From b8c38c45090eaae1551866309559142dda632d94 Mon Sep 17 00:00:00 2001 From: Benjamin Williams Date: Mon, 8 Sep 2008 09:54:28 +0000 Subject: [PATCH] fix aui sample breakage; added some accessor methods to wxAuiToolBarItem git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@55522 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/aui/auibar.h | 9 +++++++++ samples/aui/auidemo.cpp | 8 ++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/include/wx/aui/auibar.h b/include/wx/aui/auibar.h index 6ee4a4df4b..8159713989 100644 --- a/include/wx/aui/auibar.h +++ b/include/wx/aui/auibar.h @@ -155,10 +155,19 @@ public: } + void SetWindow(wxWindow* w) { window = w; } wxWindow* GetWindow() { return window; } + + void SetId(int new_id) { id = new_id; } int GetId() const { return id; } + + void SetKind(int new_kind) { kind = new_kind; } int GetKind() const { return kind; } + + void SetState(int new_state) { state = new_state; } int GetState() const { return state; } + + void SetSizerItem(wxSizerItem* s) { sizer_item = s; } wxSizerItem* GetSizerItem() const { return sizer_item; } void SetLabel(const wxString& s) { label = s; } diff --git a/samples/aui/auidemo.cpp b/samples/aui/auidemo.cpp index 65b12ec09f..40e0e0a936 100644 --- a/samples/aui/auidemo.cpp +++ b/samples/aui/auidemo.cpp @@ -757,11 +757,11 @@ MyFrame::MyFrame(wxWindow* parent, wxAuiToolBarItemArray prepend_items; wxAuiToolBarItemArray append_items; wxAuiToolBarItem item; - item.kind = wxITEM_SEPARATOR; + item.SetKind(wxITEM_SEPARATOR); append_items.Add(item); - item.kind = wxITEM_NORMAL; - item.id = ID_CustomizeToolbar; - item.label = _("Customize..."); + item.SetKind(wxITEM_NORMAL); + item.SetId(ID_CustomizeToolbar); + item.SetLabel(_("Customize...")); append_items.Add(item);