From 9da38912d3503ae504f4110c5a3c7080cd513105 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 3 Sep 2008 07:28:03 +0000 Subject: [PATCH 1/1] include wx/control.h for the base class declaration (part of #9931) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55430 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/aui/auibar.h | 144 ++++++++++++++++++++-------------------- 1 file changed, 71 insertions(+), 73 deletions(-) diff --git a/include/wx/aui/auibar.h b/include/wx/aui/auibar.h index 197fdcab7b..4c24ded4df 100644 --- a/include/wx/aui/auibar.h +++ b/include/wx/aui/auibar.h @@ -9,16 +9,14 @@ // Licence: wxWindows Library Licence, Version 3.1 /////////////////////////////////////////////////////////////////////////////// - - #ifndef _WX_AUIBAR_H_ #define _WX_AUIBAR_H_ - #include "wx/defs.h" #if wxUSE_AUI +#include "wx/control.h" enum wxAuiToolBarStyle { @@ -75,22 +73,22 @@ public: bool IsDropDownClicked() const { return is_dropdown_clicked; } void SetDropDownClicked(bool c) { is_dropdown_clicked = c; } - + wxPoint GetClickPoint() const { return click_pt; } void SetClickPoint(const wxPoint& p) { click_pt = p; } - + wxRect GetItemRect() const { return rect; } void SetItemRect(const wxRect& r) { rect = r; } - + int GetToolId() const { return tool_id; } void SetToolId(int id) { tool_id = id; } - + public: bool is_dropdown_clicked; wxPoint click_pt; wxRect rect; int tool_id; - + #ifndef SWIG private: DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxAuiToolBarEvent) @@ -116,18 +114,18 @@ public: sticky = true; user_data = 0; } - + wxAuiToolBarItem(const wxAuiToolBarItem& c) { Assign(c); } - + wxAuiToolBarItem& operator=(const wxAuiToolBarItem& c) { Assign(c); return *this; } - + void Assign(const wxAuiToolBarItem& c) { window = c.window; @@ -149,9 +147,9 @@ public: sticky = c.sticky; user_data = c.user_data; } - + public: - + wxWindow* window; // item's associated window wxString label; // label displayed on the item wxBitmap bitmap; // item's bitmap @@ -187,46 +185,46 @@ public: wxAuiToolBarArt() { } virtual ~wxAuiToolBarArt() { } - + virtual wxAuiToolBarArt* Clone() = 0; - virtual void SetFlags(unsigned int flags) = 0; + virtual void SetFlags(unsigned int flags) = 0; virtual void SetFont(const wxFont& font) = 0; virtual void SetTextOrientation(int orientation) = 0; virtual void DrawBackground( wxDC& dc, wxWindow* wnd, - const wxRect& rect) = 0; - + const wxRect& rect) = 0; + virtual void DrawLabel( wxDC& dc, wxWindow* wnd, const wxAuiToolBarItem& item, const wxRect& rect) = 0; - + virtual void DrawButton( wxDC& dc, wxWindow* wnd, const wxAuiToolBarItem& item, const wxRect& rect) = 0; - + virtual void DrawDropDownButton( wxDC& dc, wxWindow* wnd, const wxAuiToolBarItem& item, const wxRect& rect) = 0; - + virtual void DrawControlLabel( wxDC& dc, wxWindow* wnd, const wxAuiToolBarItem& item, const wxRect& rect) = 0; - + virtual void DrawSeparator( wxDC& dc, wxWindow* wnd, const wxRect& rect) = 0; - + virtual void DrawGripper( wxDC& dc, wxWindow* wnd, @@ -237,20 +235,20 @@ public: wxWindow* wnd, const wxRect& rect, int state) = 0; - + virtual wxSize GetLabelSize( wxDC& dc, wxWindow* wnd, const wxAuiToolBarItem& item) = 0; - + virtual wxSize GetToolSize( wxDC& dc, wxWindow* wnd, const wxAuiToolBarItem& item) = 0; - + virtual int GetElementSize(int element_id) = 0; virtual void SetElementSize(int element_id, int size) = 0; - + virtual int ShowDropDown( wxWindow* wnd, const wxAuiToolBarItemArray& items) = 0; @@ -265,7 +263,7 @@ public: wxAuiDefaultToolBarArt(); virtual ~wxAuiDefaultToolBarArt(); - + virtual wxAuiToolBarArt* Clone(); virtual void SetFlags(unsigned int flags); virtual void SetFont(const wxFont& font); @@ -274,58 +272,58 @@ public: virtual void DrawBackground( wxDC& dc, wxWindow* wnd, - const wxRect& rect); - + const wxRect& rect); + virtual void DrawLabel( wxDC& dc, wxWindow* wnd, const wxAuiToolBarItem& item, const wxRect& rect); - + virtual void DrawButton( wxDC& dc, wxWindow* wnd, const wxAuiToolBarItem& item, const wxRect& rect); - + virtual void DrawDropDownButton( wxDC& dc, wxWindow* wnd, const wxAuiToolBarItem& item, const wxRect& rect); - + virtual void DrawControlLabel( wxDC& dc, wxWindow* wnd, const wxAuiToolBarItem& item, const wxRect& rect); - + virtual void DrawSeparator( wxDC& dc, wxWindow* wnd, const wxRect& rect); - + virtual void DrawGripper( wxDC& dc, wxWindow* wnd, const wxRect& rect); - + virtual void DrawOverflowButton( wxDC& dc, wxWindow* wnd, const wxRect& rect, int state); - + virtual wxSize GetLabelSize( wxDC& dc, wxWindow* wnd, const wxAuiToolBarItem& item); - + virtual wxSize GetToolSize( wxDC& dc, wxWindow* wnd, const wxAuiToolBarItem& item); - + virtual int GetElementSize(int element); virtual void SetElementSize(int element_id, int size); @@ -343,11 +341,11 @@ protected: wxFont m_font; unsigned int m_flags; int m_text_orientation; - + wxPen m_gripper_pen1; wxPen m_gripper_pen2; wxPen m_gripper_pen3; - + int m_separator_size; int m_gripper_size; int m_overflow_size; @@ -366,21 +364,21 @@ public: const wxSize& size = wxDefaultSize, long style = wxAUI_TB_DEFAULT_STYLE); ~wxAuiToolBar(); - + void SetWindowStyleFlag(long style); - + void SetArtProvider(wxAuiToolBarArt* art); wxAuiToolBarArt* GetArtProvider() const; bool SetFont(const wxFont& font); - + void AddTool(int tool_id, const wxString& label, const wxBitmap& bitmap, const wxString& short_help_string = wxEmptyString, wxItemKind kind = wxITEM_NORMAL); - + void AddTool(int tool_id, const wxString& label, const wxBitmap& bitmap, @@ -389,7 +387,7 @@ public: const wxString& short_help_string, const wxString& long_help_string, wxObject* client_data); - + void AddTool(int tool_id, const wxBitmap& bitmap, const wxBitmap& disabled_bitmap, @@ -407,7 +405,7 @@ public: long_help_string, client_data); } - + void AddLabel(int tool_id, const wxString& label = wxEmptyString, const int width = -1); @@ -416,82 +414,82 @@ public: void AddSeparator(); void AddSpacer(int pixels); void AddStretchSpacer(int proportion = 1); - + bool Realize(); wxControl* FindControl(int window_id); wxAuiToolBarItem* FindToolByPosition(wxCoord x, wxCoord y) const; wxAuiToolBarItem* FindToolByIndex(int idx) const; wxAuiToolBarItem* FindTool(int tool_id) const; - + void ClearTools() { Clear() ; } void Clear(); bool DeleteTool(int tool_id); bool DeleteByIndex(int tool_id); - + size_t GetToolCount() const; int GetToolPos(int tool_id) const { return GetToolIndex(tool_id); } int GetToolIndex(int tool_id) const; bool GetToolFits(int tool_id) const; wxRect GetToolRect(int tool_id) const; - bool GetToolFitsByIndex(int tool_id) const; + bool GetToolFitsByIndex(int tool_id) const; bool GetToolBarFits() const; - + void SetMargins(const wxSize& size) { SetMargins(size.x, size.x, size.y, size.y); } void SetMargins(int x, int y) { SetMargins(x, x, y, y); } void SetMargins(int left, int right, int top, int bottom); - + void SetToolBitmapSize(const wxSize& size); wxSize GetToolBitmapSize() const; bool GetOverflowVisible() const; void SetOverflowVisible(bool visible); - + bool GetGripperVisible() const; void SetGripperVisible(bool visible); - + void ToggleTool(int tool_id, bool state); bool GetToolToggled(int tool_id) const; - + void EnableTool(int tool_id, bool state); bool GetToolEnabled(int tool_id) const; - + void SetToolDropDown(int tool_id, bool dropdown); bool GetToolDropDown(int tool_id) const; void SetToolBorderPadding(int padding); int GetToolBorderPadding() const; - + void SetToolTextOrientation(int orientation); int GetToolTextOrientation() const; - + void SetToolPacking(int packing); int GetToolPacking() const; - + void SetToolProportion(int tool_id, int proportion); int GetToolProportion(int tool_id) const; - + void SetToolSeparation(int separation); int GetToolSeparation() const; - + void SetToolSticky(int tool_id, bool sticky); bool GetToolSticky(int tool_id) const; - + wxString GetToolLabel(int tool_id) const; void SetToolLabel(int tool_id, const wxString& label); - + wxBitmap GetToolBitmap(int tool_id) const; void SetToolBitmap(int tool_id, const wxBitmap& bitmap); - + wxString GetToolShortHelp(int tool_id) const; void SetToolShortHelp(int tool_id, const wxString& help_string); - + wxString GetToolLongHelp(int tool_id) const; void SetToolLongHelp(int tool_id, const wxString& help_string); - + void SetCustomOverflowItems(const wxAuiToolBarItemArray& prepend, const wxAuiToolBarItemArray& append); - + protected: virtual void OnCustomRender(wxDC& WXUNUSED(dc), @@ -505,7 +503,7 @@ protected: void SetHoverItem(wxAuiToolBarItem* item); void SetPressedItem(wxAuiToolBarItem* item); void RefreshOverflowState(); - + int GetOverflowState() const; wxRect GetOverflowRect() const; wxSize GetLabelSize(const wxString& label); @@ -516,7 +514,7 @@ protected: int width, int height, int sizeFlags = wxSIZE_AUTO); - + protected: // handlers void OnSize(wxSizeEvent& evt); @@ -532,7 +530,7 @@ protected: // handlers void OnMotion(wxMouseEvent& evt); void OnLeaveWindow(wxMouseEvent& evt); void OnSetCursor(wxSetCursorEvent& evt); - + protected: wxAuiToolBarItemArray m_items; // array of toolbar items @@ -547,7 +545,7 @@ protected: wxPoint m_action_pos; // position of left-mouse down wxAuiToolBarItemArray m_custom_overflow_prepend; wxAuiToolBarItemArray m_custom_overflow_append; - + int m_button_width; int m_button_height; int m_sizer_element_count; @@ -563,7 +561,7 @@ protected: bool m_gripper_visible; bool m_overflow_visible; long m_style; - + DECLARE_EVENT_TABLE() DECLARE_CLASS(wxAuiToolBar) }; @@ -587,7 +585,7 @@ typedef void (wxEvtHandler::*wxAuiToolBarEventFunction)(wxAuiToolBarEvent&); #define wxAuiToolBarEventHandler(func) \ (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxAuiToolBarEventFunction, &func) - + #define EVT_AUITOOLBAR_TOOL_DROPDOWN(winid, fn) \ wx__DECLARE_EVT1(wxEVT_COMMAND_AUITOOLBAR_TOOL_DROPDOWN, winid, wxAuiToolBarEventHandler(fn)) #define EVT_AUITOOLBAR_OVERFLOW_CLICK(winid, fn) \ -- 2.47.2