X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f5bdfc69a576eb32f680f962feec04935f6e71eb..f31d3faf7a4f578f6c115fbbb0e70f7a6e7a7d63:/include/wx/gtk/control.h diff --git a/include/wx/gtk/control.h b/include/wx/gtk/control.h index fdce88e008..eba1f5f4f5 100644 --- a/include/wx/gtk/control.h +++ b/include/wx/gtk/control.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: control.h +// Name: wx/gtk/control.h // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -20,7 +20,7 @@ typedef struct _GtkFrame GtkFrame; // C-linkage function pointer types for GetDefaultAttributesFromGTKWidget extern "C" { typedef GtkWidget* (*wxGtkWidgetNew_t)(void); - typedef GtkWidget* (*wxGtkWidgetNewFromStr_t)(const gchar*); + typedef GtkWidget* (*wxGtkWidgetNewFromStr_t)(const char*); typedef GtkWidget* (*wxGtkWidgetNewFromAdj_t)(GtkAdjustment*); } @@ -75,20 +75,20 @@ protected: static wxVisualAttributes GetDefaultAttributesFromGTKWidget(GtkWidget* widget, bool useBase = false, - int state = -1); + int state = 0); static wxVisualAttributes GetDefaultAttributesFromGTKWidget(wxGtkWidgetNew_t, bool useBase = false, - int state = -1); + int state = 0); static wxVisualAttributes GetDefaultAttributesFromGTKWidget(wxGtkWidgetNewFromStr_t, bool useBase = false, - int state = -1); + int state = 0); 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.