Don't crash when laying out wxGridBagSizer with only hidden elements.

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

diff --git a/src/msw/colordlg.cpp b/src/msw/colordlg.cpp
index 7a52b05e9da372469b18ae22985c7f15f66030a1..fca709586b9840e95c904ec5f124b8c4bdf62052 100644 (file)
--- a/src/msw/colordlg.cpp
+++ b/src/msw/colordlg.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97

-// RCS-ID:      $Id$

 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -27,6 +26,7 @@
 #if wxUSE_COLOURDLG && !(defined(__SMARTPHONE__) && defined(__WXWINCE__))
 
 #include "wx/colordlg.h"
 #if wxUSE_COLOURDLG && !(defined(__SMARTPHONE__) && defined(__WXWINCE__))
 
 #include "wx/colordlg.h"

+#include "wx/modalhook.h"

 
 #ifndef WX_PRECOMP
     #include "wx/msw/wrapcdlg.h"
 
 #ifndef WX_PRECOMP
     #include "wx/msw/wrapcdlg.h"


@@ -34,8 +34,6 @@
     #include "wx/colour.h"
     #include "wx/gdicmn.h"
     #include "wx/utils.h"
     #include "wx/colour.h"
     #include "wx/gdicmn.h"
     #include "wx/utils.h"

-    #include "wx/dialog.h"
-    #include "wx/cmndata.h"

     #include "wx/math.h"
 #endif
 
     #include "wx/math.h"
 #endif
 


@@ -77,11 +75,11 @@ wxColourDialogHookProc(HWND hwnd,
     {
         CHOOSECOLOR *pCC = (CHOOSECOLOR *)lParam;
         wxColourDialog * const
     {
         CHOOSECOLOR *pCC = (CHOOSECOLOR *)lParam;
         wxColourDialog * const

-            dialog = wx_reinterpret_cast(wxColourDialog *, pCC->lCustData);
+            dialog = reinterpret_cast<wxColourDialog *>(pCC->lCustData);

 
         const wxString title = dialog->GetTitle();
         if ( !title.empty() )
 
         const wxString title = dialog->GetTitle();
         if ( !title.empty() )

-            ::SetWindowText(hwnd, title.wx_str());
+            ::SetWindowText(hwnd, title.t_str());

 
         dialog->MSWOnInitDone((WXHWND)hwnd);
     }
 
         dialog->MSWOnInitDone((WXHWND)hwnd);
     }


@@ -116,6 +114,8 @@ bool wxColourDialog::Create(wxWindow *parent, wxColourData *data)
 
 int wxColourDialog::ShowModal()
 {
 
 int wxColourDialog::ShowModal()
 {

+    WX_HOOK_MODAL_DIALOG();
+

     // initialize the struct used by Windows
     CHOOSECOLOR chooseColorStruct;
     memset(&chooseColorStruct, 0, sizeof(CHOOSECOLOR));
     // initialize the struct used by Windows
     CHOOSECOLOR chooseColorStruct;
     memset(&chooseColorStruct, 0, sizeof(CHOOSECOLOR));


@@ -152,7 +152,9 @@ int wxColourDialog::ShowModal()
         // occurred
         const DWORD err = CommDlgExtendedError();
         if ( err )
         // occurred
         const DWORD err = CommDlgExtendedError();
         if ( err )

+        {

             wxLogError(_("Colour selection dialog failed with error %0lx."), err);
             wxLogError(_("Colour selection dialog failed with error %0lx."), err);

+        }

 
         return wxID_CANCEL;
     }
 
         return wxID_CANCEL;
     }