When handling accelerators in wxWebView make sure that we do not block right-alt...

[wxWidgets.git] / include / wx / gtk / toolbar.h

diff --git a/include/wx/gtk/toolbar.h b/include/wx/gtk/toolbar.h
index c752a8dd45f1855eb31ee41990b3f3cdb25a40f1..8326870f49dd99244e848d01fad4c399e99363ed 100644 (file)
--- a/include/wx/gtk/toolbar.h
+++ b/include/wx/gtk/toolbar.h
@@ -12,6 +12,8 @@
 
 #if wxUSE_TOOLBAR
 
 
 #if wxUSE_TOOLBAR
 

+typedef struct _GtkTooltips GtkTooltips;
+

 // ----------------------------------------------------------------------------
 // wxToolBar
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxToolBar
 // ----------------------------------------------------------------------------


@@ -56,11 +58,20 @@ public:
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 
     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
     // --------------------------
 
     // implementation from now on
     // --------------------------
 

-    void OnInternalIdle();
-

 protected:
     virtual wxSize DoGetBestSize() const;
     virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const;
 protected:
     virtual wxSize DoGetBestSize() const;
     virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const;


@@ -73,17 +84,6 @@ protected:
     virtual void DoToggleTool(wxToolBarToolBase *tool, bool toggle);
     virtual void DoSetToggle(wxToolBarToolBase *tool, bool toggle);
 
     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();
 private:
     void Init();
     void GtkSetStyle();