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 f15bd2b353f3cfa742f0742579ceaacdfa15954f..278b22752fa23d2c937010deb1af6b80a6fba595 100644 (file)
--- a/src/os2/dialog.cpp
+++ b/src/os2/dialog.cpp
@@ -1,281 +1,316 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxDialog class
 // 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"

 
 #include "wx/dialog.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()

 
 

+#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
 
 #endif
 

-wxDialog::wxDialog()
-{
-    SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
-}
+#include "wx/os2/private.h"
+#include "wx/evtloop.h"
+#include "wx/scopedptr.h"
+
+#define wxDIALOG_DEFAULT_X 300
+#define wxDIALOG_DEFAULT_Y 300
+
+#define wxDIALOG_DEFAULT_WIDTH 500
+#define wxDIALOG_DEFAULT_HEIGHT 500

 
 

-bool wxDialog::Create(wxWindow *parent, wxWindowID id,
-           const wxString& title,
-           const wxPoint& pos,
-           const wxSize& size,
-           long style,
-           const wxString& name)
+
+// ----------------------------------------------------------------------------
+// wxDialogModalData
+// ----------------------------------------------------------------------------
+
+// this is simply a container for any data we need to implement modality which
+// allows us to avoid changing wxDialog each time the implementation changes
+class wxDialogModalData

 {
 {

-  m_windowStyle = style;
+public:
+    wxDialogModalData(wxDialog *dialog) : m_evtLoop(dialog) { }

 
 

-  SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
-  SetName(name);
+    void RunLoop()
+    {
+        m_evtLoop.Run();
+    }

 
 

-  if (!parent)
-    wxTopLevelWindows.Append(this);
+    void ExitLoop()
+    {
+        m_evtLoop.Exit();
+    }

 
 

-  if (parent) parent->AddChild(this);
+private:
+    wxModalEventLoop m_evtLoop;
+};

 
 

-  if ( id == -1 )
-       m_windowId = (int)NewControlId();
-  else
-       m_windowId = id;
+wxDEFINE_TIED_SCOPED_PTR_TYPE(wxDialogModalData);

 
 

-  // TODO: create dialog
+// ============================================================================
+// implementation
+// ============================================================================

 
 

-  return FALSE;
-}
+// ----------------------------------------------------------------------------
+// wxDialog construction
+// ----------------------------------------------------------------------------

 
 

-void wxDialog::SetModal(bool flag)
+void wxDialog::Init()
+{
+    m_pOldFocus = NULL;
+    m_isShown = false;
+    m_pWindowDisabler = NULL;
+    m_modalData = 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 )

 {
 {

-       if ( flag )
-               m_windowStyle |= wxDIALOG_MODAL ;
-       else
-               if ( m_windowStyle & wxDIALOG_MODAL )
-                       m_windowStyle -= wxDIALOG_MODAL ;
-
-  wxModelessWindows.DeleteObject(this);
-  if (!flag)
-    wxModelessWindows.Append(this);
+    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.empty() )
+        SetTitle(rsTitle);
+    return true;
+} // end of wxDialog::Create
+
+#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)
+{
+    Init();
+
+    Create(parent, wxID_ANY, title, wxPoint(x, y), wxSize(w, h), style, name);

 }
 
 }
 

+void wxDialog::SetModal(bool WXUNUSED(bFlag))
+{
+    // nothing to do, obsolete method
+} // end of wxDialog::SetModal
+
+#endif // WXWIN_COMPATIBILITY_2_6
+

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

-    // TODO
-    wxTopLevelWindows.DeleteObject(this);
+    SendDestroyEvent();

 
 

-    if ( (GetWindowStyleFlag() & wxDIALOG_MODAL) != wxDIALOG_MODAL )
-      wxModelessWindows.DeleteObject(this);
+    // this will also reenable all the other windows for a modal dialog
+    Show(false);
+} // end of wxDialog::~wxDialog

 
 

-    // If this is the last top-level window, exit.
-    if (wxTheApp && (wxTopLevelWindows.Number() == 0))
-    {
-      wxTheApp->SetTopWindow(NULL);
+// ----------------------------------------------------------------------------
+// showing the dialogs
+// ----------------------------------------------------------------------------

 
 

-      if (wxTheApp->GetExitOnFrameDelete())
-      {
-         // TODO: exit
-      }
-    }
-}
+#if WXWIN_COMPATIBILITY_2_6

 
 

-// By default, pressing escape cancels the dialog
-void wxDialog::OnCharHook(wxKeyEvent& event)
+bool wxDialog::IsModalShowing() const

 {
 {

-  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();
-}
+    return IsModal();
+} // end of wxDialog::IsModalShowing

 
 

-void wxDialog::Iconize(bool WXUNUSED(iconize))
-{
-    // TODO
-}
+#endif // WXWIN_COMPATIBILITY_2_6

 
 

