fixing osx_carbon

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

diff --git a/src/os2/dialog.cpp b/src/os2/dialog.cpp
index ff6cf0344b9e176a61fb680bd8c79a677cc43cec..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,18 +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)
-    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


@@ -83,30 +71,21 @@ 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
 
     SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
 } // end of wxDialog::Init
 

-bool wxDialog::Create(
-  wxWindow*                         pParent
-, wxWindowID                        vId
-, const wxString&                   rsTitle
-, const wxPoint&                    rPos
-, const wxSize&                     rSize
-, long                              lStyle
-, const wxString&                   rsName
-)
+bool wxDialog::Create( wxWindow*       pParent,
+                       wxWindowID      vId,
+                       const wxString& rsTitle,
+                       const wxPoint&  rPos,
+                       const wxSize&   rSize,
+                       long            lStyle,
+                       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);
 


@@ -128,238 +107,175 @@ bool wxDialog::Create(
                                   ,lStyle
                                   ,rsName
                                  ))
                                   ,lStyle
                                   ,rsName
                                  ))

-        return FALSE;
+        return false;
+

     SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
 
     //
     // Must defer setting the title until after dialog is created and sized
     //
     SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
 
     //
     // Must defer setting the title until after dialog is created and sized
     //

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

         SetTitle(rsTitle);
         SetTitle(rsTitle);

-    return TRUE;
+    return true;

 } // end of wxDialog::Create
 
 } // end of wxDialog::Create
 

-void wxDialog::SetModal(
-  bool                              bFlag
-)
+#if WXWIN_COMPATIBILITY_2_6
+
+// deprecated ctor
+wxDialog::wxDialog(wxWindow *parent,
+                   const wxString& title,
+                   bool WXUNUSED(modal),
+                   int x,
+                   int y,
+                   int w,
+                   int h,
+                   long style,
+                   const wxString& name)

 {
 {

-    if (bFlag)
-    {
-        m_windowStyle |= wxDIALOG_MODAL ;
-        wxModelessWindows.DeleteObject(this);
-    }
-    else
-    {
-        m_windowStyle &= ~wxDIALOG_MODAL ;
-        wxModelessWindows.Append(this);
-    }
-} // end of wxDialog::SetModal
+    Init();

 
 

-wxDialog::~wxDialog()
-{
-    m_isBeingDeleted = TRUE;
-    Show(FALSE);
-} // end of wxDialog::~wxDialog
+    Create(parent, wxID_ANY, title, wxPoint(x, y), wxSize(w, h), style, name);
+}

 
 

-//
-// By default, pressing escape cancels the dialog
-//
-void wxDialog::OnCharHook(
-  wxKeyEvent&                       rEvent
-)
+void wxDialog::SetModal(bool WXUNUSED(bFlag))

 {
 {

-    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
-                                                );
+    // nothing to do, obsolete method
+} // end of wxDialog::SetModal

 
 

-            vCancelEvent.SetEventObject( this );
-            GetEventHandler()->ProcessEvent(vCancelEvent);
+#endif // WXWIN_COMPATIBILITY_2_6

 
 

-            //
-            // 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();
-}
+wxDialog::~wxDialog()
+{
+    SendDestroyEvent();
+
+    // this will also reenable all the other windows for a modal dialog
+    Show(false);
+} // end of wxDialog::~wxDialog

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

-bool wxDialog::IsModal() const
-{
-    return (GetWindowStyleFlag() & wxDIALOG_MODAL) != 0;
-} // end of wxDialog::IsModal
+#if WXWIN_COMPATIBILITY_2_6

 
 bool wxDialog::IsModalShowing() const
 {
 
 bool wxDialog::IsModalShowing() const
 {

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

 } // end of wxDialog::IsModalShowing
 
 } // end of wxDialog::IsModalShowing
 

