wxColour -> NSColor conversion.

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

diff --git a/include/wx/gtk1/tbargtk.h b/include/wx/gtk1/tbargtk.h
index f9bf606a30e0e6f3079fa24aca347fc370f7f485..9055c1fc1e4b3d07b48218590d78754ac75258c1 100644 (file)
--- a/include/wx/gtk1/tbargtk.h
+++ b/include/wx/gtk1/tbargtk.h
@@ -1,26 +1,22 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        tbargtk.h
+// Name:        wx/gtk1/tbargtk.h
 // Purpose:     GTK toolbar
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
 // Copyright:   (c) Robert Roebling
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_GTK_TBARGTK_H_
 #define _WX_GTK_TBARGTK_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "tbargtk.h"
-#endif
-
 #if wxUSE_TOOLBAR
 
 // ----------------------------------------------------------------------------
 // wxToolBar
 // ----------------------------------------------------------------------------
 
-class wxToolBar : public wxToolBarBase
+class WXDLLIMPEXP_CORE wxToolBar : public wxToolBarBase
 {
 public:
     // construction/destruction
@@ -58,15 +54,12 @@ public:
 
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
-    
+
     // implementation from now on
     // --------------------------
 
     GtkToolbar   *m_toolbar;
 
-    GdkColor     *m_fg;
-    GdkColor     *m_bg;
-
     bool          m_blockEvent;
 
     void OnInternalIdle();
@@ -94,7 +87,8 @@ protected:
                                           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)