Add wxBitmap::GetNSImage() which creates an autoreleased NSImage either

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

diff --git a/include/wx/gtk/tbargtk.h b/include/wx/gtk/tbargtk.h
index 18f5243a8884a3aa7efda39e1f6c4b23bdd7e57e..c3c585be05f44c83f87e4b1a23cad614a8073125 100644 (file)
--- a/include/wx/gtk/tbargtk.h
+++ b/include/wx/gtk/tbargtk.h
@@ -10,7 +10,7 @@
 #ifndef _WX_GTK_TBARGTK_H_
 #define _WX_GTK_TBARGTK_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma interface "tbargtk.h"
 #endif
 
@@ -54,6 +54,8 @@ public:
 
     virtual void SetToolShortHelp(int id, const wxString& helpString);
 
+    virtual void SetWindowStyleFlag( long style );
+
     // implementation from now on
     // --------------------------
 
@@ -62,7 +64,7 @@ public:
     GdkColor     *m_fg;
     GdkColor     *m_bg;
 
-    bool          m_blockNextEvent;
+    bool          m_blockEvent;
 
     void OnInternalIdle();
 
@@ -70,6 +72,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,9 +84,10 @@ 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);