From: Benjamin Williams <bwilliams@kirix.com>
Date: Wed, 25 Mar 2009 15:56:23 +0000 (+0000)
Subject: added ability to set tool alignment (#10174)
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/0eefa6597938743c8fa12bdbfc88c7e41c5a2e6b?ds=sidebyside

added ability to set tool alignment (#10174)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59855 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/include/wx/aui/auibar.h b/include/wx/aui/auibar.h
index 50a5018969..b8f6ff453b 100644
--- a/include/wx/aui/auibar.h
+++ b/include/wx/aui/auibar.h
@@ -119,6 +119,7 @@ public:
         dropdown = true;
         sticky = true;
         user_data = 0;
+        alignment = wxALIGN_CENTER;
     }
 
     wxAuiToolBarItem(const wxAuiToolBarItem& c)
@@ -152,6 +153,7 @@ public:
         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 SetAlignment(int l) { alignment = l; }
+    int GetAlignment() const { return alignment; }
+
 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
+    int alignment;             // sizer alignment flag, defaults to wxCENTER, may be wxEXPAND or any other
 };
 
 #ifndef SWIG
diff --git a/src/aui/auibar.cpp b/src/aui/auibar.cpp
index 67d5ba9af5..d398e2b795 100644
--- a/src/aui/auibar.cpp
+++ b/src/aui/auibar.cpp
@@ -1786,7 +1786,7 @@ bool wxAuiToolBar::Realize()
                 sizer_item = sizer->Add(size.x + (m_tool_border_padding*2),
                                         size.y + (m_tool_border_padding*2),
                                         item.proportion,
-                                        wxALIGN_CENTER);
+                                        item.alignment);
                 if (i+1 < count)
                 {
                     sizer->AddSpacer(m_tool_packing);
@@ -1803,7 +1803,7 @@ bool wxAuiToolBar::Realize()
                 sizer_item = sizer->Add(size.x + (m_tool_border_padding*2),
                                         size.y + (m_tool_border_padding*2),
                                         0,
-                                        wxALIGN_CENTER);
+                                        item.alignment);
                 // add tool packing
                 if (i+1 < count)
                 {