wxMotif Solaris 2.6 compilation fixes

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

diff --git a/src/msw/dialog.cpp b/src/msw/dialog.cpp
index 59f74d78c3edb12c16ae30e4cec73255db066209..6b335758d2d6df6eb17afc34a3804fea1ed1a650 100644 (file)
--- a/src/msw/dialog.cpp
+++ b/src/msw/dialog.cpp
@@ -29,8 +29,9 @@
 #endif
 
 #include "wx/msw/private.h"
 #endif
 
 #include "wx/msw/private.h"

+#include "wx/log.h"

 
 

-#if USE_COMMON_DIALOGS
+#if wxUSE_COMMON_DIALOGS

 #include <commdlg.h>
 #endif
 
 #include <commdlg.h>
 #endif
 


@@ -41,32 +42,22 @@
 // for modal dialogs
 wxList wxModalDialogs;
 wxList wxModelessWindows;  // Frames and modeless dialogs
 // for modal dialogs
 wxList wxModalDialogs;
 wxList wxModelessWindows;  // Frames and modeless dialogs

-extern wxList wxPendingDelete;
+extern wxList WXDLLEXPORT wxPendingDelete;

 
 #if !USE_SHARED_LIBRARY
 
 #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()
-
+    IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxPanel)
+
+    BEGIN_EVENT_TABLE(wxDialog, wxPanel)
+        EVT_SIZE(wxDialog::OnSize)
+        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()

 #endif
 
 #endif
 

-long wxDialog::MSWDefWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
-{
-  return ::CallWindowProc((FARPROC)m_oldWndProc, (HWND) GetHWND(), (UINT) nMsg, (WPARAM) wParam, (LPARAM) lParam);
-}
-
-bool wxDialog::MSWProcessMessage(WXMSG* pMsg)
-{
-  return (::IsDialogMessage((HWND) GetHWND(), (MSG*)pMsg) != 0);
-}
-

 bool wxDialog::MSWOnClose(void)
 {
     return Close();
 bool wxDialog::MSWOnClose(void)
 {
     return Close();


@@ -78,70 +69,86 @@ wxDialog::wxDialog(void)
   m_modalShowing = FALSE;
 
   SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
   m_modalShowing = FALSE;
 
   SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));

