reverted wxSocket changes of rev 48723 as they broke linking under non-Unix systems

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

diff --git a/src/msw/colordlg.cpp b/src/msw/colordlg.cpp
index 3e9571bc9e4f9750f05b012a0d7ebfbd3c8a7957..75a63ecef63ea1de277c374f58e7b5475e21c7d1 100644 (file)
--- a/src/msw/colordlg.cpp
+++ b/src/msw/colordlg.cpp
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
-    #pragma implementation "colordlg.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -28,31 +24,23 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_COLOURDLG && !(defined(__SMARTPHONE__) && defined(__WXWINCE__))
+
+#include "wx/colordlg.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

+    #include "wx/msw/wrapcdlg.h"

     #include <stdio.h>
     #include <stdio.h>

-    #include "wx/defs.h"
-    #include "wx/bitmap.h"
-    #include "wx/pen.h"
-    #include "wx/brush.h"

     #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/frame.h"

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

-    #include "wx/msgdlg.h"
+    #include "wx/cmndata.h"
+    #include "wx/math.h"

 #endif
 
 #endif
 

-#if wxUSE_COLOURDLG
-

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

-#include "wx/colordlg.h"
-#include "wx/cmndata.h"
-
-#if !defined(__WIN32__) || defined(__WXWINCE__)
-    #include <commdlg.h>
-#endif

 
 

-#include <math.h>

 #include <stdlib.h>
 #include <string.h>
 
 #include <stdlib.h>
 #include <string.h>
 


@@ -70,17 +58,18 @@ IMPLEMENT_DYNAMIC_CLASS(wxColourDialog, wxDialog)
 // colour dialog hook proc
 // ----------------------------------------------------------------------------
 
 // colour dialog hook proc
 // ----------------------------------------------------------------------------
 

-UINT CALLBACK wxColourDialogHookProc(HWND hwnd,
-                                     UINT uiMsg,
-                                     WPARAM WXUNUSED(wParam),
-                                     LPARAM lParam)
+UINT_PTR CALLBACK
+wxColourDialogHookProc(HWND hwnd,
+                       UINT uiMsg,
+                       WPARAM WXUNUSED(wParam),
+                       LPARAM lParam)

 {
     if ( uiMsg == WM_INITDIALOG )
     {
         CHOOSECOLOR *pCC = (CHOOSECOLOR *)lParam;
         wxColourDialog *dialog = (wxColourDialog *)pCC->lCustData;
 
 {
     if ( uiMsg == WM_INITDIALOG )
     {
         CHOOSECOLOR *pCC = (CHOOSECOLOR *)lParam;
         wxColourDialog *dialog = (wxColourDialog *)pCC->lCustData;
 

-        ::SetWindowText(hwnd, dialog->GetTitle());
+        ::SetWindowText(hwnd, dialog->GetTitle().wx_str());

 
         wxPoint pos = dialog->GetPosition();
         if ( pos != wxDefaultPosition )
 
         wxPoint pos = dialog->GetPosition();
         if ( pos != wxDefaultPosition )


@@ -116,7 +105,7 @@ bool wxColourDialog::Create(wxWindow *parent, wxColourData *data)
     if (data)
         m_colourData = *data;
 
     if (data)
         m_colourData = *data;
 

-    return TRUE;
+    return true;

 }
 
 int wxColourDialog::ShowModal()
 }
 
 int wxColourDialog::ShowModal()


@@ -127,7 +116,12 @@ int wxColourDialog::ShowModal()
 
     int i;
     for (i = 0; i < 16; i++)
 
     int i;
     for (i = 0; i < 16; i++)

-      custColours[i] = wxColourToRGB(m_colourData.m_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.lStructSize = sizeof(CHOOSECOLOR);
     if ( m_parent )


@@ -146,10 +140,9 @@ int wxColourDialog::ShowModal()
     bool success = ::ChooseColor(&(chooseColorStruct)) != 0;
 
     // Try to highlight the correct window (the parent)
     bool success = ::ChooseColor(&(chooseColorStruct)) != 0;
 
     // Try to highlight the correct window (the parent)

-    HWND hWndParent = 0;

     if (GetParent())
     {
     if (GetParent())
     {

-      hWndParent = (HWND) GetParent()->GetHWND();
+      HWND hWndParent = (HWND) GetParent()->GetHWND();

       if (hWndParent)
         ::BringWindowToTop(hWndParent);
     }
       if (hWndParent)
         ::BringWindowToTop(hWndParent);
     }


@@ -196,10 +189,10 @@ void wxColourDialog::DoSetSize(int x, int y,
                                int WXUNUSED(width), int WXUNUSED(height),
                                int WXUNUSED(sizeFlags))
 {
                                int WXUNUSED(width), int WXUNUSED(height),
                                int WXUNUSED(sizeFlags))
 {

-    if ( x != -1 )
+    if ( x != wxDefaultCoord )

         m_pos.x = x;
 
         m_pos.x = x;
 

-    if ( y != -1 )
+    if ( y != wxDefaultCoord )

         m_pos.y = y;
 
     // ignore the size params - we can't change the size of a standard dialog
         m_pos.y = y;
 
     // ignore the size params - we can't change the size of a standard dialog


@@ -226,4 +219,4 @@ void wxColourDialog::DoGetClientSize(int *width, int *height) const
         *height = 299;
 }
 
         *height = 299;
 }
 

-#endif
+#endif // wxUSE_COLOURDLG && !(__SMARTPHONE__ && __WXWINCE__)