Simplified pen style conversion.

[wxWidgets.git] / src / os2 / dialog.cpp

diff --git a/src/os2/dialog.cpp b/src/os2/dialog.cpp
index ff6cf0344b9e176a61fb680bd8c79a677cc43cec..fb4e903b0752ff573e53ee41610d74ba185fbcd2 100644 (file)
--- a/src/os2/dialog.cpp
+++ b/src/os2/dialog.cpp
@@ -33,8 +33,6 @@
 #define wxDIALOG_DEFAULT_WIDTH 500
 #define wxDIALOG_DEFAULT_HEIGHT 500
 
 #define wxDIALOG_DEFAULT_WIDTH 500
 #define wxDIALOG_DEFAULT_HEIGHT 500
 

-wxWindowList wxModalDialogs;
-

 IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxTopLevelWindow)
 
 BEGIN_EVENT_TABLE(wxDialog, wxDialogBase)
 IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxTopLevelWindow)
 
 BEGIN_EVENT_TABLE(wxDialog, wxDialogBase)


@@ -86,6 +84,7 @@ void wxDialog::Init()
     m_pOldFocus = (wxWindow *)NULL;
     m_isShown = FALSE;
     m_pWindowDisabler = (wxWindowDisabler *)NULL;
     m_pOldFocus = (wxWindow *)NULL;
     m_isShown = FALSE;
     m_pWindowDisabler = (wxWindowDisabler *)NULL;

+    m_modalData = NULL;

     SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
 } // end of wxDialog::Init
 
     SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
 } // end of wxDialog::Init
 


@@ -99,14 +98,6 @@ bool wxDialog::Create(
 , const wxString&                   rsName
 )
 {
 , const wxString&                   rsName
 )
 {

-    long                            lX = rPos.x;
-    long                            lY = rPos.y;
-    long                            lWidth = rSize.x;
-    long                            lHeight = rSize.y;
-    const char*                     zDlg;
-    WXDWORD                         dwExtendedStyle = 0L;
-    HWND                            hWnd;
-

     Init();
     SetExtraStyle(GetExtraStyle() | wxTOPLEVEL_EX_DIALOG);
 
     Init();
     SetExtraStyle(GetExtraStyle() | wxTOPLEVEL_EX_DIALOG);
 


@@ -206,7 +197,7 @@ bool wxDialog::IsModal() const
 
 bool wxDialog::IsModalShowing() const
 {
 
 bool wxDialog::IsModalShowing() const
 {

-    return wxModalDialogs.Find((wxDialog *)this) != NULL; // const_cast
+    return m_modalData != NULL; // const_cast

 } // end of wxDialog::IsModalShowing
 
 void wxDialog::DoShowModal()
 } // end of wxDialog::IsModalShowing
 
 void wxDialog::DoShowModal()


@@ -218,7 +209,6 @@ void wxDialog::DoShowModal()
     wxCHECK_RET( !IsModalShowing(), _T("DoShowModal() called twice") );
     wxCHECK_RET( IsModal(), _T("can't DoShowModal() modeless dialog") );
 
     wxCHECK_RET( !IsModalShowing(), _T("DoShowModal() called twice") );
     wxCHECK_RET( IsModal(), _T("can't DoShowModal() modeless dialog") );
 

-    wxModalDialogs.Append(this);

     if (pOldFocus)
         hWndOldFocus = (HWND)pOldFocus->GetHWND();
 
     if (pOldFocus)
         hWndOldFocus = (HWND)pOldFocus->GetHWND();
 


@@ -237,12 +227,6 @@ void wxDialog::DoShowModal()
     //
     wxASSERT_MSG(!m_pWindowDisabler, _T("disabling windows twice?"));
 
     //
     wxASSERT_MSG(!m_pWindowDisabler, _T("disabling windows twice?"));
 

-    //
-    // Disables other app windows and window proc message processing
-    // until WinDismissDlg called
-    //
-    ::WinProcessDlg((HWND)GetHwnd());
-

     //
     // Before entering the modal loop, reset the "is in OnIdle()" flag (see
     // comment in app.cpp)
     //
     // Before entering the modal loop, reset the "is in OnIdle()" flag (see
     // comment in app.cpp)


@@ -293,6 +277,8 @@ bool wxDialog::Show(
             delete m_pWindowDisabler;
             m_pWindowDisabler = NULL;
         }
             delete m_pWindowDisabler;
             m_pWindowDisabler = NULL;
         }

+        if ( m_modalData )
+            m_modalData->ExitLoop();

     }
 
     //
     }
 
     //


@@ -308,6 +294,14 @@ bool wxDialog::Show(
 
     if (bShow)
     {
 
     if (bShow)
     {

+        // dialogs don't get WM_SIZE message after creation unlike most (all?)
+        // other windows and so could start their life non laid out correctly
+        // if we didn't call Layout() from here
+        //
+        // NB: normally we should call it just the first time but doing it
+        //     every time is simpler than keeping a flag
+//         Layout();
+

         //
         // Usually will result in TransferDataToWindow() being called
         //
         //
         // Usually will result in TransferDataToWindow() being called
         //


@@ -338,14 +332,6 @@ bool wxDialog::Show(
             }
             DoShowModal();
         }
             }
             DoShowModal();
         }

-        else // end of modal dialog
-        {
-            //
-            // This will cause IsModalShowing() return FALSE and our local
-            // message loop will terminate
-            //
-            wxModalDialogs.DeleteObject(this);
-        }

     }
     return TRUE;
 } // end of wxDialog::Show
     }
     return TRUE;
 } // end of wxDialog::Show


@@ -369,7 +355,6 @@ void wxDialog::EndModal(
 {
     SetReturnCode(nRetCode);
     Show(FALSE);
 {
     SetReturnCode(nRetCode);
     Show(FALSE);

-    ::WinDismissDlg((HWND)GetHwnd(), nRetCode);

 } // end of wxDialog::EndModal
 
 // ----------------------------------------------------------------------------
 } // end of wxDialog::EndModal
 
 // ----------------------------------------------------------------------------