-bool wxDialog::IsIconized() const
+bool wxDialog::Show( bool bShow )

 {
 {

-    // TODO
-    return FALSE;
-}
+    if ( bShow == IsShown() )
+        return false;

 
 

-void wxDialog::GetPosition(int *x, int *y) const
-{
-    // TODO
-}
+    if (!bShow && m_modalData )
+    {
+        // 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
+    }

 
 

-bool wxDialog::Show(bool show)
-{
-    // TODO
-    return FALSE;
-}
+    if (bShow)
+    {
+        if (CanDoLayoutAdaptation())
+            DoLayoutAdaptation();

 
 

-void wxDialog::SetTitle(const wxString& title)
-{
-    // TODO
-}
+        // 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();
+    }

 
 

-wxString wxDialog::GetTitle() const
-{
-    // TODO
-    return wxString("");
-}
+    wxDialogBase::Show(bShow);

 
 

-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);
-}
+    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?)
+        // 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
+        //     every time is simpler than keeping a flag
+        Layout();
+    }
+
+    return true;
+} // end of wxDialog::Show

 
 

-// Replacement for Show(TRUE) for modal dialogs - returns return code
+//
+// Replacement for Show(true) for modal dialogs - returns return code
+//

 int wxDialog::ShowModal()
 {
 int wxDialog::ShowModal()
 {

-    m_windowStyle |= wxDIALOG_MODAL;
-    // TODO: modal showing
-       Show(TRUE);
-       return GetReturnCode();
-}
+    wxASSERT_MSG( !IsModal(), wxT("wxDialog::ShowModal() reentered?") );

 
 

-void wxDialog::EndModal(int retCode)
-{
-       SetReturnCode(retCode);
-    // TODO modal un-showing
-       Show(FALSE);
-}
+    m_endModalCalled = false;

 
 

-// Standard buttons
-void wxDialog::OnOK(wxCommandEvent& event)
-{
-       if ( Validate() && TransferDataFromWindow() )
-       {
-        if ( IsModal() )
-            EndModal(wxID_OK);
-        else
+    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 )
+    {
+        // 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 )

         {
         {

-                   SetReturnCode(wxID_OK);
-                   this->Show(FALSE);
+            // VZ: do we really want to do this?
+            oldFocus = parent;

         }
         }

-       }
-}

 
 

-void wxDialog::OnApply(wxCommandEvent& event)
-{
-       if (Validate())
-               TransferDataFromWindow();
-       // TODO probably need to disable the Apply button until things change again
-}
+        // 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;

 
 

-void wxDialog::OnCancel(wxCommandEvent& event)
-{
-    if ( IsModal() )
-        EndModal(wxID_CANCEL);
-    else
-    {
-        SetReturnCode(wxID_CANCEL);
-               this->Show(FALSE);
-    }
-}

 
 

-void wxDialog::OnCloseWindow(wxCloseEvent& event)
-{
-    // We'll send a Cancel message by default,
-    // which may close the dialog.
-    // Check for looping if the Cancel event handler calls Close().
+        //
+        // Before entering the modal loop, reset the "is in OnIdle()" flag (see
+        // comment in app.cpp)
+        //
+        extern bool                     gbInOnIdle;
+        bool                            bWasInOnIdle = gbInOnIdle;

 
 

-    // 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.
+        gbInOnIdle = false;

 
 

-    static wxList closing;
+        // enter and run the modal loop
+        {
+            wxDialogModalDataTiedPtr modalData(&m_modalData,
+                                               new wxDialogModalData(this));
+            modalData->RunLoop();
+        }
+        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 is likely to prove that the object still exists
+            if (wxFindWinFromHandle((WXHWND) hwndOldFocus) == oldFocus)
+                oldFocus->SetFocus();
+        }
+    }

 
 

-    if ( closing.Member(this) )
-        return;
+    return GetReturnCode();
+} // end of wxDialog::ShowModal

 
 

-    closing.Append(this);
+void wxDialog::EndModal(
+  int                               nRetCode
+)
+{
+    wxASSERT_MSG( IsModal(), wxT("EndModal() called for non modal dialog") );

 
 

-    wxCommandEvent cancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
-    cancelEvent.SetEventObject( this );
-    GetEventHandler()->ProcessEvent(cancelEvent); // This may close the dialog
+    m_endModalCalled = true;
+    SetReturnCode(nRetCode);

 
 

-    closing.DeleteObject(this);
-}
+    Hide();
+} // end of wxDialog::EndModal

 
 

-// Destroy the window (delayed, if a managed window)
-bool wxDialog::Destroy()
+MRESULT wxDialog::OS2WindowProc( WXUINT uMessage, WXWPARAM wParam, WXLPARAM lParam )

 {
 {

-  if (!wxPendingDelete.Member(this))
-    wxPendingDelete.Append(this);
-  return TRUE;
-}
+    MRESULT  rc = 0;
+    bool     bProcessed = false;

 
 

-void wxDialog::OnSysColourChanged(wxSysColourChangedEvent& event)
-{
-  SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
-  Refresh();
-}
+    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;
+    }

 
 

-void wxDialog::Fit()
-{
-}
+    if (!bProcessed)
+        rc = wxWindow::OS2WindowProc( uMessage
+                                     ,wParam
+                                     ,lParam
+                                    );
+    return rc;
+} // end of wxDialog::OS2WindowProc