-  SetDefaultBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));

 }
 
 bool wxDialog::Create(wxWindow *parent, wxWindowID id,
 }
 
 bool wxDialog::Create(wxWindow *parent, wxWindowID id,

-           const wxString& title,
-           const wxPoint& pos,
-           const wxSize& size,
-           long style,
-           const wxString& name)
+                      const wxString& title,
+                      const wxPoint& pos,
+                      const wxSize& size,
+                      long style,
+                      const wxString& name)

 {
 {

-  SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
-  SetDefaultBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
-  SetName(name);
-  
-  if (!parent)
-    wxTopLevelWindows.Append(this);
+    SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
+    SetName(name);
+    
+    if (!parent)
+        wxTopLevelWindows.Append(this);

 
 

-//  windowFont = wxTheFontList->FindOrCreateFont(11, wxSWISS, wxNORMAL, wxNORMAL);
+    //  windowFont = wxTheFontList->FindOrCreateFont(11, wxSWISS, wxNORMAL, wxNORMAL);

 
 

-  if (parent) parent->AddChild(this);
+    if (parent) parent->AddChild(this);

 
 

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

 
 

-  int x = pos.x;
-  int y = pos.y;
-  int width = size.x;
-  int height = size.y;
+    int x = pos.x;
+    int y = pos.y;
+    int width = size.x;
+    int height = size.y;

 
 

-  if (x < 0) x = wxDIALOG_DEFAULT_X;
-  if (y < 0) y = wxDIALOG_DEFAULT_Y;
+    if (x < 0) x = wxDIALOG_DEFAULT_X;
+    if (y < 0) y = wxDIALOG_DEFAULT_Y;

 
 

-  m_windowStyle = style;
+    m_windowStyle = style;

 
 

-  m_isShown = FALSE;
-  m_modalShowing = FALSE;
+    m_isShown = FALSE;
+    m_modalShowing = FALSE;

 
 

-  if (width < 0)
-    width = 500;
-  if (height < 0)
-    height = 500;
+    if (width < 0)
+        width = 500;
+    if (height < 0)
+        height = 500;

 
 

-  WXDWORD extendedStyle = MakeExtendedStyle(m_windowStyle);
-  if (m_windowStyle & wxSTAY_ON_TOP)
-    extendedStyle |= WS_EX_TOPMOST;
+    // All dialogs should really have this style
+    m_windowStyle |= wxTAB_TRAVERSAL;

 
 

-  // Allows creation of dialogs with & without captions under MSWindows
-  if(style & wxCAPTION){
-    MSWCreate(m_windowId, (wxWindow *)parent, NULL, this, NULL, x, y, width, height, 0, "wxCaptionDialog",
-    extendedStyle);
-  }
-  else{
-    MSWCreate(m_windowId, (wxWindow *)parent, NULL, this, NULL, x, y, width, height, 0, "wxNoCaptionDialog",
-    extendedStyle);
-  }
+    WXDWORD extendedStyle = MakeExtendedStyle(m_windowStyle);
+    if (m_windowStyle & wxSTAY_ON_TOP)
+        extendedStyle |= WS_EX_TOPMOST;
+
+    // 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;
+    if ( style & wxTHICK_FRAME )
+        dlg = "wxResizeableDialog";
+    else if ( style & wxCAPTION )
+        dlg = "wxCaptionDialog";
+    else
+        dlg = "wxNoCaptionDialog";
+    MSWCreate(m_windowId, parent, NULL, this, NULL,
+              x, y, width, height,
+              0, // style is not used if we have dlg template
+              dlg,
+              extendedStyle);

 
 

-  SubclassWin(GetHWND());
+    HWND hwnd = (HWND)GetHWND();

 
 

-  SetWindowText((HWND) GetHWND(), (const char *)title);
-  SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
+    if ( !hwnd )
+    {
+        wxLogError(_("Failed to created dialog."));

 
 

-  return TRUE;
+        return FALSE;
+    }
+
+    SubclassWin(GetHWND());
+    
+    SetWindowText(hwnd, title);
+    SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
+
+    return TRUE;

 }
 
 void wxDialog::SetModal(bool flag)
 }
 
 void wxDialog::SetModal(bool flag)


@@ -204,13 +211,13 @@ void wxDialog::OnCharHook(wxKeyEvent& event)
   {
     if (event.m_keyCode == WXK_ESCAPE)
     {
   {
     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);
+        // 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;
+        return;

     }
   }
   // We didn't process this event.
     }
   }
   // We didn't process this event.


@@ -239,16 +246,11 @@ bool wxDialog::IsIconized(void) const
   return FALSE;
 }
 
   return FALSE;
 }
 

