add wxScrollHelper::ShowScrollbars() (implemented for GTK only right now, generic...

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

diff --git a/include/wx/gtk1/tbargtk.h b/include/wx/gtk1/tbargtk.h
index 18f5243a8884a3aa7efda39e1f6c4b23bdd7e57e..9055c1fc1e4b3d07b48218590d78754ac75258c1 100644 (file)
--- a/include/wx/gtk1/tbargtk.h
+++ b/include/wx/gtk1/tbargtk.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        tbargtk.h
+// Name:        wx/gtk1/tbargtk.h
 // Purpose:     GTK toolbar
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
@@ -10,17 +10,13 @@
 #ifndef _WX_GTK_TBARGTK_H_
 #define _WX_GTK_TBARGTK_H_
 
-#ifdef __GNUG__
-    #pragma interface "tbargtk.h"
-#endif
-
 #if wxUSE_TOOLBAR
 
 // ----------------------------------------------------------------------------
 // wxToolBar
 // ----------------------------------------------------------------------------
 
-class wxToolBar : public wxToolBarBase
+class WXDLLIMPEXP_CORE wxToolBar : public wxToolBarBase
 {
 public:
     // construction/destruction
@@ -54,15 +50,17 @@ public:
 
     virtual void SetToolShortHelp(int id, const wxString& helpString);
 
+    virtual void SetWindowStyleFlag( long style );
+
+    static wxVisualAttributes
+    GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
+
     // implementation from now on
     // --------------------------
 
     GtkToolbar   *m_toolbar;
 
-    GdkColor     *m_fg;
-    GdkColor     *m_bg;
-
-    bool          m_blockNextEvent;
+    bool          m_blockEvent;
 
     void OnInternalIdle();
 
@@ -70,6 +68,9 @@ protected:
     // common part of all ctors
     void Init();
 
+    // set the GTK toolbar style and orientation
+    void GtkSetStyle();
+
     // implement base class pure virtuals
     virtual bool DoInsertTool(size_t pos, wxToolBarToolBase *tool);
     virtual bool DoDeleteTool(size_t pos, wxToolBarToolBase *tool);
@@ -79,13 +80,15 @@ protected:
     virtual void DoSetToggle(wxToolBarToolBase *tool, bool toggle);
 
     virtual wxToolBarToolBase *CreateTool(int id,
+                                          const wxString& label,
                                           const wxBitmap& bitmap1,
                                           const wxBitmap& bitmap2,
-                                          bool toggle,
+                                          wxItemKind kind,
                                           wxObject *clientData,
                                           const wxString& shortHelpString,
                                           const wxString& longHelpString);
-    virtual wxToolBarToolBase *CreateTool(wxControl *control);
+    virtual wxToolBarToolBase *CreateTool(wxControl *control,
+                                          const wxString& label);
 
 private:
     DECLARE_DYNAMIC_CLASS(wxToolBar)