added wxSizerFlags::GetDefaultBorder()

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

diff --git a/docs/latex/wx/sizer.tex b/docs/latex/wx/sizer.tex
index 2a299415428c9eb990bb5627305cc4446ec90ed6..87aa48b05d5e9f6c414bfe2b61ca8c59aeb6b972 100644 (file)
--- a/docs/latex/wx/sizer.tex
+++ b/docs/latex/wx/sizer.tex
@@ -563,14 +563,14 @@ above.
 
 \func{}{wxSizerFlags}{\param{int }{proportion = 0}}
 
 
 \func{}{wxSizerFlags}{\param{int }{proportion = 0}}
 

-Creates the wxSizer with the proportion specified by \tt{proportion}.
+Creates the wxSizer with the proportion specified by \arg{proportion}.

 
 
 \membersection{wxSizerFlags::Align}\label{wxsizerflagsalign}
 
 \func{wxSizerFlags\& }{Align}{\param{int }{align = 0}}
 
 
 
 \membersection{wxSizerFlags::Align}\label{wxsizerflagsalign}
 
 \func{wxSizerFlags\& }{Align}{\param{int }{align = 0}}
 

-Sets the alignment of this wxSizerFlags to \tt{align}.
+Sets the alignment of this wxSizerFlags to \arg{align}.

 
 Note that if this method is not called, the wxSizerFlags has no specified alignment.
 
 
 Note that if this method is not called, the wxSizerFlags has no specified alignment.
 


@@ -585,11 +585,14 @@ Note that if this method is not called, the wxSizerFlags has no specified alignm
 
 \func{wxSizerFlags\& }{Border}{\param{int }{direction}, \param{int }{borderinpixels}}
 
 
 \func{wxSizerFlags\& }{Border}{\param{int }{direction}, \param{int }{borderinpixels}}
 

-Sets the wxSizerFlags to have a border of a number of pixels specified by \tt{borderinpixels} with the directions specified by \tt{direction}.
-

 \func{wxSizerFlags\& }{Border}{\param{int }{direction = wxALL}}
 
 \func{wxSizerFlags\& }{Border}{\param{int }{direction = wxALL}}
 

-Sets the wxSizerFlags to have a border of a default size with the directions specified by \tt{direction}.
+Sets the wxSizerFlags to have a border of a number of pixels specified by
+\arg{borderinpixels} with the directions specified by \arg{direction}.
+
+In the overloaded version without \arg{borderinpixels} parameter, the border of
+default size, as returned by \helpref{GetDefaultBorder}{wxsizerflagsgetdefaultborder},
+is used.

 
 
 \membersection{wxSizerFlags::Center}\label{wxsizerflagscenter}
 
 
 \membersection{wxSizerFlags::Center}\label{wxsizerflagscenter}


@@ -613,7 +616,13 @@ Sets the object of the wxSizerFlags to center itself in the area it is given.
 Sets the object of the wxSizerFlags to expand to fill as much area as it can.
 
 
 Sets the object of the wxSizerFlags to expand to fill as much area as it can.
 
 

-\membersection{wxSizerFlags::Left}\label{wxsizerflagsleft}
+\membersection{wxSizerFlags::GetDefaultBorder}\label{wxsizerflagsgetdefaultborder}
+
+\func{static int}{GetDefaultBorder}{\void}
+
+Returns the border used by default in \helpref{Border}{wxsizerflagsborder} method.
+
+

 \membersection{wxSizerFlags::Left}\label{wxsizerflagsleft}
 
 \func{wxSizerFlags\& }{Left}{\void}
 \membersection{wxSizerFlags::Left}\label{wxsizerflagsleft}
 
 \func{wxSizerFlags\& }{Left}{\void}


@@ -629,7 +638,7 @@ Aligns the object to the left, shortcut for \texttt{Align(wxALIGN\_LEFT)}
 
 \func{wxSizerFlags\& }{Proportion}{\param{int }{proportion = 0}}
 
 
 \func{wxSizerFlags\& }{Proportion}{\param{int }{proportion = 0}}
 

-Sets the proportion of this wxSizerFlags to \tt{proportion}
+Sets the proportion of this wxSizerFlags to \arg{proportion}

 
 
 \membersection{wxSizerFlags::Right}\label{wxsizerflagsright}
 
 
 \membersection{wxSizerFlags::Right}\label{wxsizerflagsright}

diff --git a/include/wx/sizer.h b/include/wx/sizer.h
index e278b0d2bac35e2cbc114d3da8946fa3b300b87a..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
     }
 

diff --git a/src/generic/aboutdlgg.cpp b/src/generic/aboutdlgg.cpp
index 21a6a057543264aeef4e441099f12db189645674..11a545c816a84be346c45b676a7fbc1dca132b90 100644 (file)
--- a/src/generic/aboutdlgg.cpp
+++ b/src/generic/aboutdlgg.cpp
@@ -152,7 +152,7 @@ bool wxGenericAboutDialog::Create(const wxAboutDialogInfo& info)
     wxSizer *sizerTop = new wxBoxSizer(wxVERTICAL);
     sizerTop->Add(sizerIconAndText, wxSizerFlags(1).Expand().Border());
 
     wxSizer *sizerTop = new wxBoxSizer(wxVERTICAL);
     sizerTop->Add(sizerIconAndText, wxSizerFlags(1).Expand().Border());
 

-    int defBorder = wxSizerFlags().Border().GetBorderInPixels();
+    const int defBorder = wxSizerFlags::GetDefaultBorder();

     wxSizer *buttonSizer = CreateButtonSizer( wxOK , false, defBorder );
     if(buttonSizer->GetChildren().GetCount() > 0 )
     {
     wxSizer *buttonSizer = CreateButtonSizer( wxOK , false, defBorder );
     if(buttonSizer->GetChildren().GetCount() > 0 )
     {