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

Implemented the first phase of OOR (Original Object Return). See the

Browse Source 
text in the demo for more details of what this means, but in a
nutshell methods such as wxWindow.GetParent or FindWindowById will now
return a shadow object of the proper type if it can.  By "proper type"
I mean that if the wxWindow pointer returned from FindWindowById
really points to a wxButton then the Python object constructed will be
of a wxButtonPtr class instead of wxWindowPtr as before.  This should
reduce or eliminiate the need for wxPyTypeCast.  (Woo Hoo!)  The
objects returned are still not the original Python object, but that is
the next step.  (Although it will probably only work on Python 2.1 and
beyond because it will use weak references.)

A few other minor tweaks and fixes and additions for things found
while doing the OOR stuff.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10202 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2001-05-18 05:20:01 +00:00
parent 419c299ae5
commit 9df61a29d2
50 changed files with 4883 additions and 2445 deletions
Download Patch File Download Diff File Expand all files Collapse all files

124
wxPython/src/gtk/cmndlgs.cpp
View File

@@ -115,6 +115,14 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
#ifdef __cplusplus
extern "C" {
#endif
static void *SwigwxColourDataTowxObject(void *ptr) {
wxColourData *src;
wxObject *dest;
src = (wxColourData *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
#define new_wxColourData() (new wxColourData())
static PyObject *_wrap_new_wxColourData(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -390,6 +398,14 @@ static void *SwigwxColourDialogTowxEvtHandler(void *ptr) {
return (void *) dest;
}
static void *SwigwxColourDialogTowxObject(void *ptr) {
wxColourDialog *src;
wxObject *dest;
src = (wxColourDialog *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
#define new_wxColourDialog(_swigarg0,_swigarg1) (new wxColourDialog(_swigarg0,_swigarg1))
static PyObject *_wrap_new_wxColourDialog(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -527,6 +543,14 @@ static void *SwigwxDirDialogTowxEvtHandler(void *ptr) {
return (void *) dest;
}
static void *SwigwxDirDialogTowxObject(void *ptr) {
wxDirDialog *src;
wxObject *dest;
src = (wxDirDialog *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
#define new_wxDirDialog(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4) (new wxDirDialog(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4))
static PyObject *_wrap_new_wxDirDialog(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -825,6 +849,14 @@ static void *SwigwxFileDialogTowxEvtHandler(void *ptr) {
return (void *) dest;
}
static void *SwigwxFileDialogTowxObject(void *ptr) {
wxFileDialog *src;
wxObject *dest;
src = (wxFileDialog *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
#define new_wxFileDialog(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6) (new wxFileDialog(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6))
static PyObject *_wrap_new_wxFileDialog(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -1535,6 +1567,14 @@ static void *SwigwxSingleChoiceDialogTowxEvtHandler(void *ptr) {
return (void *) dest;
}
static void *SwigwxSingleChoiceDialogTowxObject(void *ptr) {
wxSingleChoiceDialog *src;
wxObject *dest;
src = (wxSingleChoiceDialog *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
static wxSingleChoiceDialog *new_wxSingleChoiceDialog(wxWindow *parent,wxString *message,wxString *caption,int LCOUNT,wxString *choices,long style,wxPoint *pos) {
return new wxSingleChoiceDialog(parent, *message, *caption,
LCOUNT, choices, NULL, style, *pos);
@@ -1798,6 +1838,14 @@ static void *SwigwxTextEntryDialogTowxEvtHandler(void *ptr) {
return (void *) dest;
}
static void *SwigwxTextEntryDialogTowxObject(void *ptr) {
wxTextEntryDialog *src;
wxObject *dest;
src = (wxTextEntryDialog *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
#define new_wxTextEntryDialog(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5) (new wxTextEntryDialog(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5))
static PyObject *_wrap_new_wxTextEntryDialog(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -1955,6 +2003,14 @@ static PyObject *_wrap_wxTextEntryDialog_ShowModal(PyObject *self, PyObject *arg
return _resultobj;
}
static void *SwigwxFontDataTowxObject(void *ptr) {
wxFontData *src;
wxObject *dest;
src = (wxFontData *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
#define new_wxFontData() (new wxFontData())
static PyObject *_wrap_new_wxFontData(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -2439,6 +2495,14 @@ static void *SwigwxFontDialogTowxEvtHandler(void *ptr) {
return (void *) dest;
}
static void *SwigwxFontDialogTowxObject(void *ptr) {
wxFontDialog *src;
wxObject *dest;
src = (wxFontDialog *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
#define new_wxFontDialog(_swigarg0,_swigarg1) (new wxFontDialog(_swigarg0,_swigarg1))
static PyObject *_wrap_new_wxFontDialog(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -2576,6 +2640,14 @@ static void *SwigwxMessageDialogTowxEvtHandler(void *ptr) {
return (void *) dest;
}
static void *SwigwxMessageDialogTowxObject(void *ptr) {
wxMessageDialog *src;
wxObject *dest;
src = (wxMessageDialog *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
#define new_wxMessageDialog(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4) (new wxMessageDialog(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4))
static PyObject *_wrap_new_wxMessageDialog(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -2673,6 +2745,14 @@ static void *SwigwxProgressDialogTowxEvtHandler(void *ptr) {
return (void *) dest;
}
static void *SwigwxProgressDialogTowxObject(void *ptr) {
wxProgressDialog *src;
wxObject *dest;
src = (wxProgressDialog *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
#define new_wxProgressDialog(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4) (new wxProgressDialog(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4))
static PyObject *_wrap_new_wxProgressDialog(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -2957,10 +3037,32 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_class_wxAcceleratorTable","_wxAcceleratorTable",0},
{ "_class_wxClipboard","_wxClipboard",0},
{ "_class_wxGauge","_wxGauge",0},
{ "_wxGDIObject","_class_wxGDIObject",0},
{ "_wxDC","_class_wxDC",0},
{ "_class_wxBitmapDataObject","_wxBitmapDataObject",0},
{ "_class_wxSingleChoiceDialog","_wxSingleChoiceDialog",0},
{ "_wxProgressDialog","_class_wxProgressDialog",0},
{ "_class_wxObject","_class_wxProgressDialog",SwigwxProgressDialogTowxObject},
{ "_class_wxObject","_wxProgressDialog",SwigwxProgressDialogTowxObject},
{ "_class_wxObject","_class_wxMessageDialog",SwigwxMessageDialogTowxObject},
{ "_class_wxObject","_wxMessageDialog",SwigwxMessageDialogTowxObject},
{ "_class_wxObject","_class_wxFontDialog",SwigwxFontDialogTowxObject},
{ "_class_wxObject","_wxFontDialog",SwigwxFontDialogTowxObject},
{ "_class_wxObject","_class_wxFontData",SwigwxFontDataTowxObject},
{ "_class_wxObject","_wxFontData",SwigwxFontDataTowxObject},
{ "_class_wxObject","_class_wxTextEntryDialog",SwigwxTextEntryDialogTowxObject},
{ "_class_wxObject","_wxTextEntryDialog",SwigwxTextEntryDialogTowxObject},
{ "_class_wxObject","_class_wxSingleChoiceDialog",SwigwxSingleChoiceDialogTowxObject},
{ "_class_wxObject","_wxSingleChoiceDialog",SwigwxSingleChoiceDialogTowxObject},
{ "_class_wxObject","_class_wxFileDialog",SwigwxFileDialogTowxObject},
{ "_class_wxObject","_wxFileDialog",SwigwxFileDialogTowxObject},
{ "_class_wxObject","_class_wxDirDialog",SwigwxDirDialogTowxObject},
{ "_class_wxObject","_wxDirDialog",SwigwxDirDialogTowxObject},
{ "_class_wxObject","_class_wxColourDialog",SwigwxColourDialogTowxObject},
{ "_class_wxObject","_wxColourDialog",SwigwxColourDialogTowxObject},
{ "_class_wxObject","_class_wxColourData",SwigwxColourDataTowxObject},
{ "_class_wxObject","_wxColourData",SwigwxColourDataTowxObject},
{ "_class_wxObject","_wxObject",0},
{ "_wxSpinEvent","_class_wxSpinEvent",0},
{ "_size_t","_wxCoord",0},
{ "_size_t","_wxPrintQuality",0},
@@ -3167,6 +3269,27 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_wxClientDC","_class_wxClientDC",0},
{ "_wxMouseEvent","_class_wxMouseEvent",0},
{ "_wxSingleChoiceDialog","_class_wxSingleChoiceDialog",0},
{ "_wxObject","_class_wxProgressDialog",SwigwxProgressDialogTowxObject},
{ "_wxObject","_wxProgressDialog",SwigwxProgressDialogTowxObject},
{ "_wxObject","_class_wxMessageDialog",SwigwxMessageDialogTowxObject},
{ "_wxObject","_wxMessageDialog",SwigwxMessageDialogTowxObject},
{ "_wxObject","_class_wxFontDialog",SwigwxFontDialogTowxObject},
{ "_wxObject","_wxFontDialog",SwigwxFontDialogTowxObject},
{ "_wxObject","_class_wxFontData",SwigwxFontDataTowxObject},
{ "_wxObject","_wxFontData",SwigwxFontDataTowxObject},
{ "_wxObject","_class_wxTextEntryDialog",SwigwxTextEntryDialogTowxObject},
{ "_wxObject","_wxTextEntryDialog",SwigwxTextEntryDialogTowxObject},
{ "_wxObject","_class_wxSingleChoiceDialog",SwigwxSingleChoiceDialogTowxObject},
{ "_wxObject","_wxSingleChoiceDialog",SwigwxSingleChoiceDialogTowxObject},
{ "_wxObject","_class_wxFileDialog",SwigwxFileDialogTowxObject},
{ "_wxObject","_wxFileDialog",SwigwxFileDialogTowxObject},
{ "_wxObject","_class_wxDirDialog",SwigwxDirDialogTowxObject},
{ "_wxObject","_wxDirDialog",SwigwxDirDialogTowxObject},
{ "_wxObject","_class_wxColourDialog",SwigwxColourDialogTowxObject},
{ "_wxObject","_wxColourDialog",SwigwxColourDialogTowxObject},
{ "_wxObject","_class_wxColourData",SwigwxColourDataTowxObject},
{ "_wxObject","_wxColourData",SwigwxColourDataTowxObject},
{ "_wxObject","_class_wxObject",0},
{ "_class_wxPoint","_wxPoint",0},
{ "_wxRealPoint","_class_wxRealPoint",0},
{ "_class_wxRadioBox","_wxRadioBox",0},
@@ -3238,6 +3361,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_wxWindowID","_int",0},
{ "_wxWindowID","_signed_int",0},
{ "_wxWindowID","_unsigned_int",0},
{ "_class_wxGDIObject","_wxGDIObject",0},
{ "_class_wxScrollWinEvent","_wxScrollWinEvent",0},
{ "_int","_wxCoord",0},
{ "_int","_wxPrintQuality",0},