fixing osx_carbon

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

diff --git a/src/os2/dialog.cpp b/src/os2/dialog.cpp
index 1872c4fd4eaa69c560673bdae12c1198450d884f..278b22752fa23d2c937010deb1af6b80a6fba595 100644 (file)
--- a/src/os2/dialog.cpp
+++ b/src/os2/dialog.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        dialog.cpp
+// Name:        src/os2/dialog.cpp

 // Purpose:     wxDialog class
 // Author:      David Webster
 // Modified by:
 // Purpose:     wxDialog class
 // Author:      David Webster
 // Modified by:


@@ -12,20 +12,20 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

-#ifndef WX_PRECOMP

 #include "wx/dialog.h"
 #include "wx/dialog.h"

-#include "wx/utils.h"
-#include "wx/frame.h"
-#include "wx/app.h"
-#include "wx/settings.h"
-#include "wx/intl.h"
-#include "wx/log.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/utils.h"
+    #include "wx/frame.h"
+    #include "wx/app.h"
+    #include "wx/settings.h"
+    #include "wx/intl.h"
+    #include "wx/log.h"

 #endif
 
 #include "wx/os2/private.h"
 #endif
 
 #include "wx/os2/private.h"

-#include "wx/log.h"

 #include "wx/evtloop.h"
 #include "wx/evtloop.h"

-#include "wx/ptr_scpd.h"
+#include "wx/scopedptr.h"

 
 #define wxDIALOG_DEFAULT_X 300
 #define wxDIALOG_DEFAULT_Y 300
 
 #define wxDIALOG_DEFAULT_X 300
 #define wxDIALOG_DEFAULT_Y 300


@@ -33,17 +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)
-
-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()

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


