Removed workaround for a (now fixed) wxMotif problem.

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

diff --git a/src/os2/dialog.cpp b/src/os2/dialog.cpp
index bf3cae5e352be74e0494d910408c79df3bdbac97..1ab046a28ea5e0e69c05b39b52afe9980a6fd1d1 100644 (file)
--- a/src/os2/dialog.cpp
+++ b/src/os2/dialog.cpp
@@ -1,248 +1,388 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        dialog.cpp
 // Purpose:     wxDialog class
 /////////////////////////////////////////////////////////////////////////////
 // Name:        dialog.cpp
 // Purpose:     wxDialog class

-// Author:      AUTHOR
+// Author:      David Webster

 // Modified by:
 // Modified by:

-// Created:     ??/??/98
+// Created:     10/14/99

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) David Webster
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "dialog.h"
-#endif
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"

 
 

+#ifndef WX_PRECOMP

 #include "wx/dialog.h"
 #include "wx/utils.h"
 #include "wx/frame.h"
 #include "wx/app.h"
 #include "wx/settings.h"
 #include "wx/dialog.h"
 #include "wx/utils.h"
 #include "wx/frame.h"
 #include "wx/app.h"
 #include "wx/settings.h"

-
-// Lists to keep track of windows, so we can disable/enable them
-// for modal dialogs
-wxList wxModalDialogs;
-wxList wxModelessWindows;  // Frames and modeless dialogs
-extern wxList wxPendingDelete;
-
-#if !USE_SHARED_LIBRARY
-IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxPanel)
-
-BEGIN_EVENT_TABLE(wxDialog, wxPanel)
-  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()
-
+#include "wx/intl.h"
+#include "wx/log.h"

 #endif
 
 #endif
 

-wxDialog::wxDialog()
-{
-    SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
-}
-
-bool wxDialog::Create(wxWindow *parent, wxWindowID id,
-           const wxString& title,
-           const wxPoint& pos,
-           const wxSize& size,
-           long style,
-           const wxString& name)
-{
-  m_windowStyle = style;
+#include "wx/os2/private.h"
+#include "wx/log.h"

 
 

-  SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
-  SetName(name);
-  
-  if (!parent)
-    wxTopLevelWindows.Append(this);
+#define wxDIALOG_DEFAULT_X 300
+#define wxDIALOG_DEFAULT_Y 300

 
 

-  if (parent) parent->AddChild(this);
+#define wxDIALOG_DEFAULT_WIDTH 500
+#define wxDIALOG_DEFAULT_HEIGHT 500

 
 

-  if ( id == -1 )
-       m_windowId = (int)NewControlId();
-  else
-       m_windowId = id;
+wxWindowList wxModalDialogs;

 
 

-  // TODO: create dialog
+IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxTopLevelWindow)

 
 

-  return FALSE;
-}
+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::SetModal(bool flag)
+void wxDialog::Init()

 {
 {

-       if ( flag )
-               m_windowStyle |= wxDIALOG_MODAL ;
-       else
-               if ( m_windowStyle & wxDIALOG_MODAL )
-                       m_windowStyle -= wxDIALOG_MODAL ;
-  
-  wxModelessWindows.DeleteObject(this);
-  if (!flag)
-    wxModelessWindows.Append(this);
-}
+    m_pOldFocus = (wxWindow *)NULL;
+    m_isShown = FALSE;
+    m_pWindowDisabler = (wxWindowDisabler *)NULL;
+    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
+)
+{
+    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);
+
+    //
+    // Save focus before doing anything which can potentially change it
+    //
+    m_pOldFocus = FindFocus();
+
+    //
+    // All dialogs should really have this style
+    //
+    lStyle |= wxTAB_TRAVERSAL;
+
+    if (!wxTopLevelWindow::Create( pParent
+                                  ,vId
+                                  ,rsTitle
+                                  ,rPos
+                                  ,rSize
+                                  ,lStyle
+                                  ,rsName
+                                 ))
+        return FALSE;
+    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
+
+void wxDialog::SetModal(
+  bool                              bFlag
+)
+{
+    if (bFlag)
+    {
+        m_windowStyle |= wxDIALOG_MODAL ;
+        wxModelessWindows.DeleteObject(this);
+    }
+    else
+    {
+        m_windowStyle &= ~wxDIALOG_MODAL ;
+        wxModelessWindows.Append(this);
+    }
+} // end of wxDialog::SetModal

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

-    // TODO
-    wxTopLevelWindows.DeleteObject(this);
+    m_isBeingDeleted = TRUE;
+    Show(FALSE);
+} // end of wxDialog::~wxDialog

 
 

