Some more wxMotif improvements: DrawIcon fixed; generic notebook

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

diff --git a/include/wx/gtk/tbargtk.h b/include/wx/gtk/tbargtk.h
index 8a952ec2da8e4daa64b74d2a78c5d9f2b2461f1a..2b7ec30b31c6873b9c866291e24cd5a6cc76226c 100644 (file)
--- a/include/wx/gtk/tbargtk.h
+++ b/include/wx/gtk/tbargtk.h
@@ -2,8 +2,6 @@
 // Name:        tbargtk.h
 // Purpose:     GTK toolbar
 // Author:      Robert Roebling
-// Modified by:
-// Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Robert Roebling
 // Licence:    wxWindows licence
@@ -52,8 +50,9 @@ class wxToolBarTool: public wxObject
     wxToolBarTool(void) {}; 
     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 = "");
+      bool toggle = FALSE, wxObject *clientData = (wxObject *) NULL, 
+      const wxString& shortHelpString = "", const wxString& longHelpString = "",
+      GtkWidget *item = (GtkWidget *) NULL );
    ~wxToolBarTool(void);
 
   public:
@@ -71,6 +70,7 @@ class wxToolBarTool: public wxObject
     wxString              m_shortHelpString;
     wxString              m_longHelpString;
     wxToolBar            *m_owner;
+    GtkWidget            *m_item;
 };
 
 //-----------------------------------------------------------------------------
@@ -108,14 +108,15 @@ class wxToolBar: public wxControl
     // If toggle is TRUE, the button toggles between the two states.
     virtual wxToolBarTool *AddTool( int toolIndex, const wxBitmap& bitmap, 
       const wxBitmap& pushedBitmap = wxNullBitmap, bool toggle = FALSE,
-      float xPos = -1, float yPos = -1, wxObject *clientData = NULL,
+      float xPos = -1, float yPos = -1, wxObject *clientData = (wxObject *)NULL,
       const wxString& helpString1 = "", const wxString& helpString2 = "");
     virtual void AddSeparator(void);
     virtual void ClearTools(void);
+    
+    virtual bool Realize(void);
 
     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;
@@ -123,15 +124,30 @@ class wxToolBar: public wxControl
 
     virtual void SetMargins(int x, int y);
     void SetMargins(const wxSize& size) { SetMargins(size.x, size.y); };
+    virtual wxSize GetToolMargins(void) { return wxSize(m_xMargin, m_yMargin); }
+    
     virtual void SetToolPacking(int packing);
     virtual void SetToolSeparation(int separation);
-
-  public:
+    virtual int GetToolPacking();
+    virtual int GetToolSeparation();
+    
+    virtual wxString GetToolLongHelp(int toolIndex);
+    virtual wxString GetToolShortHelp(int toolIndex);
+    
+    virtual void SetToolLongHelp(int toolIndex, const wxString& helpString);
+    virtual void SetToolShortHelp(int toolIndex, const wxString& helpString);
+
+  // implementation
   
     GtkToolbar   *m_toolbar;
+    int           m_separation;
     wxList        m_tools;
-  
-  DECLARE_EVENT_TABLE()
+    
+    GdkColor      m_fg;
+    GdkColor      m_bg;
+    int           m_xMargin;
+    int           m_yMargin;
+    bool          m_hasToolAlready;
 };
 
 #endif