Source and warning cleaning after enabling wxUSE_DATAVIEWCTRL in wxMSW builds.

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

diff --git a/include/wx/sizer.h b/include/wx/sizer.h
index 49c6c2817cbefd8b62349a26eafd842e03153869..bbab8447f93a9d59164a8394e321ed39339925c1 100644 (file)
--- a/include/wx/sizer.h
+++ b/include/wx/sizer.h
@@ -252,6 +252,10 @@ public:
         { return m_kind == Item_Sizer ? m_sizer : NULL; }
     wxSize GetSpacer() const;
 
         { return m_kind == Item_Sizer ? m_sizer : NULL; }
     wxSize GetSpacer() const;
 

+    // 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;

     void Show(bool show);
 
     void SetUserData(wxObject* userData)
     void Show(bool show);
 
     void SetUserData(wxObject* userData)


@@ -268,11 +272,6 @@ public:
     void SetSpacer(const wxSize& size);
     void SetSpacer(int width, int height) { SetSpacer(wxSize(width, height)); }
 
     void SetSpacer(const wxSize& size);
     void SetSpacer(int width, int height) { SetSpacer(wxSize(width, height)); }
 

-    // this function is deprecated because if this item is a sizer, then it
-    // doesn't really make sense: sizer is neither shown nor hidden, because
-    // some of its elements may be hidden while others are shown
-    wxDEPRECATED( bool IsShown() const );
-

 protected:
     // common part of several ctors
     void Init() { m_userData = NULL; }
 protected:
     // common part of several ctors
     void Init() { m_userData = NULL; }