Corrected the signature for wxFrame::Maximize

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

diff --git a/include/wx/gtk1/tbargtk.h b/include/wx/gtk1/tbargtk.h
index 19b59ff9d20ff111578c80497e9e884fd4387c91..369ca4e9ca3e7343cf29e4abd35b35351f0e4dde 100644 (file)
--- a/include/wx/gtk1/tbargtk.h
+++ b/include/wx/gtk1/tbargtk.h
@@ -53,7 +53,8 @@ class wxToolBarTool: public wxObject
     wxToolBarTool( wxToolBar *owner, int theIndex = 0, 
       const wxBitmap& bitmap1 = wxNullBitmap, const wxBitmap& bitmap2 = wxNullBitmap,
       bool toggle = FALSE, wxObject *clientData = NULL, 
     wxToolBarTool( wxToolBar *owner, int theIndex = 0, 
       const wxBitmap& bitmap1 = wxNullBitmap, const wxBitmap& bitmap2 = wxNullBitmap,
       bool toggle = FALSE, wxObject *clientData = NULL, 

-      const wxString& shortHelpString = "", const wxString& longHelpString = "");
+      const wxString& shortHelpString = "", const wxString& longHelpString = "",
+      GtkWidget *item = NULL );

    ~wxToolBarTool(void);
 
   public:
    ~wxToolBarTool(void);
 
   public:


@@ -71,6 +72,7 @@ class wxToolBarTool: public wxObject
     wxString              m_shortHelpString;
     wxString              m_longHelpString;
     wxToolBar            *m_owner;
     wxString              m_shortHelpString;
     wxString              m_longHelpString;
     wxToolBar            *m_owner;

+    GtkWidget            *m_item;

 };
 
 //-----------------------------------------------------------------------------
 };
 
 //-----------------------------------------------------------------------------


@@ -113,11 +115,10 @@ class wxToolBar: public wxControl
     virtual void AddSeparator(void);
     virtual void ClearTools(void);
     
     virtual void AddSeparator(void);
     virtual void ClearTools(void);
     

-    virtual void Layout(void);
+    virtual void Realize(void);

 
     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

-    virtual void SetToggle(int toolIndex, bool toggle); // Set this to be togglable (or not)

     virtual wxObject *GetToolClientData(int index) const;
 
     virtual bool GetToolState(int toolIndex) const;
     virtual wxObject *GetToolClientData(int index) const;
 
     virtual bool GetToolState(int toolIndex) const;