projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
wxFormatConverter test rewritten for CppUnit (patch #910051)
[wxWidgets.git]
/
src
/
msw
/
colordlg.cpp
diff --git
a/src/msw/colordlg.cpp
b/src/msw/colordlg.cpp
index 10da2d4e3fd056069540a11cf34a2886277ba806..467b05a3cde72232cdbfdeb7614d068a6dc57030 100644
(file)
--- a/
src/msw/colordlg.cpp
+++ b/
src/msw/colordlg.cpp
@@
-5,7
+5,7
@@
// Modified by:
// Created: 01/02/97
// RCS-ID: $Id$
// Modified by:
// Created: 01/02/97
// RCS-ID: $Id$
-// Copyright: (c) Julian Smart
and Markus Holzem
+// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@@
-17,7
+17,7
@@
// headers
// ----------------------------------------------------------------------------
// headers
// ----------------------------------------------------------------------------
-#if
def __GNUG__
+#if
defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "colordlg.h"
#endif
#pragma implementation "colordlg.h"
#endif
@@
-42,16
+42,16
@@
#include "wx/msgdlg.h"
#endif
#include "wx/msgdlg.h"
#endif
-#include <windows.h>
-
-#if !defined(__WIN32__) || defined(__SALFORDC__) || defined(__WXWINE__)
- #include <commdlg.h>
-#endif
+#if wxUSE_COLOURDLG && !wxUSE_SMARTPHONE
#include "wx/msw/private.h"
#include "wx/colordlg.h"
#include "wx/cmndata.h"
#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>
#include <math.h>
#include <stdlib.h>
#include <string.h>
@@
-70,10
+70,11
@@
IMPLEMENT_DYNAMIC_CLASS(wxColourDialog, wxDialog)
// colour dialog hook proc
// ----------------------------------------------------------------------------
// 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 ( uiMsg == WM_INITDIALOG )
{
@@
-127,12
+128,12
@@
int wxColourDialog::ShowModal()
int i;
for (i = 0; i < 16; i++)
int i;
for (i = 0; i < 16; i++)
- custColours[i] = wxColourToRGB(m_colourData.custColours[i]);
+ custColours[i] = wxColourToRGB(m_colourData.
m_
custColours[i]);
chooseColorStruct.lStructSize = sizeof(CHOOSECOLOR);
if ( m_parent )
chooseColorStruct.hwndOwner = GetHwndOf(m_parent);
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;
chooseColorStruct.lpCustColors = custColours;
chooseColorStruct.Flags = CC_RGBINIT | CC_ENABLEHOOK;
@@
-158,10
+159,10
@@
int wxColourDialog::ShowModal()
// Restore values
for (i = 0; i < 16; i++)
{
// 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;
}
return success ? wxID_OK : wxID_CANCEL;
}
@@
-175,7
+176,7
@@
void wxColourDialog::SetTitle(const wxString& title)
m_title = title;
}
m_title = title;
}
-wxString wxColourDialog::GetTitle()
+wxString wxColourDialog::GetTitle()
const
{
return m_title;
}
{
return m_title;
}
@@
-226,3
+227,4
@@
void wxColourDialog::DoGetClientSize(int *width, int *height) const
*height = 299;
}
*height = 299;
}
+#endif