projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
GetVirtualSize() returns client size values for the m_virtualSize components which...
[wxWidgets.git]
/
src
/
msw
/
colordlg.cpp
diff --git
a/src/msw/colordlg.cpp
b/src/msw/colordlg.cpp
index eb8936211d0f5935bbd8d903aba7ca9b8b692578..cc836963a9b9a775f7d7aee8cd917c2b4d5511a2 100644
(file)
--- a/
src/msw/colordlg.cpp
+++ b/
src/msw/colordlg.cpp
@@
-42,17
+42,17
@@
#include "wx/msgdlg.h"
#endif
#include "wx/msgdlg.h"
#endif
-#if wxUSE_COLOURDLG && !
defined(__SMARTPHONE__
)
+#if wxUSE_COLOURDLG && !
(defined(__SMARTPHONE__) && defined(__WXWINCE__)
)
#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"
+#include "wx/math.h"
#if !defined(__WIN32__) || defined(__WXWINCE__)
#include <commdlg.h>
#endif
#if !defined(__WIN32__) || defined(__WXWINCE__)
#include <commdlg.h>
#endif
-#include <math.h>
#include <stdlib.h>
#include <string.h>
#include <stdlib.h>
#include <string.h>
@@
-231,4
+231,4
@@
void wxColourDialog::DoGetClientSize(int *width, int *height) const
*height = 299;
}
*height = 299;
}
-#endif
+#endif
// wxUSE_COLOURDLG && !(__SMARTPHONE__ && __WXWINCE__)