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

Added userData to wxSizerItems and other things to make sizers more

Browse Source 
usable/overrideable from wxPython.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3725 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
1999-09-20 03:12:49 +00:00
parent 76f78a96ce
commit 0c0d686fe5
2 changed files with 129 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
include/wx/sizer.h
View File

@@ -1,6 +1,6 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: sizer.h // Name: sizer.h
// Purpose: provide wxSizer class for layounting // Purpose: provide wxSizer class for layouting
// Author: Robert Roebling and Robin Dunn // Author: Robert Roebling and Robin Dunn
// Modified by: // Modified by:
// Created: // Created:
@@ -39,15 +39,18 @@ class wxStaticBoxSizer;
class WXDLLEXPORT wxSizerItem: public wxObject class WXDLLEXPORT wxSizerItem: public wxObject
{ {
DECLARE_CLASS(wxSizerItem);
public: public:
// spacer // spacer
wxSizerItem( int width, int height, int option, int flag, int border ); wxSizerItem( int width, int height, int option, int flag, int border, wxObject* userData);
// window // window
wxSizerItem( wxWindow *window, int option, int flag, int border ); wxSizerItem( wxWindow *window, int option, int flag, int border, wxObject* userData );
// subsizer // subsizer
wxSizerItem( wxSizer *sizer, int option, int flag, int border ); wxSizerItem( wxSizer *sizer, int option, int flag, int border, wxObject* userData );
~wxSizerItem();
virtual wxSize GetSize(); virtual wxSize GetSize();
virtual wxSize CalcMin(); virtual wxSize CalcMin();
@@ -67,6 +70,8 @@ public:
{ return m_flag; } { return m_flag; }
int GetBorder() const int GetBorder() const
{ return m_border; } { return m_border; }
wxObject* GetUserData()
{ return m_userData; }
protected: protected:
wxWindow *m_window; wxWindow *m_window;
@@ -76,6 +81,7 @@ protected:
int m_option; int m_option;
int m_border; int m_border;
int m_flag; int m_flag;
wxObject *m_userData;
}; };
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
@@ -84,17 +90,18 @@ protected:
class WXDLLEXPORT wxSizer: public wxObject class WXDLLEXPORT wxSizer: public wxObject
{ {
DECLARE_CLASS(wxSizer);
public: public:
wxSizer(); wxSizer();
~wxSizer(); ~wxSizer();
virtual void Add( wxWindow *window, int option = 0, int flag = 0, int border = 0 ); 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 ); 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 ); virtual void Add( int width, int height, int option = 0, int flag = 0, int border = 0, wxObject* userData = NULL );
virtual void Prepend( wxWindow *window, int option = 0, int flag = 0, int border = 0 ); 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 ); 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 ); virtual void Prepend( int width, int height, int option = 0, int flag = 0, int border = 0, wxObject* userData = NULL );
virtual bool Remove( wxWindow *window ); virtual bool Remove( wxWindow *window );
virtual bool Remove( wxSizer *sizer ); virtual bool Remove( wxSizer *sizer );
@@ -117,6 +124,9 @@ public:
void Fit( wxWindow *window ); void Fit( wxWindow *window );
void SetSizeHints( wxWindow *window ); void SetSizeHints( wxWindow *window );
wxList& GetChildren()
{ return m_children; }
protected: protected:
wxSize m_size; wxSize m_size;
wxPoint m_position; wxPoint m_position;
@@ -131,6 +141,7 @@ protected:
class WXDLLEXPORT wxBoxSizer: public wxSizer class WXDLLEXPORT wxBoxSizer: public wxSizer
{ {
DECLARE_CLASS(wxBoxSizer);
public: public:
wxBoxSizer( int orient ); wxBoxSizer( int orient );
@@ -155,6 +166,7 @@ protected:
class WXDLLEXPORT wxStaticBoxSizer: public wxBoxSizer class WXDLLEXPORT wxStaticBoxSizer: public wxBoxSizer
{ {
DECLARE_CLASS(wxStaticBoxSizer);
public: public:
wxStaticBoxSizer( wxStaticBox *box, int orient ); wxStaticBoxSizer( wxStaticBox *box, int orient );

49
src/common/sizer.cpp
View File

@@ -24,17 +24,25 @@
#include "wx/utils.h" #include "wx/utils.h"
#include "wx/statbox.h" #include "wx/statbox.h"
//---------------------------------------------------------------------------
IMPLEMENT_ABSTRACT_CLASS(wxSizerItem, wxObject);
IMPLEMENT_ABSTRACT_CLASS(wxSizer, wxObject);
IMPLEMENT_ABSTRACT_CLASS(wxBoxSizer, wxSizer);
IMPLEMENT_ABSTRACT_CLASS(wxStaticBoxSizer, wxBoxSizer);
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// wxSizerItem // wxSizerItem
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
wxSizerItem::wxSizerItem( int width, int height, int option, int flag, int border ) wxSizerItem::wxSizerItem( int width, int height, int option, int flag, int border, wxObject* userData )
{ {
m_window = (wxWindow *) NULL; m_window = (wxWindow *) NULL;
m_sizer = (wxSizer *) NULL; m_sizer = (wxSizer *) NULL;
m_option = option; m_option = option;
m_border = border; m_border = border;
m_flag = flag; m_flag = flag;
m_userData = userData;
// minimal size is the initial size // minimal size is the initial size
m_minSize.x = width; m_minSize.x = width;
@@ -44,13 +52,14 @@ wxSizerItem::wxSizerItem( int width, int height, int option, int flag, int borde
m_size = m_minSize; m_size = m_minSize;
} }
wxSizerItem::wxSizerItem( wxWindow *window, int option, int flag, int border ) wxSizerItem::wxSizerItem( wxWindow *window, int option, int flag, int border, wxObject* userData )
{ {
m_window = window; m_window = window;
m_sizer = (wxSizer *) NULL; m_sizer = (wxSizer *) NULL;
m_option = option; m_option = option;
m_border = border; m_border = border;
m_flag = flag; m_flag = flag;
m_userData = userData;
// minimal size is the initial size // minimal size is the initial size
m_minSize = window->GetSize(); m_minSize = window->GetSize();
@@ -59,13 +68,14 @@ wxSizerItem::wxSizerItem( wxWindow *window, int option, int flag, int border )
// m_size = ... // m_size = ...
} }
wxSizerItem::wxSizerItem( wxSizer *sizer, int option, int flag, int border ) wxSizerItem::wxSizerItem( wxSizer *sizer, int option, int flag, int border, wxObject* userData )
{ {
m_window = (wxWindow *) NULL; m_window = (wxWindow *) NULL;
m_sizer = sizer; m_sizer = sizer;
m_option = option; m_option = option;
m_border = border; m_border = border;
m_flag = flag; m_flag = flag;
m_userData = userData;
// minimal size is calculated later // minimal size is calculated later
// m_minSize = ... // m_minSize = ...
@@ -74,6 +84,15 @@ wxSizerItem::wxSizerItem( wxSizer *sizer, int option, int flag, int border )
// m_size = ... // m_size = ...
} }
wxSizerItem::~wxSizerItem()
{
if (m_userData)
delete m_userData;
if (m_sizer)
delete m_sizer;
}
wxSize wxSizerItem::GetSize() wxSize wxSizerItem::GetSize()
{ {
wxSize ret; wxSize ret;
@@ -182,34 +201,34 @@ wxSizer::~wxSizer()
{ {
} }
void wxSizer::Add( wxWindow *window, int option, int flag, int border ) void wxSizer::Add( wxWindow *window, int option, int flag, int border, wxObject* userData )
{ {
m_children.Append( new wxSizerItem( window, option, flag, border ) ); m_children.Append( new wxSizerItem( window, option, flag, border, userData ) );
} }
void wxSizer::Add( wxSizer *sizer, int option, int flag, int border ) void wxSizer::Add( wxSizer *sizer, int option, int flag, int border, wxObject* userData )
{ {
m_children.Append( new wxSizerItem( sizer, option, flag, border ) ); m_children.Append( new wxSizerItem( sizer, option, flag, border, userData ) );
} }
void wxSizer::Add( int width, int height, int option, int flag, int border ) void wxSizer::Add( int width, int height, int option, int flag, int border, wxObject* userData )
{ {
m_children.Append( new wxSizerItem( width, height, option, flag, border ) ); m_children.Append( new wxSizerItem( width, height, option, flag, border, userData ) );
} }
void wxSizer::Prepend( wxWindow *window, int option, int flag, int border ) void wxSizer::Prepend( wxWindow *window, int option, int flag, int border, wxObject* userData )
{ {
m_children.Insert( new wxSizerItem( window, option, flag, border ) ); m_children.Insert( new wxSizerItem( window, option, flag, border, userData ) );
} }
void wxSizer::Prepend( wxSizer *sizer, int option, int flag, int border ) void wxSizer::Prepend( wxSizer *sizer, int option, int flag, int border, wxObject* userData )
{ {
m_children.Insert( new wxSizerItem( sizer, option, flag, border ) ); m_children.Insert( new wxSizerItem( sizer, option, flag, border, userData ) );
} }
void wxSizer::Prepend( int width, int height, int option, int flag, int border ) void wxSizer::Prepend( int width, int height, int option, int flag, int border, wxObject* userData )
{ {
m_children.Insert( new wxSizerItem( width, height, option, flag, border ) ); m_children.Insert( new wxSizerItem( width, height, option, flag, border, userData ) );
} }
bool wxSizer::Remove( wxWindow *window ) bool wxSizer::Remove( wxWindow *window )