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

added grid sizers

Browse Source 
changed some build configurations


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@7385 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2000-05-11 19:30:19 +00:00
parent 08392f16cc
commit 44faee407c
11 changed files with 1241 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

925
utils/wxPython/src/msw/sizers.cpp
View File

File diff suppressed because it is too large Load Diff

122
utils/wxPython/src/msw/sizers.py
View File

@@ -54,10 +54,16 @@ class wxSizerItemPtr :
val = apply(sizersc.wxSizerItem_GetWindow,(self,) + _args, _kwargs)
if val: val = wxWindowPtr(val)
return val
def SetWindow(self, *_args, **_kwargs):
val = apply(sizersc.wxSizerItem_SetWindow,(self,) + _args, _kwargs)
return val
def GetSizer(self, *_args, **_kwargs):
val = apply(sizersc.wxSizerItem_GetSizer,(self,) + _args, _kwargs)
if val: val = wxSizerPtr(val)
return val
def SetSizer(self, *_args, **_kwargs):
val = apply(sizersc.wxSizerItem_SetSizer,(self,) + _args, _kwargs)
return val
def GetOption(self, *_args, **_kwargs):
val = apply(sizersc.wxSizerItem_GetOption,(self,) + _args, _kwargs)
return val
@@ -107,6 +113,15 @@ class wxSizerPtr :
def AddSpacer(self, *_args, **_kwargs):
val = apply(sizersc.wxSizer_AddSpacer,(self,) + _args, _kwargs)
return val
def InsertWindow(self, *_args, **_kwargs):
val = apply(sizersc.wxSizer_InsertWindow,(self,) + _args, _kwargs)
return val
def InsertSizer(self, *_args, **_kwargs):
val = apply(sizersc.wxSizer_InsertSizer,(self,) + _args, _kwargs)
return val
def InsertSpacer(self, *_args, **_kwargs):
val = apply(sizersc.wxSizer_InsertSpacer,(self,) + _args, _kwargs)
return val
def PrependWindow(self, *_args, **_kwargs):
val = apply(sizersc.wxSizer_PrependWindow,(self,) + _args, _kwargs)
return val
@@ -128,6 +143,18 @@ class wxSizerPtr :
def SetDimension(self, *_args, **_kwargs):
val = apply(sizersc.wxSizer_SetDimension,(self,) + _args, _kwargs)
return val
def SetMinSize(self, *_args, **_kwargs):
val = apply(sizersc.wxSizer_SetMinSize,(self,) + _args, _kwargs)
return val
def SetItemMinSizeWindow(self, *_args, **_kwargs):
val = apply(sizersc.wxSizer_SetItemMinSizeWindow,(self,) + _args, _kwargs)
return val
def SetItemMinSizeSizer(self, *_args, **_kwargs):
val = apply(sizersc.wxSizer_SetItemMinSizeSizer,(self,) + _args, _kwargs)
return val
def SetItemMinSizePos(self, *_args, **_kwargs):
val = apply(sizersc.wxSizer_SetItemMinSizePos,(self,) + _args, _kwargs)
return val
def GetSize(self, *_args, **_kwargs):
val = apply(sizersc.wxSizer_GetSize,(self,) + _args, _kwargs)
if val: val = wxSizePtr(val) ; val.thisown = 1
@@ -163,6 +190,14 @@ class wxSizerPtr :
else:
apply(self.AddWindow, args)
def Insert(self, *args):
if type(args[0]) == type(1):
apply(self.InsertSpacer, args)
elif string.find(args[0].this, 'Sizer') != -1:
apply(self.InsertSizer, args)
else:
apply(self.InsertWindow, args)
def Prepend(self, *args):
if type(args[0]) == type(1):
apply(self.PrependSpacer, args)
@@ -185,6 +220,15 @@ class wxSizerPtr :
childinfo = (childinfo, )
apply(self.Add, childinfo)
def SetItemMinSize(self, *args):
if type(args[0]) == type(1):
apply(self.SetItemMinSizePos, args)
elif string.find(args[0].this, 'Sizer') != -1:
apply(self.SetItemMinSizeSizer, args)
else:
apply(self.SetItemMinSizeWindow, args)
class wxSizer(wxSizerPtr):
def __init__(self,this):
self.this = this
@@ -284,6 +328,84 @@ class wxNotebookSizer(wxNotebookSizerPtr):
class wxGridSizerPtr(wxSizerPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
def RecalcSizes(self, *_args, **_kwargs):
val = apply(sizersc.wxGridSizer_RecalcSizes,(self,) + _args, _kwargs)
return val
def CalcMin(self, *_args, **_kwargs):
val = apply(sizersc.wxGridSizer_CalcMin,(self,) + _args, _kwargs)
if val: val = wxSizePtr(val) ; val.thisown = 1
return val
def SetCols(self, *_args, **_kwargs):
val = apply(sizersc.wxGridSizer_SetCols,(self,) + _args, _kwargs)
return val
def SetRows(self, *_args, **_kwargs):
val = apply(sizersc.wxGridSizer_SetRows,(self,) + _args, _kwargs)
return val
def SetVGap(self, *_args, **_kwargs):
val = apply(sizersc.wxGridSizer_SetVGap,(self,) + _args, _kwargs)
return val
def SetHGap(self, *_args, **_kwargs):
val = apply(sizersc.wxGridSizer_SetHGap,(self,) + _args, _kwargs)
return val
def GetCols(self, *_args, **_kwargs):
val = apply(sizersc.wxGridSizer_GetCols,(self,) + _args, _kwargs)
return val
def GetRows(self, *_args, **_kwargs):
val = apply(sizersc.wxGridSizer_GetRows,(self,) + _args, _kwargs)
return val
def GetVGap(self, *_args, **_kwargs):
val = apply(sizersc.wxGridSizer_GetVGap,(self,) + _args, _kwargs)
return val
def GetHGap(self, *_args, **_kwargs):
val = apply(sizersc.wxGridSizer_GetHGap,(self,) + _args, _kwargs)
return val
def __repr__(self):
return "<C wxGridSizer instance at %s>" % (self.this,)
class wxGridSizer(wxGridSizerPtr):
def __init__(self,*_args,**_kwargs):
self.this = apply(sizersc.new_wxGridSizer,_args,_kwargs)
self.thisown = 1
class wxFlexGridSizerPtr(wxGridSizerPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
def RecalcSizes(self, *_args, **_kwargs):
val = apply(sizersc.wxFlexGridSizer_RecalcSizes,(self,) + _args, _kwargs)
return val
def CalcMin(self, *_args, **_kwargs):
val = apply(sizersc.wxFlexGridSizer_CalcMin,(self,) + _args, _kwargs)
if val: val = wxSizePtr(val) ; val.thisown = 1
return val
def AddGrowableRow(self, *_args, **_kwargs):
val = apply(sizersc.wxFlexGridSizer_AddGrowableRow,(self,) + _args, _kwargs)
return val
def RemoveGrowableRow(self, *_args, **_kwargs):
val = apply(sizersc.wxFlexGridSizer_RemoveGrowableRow,(self,) + _args, _kwargs)
return val
def AddGrowableCol(self, *_args, **_kwargs):
val = apply(sizersc.wxFlexGridSizer_AddGrowableCol,(self,) + _args, _kwargs)
return val
def RemoveGrowableCol(self, *_args, **_kwargs):
val = apply(sizersc.wxFlexGridSizer_RemoveGrowableCol,(self,) + _args, _kwargs)
return val
def __repr__(self):
return "<C wxFlexGridSizer instance at %s>" % (self.this,)
class wxFlexGridSizer(wxFlexGridSizerPtr):
def __init__(self,*_args,**_kwargs):
self.this = apply(sizersc.new_wxFlexGridSizer,_args,_kwargs)
self.thisown = 1
#-------------- FUNCTION WRAPPERS ------------------

83
utils/wxPython/src/sizers.i
View File

@@ -54,7 +54,9 @@ public:
bool IsSpacer();
wxWindow *GetWindow();
void SetWindow( wxWindow *window );
wxSizer *GetSizer();
void SetSizer( wxSizer *sizer );
int GetOption();
int GetFlag();
int GetBorder();
@@ -97,14 +99,12 @@ public:
if (userData) data = new wxPyUserData(userData);
self->Add(window, option, flag, border, data);
}
void AddSizer(wxSizer *sizer, int option=0, int flag=0, int border=0,
PyObject* userData=NULL) {
wxPyUserData* data = NULL;
if (userData) data = new wxPyUserData(userData);
self->Add(sizer, option, flag, border, data);
}
void AddSpacer(int width, int height, int option=0, int flag=0,
int border=0, PyObject* userData=NULL) {
wxPyUserData* data = NULL;
@@ -113,20 +113,38 @@ public:
}
void InsertWindow(int before, wxWindow *window, int option=0, int flag=0,
int border=0, PyObject* userData=NULL) {
wxPyUserData* data = NULL;
if (userData) data = new wxPyUserData(userData);
self->Insert(before, window, option, flag, border, data);
}
void InsertSizer(int before, wxSizer *sizer, int option=0, int flag=0,
int border=0, PyObject* userData=NULL) {
wxPyUserData* data = NULL;
if (userData) data = new wxPyUserData(userData);
self->Insert(before, sizer, option, flag, border, data);
}
void InsertSpacer(int before, int width, int height, int option=0, int flag=0,
int border=0, PyObject* userData=NULL) {
wxPyUserData* data = NULL;
if (userData) data = new wxPyUserData(userData);
self->Insert(before, width, height, option, flag, border, data);
}
void PrependWindow(wxWindow *window, int option=0, int flag=0, int border=0,
PyObject* userData=NULL) {
wxPyUserData* data = NULL;
if (userData) data = new wxPyUserData(userData);
self->Prepend(window, option, flag, border, data);
}
void PrependSizer(wxSizer *sizer, int option=0, int flag=0, int border=0,
PyObject* userData=NULL) {
wxPyUserData* data = NULL;
if (userData) data = new wxPyUserData(userData);
self->Prepend(sizer, option, flag, border, data);
}
void PrependSpacer(int width, int height, int option=0, int flag=0,
int border=0, PyObject* userData=NULL) {
wxPyUserData* data = NULL;
@@ -149,6 +167,14 @@ public:
else:
apply(self.AddWindow, args)
def Insert(self, *args):
if type(args[0]) == type(1):
apply(self.InsertSpacer, args)
elif string.find(args[0].this, 'Sizer') != -1:
apply(self.InsertSizer, args)
else:
apply(self.InsertWindow, args)
def Prepend(self, *args):
if type(args[0]) == type(1):
apply(self.PrependSpacer, args)
@@ -174,6 +200,21 @@ public:
void SetDimension( int x, int y, int width, int height );
void SetMinSize(wxSize size);
%name(SetItemMinSizeWindow) void SetItemMinSize(wxWindow* window, int width, int height);
%name(SetItemMinSizeSizer) void SetItemMinSize(wxSizer* sizer, int width, int height);
%name(SetItemMinSizePos) void SetItemMinSize(int pos, int width, int height);
%pragma(python) addtoclass = "
def SetItemMinSize(self, *args):
if type(args[0]) == type(1):
apply(self.SetItemMinSizePos, args)
elif string.find(args[0].this, 'Sizer') != -1:
apply(self.SetItemMinSizeSizer, args)
else:
apply(self.SetItemMinSizeWindow, args)
"
wxSize GetSize();
wxPoint GetPosition();
@@ -259,7 +300,41 @@ public:
wxNotebook *GetNotebook();
};
//---------------------------------------------------------------------------
class wxGridSizer: public wxSizer
{
public:
wxGridSizer( int rows=1, int cols=0, int vgap=0, int hgap=0 );
void RecalcSizes();
wxSize CalcMin();
void SetCols( int cols );
void SetRows( int rows );
void SetVGap( int gap );
void SetHGap( int gap );
int GetCols();
int GetRows();
int GetVGap();
int GetHGap();
};
//---------------------------------------------------------------------------
class wxFlexGridSizer: public wxGridSizer
{
public:
wxFlexGridSizer( int rows=1, int cols=0, int vgap=0, int hgap=0 );
void RecalcSizes();
wxSize CalcMin();
void AddGrowableRow( size_t idx );
void RemoveGrowableRow( size_t idx );
void AddGrowableCol( size_t idx );
void RemoveGrowableCol( size_t idx );
};
//---------------------------------------------------------------------------