added CreateSeparatedButtonSizer(), changed signature and semantics of CreateButtonSi...

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

diff --git a/include/wx/sizer.h b/include/wx/sizer.h
index 1aab8730305864bf6bfa12790b8ba54e12dc204c..a17f61d079f504751950467b3ba34800f0740d99 100644 (file)
--- a/include/wx/sizer.h
+++ b/include/wx/sizer.h
@@ -69,6 +69,19 @@ public:
     wxSizerFlags& Left() { return Align(wxALIGN_LEFT); }
     wxSizerFlags& Right() { return Align(wxALIGN_RIGHT); }
 
     wxSizerFlags& Left() { return Align(wxALIGN_LEFT); }
     wxSizerFlags& Right() { return Align(wxALIGN_RIGHT); }
 

+    // default border size used by Border() below
+    static int GetDefaultBorder()
+    {
+#ifdef __SMARTPHONE__
+        // no borders by default on limited size screen
+        return 0;
+#else // !__SMARTPHONE__
+        // FIXME: default border size shouldn't be hardcoded and at the very
+        //        least they should depend on the current font size
+        return 5;
+#endif // __SMARTPHONE__/!__SMARTPHONE__
+    }
+

 
     wxSizerFlags& Border(int direction, int borderInPixels)
     {
 
     wxSizerFlags& Border(int direction, int borderInPixels)
     {


@@ -82,14 +95,13 @@ public:
 
     wxSizerFlags& Border(int direction = wxALL)
     {
 
     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
 #ifdef __SMARTPHONE__
         // no borders by default on limited size screen
         wxUnusedVar(direction);
 
         return *this;
 #else

-        return Border(direction, 5);
+        return Border(direction, GetDefaultBorder());

 #endif
     }
 
 #endif
     }
 


@@ -327,7 +339,7 @@ class WXDLLEXPORT wxSizer: public wxObject, public wxClientDataContainer
 {
 public:
     wxSizer() { m_containingWindow = NULL; }
 {
 public:
     wxSizer() { m_containingWindow = NULL; }

-    ~wxSizer();
+    virtual ~wxSizer();

 
     // methods for adding elements to the sizer: there are Add/Insert/Prepend
     // overloads for each of window/sizer/spacer/wxSizerItem
 
     // methods for adding elements to the sizer: there are Add/Insert/Prepend
     // overloads for each of window/sizer/spacer/wxSizerItem