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

Minimum is now GTK+ 2.4

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49650 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2007-11-05 18:46:43 +00:00
parent 700d08c109
commit 25c5c36231
2 changed files with 0 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/gtk/colour.h
View File

@@ -40,13 +40,7 @@ public:
// Implementation part // Implementation part
void CalcPixel( GdkColormap *cmap ); void CalcPixel( GdkColormap *cmap );
int GetPixel() const; int GetPixel() const;
#ifdef __WXGTK24__
const GdkColor *GetColor() const; const GdkColor *GetColor() const;
#else
// GDK functions from old gtk2 versions take non-const color parameters,
// too many uses to deal with individually
GdkColor *GetColor() const;
#endif
protected: protected:
virtual void virtual void

4
src/gtk/colour.cpp
View File

@@ -169,11 +169,7 @@ int wxColour::GetPixel() const
return M_COLDATA->m_color.pixel; return M_COLDATA->m_color.pixel;
} }
#ifdef __WXGTK24__
const GdkColor *wxColour::GetColor() const const GdkColor *wxColour::GetColor() const
#else
GdkColor *wxColour::GetColor() const
#endif
{ {
wxCHECK_MSG( Ok(), NULL, wxT("invalid colour") ); wxCHECK_MSG( Ok(), NULL, wxT("invalid colour") );