X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ac57418f39e9671c18b99942180563146625d3ae..f8c4475a3e579655f6a962822824596a7a9cfb66:/include/wx/gtk/tbargtk.h?ds=sidebyside

diff --git a/include/wx/gtk/tbargtk.h b/include/wx/gtk/tbargtk.h
index 7a864d8d40..5a6f17415d 100644
--- a/include/wx/gtk/tbargtk.h
+++ b/include/wx/gtk/tbargtk.h
@@ -15,8 +15,12 @@
 #endif
 
 #include "wx/defs.h"
+
+#if wxUSE_TOOLBAR
+
 #include "wx/control.h"
 #include "wx/bitmap.h"
+#include "wx/tbarbase.h"
 
 //-----------------------------------------------------------------------------
 // classes
@@ -36,43 +40,7 @@ class wxToolBar;
 // global data
 //-----------------------------------------------------------------------------
 
-extern const char *wxToolBarNameStr;
-
-//-----------------------------------------------------------------------------
-// wxToolBarTool
-//-----------------------------------------------------------------------------
-
-class wxToolBarTool: public wxObject
-{
-  DECLARE_DYNAMIC_CLASS(wxToolBarTool)
-  
-  public:
-
-    wxToolBarTool(void) {}; 
-    wxToolBarTool( wxToolBar *owner, int theIndex = 0, 
-      const wxBitmap& bitmap1 = wxNullBitmap, const wxBitmap& bitmap2 = wxNullBitmap,
-      bool toggle = FALSE, wxObject *clientData = (wxObject *) NULL, 
-      const wxString& shortHelpString = "", const wxString& longHelpString = "",
-      GtkWidget *item = (GtkWidget *) NULL );
-   ~wxToolBarTool(void);
-
-  public:
-  
-    int                   m_toolStyle;
-    wxObject             *m_clientData;
-    int                   m_index;
-    bool                  m_toggleState;
-    bool                  m_isToggle;
-    bool                  m_deleteSecondBitmap;
-    bool                  m_enabled;
-    wxBitmap              m_bitmap1;
-    wxBitmap              m_bitmap2;
-    bool                  m_isMenuCommand;
-    wxString              m_shortHelpString;
-    wxString              m_longHelpString;
-    wxToolBar            *m_owner;
-    GtkWidget            *m_item;
-};
+extern const wxChar *wxToolBarNameStr;
 
 //-----------------------------------------------------------------------------
 // wxToolBar
@@ -80,6 +48,7 @@ class wxToolBarTool: public wxObject
 
 class wxToolBar: public wxControl
 {
+  DECLARE_EVENT_TABLE()
   DECLARE_DYNAMIC_CLASS(wxToolBar)
   
   public:
@@ -137,6 +106,8 @@ class wxToolBar: public wxControl
     
     virtual void SetToolLongHelp(int toolIndex, const wxString& helpString);
     virtual void SetToolShortHelp(int toolIndex, const wxString& helpString);
+    
+    void OnIdle( wxIdleEvent &ievent );
 
   // implementation
   
@@ -152,5 +123,6 @@ class wxToolBar: public wxControl
 };
 
 #endif
-    // __TBARGTKH__
 
+#endif
+    // __TBARGTKH__