Moved the cleanup code to an EVT_WINDOW_DESTROY handler.

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

diff --git a/src/os2/dialog.cpp b/src/os2/dialog.cpp
index a0b3fa7c7be5b2f598c37a665fb84567b0650b02..eb635379c9397889fc060f65593ee8d60ef6634a 100644 (file)
--- a/src/os2/dialog.cpp
+++ b/src/os2/dialog.cpp
@@ -31,30 +31,25 @@
 #define wxDIALOG_DEFAULT_WIDTH 500
 #define wxDIALOG_DEFAULT_HEIGHT 500
 
 #define wxDIALOG_DEFAULT_WIDTH 500
 #define wxDIALOG_DEFAULT_HEIGHT 500
 

-// Lists to keep track of windows, so we can disable/enable them
-// for modal dialogs

 wxWindowList wxModalDialogs;
 wxWindowList wxModalDialogs;

-wxWindowList wxModelessWindows;  // Frames and modeless dialogs
-extern wxList WXDLLEXPORT wxPendingDelete;

 
 

-   IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxPanel)
+IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxTopLevelWindow)

 
 

-   BEGIN_EVENT_TABLE(wxDialog, wxPanel)
-      EVT_SIZE(wxDialog::OnSize)
-      EVT_BUTTON(wxID_OK, wxDialog::OnOK)
-      EVT_BUTTON(wxID_APPLY, wxDialog::OnApply)
-      EVT_BUTTON(wxID_CANCEL, wxDialog::OnCancel)
-      EVT_CHAR_HOOK(wxDialog::OnCharHook)
-      EVT_SYS_COLOUR_CHANGED(wxDialog::OnSysColourChanged)
-      EVT_CLOSE(wxDialog::OnCloseWindow)
-   END_EVENT_TABLE()
+BEGIN_EVENT_TABLE(wxDialog, wxDialogBase)
+    EVT_BUTTON(wxID_OK, wxDialog::OnOK)
+    EVT_BUTTON(wxID_APPLY, wxDialog::OnApply)
+    EVT_BUTTON(wxID_CANCEL, wxDialog::OnCancel)
+    EVT_CHAR_HOOK(wxDialog::OnCharHook)
+    EVT_SYS_COLOUR_CHANGED(wxDialog::OnSysColourChanged)
+    EVT_CLOSE(wxDialog::OnCloseWindow)
+END_EVENT_TABLE()

 
 void wxDialog::Init()
 {
     m_pOldFocus = (wxWindow *)NULL;
     m_isShown = FALSE;
     m_pWindowDisabler = (wxWindowDisabler *)NULL;
 
 void wxDialog::Init()
 {
     m_pOldFocus = (wxWindow *)NULL;
     m_isShown = FALSE;
     m_pWindowDisabler = (wxWindowDisabler *)NULL;

-    SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
+    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));

 } // end of wxDialog::Init
 
 bool wxDialog::Create(
 } // end of wxDialog::Init
 
 bool wxDialog::Create(


@@ -76,65 +71,34 @@ bool wxDialog::Create(
     HWND                            hWnd;
 
     Init();
     HWND                            hWnd;
 
     Init();

-    m_pOldFocus = (wxWindow*)FindFocus();
-    SetName(rsName);
-    wxTopLevelWindows.Append(this);
-    if (pParent)
-        pParent->AddChild(this);
-    if (vId == -1)
-        m_windowId = NewControlId();
-    else
-        m_windowId = vId;
-    if (lX < 0)
-        lX = wxDIALOG_DEFAULT_X;
-    if (lY < 0)
-        lY = wxDIALOG_DEFAULT_Y;
-    m_windowStyle = lStyle;
-    if (lWidth < 0)
-        lWidth = wxDIALOG_DEFAULT_WIDTH;
-    if (lHeight < 0)
-        lHeight = wxDIALOG_DEFAULT_HEIGHT;
+    SetExtraStyle(GetExtraStyle() | wxTOPLEVEL_EX_DIALOG);

 
     //
 
     //

-    // All dialogs should really have this style
+    // Save focus before doing anything which can potentially change it

     //
     //

-    m_windowStyle |= wxTAB_TRAVERSAL;
+    m_pOldFocus = FindFocus();

 
     //
 
     //

-    // Allows creation of dialogs with & without captions under MSWindows,
-    // resizeable or not (but a resizeable dialog always has caption -
-    // otherwise it would look too strange)
+    // All dialogs should really have this style

     //
     //

-    if (lStyle & wxRESIZE_BORDER )
-        zDlg = "wxResizeableDialog";
-    else if (lStyle & wxCAPTION )
-        zDlg = "wxCaptionDialog";
-    else
-        zDlg = "wxNoCaptionDialog";
-    OS2Create( GetWinHwnd(pParent)
-              ,NULL
-              ,rsTitle.c_str()
-              ,0L
-              ,lX
-              ,lY
-              ,lWidth
-              ,lHeight
-              ,GetWinHwnd(pParent)
-              ,HWND_TOP
-              ,(long)m_windowId
-              ,NULL
-              ,NULL
-             );
-    hWnd = (HWND)GetHWND();
-    if (!hWnd)
-    {
+    lStyle |= wxTAB_TRAVERSAL;
+
+    if (!wxTopLevelWindow::Create( pParent
+                                  ,vId
+                                  ,rsTitle
+                                  ,rPos
+                                  ,rSize
+                                  ,lStyle
+                                  ,rsName
+                                 ))

         return FALSE;
         return FALSE;

-    }
-    SubclassWin(GetHWND());
-    ::WinSetWindowText( hWnd
-                       ,(PSZ)rsTitle.c_str()
-                      );
-    SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
+    SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
+
+    //
+    // Must defer setting the title until after dialog is created and sized
+    //
+    if (!rsTitle.IsNull())
+        SetTitle(rsTitle);

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


@@ -143,35 +107,21 @@ void wxDialog::SetModal(
 )
 {
     if (bFlag)
 )
 {
     if (bFlag)

+    {

         m_windowStyle |= wxDIALOG_MODAL ;
         m_windowStyle |= wxDIALOG_MODAL ;

-    else if ( m_windowStyle & wxDIALOG_MODAL )
-        m_windowStyle -= wxDIALOG_MODAL ;
-
-      wxModelessWindows.DeleteObject(this);
-      if (!bFlag)
-          wxModelessWindows.Append(this);
+        wxModelessWindows.DeleteObject(this);
+    }
+    else
+    {
+        m_windowStyle &= ~wxDIALOG_MODAL ;
+        wxModelessWindows.Append(this);
+    }

 } // end of wxDialog::SetModal
 
 wxDialog::~wxDialog()
 {
     m_isBeingDeleted = TRUE;
 } // end of wxDialog::SetModal
 
 wxDialog::~wxDialog()
 {
     m_isBeingDeleted = TRUE;

-    wxTopLevelWindows.DeleteObject(this);

     Show(FALSE);
     Show(FALSE);

-    if (!IsModal)
-        wxModelessWindows.DeleteObject(this);
-
-    //
-    // If this is the last top-level window, exit.
-    //
-    if (wxTheApp && (wxTopLevelWindows.Number() == 0))
-    {
-        wxTheApp->SetTopWindow(NULL);
-
-        if (wxTheApp->GetExitOnFrameDelete())
-        {
-            ::WinPostMsg(GetHwnd(), WM_QUIT, 0, 0);
-        }
-    }

 } // end of wxDialog::~wxDialog
 
 //
 } // end of wxDialog::~wxDialog
 
 //


@@ -208,64 +158,9 @@ void wxDialog::OnCharHook(
     rEvent.Skip();
 }
 
     rEvent.Skip();
 }
 

