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

use 0 (== GTK_STATE_NORMAL) for state parameter default

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70714 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2012-02-27 17:49:33 +00:00
parent 622226dc73
commit fac46b97d6
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/wx/gtk/control.h
View File

@@ -75,20 +75,20 @@ protected:
static wxVisualAttributes static wxVisualAttributes
GetDefaultAttributesFromGTKWidget(GtkWidget* widget, GetDefaultAttributesFromGTKWidget(GtkWidget* widget,
bool useBase = false, bool useBase = false,
int state = -1); int state = 0);
static wxVisualAttributes static wxVisualAttributes
GetDefaultAttributesFromGTKWidget(wxGtkWidgetNew_t, GetDefaultAttributesFromGTKWidget(wxGtkWidgetNew_t,
bool useBase = false, bool useBase = false,
int state = -1); int state = 0);
static wxVisualAttributes static wxVisualAttributes
GetDefaultAttributesFromGTKWidget(wxGtkWidgetNewFromStr_t, GetDefaultAttributesFromGTKWidget(wxGtkWidgetNewFromStr_t,
bool useBase = false, bool useBase = false,
int state = -1); int state = 0);
static wxVisualAttributes static wxVisualAttributes
GetDefaultAttributesFromGTKWidget(wxGtkWidgetNewFromAdj_t, GetDefaultAttributesFromGTKWidget(wxGtkWidgetNewFromAdj_t,
bool useBase = false, bool useBase = false,
int state = -1); int state = 0);
// Widgets that use the style->base colour for the BG colour should // Widgets that use the style->base colour for the BG colour should
// override this and return true. // override this and return true.

3
src/gtk/control.cpp
View File

@@ -229,9 +229,6 @@ wxControl::GetDefaultAttributesFromGTKWidget(GtkWidget* widget,
return wxWindow::GetClassDefaultAttributes(wxWINDOW_VARIANT_NORMAL); return wxWindow::GetClassDefaultAttributes(wxWINDOW_VARIANT_NORMAL);
} }
if (state == -1)
state = GTK_STATE_NORMAL;
// get the style's colours // get the style's colours
attr.colFg = wxColour(style->fg[state]); attr.colFg = wxColour(style->fg[state]);
if (useBase) if (useBase)