-void wxDialog::SetSize(int x, int y, int width, int height, int WXUNUSED(sizeFlags))
-{
-  wxWindow::SetSize(x, y, width, height);
-}
-
-void wxDialog::SetClientSize(int width, int height)
+void wxDialog::DoSetClientSize(int width, int height)

 {
   HWND hWnd = (HWND) GetHWND();
   RECT rect;
 {
   HWND hWnd = (HWND) GetHWND();
   RECT rect;

-  GetClientRect(hWnd, &rect);
+  ::GetClientRect(hWnd, &rect);

 
   RECT rect2;
   GetWindowRect(hWnd, &rect2);
 
   RECT rect2;
   GetWindowRect(hWnd, &rect2);


@@ -311,7 +313,6 @@ bool wxDialog::Show(bool show)
     {
       m_hwndOldFocus = (WXHWND)::GetFocus();
 
     {
       m_hwndOldFocus = (WXHWND)::GetFocus();
 

-      wxList DisabledWindows;

       if (m_modalShowing)
       {
         BringWindowToTop((HWND) GetHWND());
       if (m_modalShowing)
       {
         BringWindowToTop((HWND) GetHWND());


@@ -327,6 +328,13 @@ bool wxDialog::Show(bool show)
           ::EnableWindow((HWND) box->GetHWND(), FALSE);
         node = node->Next();
       }
           ::EnableWindow((HWND) box->GetHWND(), FALSE);
         node = node->Next();
       }

+
+      // if we don't do it, some window might be deleted while we have pointers
+      // to them in our disabledWindows list and the program will crash when it
+      // will try to reenable them after the modal dialog end
+      wxTheApp->DeletePendingObjects();
+      wxList disabledWindows;
+

       node = wxModelessWindows.First();
       while (node)
       {
       node = wxModelessWindows.First();
       while (node)
       {


@@ -334,7 +342,7 @@ bool wxDialog::Show(bool show)
         if (::IsWindowEnabled((HWND) win->GetHWND()))
         {
           ::EnableWindow((HWND) win->GetHWND(), FALSE);
         if (::IsWindowEnabled((HWND) win->GetHWND()))
         {
           ::EnableWindow((HWND) win->GetHWND(), FALSE);

-          DisabledWindows.Append(win);
+          disabledWindows.Append(win);

         }
         node = node->Next();
       }
         }
         node = node->Next();
       }


@@ -351,11 +359,22 @@ bool wxDialog::Show(bool show)
       // a message before the deletion.
       while (wxModalDialogs.Member(this) && m_modalShowing && GetMessage(&msg, NULL, 0, 0))
       {
       // a message before the deletion.
       while (wxModalDialogs.Member(this) && m_modalShowing && GetMessage(&msg, NULL, 0, 0))
       {

-        if (!IsDialogMessage((HWND) GetHWND(), &msg))
+        if ( m_acceleratorTable.Ok() &&
+             ::TranslateAccelerator((HWND)GetHWND(),
+                                     (HACCEL)m_acceleratorTable.GetHACCEL(),
+                                     &msg) )
+        {
+            // Have processed the message
+        }
+        else if ( !wxTheApp->ProcessMessage((WXMSG *)&msg) )

         {
           TranslateMessage(&msg);
           DispatchMessage(&msg);
         }
         {
           TranslateMessage(&msg);
           DispatchMessage(&msg);
         }

+
+        // If we get crashes (as per George Tasker's message) with nested modal dialogs,
+        // we should try removing the m_modalShowing test
+

         if (m_modalShowing && !::PeekMessage(&msg, 0, 0, 0, PM_NOREMOVE))
         // dfgg: NB MUST test m_modalShowing again as the message loop could have triggered
         //       a Show(FALSE) in the mean time!!!
         if (m_modalShowing && !::PeekMessage(&msg, 0, 0, 0, PM_NOREMOVE))
         // dfgg: NB MUST test m_modalShowing again as the message loop could have triggered
         //       a Show(FALSE) in the mean time!!!


@@ -368,12 +387,15 @@ bool wxDialog::Show(bool show)
          }
       }
       // dfgg: now must specifically re-enable all other app windows that we disabled earlier
          }
       }
       // dfgg: now must specifically re-enable all other app windows that we disabled earlier

-      node=DisabledWindows.First();
+      node=disabledWindows.First();

       while(node) {
         wxWindow* win = (wxWindow*) node->Data();
       while(node) {
         wxWindow* win = (wxWindow*) node->Data();

-        HWND hWnd = (HWND) win->GetHWND();
-        if (::IsWindow(hWnd) && (wxModalDialogs.Member(win) || wxModelessWindows.Member(win) ))
-          ::EnableWindow(hWnd,TRUE);
+        if (wxModalDialogs.Member(win) || wxModelessWindows.Member(win))
+        {
+          HWND hWnd = (HWND) win->GetHWND();
+          if (::IsWindow(hWnd))
+            ::EnableWindow(hWnd,TRUE);
+        }

         node=node->Next();
       }
     }
         node=node->Next();
       }
     }


@@ -459,27 +481,19 @@ void wxDialog::Centre(int direction)
   int x_offset,y_offset ;
   int display_width, display_height;
   int  width, height, x, y;
   int x_offset,y_offset ;
   int display_width, display_height;
   int  width, height, x, y;

