wxPython 2.1b1 for wxMSW (wxGTK coming soon)

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

diff --git a/include/wx/gtk/tbargtk.h b/include/wx/gtk/tbargtk.h
index a019cefabc2f3858c61f9251f9f8dc86ce44636d..5a6f17415dcdcec6781685ab80b6e1e6affbdc17 100644 (file)
--- a/include/wx/gtk/tbargtk.h
+++ b/include/wx/gtk/tbargtk.h
@@ -15,6 +15,9 @@
 #endif
 
 #include "wx/defs.h"
 #endif
 
 #include "wx/defs.h"

+
+#if wxUSE_TOOLBAR
+

 #include "wx/control.h"
 #include "wx/bitmap.h"
 #include "wx/tbarbase.h"
 #include "wx/control.h"
 #include "wx/bitmap.h"
 #include "wx/tbarbase.h"


@@ -37,7 +40,7 @@ class wxToolBar;
 // global data
 //-----------------------------------------------------------------------------
 
 // global data
 //-----------------------------------------------------------------------------
 

-extern const char *wxToolBarNameStr;
+extern const wxChar *wxToolBarNameStr;

 
 //-----------------------------------------------------------------------------
 // wxToolBar
 
 //-----------------------------------------------------------------------------
 // wxToolBar


@@ -45,6 +48,7 @@ extern const char *wxToolBarNameStr;
 
 class wxToolBar: public wxControl
 {
 
 class wxToolBar: public wxControl
 {

+  DECLARE_EVENT_TABLE()

   DECLARE_DYNAMIC_CLASS(wxToolBar)
   
   public:
   DECLARE_DYNAMIC_CLASS(wxToolBar)
   
   public:


@@ -102,6 +106,8 @@ class wxToolBar: public wxControl
     
     virtual void SetToolLongHelp(int toolIndex, const wxString& helpString);
     virtual void SetToolShortHelp(int toolIndex, const wxString& helpString);
     
     virtual void SetToolLongHelp(int toolIndex, const wxString& helpString);
     virtual void SetToolShortHelp(int toolIndex, const wxString& helpString);

+    
+    void OnIdle( wxIdleEvent &ievent );

 
   // implementation
   
 
   // implementation
   


@@ -117,5 +123,6 @@ class wxToolBar: public wxControl
 };
 
 #endif
 };
 
 #endif

-    // __TBARGTKH__

 
 

+#endif
+    // __TBARGTKH__