MDI child maximize bug fixed

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

diff --git a/src/msw/dialog.cpp b/src/msw/dialog.cpp
index ec5d44eae27afd433295a5915c95a14142d80be3..dde02e52a8f4daa728c8842223ce669970ef88c2 100644 (file)
--- a/src/msw/dialog.cpp
+++ b/src/msw/dialog.cpp
@@ -26,6 +26,8 @@
 #include "wx/frame.h"
 #include "wx/app.h"
 #include "wx/settings.h"
 #include "wx/frame.h"
 #include "wx/app.h"
 #include "wx/settings.h"

+#include "wx/intl.h"
+#include "wx/log.h"

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


@@ -40,8 +42,8 @@
 
 // Lists to keep track of windows, so we can disable/enable them
 // for modal dialogs
 
 // Lists to keep track of windows, so we can disable/enable them
 // for modal dialogs

-wxList wxModalDialogs;
-wxList wxModelessWindows;  // Frames and modeless dialogs
+wxWindowList wxModalDialogs;
+wxWindowList wxModelessWindows;  // Frames and modeless dialogs

 extern wxList WXDLLEXPORT wxPendingDelete;
 
 #if !USE_SHARED_LIBRARY
 extern wxList WXDLLEXPORT wxPendingDelete;
 
 #if !USE_SHARED_LIBRARY


@@ -58,12 +60,7 @@ extern wxList WXDLLEXPORT wxPendingDelete;
     END_EVENT_TABLE()
 #endif
 
     END_EVENT_TABLE()
 #endif
 

