X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9d522606d0a1dfd22bcdc1a386b3dca01fa985e3..3b49331b7441e091fc5997b830801d76a1243f28:/include/wx/gtk1/tbargtk.h?ds=sidebyside diff --git a/include/wx/gtk1/tbargtk.h b/include/wx/gtk1/tbargtk.h index 340d70d665..9055c1fc1e 100644 --- a/include/wx/gtk1/tbargtk.h +++ b/include/wx/gtk1/tbargtk.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: tbargtk.h +// Name: wx/gtk1/tbargtk.h // Purpose: GTK toolbar // Author: Robert Roebling // RCS-ID: $Id$ @@ -10,17 +10,13 @@ #ifndef _WX_GTK_TBARGTK_H_ #define _WX_GTK_TBARGTK_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "tbargtk.h" -#endif - #if wxUSE_TOOLBAR // ---------------------------------------------------------------------------- // wxToolBar // ---------------------------------------------------------------------------- -class wxToolBar : public wxToolBarBase +class WXDLLIMPEXP_CORE wxToolBar : public wxToolBarBase { public: // construction/destruction @@ -58,15 +54,12 @@ public: static wxVisualAttributes GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - + // implementation from now on // -------------------------- GtkToolbar *m_toolbar; - GdkColor *m_fg; - GdkColor *m_bg; - bool m_blockEvent; void OnInternalIdle(); @@ -94,7 +87,8 @@ protected: wxObject *clientData, const wxString& shortHelpString, const wxString& longHelpString); - virtual wxToolBarToolBase *CreateTool(wxControl *control); + virtual wxToolBarToolBase *CreateTool(wxControl *control, + const wxString& label); private: DECLARE_DYNAMIC_CLASS(wxToolBar)