another segfault fix

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

diff --git a/src/msw/colordlg.cpp b/src/msw/colordlg.cpp
index 3480911ad955be934d8f5b1a729fcdb673d597f7..494928bb644bffb4a7693e49812fd9da1a875175 100644 (file)
--- a/src/msw/colordlg.cpp
+++ b/src/msw/colordlg.cpp
@@ -72,7 +72,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxColourDialog, wxDialog)
 
 UINT CALLBACK wxColourDialogHookProc(HWND hwnd,
                                      UINT uiMsg,
 
 UINT CALLBACK wxColourDialogHookProc(HWND hwnd,
                                      UINT uiMsg,

-                                     WPARAM wParam,
+                                     WPARAM WXUNUSED(wParam),

                                      LPARAM lParam)
 {
     if ( uiMsg == WM_INITDIALOG )
                                      LPARAM lParam)
 {
     if ( uiMsg == WM_INITDIALOG )


@@ -128,8 +128,8 @@ int wxColourDialog::ShowModal()
     chooseColorStruct.lCustData = (LPARAM)this;
     chooseColorStruct.lpfnHook = wxColourDialogHookProc;
 
     chooseColorStruct.lCustData = (LPARAM)this;
     chooseColorStruct.lpfnHook = wxColourDialogHookProc;
 

-    if (!m_colourData.GetChooseFull())
-      chooseColorStruct.Flags |= CC_PREVENTFULLOPEN;
+    if (m_colourData.GetChooseFull())
+        chooseColorStruct.Flags |= CC_FULLOPEN;

 
     // Do the modal dialog
     bool success = ::ChooseColor(&(chooseColorStruct)) != 0;
 
     // Do the modal dialog
     bool success = ::ChooseColor(&(chooseColorStruct)) != 0;