no_rtti fix was not having correct eval order

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

diff --git a/src/msw/colordlg.cpp b/src/msw/colordlg.cpp
index 3480911ad955be934d8f5b1a729fcdb673d597f7..cc836963a9b9a775f7d7aee8cd917c2b4d5511a2 100644 (file)
--- a/src/msw/colordlg.cpp
+++ b/src/msw/colordlg.cpp
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
+// Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "colordlg.h"
 #endif
 
@@ -42,17 +42,17 @@
     #include "wx/msgdlg.h"
 #endif
 
-#include <windows.h>
-
-#if !defined(__WIN32__) || defined(__SALFORDC__) || defined(__WXWINE__)
-    #include <commdlg.h>
-#endif
+#if wxUSE_COLOURDLG && !(defined(__SMARTPHONE__) && defined(__WXWINCE__))
 
 #include "wx/msw/private.h"
 #include "wx/colordlg.h"
 #include "wx/cmndata.h"
+#include "wx/math.h"
+
+#if !defined(__WIN32__) || defined(__WXWINCE__)
+    #include <commdlg.h>
+#endif
 
-#include <math.h>
 #include <stdlib.h>
 #include <string.h>
 
@@ -70,10 +70,11 @@ IMPLEMENT_DYNAMIC_CLASS(wxColourDialog, wxDialog)
 // colour dialog hook proc
 // ----------------------------------------------------------------------------
 
-UINT CALLBACK wxColourDialogHookProc(HWND hwnd,
-                                     UINT uiMsg,
-                                     WPARAM wParam,
-                                     LPARAM lParam)
+UINT_PTR CALLBACK
+wxColourDialogHookProc(HWND hwnd,
+                       UINT uiMsg,
+                       WPARAM WXUNUSED(wParam),
+                       LPARAM lParam)
 {
     if ( uiMsg == WM_INITDIALOG )
     {
@@ -81,6 +82,14 @@ UINT CALLBACK wxColourDialogHookProc(HWND hwnd,
         wxColourDialog *dialog = (wxColourDialog *)pCC->lCustData;
 
         ::SetWindowText(hwnd, dialog->GetTitle());
+
+        wxPoint pos = dialog->GetPosition();
+        if ( pos != wxDefaultPosition )
+        {
+            ::SetWindowPos(hwnd, NULL /* Z-order: ignored */,
+                           pos.x, pos.y, -1, -1,
+                           SWP_NOSIZE | SWP_NOZORDER);
+        }
     }
 
     return 0;
@@ -92,10 +101,13 @@ UINT CALLBACK wxColourDialogHookProc(HWND hwnd,
 
 wxColourDialog::wxColourDialog()
 {
+    m_pos = wxDefaultPosition;
 }
 
 wxColourDialog::wxColourDialog(wxWindow *parent, wxColourData *data)
 {
+    m_pos = wxDefaultPosition;
+
     Create(parent, data);
 }
 
@@ -105,7 +117,7 @@ bool wxColourDialog::Create(wxWindow *parent, wxColourData *data)
     if (data)
         m_colourData = *data;
 
-    return TRUE;
+    return true;
 }
 
 int wxColourDialog::ShowModal()
@@ -116,29 +128,33 @@ int wxColourDialog::ShowModal()
 
     int i;
     for (i = 0; i < 16; i++)
-      custColours[i] = wxColourToRGB(m_colourData.custColours[i]);
+    {
+        if (m_colourData.m_custColours[i].Ok())
+            custColours[i] = wxColourToRGB(m_colourData.m_custColours[i]);
+        else
+            custColours[i] = RGB(255,255,255);
+    }
 
     chooseColorStruct.lStructSize = sizeof(CHOOSECOLOR);
     if ( m_parent )
         chooseColorStruct.hwndOwner = GetHwndOf(m_parent);
-    chooseColorStruct.rgbResult = wxColourToRGB(m_colourData.dataColour);
+    chooseColorStruct.rgbResult = wxColourToRGB(m_colourData.m_dataColour);
     chooseColorStruct.lpCustColors = custColours;
 
     chooseColorStruct.Flags = CC_RGBINIT | CC_ENABLEHOOK;
     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;
 
     // Try to highlight the correct window (the parent)
-    HWND hWndParent = 0;
     if (GetParent())
     {
-      hWndParent = (HWND) GetParent()->GetHWND();
+      HWND hWndParent = (HWND) GetParent()->GetHWND();
       if (hWndParent)
         ::BringWindowToTop(hWndParent);
     }
@@ -147,10 +163,10 @@ int wxColourDialog::ShowModal()
     // Restore values
     for (i = 0; i < 16; i++)
     {
-      wxRGBToColour(m_colourData.custColours[i], custColours[i]);
+      wxRGBToColour(m_colourData.m_custColours[i], custColours[i]);
     }
 
-    wxRGBToColour(m_colourData.dataColour, chooseColorStruct.rgbResult);
+    wxRGBToColour(m_colourData.m_dataColour, chooseColorStruct.rgbResult);
 
     return success ? wxID_OK : wxID_CANCEL;
 }
@@ -164,7 +180,7 @@ void wxColourDialog::SetTitle(const wxString& title)
     m_title = title;
 }
 
-wxString wxColourDialog::GetTitle()
+wxString wxColourDialog::GetTitle() const
 {
     return m_title;
 }
@@ -173,11 +189,25 @@ wxString wxColourDialog::GetTitle()
 // position/size
 // ----------------------------------------------------------------------------
 
-void wxColourDialog::DoSetSize(int WXUNUSED(x), int WXUNUSED(y),
+void wxColourDialog::DoGetPosition(int *x, int *y) const
+{
+    if ( x )
+        *x = m_pos.x;
+    if ( y )
+        *y = m_pos.y;
+}
+
+void wxColourDialog::DoSetSize(int x, int y,
                                int WXUNUSED(width), int WXUNUSED(height),
                                int WXUNUSED(sizeFlags))
 {
-    // ignore - we can't change the size of this standard dialog
+    if ( x != wxDefaultCoord )
+        m_pos.x = x;
+
+    if ( y != wxDefaultCoord )
+        m_pos.y = y;
+
+    // ignore the size params - we can't change the size of a standard dialog
     return;
 }
 
@@ -200,3 +230,5 @@ void wxColourDialog::DoGetClientSize(int *width, int *height) const
     if ( height )
         *height = 299;
 }
+
+#endif // wxUSE_COLOURDLG && !(__SMARTPHONE__ && __WXWINCE__)