-  wxFrame *frame ;
-  if (direction & wxCENTER_FRAME)
+  wxWindow *parent = GetParent();
+  if ((direction & wxCENTER_FRAME) && parent)

   {
   {

-    frame = (wxFrame*)GetParent() ;
-    if (frame)
-    {
-      frame->GetPosition(&x_offset,&y_offset) ;
-      frame->GetSize(&display_width,&display_height) ;
-    }
+      parent->GetPosition(&x_offset,&y_offset) ;
+      parent->GetSize(&display_width,&display_height) ;

   }
   else
   }
   else

-    frame = NULL ;
-
-  if (frame==NULL)

   {
     wxDisplaySize(&display_width, &display_height);
     x_offset = 0 ;
     y_offset = 0 ;
   }
 
   {
     wxDisplaySize(&display_width, &display_height);
     x_offset = 0 ;
     y_offset = 0 ;
   }
 

-

   GetSize(&width, &height);
   GetPosition(&x, &y);
 
   GetSize(&width, &height);
   GetPosition(&x, &y);
 


@@ -509,7 +523,7 @@ void wxDialog::EndModal(int retCode)
 WXHBRUSH wxDialog::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
       WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
 {
 WXHBRUSH wxDialog::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
       WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
 {

-#if CTL3D
+#if wxUSE_CTL3D

   HBRUSH hbrush = Ctl3dCtlColorEx(message, wParam, lParam);
   return (WXHBRUSH) hbrush;
 #else
   HBRUSH hbrush = Ctl3dCtlColorEx(message, wParam, lParam);
   return (WXHBRUSH) hbrush;
 #else


@@ -526,8 +540,8 @@ void wxDialog::OnOK(wxCommandEvent& event)
             EndModal(wxID_OK);
         else
         {
             EndModal(wxID_OK);
         else
         {

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

         }
   }
 }
         }
   }
 }


@@ -546,39 +560,38 @@ void wxDialog::OnCancel(wxCommandEvent& event)
     else
     {
         SetReturnCode(wxID_CANCEL);
     else
     {
         SetReturnCode(wxID_CANCEL);

-    this->Show(FALSE);
+        this->Show(FALSE);

     }
 }
 
     }
 }
 

-bool wxDialog::OnClose(void)
+void wxDialog::OnCloseWindow(wxCloseEvent& event)

 {
 {

-  // Behaviour changed in 2.0: we'll send a Cancel message by default,
+    // We'll send a Cancel message by default,

     // which may close the dialog.
     // which may close the dialog.

-    // Check for looping if the Cancel event handler calls Close()
+    // 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.

 
     static wxList closing;
 
     static wxList closing;

-
+    

     if ( closing.Member(this) )
     if ( closing.Member(this) )

-        return FALSE;
-
+        return;
+    

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

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

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

-
-  return FALSE;
-}
-
-void wxDialog::OnCloseWindow(wxCloseEvent& event)
-{
-    // Compatibility
-    if ( GetEventHandler()->OnClose() || event.GetForce())
-    {
-        this->Destroy();
-    }

 }
 
 // Destroy the window (delayed, if a managed window)
 }
 
 // Destroy the window (delayed, if a managed window)


@@ -589,19 +602,22 @@ bool wxDialog::Destroy(void)
   return TRUE;
 }
 
   return TRUE;
 }
 

+void wxDialog::OnSize(wxSizeEvent& WXUNUSED(event))
+{
+  // if we're using constraints - do use them
+  #if wxUSE_CONSTRAINTS
+    if ( GetAutoLayout() ) {
+      Layout();
+    }
+  #endif
+}
+

 void wxDialog::OnSysColourChanged(wxSysColourChangedEvent& event)
 {
 void wxDialog::OnSysColourChanged(wxSysColourChangedEvent& event)
 {

-#if CTL3D
+#if wxUSE_CTL3D

   Ctl3dColorChange();
 #else
   SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
   Ctl3dColorChange();
 #else
   SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));

-  SetDefaultBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));

   Refresh();
 #endif
   Refresh();
 #endif

-}
-
-long wxDialog::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
-{
-  return wxWindow::MSWWindowProc(message, wParam, lParam);
-}
-
+}
\ No newline at end of file