X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/393c836c338dc917290ac5c626b5ed24a075d3e9..431a3edc641e379b8f5d6010220250017e99a3ff:/src/msw/colordlg.cpp diff --git a/src/msw/colordlg.cpp b/src/msw/colordlg.cpp index 92036a89af..eb8936211d 100644 --- a/src/msw/colordlg.cpp +++ b/src/msw/colordlg.cpp @@ -117,7 +117,7 @@ bool wxColourDialog::Create(wxWindow *parent, wxColourData *data) if (data) m_colourData = *data; - return TRUE; + return true; } int wxColourDialog::ShowModal() @@ -152,10 +152,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); } @@ -202,10 +201,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