-void wxDialog::Iconize(
-  bool                              WXUNUSED(bIconize)
-)
-{
-} // end of wxDialog::Iconize
-
-bool wxDialog::IsIconized() const
-{
-    return FALSE;
-} // end of wxDialog::IsIconized
-
-void wxDialog::DoSetClientSize(
-  int                               nWidth
-, int                               nHeight
-)
-{
-    HWND                            hWnd = (HWND) GetHWND();
-    RECTL                           vRect;
-    RECTL                           vRect2;
-
-    ::WinQueryWindowRect(hWnd, &vRect);
-    ::WinQueryWindowRect(hWnd, &vRect2);
-
-    LONG                            lActualWidth = vRect2.xRight - vRect2.xLeft - vRect.xRight + nWidth;
-    LONG                            lActualHeight = vRect2.yTop + vRect2.yTop - vRect.yTop + nHeight;
-
-    ::WinSetWindowPos( GetHwnd()
-                      ,HWND_TOP
-                      ,(LONG)vRect2.xLeft
-                      ,(LONG)vRect2.yTop
-                      ,(LONG)lActualWidth
-                      ,(LONG)lActualHeight
-                      ,SWP_SIZE | SWP_MOVE
-                     );
-
-    wxSizeEvent                     vEvent( wxSize( lActualWidth
-                                                   ,lActualHeight
-                                                  )
-                                           ,m_windowId
-                                          );
-
-    vEvent.SetEventObject( this );
-    GetEventHandler()->ProcessEvent(vEvent);
-} // end of wxDialog::DoSetClientSize
-
-void wxDialog::DoGetPosition(
-  int*                              pnX
-, int*                              pnY
-) const
-{
-    RECTL                           vRect;
-
-    ::WinQueryWindowRect(GetHwnd(), &vRect);
-    if (pnX)
-        *pnX = vRect.xLeft;
-    if (pnY)
-        *pnY = vRect.yBottom; // OS/2's bottom is windows' top???
-} // end of wxDialog::DoGetPosition
+// ----------------------------------------------------------------------------
+// showing the dialogs
+// ----------------------------------------------------------------------------

 
 bool wxDialog::IsModal() const
 {
 
 bool wxDialog::IsModal() const
 {


@@ -305,7 +200,11 @@ void wxDialog::DoShowModal()
     //
     wxASSERT_MSG(!m_pWindowDisabler, _T("disabling windows twice?"));
 
     //
     wxASSERT_MSG(!m_pWindowDisabler, _T("disabling windows twice?"));
 

-    m_pWindowDisabler = new wxWindowDisabler(this);
+    //
+    // Disables other app windows and window proc message processing
+    // until WinDismissDlg called
+    //
+    ::WinProcessDlg((HWND)GetHwnd());

 
     //
     // Enter the modal loop
 
     //
     // Enter the modal loop


@@ -348,7 +247,8 @@ bool wxDialog::Show(
         //
         // If we had disabled other app windows, reenable them back now because
         // if they stay disabled Windows will activate another window (one
         //
         // If we had disabled other app windows, reenable them back now because
         // if they stay disabled Windows will activate another window (one

-        // which is enabled, anyhow) and we will lose activation
+        // which is enabled, anyhow) and we will lose activation.  We really don't
+        // do this in OS/2 since PM does this for us.

         //
         if (m_pWindowDisabler)
         {
         //
         if (m_pWindowDisabler)
         {


@@ -376,6 +276,8 @@ bool wxDialog::Show(
         InitDialog();
     }
 
         InitDialog();
     }
 

+    if (GetTitle().c_str())
+        ::WinSetWindowText((HWND)GetHwnd(), GetTitle().c_str());

     if (IsModal())
     {
         if (bShow)
     if (IsModal())
     {
         if (bShow)


@@ -407,7 +309,7 @@ bool wxDialog::Show(
             wxModalDialogs.DeleteObject(this);
         }
     }
             wxModalDialogs.DeleteObject(this);
         }
     }

-    return FALSE;
+    return TRUE;

 } // end of wxDialog::Show
 
 //
 } // end of wxDialog::Show
 
 //


@@ -429,8 +331,13 @@ void wxDialog::EndModal(
 {
     SetReturnCode(nRetCode);
     Show(FALSE);
 {
     SetReturnCode(nRetCode);
     Show(FALSE);

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

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

+// ----------------------------------------------------------------------------
+// wxWin event handlers
+// ----------------------------------------------------------------------------
+

 void wxDialog::OnApply(
   wxCommandEvent&                   rEvent
 )
 void wxDialog::OnApply(
   wxCommandEvent&                   rEvent
 )


@@ -495,22 +402,11 @@ void wxDialog::OnCloseWindow(
     closing.DeleteObject(this);
 } // end of wxDialog::OnCloseWindow
 
     closing.DeleteObject(this);
 } // end of wxDialog::OnCloseWindow
 

-//
-// Destroy the window (delayed, if a managed window)
-//
-bool wxDialog::Destroy()
-{
-    wxCHECK_MSG( !wxPendingDelete.Member(this), FALSE,
-                 _T("wxDialog destroyed twice") );
-    wxPendingDelete.Append(this);
-    return TRUE;
-} // end of wxDialog::Destroy
-

 void wxDialog::OnSysColourChanged(
   wxSysColourChangedEvent&          rEvent
 )
 {
 void wxDialog::OnSysColourChanged(
   wxSysColourChangedEvent&          rEvent
 )
 {

-    SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
+    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));

     Refresh();
 } // end of wxDialog::OnSysColourChanged
 
     Refresh();
 } // end of wxDialog::OnSysColourChanged