-    if ( (GetWindowStyleFlag() & wxDIALOG_MODAL) != wxDIALOG_MODAL )
-      wxModelessWindows.DeleteObject(this);
-
-    // If this is the last top-level window, exit.
-    if (wxTheApp && (wxTopLevelWindows.Number() == 0))
+//
+// By default, pressing escape cancels the dialog
+//
+void wxDialog::OnCharHook(
+  wxKeyEvent&                       rEvent
+)
+{
+    if (GetHWND())

     {
     {

-      wxTheApp->SetTopWindow(NULL);
-
-      if (wxTheApp->GetExitOnFrameDelete())
-      {
-         // TODO: exit
-      }
+        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();

 }
 
 }
 

-// By default, pressing escape cancels the dialog
-void wxDialog::OnCharHook(wxKeyEvent& event)
-{
-  if (event.m_keyCode == WXK_ESCAPE)
-  {
-               // Behaviour changed in 2.0: we'll send a Cancel message
-               // to the dialog instead of Close.
-               wxCommandEvent cancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
-               cancelEvent.SetEventObject( this );
-               GetEventHandler()->ProcessEvent(cancelEvent);
-
-               return;
-  }
-  // We didn't process this event.
-  event.Skip();
-}
+// ----------------------------------------------------------------------------
+// showing the dialogs
+// ----------------------------------------------------------------------------

 
 

-void wxDialog::Iconize(bool WXUNUSED(iconize))
+bool wxDialog::IsModal() const

 {
 {

-    // TODO
-}
+    return (GetWindowStyleFlag() & wxDIALOG_MODAL) != 0;
+} // end of wxDialog::IsModal

 
 

-bool wxDialog::IsIconized() const
+bool wxDialog::IsModalShowing() const

 {
 {

-    // TODO
-    return FALSE;
-}
+    return wxModalDialogs.Find((wxDialog *)this) != NULL; // const_cast
+} // end of wxDialog::IsModalShowing

 
 

-void wxDialog::SetClientSize(int width, int height)
+void wxDialog::DoShowModal()

 {
 {

-    // TODO
-}
+    wxWindow*                       pParent = GetParent();
+    wxWindow*                       pOldFocus = m_pOldFocus;
+    HWND                            hWndOldFocus = 0;

 
 

-void wxDialog::GetPosition(int *x, int *y) const
-{
-    // TODO
-}
+    wxCHECK_RET( !IsModalShowing(), _T("DoShowModal() called twice") );
+    wxCHECK_RET( IsModal(), _T("can't DoShowModal() modeless dialog") );

 
 

-bool wxDialog::Show(bool show)
-{
-    // TODO
-    return FALSE;
-}
+    wxModalDialogs.Append(this);
+    if (pOldFocus)
+        hWndOldFocus = (HWND)pOldFocus->GetHWND();

 
 

-void wxDialog::SetTitle(const wxString& title)
-{
-    // TODO
-}
+    //
+    // Remember where the focus was
+    //
+    if (!pOldFocus)
+    {
+        pOldFocus = pParent;
+        if (pParent)
+            hWndOldFocus = GetHwndOf(pParent);
+    }

 
 

-wxString wxDialog::GetTitle() const
-{
-    // TODO
-    return wxString("");
-}
+    //
+    // 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());
+
+    //
+    // Before entering the modal loop, reset the "is in OnIdle()" flag (see
+    // comment in app.cpp)
+    //
+    extern bool                     gbInOnIdle;
+    bool                            bWasInOnIdle = gbInOnIdle;
+
+    gbInOnIdle = FALSE;
+
+    //
+    // Enter the modal loop
+    //
+    while ( IsModalShowing() )
+    {
+#if wxUSE_THREADS
+        wxMutexGuiLeaveOrEnter();
+#endif // wxUSE_THREADS

 
 

-void wxDialog::Centre(int direction)
-{
-  int x_offset,y_offset ;
-  int display_width, display_height;
-  int  width, height, x, y;
-  wxWindow *parent = GetParent();
-  if ((direction & wxCENTER_FRAME) && parent)
-  {
-      parent->GetPosition(&x_offset,&y_offset) ;
-      parent->GetSize(&display_width,&display_height) ;
-  }
-  else
-  {
-    wxDisplaySize(&display_width, &display_height);
-    x_offset = 0 ;
-    y_offset = 0 ;
-  }
-
-  GetSize(&width, &height);
-  GetPosition(&x, &y);
-
-  if (direction & wxHORIZONTAL)
-    x = (int)((display_width - width)/2);
-  if (direction & wxVERTICAL)
-    y = (int)((display_height - height)/2);
-
-  SetSize(x+x_offset, y+y_offset, width, height);
-}
+        while ( !wxTheApp->Pending() && wxTheApp->ProcessIdle() )
+            ;

 
 

-// Replacement for Show(TRUE) for modal dialogs - returns return code
-int wxDialog::ShowModal()
-{
-    m_windowStyle |= wxDIALOG_MODAL;
-    // TODO: modal showing
-       Show(TRUE);
-       return GetReturnCode();
-}
+        // a message came or no more idle processing to do
+        wxTheApp->DoMessage();
+    }
+    gbInOnIdle = bWasInOnIdle;
+
+    //
+    // Snd 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))
+    {
+        //
+        // This is likely to prove that the object still exists
+        //
+        if (wxFindWinFromHandle((WXHWND) hWndOldFocus) == pOldFocus)
+            pOldFocus->SetFocus();
+    }
+} // end of wxDialog::DoShowModal

 
 

-void wxDialog::EndModal(int retCode)
+bool wxDialog::Show(
+  bool                              bShow
+)

 {
 {

-       SetReturnCode(retCode);
-    // TODO modal un-showing
-       Show(FALSE);
-}
+    if (!bShow)
+    {
+        //
+        // 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)
+        {
+            delete m_pWindowDisabler;
+            m_pWindowDisabler = NULL;
+        }
+    }

 
 

-// Standard buttons
-void wxDialog::OnOK(wxCommandEvent& event)
-{
-       if ( Validate() && TransferDataFromWindow() )
-       {
-        if ( IsModal() )
-            EndModal(wxID_OK);
-        else
+    //
+    // ShowModal() may be called for already shown dialog
+    //
+    if (!wxDialogBase::Show(bShow) && !(bShow && IsModal()))
+    {
+        //
+        // Nothing to do
+        //
+        return FALSE;
+    }
+
+    if (bShow)
+    {
+        //
+        // Usually will result in TransferDataToWindow() being called
+        //
+        InitDialog();
+    }
+
+    if (GetTitle().c_str())
+        ::WinSetWindowText((HWND)GetHwnd(), GetTitle().c_str());
+    if (IsModal())
+    {
+        if (bShow)

         {
         {

-                   SetReturnCode(wxID_OK);
-                   this->Show(FALSE);
+            //
+            // 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();

         }
         }

-       }
-}
+        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

 
 

-void wxDialog::OnApply(wxCommandEvent& event)
+//
+// Replacement for Show(TRUE) for modal dialogs - returns return code
+//
+int wxDialog::ShowModal()

 {
 {

-       if (Validate())
-               TransferDataFromWindow();
-       // TODO probably need to disable the Apply button until things change again
-}
+    if (!IsModal())
+    {
+        SetModal(TRUE);
+    }
+    Show(TRUE);
+    return GetReturnCode();
+} // end of wxDialog::ShowModal

 
 

-void wxDialog::OnCancel(wxCommandEvent& event)
+void wxDialog::EndModal(
+  int                               nRetCode
+)

 {
 {

-    if ( IsModal() )
-        EndModal(wxID_CANCEL);
-    else
+    SetReturnCode(nRetCode);
+    Show(FALSE);
+    ::WinDismissDlg((HWND)GetHwnd(), nRetCode);
+} // end of wxDialog::EndModal
+
+// ----------------------------------------------------------------------------
+// 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() )

     {
     {

-        SetReturnCode(wxID_CANCEL);
-               this->Show(FALSE);
+        EndModal(wxID_OK);

     }
     }

-}
+} // end of wxDialog::OnOK
+
+void wxDialog::OnCancel(
+  wxCommandEvent&                   rEvent
+)
+{
+    EndModal(wxID_CANCEL);
+} // end of wxDialog::OnCancel

 
 

-void wxDialog::OnCloseWindow(wxCloseEvent& event)
+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().
     // 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().
     // 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().


@@ -252,35 +392,59 @@ void wxDialog::OnCloseWindow(wxCloseEvent& event)
     // 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.
     // 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;
     static wxList closing;

-    
+

     if ( closing.Member(this) )
         return;
     if ( closing.Member(this) )
         return;

-    
+

     closing.Append(this);
     closing.Append(this);

-    
-    wxCommandEvent cancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
-    cancelEvent.SetEventObject( this );
-    GetEventHandler()->ProcessEvent(cancelEvent); // This may close the dialog
+
+    wxCommandEvent                  vCancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
+
+    vCancelEvent.SetEventObject( this );
+    GetEventHandler()->ProcessEvent(vCancelEvent); // This may close the dialog

 
     closing.DeleteObject(this);
 
     closing.DeleteObject(this);

-}
+} // end of wxDialog::OnCloseWindow

 
 

