don't draw borders for bitmap buttons with wxBORDER_NONE style

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

diff --git a/include/wx/gtk/tbargtk.h b/include/wx/gtk/tbargtk.h
index 0b688d0ffaa1bdae6b4bc2c36fd985a7fdabbe83..07bff7128a392a882b595d133a685ddff5460d85 100644 (file)
--- a/include/wx/gtk/tbargtk.h
+++ b/include/wx/gtk/tbargtk.h
@@ -25,7 +25,7 @@ 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 )
     {
         Init();
                const wxString& name = wxToolBarNameStr )
     {
         Init();


@@ -37,39 +37,31 @@ 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 void SetWindowStyleFlag( long style );
 
     virtual wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y) const;
 
     virtual void SetToolShortHelp(int id, const wxString& helpString);
 
     virtual void SetWindowStyleFlag( long style );
 

+    virtual void SetToolNormalBitmap(int id, const wxBitmap& bitmap);
+    virtual void SetToolDisabledBitmap(int id, const wxBitmap& bitmap);
+

     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);

-    
+

     // 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 bool DoInsertTool(size_t pos, wxToolBarToolBase *tool);
 
     // implement base class pure virtuals
     virtual bool DoInsertTool(size_t pos, wxToolBarToolBase *tool);


@@ -87,9 +79,18 @@ 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:
 
 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)
 };