Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1. changed wxColourData default palette to NULL colours instead of white

Browse Source 
2. added native wxColourDialog for GTK2


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27626 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2004-06-04 15:58:05 +00:00
parent d33dd9ef43
commit a2b99ff5a5
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/generic/colrdlgg.cpp
View File

@@ -20,7 +20,7 @@
#pragma hdrstop #pragma hdrstop
#endif #endif
#if wxUSE_COLOURDLG #if wxUSE_COLOURDLG && !defined(__WXGTK20__)
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include "wx/utils.h" #include "wx/utils.h"
@@ -312,7 +312,11 @@ void wxGenericColourDialog::InitializeColours(void)
for (i = 0; i < WXSIZEOF(customColours); i++) for (i = 0; i < WXSIZEOF(customColours); i++)
{ {
customColours[i] = colourData.GetCustomColour(i); wxColour c = colourData.GetCustomColour(i);
if (c.Ok())
customColours[i] = colourData.GetCustomColour(i);
else
customColours[i] = wxColour(255, 255, 255);
} }
wxColour curr = colourData.GetColour(); wxColour curr = colourData.GetColour();
@@ -564,5 +568,5 @@ void wxGenericColourDialog::OnBlueSlider(wxCommandEvent& WXUNUSED(event))
PaintCustomColour(dc); PaintCustomColour(dc);
} }
#endif // wxUSE_COLOURDLG #endif // wxUSE_COLOURDLG && !defined(__WXGTK20__)