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

Added wxArtProvider and other changes to match CVS updates

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15845 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2002-06-14 23:31:53 +00:00
parent 6fc4b6483f
commit 72797a7da3
12 changed files with 1478 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

357
wxPython/src/msw/misc2.cpp
View File

@@ -272,6 +272,50 @@ extern wxMimeTypesManager * wxTheMimeTypesManager;
#endif
#include <wx/artprov.h>
DECLARE_DEF_STRING(ART_OTHER);
// Python aware wxArtProvider
class wxPyArtProvider : public wxArtProvider {
public:
virtual wxBitmap CreateBitmap(const wxArtID& id,
const wxArtClient& client,
const wxSize& size) {
wxBitmap rval = wxNullBitmap;
wxPyBeginBlockThreads();
if ((wxPyCBH_findCallback(m_myInst, "CreateBitmap"))) {
PyObject* so = wxPyConstructObject((void*)&size, "wxSize", 0);
PyObject* ro;
wxBitmap* ptr;
#if 0
ro = wxPyCBH_callCallbackObj(
m_myInst, Py_BuildValue("(OOO)",
wx2PyString(id),
wx2PyString(client),
so));
#else // testing...
PyObject *args, *s1, *s2;
s1 = wx2PyString(id);
s2 = wx2PyString(client);
args = Py_BuildValue("(OOO)", s1, s2, so);
ro = wxPyCBH_callCallbackObj(m_myInst, args);
#endif
Py_DECREF(so);
if (ro) {
if (!SWIG_GetPtrObj(ro, (void**)&ptr, "_wxBitmap_p"))
rval = *ptr;
Py_DECREF(ro);
}
}
wxPyEndBlockThreads();
return rval;
}
PYPRIVATE;
};
#include <wx/docview.h>
#ifdef __cplusplus
extern "C" {
@@ -9401,6 +9445,272 @@ static PyObject *_wrap_delete_wxMimeTypesManager(PyObject *self, PyObject *args,
return _resultobj;
}
static void *SwigwxPyArtProviderTowxObject(void *ptr) {
wxPyArtProvider *src;
wxObject *dest;
src = (wxPyArtProvider *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
#define new_wxArtProvider() (new wxPyArtProvider())
static PyObject *_wrap_new_wxArtProvider(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxPyArtProvider * _result;
char *_kwnames[] = { NULL };
char _ptemp[128];
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,":new_wxArtProvider",_kwnames))
return NULL;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (wxPyArtProvider *)new_wxArtProvider();
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} if (_result) {
SWIG_MakePtr(_ptemp, (char *) _result,"_wxPyArtProvider_p");
_resultobj = Py_BuildValue("s",_ptemp);
} else {
Py_INCREF(Py_None);
_resultobj = Py_None;
}
return _resultobj;
}
#define wxArtProvider__setCallbackInfo(_swigobj,_swigarg0,_swigarg1) (_swigobj->_setCallbackInfo(_swigarg0,_swigarg1))
static PyObject *_wrap_wxArtProvider__setCallbackInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxPyArtProvider * _arg0;
PyObject * _arg1;
PyObject * _arg2;
PyObject * _argo0 = 0;
PyObject * _obj1 = 0;
PyObject * _obj2 = 0;
char *_kwnames[] = { "self","self","_class", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO:wxArtProvider__setCallbackInfo",_kwnames,&_argo0,&_obj1,&_obj2))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyArtProvider_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxArtProvider__setCallbackInfo. Expected _wxPyArtProvider_p.");
return NULL;
}
}
{
_arg1 = _obj1;
}
{
_arg2 = _obj2;
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxArtProvider__setCallbackInfo(_arg0,_arg1,_arg2);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} Py_INCREF(Py_None);
_resultobj = Py_None;
return _resultobj;
}
static PyObject *_wrap_wxArtProvider_PushProvider(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxPyArtProvider * _arg0;
PyObject * _argo0 = 0;
char *_kwnames[] = { "provider", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxArtProvider_PushProvider",_kwnames,&_argo0))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyArtProvider_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxArtProvider_PushProvider. Expected _wxPyArtProvider_p.");
return NULL;
}
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxPyArtProvider::PushProvider(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} Py_INCREF(Py_None);
_resultobj = Py_None;
return _resultobj;
}
static PyObject *_wrap_wxArtProvider_PopProvider(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
bool _result;
char *_kwnames[] = { NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,":wxArtProvider_PopProvider",_kwnames))
return NULL;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (bool )wxPyArtProvider::PopProvider();
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} _resultobj = Py_BuildValue("i",_result);
return _resultobj;
}
static PyObject *_wrap_wxArtProvider_RemoveProvider(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
bool _result;
wxPyArtProvider * _arg0;
PyObject * _argo0 = 0;
char *_kwnames[] = { "provider", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxArtProvider_RemoveProvider",_kwnames,&_argo0))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyArtProvider_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxArtProvider_RemoveProvider. Expected _wxPyArtProvider_p.");
return NULL;
}
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (bool )wxPyArtProvider::RemoveProvider(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} _resultobj = Py_BuildValue("i",_result);
return _resultobj;
}
static PyObject *_wrap_wxArtProvider_GetBitmap(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxBitmap * _result;
wxString * _arg0;
wxString * _arg1 = (wxString *) &wxPyART_OTHER;
wxSize * _arg2 = (wxSize *) &wxDefaultSize;
PyObject * _obj0 = 0;
PyObject * _obj1 = 0;
wxSize temp;
PyObject * _obj2 = 0;
char *_kwnames[] = { "id","client","size", NULL };
char _ptemp[128];
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|OO:wxArtProvider_GetBitmap",_kwnames,&_obj0,&_obj1,&_obj2))
return NULL;
{
_arg0 = wxString_in_helper(_obj0);
if (_arg0 == NULL)
return NULL;
}
if (_obj1)
{
_arg1 = wxString_in_helper(_obj1);
if (_arg1 == NULL)
return NULL;
}
if (_obj2)
{
_arg2 = &temp;
if (! wxSize_helper(_obj2, &_arg2))
return NULL;
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = new wxBitmap (wxPyArtProvider::GetBitmap(*_arg0,*_arg1,*_arg2));
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} SWIG_MakePtr(_ptemp, (void *) _result,"_wxBitmap_p");
_resultobj = Py_BuildValue("s",_ptemp);
{
if (_obj0)
delete _arg0;
}
{
if (_obj1)
delete _arg1;
}
return _resultobj;
}
static PyObject *_wrap_wxArtProvider_GetIcon(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxIcon * _result;
wxString * _arg0;
wxString * _arg1 = (wxString *) &wxPyART_OTHER;
wxSize * _arg2 = (wxSize *) &wxDefaultSize;
PyObject * _obj0 = 0;
PyObject * _obj1 = 0;
wxSize temp;
PyObject * _obj2 = 0;
char *_kwnames[] = { "id","client","size", NULL };
char _ptemp[128];
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|OO:wxArtProvider_GetIcon",_kwnames,&_obj0,&_obj1,&_obj2))
return NULL;
{
_arg0 = wxString_in_helper(_obj0);
if (_arg0 == NULL)
return NULL;
}
if (_obj1)
{
_arg1 = wxString_in_helper(_obj1);
if (_arg1 == NULL)
return NULL;
}
if (_obj2)
{
_arg2 = &temp;
if (! wxSize_helper(_obj2, &_arg2))
return NULL;
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = new wxIcon (wxPyArtProvider::GetIcon(*_arg0,*_arg1,*_arg2));
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} SWIG_MakePtr(_ptemp, (void *) _result,"_wxIcon_p");
_resultobj = Py_BuildValue("s",_ptemp);
{
if (_obj0)
delete _arg0;
}
{
if (_obj1)
delete _arg1;
}
return _resultobj;
}
static PyObject *_wrap_wxArtProvider_CleanUpProviders(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
char *_kwnames[] = { NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,":wxArtProvider_CleanUpProviders",_kwnames))
return NULL;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxPyArtProvider::CleanUpProviders();
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} Py_INCREF(Py_None);
_resultobj = Py_None;
return _resultobj;
}
static void *SwigwxFileHistoryTowxObject(void *ptr) {
wxFileHistory *src;
wxObject *dest;
@@ -9882,6 +10192,14 @@ static PyMethodDef misc2cMethods[] = {
{ "wxFileHistory_AddFileToHistory", (PyCFunction) _wrap_wxFileHistory_AddFileToHistory, METH_VARARGS | METH_KEYWORDS },
{ "delete_wxFileHistory", (PyCFunction) _wrap_delete_wxFileHistory, METH_VARARGS | METH_KEYWORDS },
{ "new_wxFileHistory", (PyCFunction) _wrap_new_wxFileHistory, METH_VARARGS | METH_KEYWORDS },
{ "wxArtProvider_CleanUpProviders", (PyCFunction) _wrap_wxArtProvider_CleanUpProviders, METH_VARARGS | METH_KEYWORDS },
{ "wxArtProvider_GetIcon", (PyCFunction) _wrap_wxArtProvider_GetIcon, METH_VARARGS | METH_KEYWORDS },
{ "wxArtProvider_GetBitmap", (PyCFunction) _wrap_wxArtProvider_GetBitmap, METH_VARARGS | METH_KEYWORDS },
{ "wxArtProvider_RemoveProvider", (PyCFunction) _wrap_wxArtProvider_RemoveProvider, METH_VARARGS | METH_KEYWORDS },
{ "wxArtProvider_PopProvider", (PyCFunction) _wrap_wxArtProvider_PopProvider, METH_VARARGS | METH_KEYWORDS },
{ "wxArtProvider_PushProvider", (PyCFunction) _wrap_wxArtProvider_PushProvider, METH_VARARGS | METH_KEYWORDS },
{ "wxArtProvider__setCallbackInfo", (PyCFunction) _wrap_wxArtProvider__setCallbackInfo, METH_VARARGS | METH_KEYWORDS },
{ "new_wxArtProvider", (PyCFunction) _wrap_new_wxArtProvider, METH_VARARGS | METH_KEYWORDS },
{ "delete_wxMimeTypesManager", (PyCFunction) _wrap_delete_wxMimeTypesManager, METH_VARARGS | METH_KEYWORDS },
{ "wxMimeTypesManager_Unassociate", (PyCFunction) _wrap_wxMimeTypesManager_Unassociate, METH_VARARGS | METH_KEYWORDS },
{ "wxMimeTypesManager_Associate", (PyCFunction) _wrap_wxMimeTypesManager_Associate, METH_VARARGS | METH_KEYWORDS },
@@ -10227,6 +10545,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_unsigned_short","_WXTYPE",0},
{ "_unsigned_short","_short",0},
{ "_wxObject","_wxFileHistory",SwigwxFileHistoryTowxObject},
{ "_wxObject","_wxPyArtProvider",SwigwxPyArtProviderTowxObject},
{ "_wxObject","_wxWave",SwigwxWaveTowxObject},
{ "_wxObject","_wxJoystick",SwigwxJoystickTowxObject},
{ "_wxObject","_wxPyProcess",SwigwxPyProcessTowxObject},
@@ -10409,9 +10728,47 @@ SWIGEXPORT(void) initmisc2c() {
PyDict_SetItemString(d,"wxMAILCAP_ALL", PyInt_FromLong((long) wxMAILCAP_ALL));
PyDict_SetItemString(d,"cvar", SWIG_globals);
SWIG_addvarlink(SWIG_globals,"wxTheMimeTypesManager",_wrap_wxTheMimeTypesManager_get, _wrap_wxTheMimeTypesManager_set);
PyDict_SetItemString(d,"wxART_TOOLBAR", PyString_FromString("toolbar_C"));
PyDict_SetItemString(d,"wxART_MENU", PyString_FromString("menu_C"));
PyDict_SetItemString(d,"wxART_FRAME_ICON", PyString_FromString("frame_icon_C"));
PyDict_SetItemString(d,"wxART_CMN_DIALOG", PyString_FromString("cmn_dialog_C"));
PyDict_SetItemString(d,"wxART_HELP_BROWSER", PyString_FromString("help_browser_C"));
PyDict_SetItemString(d,"wxART_MESSAGE_BOX", PyString_FromString("message_box_C"));
PyDict_SetItemString(d,"wxART_OTHER", PyString_FromString("other_C"));
PyDict_SetItemString(d,"wxART_ADD_BOOKMARK", PyString_FromString("add_bookmark"));
PyDict_SetItemString(d,"wxART_DEL_BOOKMARK", PyString_FromString("del_bookmark"));
PyDict_SetItemString(d,"wxART_HELP_SIDE_PANEL", PyString_FromString("help_side_panel"));
PyDict_SetItemString(d,"wxART_HELP_SETTINGS", PyString_FromString("help_settings"));
PyDict_SetItemString(d,"wxART_HELP_BOOK", PyString_FromString("help_book"));
PyDict_SetItemString(d,"wxART_HELP_FOLDER", PyString_FromString("help_folder"));
PyDict_SetItemString(d,"wxART_HELP_PAGE", PyString_FromString("help_page"));
PyDict_SetItemString(d,"wxART_GO_BACK", PyString_FromString("go_back"));
PyDict_SetItemString(d,"wxART_GO_FORWARD", PyString_FromString("go_forward"));
PyDict_SetItemString(d,"wxART_GO_UP", PyString_FromString("go_up"));
PyDict_SetItemString(d,"wxART_GO_DOWN", PyString_FromString("go_down"));
PyDict_SetItemString(d,"wxART_GO_TO_PARENT", PyString_FromString("go_to_parent"));
PyDict_SetItemString(d,"wxART_GO_HOME", PyString_FromString("go_home"));
PyDict_SetItemString(d,"wxART_FILE_OPEN", PyString_FromString("file_open"));
PyDict_SetItemString(d,"wxART_PRINT", PyString_FromString("print"));
PyDict_SetItemString(d,"wxART_HELP", PyString_FromString("help"));
PyDict_SetItemString(d,"wxART_TIP", PyString_FromString("tip"));
PyDict_SetItemString(d,"wxART_REPORT_VIEW", PyString_FromString("report_view"));
PyDict_SetItemString(d,"wxART_LIST_VIEW", PyString_FromString("list_view"));
PyDict_SetItemString(d,"wxART_NEW_DIR", PyString_FromString("new_dir"));
PyDict_SetItemString(d,"wxART_FOLDER", PyString_FromString("folder"));
PyDict_SetItemString(d,"wxART_GO_DIR_UP", PyString_FromString("go_dir_up"));
PyDict_SetItemString(d,"wxART_EXECUTABLE_FILE", PyString_FromString("executable_file"));
PyDict_SetItemString(d,"wxART_NORMAL_FILE", PyString_FromString("normal_file"));
PyDict_SetItemString(d,"wxART_TICK_MARK", PyString_FromString("tick"));
PyDict_SetItemString(d,"wxART_CROSS_MARK", PyString_FromString("cross"));
PyDict_SetItemString(d,"wxART_ERROR", PyString_FromString("error"));
PyDict_SetItemString(d,"wxART_QUESTION", PyString_FromString("question"));
PyDict_SetItemString(d,"wxART_WARNING", PyString_FromString("warning"));
PyDict_SetItemString(d,"wxART_INFORMATION", PyString_FromString("information"));
wxPyPtrTypeMap_Add("wxDragImage", "wxGenericDragImage");
wxPyPtrTypeMap_Add("wxProcess", "wxPyProcess");
wxPyPtrTypeMap_Add("wxArtProvider", "wxPyArtProvider");
{
int i;
for (i = 0; _swig_mapping[i].n1; i++)

73
wxPython/src/msw/misc2.py
View File

@@ -900,6 +900,24 @@ class wxMimeTypesManager(wxMimeTypesManagerPtr):
class wxArtProviderPtr(wxObjectPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
def _setCallbackInfo(self, *_args, **_kwargs):
val = apply(misc2c.wxArtProvider__setCallbackInfo,(self,) + _args, _kwargs)
return val
def __repr__(self):
return "<C wxArtProvider instance at %s>" % (self.this,)
class wxArtProvider(wxArtProviderPtr):
def __init__(self,*_args,**_kwargs):
self.this = apply(misc2c.new_wxArtProvider,_args,_kwargs)
self.thisown = 1
self._setCallbackInfo(self, wxArtProvider)
class wxFileHistoryPtr(wxObjectPtr):
def __init__(self,this):
self.this = this
@@ -1178,6 +1196,24 @@ wxFileType_ExpandCommand = misc2c.wxFileType_ExpandCommand
wxMimeTypesManager_IsOfType = misc2c.wxMimeTypesManager_IsOfType
wxArtProvider_PushProvider = misc2c.wxArtProvider_PushProvider
wxArtProvider_PopProvider = misc2c.wxArtProvider_PopProvider
wxArtProvider_RemoveProvider = misc2c.wxArtProvider_RemoveProvider
def wxArtProvider_GetBitmap(*_args, **_kwargs):
val = apply(misc2c.wxArtProvider_GetBitmap,_args,_kwargs)
if val: val = wxBitmapPtr(val); val.thisown = 1
return val
def wxArtProvider_GetIcon(*_args, **_kwargs):
val = apply(misc2c.wxArtProvider_GetIcon,_args,_kwargs)
if val: val = wxIconPtr(val); val.thisown = 1
return val
wxArtProvider_CleanUpProviders = misc2c.wxArtProvider_CleanUpProviders
#-------------- VARIABLE WRAPPERS ------------------
@@ -1294,3 +1330,40 @@ wxMAILCAP_GNOME = misc2c.wxMAILCAP_GNOME
wxMAILCAP_ALL = misc2c.wxMAILCAP_ALL
cvar = misc2c.cvar
wxTheMimeTypesManager = wxMimeTypesManagerPtr(misc2c.cvar.wxTheMimeTypesManager)
wxART_TOOLBAR = misc2c.wxART_TOOLBAR
wxART_MENU = misc2c.wxART_MENU
wxART_FRAME_ICON = misc2c.wxART_FRAME_ICON
wxART_CMN_DIALOG = misc2c.wxART_CMN_DIALOG
wxART_HELP_BROWSER = misc2c.wxART_HELP_BROWSER
wxART_MESSAGE_BOX = misc2c.wxART_MESSAGE_BOX
wxART_OTHER = misc2c.wxART_OTHER
wxART_ADD_BOOKMARK = misc2c.wxART_ADD_BOOKMARK
wxART_DEL_BOOKMARK = misc2c.wxART_DEL_BOOKMARK
wxART_HELP_SIDE_PANEL = misc2c.wxART_HELP_SIDE_PANEL
wxART_HELP_SETTINGS = misc2c.wxART_HELP_SETTINGS
wxART_HELP_BOOK = misc2c.wxART_HELP_BOOK
wxART_HELP_FOLDER = misc2c.wxART_HELP_FOLDER
wxART_HELP_PAGE = misc2c.wxART_HELP_PAGE
wxART_GO_BACK = misc2c.wxART_GO_BACK
wxART_GO_FORWARD = misc2c.wxART_GO_FORWARD
wxART_GO_UP = misc2c.wxART_GO_UP
wxART_GO_DOWN = misc2c.wxART_GO_DOWN
wxART_GO_TO_PARENT = misc2c.wxART_GO_TO_PARENT
wxART_GO_HOME = misc2c.wxART_GO_HOME
wxART_FILE_OPEN = misc2c.wxART_FILE_OPEN
wxART_PRINT = misc2c.wxART_PRINT
wxART_HELP = misc2c.wxART_HELP
wxART_TIP = misc2c.wxART_TIP
wxART_REPORT_VIEW = misc2c.wxART_REPORT_VIEW
wxART_LIST_VIEW = misc2c.wxART_LIST_VIEW
wxART_NEW_DIR = misc2c.wxART_NEW_DIR
wxART_FOLDER = misc2c.wxART_FOLDER
wxART_GO_DIR_UP = misc2c.wxART_GO_DIR_UP
wxART_EXECUTABLE_FILE = misc2c.wxART_EXECUTABLE_FILE
wxART_NORMAL_FILE = misc2c.wxART_NORMAL_FILE
wxART_TICK_MARK = misc2c.wxART_TICK_MARK
wxART_CROSS_MARK = misc2c.wxART_CROSS_MARK
wxART_ERROR = misc2c.wxART_ERROR
wxART_QUESTION = misc2c.wxART_QUESTION
wxART_WARNING = misc2c.wxART_WARNING
wxART_INFORMATION = misc2c.wxART_INFORMATION

8
wxPython/src/msw/sizers.cpp
View File

@@ -1755,11 +1755,13 @@ static PyObject *_wrap_wxSizer_Layout(PyObject *self, PyObject *args, PyObject *
#define wxSizer_Fit(_swigobj,_swigarg0) (_swigobj->Fit(_swigarg0))
static PyObject *_wrap_wxSizer_Fit(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxSize * _result;
wxSizer * _arg0;
wxWindow * _arg1;
PyObject * _argo0 = 0;
PyObject * _argo1 = 0;
char *_kwnames[] = { "self","window", NULL };
char _ptemp[128];
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxSizer_Fit",_kwnames,&_argo0,&_argo1))
@@ -1780,12 +1782,12 @@ static PyObject *_wrap_wxSizer_Fit(PyObject *self, PyObject *args, PyObject *kwa
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxSizer_Fit(_arg0,_arg1);
_result = new wxSize (wxSizer_Fit(_arg0,_arg1));
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} Py_INCREF(Py_None);
_resultobj = Py_None;
} SWIG_MakePtr(_ptemp, (void *) _result,"_wxSize_p");
_resultobj = Py_BuildValue("s",_ptemp);
return _resultobj;
}

1
wxPython/src/msw/sizers.py
View File

@@ -182,6 +182,7 @@ class wxSizerPtr(wxObjectPtr):
return val
def Fit(self, *_args, **_kwargs):
val = apply(sizersc.wxSizer_Fit,(self,) + _args, _kwargs)
if val: val = wxSizePtr(val) ; val.thisown = 1
return val
def FitInside(self, *_args, **_kwargs):
val = apply(sizersc.wxSizer_FitInside,(self,) + _args, _kwargs)

6
wxPython/src/msw/wx.cpp
View File

@@ -1788,6 +1788,8 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_uint","_int",0},
{ "_uint","_wxWindowID",0},
{ "_wxChar","_char",0},
{ "_wxString","_wxArtID",0},
{ "_wxString","_wxArtClient",0},
{ "_char","_wxChar",0},
{ "_struct_wxNativeFontInfo","_wxNativeFontInfo",0},
{ "_EBool","_wxCoord",0},
@@ -1861,7 +1863,11 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_wxCoord","_size_t",0},
{ "_wxCoord","_time_t",0},
{ "_wxCoord","_wxPrintQuality",0},
{ "_wxArtClient","_wxArtID",0},
{ "_wxArtClient","_wxString",0},
{ "_wxEvtHandler","_wxPyApp",SwigwxPyAppTowxEvtHandler},
{ "_wxArtID","_wxString",0},
{ "_wxArtID","_wxArtClient",0},
{0,0,0}};
static PyObject *SWIG_globals;

23
wxPython/src/msw/wx.py
View File

@@ -1571,6 +1571,29 @@ def wxPyTypeCast(obj, typeStr):
#----------------------------------------------------------------------------
_wxCallAfterId = None
def wxCallAfter(callable, *args, **kw):
"""
Call the specified function after the current and pending event
handlers have been completed.
"""
app = wxGetApp()
assert app, 'No wxApp created yet'
global _wxCallAfterId
if _wxCallAfterId is None:
_wxCallAfterId = wxNewId()
app.Connect(-1, -1, _wxCallAfterId,
lambda event: apply(event.callable, event.args, event.kw) )
evt = wxPyEvent()
evt.SetEventType(_wxCallAfterId)
evt.callable = callable
evt.args = args
evt.kw = kw
wxPostEvent(app, evt)
#----------------------------------------------------------------------
class wxPyDeadObjectError(AttributeError):
pass