routing native events first to the wx class and only if skipped call native handler

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

diff --git a/include/wx/gtk1/tbargtk.h b/include/wx/gtk1/tbargtk.h
index 10ee7d1f3c266688a676319afe2901e70daf4545..9055c1fc1e4b3d07b48218590d78754ac75258c1 100644 (file)
--- a/include/wx/gtk1/tbargtk.h
+++ b/include/wx/gtk1/tbargtk.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        tbargtk.h
+// Name:        wx/gtk1/tbargtk.h

 // Purpose:     GTK toolbar
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
 // Purpose:     GTK toolbar
 // Author:      Robert Roebling
 // RCS-ID:      $Id$


@@ -10,10 +10,6 @@
 #ifndef _WX_GTK_TBARGTK_H_
 #define _WX_GTK_TBARGTK_H_
 
 #ifndef _WX_GTK_TBARGTK_H_
 #define _WX_GTK_TBARGTK_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "tbargtk.h"
-#endif
-

 #if wxUSE_TOOLBAR
 
 // ----------------------------------------------------------------------------
 #if wxUSE_TOOLBAR
 
 // ----------------------------------------------------------------------------


@@ -58,7 +54,7 @@ public:
 
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);

-    
+

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


@@ -91,7 +87,8 @@ protected:
                                           wxObject *clientData,
                                           const wxString& shortHelpString,
                                           const wxString& longHelpString);
                                           wxObject *clientData,
                                           const wxString& shortHelpString,
                                           const wxString& longHelpString);

-    virtual wxToolBarToolBase *CreateTool(wxControl *control);
+    virtual wxToolBarToolBase *CreateTool(wxControl *control,
+                                          const wxString& label);

 
 private:
     DECLARE_DYNAMIC_CLASS(wxToolBar)
 
 private:
     DECLARE_DYNAMIC_CLASS(wxToolBar)