X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..1ffeecf7a90f620c9a194a138bc84db17fdd18e0:/src/msw/colordlg.cpp diff --git a/src/msw/colordlg.cpp b/src/msw/colordlg.cpp index e1eea31a00..75a63ecef6 100644 --- a/src/msw/colordlg.cpp +++ b/src/msw/colordlg.cpp @@ -24,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 @@ -69,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 )