Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Deprecated wxSizer::Remove( wxWindow* ), s/Remove/Detach/ in most places.

Browse Source 
Made wxSizer child list typesafe.  I've not added the wxList implicit
conversion kludge yet, let's see who complains first perhaps..

Deprecated wxSizer::{G,S}etOption in favour of {G,S}etProportion in line
with the parameter name change in the docs.

Added {G,S}etSpacer consistent with the accessors for windows/sizers.

Made all wxSizer index parameters size_t -- we support no sensible
interpretation for negative indexes in them.  Hopefully this will
cause no real problems, but code doing (eg. Remove( 0 )) will need
to change to use 0u to resolve the ambiguity with overloaded members.
This is probably a Good Thing though, ymmv.

s/FALSE/false/g ; s/TRUE/true/g ; s/wxASSERT/wxASSERT_MSG/g in sizer.{cpp,h}

Fixed (I hope) the brokenness in wxSizer::Show -- I have no code to test
this yet, so it's a blind change, but spacers should now be hidden correctly
instead of ignored, and it should be properly reversable over multiple
calls now too.

removed pointless private scoping around DECLARE_CLASS macros.

Replace 0's I added previously with NULL -- not like that will end the
email thread either..

Added Add( wxSizerItem * ) & co.  There are probably a couple of other
places we can usefully do something like this too.  Stopped short of
refactoring everything to raise some issues about sizer method recursion
on -dev.

Updated wxSizer docs some more, they are still incomplete but getting
better.

wrapped KeyCode in wxDEPRECATED, converted all (gtk build) instances
to GetKeyCode.  There may be a few left for other ports.

Fixed a couple of other random compile warnings along the way.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18616 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ron Lee
2003-01-07 10:22:07 +00:00
parent db50ec5a50
commit 12a3f2275c
37 changed files with 569 additions and 381 deletions
Download Patch File Download Diff File Expand all files Collapse all files

204
include/wx/sizer.h
View File

