make the new GetItemCount() const

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57711 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-01-01 23:23:54 +00:00
parent 6b527e158d
commit 2f39b5a33e
2 changed files with 27 additions and 27 deletions

View File

@@ -79,28 +79,28 @@ public:
wxSizerFlags& Centre() { return Align(wxALIGN_CENTRE); } wxSizerFlags& Centre() { return Align(wxALIGN_CENTRE); }
wxSizerFlags& Center() { return Centre(); } wxSizerFlags& Center() { return Centre(); }
wxSizerFlags& Top() wxSizerFlags& Top()
{ {
m_flags &= ~(wxALIGN_BOTTOM | wxALIGN_CENTRE_VERTICAL); m_flags &= ~(wxALIGN_BOTTOM | wxALIGN_CENTRE_VERTICAL);
return *this; return *this;
} }
wxSizerFlags& Left() wxSizerFlags& Left()
{ {
m_flags &= ~(wxALIGN_RIGHT | wxALIGN_CENTRE_HORIZONTAL); m_flags &= ~(wxALIGN_RIGHT | wxALIGN_CENTRE_HORIZONTAL);
return *this; return *this;
} }
wxSizerFlags& Right() wxSizerFlags& Right()
{ {
m_flags = (m_flags & ~wxALIGN_CENTRE_HORIZONTAL) | wxALIGN_RIGHT; m_flags = (m_flags & ~wxALIGN_CENTRE_HORIZONTAL) | wxALIGN_RIGHT;
return *this; return *this;
} }
wxSizerFlags& Bottom() wxSizerFlags& Bottom()
{ {
m_flags = (m_flags & ~wxALIGN_CENTRE_VERTICAL) | wxALIGN_BOTTOM; m_flags = (m_flags & ~wxALIGN_CENTRE_VERTICAL) | wxALIGN_BOTTOM;
return *this; return *this;
} }
@@ -384,9 +384,9 @@ public:
wxPoint GetPosition() const wxPoint GetPosition() const
{ return m_pos; } { return m_pos; }
// Called once the first component of an item has been decided. This is // Called once the first component of an item has been decided. This is
// used in algorithms that depend on knowing the size in one direction // used in algorithms that depend on knowing the size in one direction
// before the min size in the other direction can be known. // before the min size in the other direction can be known.
// Returns true if it made use of the information (and min size was changed). // Returns true if it made use of the information (and min size was changed).
bool InformFirstDirection( int direction, int size, int availableOtherDir=-1 ); bool InformFirstDirection( int direction, int size, int availableOtherDir=-1 );
@@ -541,7 +541,7 @@ public:
wxSizerItem* Insert(size_t index, wxSizerItem* Insert(size_t index,
int width, int width,
int height, int height,
const wxSizerFlags& flags); const wxSizerFlags& flags);
virtual wxSizerItem* Insert( size_t index, wxSizerItem *item); virtual wxSizerItem* Insert( size_t index, wxSizerItem *item);
wxSizerItem* InsertSpacer(size_t index, int size); wxSizerItem* InsertSpacer(size_t index, int size);
@@ -600,7 +600,7 @@ public:
// Returns true if it made use of the informtion (and recalculated min size) // Returns true if it made use of the informtion (and recalculated min size)
virtual bool InformFirstDirection( int WXUNUSED(direction), int WXUNUSED(size), int WXUNUSED(availableOtherDir) ) virtual bool InformFirstDirection( int WXUNUSED(direction), int WXUNUSED(size), int WXUNUSED(availableOtherDir) )
{ return false; } { return false; }
void SetMinSize( int width, int height ) void SetMinSize( int width, int height )
{ DoSetMinSize( width, height ); } { DoSetMinSize( width, height ); }
void SetMinSize( const wxSize& size ) void SetMinSize( const wxSize& size )
@@ -665,7 +665,7 @@ public:
void SetDimension(int x, int y, int width, int height) void SetDimension(int x, int y, int width, int height)
{ SetDimension(wxPoint(x, y), wxSize(width, height)); } { SetDimension(wxPoint(x, y), wxSize(width, height)); }
size_t GetItemCount() { return m_children.GetCount(); } size_t GetItemCount() const { return m_children.GetCount(); }
wxSizerItem* GetItem( wxWindow *window, bool recursive = false ); wxSizerItem* GetItem( wxWindow *window, bool recursive = false );
wxSizerItem* GetItem( wxSizer *sizer, bool recursive = false ); wxSizerItem* GetItem( wxSizer *sizer, bool recursive = false );
@@ -1036,9 +1036,9 @@ inline void wxSizerItem::SetSpacer(const wxSize& size)
} }
inline void wxSizerItem::SetSpacer(int width, int height) inline void wxSizerItem::SetSpacer(int width, int height)
{ {
DoSetSpacer(wxSize(width, height)); DoSetSpacer(wxSize(width, height));
} }
#endif // WXWIN_COMPATIBILITY_2_8 #endif // WXWIN_COMPATIBILITY_2_8

View File

@@ -1094,8 +1094,8 @@ public:
/** /**
Returns the number of items in the sizer. Returns the number of items in the sizer.
*/ */
size_t GetItemCount(); size_t GetItemCount() const;
/** /**
Finds wxSizerItem which holds the given @a window. Finds wxSizerItem which holds the given @a window.
Use parameter @a recursive to search in subsizers too. Use parameter @a recursive to search in subsizers too.