fixed array tests compilation and a bug in obj array test

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

diff --git a/include/wx/gtk/tbargtk.h b/include/wx/gtk/tbargtk.h
index 1187c5887fcddc1affce22a3a7e48d09ef4b32ab..7c46a9dc340260fbd37937eda1d99625f519d66c 100644 (file)
--- a/include/wx/gtk/tbargtk.h
+++ b/include/wx/gtk/tbargtk.h
@@ -52,6 +52,10 @@ public:
 
     virtual wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y) const;
 
 
     virtual wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y) const;
 

+    virtual void SetToolShortHelp(int id, const wxString& helpString);
+
+    virtual void SetWindowStyleFlag( long style );
+

     // implementation from now on
     // --------------------------
 
     // implementation from now on
     // --------------------------
 


@@ -60,7 +64,7 @@ public:
     GdkColor     *m_fg;
     GdkColor     *m_bg;
 
     GdkColor     *m_fg;
     GdkColor     *m_bg;
 

-    bool          m_blockNextEvent;
+    bool          m_blockEvent;

 
     void OnInternalIdle();
 
 
     void OnInternalIdle();
 


@@ -68,6 +72,9 @@ protected:
     // common part of all ctors
     void Init();
 
     // 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);
     // implement base class pure virtuals
     virtual bool DoInsertTool(size_t pos, wxToolBarToolBase *tool);
     virtual bool DoDeleteTool(size_t pos, wxToolBarToolBase *tool);


@@ -77,9 +84,10 @@ protected:
     virtual void DoSetToggle(wxToolBarToolBase *tool, bool toggle);
 
     virtual wxToolBarToolBase *CreateTool(int id,
     virtual void DoSetToggle(wxToolBarToolBase *tool, bool toggle);
 
     virtual wxToolBarToolBase *CreateTool(int id,

+                                          const wxString& label,

                                           const wxBitmap& bitmap1,
                                           const wxBitmap& bitmap2,
                                           const wxBitmap& bitmap1,
                                           const wxBitmap& bitmap2,

-                                          bool toggle,
+                                          wxItemKind kind,

                                           wxObject *clientData,
                                           const wxString& shortHelpString,
                                           const wxString& longHelpString);
                                           wxObject *clientData,
                                           const wxString& shortHelpString,
                                           const wxString& longHelpString);