X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..74a8f67d96591cec101def2a7d47c64072aff7fd:/src/msw/colordlg.cpp?ds=sidebyside diff --git a/src/msw/colordlg.cpp b/src/msw/colordlg.cpp index 53eed0cca9..788f0fae7c 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,34 +24,33 @@ #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/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 +// ---------------------------------------------------------------------------- +// globals +// ---------------------------------------------------------------------------- + +// standard colors dialog size for the Windows systems +// this is ok if color dialog created with standart color +// and "Define Custom Colors" extension not shown +static wxRect gs_rectDialog(0, 0, 222, 324); + // ---------------------------------------------------------------------------- // wxWin macros // ---------------------------------------------------------------------------- @@ -79,17 +74,14 @@ wxColourDialogHookProc(HWND hwnd, if ( uiMsg == WM_INITDIALOG ) { CHOOSECOLOR *pCC = (CHOOSECOLOR *)lParam; - wxColourDialog *dialog = (wxColourDialog *)pCC->lCustData; + wxColourDialog * const + dialog = reinterpret_cast(pCC->lCustData); - ::SetWindowText(hwnd, dialog->GetTitle()); + const wxString title = dialog->GetTitle(); + if ( !title.empty() ) + ::SetWindowText(hwnd, title.wx_str()); - wxPoint pos = dialog->GetPosition(); - if ( pos != wxDefaultPosition ) - { - ::SetWindowPos(hwnd, NULL /* Z-order: ignored */, - pos.x, pos.y, -1, -1, - SWP_NOSIZE | SWP_NOZORDER); - } + dialog->MSWOnInitDone((WXHWND)hwnd); } return 0; @@ -99,16 +91,16 @@ wxColourDialogHookProc(HWND hwnd, // wxColourDialog // ---------------------------------------------------------------------------- -wxColourDialog::wxColourDialog() -{ - m_pos = wxDefaultPosition; -} - -wxColourDialog::wxColourDialog(wxWindow *parent, wxColourData *data) +void wxColourDialog::Init() { - m_pos = wxDefaultPosition; - - Create(parent, data); + m_movedWindow = false; + m_centreDir = 0; + + // reset to zero, otherwise the wx routines won't size the window the + // second time the dialog is shown, because they would believe it already + // has the requested size/position + gs_rectDialog.x = + gs_rectDialog.y = 0; } bool wxColourDialog::Create(wxWindow *parent, wxColourData *data) @@ -117,54 +109,69 @@ bool wxColourDialog::Create(wxWindow *parent, wxColourData *data) if (data) m_colourData = *data; - return TRUE; + return true; } int wxColourDialog::ShowModal() { + // initialize the struct used by Windows CHOOSECOLOR chooseColorStruct; - COLORREF custColours[16]; memset(&chooseColorStruct, 0, sizeof(CHOOSECOLOR)); - int i; - for (i = 0; i < 16; i++) - custColours[i] = wxColourToRGB(m_colourData.m_custColours[i]); + size_t i; + + // and transfer data from m_colourData to it + COLORREF custColours[16]; + for ( i = 0; i < WXSIZEOF(custColours); i++ ) + { + if ( m_colourData.GetCustomColour(i).IsOk() ) + custColours[i] = wxColourToRGB(m_colourData.GetCustomColour(i)); + else + custColours[i] = RGB(255,255,255); + } chooseColorStruct.lStructSize = sizeof(CHOOSECOLOR); if ( m_parent ) chooseColorStruct.hwndOwner = GetHwndOf(m_parent); - chooseColorStruct.rgbResult = wxColourToRGB(m_colourData.m_dataColour); + chooseColorStruct.rgbResult = wxColourToRGB(m_colourData.GetColour()); chooseColorStruct.lpCustColors = custColours; chooseColorStruct.Flags = CC_RGBINIT | CC_ENABLEHOOK; chooseColorStruct.lCustData = (LPARAM)this; chooseColorStruct.lpfnHook = wxColourDialogHookProc; - if (m_colourData.GetChooseFull()) + if ( m_colourData.GetChooseFull() ) chooseColorStruct.Flags |= CC_FULLOPEN; - // Do the modal dialog - bool success = ::ChooseColor(&(chooseColorStruct)) != 0; - - // Try to highlight the correct window (the parent) - HWND hWndParent = 0; - if (GetParent()) + // do show the modal dialog + if ( !::ChooseColor(&chooseColorStruct) ) { - hWndParent = (HWND) GetParent()->GetHWND(); - if (hWndParent) - ::BringWindowToTop(hWndParent); + // 0 error means the dialog was simply cancelled, i.e. no real error + // occurred + const DWORD err = CommDlgExtendedError(); + if ( err ) + { + wxLogError(_("Colour selection dialog failed with error %0lx."), err); + } + + return wxID_CANCEL; } - // Restore values - for (i = 0; i < 16; i++) + // transfer the values chosen by user back into m_colourData + for ( i = 0; i < WXSIZEOF(custColours); i++ ) { wxRGBToColour(m_colourData.m_custColours[i], custColours[i]); } - wxRGBToColour(m_colourData.m_dataColour, chooseColorStruct.rgbResult); + wxRGBToColour(m_colourData.GetColour(), chooseColorStruct.rgbResult); + + // this doesn't seem to work (contrary to what MSDN implies) on current + // Windows versions: CC_FULLOPEN is never set on return if it wasn't + // initially set and vice versa + //m_colourData.SetChooseFull((chooseColorStruct.Flags & CC_FULLOPEN) != 0); - return success ? wxID_OK : wxID_CANCEL; + return wxID_OK; } // ---------------------------------------------------------------------------- @@ -188,43 +195,82 @@ wxString wxColourDialog::GetTitle() const void wxColourDialog::DoGetPosition(int *x, int *y) const { if ( x ) - *x = m_pos.x; + *x = gs_rectDialog.x; if ( y ) - *y = m_pos.y; + *y = gs_rectDialog.y; +} + +void wxColourDialog::DoCentre(int dir) +{ + m_centreDir = dir; + + // it's unnecessary to do anything else at this stage as we'll redo it in + // MSWOnInitDone() anyhow } -void wxColourDialog::DoSetSize(int x, int y, - int WXUNUSED(width), int WXUNUSED(height), - int WXUNUSED(sizeFlags)) +void wxColourDialog::DoMoveWindow(int x, int y, int WXUNUSED(w), int WXUNUSED(h)) { - if ( x != -1 ) - m_pos.x = x; + gs_rectDialog.x = x; + gs_rectDialog.y = y; - if ( y != -1 ) - m_pos.y = y; + // our HWND is only set when we're called from MSWOnInitDone(), test if + // this is the case + HWND hwnd = GetHwnd(); + if ( hwnd ) + { + // size of the dialog can't be changed because the controls are not + // laid out correctly then + ::SetWindowPos(hwnd, HWND_TOP, x, y, 0, 0, SWP_NOZORDER | SWP_NOSIZE); + } + else // just remember that we were requested to move the window + { + m_movedWindow = true; - // ignore the size params - we can't change the size of a standard dialog - return; + // if Centre() had been called before, it shouldn't be taken into + // account now + m_centreDir = 0; + } } -// NB: of course, both of these functions are completely bogus, but it's better -// than nothing void wxColourDialog::DoGetSize(int *width, int *height) const { - // the standard dialog size if ( width ) - *width = 225; + *width = gs_rectDialog.width; if ( height ) - *height = 324; + *height = gs_rectDialog.height; } void wxColourDialog::DoGetClientSize(int *width, int *height) const { - // the standard dialog size if ( width ) - *width = 219; + *width = gs_rectDialog.width; if ( height ) - *height = 299; + *height = gs_rectDialog.height; } -#endif +void wxColourDialog::MSWOnInitDone(WXHWND hDlg) +{ + // set HWND so that our DoMoveWindow() works correctly + SetHWND(hDlg); + + if ( m_centreDir ) + { + // now we have the real dialog size, remember it + RECT rect; + ::GetWindowRect((HWND)hDlg, &rect); + gs_rectDialog = wxRectFromRECT(rect); + + // and position the window correctly: notice that we must use the base + // class version as our own doesn't do anything except setting flags + wxDialog::DoCentre(m_centreDir); + } + else if ( m_movedWindow ) // need to just move it to the correct place + { + SetPosition(GetPosition()); + } + + // we shouldn't destroy hDlg, so disassociate from it + SetHWND(NULL); +} + +#endif // wxUSE_COLOURDLG && !(__SMARTPHONE__ && __WXWINCE__)