X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/15436458138acd516aa95975a163f4c7c7c3afc8..3b49331b7441e091fc5997b830801d76a1243f28:/include/wx/gtk/tbargtk.h diff --git a/include/wx/gtk/tbargtk.h b/include/wx/gtk/tbargtk.h index ce78401588..279f5e924e 100644 --- a/include/wx/gtk/tbargtk.h +++ b/include/wx/gtk/tbargtk.h @@ -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 @@ -29,7 +25,7 @@ public: wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, - long style = 0, + long style = wxTB_HORIZONTAL, const wxString& name = wxToolBarNameStr ) { Init(); @@ -56,9 +52,12 @@ public: virtual void SetWindowStyleFlag( long style ); + virtual void SetToolNormalBitmap(int id, const wxBitmap& bitmap); + virtual void SetToolDisabledBitmap(int id, const wxBitmap& bitmap); + static wxVisualAttributes GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - + // implementation from now on // -------------------------- @@ -75,6 +74,8 @@ protected: // set the GTK toolbar style and orientation void GtkSetStyle(); + virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const; + // implement base class pure virtuals virtual bool DoInsertTool(size_t pos, wxToolBarToolBase *tool); virtual bool DoDeleteTool(size_t pos, wxToolBarToolBase *tool); @@ -91,7 +92,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)