Commented out call that breaks metal style setting before Create

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

diff --git a/include/wx/sizer.h b/include/wx/sizer.h
index 53dde1a4bf464c5c7cf06379e3eb5c460ec2e192..bbab8447f93a9d59164a8394e321ed39339925c1 100644 (file)
--- a/include/wx/sizer.h
+++ b/include/wx/sizer.h
@@ -252,8 +252,11 @@ 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; }
 
     void SetUserData(wxObject* userData)
         { delete m_userData; m_userData = userData; }


@@ -276,6 +279,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,


@@ -322,7 +327,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


@@ -486,18 +491,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 );