projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix typo in last commit
[wxWidgets.git]
/
src
/
msw
/
colordlg.cpp
diff --git
a/src/msw/colordlg.cpp
b/src/msw/colordlg.cpp
index 60affe9fc677f07bce049381aabbf1a93dab8a6b..788f0fae7c0a7069c5a8350c14f3f93d24a475af 100644
(file)
--- a/
src/msw/colordlg.cpp
+++ b/
src/msw/colordlg.cpp
@@
-34,8
+34,6
@@
#include "wx/colour.h"
#include "wx/gdicmn.h"
#include "wx/utils.h"
#include "wx/colour.h"
#include "wx/gdicmn.h"
#include "wx/utils.h"
- #include "wx/dialog.h"
- #include "wx/cmndata.h"
#include "wx/math.h"
#endif
#include "wx/math.h"
#endif
@@
-77,7
+75,7
@@
wxColourDialogHookProc(HWND hwnd,
{
CHOOSECOLOR *pCC = (CHOOSECOLOR *)lParam;
wxColourDialog * const
{
CHOOSECOLOR *pCC = (CHOOSECOLOR *)lParam;
wxColourDialog * const
- dialog =
wx_reinterpret_cast(wxColourDialog *,
pCC->lCustData);
+ dialog =
reinterpret_cast<wxColourDialog *>(
pCC->lCustData);
const wxString title = dialog->GetTitle();
if ( !title.empty() )
const wxString title = dialog->GetTitle();
if ( !title.empty() )
@@
-120,14
+118,14
@@
int wxColourDialog::ShowModal()
CHOOSECOLOR chooseColorStruct;
memset(&chooseColorStruct, 0, sizeof(CHOOSECOLOR));
CHOOSECOLOR chooseColorStruct;
memset(&chooseColorStruct, 0, sizeof(CHOOSECOLOR));
-
in
t i;
+
size_
t i;
// and transfer data from m_colourData to it
COLORREF custColours[16];
for ( i = 0; i < WXSIZEOF(custColours); i++ )
{
// and transfer data from m_colourData to it
COLORREF custColours[16];
for ( i = 0; i < WXSIZEOF(custColours); i++ )
{
- if ( m_colourData.
m_custColours[i]
.IsOk() )
- custColours[i] = wxColourToRGB(m_colourData.
m_custColours[i]
);
+ if ( m_colourData.
GetCustomColour(i)
.IsOk() )
+ custColours[i] = wxColourToRGB(m_colourData.
GetCustomColour(i)
);
else
custColours[i] = RGB(255,255,255);
}
else
custColours[i] = RGB(255,255,255);
}
@@
-135,7
+133,7
@@
int wxColourDialog::ShowModal()
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.
m_dataColour
);
+ chooseColorStruct.rgbResult = wxColourToRGB(m_colourData.
GetColour()
);
chooseColorStruct.lpCustColors = custColours;
chooseColorStruct.Flags = CC_RGBINIT | CC_ENABLEHOOK;
chooseColorStruct.lpCustColors = custColours;
chooseColorStruct.Flags = CC_RGBINIT | CC_ENABLEHOOK;
@@
-152,7
+150,9
@@
int wxColourDialog::ShowModal()
// occurred
const DWORD err = CommDlgExtendedError();
if ( err )
// occurred
const DWORD err = CommDlgExtendedError();
if ( err )
+ {
wxLogError(_("Colour selection dialog failed with error %0lx."), err);
wxLogError(_("Colour selection dialog failed with error %0lx."), err);
+ }
return wxID_CANCEL;
}
return wxID_CANCEL;
}
@@
-164,7
+164,7
@@
int wxColourDialog::ShowModal()
wxRGBToColour(m_colourData.m_custColours[i], 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
// 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