-void wxDialog::DoShowModal()
-{
-    wxWindow*                       pParent = GetParent();
-    wxWindow*                       pOldFocus = m_pOldFocus;
-    HWND                            hWndOldFocus = 0;
-
-    wxCHECK_RET( !IsModalShowing(), _T("DoShowModal() called twice") );
-    wxCHECK_RET( IsModal(), _T("can't DoShowModal() modeless dialog") );
+#endif // WXWIN_COMPATIBILITY_2_6

 
 

-    wxModalDialogs.Append(this);
-    if (pOldFocus)
-        hWndOldFocus = (HWND)pOldFocus->GetHWND();
+bool wxDialog::Show( bool bShow )
+{
+    if ( bShow == IsShown() )
+        return false;

 
 

-    //
-    // Remember where the focus was
-    //
-    if (!pOldFocus)
+    if (!bShow && m_modalData )

     {
     {

-        pOldFocus = pParent;
-        if (pParent)
-            hWndOldFocus = GetHwndOf(pParent);
+        // we need to do this before calling wxDialogBase version because if we
+        // had disabled other app windows, they must be reenabled right now as
+        // if they stay disabled Windows will activate another window (one
+        // which is enabled, anyhow) when we're hidden in the base class Show()
+        // and we will lose activation
+        m_modalData->ExitLoop();
+#if 0
+        wxDELETE(m_pWindowDisabler);
+#endif

     }
 
     }
 

-    //
-    // Disable all other app windows
-    //
-    wxASSERT_MSG(!m_pWindowDisabler, _T("disabling windows twice?"));
-
-    //
-    // Disables other app windows and window proc message processing
-    // until WinDismissDlg called
-    //
-    ::WinProcessDlg((HWND)GetHwnd());
+    if (bShow)
+    {
+        if (CanDoLayoutAdaptation())
+            DoLayoutAdaptation();

 
 

-    //
-    // Before entering the modal loop, reset the "is in OnIdle()" flag (see
-    // comment in app.cpp)
-    //
-    extern bool                     gbInOnIdle;
-    bool                            bWasInOnIdle = gbInOnIdle;
+        // 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
+        InitDialog();
+    }

 
 

-    gbInOnIdle = FALSE;
+    wxDialogBase::Show(bShow);

 
 

-    // enter the modal loop
-    {
-        wxDialogModalDataTiedPtr modalData(&m_modalData,
-                                           new wxDialogModalData(this));
-        modalData->RunLoop();
-    }
-    gbInOnIdle = bWasInOnIdle;
+    wxString title = GetTitle();
+    if (!title.empty())
+        ::WinSetWindowText((HWND)GetHwnd(), title.c_str());

 
 

-    //
-    // and restore focus
-    // Note that this code MUST NOT access the dialog object's data
-    // in case the object has been deleted (which will be the case
-    // for a modal dialog that has been destroyed before calling EndModal).
-    //
-    if (pOldFocus && (pOldFocus != this) && ::WinIsWindow(vHabmain, hWndOldFocus))
+    if ( bShow )

     {
     {

+        // dialogs don't get WM_SIZE message after creation unlike most (all?)
+        // other windows and so could start their life not laid out correctly
+        // if we didn't call Layout() from here

         //
         //

-        // This is likely to prove that the object still exists
-        //
-        if (wxFindWinFromHandle((WXHWND) hWndOldFocus) == pOldFocus)
-            pOldFocus->SetFocus();
+        // NB: normally we should call it just the first time but doing it
+        //     every time is simpler than keeping a flag
+        Layout();

     }
     }

-} // end of wxDialog::DoShowModal

 
 

-bool wxDialog::Show(
-  bool                              bShow
-)
+    return true;
+} // end of wxDialog::Show
+
+//
+// Replacement for Show(true) for modal dialogs - returns return code
+//
+int wxDialog::ShowModal()

 {
 {

-    if (!bShow)
+    wxASSERT_MSG( !IsModal(), wxT("wxDialog::ShowModal() reentered?") );
+
+    m_endModalCalled = false;
+
+    Show();
+
+    // EndModal may have been called from InitDialog handler (called from
+    // inside Show()), which would cause an infinite loop if we didn't take it
+    // into account
+    if ( !m_endModalCalled )

     {
     {

-        //
-        // 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.  We really don't
-        // do this in OS/2 since PM does this for us.
-        //
-        if (m_pWindowDisabler)
+        // modal dialog needs a parent window, so try to find one
+        wxWindow * const parent = GetParentForModalDialog();
+
+        // remember where the focus was
+        wxWindow *oldFocus = m_pOldFocus;
+        if ( !oldFocus )

         {
         {

-            delete m_pWindowDisabler;
-            m_pWindowDisabler = NULL;
+            // VZ: do we really want to do this?
+            oldFocus = parent;

         }
         }

-    }

 
 

-    //
-    // ShowModal() may be called for already shown dialog
-    //
-    if (!wxDialogBase::Show(bShow) && !(bShow && IsModal()))
-    {
-        //
-        // Nothing to do
-        //
-        return FALSE;
-    }
+        // We have to remember the HWND because we need to check
+        // the HWND still exists (oldFocus can be garbage when the dialog
+        // exits, if it has been destroyed)
+        HWND hwndOldFocus = oldFocus ? GetHwndOf(oldFocus) : NULL;
+

 
 

-    if (bShow)
-    {

         //
         //

-        // Usually will result in TransferDataToWindow() being called
+        // Before entering the modal loop, reset the "is in OnIdle()" flag (see
+        // comment in app.cpp)

         //
         //

-        InitDialog();
-    }
+        extern bool                     gbInOnIdle;
+        bool                            bWasInOnIdle = gbInOnIdle;

 
 

-    if (GetTitle().c_str())
-        ::WinSetWindowText((HWND)GetHwnd(), GetTitle().c_str());
-    if (IsModal())
-    {
-        if (bShow)
+        gbInOnIdle = false;
+
+        // enter and run the modal loop

         {
         {

-            //
-            // Modal dialog needs a parent window, so try to find one
-            //
-            if (!GetParent())
-            {
-                wxWindow*           pParent = wxTheApp->GetTopWindow();
-
-                if ( pParent && pParent != this && pParent->IsShown() )
-                {
-                    //
-                    // Use it
-                    //
-                    m_parent = pParent;
-
-                }
-            }
-            DoShowModal();
+            wxDialogModalDataTiedPtr modalData(&m_modalData,
+                                               new wxDialogModalData(this));
+            modalData->RunLoop();

         }
         }

-        else // end of modal dialog
+        gbInOnIdle = bWasInOnIdle;
+
+        // and restore focus
+        // Note that this code MUST NOT access the dialog object's data
+        // in case the object has been deleted (which will be the case
+        // for a modal dialog that has been destroyed before calling EndModal).
+        if ( oldFocus && (oldFocus != this) && ::WinIsWindow(vHabmain, hwndOldFocus))

         {
         {

-            //
-            // This will cause IsModalShowing() return FALSE and our local
-            // message loop will terminate
-            //
-            wxModalDialogs.DeleteObject(this);
+            // This is likely to prove that the object still exists
+            if (wxFindWinFromHandle((WXHWND) hwndOldFocus) == oldFocus)
+                oldFocus->SetFocus();

         }
     }
         }
     }

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

 
 

-//
-// Replacement for Show(TRUE) for modal dialogs - returns return code
-//
-int wxDialog::ShowModal()
-{
-    if (!IsModal())
-    {
-        SetModal(TRUE);
-    }
-    Show(TRUE);

     return GetReturnCode();
 } // end of wxDialog::ShowModal
 
     return GetReturnCode();
 } // end of wxDialog::ShowModal
 


@@ -367,95 +283,18 @@ void wxDialog::EndModal(
   int                               nRetCode
 )
 {
   int                               nRetCode
 )
 {

-    SetReturnCode(nRetCode);
-    Show(FALSE);
-    ::WinDismissDlg((HWND)GetHwnd(), nRetCode);
-} // end of wxDialog::EndModal
+    wxASSERT_MSG( IsModal(), wxT("EndModal() called for non modal dialog") );

 
 

-// ----------------------------------------------------------------------------
-// wxWin event handlers
-// ----------------------------------------------------------------------------
-
-void wxDialog::OnApply(
-  wxCommandEvent&                   rEvent
-)
-{
-    if (Validate())
-        TransferDataFromWindow();
-} // end of wxDialog::OnApply
-
-// Standard buttons
-void wxDialog::OnOK(
-  wxCommandEvent&                   rEvent
-)
-{
-    if ( Validate() && TransferDataFromWindow() )
-    {
-        EndModal(wxID_OK);
-    }
-} // end of wxDialog::OnOK
-
-void wxDialog::OnCancel(
-  wxCommandEvent&                   rEvent
-)
-{
-    EndModal(wxID_CANCEL);
-} // end of wxDialog::OnCancel
-
-void wxDialog::OnCloseWindow(
-  wxCloseEvent&                     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
+    m_endModalCalled = true;
+    SetReturnCode(nRetCode);

 
 

-void wxDialog::OnSysColourChanged(
-  wxSysColourChangedEvent&          rEvent
-)
-{
-    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
-    Refresh();
-} // end of wxDialog::OnSysColourChanged
+    Hide();
+} // end of wxDialog::EndModal

 
 

-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)
     {


@@ -475,4 +314,3 @@ MRESULT wxDialog::OS2WindowProc(
                                     );
     return rc;
 } // end of wxDialog::OS2WindowProc
                                     );
     return rc;
 } // end of wxDialog::OS2WindowProc

-