X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e76c0b5fc59b06273ebbe9c1d9b2646befd0acd0..26dd7154d5b4ab79db3cf4a6dc07c6404e6e14d8:/include/wx/gtk/tbargtk.h diff --git a/include/wx/gtk/tbargtk.h b/include/wx/gtk/tbargtk.h index 7c46a9dc34..07bff7128a 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_ -#ifdef __GNUG__ - #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(); @@ -41,39 +37,31 @@ public: wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, - long style = 0, + long style = wxTB_HORIZONTAL, const wxString& name = wxToolBarNameStr ); virtual ~wxToolBar(); - // override base class virtuals - virtual void SetMargins(int x, int y); - virtual void SetToolSeparation(int separation); - virtual wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y) const; virtual void SetToolShortHelp(int id, const wxString& helpString); virtual void SetWindowStyleFlag( long style ); - // implementation from now on - // -------------------------- - - GtkToolbar *m_toolbar; + virtual void SetToolNormalBitmap(int id, const wxBitmap& bitmap); + virtual void SetToolDisabledBitmap(int id, const wxBitmap& bitmap); - GdkColor *m_fg; - GdkColor *m_bg; + static wxVisualAttributes + GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - bool m_blockEvent; + // implementation from now on + // -------------------------- void OnInternalIdle(); protected: - // common part of all ctors - void Init(); - - // set the GTK toolbar style and orientation - void GtkSetStyle(); + virtual wxSize DoGetBestSize() const; + virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const; // implement base class pure virtuals virtual bool DoInsertTool(size_t pos, wxToolBarToolBase *tool); @@ -91,9 +79,18 @@ protected: wxObject *clientData, const wxString& shortHelpString, const wxString& longHelpString); - virtual wxToolBarToolBase *CreateTool(wxControl *control); + virtual wxToolBarToolBase *CreateTool(wxControl *control, + const wxString& label); private: + void Init(); + void GtkSetStyle(); + GSList* GetRadioGroup(size_t pos); + virtual void AddChildGTK(wxWindowGTK* child); + + GtkToolbar* m_toolbar; + GtkTooltips* m_tooltips; + DECLARE_DYNAMIC_CLASS(wxToolBar) };