remove extra semicolons, correct virtual access

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53541 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2008-05-10 17:48:44 +00:00
parent f92ef8536a
commit 573bd31feb
2 changed files with 6 additions and 7 deletions

View File

@@ -39,6 +39,10 @@ public:
virtual wxSize CalcMin(); virtual wxSize CalcMin();
virtual void RecalcSizes(); virtual void RecalcSizes();
virtual bool InformFirstDirection(int direction,
int size,
int availableOtherDir);
protected: protected:
// This method is called to decide if an item represents empty space or // This method is called to decide if an item represents empty space or
// not. We do this to avoid having space-only items first or last on a // not. We do this to avoid having space-only items first or last on a
@@ -52,10 +56,6 @@ protected:
return item->IsSpacer(); return item->IsSpacer();
} }
virtual bool InformFirstDirection(int direction,
int size,
int availableOtherDir );
// helpers of CalcMin() // helpers of CalcMin()
void CalcMinFromMinor(int totMinor); void CalcMinFromMinor(int totMinor);
void CalcMinFromMajor(int totMajor); void CalcMinFromMajor(int totMajor);
@@ -94,8 +94,7 @@ protected:
wxBoxSizer m_rows; // Sizer containing multiple rows of our items wxBoxSizer m_rows; // Sizer containing multiple rows of our items
private: DECLARE_DYNAMIC_CLASS_NO_COPY(wxWrapSizer)
DECLARE_DYNAMIC_CLASS_NO_COPY(wxWrapSizer);
}; };
#endif // _WX_WRAPSIZER_H_ #endif // _WX_WRAPSIZER_H_

View File

@@ -68,7 +68,7 @@ private:
// wxWrapSizer implementation // wxWrapSizer implementation
// ============================================================================ // ============================================================================
IMPLEMENT_DYNAMIC_CLASS(wxWrapSizer, wxBoxSizer); IMPLEMENT_DYNAMIC_CLASS(wxWrapSizer, wxBoxSizer)
wxWrapSizer::wxWrapSizer(int orient, int flags) wxWrapSizer::wxWrapSizer(int orient, int flags)
: wxBoxSizer(orient), : wxBoxSizer(orient),