avoid deprecated functions with GTK3

[wxWidgets.git] / include / wx / aui / auibar.h

diff --git a/include/wx/aui/auibar.h b/include/wx/aui/auibar.h
index 9eb7fc6eae89a8321c59972e5ec2240fa3c9eb1c..3e0439957f360926549ab6a9a5b039dc519aa2ce 100644 (file)
--- a/include/wx/aui/auibar.h
+++ b/include/wx/aui/auibar.h
@@ -457,10 +457,9 @@ public:
                 wxWindowID id = wxID_ANY,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 wxWindowID id = wxID_ANY,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,

-                long style = 0);
+                long style = wxAUI_TB_DEFAULT_STYLE);

 
 

-    void SetWindowStyleFlag(long style);
-    long GetWindowStyleFlag() const;
+    virtual void SetWindowStyleFlag(long style);

 
     void SetArtProvider(wxAuiToolBarArt* art);
     wxAuiToolBarArt* GetArtProvider() const;
 
     void SetArtProvider(wxAuiToolBarArt* art);
     wxAuiToolBarArt* GetArtProvider() const;


@@ -664,7 +663,6 @@ protected:
     bool m_dragging;
     bool m_gripperVisible;
     bool m_overflowVisible;
     bool m_dragging;
     bool m_gripperVisible;
     bool m_overflowVisible;

-    long m_style;

 
     bool RealizeHelper(wxClientDC& dc, bool horizontal);
     static bool IsPaneValid(long style, const wxAuiPaneInfo& pane);
 
     bool RealizeHelper(wxClientDC& dc, bool horizontal);
     static bool IsPaneValid(long style, const wxAuiPaneInfo& pane);