X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9067c6c5377cd6248d34352a2c8a0e1a2485e5c9..8e77fd8bca165aab9709649d79a7cbc6a172d4e1:/include/wx/gtk/toolbar.h?ds=sidebyside diff --git a/include/wx/gtk/toolbar.h b/include/wx/gtk/toolbar.h index c752a8dd45..e099dbb93c 100644 --- a/include/wx/gtk/toolbar.h +++ b/include/wx/gtk/toolbar.h @@ -12,6 +12,8 @@ #if wxUSE_TOOLBAR +typedef struct _GtkTooltips GtkTooltips; + // ---------------------------------------------------------------------------- // wxToolBar // ---------------------------------------------------------------------------- @@ -56,12 +58,24 @@ public: static wxVisualAttributes GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); + virtual wxToolBarToolBase *CreateTool(int id, + const wxString& label, + const wxBitmap& bitmap1, + const wxBitmap& bitmap2 = wxNullBitmap, + wxItemKind kind = wxITEM_NORMAL, + wxObject *clientData = NULL, + const wxString& shortHelpString = wxEmptyString, + const wxString& longHelpString = wxEmptyString); + virtual wxToolBarToolBase *CreateTool(wxControl *control, + const wxString& label); + // implementation from now on // -------------------------- - void OnInternalIdle(); - protected: + // choose the default border for this window + virtual wxBorder GetDefaultBorder() const { return wxBORDER_DEFAULT; } + virtual wxSize DoGetBestSize() const; virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const; @@ -73,17 +87,6 @@ protected: virtual void DoToggleTool(wxToolBarToolBase *tool, bool toggle); virtual void DoSetToggle(wxToolBarToolBase *tool, bool toggle); - virtual wxToolBarToolBase *CreateTool(int id, - const wxString& label, - const wxBitmap& bitmap1, - const wxBitmap& bitmap2, - wxItemKind kind, - wxObject *clientData, - const wxString& shortHelpString, - const wxString& longHelpString); - virtual wxToolBarToolBase *CreateTool(wxControl *control, - const wxString& label); - private: void Init(); void GtkSetStyle();