added wxSizerFlags::Shaped() and FixedMinSize() methods

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

diff --git a/docs/changes.txt b/docs/changes.txt
index 2e43c330b5cf1008e146de3a39d019cb7669321c..5f8a6e27db0ffc5425bfd7ea625003fc3f6a97d7 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -91,6 +91,10 @@ Major new features in 2.8 release
 2.8.2
 -----
 
+All:
+
+- Added wxSizerFlags::Shaped() and FixedMinSize() methods
+
 wxMSW
 
 - Fix lack of spin control update event when control lost focus

diff --git a/docs/latex/wx/sizer.tex b/docs/latex/wx/sizer.tex
index 89c36cacd4e0aeee19ca3a031b610af48b6a5c94..a90b83bffd921cdb473086c33cad8441364af375 100644 (file)
--- a/docs/latex/wx/sizer.tex
+++ b/docs/latex/wx/sizer.tex
@@ -670,6 +670,14 @@ Aligns the object to the left, shortcut for \texttt{Align(wxALIGN\_LEFT)}
 \helpref{Align}{wxsizerflagsalign}
 
 
+\membersection{wxSizerFlags::FixedMinSize}\label{wxsizerflagsfixedminsize}
+
+\func{wxSizerFlags\& }{FixedMinSize}{\void}
+
+Set the \texttt{wxFIXED\_MINSIZE} flag which indicates that the initial size of
+the window should be also set as its minimal size.
+
+
 \membersection{wxSizerFlags::Proportion}\label{wxsizerflagsproportion}
 
 \func{wxSizerFlags\& }{Proportion}{\param{int }{proportion = 0}}
@@ -688,6 +696,14 @@ Aligns the object to the right, shortcut for \texttt{Align(wxALIGN\_RIGHT)}
 \helpref{Align}{wxsizerflagsalign}
 
 
+\membersection{wxSizerFlags::Shaped}\label{wxsizerflagsshaped}
+
+\func{wxSizerFlags\& }{Shaped}{\void}
+
+Set the \texttt{wx\_SHAPED} flag which indicates that the elements should
+always keep the fixed width to height ratio equal to its original value.
+
+
 \membersection{wxSizerFlags::TripleBorder}\label{wxsizerflagstriplebleborder}
 
 \func{wxSizerFlags\& }{TripleBorder}{\param{int }{direction = wxALL}}

diff --git a/include/wx/sizer.h b/include/wx/sizer.h
index befba5e7a7f408bb9c366d87c1d1502f508f6871..d477a2e0f4c930a9a2304f7fc546d73c4540b021 100644 (file)
--- a/include/wx/sizer.h
+++ b/include/wx/sizer.h
@@ -153,6 +153,23 @@ public:
 #endif
     }
 
+#if wxABI_VERSION >= 20802
+    // setters for the others flags
+    wxSizerFlags& Shaped()
+    {
+        m_flags |= wxSHAPED;
+
+        return *this;
+    }
+
+    wxSizerFlags& FixedMinSize()
+    {
+        m_flags |= wxFIXED_MINSIZE;
+
+        return *this;
+    }
+#endif // wx 2.8.2+
+
     // accessors for wxSizer only
     int GetProportion() const { return m_proportion; }
     int GetFlags() const { return m_flags; }

diff --git a/version-script.in b/version-script.in
index 9782ee2e2d1d6fd421c48b9f7b38f4956e5b65a5..14c31478466cc7a0775bedd2e7acbb120458b5b0 100644 (file)
--- a/version-script.in
+++ b/version-script.in
@@ -29,6 +29,8 @@
     global:
         # wxFileHistory::Set/GetBaseId()
         *wxFileHistory*etBaseId*;
+        *wxSizerFlags*Shaped*;
+        *wxSizerFlags*FixedMinSize*;
 };
 
 # public symbols added in 2.8.1 (please keep in alphabetical order):