wxWindow class work

[wxWidgets.git] / include / wx / gtk1 / tbargtk.h

diff --git a/include/wx/gtk1/tbargtk.h b/include/wx/gtk1/tbargtk.h
index 5c59c3814d385a897af42a4169534a2e18715904..beb2e04416dbe49ca51d81aa42cae3936875998a 100644 (file)
--- a/include/wx/gtk1/tbargtk.h
+++ b/include/wx/gtk1/tbargtk.h
@@ -49,11 +49,11 @@ extern const wxChar *wxToolBarNameStr;
 class wxToolBar: public wxControl
 {
 public:
 class wxToolBar: public wxControl
 {
 public:

-    wxToolBar(void);
+    wxToolBar();

     wxToolBar( wxWindow *parent, wxWindowID id, 
       const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
       long style = 0, const wxString& name = wxToolBarNameStr );
     wxToolBar( wxWindow *parent, wxWindowID id, 
       const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
       long style = 0, const wxString& name = wxToolBarNameStr );

-   ~wxToolBar(void);
+   ~wxToolBar();

 
    bool Create( wxWindow *parent, wxWindowID id, 
      const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
 
    bool Create( wxWindow *parent, wxWindowID id, 
      const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,


@@ -76,10 +76,16 @@ public:
       const wxBitmap& pushedBitmap = wxNullBitmap, bool toggle = FALSE,
       wxCoord xPos = -1, wxCoord yPos = -1, wxObject *clientData = (wxObject *)NULL,
       const wxString& helpString1 = "", const wxString& helpString2 = "");
       const wxBitmap& pushedBitmap = wxNullBitmap, bool toggle = FALSE,
       wxCoord xPos = -1, wxCoord yPos = -1, wxObject *clientData = (wxObject *)NULL,
       const wxString& helpString1 = "", const wxString& helpString2 = "");

-    virtual void AddSeparator(void);
-    virtual void ClearTools(void);

     
     

-    virtual bool Realize(void);
+    // Add arbitrary control
+    virtual bool AddControl(wxControl *control);
+      
+    // Add space
+    virtual void AddSeparator();
+    
+    virtual void ClearTools();
+    
+    virtual bool Realize();

 
     virtual void EnableTool(int toolIndex, bool enable);
     virtual void ToggleTool(int toolIndex, bool toggle); // toggle is TRUE if toggled on
 
     virtual void EnableTool(int toolIndex, bool enable);
     virtual void ToggleTool(int toolIndex, bool toggle); // toggle is TRUE if toggled on