X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d7da7f13eb27c6416b13aab8af4a7431a9ed1d67..69659fd770f615210efac4b4fa741b3ad6223616:/src/msw/colordlg.cpp?ds=sidebyside diff --git a/src/msw/colordlg.cpp b/src/msw/colordlg.cpp index 53eed0cca9..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,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 - #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 -#endif -#include #include #include @@ -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 ) @@ -117,7 +105,7 @@ bool wxColourDialog::Create(wxWindow *parent, wxColourData *data) if (data) m_colourData = *data; - return TRUE; + return true; } int wxColourDialog::ShowModal() @@ -128,7 +116,12 @@ int wxColourDialog::ShowModal() 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 ) @@ -147,10 +140,9 @@ int wxColourDialog::ShowModal() 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); } @@ -197,10 +189,10 @@ void wxColourDialog::DoSetSize(int x, int y, int WXUNUSED(width), int WXUNUSED(height), int WXUNUSED(sizeFlags)) { - if ( x != -1 ) + if ( x != wxDefaultCoord ) 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 @@ -227,4 +219,4 @@ void wxColourDialog::DoGetClientSize(int *width, int *height) const *height = 299; } -#endif +#endif // wxUSE_COLOURDLG && !(__SMARTPHONE__ && __WXWINCE__)