don't draw borders for bitmap buttons with wxBORDER_NONE style

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

diff --git a/include/wx/aui/auibar.h b/include/wx/aui/auibar.h
index 13d6015cdf81cb4806c574cb5fc26ac48a355d99..b8f6ff453bc39b6a4c9536f92aafe15bec0ad717 100644 (file)
--- a/include/wx/aui/auibar.h
+++ b/include/wx/aui/auibar.h
@@ -119,6 +119,7 @@ public:
         dropdown = true;
         sticky = true;
         user_data = 0;
         dropdown = true;
         sticky = true;
         user_data = 0;

+        alignment = wxALIGN_CENTER;

     }
 
     wxAuiToolBarItem(const wxAuiToolBarItem& c)
     }
 
     wxAuiToolBarItem(const wxAuiToolBarItem& c)


@@ -152,6 +153,7 @@ public:
         dropdown = c.dropdown;
         sticky = c.sticky;
         user_data = c.user_data;
         dropdown = c.dropdown;
         sticky = c.sticky;
         user_data = c.user_data;

+        alignment = c.alignment;

     }
 
 
     }
 
 


@@ -209,6 +211,9 @@ public:
     void SetUserData(long l) { user_data = l; }
     long GetUserData() const { return user_data; }
 
     void SetUserData(long l) { user_data = l; }
     long GetUserData() const { return user_data; }
 

+    void SetAlignment(int l) { alignment = l; }
+    int GetAlignment() const { return alignment; }
+

 private:
 
     wxWindow* window;          // item's associated window
 private:
 
     wxWindow* window;          // item's associated window


@@ -229,6 +234,7 @@ private:
     bool dropdown;             // true if the item has a dropdown button
     bool sticky;               // overrides button states if true (always active)
     long user_data;            // user-specified data
     bool dropdown;             // true if the item has a dropdown button
     bool sticky;               // overrides button states if true (always active)
     long user_data;            // user-specified data

+    int alignment;             // sizer alignment flag, defaults to wxCENTER, may be wxEXPAND or any other

 };
 
 #ifndef SWIG
 };
 
 #ifndef SWIG


@@ -249,8 +255,11 @@ public:
 
     virtual wxAuiToolBarArt* Clone() = 0;
     virtual void SetFlags(unsigned int flags) = 0;
 
     virtual wxAuiToolBarArt* Clone() = 0;
     virtual void SetFlags(unsigned int flags) = 0;

+    virtual unsigned int GetFlags() = 0;

     virtual void SetFont(const wxFont& font) = 0;
     virtual void SetFont(const wxFont& font) = 0;

+    virtual wxFont GetFont() = 0;

     virtual void SetTextOrientation(int orientation) = 0;
     virtual void SetTextOrientation(int orientation) = 0;

+    virtual int GetTextOrientation() = 0;

 
     virtual void DrawBackground(
                          wxDC& dc,
 
     virtual void DrawBackground(
                          wxDC& dc,


@@ -327,8 +336,11 @@ public:
 
     virtual wxAuiToolBarArt* Clone();
     virtual void SetFlags(unsigned int flags);
 
     virtual wxAuiToolBarArt* Clone();
     virtual void SetFlags(unsigned int flags);

+    virtual unsigned int GetFlags();

     virtual void SetFont(const wxFont& font);
     virtual void SetFont(const wxFont& font);

+    virtual wxFont GetFont();

     virtual void SetTextOrientation(int orientation);
     virtual void SetTextOrientation(int orientation);

+    virtual int GetTextOrientation();

 
     virtual void DrawBackground(
                 wxDC& dc,
 
     virtual void DrawBackground(
                 wxDC& dc,


@@ -427,6 +439,7 @@ public:
     virtual ~wxAuiToolBar();
 
     void SetWindowStyleFlag(long style);
     virtual ~wxAuiToolBar();
 
     void SetWindowStyleFlag(long style);

+    long GetWindowStyleFlag() const;

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


@@ -634,18 +647,16 @@ protected:
 
 #ifndef SWIG
 
 
 #ifndef SWIG
 

-BEGIN_DECLARE_EVENT_TYPES()
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_AUI, wxEVT_COMMAND_AUITOOLBAR_TOOL_DROPDOWN, 0)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_AUI, wxEVT_COMMAND_AUITOOLBAR_OVERFLOW_CLICK, 0)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_AUI, wxEVT_COMMAND_AUITOOLBAR_RIGHT_CLICK, 0)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_AUI, wxEVT_COMMAND_AUITOOLBAR_MIDDLE_CLICK, 0)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_AUI, wxEVT_COMMAND_AUITOOLBAR_BEGIN_DRAG, 0)
-END_DECLARE_EVENT_TYPES()
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_AUI, wxEVT_COMMAND_AUITOOLBAR_TOOL_DROPDOWN, wxAuiToolBarEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_AUI, wxEVT_COMMAND_AUITOOLBAR_OVERFLOW_CLICK, wxAuiToolBarEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_AUI, wxEVT_COMMAND_AUITOOLBAR_RIGHT_CLICK, wxAuiToolBarEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_AUI, wxEVT_COMMAND_AUITOOLBAR_MIDDLE_CLICK, wxAuiToolBarEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_AUI, wxEVT_COMMAND_AUITOOLBAR_BEGIN_DRAG, wxAuiToolBarEvent );

 
 typedef void (wxEvtHandler::*wxAuiToolBarEventFunction)(wxAuiToolBarEvent&);
 
 #define wxAuiToolBarEventHandler(func) \
 
 typedef void (wxEvtHandler::*wxAuiToolBarEventFunction)(wxAuiToolBarEvent&);
 
 #define wxAuiToolBarEventHandler(func) \

-    (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxAuiToolBarEventFunction, &func)
+    wxEVENT_HANDLER_CAST(wxAuiToolBarEventFunction, func)

 
 #define EVT_AUITOOLBAR_TOOL_DROPDOWN(winid, fn) \
     wx__DECLARE_EVT1(wxEVT_COMMAND_AUITOOLBAR_TOOL_DROPDOWN, winid, wxAuiToolBarEventHandler(fn))
 
 #define EVT_AUITOOLBAR_TOOL_DROPDOWN(winid, fn) \
     wx__DECLARE_EVT1(wxEVT_COMMAND_AUITOOLBAR_TOOL_DROPDOWN, winid, wxAuiToolBarEventHandler(fn))