-bool wxDialog::MSWOnClose(void)
-{
-    return Close();
-}
-
-wxDialog::wxDialog(void)
+wxDialog::wxDialog()

 {
   m_isShown = FALSE;
   m_modalShowing = FALSE;
 {
   m_isShown = FALSE;
   m_modalShowing = FALSE;


@@ -125,13 +122,13 @@ bool wxDialog::Create(wxWindow *parent, wxWindowID id,
     // Allows creation of dialogs with & without captions under MSWindows,
     // resizeable or not (but a resizeable dialog always has caption -
     // otherwise it would look too strange)
     // Allows creation of dialogs with & without captions under MSWindows,
     // resizeable or not (but a resizeable dialog always has caption -
     // otherwise it would look too strange)

-    const char *dlg;
+    const wxChar *dlg;

     if ( style & wxTHICK_FRAME )
     if ( style & wxTHICK_FRAME )

-        dlg = "wxResizeableDialog";
+        dlg = _T("wxResizeableDialog");

     else if ( style & wxCAPTION )
     else if ( style & wxCAPTION )

-        dlg = "wxCaptionDialog";
+        dlg = _T("wxCaptionDialog");

     else
     else

-        dlg = "wxNoCaptionDialog";
+        dlg = _T("wxNoCaptionDialog");

     MSWCreate(m_windowId, parent, NULL, this, NULL,
               x, y, width, height,
               0, // style is not used if we have dlg template
     MSWCreate(m_windowId, parent, NULL, this, NULL,
               x, y, width, height,
               0, // style is not used if we have dlg template


@@ -174,9 +171,10 @@ wxDialog::~wxDialog()
 
   wxTopLevelWindows.DeleteObject(this);
 
 
   wxTopLevelWindows.DeleteObject(this);
 

+  Show(FALSE);
+

   if (m_modalShowing)
   {
   if (m_modalShowing)
   {

-    Show(FALSE);

     // For some reason, wxWindows can activate another task altogether
     // when a frame is destroyed after a modal dialog has been invoked.
     // Try to bring the parent to the top.
     // For some reason, wxWindows can activate another task altogether
     // when a frame is destroyed after a modal dialog has been invoked.
     // Try to bring the parent to the top.


@@ -188,14 +186,10 @@ wxDialog::~wxDialog()
   }
 
   m_modalShowing = FALSE;
   }
 
   m_modalShowing = FALSE;

-  if ( GetHWND() )
-    ShowWindow((HWND) GetHWND(), SW_HIDE);

 
   if ( (GetWindowStyleFlag() & wxDIALOG_MODAL) != wxDIALOG_MODAL )
     wxModelessWindows.DeleteObject(this);
 
 
   if ( (GetWindowStyleFlag() & wxDIALOG_MODAL) != wxDIALOG_MODAL )
     wxModelessWindows.DeleteObject(this);
 

-  UnsubclassWin();
-

   // If this is the last top-level window, exit.
   if (wxTheApp && (wxTopLevelWindows.Number() == 0))
   {
   // If this is the last top-level window, exit.
   if (wxTheApp && (wxTopLevelWindows.Number() == 0))
   {


@@ -235,7 +229,7 @@ void wxDialog::OnPaint(wxPaintEvent& event)
 //  wxWindow::OnPaint(event);
 }
 
 //  wxWindow::OnPaint(event);
 }
 

-void wxDialog::Fit(void)
+void wxDialog::Fit()

 {
   wxWindow::Fit();
 }
 {
   wxWindow::Fit();
 }


@@ -245,7 +239,7 @@ void wxDialog::Iconize(bool WXUNUSED(iconize))
   // Windows dialog boxes can't be iconized
 }
 
   // Windows dialog boxes can't be iconized
 }
 

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

 {
   return FALSE;
 }
 {
   return FALSE;
 }


@@ -282,7 +276,7 @@ void wxDialog::GetPosition(int *x, int *y) const
   *y = rect.top;
 }
 
   *y = rect.top;
 }
 

-bool wxDialog::IsShown(void) const
+bool wxDialog::IsShown() const

 {
   return m_isShown;
 }
 {
   return m_isShown;
 }


@@ -299,13 +293,13 @@ bool wxDialog::Show(bool show)
 #if WXGARBAGE_COLLECTION_ON /* MATTHEW: GC */
   if (!modal) {
     if (show) {
 #if WXGARBAGE_COLLECTION_ON /* MATTHEW: GC */
   if (!modal) {
     if (show) {

-      if (!wxModelessWindows.Member(this))
-  wxModelessWindows.Append(this);
+      if (!wxModelessWindows.Find(this))
+        wxModelessWindows.Append(this);

     } else
       wxModelessWindows.DeleteObject(this);
   }
   if (show) {
     } else
       wxModelessWindows.DeleteObject(this);
   }
   if (show) {

-    if (!wxTopLevelWindows.Member(this))
+    if (!wxTopLevelWindows.Find(this))

       wxTopLevelWindows.Append(this);
   } else
     wxTopLevelWindows.DeleteObject(this);
       wxTopLevelWindows.Append(this);
   } else
     wxTopLevelWindows.DeleteObject(this);


@@ -315,7 +309,13 @@ bool wxDialog::Show(bool show)
   {
     if (show)
     {
   {
     if (show)
     {

-      m_hwndOldFocus = (WXHWND)::GetFocus();
+      // find the top level window which had focus before - we will restore
+      // focus to it later
+      m_hwndOldFocus = 0;
+      for ( HWND hwnd = ::GetFocus(); hwnd; hwnd = ::GetParent(hwnd) )
+      {
+        m_hwndOldFocus = (WXHWND)hwnd;
+      }

 
       if (m_modalShowing)
       {
 
       if (m_modalShowing)
       {


@@ -355,13 +355,13 @@ bool wxDialog::Show(bool show)
       EnableWindow((HWND) GetHWND(), TRUE);
       BringWindowToTop((HWND) GetHWND());
 
       EnableWindow((HWND) GetHWND(), TRUE);
       BringWindowToTop((HWND) GetHWND());
 

-      if (!wxModalDialogs.Member(this))
+      if ( !wxModalDialogs.Find(this) )

         wxModalDialogs.Append(this);
 
       MSG msg;
       // Must test whether this dialog still exists: we may not process
       // a message before the deletion.
         wxModalDialogs.Append(this);
 
       MSG msg;
       // Must test whether this dialog still exists: we may not process
       // a message before the deletion.

-      while (wxModalDialogs.Member(this) && m_modalShowing && GetMessage(&msg, NULL, 0, 0))
+      while (wxModalDialogs.Find(this) && m_modalShowing && GetMessage(&msg, NULL, 0, 0))

       {
         if ( m_acceleratorTable.Ok() &&
              ::TranslateAccelerator((HWND)GetHWND(),
       {
         if ( m_acceleratorTable.Ok() &&
              ::TranslateAccelerator((HWND)GetHWND(),


@@ -394,7 +394,7 @@ bool wxDialog::Show(bool show)
       node=disabledWindows.First();
       while(node) {
         wxWindow* win = (wxWindow*) node->Data();
       node=disabledWindows.First();
       while(node) {
         wxWindow* win = (wxWindow*) node->Data();

-        if (wxModalDialogs.Member(win) || wxModelessWindows.Member(win))
+        if (wxModalDialogs.Find(win) || wxModelessWindows.Find(win))

         {
           HWND hWnd = (HWND) win->GetHWND();
           if (::IsWindow(hWnd))
         {
           HWND hWnd = (HWND) win->GetHWND();
           if (::IsWindow(hWnd))


@@ -477,10 +477,10 @@ bool wxDialog::Show(bool show)
 
 void wxDialog::SetTitle(const wxString& title)
 {
 
 void wxDialog::SetTitle(const wxString& title)
 {

-  SetWindowText((HWND) GetHWND(), (const char *)title);
+  SetWindowText((HWND) GetHWND(), title.c_str());

 }
 
 }
 

-wxString wxDialog::GetTitle(void) const
+wxString wxDialog::GetTitle() const

 {
   GetWindowText((HWND) GetHWND(), wxBuffer, 1000);
   return wxString(wxBuffer);
 {
   GetWindowText((HWND) GetHWND(), wxBuffer, 1000);
   return wxString(wxBuffer);


@@ -516,7 +516,7 @@ void wxDialog::Centre(int direction)
 }
 
 // Replacement for Show(TRUE) for modal dialogs - returns return code
 }
 
 // Replacement for Show(TRUE) for modal dialogs - returns return code

-int wxDialog::ShowModal(void)
+int wxDialog::ShowModal()

 {
   m_windowStyle |= wxDIALOG_MODAL;
   Show(TRUE);
 {
   m_windowStyle |= wxDIALOG_MODAL;
   Show(TRUE);


@@ -605,7 +605,7 @@ void wxDialog::OnCloseWindow(wxCloseEvent& event)
 }
 
 // Destroy the window (delayed, if a managed window)
 }
 
 // Destroy the window (delayed, if a managed window)

-bool wxDialog::Destroy(void)
+bool wxDialog::Destroy()

 {
   if (!wxPendingDelete.Member(this))
     wxPendingDelete.Append(this);
 {
   if (!wxPendingDelete.Member(this))
     wxPendingDelete.Append(this);


@@ -616,7 +616,8 @@ void wxDialog::OnSize(wxSizeEvent& WXUNUSED(event))
 {
   // if we're using constraints - do use them
   #if wxUSE_CONSTRAINTS
 {
   // if we're using constraints - do use them
   #if wxUSE_CONSTRAINTS

-    if ( GetAutoLayout() ) {
+    if ( GetAutoLayout() )
+    {

       Layout();
     }
   #endif
       Layout();
     }
   #endif


@@ -631,3 +632,27 @@ void wxDialog::OnSysColourChanged(wxSysColourChangedEvent& event)
   Refresh();
 #endif
 }
   Refresh();
 #endif
 }

+
+// ---------------------------------------------------------------------------
+// dialog window proc
+// ---------------------------------------------------------------------------
+
+long wxDialog::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
+{
+    long rc = 0;
+    bool processed = FALSE;
+
+    switch ( message )
+    {
+        case WM_CLOSE:
+            // if we can't close, tell the system that we processed the
+            // message - otherwise it would close us
+            processed = !Close();
+            break;
+    }
+
+    if ( !processed )
+        rc = wxWindow::MSWWindowProc(message, wParam, lParam);
+
+    return rc;
+}