projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Ensure there is valid context for DrawRectangle
[wxWidgets.git]
/
src
/
msw
/
colordlg.cpp
diff --git
a/src/msw/colordlg.cpp
b/src/msw/colordlg.cpp
index 7a52b05e9da372469b18ae22985c7f15f66030a1..688ca17380e51d4ab41f777b304324e109434d99 100644
(file)
--- a/
src/msw/colordlg.cpp
+++ b/
src/msw/colordlg.cpp
@@
-27,6
+27,7
@@
#if wxUSE_COLOURDLG && !(defined(__SMARTPHONE__) && defined(__WXWINCE__))
#include "wx/colordlg.h"
#if wxUSE_COLOURDLG && !(defined(__SMARTPHONE__) && defined(__WXWINCE__))
#include "wx/colordlg.h"
+#include "wx/testing.h"
#ifndef WX_PRECOMP
#include "wx/msw/wrapcdlg.h"
#ifndef WX_PRECOMP
#include "wx/msw/wrapcdlg.h"
@@
-34,8
+35,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,11
+76,11
@@
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() )
- ::SetWindowText(hwnd, title.
wx
_str());
+ ::SetWindowText(hwnd, title.
t
_str());
dialog->MSWOnInitDone((WXHWND)hwnd);
}
dialog->MSWOnInitDone((WXHWND)hwnd);
}
@@
-116,6
+115,8
@@
bool wxColourDialog::Create(wxWindow *parent, wxColourData *data)
int wxColourDialog::ShowModal()
{
int wxColourDialog::ShowModal()
{
+ WX_TESTING_SHOW_MODAL_HOOK();
+
// initialize the struct used by Windows
CHOOSECOLOR chooseColorStruct;
memset(&chooseColorStruct, 0, sizeof(CHOOSECOLOR));
// initialize the struct used by Windows
CHOOSECOLOR chooseColorStruct;
memset(&chooseColorStruct, 0, sizeof(CHOOSECOLOR));
@@
-152,7
+153,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;
}