Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update version script for wxAUI additions; use wxABI_VERSION check around the new wxAuiToolBar class

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@55284 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-08-26 12:35:18 +00:00
parent 893ffe7482
commit 7ac410e8b7
2 changed files with 83 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

147
include/wx/aui/auibar.h
View File

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

12
version-script.in
View File

@@ -24,18 +24,24 @@
# and once released its version cannot be changed. # and once released its version cannot be changed.
# public symbols added in 2.8.9 (please keep in alphabetical order):
# public symbols added in 2.8.8 (please keep in alphabetical order): # public symbols added in 2.8.8 (please keep in alphabetical order):
@WX_VERSION_TAG@.9 {
*wxAuiTabCtrl*OnCaptureLost*;
*wxAuiToolBar*;
};
@WX_VERSION_TAG@.8 { @WX_VERSION_TAG@.8 {
global: global:
*wxApp*MacHideApp*;
*TimeZone*Make*; *TimeZone*Make*;
*wxApp*MacHideApp*;
*wxBitmapButton*OnFocusChange*; *wxBitmapButton*OnFocusChange*;
*wxDocManager*MakeNewDocumentName*; *wxDocManager*MakeNewDocumentName*;
*wxEventLoopGuarantor*; *wxEventLoopGuarantor*;
*wxGridBagSizer*AdjustForOverflow*; *wxGridBagSizer*AdjustForOverflow*;
*wxRemotelyScrolledTreeCtrl*DoCalcScrolledPosition*; *wxRemotelyScrolledTreeCtrl*DoCalcScrolledPosition*;
*wxRemotelyScrolledTreeCtrl*SetScrollbar*; *wxRemotelyScrolledTreeCtrl*SetScrollbar*;
*wxRenderer_Draw*; *wxRenderer_Draw*;
*wxRichTextAction*CalculateRefreshOptimizations*; *wxRichTextAction*CalculateRefreshOptimizations*;
*wxRichTextCtrl*GetTextCursor*; *wxRichTextCtrl*GetTextCursor*;
*wxRichTextCtrl*GetURLCursor*; *wxRichTextCtrl*GetURLCursor*;
@@ -46,7 +52,7 @@
*wxSizer*ComputeFittingWindowSize*; *wxSizer*ComputeFittingWindowSize*;
*wxSizerFlags*ReserveSpaceEvenIfHidden*; *wxSizerFlags*ReserveSpaceEvenIfHidden*;
*wxSizerItem*ShouldAccountFor*; *wxSizerItem*ShouldAccountFor*;
*wxWebKitNewWindowEvent*; *wxWebKitNewWindowEvent*;
*wxWindowBase*ClientToWindowSize*; *wxWindowBase*ClientToWindowSize*;
*wxWindowBase*Get*Sibling*; *wxWindowBase*Get*Sibling*;
*wxWindowBase*WindowToClientSize*; *wxWindowBase*WindowToClientSize*;