%{
#include "helpers.h"
+
+#include <wx/notebook.h>
%}
//----------------------------------------------------------------------
%import controls.i
%pragma(python) code = "import wx"
-%pragma(python) code = "import string"
//---------------------------------------------------------------------------
-class wxSizerItem {
+class wxSizerItem : public wxObject {
public:
// No need to ever create one directly in Python...
- //wxSizerItem( int width, int height, int option, int flag, int border, wxObject* userData);
- //wxSizerItem( wxWindow *window, int option, int flag, int border, wxObject* userData );
- //wxSizerItem( wxSizer *sizer, int option, int flag, int border, wxObject* userData );
+ //wxSizerItem( int width, int height, int proportion, int flag, int border, wxObject* userData);
+ //wxSizerItem( wxWindow *window, int proportion, int flag, int border, wxObject* userData );
+ //wxSizerItem( wxSizer *sizer, int proportion, int flag, int border, wxObject* userData );
+
+ void DeleteWindows();
+ void DetachSizer();
wxSize GetSize();
wxSize CalcMin();
void SetDimension( wxPoint pos, wxSize size );
+
+ wxSize GetMinSize();
+ void SetInitSize( int x, int y );
+
%name(SetRatioWH) void SetRatio( int width, int height );
%name(SetRatioSize) void SetRatio( wxSize size );
void SetRatio( float ratio );
bool IsSizer();
bool IsSpacer();
+ void SetProportion( int proportion );
+ int GetProportion();
+ %pragma(python) addtoclass = "SetOption = SetProportion"
+ %pragma(python) addtoclass = "GetOption = GetProportion"
+ void SetFlag( int flag );
+ int GetFlag();
+ void SetBorder( int border );
+ int GetBorder();
+
wxWindow *GetWindow();
void SetWindow( wxWindow *window );
wxSizer *GetSizer();
void SetSizer( wxSizer *sizer );
- int GetOption();
- int GetFlag();
- int GetBorder();
+ const wxSize& GetSpacer();
+ void SetSpacer( const wxSize &size );
- void SetInitSize( int x, int y );
- void SetOption( int option );
- void SetFlag( int flag );
- void SetBorder( int border );
+ void Show( bool show );
+ bool IsShown();
+
+ wxPoint GetPosition();
// wxObject* GetUserData();
%addmethods {
//---------------------------------------------------------------------------
-class wxSizer {
+
+class wxSizer : public wxObject {
public:
// wxSizer(); **** abstract, can't instantiate
// ~wxSizer();
+ %addmethods {
+ void _setOORInfo(PyObject* _self) {
+ self->SetClientObject(new wxPyOORClientData(_self));
+ }
+ }
+
%addmethods {
void Destroy() { delete self; }
- void AddWindow(wxWindow *window, int option=0, int flag=0, int border=0,
- PyObject* userData=NULL) {
- wxPyUserData* data = NULL;
- 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;
- if (userData) data = new wxPyUserData(userData);
- self->Add(width, height, option, flag, border, data);
- }
+ void _Add(PyObject* item, int proportion=0, int flag=0, int border=0,
+ PyObject* userData=NULL, int option=-1) {
+ // The option parameter is only for backwards compatibility
+ // with keyword args, all new code should use "proportion"
+ // instead. This can be removed eventually.
+ if (option != -1) proportion = option;
- 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) {
+ wxWindow* window;
+ wxSizer* sizer;
+ wxSize size;
+ wxSize* sizePtr = &size;
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);
+
+ // Find out what type the item is and call the real Add method
+ if (! SWIG_GetPtrObj(item, (void**)&window, "_wxWindow_p"))
+ self->Add(window, proportion, flag, border, data);
+
+ else if (!SWIG_GetPtrObj(item, (void**)&sizer, "_wxSizer_p"))
+ self->Add(sizer, proportion, flag, border, data);
+
+ else if (wxSize_helper(item, &sizePtr))
+ self->Add(sizePtr->GetWidth(), sizePtr->GetHeight(),
+ proportion, flag, border, data);
+ else {
+ if (data) delete data;
+ PyErr_SetString(PyExc_TypeError,
+ "wxWindow, wxSizer, wxSize, or (w,h) expected for item");
+ }
}
- void PrependWindow(wxWindow *window, int option=0, int flag=0, int border=0,
- PyObject* userData=NULL) {
+ void _Insert(int before, PyObject* item, int proportion=0, int flag=0,
+ int border=0, PyObject* userData=NULL, int option=-1) {
+ // The option parameter is only for backwards compatibility
+ // with keyword args, all new code should use "proportion"
+ // instead. This can be removed eventually.
+ if (option != -1) proportion = option;
+
+ wxWindow* window;
+ wxSizer* sizer;
+ wxSize size;
+ wxSize* sizePtr = &size;
wxPyUserData* data = NULL;
if (userData) data = new wxPyUserData(userData);
- self->Prepend(window, option, flag, border, data);
+
+ // Find out what type the item is and call the real Insert method
+ if (! SWIG_GetPtrObj(item, (void**)&window, "_wxWindow_p"))
+ self->Insert(before, window, proportion, flag, border, data);
+
+ else if (!SWIG_GetPtrObj(item, (void**)&sizer, "_wxSizer_p"))
+ self->Insert(before, sizer, proportion, flag, border, data);
+
+ else if (wxSize_helper(item, &sizePtr))
+ self->Insert(before, sizePtr->GetWidth(), sizePtr->GetHeight(),
+ proportion, flag, border, data);
+ else {
+ if (data) delete data;
+ PyErr_SetString(PyExc_TypeError,
+ "wxWindow, wxSizer, wxSize, or (w,h) expected for item");
+ }
}
- void PrependSizer(wxSizer *sizer, int option=0, int flag=0, int border=0,
- PyObject* userData=NULL) {
+
+
+
+ void _Prepend(PyObject* item, int proportion=0, int flag=0, int border=0,
+ PyObject* userData=NULL, int option=-1) {
+ // The option parameter is only for backwards compatibility
+ // with keyword args, all new code should use "proportion"
+ // instead. This can be removed eventually.
+ if (option != -1) proportion = option;
+
+ wxWindow* window;
+ wxSizer* sizer;
+ wxSize size;
+ wxSize* sizePtr = &size;
wxPyUserData* data = NULL;
if (userData) data = new wxPyUserData(userData);
- self->Prepend(sizer, option, flag, border, data);
+
+ // Find out what type the item is and call the real Prepend method
+ if (! SWIG_GetPtrObj(item, (void**)&window, "_wxWindow_p"))
+ self->Prepend(window, proportion, flag, border, data);
+
+ else if (!SWIG_GetPtrObj(item, (void**)&sizer, "_wxSizer_p"))
+ self->Prepend(sizer, proportion, flag, border, data);
+
+ else if (wxSize_helper(item, &sizePtr))
+ self->Prepend(sizePtr->GetWidth(), sizePtr->GetHeight(),
+ proportion, flag, border, data);
+ else {
+ if (data) delete data;
+ PyErr_SetString(PyExc_TypeError,
+ "wxWindow, wxSizer, wxSize, or (w,h) expected for item");
+ }
}
- void PrependSpacer(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->Prepend(width, height, option, flag, border, data);
+
+ bool Remove(PyObject* item) {
+ wxWindow* window;
+ wxSizer* sizer;
+
+ // Find out what type the item is and call the real Remove method
+ if (! SWIG_GetPtrObj(item, (void**)&window, "_wxWindow_p"))
+ return self->Remove(window);
+
+ else if (!SWIG_GetPtrObj(item, (void**)&sizer, "_wxSizer_p"))
+ return self->Remove(sizer);
+
+ else if (PyInt_Check(item)) {
+ int pos = PyInt_AsLong(item);
+ return self->Remove(pos);
+ }
+ else {
+ PyErr_SetString(PyExc_TypeError,
+ "wxWindow, wxSizer or int (position) expected.");
+ return FALSE;
+ }
}
- }
- %name(RemoveWindow)bool Remove( wxWindow *window );
- %name(RemoveSizer)bool Remove( wxSizer *sizer );
- %name(RemovePos)bool Remove( int pos );
+ void _SetItemMinSize(PyObject* item, wxSize size) {
+ wxWindow* window;
+ wxSizer* sizer;
+ // Find out what type the item is and call the real Remove method
+ if (! SWIG_GetPtrObj(item, (void**)&window, "_wxWindow_p"))
+ self->SetItemMinSize(window, size);
- %pragma(python) addtoclass = "
- def Add(self, *args, **kw):
- if type(args[0]) == type(1):
- apply(self.AddSpacer, args, kw)
- elif string.find(args[0].this, 'Sizer') != -1:
- apply(self.AddSizer, args, kw)
- else:
- apply(self.AddWindow, args, kw)
+ else if (!SWIG_GetPtrObj(item, (void**)&sizer, "_wxSizer_p"))
+ self->SetItemMinSize(sizer, size);
- def Insert(self, *args, **kw):
- if type(args[1]) == type(1):
- apply(self.InsertSpacer, args, kw)
- elif string.find(args[1].this, 'Sizer') != -1:
- apply(self.InsertSizer, args, kw)
- else:
- apply(self.InsertWindow, args, kw)
+ else if (PyInt_Check(item)) {
+ int pos = PyInt_AsLong(item);
+ self->SetItemMinSize(pos, size);
+ }
+ else
+ PyErr_SetString(PyExc_TypeError,
+ "wxWindow, wxSizer or int (position) expected.");
+ }
- def Prepend(self, *args, **kw):
- if type(args[0]) == type(1):
- apply(self.PrependSpacer, args, kw)
- elif string.find(args[0].this, 'Sizer') != -1:
- apply(self.PrependSizer, args, kw)
- else:
- apply(self.PrependWindow, args, kw)
+ }
- def Remove(self, *args, **kw):
- if type(args[0]) == type(1):
- apply(self.RemovePos, args, kw)
- elif string.find(args[0].this, 'Sizer') != -1:
- apply(self.RemoveSizer, args, kw)
- else:
- apply(self.RemoveWindow, args, kw)
+
+ %pragma(python) addtoclass = "
+ def Add(self, item, *args, **kw):
+ if type(item) == type(1):
+ item = (item, args[0]) # backwards compatibility, args are width, height
+ args = args[1:]
+ self._Add(item, *args, **kw)
def AddMany(self, widgets):
for childinfo in widgets:
if type(childinfo) != type(()):
childinfo = (childinfo, )
- apply(self.Add, childinfo)
-"
+ self.Add(*childinfo)
+ def Prepend(self, item, *args, **kw):
+ if type(item) == type(1):
+ item = (item, args[0]) # backwards compatibility, args are width, height
+ args = args[1:]
+ self._Prepend(item, *args, **kw)
- void SetDimension( int x, int y, int width, int height );
- void SetMinSize(wxSize size);
+ def Insert(self, before, item, *args, **kw):
+ if type(item) == type(1):
+ item = (item, args[0]) # backwards compatibility, args are width, height
+ args = args[1:]
+ self._Insert(before, item, *args, **kw)
- %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)
+ # for backwards compatibility only
+ AddWindow = AddSizer = AddSpacer = Add
+ PrependWindow = PrependSizer = PrependSpacer = Prepend
+ InsertWindow = InsertSizer = InsertSpacer = Insert
+ RemoveWindow = RemoveSizer = RemovePos = Remove
+
+
+ def SetItemMinSize(self, item, *args):
+ if len(args) == 2:
+ return self._SetItemMinSize(item, args)
else:
- apply(self.SetItemMinSizeWindow, args)
- "
+ return self._SetItemMinSize(item, args[0])
+
+"
+
+
+ void SetDimension( int x, int y, int width, int height );
+ void SetMinSize(wxSize size);
wxSize GetSize();
wxPoint GetPosition();
wxSize GetMinSize();
+ %pragma(python) addtoclass = "
+ def GetSizeTuple(self):
+ return self.GetSize().asTuple()
+ def GetPositionTuple(self):
+ return self.GetPosition().asTuple()
+ def GetMinSizeTuple(self):
+ return self.GetMinSize().asTuple()
+ "
+
// void RecalcSizes() = 0;
// wxSize CalcMin() = 0;
void Layout();
- void Fit( wxWindow *window );
+ wxSize Fit( wxWindow *window );
+ void FitInside( wxWindow *window );
+
void SetSizeHints( wxWindow *window );
+ void SetVirtualSizeHints( wxWindow *window );
+
+ void Clear( bool delete_windows=FALSE );
+ void DeleteWindows();
+
// wxList& GetChildren();
%addmethods {
return wxPy_ConvertList(&list, "wxSizerItem");
}
}
+
+
+ // Manage whether individual windows or sub-sizers are considered
+ // in the layout calculations or not.
+
+ %addmethods {
+ void Show(PyObject* item, bool show = TRUE) {
+ wxWindow* window;
+ wxSizer* sizer;
+ // Find out what type the item is and call the real method
+ if (! SWIG_GetPtrObj(item, (void**)&window, "_wxWindow_p"))
+ self->Show(window, show);
+ else if (!SWIG_GetPtrObj(item, (void**)&sizer, "_wxSizer_p"))
+ self->Show(sizer, show);
+ else
+ PyErr_SetString(PyExc_TypeError, "wxWindow or wxSizer expected.");
+ }
+
+ void Hide(PyObject* item) {
+ wxWindow* window;
+ wxSizer* sizer;
+ // Find out what type the item is and call the real method
+ if (! SWIG_GetPtrObj(item, (void**)&window, "_wxWindow_p"))
+ self->Hide(window);
+ else if (!SWIG_GetPtrObj(item, (void**)&sizer, "_wxSizer_p"))
+ self->Hide(sizer);
+ else
+ PyErr_SetString(PyExc_TypeError, "wxWindow or wxSizer expected.");
+ }
+
+ bool IsShown(PyObject* item) {
+ wxWindow* window;
+ wxSizer* sizer;
+ // Find out what type the item is and call the real method
+ if (! SWIG_GetPtrObj(item, (void**)&window, "_wxWindow_p"))
+ return self->IsShown(window);
+ else if (!SWIG_GetPtrObj(item, (void**)&sizer, "_wxSizer_p"))
+ return self->IsShown(sizer);
+ else {
+ PyErr_SetString(PyExc_TypeError, "wxWindow or wxSizer expected.");
+ return FALSE;
+ }
+ }
+ }
+
+
+ // Recursively call wxWindow::Show() on all sizer items.
+ void ShowItems(bool show);
+
};
class wxPySizer : public wxSizer {
public:
wxPySizer();
- void _setSelf(PyObject* self, PyObject* _class);
- %pragma(python) addtomethod = "__init__:self._setSelf(self, wxPySizer)"
+ void _setCallbackInfo(PyObject* self, PyObject* _class);
+ %pragma(python) addtomethod = "__init__:self._setCallbackInfo(self, wxPySizer)"
+ %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
};
class wxBoxSizer : public wxSizer {
public:
wxBoxSizer(int orient = wxHORIZONTAL);
+ %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
int GetOrientation();
+ void SetOrientation(int orient);
void RecalcSizes();
wxSize CalcMin();
};
class wxStaticBoxSizer : public wxBoxSizer {
public:
wxStaticBoxSizer(wxStaticBox *box, int orient = wxHORIZONTAL);
+ %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
wxStaticBox *GetStaticBox();
void RecalcSizes();
wxSize CalcMin();
class wxNotebookSizer: public wxSizer {
public:
wxNotebookSizer( wxNotebook *nb );
-
+ %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
void RecalcSizes();
wxSize CalcMin();
-
wxNotebook *GetNotebook();
};
{
public:
wxGridSizer( int rows=1, int cols=0, int vgap=0, int hgap=0 );
+ %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
void RecalcSizes();
wxSize CalcMin();
//---------------------------------------------------------------------------
+enum wxFlexSizerGrowMode
+{
+ // don't resize the cells in non-flexible direction at all
+ wxFLEX_GROWMODE_NONE,
+
+ // uniformly resize only the specified ones (default)
+ wxFLEX_GROWMODE_SPECIFIED,
+
+ // uniformly resize all cells
+ wxFLEX_GROWMODE_ALL
+};
+
+
class wxFlexGridSizer: public wxGridSizer
{
public:
wxFlexGridSizer( int rows=1, int cols=0, int vgap=0, int hgap=0 );
+ %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
void RecalcSizes();
wxSize CalcMin();
- void AddGrowableRow( size_t idx );
+ void AddGrowableRow( size_t idx, int proportion = 0 );
void RemoveGrowableRow( size_t idx );
- void AddGrowableCol( size_t idx );
+ void AddGrowableCol( size_t idx, int proportion = 0 );
void RemoveGrowableCol( size_t idx );
+ // the sizer cells may grow in both directions, not grow at all or only
+ // grow in one direction but not the other
+
+ // the direction may be wxVERTICAL, wxHORIZONTAL or wxBOTH (default)
+ void SetFlexibleDirection(int direction);
+ int GetFlexibleDirection();
+
+ // note that the grow mode only applies to the direction which is not
+ // flexible
+ void SetNonFlexibleGrowMode(wxFlexSizerGrowMode mode);
+ wxFlexSizerGrowMode GetNonFlexibleGrowMode();
};
//---------------------------------------------------------------------------
projects / wxWidgets.git / blobdiff