-// Destroy the window (delayed, if a managed window)
-bool wxDialog::Destroy()
+void wxDialog::OnSysColourChanged(
+  wxSysColourChangedEvent&          rEvent
+)

 {
 {

-  if (!wxPendingDelete.Member(this))
-    wxPendingDelete.Append(this);
-  return TRUE;
-}
-
-void wxDialog::OnSysColourChanged(wxSysColourChangedEvent& event)
+    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
+    Refresh();
+} // end of wxDialog::OnSysColourChanged
+
+MRESULT wxDialog::OS2WindowProc(
+  WXUINT                            uMessage
+, WXWPARAM                          wParam
+, WXLPARAM                          lParam
+)

 {
 {

-  SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
-  Refresh();
-}
+    MRESULT                         rc = 0;
+    bool                            bProcessed = FALSE;
+
+    switch (uMessage)
+    {
+        case WM_CLOSE:
+            //
+            // If we can't close, tell the system that we processed the
+            // message - otherwise it would close us
+            //
+            bProcessed = !Close();
+            break;
+    }
+
+    if (!bProcessed)
+        rc = wxWindow::OS2WindowProc( uMessage
+                                     ,wParam
+                                     ,lParam
+                                    );
+    return rc;
+} // end of wxDialog::OS2WindowProc

 
 

-void wxDialog::Fit()
-{
-}