// headers
// ----------------------------------------------------------------------------
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "colordlg.h"
#endif
#include "wx/msgdlg.h"
#endif
-#include <windows.h>
-
-#if !defined(__WIN32__) || defined(__SALFORDC__)
- #include <commdlg.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 <commdlg.h>
+#endif
+
#include <math.h>
#include <stdlib.h>
#include <string.h>
// colour dialog hook proc
// ----------------------------------------------------------------------------
-UINT CALLBACK wxColourDialogHookProc(HWND hwnd,
- UINT uiMsg,
- WPARAM WXUNUSED(wParam),
- LPARAM lParam)
+UINT_PTR CALLBACK
+wxColourDialogHookProc(HWND hwnd,
+ UINT uiMsg,
+ WPARAM WXUNUSED(wParam),
+ LPARAM lParam)
{
if ( uiMsg == WM_INITDIALOG )
{
if (data)
m_colourData = *data;
- return TRUE;
+ return true;
}
int wxColourDialog::ShowModal()
int i;
for (i = 0; i < 16; i++)
- custColours[i] = wxColourToRGB(m_colourData.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 )
chooseColorStruct.hwndOwner = GetHwndOf(m_parent);
- chooseColorStruct.rgbResult = wxColourToRGB(m_colourData.dataColour);
+ chooseColorStruct.rgbResult = wxColourToRGB(m_colourData.m_dataColour);
chooseColorStruct.lpCustColors = custColours;
chooseColorStruct.Flags = CC_RGBINIT | CC_ENABLEHOOK;
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);
}
// Restore values
for (i = 0; i < 16; i++)
{
- wxRGBToColour(m_colourData.custColours[i], custColours[i]);
+ wxRGBToColour(m_colourData.m_custColours[i], custColours[i]);
}
- wxRGBToColour(m_colourData.dataColour, chooseColorStruct.rgbResult);
+ wxRGBToColour(m_colourData.m_dataColour, chooseColorStruct.rgbResult);
return success ? wxID_OK : wxID_CANCEL;
}
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
*height = 299;
}
+#endif