Putting files back in the wxWidgets-$VERSION dir.

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

diff --git a/include/wx/sizer.h b/include/wx/sizer.h
index c4762c828e0753673a3397741608aaa213b1a614..62b49e681561fff90ff23de195ea30772c4540a7 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
     {
 
     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); }


@@ -224,9 +229,11 @@ public:
     bool IsSizer() const { return m_kind == Item_Sizer; }
     bool IsSpacer() const { return m_kind == Item_Spacer; }
 
     bool IsSizer() const { return m_kind == Item_Sizer; }
     bool IsSpacer() const { return m_kind == Item_Spacer; }
 

+#if WXWIN_COMPATIBILITY_2_6

     // Deprecated in 2.6, use {G,S}etProportion instead.
     wxDEPRECATED( void SetOption( int option ) );
     wxDEPRECATED( int GetOption() const );
     // Deprecated in 2.6, use {G,S}etProportion instead.
     wxDEPRECATED( void SetOption( int option ) );
     wxDEPRECATED( int GetOption() const );

+#endif // WXWIN_COMPATIBILITY_2_6

 
     void SetProportion( int proportion )
         { m_proportion = proportion; }
 
     void SetProportion( int proportion )
         { m_proportion = proportion; }


@@ -247,9 +254,14 @@ public:
         { return m_kind == Item_Sizer ? m_sizer : NULL; }
     wxSize GetSpacer() const;
 
         { return m_kind == Item_Sizer ? m_sizer : NULL; }
     wxSize GetSpacer() const;
 

-    void Show(bool show);
+    // this function behaves obviously for the windows and spacers but for the
+    // sizers it returns true if any sizer element is shown and only returns
+    // false if all of them are hidden

     bool IsShown() const;
     bool IsShown() const;

+    void Show(bool show);

 
 

+    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


@@ -269,6 +281,8 @@ protected:
     // common part of ctors taking wxSizerFlags
     void Init(const wxSizerFlags& flags);
 
     // common part of ctors taking wxSizerFlags
     void Init(const wxSizerFlags& flags);
 

+
+    // discriminated union: depending on m_kind one of the fields is valid

     enum
     {
         Item_None,
     enum
     {
         Item_None,


@@ -315,7 +329,7 @@ WX_DECLARE_EXPORTED_LIST( wxSizerItem, wxSizerItemList );
 class WXDLLEXPORT wxSizer: public wxObject, public wxClientDataContainer
 {
 public:
 class WXDLLEXPORT wxSizer: public wxObject, public wxClientDataContainer
 {
 public:

-    wxSizer();
+    wxSizer() { }

     ~wxSizer();
 
     // methods for adding elements to the sizer: there are Add/Insert/Prepend
     ~wxSizer();
 
     // methods for adding elements to the sizer: there are Add/Insert/Prepend


@@ -397,9 +411,12 @@ public:
     inline wxSizerItem* PrependStretchSpacer(int prop = 1);
 
 
     inline wxSizerItem* PrependStretchSpacer(int prop = 1);
 
 

+#if WXWIN_COMPATIBILITY_2_6

     // Deprecated in 2.6 since historically it does not delete the window,
     // use Detach instead.
     wxDEPRECATED( virtual bool Remove( wxWindow *window ) );
     // Deprecated in 2.6 since historically it does not delete the window,
     // use Detach instead.
     wxDEPRECATED( virtual bool Remove( wxWindow *window ) );

+#endif // WXWIN_COMPATIBILITY_2_6
+

     virtual bool Remove( wxSizer *sizer );
     virtual bool Remove( int index );
 
     virtual bool Remove( wxSizer *sizer );
     virtual bool Remove( int index );
 


@@ -479,18 +496,13 @@ public:
     // Recursively call wxWindow::Show () on all sizer items.
     virtual void ShowItems (bool show);
 
     // Recursively call wxWindow::Show () on all sizer items.
     virtual void ShowItems (bool show);
 

-    void Show(bool show)
-    {   m_isShown = show;
-        ShowItems(show);
-    }
-    bool IsShown() const { return m_isShown; }
+    void Show(bool show) { ShowItems(show); }

 
 protected:
     wxSize              m_size;
     wxSize              m_minSize;
     wxPoint             m_position;
     wxSizerItemList     m_children;
 
 protected:
     wxSize              m_size;
     wxSize              m_minSize;
     wxPoint             m_position;
     wxSizerItemList     m_children;

-    bool                m_isShown;

 
     wxSize GetMaxWindowSize( wxWindow *window ) const;
     wxSize GetMinWindowSize( wxWindow *window );
 
     wxSize GetMaxWindowSize( wxWindow *window ) const;
     wxSize GetMinWindowSize( wxWindow *window );


@@ -673,6 +685,7 @@ class WXDLLEXPORT wxStaticBoxSizer: public wxBoxSizer
 public:
     wxStaticBoxSizer(wxStaticBox *box, int orient);
     wxStaticBoxSizer(int orient, wxWindow *win, const wxString& label = wxEmptyString);
 public:
     wxStaticBoxSizer(wxStaticBox *box, int orient);
     wxStaticBoxSizer(int orient, wxWindow *win, const wxString& label = wxEmptyString);

+    virtual ~wxStaticBoxSizer();

 
     void RecalcSizes();
     wxSize CalcMin();
 
     void RecalcSizes();
     wxSize CalcMin();


@@ -683,6 +696,10 @@ public:
     // override to hide/show the static box as well
     virtual void ShowItems (bool show);
 
     // override to hide/show the static box as well
     virtual void ShowItems (bool show);
 

+    virtual bool Detach( wxWindow *window );
+    virtual bool Detach( wxSizer *sizer ) { return wxBoxSizer::Detach(sizer); }
+    virtual bool Detach( int index ) { return wxBoxSizer::Detach(index); }
+

 protected:
     wxStaticBox   *m_staticBox;
 
 protected:
     wxStaticBox   *m_staticBox;
 


@@ -758,7 +775,9 @@ class WXDLLEXPORT wxBookCtrlBase;
 class WXDLLEXPORT wxBookCtrlSizer : public wxSizer
 {
 public:
 class WXDLLEXPORT wxBookCtrlSizer : public wxSizer
 {
 public:

+#if WXWIN_COMPATIBILITY_2_6

     wxDEPRECATED( wxBookCtrlSizer(wxBookCtrlBase *bookctrl) );
     wxDEPRECATED( wxBookCtrlSizer(wxBookCtrlBase *bookctrl) );

+#endif // WXWIN_COMPATIBILITY_2_6

 
     wxBookCtrlBase *GetControl() const { return m_bookctrl; }
 
 
     wxBookCtrlBase *GetControl() const { return m_bookctrl; }
 


@@ -787,7 +806,9 @@ class WXDLLEXPORT wxNotebook;
 class WXDLLEXPORT wxNotebookSizer : public wxBookCtrlSizer
 {
 public:
 class WXDLLEXPORT wxNotebookSizer : public wxBookCtrlSizer
 {
 public:

+#if WXWIN_COMPATIBILITY_2_6

     wxDEPRECATED( wxNotebookSizer(wxNotebook *nb) );
     wxDEPRECATED( wxNotebookSizer(wxNotebook *nb) );

+#endif // WXWIN_COMPATIBILITY_2_6

 
     wxNotebook *GetNotebook() const { return (wxNotebook *)m_bookctrl; }
 
 
     wxNotebook *GetNotebook() const { return (wxNotebook *)m_bookctrl; }