X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c9429ecf52be4bd2824352a6a40c2b93b130279e..69659fd770f615210efac4b4fa741b3ad6223616:/src/msw/colordlg.cpp?ds=sidebyside diff --git a/src/msw/colordlg.cpp b/src/msw/colordlg.cpp index c364ae2d40..75a63ecef6 100644 --- 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,22 +24,22 @@ #pragma hdrstop #endif +#if wxUSE_COLOURDLG && !(defined(__SMARTPHONE__) && defined(__WXWINCE__)) + +#include "wx/colordlg.h" + #ifndef WX_PRECOMP + #include "wx/msw/wrapcdlg.h" #include - #include "wx/defs.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 -#if wxUSE_COLOURDLG && !(defined(__SMARTPHONE__) && defined(__WXWINCE__)) - #include "wx/msw/private.h" -#include "wx/colordlg.h" -#include "wx/cmndata.h" -#include "wx/math.h" -#include "wx/msw/wrapcdlg.h" #include #include @@ -73,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 )