fixes for Unicode build with CodeWarrior under OS X 10.2 (patch 1373217)

[wxWidgets.git] / include / wx / sizer.h

diff --git a/include/wx/sizer.h b/include/wx/sizer.h
index c4762c828e0753673a3397741608aaa213b1a614..ebb3cc240421cb87e9b5eef2a0609b6747aa9ea8 100644 (file)
--- a/include/wx/sizer.h
+++ b/include/wx/sizer.h
@@ -54,14 +54,19 @@ public:
 
     wxSizerFlags& Align(int alignment) // combination of wxAlignment values
     {
-        m_flags &= wxALL;
+        m_flags &= ~wxALIGN_MASK;
         m_flags |= alignment;
 
         return *this;
     }
 
+    wxSizerFlags& Expand()
+    {
+        m_flags |= wxEXPAND;
+        return *this;
+    }
+
     // some shortcuts for Align()
-    wxSizerFlags& Expand() { return Align(wxEXPAND); }
     wxSizerFlags& Centre() { return Align(wxCENTRE); }
     wxSizerFlags& Center() { return Centre(); }
     wxSizerFlags& Left() { return Align(wxALIGN_LEFT); }
@@ -250,6 +255,8 @@ public:
     void Show(bool show);
     bool IsShown() const;
 
+    void SetUserData(wxObject* userData)
+        { delete userData; m_userData = userData; }
     wxObject* GetUserData() const
         { return m_userData; }
     wxPoint GetPosition() const