1. added encoding param to wxFontEncoding::EnumFamilies() which allows to get

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

diff --git a/include/wx/gtk/tbargtk.h b/include/wx/gtk/tbargtk.h
index a019cefabc2f3858c61f9251f9f8dc86ce44636d..c7f755e53097ced57686ba6422c049e0fcee73d0 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,10 +48,7 @@ extern const char *wxToolBarNameStr;
 
 class wxToolBar: public wxControl
 {
 
 class wxToolBar: public wxControl
 {

-  DECLARE_DYNAMIC_CLASS(wxToolBar)
-  
-  public:
-
+public:

     wxToolBar(void);
     wxToolBar( wxWindow *parent, wxWindowID id, 
       const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
     wxToolBar(void);
     wxToolBar( wxWindow *parent, wxWindowID id, 
       const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,


@@ -102,6 +102,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
   


@@ -114,8 +116,15 @@ class wxToolBar: public wxControl
     int           m_xMargin;
     int           m_yMargin;
     bool          m_hasToolAlready;
     int           m_xMargin;
     int           m_yMargin;
     bool          m_hasToolAlready;

+    
+    void OnInternalIdle();
+    
+private:
+    DECLARE_EVENT_TABLE()
+    DECLARE_DYNAMIC_CLASS(wxToolBar)

 };
 
 #endif
 };
 
 #endif

-    // __TBARGTKH__

 
 

+#endif
+    // __TBARGTKH__