avoid infinite recursion for richtooltops, (hopefully) fixes #15070

[wxWidgets.git] / interface / wx / toolbar.h

diff --git a/interface/wx/toolbar.h b/interface/wx/toolbar.h
index e0afc16cd95d31e6d9fe095eadd181075a58bfb2..9f0f8674cec146f33c79cd18ad1e71d3e32bfcc6 100644 (file)
--- a/interface/wx/toolbar.h
+++ b/interface/wx/toolbar.h
@@ -98,7 +98,6 @@ public:
     wxControl *GetControl() const;
     wxToolBarBase *GetToolBar() const;
 
     wxControl *GetControl() const;
     wxToolBarBase *GetToolBar() const;
 

-    // style/kind

     bool IsStretchable() const;
     bool IsButton() const;
     bool IsControl() const;
     bool IsStretchable() const;
     bool IsButton() const;
     bool IsControl() const;


@@ -108,12 +107,10 @@ public:
     wxItemKind GetKind() const;
     void MakeStretchable();
 
     wxItemKind GetKind() const;
     void MakeStretchable();
 

-    // state

     bool IsEnabled() const;
     bool IsToggled() const;
     bool CanBeToggled() const;
 
     bool IsEnabled() const;
     bool IsToggled() const;
     bool CanBeToggled() const;
 

-    // attributes

     const wxBitmap& GetNormalBitmap() const;
     const wxBitmap& GetDisabledBitmap() const;
 
     const wxBitmap& GetNormalBitmap() const;
     const wxBitmap& GetDisabledBitmap() const;
 


@@ -125,7 +122,6 @@ public:
 
     wxObject *GetClientData() const;
 
 
     wxObject *GetClientData() const;
 

-    // modifiers: return true if the state really changed

     virtual bool Enable(bool enable);
     virtual bool Toggle(bool toggle);
     virtual bool SetToggle(bool toggle);
     virtual bool Enable(bool enable);
     virtual bool Toggle(bool toggle);
     virtual bool SetToggle(bool toggle);


@@ -137,14 +133,11 @@ public:
     virtual void SetLabel(const wxString& label);
     void SetClientData(wxObject *clientData);
     
     virtual void SetLabel(const wxString& label);
     void SetClientData(wxObject *clientData);
     

-    // add tool to/remove it from a toolbar

     virtual void Detach();
     virtual void Attach(wxToolBarBase *tbar);
 
     virtual void Detach();
     virtual void Attach(wxToolBarBase *tbar);
 

-    // these methods are only for tools of wxITEM_DROPDOWN kind (but even such
-    // tools can have a NULL associated menu)

     virtual void SetDropdownMenu(wxMenu *menu);
     virtual void SetDropdownMenu(wxMenu *menu);

-    wxMenu *GetDropdownMenu() const { return m_dropdownMenu; }
+    wxMenu *GetDropdownMenu() const;

 };
 
 
 };
 
 


@@ -326,7 +319,7 @@ public:
                                     wxObject* clientData = NULL);
 
     /**
                                     wxObject* clientData = NULL);
 
     /**

-        Adds any control to the toolbar, typically e.g. a wxComboBox.
+        Adds any control to the toolbar, typically e.g.\ a wxComboBox.

 
         @param control
             The control to be added.
 
         @param control
             The control to be added.


@@ -724,13 +717,16 @@ public:
             the overload taking @a tool parameter the caller is responsible for
             deleting the tool in the latter case.
     */
             the overload taking @a tool parameter the caller is responsible for
             deleting the tool in the latter case.
     */

-    wxToolBarToolBase* InsertTool(size_t pos, int toolId,
-                                  const wxBitmap& bitmap1,
-                                  const wxBitmap& bitmap2 = wxNullBitmap,
-                                  bool isToggle = false,
-                                  wxObject* clientData = NULL,
-                                  const wxString& shortHelpString = wxEmptyString,
-                                  const wxString& longHelpString = wxEmptyString);
+    wxToolBarToolBase* InsertTool(  size_t pos,
+                                    int toolId,
+                                    const wxString& label,
+                                    const wxBitmap& bitmap,
+                                    const wxBitmap& bmpDisabled = wxNullBitmap,
+                                    wxItemKind kind = wxITEM_NORMAL,
+                                    const wxString& shortHelp = wxEmptyString,
+                                    const wxString& longHelp = wxEmptyString,
+                                    wxObject *clientData = NULL);
+

     wxToolBarToolBase* InsertTool(size_t pos,
                                   wxToolBarToolBase* tool);
     //@}
     wxToolBarToolBase* InsertTool(size_t pos,
                                   wxToolBarToolBase* tool);
     //@}


@@ -976,5 +972,28 @@ public:
             tool.
     */
     virtual void ToggleTool(int toolId, bool toggle);
             tool.
     */
     virtual void ToggleTool(int toolId, bool toggle);

+
+
+    /**
+       Factory function to create a new toolbar tool.
+    */
+    virtual wxToolBarToolBase *CreateTool(int toolId,
+                                          const wxString& label,
+                                          const wxBitmap& bmpNormal,
+                                          const wxBitmap& bmpDisabled = wxNullBitmap,
+                                          wxItemKind kind = wxITEM_NORMAL,
+                                          wxObject *clientData = NULL,
+                                          const wxString& shortHelp = wxEmptyString,
+                                          const wxString& longHelp = wxEmptyString);
+    /**
+       Factory function to create a new control toolbar tool.
+    */
+    virtual wxToolBarToolBase *CreateTool(wxControl *control,
+                                          const wxString& label);
+
+    /**
+       Factory function to create a new separator toolbar tool.
+    */
+    wxToolBarToolBase *CreateSeparator()

 };
 
 };