use "new" GtkToolbar API
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54995 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -37,15 +37,11 @@ public:
|
||||
wxWindowID id,
|
||||
const wxPoint& pos = wxDefaultPosition,
|
||||
const wxSize& size = wxDefaultSize,
|
||||
long style = 0,
|
||||
long style = wxTB_HORIZONTAL,
|
||||
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);
|
||||
@@ -61,19 +57,10 @@ public:
|
||||
// implementation from now on
|
||||
// --------------------------
|
||||
|
||||
GtkToolbar *m_toolbar;
|
||||
|
||||
bool m_blockEvent;
|
||||
|
||||
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
|
||||
@@ -96,6 +83,13 @@ protected:
|
||||
const wxString& label);
|
||||
|
||||
private:
|
||||
void Init();
|
||||
void GtkSetStyle();
|
||||
GSList* GetRadioGroup(size_t pos);
|
||||
|
||||
GtkToolbar* m_toolbar;
|
||||
GtkTooltips* m_tooltips;
|
||||
|
||||
DECLARE_DYNAMIC_CLASS(wxToolBar)
|
||||
};
|
||||
|
||||
|
Reference in New Issue
Block a user