X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/15f7c30516facfb272fc116aec4d3f9c3a9de085..50ccc908dc4e6376de91edd7f74018898fd690b1:/include/wx/sizer.h diff --git a/include/wx/sizer.h b/include/wx/sizer.h index 332b08d804..8ae125062d 100644 --- a/include/wx/sizer.h +++ b/include/wx/sizer.h @@ -604,7 +604,10 @@ public: wxSize Fit( wxWindow *window ); void FitInside( wxWindow *window ); void SetSizeHints( wxWindow *window ); - void SetVirtualSizeHints( wxWindow *window ); +#if WXWIN_COMPATIBILITY_2_8 + // This only calls FitInside() since 2.9 + wxDEPRECATED( void SetVirtualSizeHints( wxWindow *window ) ); +#endif wxSizerItemList& GetChildren() { return m_children; } @@ -814,7 +817,7 @@ public: protected: // helpers for our code: this returns the component of the given wxSize in // the direction of the sizer and in the other direction, respectively - int SizeInMajorDir(const wxSize& sz) const + int GetSizeInMajorDir(const wxSize& sz) const { return m_orient == wxHORIZONTAL ? sz.x : sz.y; } @@ -829,7 +832,7 @@ protected: return m_orient == wxHORIZONTAL ? pt.x : pt.y; } - int SizeInMinorDir(const wxSize& sz) const + int GetSizeInMinorDir(const wxSize& sz) const { return m_orient == wxHORIZONTAL ? sz.y : sz.x; } @@ -899,8 +902,7 @@ protected: void AdjustPropLastItem(wxSizer *psz, wxSizerItem *itemLast); -private: - DECLARE_DYNAMIC_CLASS(wxWrapSizer); + DECLARE_DYNAMIC_CLASS(wxWrapSizer) }; //---------------------------------------------------------------------------