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

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

diff --git a/include/wx/gtk/tbargtk.h b/include/wx/gtk/tbargtk.h
index 279f5e924ea4729bc44394f198ac11e53c9af5ee..07bff7128a392a882b595d133a685ddff5460d85 100644 (file)
--- a/include/wx/gtk/tbargtk.h
+++ b/include/wx/gtk/tbargtk.h
@@ -37,15 +37,11 @@ public:
                  wxWindowID id,
                  const wxPoint& pos = wxDefaultPosition,
                  const wxSize& size = wxDefaultSize,
                  wxWindowID id,
                  const wxPoint& pos = wxDefaultPosition,
                  const wxSize& size = wxDefaultSize,

-                 long style = 0,
+                 long style = wxTB_HORIZONTAL,

                  const wxString& name = wxToolBarNameStr );
 
     virtual ~wxToolBar();
 
                  const wxString& name = wxToolBarNameStr );
 
     virtual ~wxToolBar();
 

-    // override base class virtuals
-    virtual void SetMargins(int x, int y);
-    virtual void SetToolSeparation(int separation);
-

     virtual wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y) const;
 
     virtual void SetToolShortHelp(int id, const wxString& helpString);
     virtual wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y) const;
 
     virtual void SetToolShortHelp(int id, const wxString& helpString);


@@ -61,19 +57,10 @@ public:
     // implementation from now on
     // --------------------------
 
     // implementation from now on
     // --------------------------
 

-    GtkToolbar   *m_toolbar;
-
-    bool          m_blockEvent;
-

     void OnInternalIdle();
 
 protected:
     void OnInternalIdle();
 
 protected:

-    // common part of all ctors
-    void Init();
-
-    // set the GTK toolbar style and orientation
-    void GtkSetStyle();
-
+    virtual wxSize DoGetBestSize() const;

     virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const;
 
     // implement base class pure virtuals
     virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const;
 
     // implement base class pure virtuals


@@ -96,6 +83,14 @@ protected:
                                           const wxString& label);
 
 private:
                                           const wxString& label);
 
 private:

+    void Init();
+    void GtkSetStyle();
+    GSList* GetRadioGroup(size_t pos);
+    virtual void AddChildGTK(wxWindowGTK* child);
+
+    GtkToolbar* m_toolbar;
+    GtkTooltips* m_tooltips;
+

     DECLARE_DYNAMIC_CLASS(wxToolBar)
 };
 
     DECLARE_DYNAMIC_CLASS(wxToolBar)
 };