Applied patch [ 1255676 ] stc2wx/wx2stc not exported (Win32 Unicode DLL)

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

diff --git a/include/wx/sizer.h b/include/wx/sizer.h
index 28965fe97ed880a1cc5d910cd4ce5b35833f5e4f..53dde1a4bf464c5c7cf06379e3eb5c460ec2e192 100644 (file)
--- a/include/wx/sizer.h
+++ b/include/wx/sizer.h
@@ -18,7 +18,6 @@
 #include "wx/window.h"
 #include "wx/frame.h"
 #include "wx/dialog.h"
 #include "wx/window.h"
 #include "wx/frame.h"
 #include "wx/dialog.h"

-#include "wx/bookctrl.h"

 
 //---------------------------------------------------------------------------
 // classes
 
 //---------------------------------------------------------------------------
 // classes


@@ -55,14 +54,19 @@ public:
 
     wxSizerFlags& Align(int alignment) // combination of wxAlignment values
     {
 
     wxSizerFlags& Align(int alignment) // combination of wxAlignment values
     {

-        m_flags &= wxALL;
+        m_flags &= ~wxALIGN_MASK;

         m_flags |= alignment;
 
         return *this;
     }
 
         m_flags |= alignment;
 
         return *this;
     }
 

+    wxSizerFlags& Expand()
+    {
+        m_flags |= wxEXPAND;
+        return *this;
+    }
+

     // some shortcuts for Align()
     // some shortcuts for Align()

-    wxSizerFlags& Expand() { return Align(wxEXPAND); }

     wxSizerFlags& Centre() { return Align(wxCENTRE); }
     wxSizerFlags& Center() { return Centre(); }
     wxSizerFlags& Left() { return Align(wxALIGN_LEFT); }
     wxSizerFlags& Centre() { return Align(wxCENTRE); }
     wxSizerFlags& Center() { return Centre(); }
     wxSizerFlags& Left() { return Align(wxALIGN_LEFT); }


@@ -82,7 +86,14 @@ public:
     wxSizerFlags& Border(int direction = wxALL)
     {
         // FIXME: default border size shouldn't be hardcoded
     wxSizerFlags& Border(int direction = wxALL)
     {
         // FIXME: default border size shouldn't be hardcoded

+#ifdef __SMARTPHONE__
+        // no borders by default on limited size screen
+        wxUnusedVar(direction);
+
+        return *this;
+#else

         return Border(direction, 5);
         return Border(direction, 5);

+#endif

     }
 
 
     }
 
 


@@ -244,6 +255,8 @@ public:
     void Show(bool show);
     bool IsShown() const;
 
     void Show(bool show);
     bool IsShown() const;
 

+    void SetUserData(wxObject* userData)
+        { delete m_userData; m_userData = userData; }

     wxObject* GetUserData() const
         { return m_userData; }
     wxPoint GetPosition() const
     wxObject* GetUserData() const
         { return m_userData; }
     wxPoint GetPosition() const