wxUSE_DISPLAY impossible with eVC3 (SDKs 2002).

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

diff --git a/include/wx/sizer.h b/include/wx/sizer.h
index 410b2c1e3726d5716f08b19b535c760ad4ea8183..2d3d87496c5952a22108a00adbc916fee8415eeb 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); }
@@ -81,7 +86,14 @@ public:
     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);
+#endif
     }