X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b2ff89d648e5b73172dc2f4aa84d2aadbdc063ec..be33a1c72620aad7a221896b24b7f75fe79dbdc5:/include/wx/gtk/control.h diff --git a/include/wx/gtk/control.h b/include/wx/gtk/control.h index 42e48726bf..5c7ffcc4dc 100644 --- a/include/wx/gtk/control.h +++ b/include/wx/gtk/control.h @@ -7,19 +7,8 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifndef __GTKCONTROLH__ -#define __GTKCONTROLH__ - -#include "wx/defs.h" -#include "wx/object.h" -#include "wx/list.h" -#include "wx/window.h" - -//----------------------------------------------------------------------------- -// classes -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxControl; +#ifndef _WX_GTK_CONTROL_H_ +#define _WX_GTK_CONTROL_H_ typedef struct _GtkLabel GtkLabel; typedef struct _GtkFrame GtkFrame; @@ -59,6 +48,8 @@ public: virtual wxVisualAttributes GetDefaultAttributes() const; + virtual void OnInternalIdle(); + protected: virtual wxSize DoGetBestSize() const; void PostCreation(const wxSize& size); @@ -66,8 +57,11 @@ protected: // sets the label to the given string and also sets it for the given widget void GTKSetLabelForLabel(GtkLabel *w, const wxString& label); - // as GTKSetLabelForLabel() but for a GtkFrame widget + // GtkFrame helpers + GtkWidget* GTKCreateFrame(const wxString& label); void GTKSetLabelForFrame(GtkFrame *w, const wxString& label); + void GTKFrameApplyWidgetStyle(GtkFrame* w, GtkRcStyle* rc); + void GTKFrameSetMnemonicWidget(GtkFrame* w, GtkWidget* widget); // remove mnemonics ("&"s) from the label static wxString GTKRemoveMnemonics(const wxString& label); @@ -108,4 +102,4 @@ private: DECLARE_DYNAMIC_CLASS(wxControl) }; -#endif // __GTKCONTROLH__ +#endif // _WX_GTK_CONTROL_H_