X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/12028905135250524409f1e7b9bfa9c55e5ce16b..2c01d33555e3125057f4575ca7d0d2aba93f421f:/include/wx/gtk/control.h diff --git a/include/wx/gtk/control.h b/include/wx/gtk/control.h index 623133c461..6e51a1116f 100644 --- a/include/wx/gtk/control.h +++ b/include/wx/gtk/control.h @@ -10,10 +10,6 @@ #ifndef __GTKCONTROLH__ #define __GTKCONTROLH__ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface -#endif - #include "wx/defs.h" #include "wx/object.h" #include "wx/list.h" @@ -23,13 +19,20 @@ // classes //----------------------------------------------------------------------------- -class wxControl; +class WXDLLIMPEXP_CORE wxControl; //----------------------------------------------------------------------------- // wxControl //----------------------------------------------------------------------------- -class wxControl : public wxControlBase +// C-linkage function pointer types for GetDefaultAttributesFromGTKWidget +extern "C" { + typedef GtkWidget* (*wxGtkWidgetNew_t)(void); + typedef GtkWidget* (*wxGtkWidgetNewFromStr_t)(const gchar*); + typedef GtkWidget* (*wxGtkWidgetNewFromAdj_t)(GtkAdjustment*); +} + +class WXDLLIMPEXP_CORE wxControl : public wxControlBase { public: wxControl(); @@ -52,13 +55,40 @@ public: // char (the one immediately after '&') into m_chAccel (TODO not yet) virtual void SetLabel( const wxString &label ); virtual wxString GetLabel() const; + + virtual wxVisualAttributes GetDefaultAttributes() const; protected: virtual wxSize DoGetBestSize() const; + void PostCreation(const wxSize& size); + #ifdef __WXGTK20__ wxString PrepareLabelMnemonics( const wxString &label ) const; #endif + // These are used by GetDefaultAttributes + static wxVisualAttributes + GetDefaultAttributesFromGTKWidget(GtkWidget* widget, + bool useBase = false, + int state = -1); + static wxVisualAttributes + GetDefaultAttributesFromGTKWidget(wxGtkWidgetNew_t, + bool useBase = false, + int state = -1); + static wxVisualAttributes + GetDefaultAttributesFromGTKWidget(wxGtkWidgetNewFromStr_t, + bool useBase = false, + int state = -1); + + static wxVisualAttributes + GetDefaultAttributesFromGTKWidget(wxGtkWidgetNewFromAdj_t, + bool useBase = false, + int state = -1); + + // Widgets that use the style->base colour for the BG colour should + // override this and return true. + virtual bool UseGTKStyleBase() const { return false; } + wxString m_label; char m_chAccel; // enabled to avoid breaking binary compatibility later on