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 66af5ffcf7438bd9435e34244aff00ff6785c1a3..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 && !
wxUSE_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>
@@
-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 )
{
@@
-116,7
+117,7
@@
bool wxColourDialog::Create(wxWindow *parent, wxColourData *data)
if (data)
m_colourData = *data;
if (data)
m_colourData = *data;
- return
TRUE
;
+ return
true
;
}
int wxColourDialog::ShowModal()
}
int wxColourDialog::ShowModal()
@@
-127,7
+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.m_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.lStructSize = sizeof(CHOOSECOLOR);
if ( m_parent )
@@
-146,10
+152,9
@@
int wxColourDialog::ShowModal()
bool success = ::ChooseColor(&(chooseColorStruct)) != 0;
// Try to highlight the correct window (the parent)
bool success = ::ChooseColor(&(chooseColorStruct)) != 0;
// Try to highlight the correct window (the parent)
- HWND hWndParent = 0;
if (GetParent())
{
if (GetParent())
{
- hWndParent = (HWND) GetParent()->GetHWND();
+
HWND
hWndParent = (HWND) GetParent()->GetHWND();
if (hWndParent)
::BringWindowToTop(hWndParent);
}
if (hWndParent)
::BringWindowToTop(hWndParent);
}
@@
-196,10
+201,10
@@
void wxColourDialog::DoSetSize(int x, int y,
int WXUNUSED(width), int WXUNUSED(height),
int WXUNUSED(sizeFlags))
{
int WXUNUSED(width), int WXUNUSED(height),
int WXUNUSED(sizeFlags))
{
- if ( x !=
-1
)
+ if ( x !=
wxDefaultCoord
)
m_pos.x = x;
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
m_pos.y = y;
// ignore the size params - we can't change the size of a standard dialog
@@
-226,4
+231,4
@@
void wxColourDialog::DoGetClientSize(int *width, int *height) const
*height = 299;
}
*height = 299;
}
-#endif
+#endif
// wxUSE_COLOURDLG && !(__SMARTPHONE__ && __WXWINCE__)