Fix wxGrid::AutoSizeColOrRow() logic for multicells.

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

diff --git a/src/os2/dialog.cpp b/src/os2/dialog.cpp
index 51152300491fbd8068633ef14aec5a59a8cb9bb8..278b22752fa23d2c937010deb1af6b80a6fba595 100644 (file)
--- a/src/os2/dialog.cpp
+++ b/src/os2/dialog.cpp
@@ -33,7 +33,6 @@
 #define wxDIALOG_DEFAULT_WIDTH 500
 #define wxDIALOG_DEFAULT_HEIGHT 500
 
 #define wxDIALOG_DEFAULT_WIDTH 500
 #define wxDIALOG_DEFAULT_HEIGHT 500
 

-IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxTopLevelWindow)

 
 // ----------------------------------------------------------------------------
 // wxDialogModalData
 
 // ----------------------------------------------------------------------------
 // wxDialogModalData


@@ -115,7 +114,7 @@ bool wxDialog::Create( wxWindow*       pParent,
     //
     // Must defer setting the title until after dialog is created and sized
     //
     //
     // Must defer setting the title until after dialog is created and sized
     //

-    if (!rsTitle.IsNull())
+    if ( !rsTitle.empty() )

         SetTitle(rsTitle);
     return true;
 } // end of wxDialog::Create
         SetTitle(rsTitle);
     return true;
 } // end of wxDialog::Create


@@ -180,11 +179,7 @@ bool wxDialog::Show( bool bShow )
         // and we will lose activation
         m_modalData->ExitLoop();
 #if 0
         // and we will lose activation
         m_modalData->ExitLoop();
 #if 0

-        if (m_pWindowDisabler)
-        {
-            delete m_pWindowDisabler;
-            m_pWindowDisabler = NULL;
-        }
+        wxDELETE(m_pWindowDisabler);

 #endif
     }
 
 #endif
     }
 


@@ -224,7 +219,7 @@ bool wxDialog::Show( bool bShow )
 //
 int wxDialog::ShowModal()
 {
 //
 int wxDialog::ShowModal()
 {

-    wxASSERT_MSG( !IsModal(), _T("wxDialog::ShowModal() reentered?") );
+    wxASSERT_MSG( !IsModal(), wxT("wxDialog::ShowModal() reentered?") );

 
     m_endModalCalled = false;
 
 
     m_endModalCalled = false;
 


@@ -236,11 +231,7 @@ int wxDialog::ShowModal()
     if ( !m_endModalCalled )
     {
         // modal dialog needs a parent window, so try to find one
     if ( !m_endModalCalled )
     {
         // modal dialog needs a parent window, so try to find one

-        wxWindow *parent = GetParent();
-        if ( !parent )
-        {
-            parent = FindSuitableParent();
-        }
+        wxWindow * const parent = GetParentForModalDialog();

 
         // remember where the focus was
         wxWindow *oldFocus = m_pOldFocus;
 
         // remember where the focus was
         wxWindow *oldFocus = m_pOldFocus;


@@ -292,7 +283,7 @@ void wxDialog::EndModal(
   int                               nRetCode
 )
 {
   int                               nRetCode
 )
 {

-    wxASSERT_MSG( IsModal(), _T("EndModal() called for non modal dialog") );
+    wxASSERT_MSG( IsModal(), wxT("EndModal() called for non modal dialog") );

 
     m_endModalCalled = true;
     SetReturnCode(nRetCode);
 
     m_endModalCalled = true;
     SetReturnCode(nRetCode);