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 eb8936211d0f5935bbd8d903aba7ca9b8b692578..75a63ecef63ea1de277c374f58e7b5475e21c7d1 100644 (file)
--- a/src/msw/colordlg.cpp
+++ b/src/msw/colordlg.cpp
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "colordlg.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -28,31 +24,23 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_COLOURDLG && !(defined(__SMARTPHONE__) && defined(__WXWINCE__))
+
+#include "wx/colordlg.h"
+
 #ifndef WX_PRECOMP
+    #include "wx/msw/wrapcdlg.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/frame.h"
     #include "wx/dialog.h"
-    #include "wx/msgdlg.h"
+    #include "wx/cmndata.h"
+    #include "wx/math.h"
 #endif
 
-#if wxUSE_COLOURDLG && !defined(__SMARTPHONE__)
-
 #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>
 
@@ -81,7 +69,7 @@ wxColourDialogHookProc(HWND hwnd,
         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 )
@@ -231,4 +219,4 @@ void wxColourDialog::DoGetClientSize(int *width, int *height) const
         *height = 299;
 }
 
-#endif
+#endif // wxUSE_COLOURDLG && !(__SMARTPHONE__ && __WXWINCE__)