@@ -6,6 +6,7 @@
// Created:
// RCS-ID: $Id$
// Copyright: (c) Robin Dunn, Dirk Holtwick and Robert Roebling
// (c) 2003, Ron Lee
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@@ -38,13 +39,26 @@ class WXDLLEXPORT wxSizerItem: public wxObject
{
public:
// spacer
wxSizerItem( int width, int height, int option, int flag, int border, wxObject* userData);
wxSizerItem( int width,
int height,
int proportion,
int flag,
int border,
wxObject* userData);
// window
wxSizerItem( wxWindow *window, int option, int flag, int border, wxObject* userData );
wxSizerItem( wxWindow *window,
int proportion,
int flag,
int border,
wxObject* userData );
// subsizer
wxSizerItem( wxSizer *sizer, int option, int flag, int border, wxObject* userData );
wxSizerItem( wxSizer *sizer,
int proportion,
int flag,
int border,
wxObject* userData );
~wxSizerItem();
@@ -60,6 +74,8 @@ public:
wxSize GetMinSize()
{ return m_minSize; }
void SetInitSize( int x, int y )
{ m_minSize.x = x; m_minSize.y = y; }
void SetRatio( int width, int height )
// if either of dimensions is zero, ratio is assumed to be 1
@@ -76,16 +92,22 @@ public:
bool IsSizer();
bool IsSpacer();
void SetInitSize( int x, int y )
{ m_minSize.x = x; m_minSize.y = y; }
void SetOption( int option )
{ m_option = option; }
// Deprecated in 2.6, use {G,S}etProportion instead.
wxDEPRECATED( void SetOption( int option ) );
wxDEPRECATED( int GetOption() const );
void SetProportion( int proportion )
{ m_proportion = proportion; }
int GetProportion() const
{ return m_proportion; }
void SetFlag( int flag )
{ m_flag = flag; }
int GetFlag() const
{ return m_flag; }
void SetBorder( int border )
{ m_border = border; }
void Show ( bool show )
{ m_show = show; }
int GetBorder() const
{ return m_border; }
wxWindow *GetWindow() const
{ return m_window; }
@@ -95,14 +117,15 @@ public:
{ return m_sizer; }
void SetSizer( wxSizer *sizer )
{ m_sizer = sizer; }
int GetOption() const
{ return m_option; }
int GetFlag() const
{ return m_flag; }
int GetBorder() const
{ return m_border; }
const wxSize &GetSpacer() const
{ return m_size; }
void SetSpacer( const wxSize &size )
{ m_size = size; m_minSize = size; }
void Show ( bool show );
bool IsShown() const
{ return m_show; }
wxObject* GetUserData()
{ return m_userData; }
wxPoint GetPosition()
@@ -114,25 +137,28 @@ protected:
wxSize m_size;
wxPoint m_pos;
wxSize m_minSize;
int m_option;
int m_proportion;
int m_border;
int m_flag;
// If TRUE, then this item is considered in the layout
// If true, then this item is considered in the layout
// calculation. Otherwise, it is skipped over.
bool m_show;
// als: aspect ratio can always be calculated from m_size,
// but this would cause precision loss when the window
// is shrinked. it is safer to preserve initial value.
// Aspect ratio can always be calculated from m_size,
// but this would cause precision loss when the window
// is shrunk. It is safer to preserve the initial value.
float m_ratio;
wxObject *m_userData;
private:
DECLARE_CLASS(wxSizerItem);
DECLARE_DYNAMIC_CLASS(wxSizerItem);
DECLARE_NO_COPY_CLASS(wxSizerItem)
};
WX_DECLARE_EXPORTED_LIST( wxSizerItem, wxSizerItemList );
//---------------------------------------------------------------------------
// wxSizer
//---------------------------------------------------------------------------
@@ -144,30 +170,75 @@ public:
~wxSizer();
/* These should be called Append() really. */
virtual void Add( wxWindow *window, int option = 0, int flag = 0, int border = 0, wxObject* userData = NULL );
virtual void Add( wxSizer *sizer, int option = 0, int flag = 0, int border = 0, wxObject* userData = NULL );
virtual void Add( int width, int height, int option = 0, int flag = 0, int border = 0, wxObject* userData = NULL );
virtual void Add( wxWindow *window,
int proportion = 0,
int flag = 0,
int border = 0,
wxObject* userData = NULL );
virtual void Add( wxSizer *sizer,
int proportion = 0,
int flag = 0,
int border = 0,
wxObject* userData = NULL );
virtual void Add( int width,
int height,
int proportion = 0,
int flag = 0,
int border = 0,
wxObject* userData = NULL );
virtual void Add( wxSizerItem *item );
virtual void Insert( int before, wxWindow *window, int option = 0, int flag = 0, int border = 0, wxObject* userData = NULL );
virtual void Insert( int before, wxSizer *sizer, int option = 0, int flag = 0, int border = 0, wxObject* userData = NULL );
virtual void Insert( int before, int width, int height, int option = 0, int flag = 0, int border = 0, wxObject* userData = NULL );
virtual void Insert( size_t index,
wxWindow *window,
int proportion = 0,
int flag = 0,
int border = 0,
wxObject* userData = NULL );
virtual void Insert( size_t index,
wxSizer *sizer,
int proportion = 0,
int flag = 0,
int border = 0,
wxObject* userData = NULL );
virtual void Insert( size_t index,
int width,
int height,
int proportion = 0,
int flag = 0,
int border = 0,
wxObject* userData = NULL );
virtual void Insert( size_t index,
wxSizerItem *item );
virtual void Prepend( wxWindow *window, int option = 0, int flag = 0, int border = 0, wxObject* userData = NULL );
virtual void Prepend( wxSizer *sizer, int option = 0, int flag = 0, int border = 0, wxObject* userData = NULL );
virtual void Prepend( int width, int height, int option = 0, int flag = 0, int border = 0, wxObject* userData = NULL );
virtual void Prepend( wxWindow *window,
int proportion = 0,
int flag = 0,
int border = 0,
wxObject* userData = NULL );
virtual void Prepend( wxSizer *sizer,
int proportion = 0,
int flag = 0,
int border = 0,
wxObject* userData = NULL );
virtual void Prepend( int width,
int height,
int proportion = 0,
int flag = 0,
int border = 0,
wxObject* userData = NULL );
virtual void Prepend( wxSizerItem *item );
// Remove will delete a sizer, but not a window.
virtual bool Remove( wxWindow *window );
// Deprecated in 2.6 since historically it does not delete the window,
// use Detach instead.
wxDEPRECATED( virtual bool Remove( wxWindow *window ) );
virtual bool Remove( wxSizer *sizer );
virtual bool Remove( int pos );
virtual bool Remove( size_t index );
// Detach will never destroy a sizer or window.
virtual bool Detach( wxWindow *window )
{ return Remove( window ); }
virtual bool Detach( wxWindow *window );
virtual bool Detach( wxSizer *sizer );
virtual bool Detach( int pos );
virtual bool Detach( size_t index );
virtual void Clear( bool delete_windows=FALSE );
virtual void Clear( bool delete_windows=false );
virtual void DeleteWindows();
void SetMinSize( int width, int height )
@@ -187,10 +258,10 @@ public:
bool SetItemMinSize( wxSizer *sizer, wxSize size )
{ return DoSetItemMinSize( sizer, size.x, size.y ); }
bool SetItemMinSize( int pos, int width, int height )
{ return DoSetItemMinSize( pos, width, height ); }
bool SetItemMinSize( int pos, wxSize size )
{ return DoSetItemMinSize( pos, size.x, size.y ); }
bool SetItemMinSize( size_t index, int width, int height )
{ return DoSetItemMinSize( index, width, height ); }
bool SetItemMinSize( size_t index, wxSize size )
{ return DoSetItemMinSize( index, size.x, size.y ); }
wxSize GetSize()
{ return m_size; }
@@ -210,31 +281,36 @@ public:
void SetSizeHints( wxWindow *window );
void SetVirtualSizeHints( wxWindow *window );
wxList& GetChildren()
wxSizerItemList& GetChildren()
{ return m_children; }
void SetDimension( int x, int y, int width, int height );
// Manage whether individual windows or sub-sizers are considered
// Manage whether individual scene items are considered
// in the layout calculations or not.
void Show( wxWindow *window, bool show = TRUE );
void Hide( wxWindow *window )
{ Show (window, FALSE); }
void Show( wxSizer *sizer, bool show = TRUE );
void Show( wxWindow *window, bool show = true );
void Show( wxSizer *sizer, bool show = true );
void Show( size_t index, bool show = true );
void Hide( wxSizer *sizer )
{ Show (sizer, FALSE); }
{ Show( sizer, false ); }
void Hide( wxWindow *window )
{ Show( window, false ); }
void Hide( size_t index )
{ Show( index, false ); }
bool IsShown( wxWindow *window );
bool IsShown( wxSizer *sizer );
bool IsShown( size_t index );
// Recursively call wxWindow::Show () on all sizer items.
void ShowItems (bool show);
protected:
wxSize m_size;
wxSize m_minSize;
wxPoint m_position;
wxList m_children;
wxSize m_size;
wxSize m_minSize;
wxPoint m_position;
wxSizerItemList m_children;
wxSize GetMaxWindowSize( wxWindow *window );
wxSize GetMinWindowSize( wxWindow *window );
@@ -246,10 +322,9 @@ protected:
virtual void DoSetMinSize( int width, int height );
virtual bool DoSetItemMinSize( wxWindow *window, int width, int height );
virtual bool DoSetItemMinSize( wxSizer *sizer, int width, int height );
virtual bool DoSetItemMinSize( int pos, int width, int height );
virtual bool DoSetItemMinSize( size_t index, int width, int height );
private:
DECLARE_CLASS(wxSizer);
DECLARE_DYNAMIC_CLASS(wxSizer);
};
//---------------------------------------------------------------------------
@@ -285,8 +360,7 @@ protected:
void SetItemBounds( wxSizerItem *item, int x, int y, int w, int h );
private:
DECLARE_CLASS(wxGridSizer);
DECLARE_DYNAMIC_CLASS(wxGridSizer);
};
//---------------------------------------------------------------------------
@@ -316,8 +390,7 @@ protected:
void CreateArrays();
private:
DECLARE_CLASS(wxFlexGridSizer);
DECLARE_DYNAMIC_CLASS(wxFlexGridSizer);
DECLARE_NO_COPY_CLASS(wxFlexGridSizer)
};
@@ -347,8 +420,7 @@ protected:
int m_fixedWidth;
int m_fixedHeight;
private:
DECLARE_CLASS(wxBoxSizer);
DECLARE_DYNAMIC_CLASS(wxBoxSizer);
};
//---------------------------------------------------------------------------
@@ -373,8 +445,7 @@ public:
protected:
wxStaticBox *m_staticBox;
private:
DECLARE_CLASS(wxStaticBoxSizer);
DECLARE_DYNAMIC_CLASS(wxStaticBoxSizer);
DECLARE_NO_COPY_CLASS(wxStaticBoxSizer)
};
@@ -402,8 +473,7 @@ public:
protected:
wxNotebook *m_notebook;
private:
DECLARE_CLASS(wxNotebookSizer);
DECLARE_DYNAMIC_CLASS(wxNotebookSizer);
DECLARE_NO_COPY_CLASS(wxNotebookSizer)
};