projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
no changes, just remove #if'd out code
[wxWidgets.git]
/
include
/
wx
/
sizer.h
diff --git
a/include/wx/sizer.h
b/include/wx/sizer.h
index 80b16bbd0cf5d38a0135a3a9b37cb07c6c3dfd61..0390c59605db52119dbed8b0657df78cc16ca72d 100644
(file)
--- a/
include/wx/sizer.h
+++ b/
include/wx/sizer.h
@@
-79,28
+79,28
@@
public:
wxSizerFlags& Centre() { return Align(wxALIGN_CENTRE); }
wxSizerFlags& Center() { return Centre(); }
wxSizerFlags& Centre() { return Align(wxALIGN_CENTRE); }
wxSizerFlags& Center() { return Centre(); }
- wxSizerFlags& Top()
- {
- m_flags &= ~(wxALIGN_BOTTOM | wxALIGN_CENTRE_VERTICAL);
- return *this;
+ wxSizerFlags& Top()
+ {
+ m_flags &= ~(wxALIGN_BOTTOM | wxALIGN_CENTRE_VERTICAL);
+ return *this;
}
}
- wxSizerFlags& Left()
- {
- m_flags &= ~(wxALIGN_RIGHT | wxALIGN_CENTRE_HORIZONTAL);
- return *this;
+ wxSizerFlags& Left()
+ {
+ m_flags &= ~(wxALIGN_RIGHT | wxALIGN_CENTRE_HORIZONTAL);
+ return *this;
}
}
- wxSizerFlags& Right()
- {
- m_flags = (m_flags & ~wxALIGN_CENTRE_HORIZONTAL) | wxALIGN_RIGHT;
- return *this;
+ wxSizerFlags& Right()
+ {
+ m_flags = (m_flags & ~wxALIGN_CENTRE_HORIZONTAL) | wxALIGN_RIGHT;
+ return *this;
}
}
- wxSizerFlags& Bottom()
- {
- m_flags = (m_flags & ~wxALIGN_CENTRE_VERTICAL) | wxALIGN_BOTTOM;
- return *this;
+ wxSizerFlags& Bottom()
+ {
+ m_flags = (m_flags & ~wxALIGN_CENTRE_VERTICAL) | wxALIGN_BOTTOM;
+ return *this;
}
}
@@
-384,9
+384,9
@@
public:
wxPoint GetPosition() const
{ return m_pos; }
wxPoint GetPosition() const
{ return m_pos; }
- // 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
- // before the min size in the other direction can be known.
+ // 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
+ // 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).
bool InformFirstDirection( int direction, int size, int availableOtherDir=-1 );
// Returns true if it made use of the information (and min size was changed).
bool InformFirstDirection( int direction, int size, int availableOtherDir=-1 );
@@
-471,7
+471,7
@@
protected:
private:
DECLARE_CLASS(wxSizerItem)
private:
DECLARE_CLASS(wxSizerItem)
- DECLARE_NO_COPY_CLASS(wxSizerItem)
+ wxDECLARE_NO_COPY_CLASS(wxSizerItem);
};
WX_DECLARE_EXPORTED_LIST( wxSizerItem, wxSizerItemList );
};
WX_DECLARE_EXPORTED_LIST( wxSizerItem, wxSizerItemList );
@@
-541,7
+541,7
@@
public:
wxSizerItem* Insert(size_t index,
int width,
int height,
wxSizerItem* Insert(size_t index,
int width,
int height,
- const wxSizerFlags& flags);
+ const wxSizerFlags& flags);
virtual wxSizerItem* Insert( size_t index, wxSizerItem *item);
wxSizerItem* InsertSpacer(size_t index, int size);
virtual wxSizerItem* Insert( size_t index, wxSizerItem *item);
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)
virtual bool InformFirstDirection( int WXUNUSED(direction), int WXUNUSED(size), int WXUNUSED(availableOtherDir) )
{ return false; }
// 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) )
{ return false; }
-
+
void SetMinSize( int width, int height )
{ DoSetMinSize( width, height ); }
void SetMinSize( const wxSize& size )
void SetMinSize( int width, int height )
{ DoSetMinSize( width, height ); }
void SetMinSize( const wxSize& size )
@@
-665,7
+665,8
@@
public:
void SetDimension(int x, int y, int width, int height)
{ SetDimension(wxPoint(x, y), wxSize(width, height)); }
void SetDimension(int x, int y, int width, int height)
{ SetDimension(wxPoint(x, y), wxSize(width, height)); }
- size_t GetItemCount() { return m_children.GetCount(); }
+ size_t GetItemCount() const { return m_children.GetCount(); }
+ bool IsEmpty() const { return m_children.IsEmpty(); }
wxSizerItem* GetItem( wxWindow *window, bool recursive = false );
wxSizerItem* GetItem( wxSizer *sizer, bool recursive = false );
wxSizerItem* GetItem( wxWindow *window, bool recursive = false );
wxSizerItem* GetItem( wxSizer *sizer, bool recursive = false );
@@
-726,6
+727,8
@@
public:
wxGridSizer( int rows, int cols, int vgap, int hgap );
wxGridSizer( int cols, int vgap = 0, int hgap = 0 );
wxGridSizer( int rows, int cols, int vgap, int hgap );
wxGridSizer( int cols, int vgap = 0, int hgap = 0 );
+ virtual wxSizerItem *Insert(size_t index, wxSizerItem *item);
+
virtual void RecalcSizes();
virtual wxSize CalcMin();
virtual void RecalcSizes();
virtual wxSize CalcMin();
@@
-738,15
+741,16
@@
public:
int GetVGap() const { return m_vgap; }
int GetHGap() const { return m_hgap; }
int GetVGap() const { return m_vgap; }
int GetHGap() const { return m_hgap; }
+ // return the number of total items and the number of columns and rows
+ // (for internal use only)
+ int CalcRowsCols(int& rows, int& cols) const;
+
protected:
int m_rows;
int m_cols;
int m_vgap;
int m_hgap;
protected:
int m_rows;
int m_cols;
int m_vgap;
int m_hgap;
- // return the number of total items and the number of columns and rows
- int CalcRowsCols(int& rows, int& cols) const;
-
void SetItemBounds( wxSizerItem *item, int x, int y, int w, int h );
private:
void SetItemBounds( wxSizerItem *item, int x, int y, int w, int h );
private:
@@
-757,8
+761,8
@@
private:
// wxFlexGridSizer
//---------------------------------------------------------------------------
// wxFlexGridSizer
//---------------------------------------------------------------------------
-//
the bevaiour for resizing wxFlexGridSizer cells in the "non-flexible"
-// direction
+//
values which define the behaviour for resizing wxFlexGridSizer cells in the
+//
"non-flexible"
direction
enum wxFlexSizerGrowMode
{
// don't resize the cells in non-flexible direction at all
enum wxFlexSizerGrowMode
{
// don't resize the cells in non-flexible direction at all
@@
-837,7
+841,7
@@
protected:
private:
DECLARE_CLASS(wxFlexGridSizer)
private:
DECLARE_CLASS(wxFlexGridSizer)
- DECLARE_NO_COPY_CLASS(wxFlexGridSizer)
+ wxDECLARE_NO_COPY_CLASS(wxFlexGridSizer);
};
//---------------------------------------------------------------------------
};
//---------------------------------------------------------------------------
@@
-960,11
+964,15
@@
protected:
private:
DECLARE_CLASS(wxStaticBoxSizer)
private:
DECLARE_CLASS(wxStaticBoxSizer)
- DECLARE_NO_COPY_CLASS(wxStaticBoxSizer)
+ wxDECLARE_NO_COPY_CLASS(wxStaticBoxSizer);
};
#endif // wxUSE_STATBOX
};
#endif // wxUSE_STATBOX
+//---------------------------------------------------------------------------
+// wxStdDialogButtonSizer
+//---------------------------------------------------------------------------
+
#if wxUSE_BUTTON
class WXDLLIMPEXP_CORE wxStdDialogButtonSizer: public wxBoxSizer
#if wxUSE_BUTTON
class WXDLLIMPEXP_CORE wxStdDialogButtonSizer: public wxBoxSizer
@@
-1008,7
+1016,7
@@
protected:
private:
DECLARE_CLASS(wxStdDialogButtonSizer)
private:
DECLARE_CLASS(wxStdDialogButtonSizer)
- DECLARE_NO_COPY_CLASS(wxStdDialogButtonSizer)
+ wxDECLARE_NO_COPY_CLASS(wxStdDialogButtonSizer);
};
#endif // wxUSE_BUTTON
};
#endif // wxUSE_BUTTON
@@
-1036,9
+1044,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