@@ -82,9 +71,9 @@ wxDEFINE_TIED_SCOPED_PTR_TYPE(wxDialogModalData);
 
 void wxDialog::Init()
 {
 
 void wxDialog::Init()
 {

-    m_pOldFocus = (wxWindow *)NULL;
-    m_isShown = FALSE;
-    m_pWindowDisabler = (wxWindowDisabler *)NULL;
+    m_pOldFocus = NULL;
+    m_isShown = false;
+    m_pWindowDisabler = NULL;

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


@@ -125,11 +114,13 @@ 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
 

+#if WXWIN_COMPATIBILITY_2_6
+

 // deprecated ctor
 wxDialog::wxDialog(wxWindow *parent,
                    const wxString& title,
 // deprecated ctor
 wxDialog::wxDialog(wxWindow *parent,
                    const wxString& title,


@@ -146,90 +137,35 @@ wxDialog::wxDialog(wxWindow *parent,
     Create(parent, wxID_ANY, title, wxPoint(x, y), wxSize(w, h), style, name);
 }
 
     Create(parent, wxID_ANY, title, wxPoint(x, y), wxSize(w, h), style, name);
 }
 

-void wxDialog::SetModal(
-  bool                              WXUNUSED(bFlag)
-)
+void wxDialog::SetModal(bool WXUNUSED(bFlag))

 {
     // nothing to do, obsolete method
 } // end of wxDialog::SetModal
 
 {
     // nothing to do, obsolete method
 } // end of wxDialog::SetModal
 

+#endif // WXWIN_COMPATIBILITY_2_6
+

 wxDialog::~wxDialog()
 {
 wxDialog::~wxDialog()
 {

-    m_isBeingDeleted = true;
+    SendDestroyEvent();

 
     // this will also reenable all the other windows for a modal dialog
     Show(false);
 } // end of wxDialog::~wxDialog
 
 
     // this will also reenable all the other windows for a modal dialog
     Show(false);
 } // end of wxDialog::~wxDialog
 

-//
-// By default, pressing escape cancels the dialog
-//
-void wxDialog::OnCharHook(
-  wxKeyEvent&                       rEvent
-)
-{
-    if (GetHWND())
-    {
-        if (rEvent.m_keyCode == WXK_ESCAPE)
-        {
-            //
-            // Behaviour changed in 2.0: we'll send a Cancel message
-            // to the dialog instead of Close.
-            //
-            wxCommandEvent          vCancelEvent( wxEVT_COMMAND_BUTTON_CLICKED
-                                                 ,wxID_CANCEL
-                                                );
-
-            vCancelEvent.SetEventObject( this );
-            GetEventHandler()->ProcessEvent(vCancelEvent);
-
-            //
-            // Ensure that there is another message for this window so the
-            // ShowModal loop will exit and won't get stuck in GetMessage().
-            //
-            ::WinPostMsg(GetHwnd(), WM_NULL, 0, 0);
-            return;
-        }
-    }
-    // We didn't process this event.
-    rEvent.Skip();
-}
-

 // ----------------------------------------------------------------------------
 // showing the dialogs
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // showing the dialogs
 // ----------------------------------------------------------------------------
 

+#if WXWIN_COMPATIBILITY_2_6
+

 bool wxDialog::IsModalShowing() const
 {
     return IsModal();
 } // end of wxDialog::IsModalShowing
 
 bool wxDialog::IsModalShowing() const
 {
     return IsModal();
 } // end of wxDialog::IsModalShowing
 

+#endif // WXWIN_COMPATIBILITY_2_6

 
 

-wxWindow *wxDialog::FindSuitableParent() const
-{
-    // first try to use the currently active window
-    HWND hwndFg = ::WinQueryActiveWindow(HWND_DESKTOP);
-    wxWindow *parent = hwndFg ? wxFindWinFromHandle((WXHWND)hwndFg)
-                              : NULL;
-    if ( !parent )
-    {
-        // next try the main app window
-        parent = wxTheApp->GetTopWindow();
-    }
-
-    // finally, check if the parent we found is really suitable
-    if ( !parent || parent == (wxWindow *)this || !parent->IsShown() )
-    {
-        // don't use this one
-        parent = NULL;
-    }
-
-    return parent;
-}
-
-bool wxDialog::Show(
-  bool                              bShow
-)
+bool wxDialog::Show( bool bShow )

 {
     if ( bShow == IsShown() )
         return false;
 {
     if ( bShow == IsShown() )
         return false;


@@ -243,16 +179,15 @@ bool wxDialog::Show(
         // 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
     }
 
     if (bShow)
     {
 #endif
     }
 
     if (bShow)
     {

+        if (CanDoLayoutAdaptation())
+            DoLayoutAdaptation();
+

         // this usually will result in TransferDataToWindow() being called
         // which will change the controls values so do it before showing as
         // otherwise we could have some flicker
         // this usually will result in TransferDataToWindow() being called
         // which will change the controls values so do it before showing as
         // otherwise we could have some flicker


@@ -261,13 +196,14 @@ bool wxDialog::Show(
 
     wxDialogBase::Show(bShow);
 
 
     wxDialogBase::Show(bShow);
 

-    if (GetTitle().c_str())
-        ::WinSetWindowText((HWND)GetHwnd(), (PSZ)GetTitle().c_str());
+    wxString title = GetTitle();
+    if (!title.empty())
+        ::WinSetWindowText((HWND)GetHwnd(), title.c_str());

 
     if ( bShow )
     {
         // dialogs don't get WM_SIZE message after creation unlike most (all?)
 
     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
+        // other windows and so could start their life not laid out correctly

         // if we didn't call Layout() from here
         //
         // NB: normally we should call it just the first time but doing it
         // if we didn't call Layout() from here
         //
         // NB: normally we should call it just the first time but doing it


@@ -283,7 +219,7 @@ bool wxDialog::Show(
 //
 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;
 


@@ -295,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;


@@ -322,7 +254,7 @@ int wxDialog::ShowModal()
         extern bool                     gbInOnIdle;
         bool                            bWasInOnIdle = gbInOnIdle;
 
         extern bool                     gbInOnIdle;
         bool                            bWasInOnIdle = gbInOnIdle;
 

-        gbInOnIdle = FALSE;
+        gbInOnIdle = false;

 
         // enter and run the modal loop
         {
 
         // enter and run the modal loop
         {


@@ -351,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);


@@ -359,87 +291,10 @@ void wxDialog::EndModal(
     Hide();
 } // end of wxDialog::EndModal
 
     Hide();
 } // end of wxDialog::EndModal
 

-void wxDialog::EndDialog(int rc)
-{
-    if ( IsModal() )
-        EndModal(rc);
-    else
-        Hide();
-}
-
-// ----------------------------------------------------------------------------
-// wxWin event handlers
-// ----------------------------------------------------------------------------
-
-void wxDialog::OnApply( wxCommandEvent& WXUNUSED(rEvent) )
-{
-    if (Validate())
-        TransferDataFromWindow();
-} // end of wxDialog::OnApply
-
-// Standard buttons
-void wxDialog::OnOK( wxCommandEvent& WXUNUSED(rEvent) )
-{
-    if ( Validate() && TransferDataFromWindow() )
-    {
-        EndDialog(wxID_OK);
-    }
-} // end of wxDialog::OnOK
-
-void wxDialog::OnCancel( wxCommandEvent& WXUNUSED(rEvent) )
-{
-    EndDialog(wxID_CANCEL);
-} // end of wxDialog::OnCancel
-
-void wxDialog::OnCloseWindow( wxCloseEvent& WXUNUSED(rEvent) )
-{
-    //
-    // We'll send a Cancel message by default, which may close the dialog.
-    // Check for looping if the Cancel event handler calls Close().
-    //
-    // Note that if a cancel button and handler aren't present in the dialog,
-    // nothing will happen when you close the dialog via the window manager, or
-    // via Close().
-    // We wouldn't want to destroy the dialog by default, since the dialog may have been
-    // created on the stack.
-    // However, this does mean that calling dialog->Close() won't delete the dialog
-    // unless the handler for wxID_CANCEL does so. So use Destroy() if you want to be
-    // sure to destroy the dialog.
-    // The default OnCancel (above) simply ends a modal dialog, and hides a modeless dialog.
-    //
-
-    //
-    // Ugh???  This is not good but until I figure out a global list it'll have to do
-    //
-    static wxList closing;
-
-    if ( closing.Member(this) )
-        return;
-
-    closing.Append(this);
-
-    wxCommandEvent vCancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
-
-    vCancelEvent.SetEventObject( this );
-    GetEventHandler()->ProcessEvent(vCancelEvent); // This may close the dialog
-
-    closing.DeleteObject(this);
-} // end of wxDialog::OnCloseWindow
-
-void wxDialog::OnSysColourChanged( wxSysColourChangedEvent& WXUNUSED(rEvent) )
-{
-    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
-    Refresh();
-} // end of wxDialog::OnSysColourChanged
-
-MRESULT wxDialog::OS2WindowProc(
-  WXUINT                            uMessage
-, WXWPARAM                          wParam
-, WXLPARAM                          lParam
-)
+MRESULT wxDialog::OS2WindowProc( WXUINT uMessage, WXWPARAM wParam, WXLPARAM lParam )

 {
 {

-    MRESULT                         rc = 0;
-    bool                            bProcessed = FALSE;
+    MRESULT  rc = 0;
+    bool     bProcessed = false;

 
     switch (uMessage)
     {
 
     switch (uMessage)
     {