projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
implementation streamlined
[wxWidgets.git]
/
src
/
msw
/
colordlg.cpp
diff --git
a/src/msw/colordlg.cpp
b/src/msw/colordlg.cpp
index 2398e1bc76c10af15a8b3140e7f64a64a5a6a428..e1eea31a004a3c83f67c231bef1467d2ca06ae59 100644
(file)
--- a/
src/msw/colordlg.cpp
+++ b/
src/msw/colordlg.cpp
@@
-6,7
+6,7
@@
// Created: 01/02/97
// RCS-ID: $Id$
// Copyright: (c) Julian Smart
// Created: 01/02/97
// RCS-ID: $Id$
// Copyright: (c) Julian Smart
-// Licence: wxWi
dget
s licence
+// Licence: wxWi
ndow
s licence
/////////////////////////////////////////////////////////////////////////////
// ============================================================================
/////////////////////////////////////////////////////////////////////////////
// ============================================================================
@@
-17,10
+17,6
@@
// headers
// ----------------------------------------------------------------------------
// headers
// ----------------------------------------------------------------------------
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
- #pragma implementation "colordlg.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
@@
-31,28
+27,20
@@
#ifndef WX_PRECOMP
#include <stdio.h>
#include "wx/defs.h"
#ifndef WX_PRECOMP
#include <stdio.h>
#include "wx/defs.h"
- #include "wx/bitmap.h"
- #include "wx/pen.h"
- #include "wx/brush.h"
#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/frame.h"
#include "wx/dialog.h"
#include "wx/dialog.h"
- #include "wx/msgdlg.h"
#endif
#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"
+#include "wx/msw/wrapcdlg.h"
-#if !defined(__WIN32__) || defined(__WXWINCE__)
- #include <commdlg.h>
-#endif
-
-#include <math.h>
#include <stdlib.h>
#include <string.h>
#include <stdlib.h>
#include <string.h>
@@
-117,7
+105,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()
@@
-128,7
+116,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 )
@@
-147,10
+140,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);
}
@@
-197,10
+189,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
@@
-227,4
+219,4
@@
void wxColourDialog::DoGetClientSize(int *width, int *height) const
*height = 299;
}
*height = 299;
}
-#endif
+#endif
// wxUSE_COLOURDLG && !(__SMARTPHONE__ && __WXWINCE__)