use 0 (== GTK_STATE_NORMAL) for state parameter default

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70714 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/gtk/control.h b/include/wx/gtk/control.h
index 7e14b84d4bf77769e87b0d06036ab74e8e3c9af9..eba1f5f4f5fd38b81a5197e103543038431e5266 100644 (file)
--- a/include/wx/gtk/control.h
+++ b/include/wx/gtk/control.h
@@ -75,20 +75,20 @@ protected:
     static wxVisualAttributes
         GetDefaultAttributesFromGTKWidget(GtkWidget* widget,
                                           bool useBase = false,
     static wxVisualAttributes
         GetDefaultAttributesFromGTKWidget(GtkWidget* widget,
                                           bool useBase = false,

-                                          int state = -1);
+                                          int state = 0);

     static wxVisualAttributes
         GetDefaultAttributesFromGTKWidget(wxGtkWidgetNew_t,
                                           bool useBase = false,
     static wxVisualAttributes
         GetDefaultAttributesFromGTKWidget(wxGtkWidgetNew_t,
                                           bool useBase = false,

-                                          int state = -1);
+                                          int state = 0);

     static wxVisualAttributes
         GetDefaultAttributesFromGTKWidget(wxGtkWidgetNewFromStr_t,
                                           bool useBase = false,
     static wxVisualAttributes
         GetDefaultAttributesFromGTKWidget(wxGtkWidgetNewFromStr_t,
                                           bool useBase = false,

-                                          int state = -1);
+                                          int state = 0);

 
     static wxVisualAttributes
         GetDefaultAttributesFromGTKWidget(wxGtkWidgetNewFromAdj_t,
                                           bool useBase = false,
 
     static wxVisualAttributes
         GetDefaultAttributesFromGTKWidget(wxGtkWidgetNewFromAdj_t,
                                           bool useBase = false,

-                                          int state = -1);
+                                          int state = 0);

 
     // Widgets that use the style->base colour for the BG colour should
     // override this and return true.
 
     // Widgets that use the style->base colour for the BG colour should
     // override this and return true.

diff --git a/src/gtk/control.cpp b/src/gtk/control.cpp
index 626fbf167d05124c88b0fd1f2b1fe0e34ff0c864..24570f6afec6ee0e9580e9901b554c39722d3cbc 100644 (file)
--- a/src/gtk/control.cpp
+++ b/src/gtk/control.cpp
@@ -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
     attr.colFg = wxColour(style->fg[state]);
     if (useBase)
     // get the style's colours
     attr.colFg = wxColour(style->fg[state]);
     if (useBase)