Mirrors_UI_SDK/wxWidgets
1
0
Fork 0
mirror of https://github.com/wxWidgets/wxWidgets.git synced 2026-09-21 13:26:08 +08:00
Code Issues Actions 8 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
wxPython/src/gtk/calendar.cpp
+28
View File
@@ -752,6 +752,14 @@ static void *SwigwxCalendarEventTowxEvent(void *ptr) {
return (void *) dest;
}
static void *SwigwxCalendarEventTowxObject(void *ptr) {
wxCalendarEvent *src;
wxObject *dest;
src = (wxCalendarEvent *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
#define new_wxCalendarEvent(_swigarg0,_swigarg1) (new wxCalendarEvent(_swigarg0,_swigarg1))
static PyObject *_wrap_new_wxCalendarEvent(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -873,6 +881,14 @@ static void *SwigwxCalendarCtrlTowxEvtHandler(void *ptr) {
return (void *) dest;
}
static void *SwigwxCalendarCtrlTowxObject(void *ptr) {
wxCalendarCtrl *src;
wxObject *dest;
src = (wxCalendarCtrl *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
#define new_wxCalendarCtrl(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6) (new wxCalendarCtrl(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6))
static PyObject *_wrap_new_wxCalendarCtrl(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -1722,8 +1738,14 @@ 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_wxObject","_class_wxCalendarCtrl",SwigwxCalendarCtrlTowxObject},
{ "_class_wxObject","_wxCalendarCtrl",SwigwxCalendarCtrlTowxObject},
{ "_class_wxObject","_class_wxCalendarEvent",SwigwxCalendarEventTowxObject},
{ "_class_wxObject","_wxCalendarEvent",SwigwxCalendarEventTowxObject},
{ "_class_wxObject","_wxObject",0},
{ "_wxSpinEvent","_class_wxSpinEvent",0},
{ "_size_t","_wxCoord",0},
{ "_size_t","_wxPrintQuality",0},
@@ -1872,6 +1894,11 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_class_wxPyBitmapDataObject","_wxPyBitmapDataObject",0},
{ "_wxClientDC","_class_wxClientDC",0},
{ "_wxMouseEvent","_class_wxMouseEvent",0},
{ "_wxObject","_class_wxCalendarCtrl",SwigwxCalendarCtrlTowxObject},
{ "_wxObject","_wxCalendarCtrl",SwigwxCalendarCtrlTowxObject},
{ "_wxObject","_class_wxCalendarEvent",SwigwxCalendarEventTowxObject},
{ "_wxObject","_wxCalendarEvent",SwigwxCalendarEventTowxObject},
{ "_wxObject","_class_wxObject",0},
{ "_class_wxPoint","_wxPoint",0},
{ "_wxRealPoint","_class_wxRealPoint",0},
{ "_class_wxRadioBox","_wxRadioBox",0},
@@ -1929,6 +1956,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},
wxPython/src/gtk/clip_dnd.cpp
+19 -1
View File
@@ -1909,6 +1909,14 @@ static PyObject *_wrap_wxCustomDataObject_GetData(PyObject *self, PyObject *args
return _resultobj;
}
static void *SwigwxClipboardTowxObject(void *ptr) {
wxClipboard *src;
wxObject *dest;
src = (wxClipboard *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
#define new_wxClipboard() (new wxClipboard())
static PyObject *_wrap_new_wxClipboard(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -3438,10 +3446,14 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_wxDataObjectSimple","_class_wxDataObjectSimple",0},
{ "_class_wxAcceleratorTable","_wxAcceleratorTable",0},
{ "_class_wxClipboard","_wxClipboard",0},
{ "_wxGDIObject","_class_wxGDIObject",0},
{ "_wxDC","_class_wxDC",0},
{ "_class_wxBitmapDataObject","_class_wxPyBitmapDataObject",SwigwxPyBitmapDataObjectTowxBitmapDataObject},
{ "_class_wxBitmapDataObject","_wxPyBitmapDataObject",SwigwxPyBitmapDataObjectTowxBitmapDataObject},
{ "_class_wxBitmapDataObject","_wxBitmapDataObject",0},
{ "_class_wxObject","_class_wxClipboard",SwigwxClipboardTowxObject},
{ "_class_wxObject","_wxClipboard",SwigwxClipboardTowxObject},
{ "_class_wxObject","_wxObject",0},
{ "_size_t","_wxCoord",0},
{ "_size_t","_wxPrintQuality",0},
{ "_size_t","_time_t",0},
@@ -3564,6 +3576,9 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_wxFontList","_class_wxFontList",0},
{ "_class_wxPyBitmapDataObject","_wxPyBitmapDataObject",0},
{ "_wxClientDC","_class_wxClientDC",0},
{ "_wxObject","_class_wxClipboard",SwigwxClipboardTowxObject},
{ "_wxObject","_wxClipboard",SwigwxClipboardTowxObject},
{ "_wxObject","_class_wxObject",0},
{ "_class_wxPoint","_wxPoint",0},
{ "_wxRealPoint","_class_wxRealPoint",0},
{ "_signed_short","_WXTYPE",0},
@@ -3601,6 +3616,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},
{ "_int","_wxCoord",0},
{ "_int","_wxPrintQuality",0},
{ "_int","_time_t",0},
@@ -3696,7 +3712,9 @@ SWIGEXPORT(void) initclip_dndc() {
wxPyTheClipboard = wxTheClipboard;
wxPyPtrTypeMap_Add("wxDropSource", "wxPyDropSource");
wxPyPtrTypeMap_Add("wxTextDropTarget", "wxPyTextDropTarget");
wxPyPtrTypeMap_Add("wxFileDropTarget", "wxPyFileDropTarget");
PyDict_SetItemString(d,"wxDataObject_Get", PyInt_FromLong((long) wxDataObject::Get));
PyDict_SetItemString(d,"wxDataObject_Set", PyInt_FromLong((long) wxDataObject::Set));
PyDict_SetItemString(d,"wxDataObject_Both", PyInt_FromLong((long) wxDataObject::Both));
wxPython/src/gtk/clip_dnd.py
+1 -1
View File
@@ -255,7 +255,7 @@ class wxCustomDataObject(wxCustomDataObjectPtr):
class wxClipboardPtr :
class wxClipboardPtr(wxObjectPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
wxPython/src/gtk/cmndlgs.cpp
+124
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},
wxPython/src/gtk/cmndlgs.py
+2 -2
View File
@@ -17,7 +17,7 @@ from controls import *
from events import *
import wx
class wxColourDataPtr :
class wxColourDataPtr(wxObjectPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
@@ -226,7 +226,7 @@ class wxTextEntryDialog(wxTextEntryDialogPtr):
class wxFontDataPtr :
class wxFontDataPtr(wxObjectPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
wxPython/src/gtk/controls.cpp
+256
View File
@@ -182,6 +182,14 @@ static void *SwigwxControlTowxEvtHandler(void *ptr) {
return (void *) dest;
}
static void *SwigwxControlTowxObject(void *ptr) {
wxControl *src;
wxObject *dest;
src = (wxControl *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
#define new_wxControl(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6) (new wxControl(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6))
static PyObject *_wrap_new_wxControl(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -389,6 +397,14 @@ static void *SwigwxButtonTowxEvtHandler(void *ptr) {
return (void *) dest;
}
static void *SwigwxButtonTowxObject(void *ptr) {
wxButton *src;
wxObject *dest;
src = (wxButton *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
#define new_wxButton(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6,_swigarg7) (new wxButton(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6,_swigarg7))
static PyObject *_wrap_new_wxButton(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -606,6 +622,14 @@ static void *SwigwxBitmapButtonTowxEvtHandler(void *ptr) {
return (void *) dest;
}
static void *SwigwxBitmapButtonTowxObject(void *ptr) {
wxBitmapButton *src;
wxObject *dest;
src = (wxBitmapButton *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
#define new_wxBitmapButton(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6,_swigarg7) (new wxBitmapButton(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6,_swigarg7))
static PyObject *_wrap_new_wxBitmapButton(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -1070,6 +1094,14 @@ static void *SwigwxCheckBoxTowxEvtHandler(void *ptr) {
return (void *) dest;
}
static void *SwigwxCheckBoxTowxObject(void *ptr) {
wxCheckBox *src;
wxObject *dest;
src = (wxCheckBox *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
#define new_wxCheckBox(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6,_swigarg7) (new wxCheckBox(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6,_swigarg7))
static PyObject *_wrap_new_wxCheckBox(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -1239,6 +1271,14 @@ static void *SwigwxChoiceTowxEvtHandler(void *ptr) {
return (void *) dest;
}
static void *SwigwxChoiceTowxObject(void *ptr) {
wxChoice *src;
wxObject *dest;
src = (wxChoice *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
#define new_wxChoice(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6,_swigarg7,_swigarg8) (new wxChoice(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6,_swigarg7,_swigarg8))
static PyObject *_wrap_new_wxChoice(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -1738,6 +1778,14 @@ static void *SwigwxComboBoxTowxEvtHandler(void *ptr) {
return (void *) dest;
}
static void *SwigwxComboBoxTowxObject(void *ptr) {
wxComboBox *src;
wxObject *dest;
src = (wxComboBox *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
#define new_wxComboBox(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6,_swigarg7,_swigarg8,_swigarg9) (new wxComboBox(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6,_swigarg7,_swigarg8,_swigarg9))
static PyObject *_wrap_new_wxComboBox(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -2536,6 +2584,14 @@ static void *SwigwxGaugeTowxEvtHandler(void *ptr) {
return (void *) dest;
}
static void *SwigwxGaugeTowxObject(void *ptr) {
wxGauge *src;
wxObject *dest;
src = (wxGauge *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
#define new_wxGauge(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6,_swigarg7) (new wxGauge(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6,_swigarg7))
static PyObject *_wrap_new_wxGauge(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -2845,6 +2901,14 @@ static void *SwigwxStaticBoxTowxEvtHandler(void *ptr) {
return (void *) dest;
}
static void *SwigwxStaticBoxTowxObject(void *ptr) {
wxStaticBox *src;
wxObject *dest;
src = (wxStaticBox *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
#define new_wxStaticBox(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6) (new wxStaticBox(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6))
static PyObject *_wrap_new_wxStaticBox(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -2948,6 +3012,14 @@ static void *SwigwxStaticLineTowxEvtHandler(void *ptr) {
return (void *) dest;
}
static void *SwigwxStaticLineTowxObject(void *ptr) {
wxStaticLine *src;
wxObject *dest;
src = (wxStaticLine *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
#define new_wxStaticLine(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5) (new wxStaticLine(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5))
static PyObject *_wrap_new_wxStaticLine(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -3027,6 +3099,14 @@ static void *SwigwxStaticTextTowxEvtHandler(void *ptr) {
return (void *) dest;
}
static void *SwigwxStaticTextTowxObject(void *ptr) {
wxStaticText *src;
wxObject *dest;
src = (wxStaticText *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
#define new_wxStaticText(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6) (new wxStaticText(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6))
static PyObject *_wrap_new_wxStaticText(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -3213,6 +3293,14 @@ static void *SwigwxListBoxTowxEvtHandler(void *ptr) {
return (void *) dest;
}
static void *SwigwxListBoxTowxObject(void *ptr) {
wxListBox *src;
wxObject *dest;
src = (wxListBox *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
#define new_wxListBox(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6,_swigarg7,_swigarg8) (new wxListBox(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6,_swigarg7,_swigarg8))
static PyObject *_wrap_new_wxListBox(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -4011,6 +4099,14 @@ static void *SwigwxCheckListBoxTowxEvtHandler(void *ptr) {
return (void *) dest;
}
static void *SwigwxCheckListBoxTowxObject(void *ptr) {
wxCheckListBox *src;
wxObject *dest;
src = (wxCheckListBox *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
#define new_wxCheckListBox(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6,_swigarg7,_swigarg8) (new wxCheckListBox(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6,_swigarg7,_swigarg8))
static PyObject *_wrap_new_wxCheckListBox(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -4252,6 +4348,14 @@ static void *SwigwxTextCtrlTowxEvtHandler(void *ptr) {
return (void *) dest;
}
static void *SwigwxTextCtrlTowxObject(void *ptr) {
wxTextCtrl *src;
wxObject *dest;
src = (wxTextCtrl *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
#define new_wxTextCtrl(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6,_swigarg7) (new wxTextCtrl(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6,_swigarg7))
static PyObject *_wrap_new_wxTextCtrl(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -5549,6 +5653,14 @@ static void *SwigwxScrollBarTowxEvtHandler(void *ptr) {
return (void *) dest;
}
static void *SwigwxScrollBarTowxObject(void *ptr) {
wxScrollBar *src;
wxObject *dest;
src = (wxScrollBar *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
#define new_wxScrollBar(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6) (new wxScrollBar(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6))
static PyObject *_wrap_new_wxScrollBar(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -5807,6 +5919,14 @@ static void *SwigwxSpinButtonTowxEvtHandler(void *ptr) {
return (void *) dest;
}
static void *SwigwxSpinButtonTowxObject(void *ptr) {
wxSpinButton *src;
wxObject *dest;
src = (wxSpinButton *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
#define new_wxSpinButton(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5) (new wxSpinButton(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5))
static PyObject *_wrap_new_wxSpinButton(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -6024,6 +6144,14 @@ static void *SwigwxStaticBitmapTowxEvtHandler(void *ptr) {
return (void *) dest;
}
static void *SwigwxStaticBitmapTowxObject(void *ptr) {
wxStaticBitmap *src;
wxObject *dest;
src = (wxStaticBitmap *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
#define new_wxStaticBitmap(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6) (new wxStaticBitmap(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6))
static PyObject *_wrap_new_wxStaticBitmap(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -6219,6 +6347,14 @@ static void *SwigwxRadioBoxTowxEvtHandler(void *ptr) {
return (void *) dest;
}
static void *SwigwxRadioBoxTowxObject(void *ptr) {
wxRadioBox *src;
wxObject *dest;
src = (wxRadioBox *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
#define new_wxRadioBox(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6,_swigarg7,_swigarg8,_swigarg9,_swigarg10) (new wxRadioBox(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6,_swigarg7,_swigarg8,_swigarg9,_swigarg10))
static PyObject *_wrap_new_wxRadioBox(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -6809,6 +6945,14 @@ static void *SwigwxRadioButtonTowxEvtHandler(void *ptr) {
return (void *) dest;
}
static void *SwigwxRadioButtonTowxObject(void *ptr) {
wxRadioButton *src;
wxObject *dest;
src = (wxRadioButton *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
#define new_wxRadioButton(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6,_swigarg7) (new wxRadioButton(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6,_swigarg7))
static PyObject *_wrap_new_wxRadioButton(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -6978,6 +7122,14 @@ static void *SwigwxSliderTowxEvtHandler(void *ptr) {
return (void *) dest;
}
static void *SwigwxSliderTowxObject(void *ptr) {
wxSlider *src;
wxObject *dest;
src = (wxSlider *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
#define new_wxSlider(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6,_swigarg7,_swigarg8,_swigarg9) (new wxSlider(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6,_swigarg7,_swigarg8,_swigarg9))
static PyObject *_wrap_new_wxSlider(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -7601,6 +7753,14 @@ static void *SwigwxSpinCtrlTowxEvtHandler(void *ptr) {
return (void *) dest;
}
static void *SwigwxSpinCtrlTowxObject(void *ptr) {
wxSpinCtrl *src;
wxObject *dest;
src = (wxSpinCtrl *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
#define new_wxSpinCtrl(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6,_swigarg7,_swigarg8,_swigarg9) (new wxSpinCtrl(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6,_swigarg7,_swigarg8,_swigarg9))
static PyObject *_wrap_new_wxSpinCtrl(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -7822,6 +7982,14 @@ static void *SwigwxToggleButtonTowxEvtHandler(void *ptr) {
return (void *) dest;
}
static void *SwigwxToggleButtonTowxObject(void *ptr) {
wxToggleButton *src;
wxObject *dest;
src = (wxToggleButton *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
#define new_wxToggleButton(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6,_swigarg7) (new wxToggleButton(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6,_swigarg7))
static PyObject *_wrap_new_wxToggleButton(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -8317,8 +8485,52 @@ 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_wxObject","_class_wxToggleButton",SwigwxToggleButtonTowxObject},
{ "_class_wxObject","_wxToggleButton",SwigwxToggleButtonTowxObject},
{ "_class_wxObject","_class_wxSpinCtrl",SwigwxSpinCtrlTowxObject},
{ "_class_wxObject","_wxSpinCtrl",SwigwxSpinCtrlTowxObject},
{ "_class_wxObject","_class_wxSlider",SwigwxSliderTowxObject},
{ "_class_wxObject","_wxSlider",SwigwxSliderTowxObject},
{ "_class_wxObject","_class_wxRadioButton",SwigwxRadioButtonTowxObject},
{ "_class_wxObject","_wxRadioButton",SwigwxRadioButtonTowxObject},
{ "_class_wxObject","_class_wxRadioBox",SwigwxRadioBoxTowxObject},
{ "_class_wxObject","_wxRadioBox",SwigwxRadioBoxTowxObject},
{ "_class_wxObject","_class_wxStaticBitmap",SwigwxStaticBitmapTowxObject},
{ "_class_wxObject","_wxStaticBitmap",SwigwxStaticBitmapTowxObject},
{ "_class_wxObject","_class_wxSpinButton",SwigwxSpinButtonTowxObject},
{ "_class_wxObject","_wxSpinButton",SwigwxSpinButtonTowxObject},
{ "_class_wxObject","_class_wxScrollBar",SwigwxScrollBarTowxObject},
{ "_class_wxObject","_wxScrollBar",SwigwxScrollBarTowxObject},
{ "_class_wxObject","_class_wxTextCtrl",SwigwxTextCtrlTowxObject},
{ "_class_wxObject","_wxTextCtrl",SwigwxTextCtrlTowxObject},
{ "_class_wxObject","_class_wxCheckListBox",SwigwxCheckListBoxTowxObject},
{ "_class_wxObject","_wxCheckListBox",SwigwxCheckListBoxTowxObject},
{ "_class_wxObject","_class_wxListBox",SwigwxListBoxTowxObject},
{ "_class_wxObject","_wxListBox",SwigwxListBoxTowxObject},
{ "_class_wxObject","_class_wxStaticText",SwigwxStaticTextTowxObject},
{ "_class_wxObject","_wxStaticText",SwigwxStaticTextTowxObject},
{ "_class_wxObject","_class_wxStaticLine",SwigwxStaticLineTowxObject},
{ "_class_wxObject","_wxStaticLine",SwigwxStaticLineTowxObject},
{ "_class_wxObject","_class_wxStaticBox",SwigwxStaticBoxTowxObject},
{ "_class_wxObject","_wxStaticBox",SwigwxStaticBoxTowxObject},
{ "_class_wxObject","_class_wxGauge",SwigwxGaugeTowxObject},
{ "_class_wxObject","_wxGauge",SwigwxGaugeTowxObject},
{ "_class_wxObject","_class_wxComboBox",SwigwxComboBoxTowxObject},
{ "_class_wxObject","_wxComboBox",SwigwxComboBoxTowxObject},
{ "_class_wxObject","_class_wxChoice",SwigwxChoiceTowxObject},
{ "_class_wxObject","_wxChoice",SwigwxChoiceTowxObject},
{ "_class_wxObject","_class_wxCheckBox",SwigwxCheckBoxTowxObject},
{ "_class_wxObject","_wxCheckBox",SwigwxCheckBoxTowxObject},
{ "_class_wxObject","_class_wxBitmapButton",SwigwxBitmapButtonTowxObject},
{ "_class_wxObject","_wxBitmapButton",SwigwxBitmapButtonTowxObject},
{ "_class_wxObject","_class_wxButton",SwigwxButtonTowxObject},
{ "_class_wxObject","_wxButton",SwigwxButtonTowxObject},
{ "_class_wxObject","_class_wxControl",SwigwxControlTowxObject},
{ "_class_wxObject","_wxControl",SwigwxControlTowxObject},
{ "_class_wxObject","_wxObject",0},
{ "_wxSpinEvent","_class_wxSpinEvent",0},
{ "_size_t","_wxCoord",0},
{ "_size_t","_wxPrintQuality",0},
@@ -8501,6 +8713,49 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_class_wxPyBitmapDataObject","_wxPyBitmapDataObject",0},
{ "_wxClientDC","_class_wxClientDC",0},
{ "_wxMouseEvent","_class_wxMouseEvent",0},
{ "_wxObject","_class_wxToggleButton",SwigwxToggleButtonTowxObject},
{ "_wxObject","_wxToggleButton",SwigwxToggleButtonTowxObject},
{ "_wxObject","_class_wxSpinCtrl",SwigwxSpinCtrlTowxObject},
{ "_wxObject","_wxSpinCtrl",SwigwxSpinCtrlTowxObject},
{ "_wxObject","_class_wxSlider",SwigwxSliderTowxObject},
{ "_wxObject","_wxSlider",SwigwxSliderTowxObject},
{ "_wxObject","_class_wxRadioButton",SwigwxRadioButtonTowxObject},
{ "_wxObject","_wxRadioButton",SwigwxRadioButtonTowxObject},
{ "_wxObject","_class_wxRadioBox",SwigwxRadioBoxTowxObject},
{ "_wxObject","_wxRadioBox",SwigwxRadioBoxTowxObject},
{ "_wxObject","_class_wxStaticBitmap",SwigwxStaticBitmapTowxObject},
{ "_wxObject","_wxStaticBitmap",SwigwxStaticBitmapTowxObject},
{ "_wxObject","_class_wxSpinButton",SwigwxSpinButtonTowxObject},
{ "_wxObject","_wxSpinButton",SwigwxSpinButtonTowxObject},
{ "_wxObject","_class_wxScrollBar",SwigwxScrollBarTowxObject},
{ "_wxObject","_wxScrollBar",SwigwxScrollBarTowxObject},
{ "_wxObject","_class_wxTextCtrl",SwigwxTextCtrlTowxObject},
{ "_wxObject","_wxTextCtrl",SwigwxTextCtrlTowxObject},
{ "_wxObject","_class_wxCheckListBox",SwigwxCheckListBoxTowxObject},
{ "_wxObject","_wxCheckListBox",SwigwxCheckListBoxTowxObject},
{ "_wxObject","_class_wxListBox",SwigwxListBoxTowxObject},
{ "_wxObject","_wxListBox",SwigwxListBoxTowxObject},
{ "_wxObject","_class_wxStaticText",SwigwxStaticTextTowxObject},
{ "_wxObject","_wxStaticText",SwigwxStaticTextTowxObject},
{ "_wxObject","_class_wxStaticLine",SwigwxStaticLineTowxObject},
{ "_wxObject","_wxStaticLine",SwigwxStaticLineTowxObject},
{ "_wxObject","_class_wxStaticBox",SwigwxStaticBoxTowxObject},
{ "_wxObject","_wxStaticBox",SwigwxStaticBoxTowxObject},
{ "_wxObject","_class_wxGauge",SwigwxGaugeTowxObject},
{ "_wxObject","_wxGauge",SwigwxGaugeTowxObject},
{ "_wxObject","_class_wxComboBox",SwigwxComboBoxTowxObject},
{ "_wxObject","_wxComboBox",SwigwxComboBoxTowxObject},
{ "_wxObject","_class_wxChoice",SwigwxChoiceTowxObject},
{ "_wxObject","_wxChoice",SwigwxChoiceTowxObject},
{ "_wxObject","_class_wxCheckBox",SwigwxCheckBoxTowxObject},
{ "_wxObject","_wxCheckBox",SwigwxCheckBoxTowxObject},
{ "_wxObject","_class_wxBitmapButton",SwigwxBitmapButtonTowxObject},
{ "_wxObject","_wxBitmapButton",SwigwxBitmapButtonTowxObject},
{ "_wxObject","_class_wxButton",SwigwxButtonTowxObject},
{ "_wxObject","_wxButton",SwigwxButtonTowxObject},
{ "_wxObject","_class_wxControl",SwigwxControlTowxObject},
{ "_wxObject","_wxControl",SwigwxControlTowxObject},
{ "_wxObject","_class_wxObject",0},
{ "_class_wxPoint","_wxPoint",0},
{ "_wxRealPoint","_class_wxRealPoint",0},
{ "_class_wxRadioBox","_wxRadioBox",0},
@@ -8597,6 +8852,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},
wxPython/src/gtk/controls2.cpp
+90 -57
View File
@@ -61,6 +61,7 @@ extern PyObject *SWIG_newvarlink(void);
#endif
#include <wx/listctrl.h>
#include <wx/treectrl.h>
#include <wx/imaglist.h>
static PyObject* l_output_helper(PyObject* target, PyObject* o) {
PyObject* o2;
@@ -164,6 +165,7 @@ public:
};
class wxPyTreeCtrl : public wxTreeCtrl {
DECLARE_ABSTRACT_CLASS(wxPyTreeCtrl);
public:
wxPyTreeCtrl(wxWindow *parent, wxWindowID id,
const wxPoint& pos,
@@ -173,7 +175,6 @@ public:
char* name) :
wxTreeCtrl(parent, id, pos, size, style, validator, name) {}
int OnCompareItems(const wxTreeItemId& item1,
const wxTreeItemId& item2) {
int rval = 0;
@@ -191,6 +192,8 @@ public:
PYPRIVATE;
};
IMPLEMENT_ABSTRACT_CLASS(wxPyTreeCtrl, wxTreeCtrl);
#ifdef __cplusplus
extern "C" {
#endif
@@ -511,6 +514,14 @@ static PyObject *_wrap_wxListItemAttr_GetFont(PyObject *self, PyObject *args, Py
return _resultobj;
}
static void *SwigwxListItemTowxObject(void *ptr) {
wxListItem *src;
wxObject *dest;
src = (wxListItem *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
#define new_wxListItem() (new wxListItem())
static PyObject *_wrap_new_wxListItem(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -2021,6 +2032,14 @@ static void *SwigwxListEventTowxEvent(void *ptr) {
return (void *) dest;
}
static void *SwigwxListEventTowxObject(void *ptr) {
wxListEvent *src;
wxObject *dest;
src = (wxListEvent *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
#define wxListEvent_m_code_set(_swigobj,_swigval) (_swigobj->m_code = _swigval,_swigval)
static PyObject *_wrap_wxListEvent_m_code_set(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -2383,7 +2402,6 @@ static PyObject *_wrap_wxListEvent_m_item_set(PyObject *self, PyObject *args, Py
PyObject * _argo0 = 0;
PyObject * _argo1 = 0;
char *_kwnames[] = { "self","m_item", NULL };
char _ptemp[128];
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxListEvent_m_item_set",_kwnames,&_argo0,&_argo1))
@@ -2407,13 +2425,7 @@ static PyObject *_wrap_wxListEvent_m_item_set(PyObject *self, PyObject *args, Py
_result = (wxListItem *)wxListEvent_m_item_set(_arg0,_arg1);
wxPy_END_ALLOW_THREADS;
} if (_result) {
SWIG_MakePtr(_ptemp, (char *) _result,"_wxListItem_p");
_resultobj = Py_BuildValue("s",_ptemp);
} else {
Py_INCREF(Py_None);
_resultobj = Py_None;
}
}{ _resultobj = wxPyMake_wxObject(_result); }
return _resultobj;
}
@@ -2424,7 +2436,6 @@ static PyObject *_wrap_wxListEvent_m_item_get(PyObject *self, PyObject *args, Py
wxListEvent * _arg0;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self", NULL };
char _ptemp[128];
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxListEvent_m_item_get",_kwnames,&_argo0))
@@ -2441,13 +2452,7 @@ static PyObject *_wrap_wxListEvent_m_item_get(PyObject *self, PyObject *args, Py
_result = (wxListItem *)wxListEvent_m_item_get(_arg0);
wxPy_END_ALLOW_THREADS;
} if (_result) {
SWIG_MakePtr(_ptemp, (char *) _result,"_wxListItem_p");
_resultobj = Py_BuildValue("s",_ptemp);
} else {
Py_INCREF(Py_None);
_resultobj = Py_None;
}
}{ _resultobj = wxPyMake_wxObject(_result); }
return _resultobj;
}
@@ -2790,7 +2795,6 @@ static PyObject *_wrap_wxListEvent_GetItem(PyObject *self, PyObject *args, PyObj
wxListEvent * _arg0;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self", NULL };
char _ptemp[128];
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxListEvent_GetItem",_kwnames,&_argo0))
@@ -2808,13 +2812,7 @@ static PyObject *_wrap_wxListEvent_GetItem(PyObject *self, PyObject *args, PyObj
_result = (wxListItem *) &_result_ref;
wxPy_END_ALLOW_THREADS;
} if (_result) {
SWIG_MakePtr(_ptemp, (char *) _result,"_wxListItem_p");
_resultobj = Py_BuildValue("s",_ptemp);
} else {
Py_INCREF(Py_None);
_resultobj = Py_None;
}
}{ _resultobj = wxPyMake_wxObject(_result); }
return _resultobj;
}
@@ -2842,6 +2840,14 @@ static void *SwigwxListCtrlTowxEvtHandler(void *ptr) {
return (void *) dest;
}
static void *SwigwxListCtrlTowxObject(void *ptr) {
wxListCtrl *src;
wxObject *dest;
src = (wxListCtrl *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
#define new_wxListCtrl(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6) (new wxListCtrl(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6))
static PyObject *_wrap_new_wxListCtrl(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -3385,7 +3391,6 @@ static PyObject *_wrap_wxListCtrl_GetImageList(PyObject *self, PyObject *args, P
int _arg1;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self","which", NULL };
char _ptemp[128];
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxListCtrl_GetImageList",_kwnames,&_argo0,&_arg1))
@@ -3402,13 +3407,7 @@ static PyObject *_wrap_wxListCtrl_GetImageList(PyObject *self, PyObject *args, P
_result = (wxImageList *)wxListCtrl_GetImageList(_arg0,_arg1);
wxPy_END_ALLOW_THREADS;
} if (_result) {
SWIG_MakePtr(_ptemp, (char *) _result,"_wxImageList_p");
_resultobj = Py_BuildValue("s",_ptemp);
} else {
Py_INCREF(Py_None);
_resultobj = Py_None;
}
}{ _resultobj = wxPyMake_wxObject(_result); }
return _resultobj;
}
@@ -3456,7 +3455,6 @@ static PyObject *_wrap_wxListCtrl_GetItem(PyObject *self, PyObject *args, PyObje
int _arg2 = (int ) 0;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self","itemId","col", NULL };
char _ptemp[128];
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol|i:wxListCtrl_GetItem",_kwnames,&_argo0,&_arg1,&_arg2))
@@ -3473,13 +3471,7 @@ static PyObject *_wrap_wxListCtrl_GetItem(PyObject *self, PyObject *args, PyObje
_result = (wxListItem *)wxListCtrl_GetItem(_arg0,_arg1,_arg2);
wxPy_END_ALLOW_THREADS;
} if (_result) {
SWIG_MakePtr(_ptemp, (char *) _result,"_wxListItem_p");
_resultobj = Py_BuildValue("s",_ptemp);
} else {
Py_INCREF(Py_None);
_resultobj = Py_None;
}
}{ _resultobj = wxPyMake_wxObject(_result); }
return _resultobj;
}
@@ -4719,6 +4711,14 @@ static PyObject *_wrap_wxTreeItemId___cmp__(PyObject *self, PyObject *args, PyOb
return _resultobj;
}
static void *SwigwxPyTreeItemDataTowxObject(void *ptr) {
wxPyTreeItemData *src;
wxObject *dest;
src = (wxPyTreeItemData *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
#define new_wxTreeItemData(_swigarg0) (new wxPyTreeItemData(_swigarg0))
static PyObject *_wrap_new_wxTreeItemData(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -4906,6 +4906,14 @@ static void *SwigwxTreeEventTowxEvent(void *ptr) {
return (void *) dest;
}
static void *SwigwxTreeEventTowxObject(void *ptr) {
wxTreeEvent *src;
wxObject *dest;
src = (wxTreeEvent *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
#define wxTreeEvent_GetItem(_swigobj) (_swigobj->GetItem())
static PyObject *_wrap_wxTreeEvent_GetItem(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -5074,6 +5082,14 @@ static void *SwigwxPyTreeCtrlTowxEvtHandler(void *ptr) {
return (void *) dest;
}
static void *SwigwxPyTreeCtrlTowxObject(void *ptr) {
wxPyTreeCtrl *src;
wxObject *dest;
src = (wxPyTreeCtrl *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
#define new_wxTreeCtrl(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6) (new wxPyTreeCtrl(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6))
static PyObject *_wrap_new_wxTreeCtrl(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -5300,7 +5316,6 @@ static PyObject *_wrap_wxTreeCtrl_GetImageList(PyObject *self, PyObject *args, P
wxPyTreeCtrl * _arg0;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self", NULL };
char _ptemp[128];
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxTreeCtrl_GetImageList",_kwnames,&_argo0))
@@ -5317,13 +5332,7 @@ static PyObject *_wrap_wxTreeCtrl_GetImageList(PyObject *self, PyObject *args, P
_result = (wxImageList *)wxTreeCtrl_GetImageList(_arg0);
wxPy_END_ALLOW_THREADS;
} if (_result) {
SWIG_MakePtr(_ptemp, (char *) _result,"_wxImageList_p");
_resultobj = Py_BuildValue("s",_ptemp);
} else {
Py_INCREF(Py_None);
_resultobj = Py_None;
}
}{ _resultobj = wxPyMake_wxObject(_result); }
return _resultobj;
}
@@ -5334,7 +5343,6 @@ static PyObject *_wrap_wxTreeCtrl_GetStateImageList(PyObject *self, PyObject *ar
wxPyTreeCtrl * _arg0;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self", NULL };
char _ptemp[128];
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxTreeCtrl_GetStateImageList",_kwnames,&_argo0))
@@ -5351,13 +5359,7 @@ static PyObject *_wrap_wxTreeCtrl_GetStateImageList(PyObject *self, PyObject *ar
_result = (wxImageList *)wxTreeCtrl_GetStateImageList(_arg0);
wxPy_END_ALLOW_THREADS;
} if (_result) {
SWIG_MakePtr(_ptemp, (char *) _result,"_wxImageList_p");
_resultobj = Py_BuildValue("s",_ptemp);
} else {
Py_INCREF(Py_None);
_resultobj = Py_None;
}
}{ _resultobj = wxPyMake_wxObject(_result); }
return _resultobj;
}
@@ -7994,9 +7996,23 @@ 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},
{ "_wxListEvent","_class_wxListEvent",0},
{ "_class_wxObject","_class_wxPyTreeCtrl",SwigwxPyTreeCtrlTowxObject},
{ "_class_wxObject","_wxPyTreeCtrl",SwigwxPyTreeCtrlTowxObject},
{ "_class_wxObject","_class_wxTreeEvent",SwigwxTreeEventTowxObject},
{ "_class_wxObject","_wxTreeEvent",SwigwxTreeEventTowxObject},
{ "_class_wxObject","_class_wxPyTreeItemData",SwigwxPyTreeItemDataTowxObject},
{ "_class_wxObject","_wxPyTreeItemData",SwigwxPyTreeItemDataTowxObject},
{ "_class_wxObject","_class_wxListCtrl",SwigwxListCtrlTowxObject},
{ "_class_wxObject","_wxListCtrl",SwigwxListCtrlTowxObject},
{ "_class_wxObject","_class_wxListEvent",SwigwxListEventTowxObject},
{ "_class_wxObject","_wxListEvent",SwigwxListEventTowxObject},
{ "_class_wxObject","_class_wxListItem",SwigwxListItemTowxObject},
{ "_class_wxObject","_wxListItem",SwigwxListItemTowxObject},
{ "_class_wxObject","_wxObject",0},
{ "_wxSpinEvent","_class_wxSpinEvent",0},
{ "_size_t","_wxCoord",0},
{ "_size_t","_wxPrintQuality",0},
@@ -8150,6 +8166,19 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_wxClientDC","_class_wxClientDC",0},
{ "_wxMouseEvent","_class_wxMouseEvent",0},
{ "_wxListCtrl","_class_wxListCtrl",0},
{ "_wxObject","_class_wxPyTreeCtrl",SwigwxPyTreeCtrlTowxObject},
{ "_wxObject","_wxPyTreeCtrl",SwigwxPyTreeCtrlTowxObject},
{ "_wxObject","_class_wxTreeEvent",SwigwxTreeEventTowxObject},
{ "_wxObject","_wxTreeEvent",SwigwxTreeEventTowxObject},
{ "_wxObject","_class_wxPyTreeItemData",SwigwxPyTreeItemDataTowxObject},
{ "_wxObject","_wxPyTreeItemData",SwigwxPyTreeItemDataTowxObject},
{ "_wxObject","_class_wxListCtrl",SwigwxListCtrlTowxObject},
{ "_wxObject","_wxListCtrl",SwigwxListCtrlTowxObject},
{ "_wxObject","_class_wxListEvent",SwigwxListEventTowxObject},
{ "_wxObject","_wxListEvent",SwigwxListEventTowxObject},
{ "_wxObject","_class_wxListItem",SwigwxListItemTowxObject},
{ "_wxObject","_wxListItem",SwigwxListItemTowxObject},
{ "_wxObject","_class_wxObject",0},
{ "_class_wxPoint","_wxPoint",0},
{ "_wxRealPoint","_class_wxRealPoint",0},
{ "_class_wxRadioBox","_wxRadioBox",0},
@@ -8208,6 +8237,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},
@@ -8422,6 +8452,9 @@ SWIGEXPORT(void) initcontrols2c() {
PyDict_SetItemString(d,"wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK", PyInt_FromLong((long) wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK));
PyDict_SetItemString(d,"wxEVT_COMMAND_TREE_ITEM_MIDDLE_CLICK", PyInt_FromLong((long) wxEVT_COMMAND_TREE_ITEM_MIDDLE_CLICK));
PyDict_SetItemString(d,"wxEVT_COMMAND_TREE_END_DRAG", PyInt_FromLong((long) wxEVT_COMMAND_TREE_END_DRAG));
wxPyPtrTypeMap_Add("wxTreeItemData", "wxPyTreeItemData");
wxPyPtrTypeMap_Add("wxTreeCtrl", "wxPyTreeCtrl");
{
int i;
for (i = 0; _swig_mapping[i].n1; i++)
wxPython/src/gtk/controls2.py
+4 -7
View File
@@ -57,7 +57,7 @@ class wxListItemAttr(wxListItemAttrPtr):
class wxListItemPtr :
class wxListItemPtr(wxObjectPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
@@ -262,7 +262,6 @@ class wxListEventPtr(wxNotifyEventPtr):
return val
def GetItem(self, *_args, **_kwargs):
val = apply(controls2c.wxListEvent_GetItem,(self,) + _args, _kwargs)
if val: val = wxListItemPtr(val)
return val
def __setattr__(self,name,value):
if name == "m_code" :
@@ -321,6 +320,7 @@ class wxListCtrlPtr(wxControlPtr):
return val
def AssignImageList(self, *_args, **_kwargs):
val = apply(controls2c.wxListCtrl_AssignImageList,(self,) + _args, _kwargs)
_args[0].thisown = 0
return val
def DeleteItem(self, *_args, **_kwargs):
val = apply(controls2c.wxListCtrl_DeleteItem,(self,) + _args, _kwargs)
@@ -363,14 +363,12 @@ class wxListCtrlPtr(wxControlPtr):
return val
def GetImageList(self, *_args, **_kwargs):
val = apply(controls2c.wxListCtrl_GetImageList,(self,) + _args, _kwargs)
if val: val = wxImageListPtr(val)
return val
def GetItemData(self, *_args, **_kwargs):
val = apply(controls2c.wxListCtrl_GetItemData,(self,) + _args, _kwargs)
return val
def GetItem(self, *_args, **_kwargs):
val = apply(controls2c.wxListCtrl_GetItem,(self,) + _args, _kwargs)
if val: val = wxListItemPtr(val) ; val.thisown = 1
return val
def GetItemPosition(self, *_args, **_kwargs):
val = apply(controls2c.wxListCtrl_GetItemPosition,(self,) + _args, _kwargs)
@@ -501,7 +499,7 @@ class wxTreeItemId(wxTreeItemIdPtr):
class wxTreeItemDataPtr :
class wxTreeItemDataPtr(wxObjectPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
@@ -568,6 +566,7 @@ class wxTreeCtrlPtr(wxControlPtr):
return val
def AssignImageList(self, *_args, **_kwargs):
val = apply(controls2c.wxTreeCtrl_AssignImageList,(self,) + _args, _kwargs)
_args[0].thisown = 0
return val
def GetCount(self, *_args, **_kwargs):
val = apply(controls2c.wxTreeCtrl_GetCount,(self,) + _args, _kwargs)
@@ -580,11 +579,9 @@ class wxTreeCtrlPtr(wxControlPtr):
return val
def GetImageList(self, *_args, **_kwargs):
val = apply(controls2c.wxTreeCtrl_GetImageList,(self,) + _args, _kwargs)
if val: val = wxImageListPtr(val)
return val
def GetStateImageList(self, *_args, **_kwargs):
val = apply(controls2c.wxTreeCtrl_GetStateImageList,(self,) + _args, _kwargs)
if val: val = wxImageListPtr(val)
return val
def SetImageList(self, *_args, **_kwargs):
val = apply(controls2c.wxTreeCtrl_SetImageList,(self,) + _args, _kwargs)
wxPython/src/gtk/events.cpp
+406 -48
View File
File diff suppressed because it is too large Load Diff
wxPython/src/gtk/events.py
+1 -6
View File
@@ -4,7 +4,7 @@ import eventsc
from misc import *
from gdi import *
class wxEventPtr :
class wxEventPtr(wxObjectPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
@@ -491,7 +491,6 @@ class wxNavigationKeyEventPtr(wxEventPtr):
return val
def GetCurrentFocus(self, *_args, **_kwargs):
val = apply(eventsc.wxNavigationKeyEvent_GetCurrentFocus,(self,) + _args, _kwargs)
if val: val = wxWindowPtr(val)
return val
def SetCurrentFocus(self, *_args, **_kwargs):
val = apply(eventsc.wxNavigationKeyEvent_SetCurrentFocus,(self,) + _args, _kwargs)
@@ -544,7 +543,6 @@ class wxEraseEventPtr(wxEventPtr):
self.thisown = 0
def GetDC(self, *_args, **_kwargs):
val = apply(eventsc.wxEraseEvent_GetDC,(self,) + _args, _kwargs)
if val: val = wxDCPtr(val)
return val
def __repr__(self):
return "<C wxEraseEvent instance at %s>" % (self.this,)
@@ -859,7 +857,6 @@ class wxPaletteChangedEventPtr(wxEventPtr):
return val
def GetChangedWindow(self, *_args, **_kwargs):
val = apply(eventsc.wxPaletteChangedEvent_GetChangedWindow,(self,) + _args, _kwargs)
if val: val = wxWindowPtr(val)
return val
def __repr__(self):
return "<C wxPaletteChangedEvent instance at %s>" % (self.this,)
@@ -897,7 +894,6 @@ class wxWindowCreateEventPtr(wxCommandEventPtr):
self.thisown = 0
def GetWindow(self, *_args, **_kwargs):
val = apply(eventsc.wxWindowCreateEvent_GetWindow,(self,) + _args, _kwargs)
if val: val = wxWindowPtr(val)
return val
def __repr__(self):
return "<C wxWindowCreateEvent instance at %s>" % (self.this,)
@@ -915,7 +911,6 @@ class wxWindowDestroyEventPtr(wxCommandEventPtr):
self.thisown = 0
def GetWindow(self, *_args, **_kwargs):
val = apply(eventsc.wxWindowDestroyEvent_GetWindow,(self,) + _args, _kwargs)
if val: val = wxWindowPtr(val)
return val
def __repr__(self):
return "<C wxWindowDestroyEvent instance at %s>" % (self.this,)
wxPython/src/gtk/filesys.cpp
+96 -62
View File
@@ -328,6 +328,14 @@ static PyObject *_wrap___wxMemoryFSHandler_AddFile_Data(PyObject *self, PyObject
return _resultobj;
}
static void *SwigwxFSFileTowxObject(void *ptr) {
wxFSFile *src;
wxObject *dest;
src = (wxFSFile *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
#define new_wxFSFile(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4) (new wxFSFile(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4))
static PyObject *_wrap_new_wxFSFile(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -478,28 +486,7 @@ static PyObject *_wrap_wxFSFile_GetStream(PyObject *self, PyObject *args, PyObje
if (_result) {
_ptr = new wxPyInputStream(_result);
}
if (_ptr) {
char swigptr[64];
SWIG_MakePtr(swigptr, _ptr, "_wxPyInputStream_p");
PyObject* classobj = PyDict_GetItemString(wxPython_dict, "wxInputStreamPtr");
if (! classobj) {
Py_INCREF(Py_None);
_resultobj = Py_None;
} else {
PyObject* arg = Py_BuildValue("(s)", swigptr);
_resultobj = PyInstance_New(classobj, arg, NULL);
Py_DECREF(arg);
// set ThisOwn
PyObject* one = PyInt_FromLong(1);
PyObject_SetAttrString(_resultobj, "thisown", one);
Py_DECREF(one);
}
} else {
Py_INCREF(Py_None);
_resultobj = Py_None;
}
_resultobj = wxPyConstructObject(_ptr, "wxInputStream", TRUE);
}
return _resultobj;
}
@@ -623,6 +610,14 @@ static PyObject *_wrap_wxFSFile_GetModificationTime(PyObject *self, PyObject *ar
return _resultobj;
}
static void *SwigwxFileSystemHandlerTowxObject(void *ptr) {
wxFileSystemHandler *src;
wxObject *dest;
src = (wxFileSystemHandler *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
static void *SwigwxPyFileSystemHandlerTowxFileSystemHandler(void *ptr) {
wxPyFileSystemHandler *src;
wxFileSystemHandler *dest;
@@ -631,6 +626,14 @@ static void *SwigwxPyFileSystemHandlerTowxFileSystemHandler(void *ptr) {
return (void *) dest;
}
static void *SwigwxPyFileSystemHandlerTowxObject(void *ptr) {
wxPyFileSystemHandler *src;
wxObject *dest;
src = (wxPyFileSystemHandler *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
#define new_wxFileSystemHandler() (new wxPyFileSystemHandler())
static PyObject *_wrap_new_wxFileSystemHandler(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -755,7 +758,6 @@ static PyObject *_wrap_wxFileSystemHandler_OpenFile(PyObject *self, PyObject *ar
PyObject * _argo1 = 0;
PyObject * _obj2 = 0;
char *_kwnames[] = { "self","fs","location", NULL };
char _ptemp[128];
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO:wxFileSystemHandler_OpenFile",_kwnames,&_argo0,&_argo1,&_obj2))
@@ -797,13 +799,7 @@ static PyObject *_wrap_wxFileSystemHandler_OpenFile(PyObject *self, PyObject *ar
_result = (wxFSFile *)wxFileSystemHandler_OpenFile(_arg0,*_arg1,*_arg2);
wxPy_END_ALLOW_THREADS;
} if (_result) {
SWIG_MakePtr(_ptemp, (char *) _result,"_wxFSFile_p");
_resultobj = Py_BuildValue("s",_ptemp);
} else {
Py_INCREF(Py_None);
_resultobj = Py_None;
}
}{ _resultobj = wxPyMake_wxObject(_result); }
{
if (_obj2)
delete _arg2;
@@ -1180,6 +1176,14 @@ static PyObject *_wrap_wxFileSystemHandler_GetMimeTypeFromExt(PyObject *self, Py
return _resultobj;
}
static void *SwigwxFileSystemTowxObject(void *ptr) {
wxFileSystem *src;
wxObject *dest;
src = (wxFileSystem *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
#define new_wxFileSystem() (new wxFileSystem())
static PyObject *_wrap_new_wxFileSystem(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -1300,7 +1304,6 @@ static PyObject *_wrap_wxFileSystem_OpenFile(PyObject *self, PyObject *args, PyO
PyObject * _argo0 = 0;
PyObject * _obj1 = 0;
char *_kwnames[] = { "self","location", NULL };
char _ptemp[128];
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxFileSystem_OpenFile",_kwnames,&_argo0,&_obj1))
@@ -1335,13 +1338,7 @@ static PyObject *_wrap_wxFileSystem_OpenFile(PyObject *self, PyObject *args, PyO
_result = (wxFSFile *)wxFileSystem_OpenFile(_arg0,*_arg1);
wxPy_END_ALLOW_THREADS;
} if (_result) {
SWIG_MakePtr(_ptemp, (char *) _result,"_wxFSFile_p");
_resultobj = Py_BuildValue("s",_ptemp);
} else {
Py_INCREF(Py_None);
_resultobj = Py_None;
}
}{ _resultobj = wxPyMake_wxObject(_result); }
{
if (_obj1)
delete _arg1;
@@ -1489,6 +1486,14 @@ static void *SwigwxInternetFSHandlerTowxFileSystemHandler(void *ptr) {
return (void *) dest;
}
static void *SwigwxInternetFSHandlerTowxObject(void *ptr) {
wxInternetFSHandler *src;
wxObject *dest;
src = (wxInternetFSHandler *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
#define new_wxInternetFSHandler() (new wxInternetFSHandler())
static PyObject *_wrap_new_wxInternetFSHandler(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -1576,7 +1581,6 @@ static PyObject *_wrap_wxInternetFSHandler_OpenFile(PyObject *self, PyObject *ar
PyObject * _argo1 = 0;
PyObject * _obj2 = 0;
char *_kwnames[] = { "self","fs","location", NULL };
char _ptemp[128];
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO:wxInternetFSHandler_OpenFile",_kwnames,&_argo0,&_argo1,&_obj2))
@@ -1618,13 +1622,7 @@ static PyObject *_wrap_wxInternetFSHandler_OpenFile(PyObject *self, PyObject *ar
_result = (wxFSFile *)wxInternetFSHandler_OpenFile(_arg0,*_arg1,*_arg2);
wxPy_END_ALLOW_THREADS;
} if (_result) {
SWIG_MakePtr(_ptemp, (char *) _result,"_wxFSFile_p");
_resultobj = Py_BuildValue("s",_ptemp);
} else {
Py_INCREF(Py_None);
_resultobj = Py_None;
}
}{ _resultobj = wxPyMake_wxObject(_result); }
{
if (_obj2)
delete _arg2;
@@ -1640,6 +1638,14 @@ static void *SwigwxZipFSHandlerTowxFileSystemHandler(void *ptr) {
return (void *) dest;
}
static void *SwigwxZipFSHandlerTowxObject(void *ptr) {
wxZipFSHandler *src;
wxObject *dest;
src = (wxZipFSHandler *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
#define new_wxZipFSHandler() (new wxZipFSHandler())
static PyObject *_wrap_new_wxZipFSHandler(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -1727,7 +1733,6 @@ static PyObject *_wrap_wxZipFSHandler_OpenFile(PyObject *self, PyObject *args, P
PyObject * _argo1 = 0;
PyObject * _obj2 = 0;
char *_kwnames[] = { "self","fs","location", NULL };
char _ptemp[128];
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO:wxZipFSHandler_OpenFile",_kwnames,&_argo0,&_argo1,&_obj2))
@@ -1769,13 +1774,7 @@ static PyObject *_wrap_wxZipFSHandler_OpenFile(PyObject *self, PyObject *args, P
_result = (wxFSFile *)wxZipFSHandler_OpenFile(_arg0,*_arg1,*_arg2);
wxPy_END_ALLOW_THREADS;
} if (_result) {
SWIG_MakePtr(_ptemp, (char *) _result,"_wxFSFile_p");
_resultobj = Py_BuildValue("s",_ptemp);
} else {
Py_INCREF(Py_None);
_resultobj = Py_None;
}
}{ _resultobj = wxPyMake_wxObject(_result); }
{
if (_obj2)
delete _arg2;
@@ -1880,6 +1879,14 @@ static void *SwigwxMemoryFSHandlerTowxFileSystemHandler(void *ptr) {
return (void *) dest;
}
static void *SwigwxMemoryFSHandlerTowxObject(void *ptr) {
wxMemoryFSHandler *src;
wxObject *dest;
src = (wxMemoryFSHandler *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
#define new_wxMemoryFSHandler() (new wxMemoryFSHandler())
static PyObject *_wrap_new_wxMemoryFSHandler(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -2008,7 +2015,6 @@ static PyObject *_wrap_wxMemoryFSHandler_OpenFile(PyObject *self, PyObject *args
PyObject * _argo1 = 0;
PyObject * _obj2 = 0;
char *_kwnames[] = { "self","fs","location", NULL };
char _ptemp[128];
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO:wxMemoryFSHandler_OpenFile",_kwnames,&_argo0,&_argo1,&_obj2))
@@ -2050,13 +2056,7 @@ static PyObject *_wrap_wxMemoryFSHandler_OpenFile(PyObject *self, PyObject *args
_result = (wxFSFile *)wxMemoryFSHandler_OpenFile(_arg0,*_arg1,*_arg2);
wxPy_END_ALLOW_THREADS;
} if (_result) {
SWIG_MakePtr(_ptemp, (char *) _result,"_wxFSFile_p");
_resultobj = Py_BuildValue("s",_ptemp);
} else {
Py_INCREF(Py_None);
_resultobj = Py_None;
}
}{ _resultobj = wxPyMake_wxObject(_result); }
{
if (_obj2)
delete _arg2;
@@ -2237,8 +2237,24 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_wxImageList","_class_wxImageList",0},
{ "_class_wxTIFFHandler","_wxTIFFHandler",0},
{ "_class_wxAcceleratorTable","_wxAcceleratorTable",0},
{ "_wxGDIObject","_class_wxGDIObject",0},
{ "_wxDC","_class_wxDC",0},
{ "_class_wxBMPHandler","_wxBMPHandler",0},
{ "_class_wxObject","_class_wxMemoryFSHandler",SwigwxMemoryFSHandlerTowxObject},
{ "_class_wxObject","_wxMemoryFSHandler",SwigwxMemoryFSHandlerTowxObject},
{ "_class_wxObject","_class_wxZipFSHandler",SwigwxZipFSHandlerTowxObject},
{ "_class_wxObject","_wxZipFSHandler",SwigwxZipFSHandlerTowxObject},
{ "_class_wxObject","_class_wxInternetFSHandler",SwigwxInternetFSHandlerTowxObject},
{ "_class_wxObject","_wxInternetFSHandler",SwigwxInternetFSHandlerTowxObject},
{ "_class_wxObject","_class_wxFileSystem",SwigwxFileSystemTowxObject},
{ "_class_wxObject","_wxFileSystem",SwigwxFileSystemTowxObject},
{ "_class_wxObject","_class_wxPyFileSystemHandler",SwigwxPyFileSystemHandlerTowxObject},
{ "_class_wxObject","_wxPyFileSystemHandler",SwigwxPyFileSystemHandlerTowxObject},
{ "_class_wxObject","_class_wxFileSystemHandler",SwigwxFileSystemHandlerTowxObject},
{ "_class_wxObject","_wxFileSystemHandler",SwigwxFileSystemHandlerTowxObject},
{ "_class_wxObject","_class_wxFSFile",SwigwxFSFileTowxObject},
{ "_class_wxObject","_wxFSFile",SwigwxFSFileTowxObject},
{ "_class_wxObject","_wxObject",0},
{ "_size_t","_wxCoord",0},
{ "_size_t","_wxPrintQuality",0},
{ "_size_t","_time_t",0},
@@ -2315,6 +2331,21 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_wxBusyInfo","_class_wxBusyInfo",0},
{ "_wxFontList","_class_wxFontList",0},
{ "_wxClientDC","_class_wxClientDC",0},
{ "_wxObject","_class_wxMemoryFSHandler",SwigwxMemoryFSHandlerTowxObject},
{ "_wxObject","_wxMemoryFSHandler",SwigwxMemoryFSHandlerTowxObject},
{ "_wxObject","_class_wxZipFSHandler",SwigwxZipFSHandlerTowxObject},
{ "_wxObject","_wxZipFSHandler",SwigwxZipFSHandlerTowxObject},
{ "_wxObject","_class_wxInternetFSHandler",SwigwxInternetFSHandlerTowxObject},
{ "_wxObject","_wxInternetFSHandler",SwigwxInternetFSHandlerTowxObject},
{ "_wxObject","_class_wxFileSystem",SwigwxFileSystemTowxObject},
{ "_wxObject","_wxFileSystem",SwigwxFileSystemTowxObject},
{ "_wxObject","_class_wxPyFileSystemHandler",SwigwxPyFileSystemHandlerTowxObject},
{ "_wxObject","_wxPyFileSystemHandler",SwigwxPyFileSystemHandlerTowxObject},
{ "_wxObject","_class_wxFileSystemHandler",SwigwxFileSystemHandlerTowxObject},
{ "_wxObject","_wxFileSystemHandler",SwigwxFileSystemHandlerTowxObject},
{ "_wxObject","_class_wxFSFile",SwigwxFSFileTowxObject},
{ "_wxObject","_wxFSFile",SwigwxFSFileTowxObject},
{ "_wxObject","_class_wxObject",0},
{ "_class_wxPoint","_wxPoint",0},
{ "_class_wxPyInputStream","_wxPyInputStream",0},
{ "_wxRealPoint","_class_wxRealPoint",0},
@@ -2364,6 +2395,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},
{ "_int","_wxCoord",0},
{ "_int","_wxPrintQuality",0},
{ "_int","_time_t",0},
@@ -2442,6 +2474,8 @@ SWIGEXPORT(void) initfilesysc() {
SWIG_globals = SWIG_newvarlink();
m = Py_InitModule("filesysc", filesyscMethods);
d = PyModule_GetDict(m);
wxPyPtrTypeMap_Add("wxFileSystemHandler", "wxPyFileSystemHandler");
{
int i;
for (i = 0; _swig_mapping[i].n1; i++)
wxPython/src/gtk/filesys.py
+3 -8
View File
@@ -24,7 +24,7 @@ def wxMemoryFSHandler_AddFile(filename, a, b=''):
__wxMemoryFSHandler_AddFile_Data(filename, a)
else: raise TypeError, 'wxImage, wxBitmap or string expected'
class wxFSFilePtr :
class wxFSFilePtr(wxObjectPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
@@ -54,7 +54,7 @@ class wxFSFile(wxFSFilePtr):
class wxCPPFileSystemHandlerPtr :
class wxCPPFileSystemHandlerPtr(wxObjectPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
@@ -79,7 +79,6 @@ class wxFileSystemHandlerPtr(wxCPPFileSystemHandlerPtr):
return val
def OpenFile(self, *_args, **_kwargs):
val = apply(filesysc.wxFileSystemHandler_OpenFile,(self,) + _args, _kwargs)
if val: val = wxFSFilePtr(val)
return val
def FindFirst(self, *_args, **_kwargs):
val = apply(filesysc.wxFileSystemHandler_FindFirst,(self,) + _args, _kwargs)
@@ -113,7 +112,7 @@ class wxFileSystemHandler(wxFileSystemHandlerPtr):
class wxFileSystemPtr :
class wxFileSystemPtr(wxObjectPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
@@ -125,7 +124,6 @@ class wxFileSystemPtr :
return val
def OpenFile(self, *_args, **_kwargs):
val = apply(filesysc.wxFileSystem_OpenFile,(self,) + _args, _kwargs)
if val: val = wxFSFilePtr(val)
return val
def FindFirst(self, *_args, **_kwargs):
val = apply(filesysc.wxFileSystem_FindFirst,(self,) + _args, _kwargs)
@@ -152,7 +150,6 @@ class wxInternetFSHandlerPtr(wxCPPFileSystemHandlerPtr):
return val
def OpenFile(self, *_args, **_kwargs):
val = apply(filesysc.wxInternetFSHandler_OpenFile,(self,) + _args, _kwargs)
if val: val = wxFSFilePtr(val)
return val
def __repr__(self):
return "<C wxInternetFSHandler instance at %s>" % (self.this,)
@@ -173,7 +170,6 @@ class wxZipFSHandlerPtr(wxCPPFileSystemHandlerPtr):
return val
def OpenFile(self, *_args, **_kwargs):
val = apply(filesysc.wxZipFSHandler_OpenFile,(self,) + _args, _kwargs)
if val: val = wxFSFilePtr(val)
return val
def FindFirst(self, *_args, **_kwargs):
val = apply(filesysc.wxZipFSHandler_FindFirst,(self,) + _args, _kwargs)
@@ -200,7 +196,6 @@ class wxMemoryFSHandlerPtr(wxCPPFileSystemHandlerPtr):
return val
def OpenFile(self, *_args, **_kwargs):
val = apply(filesysc.wxMemoryFSHandler_OpenFile,(self,) + _args, _kwargs)
if val: val = wxFSFilePtr(val)
return val
def FindFirst(self, *_args, **_kwargs):
val = apply(filesysc.wxMemoryFSHandler_FindFirst,(self,) + _args, _kwargs)
wxPython/src/gtk/frames.cpp
+65 -40
View File
@@ -128,6 +128,14 @@ static void *SwigwxFrameTowxEvtHandler(void *ptr) {
return (void *) dest;
}
static void *SwigwxFrameTowxObject(void *ptr) {
wxFrame *src;
wxObject *dest;
src = (wxFrame *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
#define new_wxFrame(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6) (new wxFrame(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6))
static PyObject *_wrap_new_wxFrame(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -246,7 +254,6 @@ static PyObject *_wrap_wxFrame_CreateStatusBar(PyObject *self, PyObject *args, P
char * _arg4 = (char *) "statusBar";
PyObject * _argo0 = 0;
char *_kwnames[] = { "self","number","style","id","name", NULL };
char _ptemp[128];
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|ilis:wxFrame_CreateStatusBar",_kwnames,&_argo0,&_arg1,&_arg2,&_arg3,&_arg4))
@@ -263,13 +270,7 @@ static PyObject *_wrap_wxFrame_CreateStatusBar(PyObject *self, PyObject *args, P
_result = (wxStatusBar *)wxFrame_CreateStatusBar(_arg0,_arg1,_arg2,_arg3,_arg4);
wxPy_END_ALLOW_THREADS;
} if (_result) {
SWIG_MakePtr(_ptemp, (char *) _result,"_wxStatusBar_p");
_resultobj = Py_BuildValue("s",_ptemp);
} else {
Py_INCREF(Py_None);
_resultobj = Py_None;
}
}{ _resultobj = wxPyMake_wxObject(_result); }
return _resultobj;
}
@@ -283,7 +284,6 @@ static PyObject *_wrap_wxFrame_CreateToolBar(PyObject *self, PyObject *args, PyO
char * _arg3 = (char *) "toolBar";
PyObject * _argo0 = 0;
char *_kwnames[] = { "self","style","id","name", NULL };
char _ptemp[128];
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|lis:wxFrame_CreateToolBar",_kwnames,&_argo0,&_arg1,&_arg2,&_arg3))
@@ -300,13 +300,7 @@ static PyObject *_wrap_wxFrame_CreateToolBar(PyObject *self, PyObject *args, PyO
_result = (wxToolBar *)wxFrame_CreateToolBar(_arg0,_arg1,_arg2,_arg3);
wxPy_END_ALLOW_THREADS;
} if (_result) {
SWIG_MakePtr(_ptemp, (char *) _result,"_wxToolBar_p");
_resultobj = Py_BuildValue("s",_ptemp);
} else {
Py_INCREF(Py_None);
_resultobj = Py_None;
}
}{ _resultobj = wxPyMake_wxObject(_result); }
return _resultobj;
}
@@ -352,7 +346,6 @@ static PyObject *_wrap_wxFrame_GetMenuBar(PyObject *self, PyObject *args, PyObje
wxFrame * _arg0;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self", NULL };
char _ptemp[128];
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxFrame_GetMenuBar",_kwnames,&_argo0))
@@ -369,13 +362,7 @@ static PyObject *_wrap_wxFrame_GetMenuBar(PyObject *self, PyObject *args, PyObje
_result = (wxMenuBar *)wxFrame_GetMenuBar(_arg0);
wxPy_END_ALLOW_THREADS;
} if (_result) {
SWIG_MakePtr(_ptemp, (char *) _result,"_wxMenuBar_p");
_resultobj = Py_BuildValue("s",_ptemp);
} else {
Py_INCREF(Py_None);
_resultobj = Py_None;
}
}{ _resultobj = wxPyMake_wxObject(_result); }
return _resultobj;
}
@@ -386,7 +373,6 @@ static PyObject *_wrap_wxFrame_GetStatusBar(PyObject *self, PyObject *args, PyOb
wxFrame * _arg0;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self", NULL };
char _ptemp[128];
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxFrame_GetStatusBar",_kwnames,&_argo0))
@@ -403,13 +389,7 @@ static PyObject *_wrap_wxFrame_GetStatusBar(PyObject *self, PyObject *args, PyOb
_result = (wxStatusBar *)wxFrame_GetStatusBar(_arg0);
wxPy_END_ALLOW_THREADS;
} if (_result) {
SWIG_MakePtr(_ptemp, (char *) _result,"_wxStatusBar_p");
_resultobj = Py_BuildValue("s",_ptemp);
} else {
Py_INCREF(Py_None);
_resultobj = Py_None;
}
}{ _resultobj = wxPyMake_wxObject(_result); }
return _resultobj;
}
@@ -452,7 +432,6 @@ static PyObject *_wrap_wxFrame_GetToolBar(PyObject *self, PyObject *args, PyObje
wxFrame * _arg0;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self", NULL };
char _ptemp[128];
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxFrame_GetToolBar",_kwnames,&_argo0))
@@ -469,13 +448,7 @@ static PyObject *_wrap_wxFrame_GetToolBar(PyObject *self, PyObject *args, PyObje
_result = (wxToolBar *)wxFrame_GetToolBar(_arg0);
wxPy_END_ALLOW_THREADS;
} if (_result) {
SWIG_MakePtr(_ptemp, (char *) _result,"_wxToolBar_p");
_resultobj = Py_BuildValue("s",_ptemp);
} else {
Py_INCREF(Py_None);
_resultobj = Py_None;
}
}{ _resultobj = wxPyMake_wxObject(_result); }
return _resultobj;
}
@@ -1066,6 +1039,37 @@ static PyObject *_wrap_wxFrame_ProcessCommand(PyObject *self, PyObject *args, Py
return _resultobj;
}
#define wxFrame_ShowFullScreen(_swigobj,_swigarg0,_swigarg1) (_swigobj->ShowFullScreen(_swigarg0,_swigarg1))
static PyObject *_wrap_wxFrame_ShowFullScreen(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
bool _result;
wxFrame * _arg0;
bool _arg1;
long _arg2 = (long ) (wxFULLSCREEN_ALL);
PyObject * _argo0 = 0;
int tempbool1;
char *_kwnames[] = { "self","show","style", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi|l:wxFrame_ShowFullScreen",_kwnames,&_argo0,&tempbool1,&_arg2))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFrame_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFrame_ShowFullScreen. Expected _wxFrame_p.");
return NULL;
}
}
_arg1 = (bool ) tempbool1;
{
wxPy_BEGIN_ALLOW_THREADS;
_result = (bool )wxFrame_ShowFullScreen(_arg0,_arg1,_arg2);
wxPy_END_ALLOW_THREADS;
} _resultobj = Py_BuildValue("i",_result);
return _resultobj;
}
static void *SwigwxMiniFrameTowxFrame(void *ptr) {
wxMiniFrame *src;
wxFrame *dest;
@@ -1090,6 +1094,14 @@ static void *SwigwxMiniFrameTowxEvtHandler(void *ptr) {
return (void *) dest;
}
static void *SwigwxMiniFrameTowxObject(void *ptr) {
wxMiniFrame *src;
wxObject *dest;
src = (wxMiniFrame *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
#define new_wxMiniFrame(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6) (new wxMiniFrame(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6))
static PyObject *_wrap_new_wxMiniFrame(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -1171,6 +1183,7 @@ static PyObject *_wrap_new_wxMiniFrame(PyObject *self, PyObject *args, PyObject
static PyMethodDef framescMethods[] = {
{ "new_wxMiniFrame", (PyCFunction) _wrap_new_wxMiniFrame, METH_VARARGS | METH_KEYWORDS },
{ "wxFrame_ShowFullScreen", (PyCFunction) _wrap_wxFrame_ShowFullScreen, METH_VARARGS | METH_KEYWORDS },
{ "wxFrame_ProcessCommand", (PyCFunction) _wrap_wxFrame_ProcessCommand, METH_VARARGS | METH_KEYWORDS },
{ "wxFrame_Command", (PyCFunction) _wrap_wxFrame_Command, METH_VARARGS | METH_KEYWORDS },
{ "wxFrame_GetClientAreaOrigin", (PyCFunction) _wrap_wxFrame_GetClientAreaOrigin, METH_VARARGS | METH_KEYWORDS },
@@ -1258,8 +1271,14 @@ 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_wxObject","_class_wxMiniFrame",SwigwxMiniFrameTowxObject},
{ "_class_wxObject","_wxMiniFrame",SwigwxMiniFrameTowxObject},
{ "_class_wxObject","_class_wxFrame",SwigwxFrameTowxObject},
{ "_class_wxObject","_wxFrame",SwigwxFrameTowxObject},
{ "_class_wxObject","_wxObject",0},
{ "_wxSpinEvent","_class_wxSpinEvent",0},
{ "_size_t","_wxCoord",0},
{ "_size_t","_wxPrintQuality",0},
@@ -1403,6 +1422,11 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_class_wxPyBitmapDataObject","_wxPyBitmapDataObject",0},
{ "_wxClientDC","_class_wxClientDC",0},
{ "_wxMouseEvent","_class_wxMouseEvent",0},
{ "_wxObject","_class_wxMiniFrame",SwigwxMiniFrameTowxObject},
{ "_wxObject","_wxMiniFrame",SwigwxMiniFrameTowxObject},
{ "_wxObject","_class_wxFrame",SwigwxFrameTowxObject},
{ "_wxObject","_wxFrame",SwigwxFrameTowxObject},
{ "_wxObject","_class_wxObject",0},
{ "_class_wxPoint","_wxPoint",0},
{ "_wxRealPoint","_class_wxRealPoint",0},
{ "_class_wxRadioBox","_wxRadioBox",0},
@@ -1459,6 +1483,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},
wxPython/src/gtk/frames.py
+3 -5
View File
@@ -24,11 +24,9 @@ class wxFramePtr(wxWindowPtr):
return val
def CreateStatusBar(self, *_args, **_kwargs):
val = apply(framesc.wxFrame_CreateStatusBar,(self,) + _args, _kwargs)
if val: val = wxStatusBarPtr(val)
return val
def CreateToolBar(self, *_args, **_kwargs):
val = apply(framesc.wxFrame_CreateToolBar,(self,) + _args, _kwargs)
if val: val = wxToolBarPtr(val)
return val
def GetIcon(self, *_args, **_kwargs):
val = apply(framesc.wxFrame_GetIcon,(self,) + _args, _kwargs)
@@ -36,18 +34,15 @@ class wxFramePtr(wxWindowPtr):
return val
def GetMenuBar(self, *_args, **_kwargs):
val = apply(framesc.wxFrame_GetMenuBar,(self,) + _args, _kwargs)
if val: val = wxMenuBarPtr(val)
return val
def GetStatusBar(self, *_args, **_kwargs):
val = apply(framesc.wxFrame_GetStatusBar,(self,) + _args, _kwargs)
if val: val = wxStatusBarPtr(val)
return val
def GetTitle(self, *_args, **_kwargs):
val = apply(framesc.wxFrame_GetTitle,(self,) + _args, _kwargs)
return val
def GetToolBar(self, *_args, **_kwargs):
val = apply(framesc.wxFrame_GetToolBar,(self,) + _args, _kwargs)
if val: val = wxToolBarPtr(val)
return val
def Iconize(self, *_args, **_kwargs):
val = apply(framesc.wxFrame_Iconize,(self,) + _args, _kwargs)
@@ -101,6 +96,9 @@ class wxFramePtr(wxWindowPtr):
def ProcessCommand(self, *_args, **_kwargs):
val = apply(framesc.wxFrame_ProcessCommand,(self,) + _args, _kwargs)
return val
def ShowFullScreen(self, *_args, **_kwargs):
val = apply(framesc.wxFrame_ShowFullScreen,(self,) + _args, _kwargs)
return val
def __repr__(self):
return "<C wxFrame instance at %s>" % (self.this,)
class wxFrame(wxFramePtr):
wxPython/src/gtk/gdi.cpp
+1565
View File
File diff suppressed because it is too large Load Diff
wxPython/src/gtk/gdi.py
+166 -14
View File
@@ -2,7 +2,33 @@
import gdic
from misc import *
class wxBitmapPtr :
class wxGDIObjectPtr(wxObjectPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
def __del__(self,gdic=gdic):
if self.thisown == 1 :
gdic.delete_wxGDIObject(self)
def GetVisible(self, *_args, **_kwargs):
val = apply(gdic.wxGDIObject_GetVisible,(self,) + _args, _kwargs)
return val
def SetVisible(self, *_args, **_kwargs):
val = apply(gdic.wxGDIObject_SetVisible,(self,) + _args, _kwargs)
return val
def IsNull(self, *_args, **_kwargs):
val = apply(gdic.wxGDIObject_IsNull,(self,) + _args, _kwargs)
return val
def __repr__(self):
return "<C wxGDIObject instance at %s>" % (self.this,)
class wxGDIObject(wxGDIObjectPtr):
def __init__(self,*_args,**_kwargs):
self.this = apply(gdic.new_wxGDIObject,_args,_kwargs)
self.thisown = 1
class wxBitmapPtr(wxGDIObjectPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
@@ -69,7 +95,7 @@ class wxBitmap(wxBitmapPtr):
class wxMaskPtr :
class wxMaskPtr(wxObjectPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
@@ -86,7 +112,7 @@ class wxMask(wxMaskPtr):
class wxIconPtr :
class wxIconPtr(wxGDIObjectPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
@@ -138,7 +164,7 @@ class wxIcon(wxIconPtr):
class wxCursorPtr :
class wxCursorPtr(wxGDIObjectPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
@@ -157,7 +183,7 @@ class wxCursor(wxCursorPtr):
class wxFontPtr :
class wxFontPtr(wxGDIObjectPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
@@ -228,7 +254,7 @@ class wxFont(wxFontPtr):
class wxFontListPtr :
class wxFontListPtr(wxObjectPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
@@ -251,7 +277,7 @@ class wxFontList(wxFontListPtr):
class wxColourPtr :
class wxColourPtr(wxObjectPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
@@ -289,7 +315,7 @@ class wxColour(wxColourPtr):
class wxColourDatabasePtr :
class wxColourDatabasePtr(wxObjectPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
@@ -312,7 +338,7 @@ class wxColourDatabase(wxColourDatabasePtr):
class wxPenPtr :
class wxPenPtr(wxGDIObjectPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
@@ -369,7 +395,7 @@ class wxPen(wxPenPtr):
class wxPenListPtr :
class wxPenListPtr(wxObjectPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
@@ -392,7 +418,7 @@ class wxPenList(wxPenListPtr):
class wxBrushPtr :
class wxBrushPtr(wxGDIObjectPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
@@ -455,7 +481,7 @@ class wxBrushList(wxBrushListPtr):
class wxDCPtr :
class wxDCPtr(wxObjectPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
@@ -829,7 +855,7 @@ class wxPostScriptDC(wxPostScriptDCPtr):
class wxPalettePtr :
class wxPalettePtr(wxGDIObjectPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
@@ -855,7 +881,7 @@ class wxPalette(wxPalettePtr):
class wxImageListPtr :
class wxImageListPtr(wxObjectPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
@@ -899,6 +925,129 @@ class wxImageList(wxImageListPtr):
class wxRegionPtr(wxGDIObjectPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
def __del__(self,gdic=gdic):
if self.thisown == 1 :
gdic.delete_wxRegion(self)
def Clear(self, *_args, **_kwargs):
val = apply(gdic.wxRegion_Clear,(self,) + _args, _kwargs)
return val
def Contains(self, *_args, **_kwargs):
val = apply(gdic.wxRegion_Contains,(self,) + _args, _kwargs)
return val
def ContainsPoint(self, *_args, **_kwargs):
val = apply(gdic.wxRegion_ContainsPoint,(self,) + _args, _kwargs)
return val
def ContainsRect(self, *_args, **_kwargs):
val = apply(gdic.wxRegion_ContainsRect,(self,) + _args, _kwargs)
return val
def ContainsRectDim(self, *_args, **_kwargs):
val = apply(gdic.wxRegion_ContainsRectDim,(self,) + _args, _kwargs)
return val
def GetBox(self, *_args, **_kwargs):
val = apply(gdic.wxRegion_GetBox,(self,) + _args, _kwargs)
if val: val = wxRectPtr(val) ; val.thisown = 1
return val
def Intersect(self, *_args, **_kwargs):
val = apply(gdic.wxRegion_Intersect,(self,) + _args, _kwargs)
return val
def IntersectRect(self, *_args, **_kwargs):
val = apply(gdic.wxRegion_IntersectRect,(self,) + _args, _kwargs)
return val
def IntersectRegion(self, *_args, **_kwargs):
val = apply(gdic.wxRegion_IntersectRegion,(self,) + _args, _kwargs)
return val
def IsEmpty(self, *_args, **_kwargs):
val = apply(gdic.wxRegion_IsEmpty,(self,) + _args, _kwargs)
return val
def Union(self, *_args, **_kwargs):
val = apply(gdic.wxRegion_Union,(self,) + _args, _kwargs)
return val
def UnionRect(self, *_args, **_kwargs):
val = apply(gdic.wxRegion_UnionRect,(self,) + _args, _kwargs)
return val
def UnionRegion(self, *_args, **_kwargs):
val = apply(gdic.wxRegion_UnionRegion,(self,) + _args, _kwargs)
return val
def Subtract(self, *_args, **_kwargs):
val = apply(gdic.wxRegion_Subtract,(self,) + _args, _kwargs)
return val
def SubtractRect(self, *_args, **_kwargs):
val = apply(gdic.wxRegion_SubtractRect,(self,) + _args, _kwargs)
return val
def SubtractRegion(self, *_args, **_kwargs):
val = apply(gdic.wxRegion_SubtractRegion,(self,) + _args, _kwargs)
return val
def Xor(self, *_args, **_kwargs):
val = apply(gdic.wxRegion_Xor,(self,) + _args, _kwargs)
return val
def XorRect(self, *_args, **_kwargs):
val = apply(gdic.wxRegion_XorRect,(self,) + _args, _kwargs)
return val
def XorRegion(self, *_args, **_kwargs):
val = apply(gdic.wxRegion_XorRegion,(self,) + _args, _kwargs)
return val
def __repr__(self):
return "<C wxRegion instance at %s>" % (self.this,)
class wxRegion(wxRegionPtr):
def __init__(self,*_args,**_kwargs):
self.this = apply(gdic.new_wxRegion,_args,_kwargs)
self.thisown = 1
class wxRegionIteratorPtr(wxObjectPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
def __del__(self,gdic=gdic):
if self.thisown == 1 :
gdic.delete_wxRegionIterator(self)
def GetX(self, *_args, **_kwargs):
val = apply(gdic.wxRegionIterator_GetX,(self,) + _args, _kwargs)
return val
def GetY(self, *_args, **_kwargs):
val = apply(gdic.wxRegionIterator_GetY,(self,) + _args, _kwargs)
return val
def GetW(self, *_args, **_kwargs):
val = apply(gdic.wxRegionIterator_GetW,(self,) + _args, _kwargs)
return val
def GetWidth(self, *_args, **_kwargs):
val = apply(gdic.wxRegionIterator_GetWidth,(self,) + _args, _kwargs)
return val
def GetH(self, *_args, **_kwargs):
val = apply(gdic.wxRegionIterator_GetH,(self,) + _args, _kwargs)
return val
def GetHeight(self, *_args, **_kwargs):
val = apply(gdic.wxRegionIterator_GetHeight,(self,) + _args, _kwargs)
return val
def GetRect(self, *_args, **_kwargs):
val = apply(gdic.wxRegionIterator_GetRect,(self,) + _args, _kwargs)
if val: val = wxRectPtr(val) ; val.thisown = 1
return val
def HaveRects(self, *_args, **_kwargs):
val = apply(gdic.wxRegionIterator_HaveRects,(self,) + _args, _kwargs)
return val
def Reset(self, *_args, **_kwargs):
val = apply(gdic.wxRegionIterator_Reset,(self,) + _args, _kwargs)
return val
def Next(self, *_args, **_kwargs):
val = apply(gdic.wxRegionIterator_Next,(self,) + _args, _kwargs)
return val
def __repr__(self):
return "<C wxRegionIterator instance at %s>" % (self.this,)
class wxRegionIterator(wxRegionIteratorPtr):
def __init__(self,*_args,**_kwargs):
self.this = apply(gdic.new_wxRegionIterator,_args,_kwargs)
self.thisown = 1
#-------------- FUNCTION WRAPPERS ------------------
@@ -1038,3 +1187,6 @@ wxIMAGELIST_DRAW_FOCUSED = gdic.wxIMAGELIST_DRAW_FOCUSED
wxIMAGE_LIST_NORMAL = gdic.wxIMAGE_LIST_NORMAL
wxIMAGE_LIST_SMALL = gdic.wxIMAGE_LIST_SMALL
wxIMAGE_LIST_STATE = gdic.wxIMAGE_LIST_STATE
wxOutRegion = gdic.wxOutRegion
wxPartRegion = gdic.wxPartRegion
wxInRegion = gdic.wxInRegion
wxPython/src/gtk/grid.cpp
+460 -70
View File
File diff suppressed because it is too large Load Diff
wxPython/src/gtk/grid.py
+40 -5
View File
@@ -191,7 +191,6 @@ class wxGridCellEditorPtr :
return val
def GetControl(self, *_args, **_kwargs):
val = apply(gridc.wxGridCellEditor_GetControl,(self,) + _args, _kwargs)
if val: val = wxControlPtr(val)
return val
def SetControl(self, *_args, **_kwargs):
val = apply(gridc.wxGridCellEditor_SetControl,(self,) + _args, _kwargs)
@@ -370,6 +369,12 @@ class wxGridCellChoiceEditor(wxGridCellChoiceEditorPtr):
class wxGridCellAttrPtr :
Any = gridc.wxGridCellAttr_Any
Default = gridc.wxGridCellAttr_Default
Cell = gridc.wxGridCellAttr_Cell
Row = gridc.wxGridCellAttr_Row
Col = gridc.wxGridCellAttr_Col
Merged = gridc.wxGridCellAttr_Merged
def __init__(self,this):
self.this = this
self.thisown = 0
@@ -377,6 +382,9 @@ class wxGridCellAttrPtr :
val = apply(gridc.wxGridCellAttr_Clone,(self,) + _args, _kwargs)
if val: val = wxGridCellAttrPtr(val)
return val
def MergeWith(self, *_args, **_kwargs):
val = apply(gridc.wxGridCellAttr_MergeWith,(self,) + _args, _kwargs)
return val
def IncRef(self, *_args, **_kwargs):
val = apply(gridc.wxGridCellAttr_IncRef,(self,) + _args, _kwargs)
return val
@@ -404,6 +412,9 @@ class wxGridCellAttrPtr :
def SetEditor(self, *_args, **_kwargs):
val = apply(gridc.wxGridCellAttr_SetEditor,(self,) + _args, _kwargs)
return val
def SetKind(self, *_args, **_kwargs):
val = apply(gridc.wxGridCellAttr_SetKind,(self,) + _args, _kwargs)
return val
def HasTextColour(self, *_args, **_kwargs):
val = apply(gridc.wxGridCellAttr_HasTextColour,(self,) + _args, _kwargs)
return val
@@ -422,6 +433,9 @@ class wxGridCellAttrPtr :
def HasEditor(self, *_args, **_kwargs):
val = apply(gridc.wxGridCellAttr_HasEditor,(self,) + _args, _kwargs)
return val
def HasReadWriteMode(self, *_args, **_kwargs):
val = apply(gridc.wxGridCellAttr_HasReadWriteMode,(self,) + _args, _kwargs)
return val
def GetTextColour(self, *_args, **_kwargs):
val = apply(gridc.wxGridCellAttr_GetTextColour,(self,) + _args, _kwargs)
if val: val = wxColourPtr(val)
@@ -525,7 +539,7 @@ class wxPyGridCellAttrProvider(wxPyGridCellAttrProviderPtr):
class wxGridTableBasePtr :
class wxGridTableBasePtr(wxObjectPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
@@ -541,7 +555,6 @@ class wxGridTableBasePtr :
return val
def GetView(self, *_args, **_kwargs):
val = apply(gridc.wxGridTableBase_GetView,(self,) + _args, _kwargs)
if val: val = wxGridPtr(val)
return val
def GetNumberRows(self, *_args, **_kwargs):
val = apply(gridc.wxGridTableBase_GetNumberRows,(self,) + _args, _kwargs)
@@ -748,7 +761,6 @@ class wxGridTableMessagePtr :
return val
def GetTableObject(self, *_args, **_kwargs):
val = apply(gridc.wxGridTableMessage_GetTableObject,(self,) + _args, _kwargs)
if val: val = wxGridTableBasePtr(val)
return val
def SetId(self, *_args, **_kwargs):
val = apply(gridc.wxGridTableMessage_SetId,(self,) + _args, _kwargs)
@@ -842,7 +854,6 @@ class wxGridPtr(wxScrolledWindowPtr):
return val
def GetTable(self, *_args, **_kwargs):
val = apply(gridc.wxGrid_GetTable,(self,) + _args, _kwargs)
if val: val = wxGridTableBasePtr(val)
return val
def SetTable(self, *_args, **_kwargs):
val = apply(gridc.wxGrid_SetTable,(self,) + _args, _kwargs)
@@ -1031,6 +1042,12 @@ class wxGridPtr(wxScrolledWindowPtr):
val = apply(gridc.wxGrid_GetCellHighlightColour,(self,) + _args, _kwargs)
if val: val = wxColourPtr(val) ; val.thisown = 1
return val
def GetCellHighlightPenWidth(self, *_args, **_kwargs):
val = apply(gridc.wxGrid_GetCellHighlightPenWidth,(self,) + _args, _kwargs)
return val
def GetCellHighlightROPenWidth(self, *_args, **_kwargs):
val = apply(gridc.wxGrid_GetCellHighlightROPenWidth,(self,) + _args, _kwargs)
return val
def SetRowLabelSize(self, *_args, **_kwargs):
val = apply(gridc.wxGrid_SetRowLabelSize,(self,) + _args, _kwargs)
return val
@@ -1064,6 +1081,12 @@ class wxGridPtr(wxScrolledWindowPtr):
def SetCellHighlightColour(self, *_args, **_kwargs):
val = apply(gridc.wxGrid_SetCellHighlightColour,(self,) + _args, _kwargs)
return val
def SetCellHighlightPenWidth(self, *_args, **_kwargs):
val = apply(gridc.wxGrid_SetCellHighlightPenWidth,(self,) + _args, _kwargs)
return val
def SetCellHighlightROPenWidth(self, *_args, **_kwargs):
val = apply(gridc.wxGrid_SetCellHighlightROPenWidth,(self,) + _args, _kwargs)
return val
def EnableDragRowSize(self, *_args, **_kwargs):
val = apply(gridc.wxGrid_EnableDragRowSize,(self,) + _args, _kwargs)
return val
@@ -1315,6 +1338,18 @@ class wxGridPtr(wxScrolledWindowPtr):
def SetMargins(self, *_args, **_kwargs):
val = apply(gridc.wxGrid_SetMargins,(self,) + _args, _kwargs)
return val
def GetGridWindow(self, *_args, **_kwargs):
val = apply(gridc.wxGrid_GetGridWindow,(self,) + _args, _kwargs)
return val
def GetGridRowLabelWindow(self, *_args, **_kwargs):
val = apply(gridc.wxGrid_GetGridRowLabelWindow,(self,) + _args, _kwargs)
return val
def GetGridColLabelWindow(self, *_args, **_kwargs):
val = apply(gridc.wxGrid_GetGridColLabelWindow,(self,) + _args, _kwargs)
return val
def GetGridCornerLabelWindow(self, *_args, **_kwargs):
val = apply(gridc.wxGrid_GetGridCornerLabelWindow,(self,) + _args, _kwargs)
return val
def __repr__(self):
return "<C wxGrid instance at %s>" % (self.this,)
class wxGrid(wxGridPtr):
wxPython/src/gtk/html.cpp
+335 -49
View File
File diff suppressed because it is too large Load Diff
wxPython/src/gtk/html.py
+35 -13
View File
@@ -41,7 +41,7 @@ from filesys import *
from utils import *
import wx
class wxHtmlLinkInfoPtr :
class wxHtmlLinkInfoPtr(wxObjectPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
@@ -53,7 +53,6 @@ class wxHtmlLinkInfoPtr :
return val
def GetEvent(self, *_args, **_kwargs):
val = apply(htmlc.wxHtmlLinkInfo_GetEvent,(self,) + _args, _kwargs)
if val: val = wxMouseEventPtr(val)
return val
def GetHtmlCell(self, *_args, **_kwargs):
val = apply(htmlc.wxHtmlLinkInfo_GetHtmlCell,(self,) + _args, _kwargs)
@@ -75,7 +74,7 @@ class wxHtmlLinkInfo(wxHtmlLinkInfoPtr):
class wxHtmlTagPtr :
class wxHtmlTagPtr(wxObjectPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
@@ -115,7 +114,7 @@ class wxHtmlTag(wxHtmlTagPtr):
class wxHtmlParserPtr :
class wxHtmlParserPtr(wxObjectPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
@@ -124,7 +123,6 @@ class wxHtmlParserPtr :
return val
def GetFS(self, *_args, **_kwargs):
val = apply(htmlc.wxHtmlParser_GetFS,(self,) + _args, _kwargs)
if val: val = wxFileSystemPtr(val)
return val
def Parse(self, *_args, **_kwargs):
val = apply(htmlc.wxHtmlParser_Parse,(self,) + _args, _kwargs)
@@ -168,7 +166,6 @@ class wxHtmlWinParserPtr(wxHtmlParserPtr):
return val
def GetDC(self, *_args, **_kwargs):
val = apply(htmlc.wxHtmlWinParser_GetDC,(self,) + _args, _kwargs)
if val: val = wxDCPtr(val)
return val
def GetCharHeight(self, *_args, **_kwargs):
val = apply(htmlc.wxHtmlWinParser_GetCharHeight,(self,) + _args, _kwargs)
@@ -178,7 +175,6 @@ class wxHtmlWinParserPtr(wxHtmlParserPtr):
return val
def GetWindow(self, *_args, **_kwargs):
val = apply(htmlc.wxHtmlWinParser_GetWindow,(self,) + _args, _kwargs)
if val: val = wxWindowPtr(val)
return val
def SetFonts(self, *_args, **_kwargs):
val = apply(htmlc.wxHtmlWinParser_SetFonts,(self,) + _args, _kwargs)
@@ -270,7 +266,7 @@ class wxHtmlWinParser(wxHtmlWinParserPtr):
class wxHtmlTagHandlerPtr :
class wxHtmlTagHandlerPtr(wxObjectPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
@@ -326,7 +322,7 @@ class wxHtmlWinTagHandler(wxHtmlWinTagHandlerPtr):
class wxHtmlCellPtr :
class wxHtmlCellPtr(wxObjectPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
@@ -398,6 +394,20 @@ class wxHtmlCell(wxHtmlCellPtr):
class wxHtmlWordCellPtr(wxHtmlCellPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
def __repr__(self):
return "<C wxHtmlWordCell instance at %s>" % (self.this,)
class wxHtmlWordCell(wxHtmlWordCellPtr):
def __init__(self,*_args,**_kwargs):
self.this = apply(htmlc.new_wxHtmlWordCell,_args,_kwargs)
self.thisown = 1
class wxHtmlContainerCellPtr(wxHtmlCellPtr):
def __init__(self,this):
self.this = this
@@ -472,6 +482,20 @@ class wxHtmlColourCell(wxHtmlColourCellPtr):
class wxHtmlFontCellPtr(wxHtmlCellPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
def __repr__(self):
return "<C wxHtmlFontCell instance at %s>" % (self.this,)
class wxHtmlFontCell(wxHtmlFontCellPtr):
def __init__(self,*_args,**_kwargs):
self.this = apply(htmlc.new_wxHtmlFontCell,_args,_kwargs)
self.thisown = 1
class wxHtmlWidgetCellPtr(wxHtmlCellPtr):
def __init__(self,this):
self.this = this
@@ -513,7 +537,6 @@ class wxHtmlWindowPtr(wxScrolledWindowPtr):
return val
def GetRelatedFrame(self, *_args, **_kwargs):
val = apply(htmlc.wxHtmlWindow_GetRelatedFrame,(self,) + _args, _kwargs)
if val: val = wxFramePtr(val)
return val
def SetRelatedStatusBar(self, *_args, **_kwargs):
val = apply(htmlc.wxHtmlWindow_SetRelatedStatusBar,(self,) + _args, _kwargs)
@@ -575,7 +598,7 @@ class wxHtmlWindow(wxHtmlWindowPtr):
class wxHtmlDCRendererPtr :
class wxHtmlDCRendererPtr(wxObjectPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
@@ -636,7 +659,7 @@ class wxHtmlPrintout(wxHtmlPrintoutPtr):
class wxHtmlEasyPrintingPtr :
class wxHtmlEasyPrintingPtr(wxObjectPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
@@ -736,4 +759,3 @@ wx.wxHtmlContainerCellPtr = wxHtmlContainerCellPtr
wx.wxHtmlWidgetCellPtr = wxHtmlWidgetCellPtr
wx.wxHtmlWindowPtr = wxHtmlWindowPtr
wx.wxHtmlLinkInfoPtr = wxHtmlLinkInfoPtr
wxPython/src/gtk/htmlhelp.cpp
+32
View File
@@ -1653,6 +1653,14 @@ static void *SwigwxHtmlHelpFrameTowxEvtHandler(void *ptr) {
return (void *) dest;
}
static void *SwigwxHtmlHelpFrameTowxObject(void *ptr) {
wxHtmlHelpFrame *src;
wxObject *dest;
src = (wxHtmlHelpFrame *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
#define new_wxHtmlHelpFrame(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4) (new wxHtmlHelpFrame(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4))
static PyObject *_wrap_new_wxHtmlHelpFrame(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -2183,6 +2191,14 @@ static void *SwigwxHtmlHelpControllerTowxEvtHandler(void *ptr) {
return (void *) dest;
}
static void *SwigwxHtmlHelpControllerTowxObject(void *ptr) {
wxHtmlHelpController *src;
wxObject *dest;
src = (wxHtmlHelpController *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
#define new_wxHtmlHelpController(_swigarg0) (new wxHtmlHelpController(_swigarg0))
static PyObject *_wrap_new_wxHtmlHelpController(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -2966,6 +2982,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_class_wxClipboard","_wxClipboard",0},
{ "_class_wxGauge","_wxGauge",0},
{ "_class_wxSashEvent","_wxSashEvent",0},
{ "_wxGDIObject","_class_wxGDIObject",0},
{ "_wxDC","_class_wxDC",0},
{ "_wxSizerItem","_class_wxSizerItem",0},
{ "_class_wxBitmapDataObject","_wxBitmapDataObject",0},
@@ -2975,6 +2992,11 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_class_wxBMPHandler","_wxBMPHandler",0},
{ "_wxPrintPreview","_class_wxPrintPreview",0},
{ "_class_wxFlexGridSizer","_wxFlexGridSizer",0},
{ "_class_wxObject","_class_wxHtmlHelpController",SwigwxHtmlHelpControllerTowxObject},
{ "_class_wxObject","_wxHtmlHelpController",SwigwxHtmlHelpControllerTowxObject},
{ "_class_wxObject","_class_wxHtmlHelpFrame",SwigwxHtmlHelpFrameTowxObject},
{ "_class_wxObject","_wxHtmlHelpFrame",SwigwxHtmlHelpFrameTowxObject},
{ "_class_wxObject","_wxObject",0},
{ "_wxSpinEvent","_class_wxSpinEvent",0},
{ "_wxSashLayoutWindow","_class_wxSashLayoutWindow",0},
{ "_size_t","_wxCoord",0},
@@ -3161,6 +3183,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_wxMenu","_class_wxMenu",0},
{ "_class_wxMoveEvent","_wxMoveEvent",0},
{ "_wxListBox","_class_wxListBox",0},
{ "_class_wxHtmlWordCell","_wxHtmlWordCell",0},
{ "_wxScreenDC","_class_wxScreenDC",0},
{ "_class_wxToolBarSimple","_wxToolBarSimple",0},
{ "_class_wxMDIChildFrame","_wxMDIChildFrame",0},
@@ -3176,6 +3199,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_class_wxCaret","_wxCaret",0},
{ "_class_wxMDIClientWindow","_wxMDIClientWindow",0},
{ "_class_wxHtmlLinkInfo","_wxHtmlLinkInfo",0},
{ "_class_wxHtmlFontCell","_wxHtmlFontCell",0},
{ "_class_wxBrush","_wxBrush",0},
{ "_wxTipProvider","_class_wxTipProvider",0},
{ "_class_wxPyHtmlTagHandler","_wxPyHtmlTagHandler",0},
@@ -3205,6 +3229,11 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_class_wxGenericDragImage","_wxGenericDragImage",0},
{ "_wxListCtrl","_class_wxListCtrl",0},
{ "_wxSingleChoiceDialog","_class_wxSingleChoiceDialog",0},
{ "_wxObject","_class_wxHtmlHelpController",SwigwxHtmlHelpControllerTowxObject},
{ "_wxObject","_wxHtmlHelpController",SwigwxHtmlHelpControllerTowxObject},
{ "_wxObject","_class_wxHtmlHelpFrame",SwigwxHtmlHelpFrameTowxObject},
{ "_wxObject","_wxHtmlHelpFrame",SwigwxHtmlHelpFrameTowxObject},
{ "_wxObject","_class_wxObject",0},
{ "_class_wxPoint","_wxPoint",0},
{ "_class_wxPyInputStream","_wxPyInputStream",0},
{ "_wxRealPoint","_class_wxRealPoint",0},
@@ -3292,6 +3321,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},
{ "_class_wxSizerItem","_wxSizerItem",0},
{ "_int","_wxCoord",0},
@@ -3424,6 +3454,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_class_wxConfig","_wxConfig",0},
{ "_wxKeyEvent","_class_wxKeyEvent",0},
{ "_wxMoveEvent","_class_wxMoveEvent",0},
{ "_wxHtmlWordCell","_class_wxHtmlWordCell",0},
{ "_wxHtmlEasyPrinting","_class_wxHtmlEasyPrinting",0},
{ "_wxColourData","_class_wxColourData",0},
{ "_wxPageSetupDialogData","_class_wxPageSetupDialogData",0},
@@ -3436,6 +3467,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_wxPyFontEnumerator","_class_wxPyFontEnumerator",0},
{ "_wxMDIClientWindow","_class_wxMDIClientWindow",0},
{ "_wxHtmlLinkInfo","_class_wxHtmlLinkInfo",0},
{ "_wxHtmlFontCell","_class_wxHtmlFontCell",0},
{ "_class_wxDataObjectComposite","_wxDataObjectComposite",0},
{ "_class_wxToolBarToolBase","_wxToolBarToolBase",0},
{ "_class_wxFontDialog","_wxFontDialog",0},
wxPython/src/gtk/image.cpp
+112
View File
@@ -334,6 +334,14 @@ static PyObject *_wrap_wxBitmapFromImage(PyObject *self, PyObject *args, PyObjec
return _resultobj;
}
static void *SwigwxImageHandlerTowxObject(void *ptr) {
wxImageHandler *src;
wxObject *dest;
src = (wxImageHandler *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
#define wxImageHandler_GetName(_swigobj) (_swigobj->GetName())
static PyObject *_wrap_wxImageHandler_GetName(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -646,6 +654,14 @@ static void *SwigwxPNGHandlerTowxImageHandler(void *ptr) {
return (void *) dest;
}
static void *SwigwxPNGHandlerTowxObject(void *ptr) {
wxPNGHandler *src;
wxObject *dest;
src = (wxPNGHandler *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
#define new_wxPNGHandler() (new wxPNGHandler())
static PyObject *_wrap_new_wxPNGHandler(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -679,6 +695,14 @@ static void *SwigwxJPEGHandlerTowxImageHandler(void *ptr) {
return (void *) dest;
}
static void *SwigwxJPEGHandlerTowxObject(void *ptr) {
wxJPEGHandler *src;
wxObject *dest;
src = (wxJPEGHandler *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
#define new_wxJPEGHandler() (new wxJPEGHandler())
static PyObject *_wrap_new_wxJPEGHandler(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -712,6 +736,14 @@ static void *SwigwxBMPHandlerTowxImageHandler(void *ptr) {
return (void *) dest;
}
static void *SwigwxBMPHandlerTowxObject(void *ptr) {
wxBMPHandler *src;
wxObject *dest;
src = (wxBMPHandler *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
#define new_wxBMPHandler() (new wxBMPHandler())
static PyObject *_wrap_new_wxBMPHandler(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -745,6 +777,14 @@ static void *SwigwxGIFHandlerTowxImageHandler(void *ptr) {
return (void *) dest;
}
static void *SwigwxGIFHandlerTowxObject(void *ptr) {
wxGIFHandler *src;
wxObject *dest;
src = (wxGIFHandler *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
#define new_wxGIFHandler() (new wxGIFHandler())
static PyObject *_wrap_new_wxGIFHandler(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -778,6 +818,14 @@ static void *SwigwxPNMHandlerTowxImageHandler(void *ptr) {
return (void *) dest;
}
static void *SwigwxPNMHandlerTowxObject(void *ptr) {
wxPNMHandler *src;
wxObject *dest;
src = (wxPNMHandler *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
#define new_wxPNMHandler() (new wxPNMHandler())
static PyObject *_wrap_new_wxPNMHandler(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -811,6 +859,14 @@ static void *SwigwxPCXHandlerTowxImageHandler(void *ptr) {
return (void *) dest;
}
static void *SwigwxPCXHandlerTowxObject(void *ptr) {
wxPCXHandler *src;
wxObject *dest;
src = (wxPCXHandler *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
#define new_wxPCXHandler() (new wxPCXHandler())
static PyObject *_wrap_new_wxPCXHandler(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -844,6 +900,14 @@ static void *SwigwxTIFFHandlerTowxImageHandler(void *ptr) {
return (void *) dest;
}
static void *SwigwxTIFFHandlerTowxObject(void *ptr) {
wxTIFFHandler *src;
wxObject *dest;
src = (wxTIFFHandler *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
#define new_wxTIFFHandler() (new wxTIFFHandler())
static PyObject *_wrap_new_wxTIFFHandler(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -869,6 +933,14 @@ static PyObject *_wrap_new_wxTIFFHandler(PyObject *self, PyObject *args, PyObjec
return _resultobj;
}
static void *SwigwxImageTowxObject(void *ptr) {
wxImage *src;
wxObject *dest;
src = (wxImage *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
#define new_wxImage(_swigarg0,_swigarg1) (new wxImage(_swigarg0,_swigarg1))
static PyObject *_wrap_new_wxImage(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -2355,8 +2427,28 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_wxImageList","_class_wxImageList",0},
{ "_class_wxTIFFHandler","_wxTIFFHandler",0},
{ "_class_wxAcceleratorTable","_wxAcceleratorTable",0},
{ "_wxGDIObject","_class_wxGDIObject",0},
{ "_wxDC","_class_wxDC",0},
{ "_class_wxBMPHandler","_wxBMPHandler",0},
{ "_class_wxObject","_class_wxImage",SwigwxImageTowxObject},
{ "_class_wxObject","_wxImage",SwigwxImageTowxObject},
{ "_class_wxObject","_class_wxTIFFHandler",SwigwxTIFFHandlerTowxObject},
{ "_class_wxObject","_wxTIFFHandler",SwigwxTIFFHandlerTowxObject},
{ "_class_wxObject","_class_wxPCXHandler",SwigwxPCXHandlerTowxObject},
{ "_class_wxObject","_wxPCXHandler",SwigwxPCXHandlerTowxObject},
{ "_class_wxObject","_class_wxPNMHandler",SwigwxPNMHandlerTowxObject},
{ "_class_wxObject","_wxPNMHandler",SwigwxPNMHandlerTowxObject},
{ "_class_wxObject","_class_wxGIFHandler",SwigwxGIFHandlerTowxObject},
{ "_class_wxObject","_wxGIFHandler",SwigwxGIFHandlerTowxObject},
{ "_class_wxObject","_class_wxBMPHandler",SwigwxBMPHandlerTowxObject},
{ "_class_wxObject","_wxBMPHandler",SwigwxBMPHandlerTowxObject},
{ "_class_wxObject","_class_wxJPEGHandler",SwigwxJPEGHandlerTowxObject},
{ "_class_wxObject","_wxJPEGHandler",SwigwxJPEGHandlerTowxObject},
{ "_class_wxObject","_class_wxPNGHandler",SwigwxPNGHandlerTowxObject},
{ "_class_wxObject","_wxPNGHandler",SwigwxPNGHandlerTowxObject},
{ "_class_wxObject","_class_wxImageHandler",SwigwxImageHandlerTowxObject},
{ "_class_wxObject","_wxImageHandler",SwigwxImageHandlerTowxObject},
{ "_class_wxObject","_wxObject",0},
{ "_size_t","_wxCoord",0},
{ "_size_t","_wxPrintQuality",0},
{ "_size_t","_time_t",0},
@@ -2420,6 +2512,25 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_wxBusyInfo","_class_wxBusyInfo",0},
{ "_wxFontList","_class_wxFontList",0},
{ "_wxClientDC","_class_wxClientDC",0},
{ "_wxObject","_class_wxImage",SwigwxImageTowxObject},
{ "_wxObject","_wxImage",SwigwxImageTowxObject},
{ "_wxObject","_class_wxTIFFHandler",SwigwxTIFFHandlerTowxObject},
{ "_wxObject","_wxTIFFHandler",SwigwxTIFFHandlerTowxObject},
{ "_wxObject","_class_wxPCXHandler",SwigwxPCXHandlerTowxObject},
{ "_wxObject","_wxPCXHandler",SwigwxPCXHandlerTowxObject},
{ "_wxObject","_class_wxPNMHandler",SwigwxPNMHandlerTowxObject},
{ "_wxObject","_wxPNMHandler",SwigwxPNMHandlerTowxObject},
{ "_wxObject","_class_wxGIFHandler",SwigwxGIFHandlerTowxObject},
{ "_wxObject","_wxGIFHandler",SwigwxGIFHandlerTowxObject},
{ "_wxObject","_class_wxBMPHandler",SwigwxBMPHandlerTowxObject},
{ "_wxObject","_wxBMPHandler",SwigwxBMPHandlerTowxObject},
{ "_wxObject","_class_wxJPEGHandler",SwigwxJPEGHandlerTowxObject},
{ "_wxObject","_wxJPEGHandler",SwigwxJPEGHandlerTowxObject},
{ "_wxObject","_class_wxPNGHandler",SwigwxPNGHandlerTowxObject},
{ "_wxObject","_wxPNGHandler",SwigwxPNGHandlerTowxObject},
{ "_wxObject","_class_wxImageHandler",SwigwxImageHandlerTowxObject},
{ "_wxObject","_wxImageHandler",SwigwxImageHandlerTowxObject},
{ "_wxObject","_class_wxObject",0},
{ "_class_wxPoint","_wxPoint",0},
{ "_wxRealPoint","_class_wxRealPoint",0},
{ "_signed_short","_WXTYPE",0},
@@ -2470,6 +2581,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},
{ "_int","_wxCoord",0},
{ "_int","_wxPrintQuality",0},
{ "_int","_time_t",0},
wxPython/src/gtk/image.py
+2 -2
View File
@@ -4,7 +4,7 @@ import imagec
from misc import *
from gdi import *
class wxImageHandlerPtr :
class wxImageHandlerPtr(wxObjectPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
@@ -139,7 +139,7 @@ class wxTIFFHandler(wxTIFFHandlerPtr):
class wxImagePtr :
class wxImagePtr(wxObjectPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
wxPython/src/gtk/mdi.cpp
+43 -24
View File
@@ -135,6 +135,14 @@ static void *SwigwxMDIParentFrameTowxEvtHandler(void *ptr) {
return (void *) dest;
}
static void *SwigwxMDIParentFrameTowxObject(void *ptr) {
wxMDIParentFrame *src;
wxObject *dest;
src = (wxMDIParentFrame *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
#define new_wxMDIParentFrame(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6) (new wxMDIParentFrame(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6))
static PyObject *_wrap_new_wxMDIParentFrame(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -329,7 +337,6 @@ static PyObject *_wrap_wxMDIParentFrame_GetActiveChild(PyObject *self, PyObject
wxMDIParentFrame * _arg0;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self", NULL };
char _ptemp[128];
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxMDIParentFrame_GetActiveChild",_kwnames,&_argo0))
@@ -346,13 +353,7 @@ static PyObject *_wrap_wxMDIParentFrame_GetActiveChild(PyObject *self, PyObject
_result = (wxMDIChildFrame *)wxMDIParentFrame_GetActiveChild(_arg0);
wxPy_END_ALLOW_THREADS;
} if (_result) {
SWIG_MakePtr(_ptemp, (char *) _result,"_wxMDIChildFrame_p");
_resultobj = Py_BuildValue("s",_ptemp);
} else {
Py_INCREF(Py_None);
_resultobj = Py_None;
}
}{ _resultobj = wxPyMake_wxObject(_result); }
return _resultobj;
}
@@ -363,7 +364,6 @@ static PyObject *_wrap_wxMDIParentFrame_GetClientWindow(PyObject *self, PyObject
wxMDIParentFrame * _arg0;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self", NULL };
char _ptemp[128];
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxMDIParentFrame_GetClientWindow",_kwnames,&_argo0))
@@ -380,13 +380,7 @@ static PyObject *_wrap_wxMDIParentFrame_GetClientWindow(PyObject *self, PyObject
_result = (wxMDIClientWindow *)wxMDIParentFrame_GetClientWindow(_arg0);
wxPy_END_ALLOW_THREADS;
} if (_result) {
SWIG_MakePtr(_ptemp, (char *) _result,"_wxMDIClientWindow_p");
_resultobj = Py_BuildValue("s",_ptemp);
} else {
Py_INCREF(Py_None);
_resultobj = Py_None;
}
}{ _resultobj = wxPyMake_wxObject(_result); }
return _resultobj;
}
@@ -397,7 +391,6 @@ static PyObject *_wrap_wxMDIParentFrame_GetToolBar(PyObject *self, PyObject *arg
wxMDIParentFrame * _arg0;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self", NULL };
char _ptemp[128];
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxMDIParentFrame_GetToolBar",_kwnames,&_argo0))
@@ -414,13 +407,7 @@ static PyObject *_wrap_wxMDIParentFrame_GetToolBar(PyObject *self, PyObject *arg
_result = (wxWindow *)wxMDIParentFrame_GetToolBar(_arg0);
wxPy_END_ALLOW_THREADS;
} if (_result) {
SWIG_MakePtr(_ptemp, (char *) _result,"_wxWindow_p");
_resultobj = Py_BuildValue("s",_ptemp);
} else {
Py_INCREF(Py_None);
_resultobj = Py_None;
}
}{ _resultobj = wxPyMake_wxObject(_result); }
return _resultobj;
}
@@ -475,6 +462,14 @@ static void *SwigwxMDIChildFrameTowxEvtHandler(void *ptr) {
return (void *) dest;
}
static void *SwigwxMDIChildFrameTowxObject(void *ptr) {
wxMDIChildFrame *src;
wxObject *dest;
src = (wxMDIChildFrame *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
#define new_wxMDIChildFrame(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6) (new wxMDIChildFrame(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6))
static PyObject *_wrap_new_wxMDIChildFrame(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -654,6 +649,14 @@ static void *SwigwxMDIClientWindowTowxEvtHandler(void *ptr) {
return (void *) dest;
}
static void *SwigwxMDIClientWindowTowxObject(void *ptr) {
wxMDIClientWindow *src;
wxObject *dest;
src = (wxMDIClientWindow *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
#define new_wxMDIClientWindow(_swigarg0,_swigarg1) (new wxMDIClientWindow(_swigarg0,_swigarg1))
static PyObject *_wrap_new_wxMDIClientWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -767,8 +770,16 @@ 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_wxObject","_class_wxMDIClientWindow",SwigwxMDIClientWindowTowxObject},
{ "_class_wxObject","_wxMDIClientWindow",SwigwxMDIClientWindowTowxObject},
{ "_class_wxObject","_class_wxMDIChildFrame",SwigwxMDIChildFrameTowxObject},
{ "_class_wxObject","_wxMDIChildFrame",SwigwxMDIChildFrameTowxObject},
{ "_class_wxObject","_class_wxMDIParentFrame",SwigwxMDIParentFrameTowxObject},
{ "_class_wxObject","_wxMDIParentFrame",SwigwxMDIParentFrameTowxObject},
{ "_class_wxObject","_wxObject",0},
{ "_wxSpinEvent","_class_wxSpinEvent",0},
{ "_size_t","_wxCoord",0},
{ "_size_t","_wxPrintQuality",0},
@@ -918,6 +929,13 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_class_wxPyBitmapDataObject","_wxPyBitmapDataObject",0},
{ "_wxClientDC","_class_wxClientDC",0},
{ "_wxMouseEvent","_class_wxMouseEvent",0},
{ "_wxObject","_class_wxMDIClientWindow",SwigwxMDIClientWindowTowxObject},
{ "_wxObject","_wxMDIClientWindow",SwigwxMDIClientWindowTowxObject},
{ "_wxObject","_class_wxMDIChildFrame",SwigwxMDIChildFrameTowxObject},
{ "_wxObject","_wxMDIChildFrame",SwigwxMDIChildFrameTowxObject},
{ "_wxObject","_class_wxMDIParentFrame",SwigwxMDIParentFrameTowxObject},
{ "_wxObject","_wxMDIParentFrame",SwigwxMDIParentFrameTowxObject},
{ "_wxObject","_class_wxObject",0},
{ "_class_wxPoint","_wxPoint",0},
{ "_wxRealPoint","_class_wxRealPoint",0},
{ "_class_wxRadioBox","_wxRadioBox",0},
@@ -976,6 +994,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},
wxPython/src/gtk/mdi.py
-3
View File
@@ -35,15 +35,12 @@ class wxMDIParentFramePtr(wxFramePtr):
return val
def GetActiveChild(self, *_args, **_kwargs):
val = apply(mdic.wxMDIParentFrame_GetActiveChild,(self,) + _args, _kwargs)
if val: val = wxMDIChildFramePtr(val)
return val
def GetClientWindow(self, *_args, **_kwargs):
val = apply(mdic.wxMDIParentFrame_GetClientWindow,(self,) + _args, _kwargs)
if val: val = wxMDIClientWindowPtr(val)
return val
def GetToolBar(self, *_args, **_kwargs):
val = apply(mdic.wxMDIParentFrame_GetToolBar,(self,) + _args, _kwargs)
if val: val = wxWindowPtr(val)
return val
def Tile(self, *_args, **_kwargs):
val = apply(mdic.wxMDIParentFrame_Tile,(self,) + _args, _kwargs)
wxPython/src/gtk/misc.cpp
+158 -1058
View File
File diff suppressed because it is too large Load Diff
wxPython/src/gtk/misc.py
+26 -130
View File
@@ -1,5 +1,24 @@
# This file was created automatically by SWIG.
import miscc
class wxObjectPtr :
def __init__(self,this):
self.this = this
self.thisown = 0
def GetClassName(self, *_args, **_kwargs):
val = apply(miscc.wxObject_GetClassName,(self,) + _args, _kwargs)
return val
def Destroy(self, *_args, **_kwargs):
val = apply(miscc.wxObject_Destroy,(self,) + _args, _kwargs)
return val
def __repr__(self):
return "<C wxObject instance at %s>" % (self.this,)
class wxObject(wxObjectPtr):
def __init__(self,this):
self.this = this
class wxSizePtr :
def __init__(self,this):
self.this = this
@@ -31,6 +50,9 @@ class wxSizePtr :
def asTuple(self, *_args, **_kwargs):
val = apply(miscc.wxSize_asTuple,(self,) + _args, _kwargs)
return val
def __cmp__(self, *_args, **_kwargs):
val = apply(miscc.wxSize___cmp__,(self,) + _args, _kwargs)
return val
def __setattr__(self,name,value):
if name == "x" :
miscc.wxSize_x_set(self,value)
@@ -353,7 +375,7 @@ class wxRect(wxRectPtr):
class wxIndividualLayoutConstraintPtr :
class wxIndividualLayoutConstraintPtr(wxObjectPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
@@ -396,7 +418,7 @@ class wxIndividualLayoutConstraint(wxIndividualLayoutConstraintPtr):
class wxLayoutConstraintsPtr :
class wxLayoutConstraintsPtr(wxObjectPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
@@ -454,129 +476,6 @@ class wxLayoutConstraints(wxLayoutConstraintsPtr):
class wxRegionPtr :
def __init__(self,this):
self.this = this
self.thisown = 0
def __del__(self,miscc=miscc):
if self.thisown == 1 :
miscc.delete_wxRegion(self)
def Clear(self, *_args, **_kwargs):
val = apply(miscc.wxRegion_Clear,(self,) + _args, _kwargs)
return val
def Contains(self, *_args, **_kwargs):
val = apply(miscc.wxRegion_Contains,(self,) + _args, _kwargs)
return val
def ContainsPoint(self, *_args, **_kwargs):
val = apply(miscc.wxRegion_ContainsPoint,(self,) + _args, _kwargs)
return val
def ContainsRect(self, *_args, **_kwargs):
val = apply(miscc.wxRegion_ContainsRect,(self,) + _args, _kwargs)
return val
def ContainsRectDim(self, *_args, **_kwargs):
val = apply(miscc.wxRegion_ContainsRectDim,(self,) + _args, _kwargs)
return val
def GetBox(self, *_args, **_kwargs):
val = apply(miscc.wxRegion_GetBox,(self,) + _args, _kwargs)
if val: val = wxRectPtr(val) ; val.thisown = 1
return val
def Intersect(self, *_args, **_kwargs):
val = apply(miscc.wxRegion_Intersect,(self,) + _args, _kwargs)
return val
def IntersectRect(self, *_args, **_kwargs):
val = apply(miscc.wxRegion_IntersectRect,(self,) + _args, _kwargs)
return val
def IntersectRegion(self, *_args, **_kwargs):
val = apply(miscc.wxRegion_IntersectRegion,(self,) + _args, _kwargs)
return val
def IsEmpty(self, *_args, **_kwargs):
val = apply(miscc.wxRegion_IsEmpty,(self,) + _args, _kwargs)
return val
def Union(self, *_args, **_kwargs):
val = apply(miscc.wxRegion_Union,(self,) + _args, _kwargs)
return val
def UnionRect(self, *_args, **_kwargs):
val = apply(miscc.wxRegion_UnionRect,(self,) + _args, _kwargs)
return val
def UnionRegion(self, *_args, **_kwargs):
val = apply(miscc.wxRegion_UnionRegion,(self,) + _args, _kwargs)
return val
def Subtract(self, *_args, **_kwargs):
val = apply(miscc.wxRegion_Subtract,(self,) + _args, _kwargs)
return val
def SubtractRect(self, *_args, **_kwargs):
val = apply(miscc.wxRegion_SubtractRect,(self,) + _args, _kwargs)
return val
def SubtractRegion(self, *_args, **_kwargs):
val = apply(miscc.wxRegion_SubtractRegion,(self,) + _args, _kwargs)
return val
def Xor(self, *_args, **_kwargs):
val = apply(miscc.wxRegion_Xor,(self,) + _args, _kwargs)
return val
def XorRect(self, *_args, **_kwargs):
val = apply(miscc.wxRegion_XorRect,(self,) + _args, _kwargs)
return val
def XorRegion(self, *_args, **_kwargs):
val = apply(miscc.wxRegion_XorRegion,(self,) + _args, _kwargs)
return val
def __repr__(self):
return "<C wxRegion instance at %s>" % (self.this,)
class wxRegion(wxRegionPtr):
def __init__(self,*_args,**_kwargs):
self.this = apply(miscc.new_wxRegion,_args,_kwargs)
self.thisown = 1
class wxRegionIteratorPtr :
def __init__(self,this):
self.this = this
self.thisown = 0
def __del__(self,miscc=miscc):
if self.thisown == 1 :
miscc.delete_wxRegionIterator(self)
def GetX(self, *_args, **_kwargs):
val = apply(miscc.wxRegionIterator_GetX,(self,) + _args, _kwargs)
return val
def GetY(self, *_args, **_kwargs):
val = apply(miscc.wxRegionIterator_GetY,(self,) + _args, _kwargs)
return val
def GetW(self, *_args, **_kwargs):
val = apply(miscc.wxRegionIterator_GetW,(self,) + _args, _kwargs)
return val
def GetWidth(self, *_args, **_kwargs):
val = apply(miscc.wxRegionIterator_GetWidth,(self,) + _args, _kwargs)
return val
def GetH(self, *_args, **_kwargs):
val = apply(miscc.wxRegionIterator_GetH,(self,) + _args, _kwargs)
return val
def GetHeight(self, *_args, **_kwargs):
val = apply(miscc.wxRegionIterator_GetHeight,(self,) + _args, _kwargs)
return val
def GetRect(self, *_args, **_kwargs):
val = apply(miscc.wxRegionIterator_GetRect,(self,) + _args, _kwargs)
if val: val = wxRectPtr(val) ; val.thisown = 1
return val
def HaveRects(self, *_args, **_kwargs):
val = apply(miscc.wxRegionIterator_HaveRects,(self,) + _args, _kwargs)
return val
def Reset(self, *_args, **_kwargs):
val = apply(miscc.wxRegionIterator_Reset,(self,) + _args, _kwargs)
return val
def Next(self, *_args, **_kwargs):
val = apply(miscc.wxRegionIterator_Next,(self,) + _args, _kwargs)
return val
def __repr__(self):
return "<C wxRegionIterator instance at %s>" % (self.this,)
class wxRegionIterator(wxRegionIteratorPtr):
def __init__(self,*_args,**_kwargs):
self.this = apply(miscc.new_wxRegionIterator,_args,_kwargs)
self.thisown = 1
class wxAcceleratorEntryPtr :
def __init__(self,this):
self.this = this
@@ -606,7 +505,7 @@ class wxAcceleratorEntry(wxAcceleratorEntryPtr):
class wxAcceleratorTablePtr :
class wxAcceleratorTablePtr(wxObjectPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
@@ -623,7 +522,7 @@ class wxAcceleratorTable(wxAcceleratorTablePtr):
class wxBusyInfoPtr :
class wxBusyInfoPtr(wxObjectPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
@@ -730,8 +629,5 @@ wxLeftOf = miscc.wxLeftOf
wxRightOf = miscc.wxRightOf
wxSameAs = miscc.wxSameAs
wxAbsolute = miscc.wxAbsolute
wxOutRegion = miscc.wxOutRegion
wxPartRegion = miscc.wxPartRegion
wxInRegion = miscc.wxInRegion
cvar = miscc.cvar
wxNullAcceleratorTable = wxAcceleratorTablePtr(miscc.cvar.wxNullAcceleratorTable)
wxPython/src/gtk/misc2.cpp
+77 -100
View File
@@ -1146,7 +1146,6 @@ static PyObject *_wrap_wxFindWindowByLabel(PyObject *self, PyObject *args, PyObj
PyObject * _obj0 = 0;
PyObject * _argo1 = 0;
char *_kwnames[] = { "label","parent", NULL };
char _ptemp[128];
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|O:wxFindWindowByLabel",_kwnames,&_obj0,&_argo1))
@@ -1181,13 +1180,7 @@ static PyObject *_wrap_wxFindWindowByLabel(PyObject *self, PyObject *args, PyObj
_result = (wxWindow *)wxFindWindowByLabel(*_arg0,_arg1);
wxPy_END_ALLOW_THREADS;
} if (_result) {
SWIG_MakePtr(_ptemp, (char *) _result,"_wxWindow_p");
_resultobj = Py_BuildValue("s",_ptemp);
} else {
Py_INCREF(Py_None);
_resultobj = Py_None;
}
}{ _resultobj = wxPyMake_wxObject(_result); }
{
if (_obj0)
delete _arg0;
@@ -1203,7 +1196,6 @@ static PyObject *_wrap_wxFindWindowByName(PyObject *self, PyObject *args, PyObje
PyObject * _obj0 = 0;
PyObject * _argo1 = 0;
char *_kwnames[] = { "name","parent", NULL };
char _ptemp[128];
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|O:wxFindWindowByName",_kwnames,&_obj0,&_argo1))
@@ -1238,13 +1230,7 @@ static PyObject *_wrap_wxFindWindowByName(PyObject *self, PyObject *args, PyObje
_result = (wxWindow *)wxFindWindowByName(*_arg0,_arg1);
wxPy_END_ALLOW_THREADS;
} if (_result) {
SWIG_MakePtr(_ptemp, (char *) _result,"_wxWindow_p");
_resultobj = Py_BuildValue("s",_ptemp);
} else {
Py_INCREF(Py_None);
_resultobj = Py_None;
}
}{ _resultobj = wxPyMake_wxObject(_result); }
{
if (_obj0)
delete _arg0;
@@ -1282,7 +1268,6 @@ static PyObject *_wrap_wxGetActiveWindow(PyObject *self, PyObject *args, PyObjec
PyObject * _resultobj;
wxWindow * _result;
char *_kwnames[] = { NULL };
char _ptemp[128];
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,":wxGetActiveWindow",_kwnames))
@@ -1292,13 +1277,7 @@ static PyObject *_wrap_wxGetActiveWindow(PyObject *self, PyObject *args, PyObjec
_result = (wxWindow *)wxGetActiveWindow();
wxPy_END_ALLOW_THREADS;
} if (_result) {
SWIG_MakePtr(_ptemp, (char *) _result,"_wxWindow_p");
_resultobj = Py_BuildValue("s",_ptemp);
} else {
Py_INCREF(Py_None);
_resultobj = Py_None;
}
}{ _resultobj = wxPyMake_wxObject(_result); }
return _resultobj;
}
@@ -1383,7 +1362,6 @@ static PyObject *_wrap_wxResourceCreateMenuBar(PyObject *self, PyObject *args, P
wxMenuBar * _result;
char * _arg0;
char *_kwnames[] = { "resource", NULL };
char _ptemp[128];
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"s:wxResourceCreateMenuBar",_kwnames,&_arg0))
@@ -1393,13 +1371,7 @@ static PyObject *_wrap_wxResourceCreateMenuBar(PyObject *self, PyObject *args, P
_result = (wxMenuBar *)wxResourceCreateMenuBar(_arg0);
wxPy_END_ALLOW_THREADS;
} if (_result) {
SWIG_MakePtr(_ptemp, (char *) _result,"_wxMenuBar_p");
_resultobj = Py_BuildValue("s",_ptemp);
} else {
Py_INCREF(Py_None);
_resultobj = Py_None;
}
}{ _resultobj = wxPyMake_wxObject(_result); }
return _resultobj;
}
@@ -2299,6 +2271,14 @@ static PyObject *_wrap_wxExecute(PyObject *self, PyObject *args, PyObject *kwarg
return _resultobj;
}
static void *SwigwxToolTipTowxObject(void *ptr) {
wxToolTip *src;
wxObject *dest;
src = (wxToolTip *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
#define new_wxToolTip(_swigarg0) (new wxToolTip(_swigarg0))
static PyObject *_wrap_new_wxToolTip(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -2438,7 +2418,6 @@ static PyObject *_wrap_wxToolTip_GetWindow(PyObject *self, PyObject *args, PyObj
wxToolTip * _arg0;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self", NULL };
char _ptemp[128];
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxToolTip_GetWindow",_kwnames,&_argo0))
@@ -2455,13 +2434,7 @@ static PyObject *_wrap_wxToolTip_GetWindow(PyObject *self, PyObject *args, PyObj
_result = (wxWindow *)wxToolTip_GetWindow(_arg0);
wxPy_END_ALLOW_THREADS;
} if (_result) {
SWIG_MakePtr(_ptemp, (char *) _result,"_wxWindow_p");
_resultobj = Py_BuildValue("s",_ptemp);
} else {
Py_INCREF(Py_None);
_resultobj = Py_None;
}
}{ _resultobj = wxPyMake_wxObject(_result); }
return _resultobj;
}
@@ -2747,7 +2720,6 @@ static PyObject *_wrap_wxCaret_GetWindow(PyObject *self, PyObject *args, PyObjec
wxCaret * _arg0;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self", NULL };
char _ptemp[128];
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxCaret_GetWindow",_kwnames,&_argo0))
@@ -2764,13 +2736,7 @@ static PyObject *_wrap_wxCaret_GetWindow(PyObject *self, PyObject *args, PyObjec
_result = (wxWindow *)wxCaret_GetWindow(_arg0);
wxPy_END_ALLOW_THREADS;
} if (_result) {
SWIG_MakePtr(_ptemp, (char *) _result,"_wxWindow_p");
_resultobj = Py_BuildValue("s",_ptemp);
} else {
Py_INCREF(Py_None);
_resultobj = Py_None;
}
}{ _resultobj = wxPyMake_wxObject(_result); }
return _resultobj;
}
@@ -3469,6 +3435,14 @@ static PyObject *_wrap_new_wxPyTipProvider(PyObject *self, PyObject *args, PyObj
return _resultobj;
}
static void *SwigwxGenericDragImageTowxObject(void *ptr) {
wxGenericDragImage *src;
wxObject *dest;
src = (wxGenericDragImage *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
#define new_wxDragImage(_swigarg0,_swigarg1,_swigarg2) (new wxGenericDragImage(_swigarg0,_swigarg1,_swigarg2))
static PyObject *_wrap_new_wxDragImage(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -3859,6 +3833,14 @@ static PyObject *_wrap_wxDragImage_RedrawImage(PyObject *self, PyObject *args, P
return _resultobj;
}
static void *SwigwxPyTimerTowxObject(void *ptr) {
wxPyTimer *src;
wxObject *dest;
src = (wxPyTimer *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
#define new_wxPyTimer(_swigarg0) (new wxPyTimer(_swigarg0))
static PyObject *_wrap_new_wxPyTimer(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -4755,7 +4737,6 @@ static PyObject *_wrap_wxLogWindow_GetFrame(PyObject *self, PyObject *args, PyOb
wxLogWindow * _arg0;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self", NULL };
char _ptemp[128];
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxLogWindow_GetFrame",_kwnames,&_argo0))
@@ -4772,13 +4753,7 @@ static PyObject *_wrap_wxLogWindow_GetFrame(PyObject *self, PyObject *args, PyOb
_result = (wxFrame *)wxLogWindow_GetFrame(_arg0);
wxPy_END_ALLOW_THREADS;
} if (_result) {
SWIG_MakePtr(_ptemp, (char *) _result,"_wxFrame_p");
_resultobj = Py_BuildValue("s",_ptemp);
} else {
Py_INCREF(Py_None);
_resultobj = Py_None;
}
}{ _resultobj = wxPyMake_wxObject(_result); }
return _resultobj;
}
@@ -4933,6 +4908,14 @@ static void *SwigwxProcessEventTowxEvent(void *ptr) {
return (void *) dest;
}
static void *SwigwxProcessEventTowxObject(void *ptr) {
wxProcessEvent *src;
wxObject *dest;
src = (wxProcessEvent *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
#define new_wxProcessEvent(_swigarg0,_swigarg1,_swigarg2) (new wxProcessEvent(_swigarg0,_swigarg1,_swigarg2))
static PyObject *_wrap_new_wxProcessEvent(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -5133,6 +5116,14 @@ static void *SwigwxPyProcessTowxEvtHandler(void *ptr) {
return (void *) dest;
}
static void *SwigwxPyProcessTowxObject(void *ptr) {
wxPyProcess *src;
wxObject *dest;
src = (wxPyProcess *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
#define new_wxProcess(_swigarg0,_swigarg1) (new wxPyProcess(_swigarg0,_swigarg1))
static PyObject *_wrap_new_wxProcess(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -5371,28 +5362,7 @@ static PyObject *_wrap_wxProcess_GetInputStream(PyObject *self, PyObject *args,
if (_result) {
_ptr = new wxPyInputStream(_result);
}
if (_ptr) {
char swigptr[64];
SWIG_MakePtr(swigptr, _ptr, "_wxPyInputStream_p");
PyObject* classobj = PyDict_GetItemString(wxPython_dict, "wxInputStreamPtr");
if (! classobj) {
Py_INCREF(Py_None);
_resultobj = Py_None;
} else {
PyObject* arg = Py_BuildValue("(s)", swigptr);
_resultobj = PyInstance_New(classobj, arg, NULL);
Py_DECREF(arg);
// set ThisOwn
PyObject* one = PyInt_FromLong(1);
PyObject_SetAttrString(_resultobj, "thisown", one);
Py_DECREF(one);
}
} else {
Py_INCREF(Py_None);
_resultobj = Py_None;
}
_resultobj = wxPyConstructObject(_ptr, "wxInputStream", TRUE);
}
return _resultobj;
}
@@ -5426,28 +5396,7 @@ static PyObject *_wrap_wxProcess_GetErrorStream(PyObject *self, PyObject *args,
if (_result) {
_ptr = new wxPyInputStream(_result);
}
if (_ptr) {
char swigptr[64];
SWIG_MakePtr(swigptr, _ptr, "_wxPyInputStream_p");
PyObject* classobj = PyDict_GetItemString(wxPython_dict, "wxInputStreamPtr");
if (! classobj) {
Py_INCREF(Py_None);
_resultobj = Py_None;
} else {
PyObject* arg = Py_BuildValue("(s)", swigptr);
_resultobj = PyInstance_New(classobj, arg, NULL);
Py_DECREF(arg);
// set ThisOwn
PyObject* one = PyInt_FromLong(1);
PyObject_SetAttrString(_resultobj, "thisown", one);
Py_DECREF(one);
}
} else {
Py_INCREF(Py_None);
_resultobj = Py_None;
}
_resultobj = wxPyConstructObject(_ptr, "wxInputStream", TRUE);
}
return _resultobj;
}
@@ -5746,8 +5695,20 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_wxDropFilesEvent","_class_wxDropFilesEvent",0},
{ "_class_wxAcceleratorTable","_wxAcceleratorTable",0},
{ "_class_wxClipboard","_wxClipboard",0},
{ "_wxGDIObject","_class_wxGDIObject",0},
{ "_wxDC","_class_wxDC",0},
{ "_class_wxBitmapDataObject","_wxBitmapDataObject",0},
{ "_class_wxObject","_class_wxPyProcess",SwigwxPyProcessTowxObject},
{ "_class_wxObject","_wxPyProcess",SwigwxPyProcessTowxObject},
{ "_class_wxObject","_class_wxProcessEvent",SwigwxProcessEventTowxObject},
{ "_class_wxObject","_wxProcessEvent",SwigwxProcessEventTowxObject},
{ "_class_wxObject","_class_wxPyTimer",SwigwxPyTimerTowxObject},
{ "_class_wxObject","_wxPyTimer",SwigwxPyTimerTowxObject},
{ "_class_wxObject","_class_wxGenericDragImage",SwigwxGenericDragImageTowxObject},
{ "_class_wxObject","_wxGenericDragImage",SwigwxGenericDragImageTowxObject},
{ "_class_wxObject","_class_wxToolTip",SwigwxToolTipTowxObject},
{ "_class_wxObject","_wxToolTip",SwigwxToolTipTowxObject},
{ "_class_wxObject","_wxObject",0},
{ "_wxSpinEvent","_class_wxSpinEvent",0},
{ "_size_t","_wxCoord",0},
{ "_size_t","_wxPrintQuality",0},
@@ -5883,6 +5844,17 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_wxClientDC","_class_wxClientDC",0},
{ "_wxMouseEvent","_class_wxMouseEvent",0},
{ "_class_wxGenericDragImage","_wxGenericDragImage",0},
{ "_wxObject","_class_wxPyProcess",SwigwxPyProcessTowxObject},
{ "_wxObject","_wxPyProcess",SwigwxPyProcessTowxObject},
{ "_wxObject","_class_wxProcessEvent",SwigwxProcessEventTowxObject},
{ "_wxObject","_wxProcessEvent",SwigwxProcessEventTowxObject},
{ "_wxObject","_class_wxPyTimer",SwigwxPyTimerTowxObject},
{ "_wxObject","_wxPyTimer",SwigwxPyTimerTowxObject},
{ "_wxObject","_class_wxGenericDragImage",SwigwxGenericDragImageTowxObject},
{ "_wxObject","_wxGenericDragImage",SwigwxGenericDragImageTowxObject},
{ "_wxObject","_class_wxToolTip",SwigwxToolTipTowxObject},
{ "_wxObject","_wxToolTip",SwigwxToolTipTowxObject},
{ "_wxObject","_class_wxObject",0},
{ "_class_wxPoint","_wxPoint",0},
{ "_class_wxPyInputStream","_wxPyInputStream",0},
{ "_wxRealPoint","_class_wxRealPoint",0},
@@ -5940,6 +5912,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},
@@ -6138,6 +6111,10 @@ SWIGEXPORT(void) initmisc2c() {
PyDict_SetItemString(d,"wxLOG_Progress", PyInt_FromLong((long) wxLOG_Progress));
PyDict_SetItemString(d,"wxLOG_User", PyInt_FromLong((long) wxLOG_User));
PyDict_SetItemString(d,"wxEVT_END_PROCESS", PyInt_FromLong((long) wxEVT_END_PROCESS));
wxPyPtrTypeMap_Add("wxFontEnumerator", "wxPyFontEnumerator");
wxPyPtrTypeMap_Add("wxDragImage", "wxGenericDragImage");
wxPyPtrTypeMap_Add("wxProcess", "wxPyProcess");
{
int i;
for (i = 0; _swig_mapping[i].n1; i++)
wxPython/src/gtk/misc2.py
+3 -10
View File
@@ -12,7 +12,7 @@ from clip_dnd import *
from events import *
from streams import *
class wxToolTipPtr :
class wxToolTipPtr(wxObjectPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
@@ -24,7 +24,6 @@ class wxToolTipPtr :
return val
def GetWindow(self, *_args, **_kwargs):
val = apply(misc2c.wxToolTip_GetWindow,(self,) + _args, _kwargs)
if val: val = wxWindowPtr(val)
return val
def __repr__(self):
return "<C wxToolTip instance at %s>" % (self.this,)
@@ -65,7 +64,6 @@ class wxCaretPtr :
return val
def GetWindow(self, *_args, **_kwargs):
val = apply(misc2c.wxCaret_GetWindow,(self,) + _args, _kwargs)
if val: val = wxWindowPtr(val)
return val
def MoveXY(self, *_args, **_kwargs):
val = apply(misc2c.wxCaret_MoveXY,(self,) + _args, _kwargs)
@@ -215,7 +213,7 @@ class wxPyTipProvider(wxPyTipProviderPtr):
class wxDragImagePtr :
class wxDragImagePtr(wxObjectPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
@@ -257,7 +255,7 @@ class wxDragImage(wxDragImagePtr):
class wxPyTimerPtr :
class wxPyTimerPtr(wxObjectPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
@@ -369,7 +367,6 @@ class wxLogWindowPtr(wxLogPtr):
return val
def GetFrame(self, *_args, **_kwargs):
val = apply(misc2c.wxLogWindow_GetFrame,(self,) + _args, _kwargs)
if val: val = wxFramePtr(val)
return val
def GetOldLog(self, *_args, **_kwargs):
val = apply(misc2c.wxLogWindow_GetOldLog,(self,) + _args, _kwargs)
@@ -537,19 +534,16 @@ wxSetCursor = misc2c.wxSetCursor
def wxFindWindowByLabel(*_args, **_kwargs):
val = apply(misc2c.wxFindWindowByLabel,_args,_kwargs)
if val: val = wxWindowPtr(val)
return val
def wxFindWindowByName(*_args, **_kwargs):
val = apply(misc2c.wxFindWindowByName,_args,_kwargs)
if val: val = wxWindowPtr(val)
return val
wxBeginBusyCursor = misc2c.wxBeginBusyCursor
def wxGetActiveWindow(*_args, **_kwargs):
val = apply(misc2c.wxGetActiveWindow,_args,_kwargs)
if val: val = wxWindowPtr(val)
return val
wxResourceAddIdentifier = misc2c.wxResourceAddIdentifier
@@ -568,7 +562,6 @@ def wxResourceCreateIcon(*_args, **_kwargs):
def wxResourceCreateMenuBar(*_args, **_kwargs):
val = apply(misc2c.wxResourceCreateMenuBar,_args,_kwargs)
if val: val = wxMenuBarPtr(val)
return val
wxResourceGetIdentifier = misc2c.wxResourceGetIdentifier
wxPython/src/gtk/printfw.cpp
+121 -56
View File
@@ -173,6 +173,14 @@ IMP_PYCALLBACK_BOOL_INT(wxPyPrintout, wxPrintout, HasPage);
#ifdef __cplusplus
extern "C" {
#endif
static void *SwigwxPrintDataTowxObject(void *ptr) {
wxPrintData *src;
wxObject *dest;
src = (wxPrintData *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
#define new_wxPrintData() (new wxPrintData())
static PyObject *_wrap_new_wxPrintData(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -1513,6 +1521,14 @@ static PyObject *_wrap_wxPrintData_SetPrintMode(PyObject *self, PyObject *args,
return _resultobj;
}
static void *SwigwxPageSetupDialogDataTowxObject(void *ptr) {
wxPageSetupDialogData *src;
wxObject *dest;
src = (wxPageSetupDialogData *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
#define new_wxPageSetupDialogData() (new wxPageSetupDialogData())
static PyObject *_wrap_new_wxPageSetupDialogData(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -2443,6 +2459,14 @@ static void *SwigwxPageSetupDialogTowxEvtHandler(void *ptr) {
return (void *) dest;
}
static void *SwigwxPageSetupDialogTowxObject(void *ptr) {
wxPageSetupDialog *src;
wxObject *dest;
src = (wxPageSetupDialog *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
#define new_wxPageSetupDialog(_swigarg0,_swigarg1) (new wxPageSetupDialog(_swigarg0,_swigarg1))
static PyObject *_wrap_new_wxPageSetupDialog(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -2548,6 +2572,14 @@ static PyObject *_wrap_wxPageSetupDialog_ShowModal(PyObject *self, PyObject *arg
return _resultobj;
}
static void *SwigwxPrintDialogDataTowxObject(void *ptr) {
wxPrintDialogData *src;
wxObject *dest;
src = (wxPrintDialogData *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
#define new_wxPrintDialogData() (new wxPrintDialogData())
static PyObject *_wrap_new_wxPrintDialogData(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -3270,6 +3302,14 @@ static void *SwigwxPrintDialogTowxEvtHandler(void *ptr) {
return (void *) dest;
}
static void *SwigwxPrintDialogTowxObject(void *ptr) {
wxPrintDialog *src;
wxObject *dest;
src = (wxPrintDialog *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
#define new_wxPrintDialog(_swigarg0,_swigarg1) (new wxPrintDialog(_swigarg0,_swigarg1))
static PyObject *_wrap_new_wxPrintDialog(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -3355,7 +3395,6 @@ static PyObject *_wrap_wxPrintDialog_GetPrintDC(PyObject *self, PyObject *args,
wxPrintDialog * _arg0;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self", NULL };
char _ptemp[128];
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintDialog_GetPrintDC",_kwnames,&_argo0))
@@ -3372,13 +3411,7 @@ static PyObject *_wrap_wxPrintDialog_GetPrintDC(PyObject *self, PyObject *args,
_result = (wxDC *)wxPrintDialog_GetPrintDC(_arg0);
wxPy_END_ALLOW_THREADS;
} if (_result) {
SWIG_MakePtr(_ptemp, (char *) _result,"_wxDC_p");
_resultobj = Py_BuildValue("s",_ptemp);
} else {
Py_INCREF(Py_None);
_resultobj = Py_None;
}
}{ _resultobj = wxPyMake_wxObject(_result); }
return _resultobj;
}
@@ -3409,6 +3442,14 @@ static PyObject *_wrap_wxPrintDialog_ShowModal(PyObject *self, PyObject *args, P
return _resultobj;
}
static void *SwigwxPyPrintoutTowxObject(void *ptr) {
wxPyPrintout *src;
wxObject *dest;
src = (wxPyPrintout *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
#define new_wxPrintout(_swigarg0) (new wxPyPrintout(_swigarg0))
static PyObject *_wrap_new_wxPrintout(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -3506,7 +3547,6 @@ static PyObject *_wrap_wxPrintout_GetDC(PyObject *self, PyObject *args, PyObject
wxPyPrintout * _arg0;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self", NULL };
char _ptemp[128];
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintout_GetDC",_kwnames,&_argo0))
@@ -3523,13 +3563,7 @@ static PyObject *_wrap_wxPrintout_GetDC(PyObject *self, PyObject *args, PyObject
_result = (wxDC *)wxPrintout_GetDC(_arg0);
wxPy_END_ALLOW_THREADS;
} if (_result) {
SWIG_MakePtr(_ptemp, (char *) _result,"_wxDC_p");
_resultobj = Py_BuildValue("s",_ptemp);
} else {
Py_INCREF(Py_None);
_resultobj = Py_None;
}
}{ _resultobj = wxPyMake_wxObject(_result); }
return _resultobj;
}
@@ -3980,6 +4014,14 @@ static PyObject *_wrap_wxPrintout_base_HasPage(PyObject *self, PyObject *args, P
return _resultobj;
}
static void *SwigwxPrinterTowxObject(void *ptr) {
wxPrinter *src;
wxObject *dest;
src = (wxPrinter *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
#define new_wxPrinter(_swigarg0) (new wxPrinter(_swigarg0))
static PyObject *_wrap_new_wxPrinter(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -4176,7 +4218,6 @@ static PyObject *_wrap_wxPrinter_PrintDialog(PyObject *self, PyObject *args, PyO
PyObject * _argo0 = 0;
PyObject * _argo1 = 0;
char *_kwnames[] = { "self","parent", NULL };
char _ptemp[128];
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPrinter_PrintDialog",_kwnames,&_argo0,&_argo1))
@@ -4200,13 +4241,7 @@ static PyObject *_wrap_wxPrinter_PrintDialog(PyObject *self, PyObject *args, PyO
_result = (wxDC *)wxPrinter_PrintDialog(_arg0,_arg1);
wxPy_END_ALLOW_THREADS;
} if (_result) {
SWIG_MakePtr(_ptemp, (char *) _result,"_wxDC_p");
_resultobj = Py_BuildValue("s",_ptemp);
} else {
Py_INCREF(Py_None);
_resultobj = Py_None;
}
}{ _resultobj = wxPyMake_wxObject(_result); }
return _resultobj;
}
@@ -4292,6 +4327,14 @@ static PyObject *_wrap_wxPrinter_Setup(PyObject *self, PyObject *args, PyObject
return _resultobj;
}
static void *SwigwxPrintPreviewTowxObject(void *ptr) {
wxPrintPreview *src;
wxObject *dest;
src = (wxPrintPreview *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
#define new_wxPrintPreview(_swigarg0,_swigarg1,_swigarg2) (new wxPrintPreview(_swigarg0,_swigarg1,_swigarg2))
static PyObject *_wrap_new_wxPrintPreview(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -4351,7 +4394,6 @@ static PyObject *_wrap_wxPrintPreview_GetCanvas(PyObject *self, PyObject *args,
wxPrintPreview * _arg0;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self", NULL };
char _ptemp[128];
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintPreview_GetCanvas",_kwnames,&_argo0))
@@ -4368,13 +4410,7 @@ static PyObject *_wrap_wxPrintPreview_GetCanvas(PyObject *self, PyObject *args,
_result = (wxWindow *)wxPrintPreview_GetCanvas(_arg0);
wxPy_END_ALLOW_THREADS;
} if (_result) {
SWIG_MakePtr(_ptemp, (char *) _result,"_wxWindow_p");
_resultobj = Py_BuildValue("s",_ptemp);
} else {
Py_INCREF(Py_None);
_resultobj = Py_None;
}
}{ _resultobj = wxPyMake_wxObject(_result); }
return _resultobj;
}
@@ -4412,7 +4448,6 @@ static PyObject *_wrap_wxPrintPreview_GetFrame(PyObject *self, PyObject *args, P
wxPrintPreview * _arg0;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self", NULL };
char _ptemp[128];
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintPreview_GetFrame",_kwnames,&_argo0))
@@ -4429,13 +4464,7 @@ static PyObject *_wrap_wxPrintPreview_GetFrame(PyObject *self, PyObject *args, P
_result = (wxFrame *)wxPrintPreview_GetFrame(_arg0);
wxPy_END_ALLOW_THREADS;
} if (_result) {
SWIG_MakePtr(_ptemp, (char *) _result,"_wxFrame_p");
_resultobj = Py_BuildValue("s",_ptemp);
} else {
Py_INCREF(Py_None);
_resultobj = Py_None;
}
}{ _resultobj = wxPyMake_wxObject(_result); }
return _resultobj;
}
@@ -4535,7 +4564,6 @@ static PyObject *_wrap_wxPrintPreview_GetPrintout(PyObject *self, PyObject *args
wxPrintPreview * _arg0;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self", NULL };
char _ptemp[128];
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintPreview_GetPrintout",_kwnames,&_argo0))
@@ -4552,13 +4580,7 @@ static PyObject *_wrap_wxPrintPreview_GetPrintout(PyObject *self, PyObject *args
_result = (wxPyPrintout *)wxPrintPreview_GetPrintout(_arg0);
wxPy_END_ALLOW_THREADS;
} if (_result) {
SWIG_MakePtr(_ptemp, (char *) _result,"_wxPyPrintout_p");
_resultobj = Py_BuildValue("s",_ptemp);
} else {
Py_INCREF(Py_None);
_resultobj = Py_None;
}
}{ _resultobj = wxPyMake_wxObject(_result); }
return _resultobj;
}
@@ -4569,7 +4591,6 @@ static PyObject *_wrap_wxPrintPreview_GetPrintoutForPrinting(PyObject *self, PyO
wxPrintPreview * _arg0;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self", NULL };
char _ptemp[128];
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintPreview_GetPrintoutForPrinting",_kwnames,&_argo0))
@@ -4586,13 +4607,7 @@ static PyObject *_wrap_wxPrintPreview_GetPrintoutForPrinting(PyObject *self, PyO
_result = (wxPyPrintout *)wxPrintPreview_GetPrintoutForPrinting(_arg0);
wxPy_END_ALLOW_THREADS;
} if (_result) {
SWIG_MakePtr(_ptemp, (char *) _result,"_wxPyPrintout_p");
_resultobj = Py_BuildValue("s",_ptemp);
} else {
Py_INCREF(Py_None);
_resultobj = Py_None;
}
}{ _resultobj = wxPyMake_wxObject(_result); }
return _resultobj;
}
@@ -4868,6 +4883,14 @@ static void *SwigwxPreviewFrameTowxEvtHandler(void *ptr) {
return (void *) dest;
}
static void *SwigwxPreviewFrameTowxObject(void *ptr) {
wxPreviewFrame *src;
wxObject *dest;
src = (wxPreviewFrame *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
#define new_wxPreviewFrame(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6) (new wxPreviewFrame(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6))
static PyObject *_wrap_new_wxPreviewFrame(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -5198,11 +5221,31 @@ 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},
{ "_wxPrintPreview","_class_wxPrintPreview",0},
{ "_class_wxObject","_class_wxPreviewFrame",SwigwxPreviewFrameTowxObject},
{ "_class_wxObject","_wxPreviewFrame",SwigwxPreviewFrameTowxObject},
{ "_class_wxObject","_class_wxPrintPreview",SwigwxPrintPreviewTowxObject},
{ "_class_wxObject","_wxPrintPreview",SwigwxPrintPreviewTowxObject},
{ "_class_wxObject","_class_wxPrinter",SwigwxPrinterTowxObject},
{ "_class_wxObject","_wxPrinter",SwigwxPrinterTowxObject},
{ "_class_wxObject","_class_wxPyPrintout",SwigwxPyPrintoutTowxObject},
{ "_class_wxObject","_wxPyPrintout",SwigwxPyPrintoutTowxObject},
{ "_class_wxObject","_class_wxPrintDialog",SwigwxPrintDialogTowxObject},
{ "_class_wxObject","_wxPrintDialog",SwigwxPrintDialogTowxObject},
{ "_class_wxObject","_class_wxPrintDialogData",SwigwxPrintDialogDataTowxObject},
{ "_class_wxObject","_wxPrintDialogData",SwigwxPrintDialogDataTowxObject},
{ "_class_wxObject","_class_wxPageSetupDialog",SwigwxPageSetupDialogTowxObject},
{ "_class_wxObject","_wxPageSetupDialog",SwigwxPageSetupDialogTowxObject},
{ "_class_wxObject","_class_wxPageSetupDialogData",SwigwxPageSetupDialogDataTowxObject},
{ "_class_wxObject","_wxPageSetupDialogData",SwigwxPageSetupDialogDataTowxObject},
{ "_class_wxObject","_class_wxPrintData",SwigwxPrintDataTowxObject},
{ "_class_wxObject","_wxPrintData",SwigwxPrintDataTowxObject},
{ "_class_wxObject","_wxObject",0},
{ "_wxSpinEvent","_class_wxSpinEvent",0},
{ "_size_t","_wxCoord",0},
{ "_size_t","_wxPrintQuality",0},
@@ -5376,6 +5419,25 @@ 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_wxPreviewFrame",SwigwxPreviewFrameTowxObject},
{ "_wxObject","_wxPreviewFrame",SwigwxPreviewFrameTowxObject},
{ "_wxObject","_class_wxPrintPreview",SwigwxPrintPreviewTowxObject},
{ "_wxObject","_wxPrintPreview",SwigwxPrintPreviewTowxObject},
{ "_wxObject","_class_wxPrinter",SwigwxPrinterTowxObject},
{ "_wxObject","_wxPrinter",SwigwxPrinterTowxObject},
{ "_wxObject","_class_wxPyPrintout",SwigwxPyPrintoutTowxObject},
{ "_wxObject","_wxPyPrintout",SwigwxPyPrintoutTowxObject},
{ "_wxObject","_class_wxPrintDialog",SwigwxPrintDialogTowxObject},
{ "_wxObject","_wxPrintDialog",SwigwxPrintDialogTowxObject},
{ "_wxObject","_class_wxPrintDialogData",SwigwxPrintDialogDataTowxObject},
{ "_wxObject","_wxPrintDialogData",SwigwxPrintDialogDataTowxObject},
{ "_wxObject","_class_wxPageSetupDialog",SwigwxPageSetupDialogTowxObject},
{ "_wxObject","_wxPageSetupDialog",SwigwxPageSetupDialogTowxObject},
{ "_wxObject","_class_wxPageSetupDialogData",SwigwxPageSetupDialogDataTowxObject},
{ "_wxObject","_wxPageSetupDialogData",SwigwxPageSetupDialogDataTowxObject},
{ "_wxObject","_class_wxPrintData",SwigwxPrintDataTowxObject},
{ "_wxObject","_wxPrintData",SwigwxPrintDataTowxObject},
{ "_wxObject","_class_wxObject",0},
{ "_class_wxPoint","_wxPoint",0},
{ "_wxRealPoint","_class_wxRealPoint",0},
{ "_class_wxRadioBox","_wxRadioBox",0},
@@ -5438,6 +5500,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},
@@ -5563,6 +5626,8 @@ SWIGEXPORT(void) initprintfwc() {
SWIG_globals = SWIG_newvarlink();
m = Py_InitModule("printfwc", printfwcMethods);
d = PyModule_GetDict(m);
wxPyPtrTypeMap_Add("wxPrintout", "wxPyPrintout");
{
int i;
for (i = 0; _swig_mapping[i].n1; i++)
wxPython/src/gtk/printfw.py
+6 -13
View File
@@ -19,7 +19,7 @@ from controls import *
from events import *
import wx
class wxPrintDataPtr :
class wxPrintDataPtr(wxObjectPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
@@ -157,7 +157,7 @@ class wxPrintData(wxPrintDataPtr):
class wxPageSetupDialogDataPtr :
class wxPageSetupDialogDataPtr(wxObjectPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
@@ -286,7 +286,7 @@ class wxPageSetupDialog(wxPageSetupDialogPtr):
class wxPrintDialogDataPtr :
class wxPrintDialogDataPtr(wxObjectPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
@@ -380,7 +380,6 @@ class wxPrintDialogPtr(wxDialogPtr):
return val
def GetPrintDC(self, *_args, **_kwargs):
val = apply(printfwc.wxPrintDialog_GetPrintDC,(self,) + _args, _kwargs)
if val: val = wxDCPtr(val) ; val.thisown = 1
return val
def ShowModal(self, *_args, **_kwargs):
val = apply(printfwc.wxPrintDialog_ShowModal,(self,) + _args, _kwargs)
@@ -396,7 +395,7 @@ class wxPrintDialog(wxPrintDialogPtr):
class wxPrintoutPtr :
class wxPrintoutPtr(wxObjectPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
@@ -408,7 +407,6 @@ class wxPrintoutPtr :
return val
def GetDC(self, *_args, **_kwargs):
val = apply(printfwc.wxPrintout_GetDC,(self,) + _args, _kwargs)
if val: val = wxDCPtr(val)
return val
def GetPageSizeMM(self, *_args, **_kwargs):
val = apply(printfwc.wxPrintout_GetPageSizeMM,(self,) + _args, _kwargs)
@@ -457,7 +455,7 @@ class wxPrintout(wxPrintoutPtr):
class wxPrinterPtr :
class wxPrinterPtr(wxObjectPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
@@ -476,7 +474,6 @@ class wxPrinterPtr :
return val
def PrintDialog(self, *_args, **_kwargs):
val = apply(printfwc.wxPrinter_PrintDialog,(self,) + _args, _kwargs)
if val: val = wxDCPtr(val)
return val
def ReportError(self, *_args, **_kwargs):
val = apply(printfwc.wxPrinter_ReportError,(self,) + _args, _kwargs)
@@ -494,20 +491,18 @@ class wxPrinter(wxPrinterPtr):
class wxPrintPreviewPtr :
class wxPrintPreviewPtr(wxObjectPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
def GetCanvas(self, *_args, **_kwargs):
val = apply(printfwc.wxPrintPreview_GetCanvas,(self,) + _args, _kwargs)
if val: val = wxWindowPtr(val)
return val
def GetCurrentPage(self, *_args, **_kwargs):
val = apply(printfwc.wxPrintPreview_GetCurrentPage,(self,) + _args, _kwargs)
return val
def GetFrame(self, *_args, **_kwargs):
val = apply(printfwc.wxPrintPreview_GetFrame,(self,) + _args, _kwargs)
if val: val = wxFramePtr(val)
return val
def GetMaxPage(self, *_args, **_kwargs):
val = apply(printfwc.wxPrintPreview_GetMaxPage,(self,) + _args, _kwargs)
@@ -521,11 +516,9 @@ class wxPrintPreviewPtr :
return val
def GetPrintout(self, *_args, **_kwargs):
val = apply(printfwc.wxPrintPreview_GetPrintout,(self,) + _args, _kwargs)
if val: val = wxPrintoutPtr(val)
return val
def GetPrintoutForPrinting(self, *_args, **_kwargs):
val = apply(printfwc.wxPrintPreview_GetPrintoutForPrinting,(self,) + _args, _kwargs)
if val: val = wxPrintoutPtr(val)
return val
def GetZoom(self, *_args, **_kwargs):
val = apply(printfwc.wxPrintPreview_GetZoom,(self,) + _args, _kwargs)
wxPython/src/gtk/sizers.cpp
+106 -32
View File
@@ -57,6 +57,8 @@ extern PyObject *SWIG_newvarlink(void);
#include "helpers.h"
#include <wx/notebook.h>
static PyObject* l_output_helper(PyObject* target, PyObject* o) {
PyObject* o2;
if (!target) {
@@ -127,6 +129,14 @@ IMPLEMENT_DYNAMIC_CLASS(wxPySizer, wxSizer);
#ifdef __cplusplus
extern "C" {
#endif
static void *SwigwxSizerItemTowxObject(void *ptr) {
wxSizerItem *src;
wxObject *dest;
src = (wxSizerItem *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
#define wxSizerItem_GetSize(_swigobj) (_swigobj->GetSize())
static PyObject *_wrap_wxSizerItem_GetSize(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -435,7 +445,6 @@ static PyObject *_wrap_wxSizerItem_GetWindow(PyObject *self, PyObject *args, PyO
wxSizerItem * _arg0;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self", NULL };
char _ptemp[128];
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSizerItem_GetWindow",_kwnames,&_argo0))
@@ -452,13 +461,7 @@ static PyObject *_wrap_wxSizerItem_GetWindow(PyObject *self, PyObject *args, PyO
_result = (wxWindow *)wxSizerItem_GetWindow(_arg0);
wxPy_END_ALLOW_THREADS;
} if (_result) {
SWIG_MakePtr(_ptemp, (char *) _result,"_wxWindow_p");
_resultobj = Py_BuildValue("s",_ptemp);
} else {
Py_INCREF(Py_None);
_resultobj = Py_None;
}
}{ _resultobj = wxPyMake_wxObject(_result); }
return _resultobj;
}
@@ -505,7 +508,6 @@ static PyObject *_wrap_wxSizerItem_GetSizer(PyObject *self, PyObject *args, PyOb
wxSizerItem * _arg0;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self", NULL };
char _ptemp[128];
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSizerItem_GetSizer",_kwnames,&_argo0))
@@ -522,13 +524,7 @@ static PyObject *_wrap_wxSizerItem_GetSizer(PyObject *self, PyObject *args, PyOb
_result = (wxSizer *)wxSizerItem_GetSizer(_arg0);
wxPy_END_ALLOW_THREADS;
} if (_result) {
SWIG_MakePtr(_ptemp, (char *) _result,"_wxSizer_p");
_resultobj = Py_BuildValue("s",_ptemp);
} else {
Py_INCREF(Py_None);
_resultobj = Py_None;
}
}{ _resultobj = wxPyMake_wxObject(_result); }
return _resultobj;
}
@@ -800,6 +796,14 @@ static PyObject *_wrap_wxSizerItem_GetUserData(PyObject *self, PyObject *args, P
return _resultobj;
}
static void *SwigwxSizerTowxObject(void *ptr) {
wxSizer *src;
wxObject *dest;
src = (wxSizer *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
static void wxSizer_Destroy(wxSizer *self) { delete self; }
static PyObject *_wrap_wxSizer_Destroy(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -1748,6 +1752,14 @@ static void *SwigwxPySizerTowxSizer(void *ptr) {
return (void *) dest;
}
static void *SwigwxPySizerTowxObject(void *ptr) {
wxPySizer *src;
wxObject *dest;
src = (wxPySizer *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
#define new_wxPySizer() (new wxPySizer())
static PyObject *_wrap_new_wxPySizer(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -1818,6 +1830,14 @@ static void *SwigwxBoxSizerTowxSizer(void *ptr) {
return (void *) dest;
}
static void *SwigwxBoxSizerTowxObject(void *ptr) {
wxBoxSizer *src;
wxObject *dest;
src = (wxBoxSizer *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
#define new_wxBoxSizer(_swigarg0) (new wxBoxSizer(_swigarg0))
static PyObject *_wrap_new_wxBoxSizer(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -1943,6 +1963,14 @@ static void *SwigwxStaticBoxSizerTowxSizer(void *ptr) {
return (void *) dest;
}
static void *SwigwxStaticBoxSizerTowxObject(void *ptr) {
wxStaticBoxSizer *src;
wxObject *dest;
src = (wxStaticBoxSizer *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
#define new_wxStaticBoxSizer(_swigarg0,_swigarg1) (new wxStaticBoxSizer(_swigarg0,_swigarg1))
static PyObject *_wrap_new_wxStaticBoxSizer(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -1985,7 +2013,6 @@ static PyObject *_wrap_wxStaticBoxSizer_GetStaticBox(PyObject *self, PyObject *a
wxStaticBoxSizer * _arg0;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self", NULL };
char _ptemp[128];
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxStaticBoxSizer_GetStaticBox",_kwnames,&_argo0))
@@ -2002,13 +2029,7 @@ static PyObject *_wrap_wxStaticBoxSizer_GetStaticBox(PyObject *self, PyObject *a
_result = (wxStaticBox *)wxStaticBoxSizer_GetStaticBox(_arg0);
wxPy_END_ALLOW_THREADS;
} if (_result) {
SWIG_MakePtr(_ptemp, (char *) _result,"_wxStaticBox_p");
_resultobj = Py_BuildValue("s",_ptemp);
} else {
Py_INCREF(Py_None);
_resultobj = Py_None;
}
}{ _resultobj = wxPyMake_wxObject(_result); }
return _resultobj;
}
@@ -2076,6 +2097,14 @@ static void *SwigwxNotebookSizerTowxSizer(void *ptr) {
return (void *) dest;
}
static void *SwigwxNotebookSizerTowxObject(void *ptr) {
wxNotebookSizer *src;
wxObject *dest;
src = (wxNotebookSizer *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
#define new_wxNotebookSizer(_swigarg0) (new wxNotebookSizer(_swigarg0))
static PyObject *_wrap_new_wxNotebookSizer(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -2173,7 +2202,6 @@ static PyObject *_wrap_wxNotebookSizer_GetNotebook(PyObject *self, PyObject *arg
wxNotebookSizer * _arg0;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self", NULL };
char _ptemp[128];
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxNotebookSizer_GetNotebook",_kwnames,&_argo0))
@@ -2190,13 +2218,7 @@ static PyObject *_wrap_wxNotebookSizer_GetNotebook(PyObject *self, PyObject *arg
_result = (wxNotebook *)wxNotebookSizer_GetNotebook(_arg0);
wxPy_END_ALLOW_THREADS;
} if (_result) {
SWIG_MakePtr(_ptemp, (char *) _result,"_wxNotebook_p");
_resultobj = Py_BuildValue("s",_ptemp);
} else {
Py_INCREF(Py_None);
_resultobj = Py_None;
}
}{ _resultobj = wxPyMake_wxObject(_result); }
return _resultobj;
}
@@ -2208,6 +2230,14 @@ static void *SwigwxGridSizerTowxSizer(void *ptr) {
return (void *) dest;
}
static void *SwigwxGridSizerTowxObject(void *ptr) {
wxGridSizer *src;
wxObject *dest;
src = (wxGridSizer *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
#define new_wxGridSizer(_swigarg0,_swigarg1,_swigarg2,_swigarg3) (new wxGridSizer(_swigarg0,_swigarg1,_swigarg2,_swigarg3))
static PyObject *_wrap_new_wxGridSizer(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -2529,6 +2559,14 @@ static void *SwigwxFlexGridSizerTowxSizer(void *ptr) {
return (void *) dest;
}
static void *SwigwxFlexGridSizerTowxObject(void *ptr) {
wxFlexGridSizer *src;
wxObject *dest;
src = (wxFlexGridSizer *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
#define new_wxFlexGridSizer(_swigarg0,_swigarg1,_swigarg2,_swigarg3) (new wxFlexGridSizer(_swigarg0,_swigarg1,_swigarg2,_swigarg3))
static PyObject *_wrap_new_wxFlexGridSizer(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -2882,10 +2920,28 @@ 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},
{ "_wxSizerItem","_class_wxSizerItem",0},
{ "_class_wxBitmapDataObject","_wxBitmapDataObject",0},
{ "_class_wxFlexGridSizer","_wxFlexGridSizer",0},
{ "_class_wxObject","_class_wxFlexGridSizer",SwigwxFlexGridSizerTowxObject},
{ "_class_wxObject","_wxFlexGridSizer",SwigwxFlexGridSizerTowxObject},
{ "_class_wxObject","_class_wxGridSizer",SwigwxGridSizerTowxObject},
{ "_class_wxObject","_wxGridSizer",SwigwxGridSizerTowxObject},
{ "_class_wxObject","_class_wxNotebookSizer",SwigwxNotebookSizerTowxObject},
{ "_class_wxObject","_wxNotebookSizer",SwigwxNotebookSizerTowxObject},
{ "_class_wxObject","_class_wxStaticBoxSizer",SwigwxStaticBoxSizerTowxObject},
{ "_class_wxObject","_wxStaticBoxSizer",SwigwxStaticBoxSizerTowxObject},
{ "_class_wxObject","_class_wxBoxSizer",SwigwxBoxSizerTowxObject},
{ "_class_wxObject","_wxBoxSizer",SwigwxBoxSizerTowxObject},
{ "_class_wxObject","_class_wxPySizer",SwigwxPySizerTowxObject},
{ "_class_wxObject","_wxPySizer",SwigwxPySizerTowxObject},
{ "_class_wxObject","_class_wxSizer",SwigwxSizerTowxObject},
{ "_class_wxObject","_wxSizer",SwigwxSizerTowxObject},
{ "_class_wxObject","_class_wxSizerItem",SwigwxSizerItemTowxObject},
{ "_class_wxObject","_wxSizerItem",SwigwxSizerItemTowxObject},
{ "_class_wxObject","_wxObject",0},
{ "_wxSpinEvent","_class_wxSpinEvent",0},
{ "_size_t","_wxCoord",0},
{ "_size_t","_wxPrintQuality",0},
@@ -3022,6 +3078,23 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_class_wxPyBitmapDataObject","_wxPyBitmapDataObject",0},
{ "_wxClientDC","_class_wxClientDC",0},
{ "_wxMouseEvent","_class_wxMouseEvent",0},
{ "_wxObject","_class_wxFlexGridSizer",SwigwxFlexGridSizerTowxObject},
{ "_wxObject","_wxFlexGridSizer",SwigwxFlexGridSizerTowxObject},
{ "_wxObject","_class_wxGridSizer",SwigwxGridSizerTowxObject},
{ "_wxObject","_wxGridSizer",SwigwxGridSizerTowxObject},
{ "_wxObject","_class_wxNotebookSizer",SwigwxNotebookSizerTowxObject},
{ "_wxObject","_wxNotebookSizer",SwigwxNotebookSizerTowxObject},
{ "_wxObject","_class_wxStaticBoxSizer",SwigwxStaticBoxSizerTowxObject},
{ "_wxObject","_wxStaticBoxSizer",SwigwxStaticBoxSizerTowxObject},
{ "_wxObject","_class_wxBoxSizer",SwigwxBoxSizerTowxObject},
{ "_wxObject","_wxBoxSizer",SwigwxBoxSizerTowxObject},
{ "_wxObject","_class_wxPySizer",SwigwxPySizerTowxObject},
{ "_wxObject","_wxPySizer",SwigwxPySizerTowxObject},
{ "_wxObject","_class_wxSizer",SwigwxSizerTowxObject},
{ "_wxObject","_wxSizer",SwigwxSizerTowxObject},
{ "_wxObject","_class_wxSizerItem",SwigwxSizerItemTowxObject},
{ "_wxObject","_wxSizerItem",SwigwxSizerItemTowxObject},
{ "_wxObject","_class_wxObject",0},
{ "_class_wxPoint","_wxPoint",0},
{ "_wxRealPoint","_class_wxRealPoint",0},
{ "_class_wxRadioBox","_wxRadioBox",0},
@@ -3080,6 +3153,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},
{ "_class_wxSizerItem","_wxSizerItem",0},
{ "_int","_wxCoord",0},
wxPython/src/gtk/sizers.py
+2 -6
View File
@@ -14,7 +14,7 @@ from controls import *
from events import *
import wx
import string
class wxSizerItemPtr :
class wxSizerItemPtr(wxObjectPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
@@ -52,14 +52,12 @@ class wxSizerItemPtr :
return val
def GetWindow(self, *_args, **_kwargs):
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)
@@ -97,7 +95,7 @@ class wxSizerItem(wxSizerItemPtr):
class wxSizerPtr :
class wxSizerPtr(wxObjectPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
@@ -284,7 +282,6 @@ class wxStaticBoxSizerPtr(wxBoxSizerPtr):
self.thisown = 0
def GetStaticBox(self, *_args, **_kwargs):
val = apply(sizersc.wxStaticBoxSizer_GetStaticBox,(self,) + _args, _kwargs)
if val: val = wxStaticBoxPtr(val)
return val
def RecalcSizes(self, *_args, **_kwargs):
val = apply(sizersc.wxStaticBoxSizer_RecalcSizes,(self,) + _args, _kwargs)
@@ -316,7 +313,6 @@ class wxNotebookSizerPtr(wxSizerPtr):
return val
def GetNotebook(self, *_args, **_kwargs):
val = apply(sizersc.wxNotebookSizer_GetNotebook,(self,) + _args, _kwargs)
if val: val = wxNotebookPtr(val)
return val
def __repr__(self):
return "<C wxNotebookSizer instance at %s>" % (self.this,)
wxPython/src/gtk/stattool.cpp
+77 -104
View File
@@ -131,6 +131,14 @@ static void *SwigwxStatusBarTowxEvtHandler(void *ptr) {
return (void *) dest;
}
static void *SwigwxStatusBarTowxObject(void *ptr) {
wxStatusBar *src;
wxObject *dest;
src = (wxStatusBar *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
#define new_wxStatusBar(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5) (new wxStatusBar(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5))
static PyObject *_wrap_new_wxStatusBar(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -495,6 +503,14 @@ static PyObject *_wrap_wxStatusBar_SetMinHeight(PyObject *self, PyObject *args,
return _resultobj;
}
static void *SwigwxToolBarToolBaseTowxObject(void *ptr) {
wxToolBarToolBase *src;
wxObject *dest;
src = (wxToolBarToolBase *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
static void wxToolBarToolBase_Destroy(wxToolBarToolBase *self) { delete self; }
static PyObject *_wrap_wxToolBarToolBase_Destroy(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -556,7 +572,6 @@ static PyObject *_wrap_wxToolBarToolBase_GetControl(PyObject *self, PyObject *ar
wxToolBarToolBase * _arg0;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self", NULL };
char _ptemp[128];
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxToolBarToolBase_GetControl",_kwnames,&_argo0))
@@ -573,13 +588,7 @@ static PyObject *_wrap_wxToolBarToolBase_GetControl(PyObject *self, PyObject *ar
_result = (wxControl *)wxToolBarToolBase_GetControl(_arg0);
wxPy_END_ALLOW_THREADS;
} if (_result) {
SWIG_MakePtr(_ptemp, (char *) _result,"_wxControl_p");
_resultobj = Py_BuildValue("s",_ptemp);
} else {
Py_INCREF(Py_None);
_resultobj = Py_None;
}
}{ _resultobj = wxPyMake_wxObject(_result); }
return _resultobj;
}
@@ -590,7 +599,6 @@ static PyObject *_wrap_wxToolBarToolBase_GetToolBar(PyObject *self, PyObject *ar
wxToolBarToolBase * _arg0;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self", NULL };
char _ptemp[128];
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxToolBarToolBase_GetToolBar",_kwnames,&_argo0))
@@ -607,13 +615,7 @@ static PyObject *_wrap_wxToolBarToolBase_GetToolBar(PyObject *self, PyObject *ar
_result = (wxToolBarBase *)wxToolBarToolBase_GetToolBar(_arg0);
wxPy_END_ALLOW_THREADS;
} if (_result) {
SWIG_MakePtr(_ptemp, (char *) _result,"_wxToolBarBase_p");
_resultobj = Py_BuildValue("s",_ptemp);
} else {
Py_INCREF(Py_None);
_resultobj = Py_None;
}
}{ _resultobj = wxPyMake_wxObject(_result); }
return _resultobj;
}
@@ -1398,6 +1400,14 @@ static void *SwigwxToolBarBaseTowxEvtHandler(void *ptr) {
return (void *) dest;
}
static void *SwigwxToolBarBaseTowxObject(void *ptr) {
wxToolBarBase *src;
wxObject *dest;
src = (wxToolBarBase *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
static wxToolBarToolBase * wxToolBarBase_AddTool(wxToolBarBase *self,int id,const wxBitmap & bitmap,const wxBitmap & pushedBitmap,int isToggle,PyObject * clientData,const wxString & shortHelpString,const wxString & longHelpString) {
wxPyUserData* udata = NULL;
if (clientData)
@@ -1423,7 +1433,6 @@ static PyObject *_wrap_wxToolBarBase_AddTool(PyObject *self, PyObject *args, PyO
PyObject * _obj6 = 0;
PyObject * _obj7 = 0;
char *_kwnames[] = { "self","id","bitmap","pushedBitmap","isToggle","clientData","shortHelpString","longHelpString", NULL };
char _ptemp[128];
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO|OiOOO:wxToolBarBase_AddTool",_kwnames,&_argo0,&_arg1,&_argo2,&_argo3,&_arg4,&_obj5,&_obj6,&_obj7))
@@ -1496,13 +1505,7 @@ static PyObject *_wrap_wxToolBarBase_AddTool(PyObject *self, PyObject *args, PyO
_result = (wxToolBarToolBase *)wxToolBarBase_AddTool(_arg0,_arg1,*_arg2,*_arg3,_arg4,_arg5,*_arg6,*_arg7);
wxPy_END_ALLOW_THREADS;
} if (_result) {
SWIG_MakePtr(_ptemp, (char *) _result,"_wxToolBarToolBase_p");
_resultobj = Py_BuildValue("s",_ptemp);
} else {
Py_INCREF(Py_None);
_resultobj = Py_None;
}
}{ _resultobj = wxPyMake_wxObject(_result); }
{
if (_obj6)
delete _arg6;
@@ -1532,7 +1535,6 @@ static PyObject *_wrap_wxToolBarBase_AddSimpleTool(PyObject *self, PyObject *arg
PyObject * _obj3 = 0;
PyObject * _obj4 = 0;
char *_kwnames[] = { "self","id","bitmap","shortHelpString","longHelpString","isToggle", NULL };
char _ptemp[128];
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO|OOi:wxToolBarBase_AddSimpleTool",_kwnames,&_argo0,&_arg1,&_argo2,&_obj3,&_obj4,&_arg5))
@@ -1594,13 +1596,7 @@ static PyObject *_wrap_wxToolBarBase_AddSimpleTool(PyObject *self, PyObject *arg
_result = (wxToolBarToolBase *)wxToolBarBase_AddSimpleTool(_arg0,_arg1,*_arg2,*_arg3,*_arg4,_arg5);
wxPy_END_ALLOW_THREADS;
} if (_result) {
SWIG_MakePtr(_ptemp, (char *) _result,"_wxToolBarToolBase_p");
_resultobj = Py_BuildValue("s",_ptemp);
} else {
Py_INCREF(Py_None);
_resultobj = Py_None;
}
}{ _resultobj = wxPyMake_wxObject(_result); }
{
if (_obj3)
delete _arg3;
@@ -1638,7 +1634,6 @@ static PyObject *_wrap_wxToolBarBase_InsertTool(PyObject *self, PyObject *args,
PyObject * _obj7 = 0;
PyObject * _obj8 = 0;
char *_kwnames[] = { "self","pos","id","bitmap","pushedBitmap","isToggle","clientData","shortHelpString","longHelpString", NULL };
char _ptemp[128];
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiiO|OiOOO:wxToolBarBase_InsertTool",_kwnames,&_argo0,&_arg1,&_arg2,&_argo3,&_argo4,&_arg5,&_obj6,&_obj7,&_obj8))
@@ -1711,13 +1706,7 @@ static PyObject *_wrap_wxToolBarBase_InsertTool(PyObject *self, PyObject *args,
_result = (wxToolBarToolBase *)wxToolBarBase_InsertTool(_arg0,_arg1,_arg2,*_arg3,*_arg4,_arg5,_arg6,*_arg7,*_arg8);
wxPy_END_ALLOW_THREADS;
} if (_result) {
SWIG_MakePtr(_ptemp, (char *) _result,"_wxToolBarToolBase_p");
_resultobj = Py_BuildValue("s",_ptemp);
} else {
Py_INCREF(Py_None);
_resultobj = Py_None;
}
}{ _resultobj = wxPyMake_wxObject(_result); }
{
if (_obj7)
delete _arg7;
@@ -1748,7 +1737,6 @@ static PyObject *_wrap_wxToolBarBase_InsertSimpleTool(PyObject *self, PyObject *
PyObject * _obj4 = 0;
PyObject * _obj5 = 0;
char *_kwnames[] = { "self","pos","id","bitmap","shortHelpString","longHelpString","isToggle", NULL };
char _ptemp[128];
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiiO|OOi:wxToolBarBase_InsertSimpleTool",_kwnames,&_argo0,&_arg1,&_arg2,&_argo3,&_obj4,&_obj5,&_arg6))
@@ -1810,13 +1798,7 @@ static PyObject *_wrap_wxToolBarBase_InsertSimpleTool(PyObject *self, PyObject *
_result = (wxToolBarToolBase *)wxToolBarBase_InsertSimpleTool(_arg0,_arg1,_arg2,*_arg3,*_arg4,*_arg5,_arg6);
wxPy_END_ALLOW_THREADS;
} if (_result) {
SWIG_MakePtr(_ptemp, (char *) _result,"_wxToolBarToolBase_p");
_resultobj = Py_BuildValue("s",_ptemp);
} else {
Py_INCREF(Py_None);
_resultobj = Py_None;
}
}{ _resultobj = wxPyMake_wxObject(_result); }
{
if (_obj4)
delete _arg4;
@@ -1837,7 +1819,6 @@ static PyObject *_wrap_wxToolBarBase_AddControl(PyObject *self, PyObject *args,
PyObject * _argo0 = 0;
PyObject * _argo1 = 0;
char *_kwnames[] = { "self","control", NULL };
char _ptemp[128];
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxToolBarBase_AddControl",_kwnames,&_argo0,&_argo1))
@@ -1861,13 +1842,7 @@ static PyObject *_wrap_wxToolBarBase_AddControl(PyObject *self, PyObject *args,
_result = (wxToolBarToolBase *)wxToolBarBase_AddControl(_arg0,_arg1);
wxPy_END_ALLOW_THREADS;
} if (_result) {
SWIG_MakePtr(_ptemp, (char *) _result,"_wxToolBarToolBase_p");
_resultobj = Py_BuildValue("s",_ptemp);
} else {
Py_INCREF(Py_None);
_resultobj = Py_None;
}
}{ _resultobj = wxPyMake_wxObject(_result); }
return _resultobj;
}
@@ -1881,7 +1856,6 @@ static PyObject *_wrap_wxToolBarBase_InsertControl(PyObject *self, PyObject *arg
PyObject * _argo0 = 0;
PyObject * _argo2 = 0;
char *_kwnames[] = { "self","pos","control", NULL };
char _ptemp[128];
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO:wxToolBarBase_InsertControl",_kwnames,&_argo0,&_arg1,&_argo2))
@@ -1905,13 +1879,7 @@ static PyObject *_wrap_wxToolBarBase_InsertControl(PyObject *self, PyObject *arg
_result = (wxToolBarToolBase *)wxToolBarBase_InsertControl(_arg0,_arg1,_arg2);
wxPy_END_ALLOW_THREADS;
} if (_result) {
SWIG_MakePtr(_ptemp, (char *) _result,"_wxToolBarToolBase_p");
_resultobj = Py_BuildValue("s",_ptemp);
} else {
Py_INCREF(Py_None);
_resultobj = Py_None;
}
}{ _resultobj = wxPyMake_wxObject(_result); }
return _resultobj;
}
@@ -1922,7 +1890,6 @@ static PyObject *_wrap_wxToolBarBase_AddSeparator(PyObject *self, PyObject *args
wxToolBarBase * _arg0;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self", NULL };
char _ptemp[128];
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxToolBarBase_AddSeparator",_kwnames,&_argo0))
@@ -1939,13 +1906,7 @@ static PyObject *_wrap_wxToolBarBase_AddSeparator(PyObject *self, PyObject *args
_result = (wxToolBarToolBase *)wxToolBarBase_AddSeparator(_arg0);
wxPy_END_ALLOW_THREADS;
} if (_result) {
SWIG_MakePtr(_ptemp, (char *) _result,"_wxToolBarToolBase_p");
_resultobj = Py_BuildValue("s",_ptemp);
} else {
Py_INCREF(Py_None);
_resultobj = Py_None;
}
}{ _resultobj = wxPyMake_wxObject(_result); }
return _resultobj;
}
@@ -1957,7 +1918,6 @@ static PyObject *_wrap_wxToolBarBase_InsertSeparator(PyObject *self, PyObject *a
size_t _arg1;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self","pos", NULL };
char _ptemp[128];
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxToolBarBase_InsertSeparator",_kwnames,&_argo0,&_arg1))
@@ -1974,13 +1934,7 @@ static PyObject *_wrap_wxToolBarBase_InsertSeparator(PyObject *self, PyObject *a
_result = (wxToolBarToolBase *)wxToolBarBase_InsertSeparator(_arg0,_arg1);
wxPy_END_ALLOW_THREADS;
} if (_result) {
SWIG_MakePtr(_ptemp, (char *) _result,"_wxToolBarToolBase_p");
_resultobj = Py_BuildValue("s",_ptemp);
} else {
Py_INCREF(Py_None);
_resultobj = Py_None;
}
}{ _resultobj = wxPyMake_wxObject(_result); }
return _resultobj;
}
@@ -1992,7 +1946,6 @@ static PyObject *_wrap_wxToolBarBase_RemoveTool(PyObject *self, PyObject *args,
int _arg1;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self","id", NULL };
char _ptemp[128];
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxToolBarBase_RemoveTool",_kwnames,&_argo0,&_arg1))
@@ -2009,13 +1962,7 @@ static PyObject *_wrap_wxToolBarBase_RemoveTool(PyObject *self, PyObject *args,
_result = (wxToolBarToolBase *)wxToolBarBase_RemoveTool(_arg0,_arg1);
wxPy_END_ALLOW_THREADS;
} if (_result) {
SWIG_MakePtr(_ptemp, (char *) _result,"_wxToolBarToolBase_p");
_resultobj = Py_BuildValue("s",_ptemp);
} else {
Py_INCREF(Py_None);
_resultobj = Py_None;
}
}{ _resultobj = wxPyMake_wxObject(_result); }
return _resultobj;
}
@@ -2990,6 +2937,14 @@ static void *SwigwxToolBarTowxEvtHandler(void *ptr) {
return (void *) dest;
}
static void *SwigwxToolBarTowxObject(void *ptr) {
wxToolBar *src;
wxObject *dest;
src = (wxToolBar *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
#define new_wxToolBar(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5) (new wxToolBar(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5))
static PyObject *_wrap_new_wxToolBar(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -3054,7 +3009,6 @@ static PyObject *_wrap_wxToolBar_FindToolForPosition(PyObject *self, PyObject *a
wxCoord _arg2;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self","x","y", NULL };
char _ptemp[128];
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii:wxToolBar_FindToolForPosition",_kwnames,&_argo0,&_arg1,&_arg2))
@@ -3071,13 +3025,7 @@ static PyObject *_wrap_wxToolBar_FindToolForPosition(PyObject *self, PyObject *a
_result = (wxToolBarToolBase *)wxToolBar_FindToolForPosition(_arg0,_arg1,_arg2);
wxPy_END_ALLOW_THREADS;
} if (_result) {
SWIG_MakePtr(_ptemp, (char *) _result,"_wxToolBarToolBase_p");
_resultobj = Py_BuildValue("s",_ptemp);
} else {
Py_INCREF(Py_None);
_resultobj = Py_None;
}
}{ _resultobj = wxPyMake_wxObject(_result); }
return _resultobj;
}
@@ -3113,6 +3061,14 @@ static void *SwigwxToolBarSimpleTowxEvtHandler(void *ptr) {
return (void *) dest;
}
static void *SwigwxToolBarSimpleTowxObject(void *ptr) {
wxToolBarSimple *src;
wxObject *dest;
src = (wxToolBarSimple *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
#define new_wxToolBarSimple(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5) (new wxToolBarSimple(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5))
static PyObject *_wrap_new_wxToolBarSimple(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -3177,7 +3133,6 @@ static PyObject *_wrap_wxToolBarSimple_FindToolForPosition(PyObject *self, PyObj
wxCoord _arg2;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self","x","y", NULL };
char _ptemp[128];
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii:wxToolBarSimple_FindToolForPosition",_kwnames,&_argo0,&_arg1,&_arg2))
@@ -3194,13 +3149,7 @@ static PyObject *_wrap_wxToolBarSimple_FindToolForPosition(PyObject *self, PyObj
_result = (wxToolBarToolBase *)wxToolBarSimple_FindToolForPosition(_arg0,_arg1,_arg2);
wxPy_END_ALLOW_THREADS;
} if (_result) {
SWIG_MakePtr(_ptemp, (char *) _result,"_wxToolBarToolBase_p");
_resultobj = Py_BuildValue("s",_ptemp);
} else {
Py_INCREF(Py_None);
_resultobj = Py_None;
}
}{ _resultobj = wxPyMake_wxObject(_result); }
return _resultobj;
}
@@ -3354,8 +3303,20 @@ 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_wxObject","_class_wxToolBarSimple",SwigwxToolBarSimpleTowxObject},
{ "_class_wxObject","_wxToolBarSimple",SwigwxToolBarSimpleTowxObject},
{ "_class_wxObject","_class_wxToolBar",SwigwxToolBarTowxObject},
{ "_class_wxObject","_wxToolBar",SwigwxToolBarTowxObject},
{ "_class_wxObject","_class_wxToolBarBase",SwigwxToolBarBaseTowxObject},
{ "_class_wxObject","_wxToolBarBase",SwigwxToolBarBaseTowxObject},
{ "_class_wxObject","_class_wxToolBarToolBase",SwigwxToolBarToolBaseTowxObject},
{ "_class_wxObject","_wxToolBarToolBase",SwigwxToolBarToolBaseTowxObject},
{ "_class_wxObject","_class_wxStatusBar",SwigwxStatusBarTowxObject},
{ "_class_wxObject","_wxStatusBar",SwigwxStatusBarTowxObject},
{ "_class_wxObject","_wxObject",0},
{ "_wxSpinEvent","_class_wxSpinEvent",0},
{ "_size_t","_wxCoord",0},
{ "_size_t","_wxPrintQuality",0},
@@ -3502,6 +3463,17 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_class_wxPyBitmapDataObject","_wxPyBitmapDataObject",0},
{ "_wxClientDC","_class_wxClientDC",0},
{ "_wxMouseEvent","_class_wxMouseEvent",0},
{ "_wxObject","_class_wxToolBarSimple",SwigwxToolBarSimpleTowxObject},
{ "_wxObject","_wxToolBarSimple",SwigwxToolBarSimpleTowxObject},
{ "_wxObject","_class_wxToolBar",SwigwxToolBarTowxObject},
{ "_wxObject","_wxToolBar",SwigwxToolBarTowxObject},
{ "_wxObject","_class_wxToolBarBase",SwigwxToolBarBaseTowxObject},
{ "_wxObject","_wxToolBarBase",SwigwxToolBarBaseTowxObject},
{ "_wxObject","_class_wxToolBarToolBase",SwigwxToolBarToolBaseTowxObject},
{ "_wxObject","_wxToolBarToolBase",SwigwxToolBarToolBaseTowxObject},
{ "_wxObject","_class_wxStatusBar",SwigwxStatusBarTowxObject},
{ "_wxObject","_wxStatusBar",SwigwxStatusBarTowxObject},
{ "_wxObject","_class_wxObject",0},
{ "_class_wxPoint","_wxPoint",0},
{ "_wxRealPoint","_class_wxRealPoint",0},
{ "_class_wxRadioBox","_wxRadioBox",0},
@@ -3561,6 +3533,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},
wxPython/src/gtk/stattool.py
+1 -14
View File
@@ -56,7 +56,7 @@ class wxStatusBar(wxStatusBarPtr):
class wxToolBarToolBasePtr :
class wxToolBarToolBasePtr(wxObjectPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
@@ -68,11 +68,9 @@ class wxToolBarToolBasePtr :
return val
def GetControl(self, *_args, **_kwargs):
val = apply(stattoolc.wxToolBarToolBase_GetControl,(self,) + _args, _kwargs)
if val: val = wxControlPtr(val)
return val
def GetToolBar(self, *_args, **_kwargs):
val = apply(stattoolc.wxToolBarToolBase_GetToolBar,(self,) + _args, _kwargs)
if val: val = wxToolBarBasePtr(val)
return val
def IsButton(self, *_args, **_kwargs):
val = apply(stattoolc.wxToolBarToolBase_IsButton,(self,) + _args, _kwargs)
@@ -161,39 +159,30 @@ class wxToolBarBasePtr(wxControlPtr):
self.thisown = 0
def AddTool(self, *_args, **_kwargs):
val = apply(stattoolc.wxToolBarBase_AddTool,(self,) + _args, _kwargs)
if val: val = wxToolBarToolBasePtr(val)
return val
def AddSimpleTool(self, *_args, **_kwargs):
val = apply(stattoolc.wxToolBarBase_AddSimpleTool,(self,) + _args, _kwargs)
if val: val = wxToolBarToolBasePtr(val)
return val
def InsertTool(self, *_args, **_kwargs):
val = apply(stattoolc.wxToolBarBase_InsertTool,(self,) + _args, _kwargs)
if val: val = wxToolBarToolBasePtr(val)
return val
def InsertSimpleTool(self, *_args, **_kwargs):
val = apply(stattoolc.wxToolBarBase_InsertSimpleTool,(self,) + _args, _kwargs)
if val: val = wxToolBarToolBasePtr(val)
return val
def AddControl(self, *_args, **_kwargs):
val = apply(stattoolc.wxToolBarBase_AddControl,(self,) + _args, _kwargs)
if val: val = wxToolBarToolBasePtr(val)
return val
def InsertControl(self, *_args, **_kwargs):
val = apply(stattoolc.wxToolBarBase_InsertControl,(self,) + _args, _kwargs)
if val: val = wxToolBarToolBasePtr(val)
return val
def AddSeparator(self, *_args, **_kwargs):
val = apply(stattoolc.wxToolBarBase_AddSeparator,(self,) + _args, _kwargs)
if val: val = wxToolBarToolBasePtr(val)
return val
def InsertSeparator(self, *_args, **_kwargs):
val = apply(stattoolc.wxToolBarBase_InsertSeparator,(self,) + _args, _kwargs)
if val: val = wxToolBarToolBasePtr(val)
return val
def RemoveTool(self, *_args, **_kwargs):
val = apply(stattoolc.wxToolBarBase_RemoveTool,(self,) + _args, _kwargs)
if val: val = wxToolBarToolBasePtr(val)
return val
def DeleteToolByPos(self, *_args, **_kwargs):
val = apply(stattoolc.wxToolBarBase_DeleteToolByPos,(self,) + _args, _kwargs)
@@ -304,7 +293,6 @@ class wxToolBarPtr(wxToolBarBasePtr):
self.thisown = 0
def FindToolForPosition(self, *_args, **_kwargs):
val = apply(stattoolc.wxToolBar_FindToolForPosition,(self,) + _args, _kwargs)
if val: val = wxToolBarToolBasePtr(val)
return val
def __repr__(self):
return "<C wxToolBar instance at %s>" % (self.this,)
@@ -323,7 +311,6 @@ class wxToolBarSimplePtr(wxToolBarBasePtr):
self.thisown = 0
def FindToolForPosition(self, *_args, **_kwargs):
val = apply(stattoolc.wxToolBarSimple_FindToolForPosition,(self,) + _args, _kwargs)
if val: val = wxToolBarToolBasePtr(val)
return val
def __repr__(self):
return "<C wxToolBarSimple instance at %s>" % (self.this,)
wxPython/src/gtk/streams.cpp
+7 -6
View File
@@ -432,6 +432,7 @@ static PyObject *_wrap_new_wxInputStream(PyObject *self, PyObject *args, PyObjec
PyObject * _arg0;
PyObject * _obj0 = 0;
char *_kwnames[] = { "p", NULL };
char _ptemp[128];
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:new_wxInputStream",_kwnames,&_obj0))
@@ -442,15 +443,13 @@ static PyObject *_wrap_new_wxInputStream(PyObject *self, PyObject *args, PyObjec
{
_result = (wxPyInputStream *)new_wxPyInputStream(_arg0);
}{
char _ptemp[128];
if (_result) {
} if (_result) {
SWIG_MakePtr(_ptemp, (char *) _result,"_wxPyInputStream_p");
_resultobj = Py_BuildValue("s",_ptemp);
} else {
Py_INCREF(Py_None);
_resultobj = Py_None;
}
else
_resultobj=0;
}
return _resultobj;
}
@@ -865,6 +864,8 @@ SWIGEXPORT(void) initstreamsc() {
SWIG_globals = SWIG_newvarlink();
m = Py_InitModule("streamsc", streamscMethods);
d = PyModule_GetDict(m);
wxPyPtrTypeMap_Add("wxInputStream", "wxPyInputStream");
{
int i;
for (i = 0; _swig_mapping[i].n1; i++)
wxPython/src/gtk/windows.cpp
+193 -345
View File
File diff suppressed because it is too large Load Diff
wxPython/src/gtk/windows.py
+8 -76
View File
@@ -20,7 +20,7 @@ def wxDLG_SZE(win, size_width, height=None):
else:
return win.ConvertDialogSizeToPixels(wxSize(size_width, height))
class wxEvtHandlerPtr :
class wxEvtHandlerPtr(wxObjectPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
@@ -38,11 +38,9 @@ class wxEvtHandlerPtr :
return val
def GetNextHandler(self, *_args, **_kwargs):
val = apply(windowsc.wxEvtHandler_GetNextHandler,(self,) + _args, _kwargs)
if val: val = wxEvtHandlerPtr(val)
return val
def GetPreviousHandler(self, *_args, **_kwargs):
val = apply(windowsc.wxEvtHandler_GetPreviousHandler,(self,) + _args, _kwargs)
if val: val = wxEvtHandlerPtr(val)
return val
def SetNextHandler(self, *_args, **_kwargs):
val = apply(windowsc.wxEvtHandler_SetNextHandler,(self,) + _args, _kwargs)
@@ -56,9 +54,6 @@ class wxEvtHandlerPtr :
def Disconnect(self, *_args, **_kwargs):
val = apply(windowsc.wxEvtHandler_Disconnect,(self,) + _args, _kwargs)
return val
def GetClassName(self, *_args, **_kwargs):
val = apply(windowsc.wxEvtHandler_GetClassName,(self,) + _args, _kwargs)
return val
def __repr__(self):
return "<C wxEvtHandler instance at %s>" % (self.this,)
class wxEvtHandler(wxEvtHandlerPtr):
@@ -75,11 +70,9 @@ class wxValidatorPtr(wxEvtHandlerPtr):
self.thisown = 0
def Clone(self, *_args, **_kwargs):
val = apply(windowsc.wxValidator_Clone,(self,) + _args, _kwargs)
if val: val = wxValidatorPtr(val)
return val
def GetWindow(self, *_args, **_kwargs):
val = apply(windowsc.wxValidator_GetWindow,(self,) + _args, _kwargs)
if val: val = wxWindowPtr(val)
return val
def SetWindow(self, *_args, **_kwargs):
val = apply(windowsc.wxValidator_SetWindow,(self,) + _args, _kwargs)
@@ -98,9 +91,6 @@ class wxPyValidatorPtr(wxValidatorPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
def Destroy(self, *_args, **_kwargs):
val = apply(windowsc.wxPyValidator_Destroy,(self,) + _args, _kwargs)
return val
def _setSelf(self, *_args, **_kwargs):
val = apply(windowsc.wxPyValidator__setSelf,(self,) + _args, _kwargs)
return val
@@ -110,7 +100,7 @@ class wxPyValidator(wxPyValidatorPtr):
def __init__(self,*_args,**_kwargs):
self.this = apply(windowsc.new_wxPyValidator,_args,_kwargs)
self.thisown = 1
self._setSelf(self, wxPyValidator, 0)
self._setSelf(self, wxPyValidator, 1)
@@ -161,11 +151,9 @@ class wxWindowPtr(wxEvtHandlerPtr):
return val
def FindWindowById(self, *_args, **_kwargs):
val = apply(windowsc.wxWindow_FindWindowById,(self,) + _args, _kwargs)
if val: val = wxWindowPtr(val)
return val
def FindWindowByName(self, *_args, **_kwargs):
val = apply(windowsc.wxWindow_FindWindowByName,(self,) + _args, _kwargs)
if val: val = wxWindowPtr(val)
return val
def Fit(self, *_args, **_kwargs):
val = apply(windowsc.wxWindow_Fit,(self,) + _args, _kwargs)
@@ -196,7 +184,6 @@ class wxWindowPtr(wxEvtHandlerPtr):
return val
def GetEventHandler(self, *_args, **_kwargs):
val = apply(windowsc.wxWindow_GetEventHandler,(self,) + _args, _kwargs)
if val: val = wxEvtHandlerPtr(val)
return val
def GetFont(self, *_args, **_kwargs):
val = apply(windowsc.wxWindow_GetFont,(self,) + _args, _kwargs)
@@ -208,7 +195,6 @@ class wxWindowPtr(wxEvtHandlerPtr):
return val
def GetGrandParent(self, *_args, **_kwargs):
val = apply(windowsc.wxWindow_GetGrandParent,(self,) + _args, _kwargs)
if val: val = wxWindowPtr(val)
return val
def GetHandle(self, *_args, **_kwargs):
val = apply(windowsc.wxWindow_GetHandle,(self,) + _args, _kwargs)
@@ -227,7 +213,6 @@ class wxWindowPtr(wxEvtHandlerPtr):
return val
def GetParent(self, *_args, **_kwargs):
val = apply(windowsc.wxWindow_GetParent,(self,) + _args, _kwargs)
if val: val = wxWindowPtr(val)
return val
def GetPositionTuple(self, *_args, **_kwargs):
val = apply(windowsc.wxWindow_GetPositionTuple,(self,) + _args, _kwargs)
@@ -325,7 +310,6 @@ class wxWindowPtr(wxEvtHandlerPtr):
return val
def PopEventHandler(self, *_args, **_kwargs):
val = apply(windowsc.wxWindow_PopEventHandler,(self,) + _args, _kwargs)
if val: val = wxEvtHandlerPtr(val)
return val
def PushEventHandler(self, *_args, **_kwargs):
val = apply(windowsc.wxWindow_PushEventHandler,(self,) + _args, _kwargs)
@@ -483,18 +467,15 @@ class wxWindowPtr(wxEvtHandlerPtr):
return val
def GetToolTip(self, *_args, **_kwargs):
val = apply(windowsc.wxWindow_GetToolTip,(self,) + _args, _kwargs)
if val: val = wxToolTipPtr(val)
return val
def SetSizer(self, *_args, **_kwargs):
val = apply(windowsc.wxWindow_SetSizer,(self,) + _args, _kwargs)
return val
def GetSizer(self, *_args, **_kwargs):
val = apply(windowsc.wxWindow_GetSizer,(self,) + _args, _kwargs)
if val: val = wxSizerPtr(val)
return val
def GetValidator(self, *_args, **_kwargs):
val = apply(windowsc.wxWindow_GetValidator,(self,) + _args, _kwargs)
if val: val = wxValidatorPtr(val)
return val
def SetValidator(self, *_args, **_kwargs):
val = apply(windowsc.wxWindow_SetValidator,(self,) + _args, _kwargs)
@@ -520,24 +501,12 @@ class wxWindowPtr(wxEvtHandlerPtr):
return val
def __repr__(self):
return "<C wxWindow instance at %s>" % (self.this,)
# replaces broken shadow methods
# replaces broken shadow method
def GetCaret(self, *_args, **_kwargs):
from misc2 import wxCaretPtr
val = apply(windowsc.wxWindow_GetCaret,(self,) + _args, _kwargs)
if val: val = wxCaretPtr(val)
return val
def GetSizer(self, *_args, **_kwargs):
from sizers import wxSizerPtr
val = apply(windowsc.wxWindow_GetSizer,(self,) + _args, _kwargs)
if val: val = wxSizerPtr(val)
return val
def GetToolTip(self, *_args, **_kwargs):
from misc2 import wxToolTipPtr
val = apply(windowsc.wxWindow_GetToolTip,(self,) + _args, _kwargs)
if val: val = wxToolTipPtr(val)
return val
class wxWindow(wxWindowPtr):
def __init__(self,*_args,**_kwargs):
@@ -557,20 +526,12 @@ class wxPanelPtr(wxWindowPtr):
return val
def GetDefaultItem(self, *_args, **_kwargs):
val = apply(windowsc.wxPanel_GetDefaultItem,(self,) + _args, _kwargs)
if val: val = wxButtonPtr(val)
return val
def SetDefaultItem(self, *_args, **_kwargs):
val = apply(windowsc.wxPanel_SetDefaultItem,(self,) + _args, _kwargs)
return val
def __repr__(self):
return "<C wxPanel instance at %s>" % (self.this,)
def GetDefaultItem(self):
import controls
val = windowsc.wxPanel_GetDefaultItem(self.this)
val = controls.wxButtonPtr(val)
return val
class wxPanel(wxPanelPtr):
def __init__(self,*_args,**_kwargs):
self.this = apply(windowsc.new_wxPanel,_args,_kwargs)
@@ -622,27 +583,12 @@ class wxDialogPtr(wxPanelPtr):
return val
def CreateTextSizer(self, *_args, **_kwargs):
val = apply(windowsc.wxDialog_CreateTextSizer,(self,) + _args, _kwargs)
if val: val = wxSizerPtr(val)
return val
def CreateButtonSizer(self, *_args, **_kwargs):
val = apply(windowsc.wxDialog_CreateButtonSizer,(self,) + _args, _kwargs)
if val: val = wxSizerPtr(val)
return val
def __repr__(self):
return "<C wxDialog instance at %s>" % (self.this,)
# replace swig generated shadow methods to resolve import issues
def CreateTextSizer(self, *_args, **_kwargs):
import sizers
val = apply(windowsc.wxDialog_CreateTextSizer,(self,) + _args, _kwargs)
if val: val = sizers.wxSizerPtr(val)
return val
def CreateButtonSizer(self, *_args, **_kwargs):
import sizers
val = apply(windowsc.wxDialog_CreateButtonSizer,(self,) + _args, _kwargs)
if val: val = sizers.wxSizerPtr(val)
return val
class wxDialog(wxDialogPtr):
def __init__(self,*_args,**_kwargs):
self.this = apply(windowsc.new_wxDialog,_args,_kwargs)
@@ -667,7 +613,6 @@ class wxScrolledWindowPtr(wxPanelPtr):
return val
def GetTargetWindow(self, *_args, **_kwargs):
val = apply(windowsc.wxScrolledWindow_GetTargetWindow,(self,) + _args, _kwargs)
if val: val = wxWindowPtr(val)
return val
def GetVirtualSize(self, *_args, **_kwargs):
val = apply(windowsc.wxScrolledWindow_GetVirtualSize,(self,) + _args, _kwargs)
@@ -762,7 +707,6 @@ class wxMenuPtr(wxEvtHandlerPtr):
return val
def FindItemById(self, *_args, **_kwargs):
val = apply(windowsc.wxMenu_FindItemById,(self,) + _args, _kwargs)
if val: val = wxMenuItemPtr(val)
return val
def GetTitle(self, *_args, **_kwargs):
val = apply(windowsc.wxMenu_GetTitle,(self,) + _args, _kwargs)
@@ -796,11 +740,9 @@ class wxMenuPtr(wxEvtHandlerPtr):
return val
def Remove(self, *_args, **_kwargs):
val = apply(windowsc.wxMenu_Remove,(self,) + _args, _kwargs)
if val: val = wxMenuItemPtr(val)
return val
def RemoveItem(self, *_args, **_kwargs):
val = apply(windowsc.wxMenu_RemoveItem,(self,) + _args, _kwargs)
if val: val = wxMenuItemPtr(val)
return val
def Destroy(self, *_args, **_kwargs):
val = apply(windowsc.wxMenu_Destroy,(self,) + _args, _kwargs)
@@ -822,14 +764,12 @@ class wxMenuPtr(wxEvtHandlerPtr):
return val
def GetEventHandler(self, *_args, **_kwargs):
val = apply(windowsc.wxMenu_GetEventHandler,(self,) + _args, _kwargs)
if val: val = wxEvtHandlerPtr(val)
return val
def SetInvokingWindow(self, *_args, **_kwargs):
val = apply(windowsc.wxMenu_SetInvokingWindow,(self,) + _args, _kwargs)
return val
def GetInvokingWindow(self, *_args, **_kwargs):
val = apply(windowsc.wxMenu_GetInvokingWindow,(self,) + _args, _kwargs)
if val: val = wxWindowPtr(val)
return val
def GetStyle(self, *_args, **_kwargs):
val = apply(windowsc.wxMenu_GetStyle,(self,) + _args, _kwargs)
@@ -842,7 +782,6 @@ class wxMenuPtr(wxEvtHandlerPtr):
return val
def GetParent(self, *_args, **_kwargs):
val = apply(windowsc.wxMenu_GetParent,(self,) + _args, _kwargs)
if val: val = wxMenuPtr(val)
return val
def __repr__(self):
return "<C wxMenu instance at %s>" % (self.this,)
@@ -869,15 +808,12 @@ class wxMenuBarPtr(wxWindowPtr):
return val
def GetMenu(self, *_args, **_kwargs):
val = apply(windowsc.wxMenuBar_GetMenu,(self,) + _args, _kwargs)
if val: val = wxMenuPtr(val)
return val
def Replace(self, *_args, **_kwargs):
val = apply(windowsc.wxMenuBar_Replace,(self,) + _args, _kwargs)
if val: val = wxMenuPtr(val)
return val
def Remove(self, *_args, **_kwargs):
val = apply(windowsc.wxMenuBar_Remove,(self,) + _args, _kwargs)
if val: val = wxMenuPtr(val)
return val
def EnableTop(self, *_args, **_kwargs):
val = apply(windowsc.wxMenuBar_EnableTop,(self,) + _args, _kwargs)
@@ -893,7 +829,6 @@ class wxMenuBarPtr(wxWindowPtr):
return val
def FindItemById(self, *_args, **_kwargs):
val = apply(windowsc.wxMenuBar_FindItemById,(self,) + _args, _kwargs)
if val: val = wxMenuItemPtr(val)
return val
def Enable(self, *_args, **_kwargs):
val = apply(windowsc.wxMenuBar_Enable,(self,) + _args, _kwargs)
@@ -929,13 +864,12 @@ class wxMenuBar(wxMenuBarPtr):
class wxMenuItemPtr :
class wxMenuItemPtr(wxObjectPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
def GetMenu(self, *_args, **_kwargs):
val = apply(windowsc.wxMenuItem_GetMenu,(self,) + _args, _kwargs)
if val: val = wxMenuPtr(val)
return val
def SetId(self, *_args, **_kwargs):
val = apply(windowsc.wxMenuItem_SetId,(self,) + _args, _kwargs)
@@ -969,7 +903,6 @@ class wxMenuItemPtr :
return val
def GetSubMenu(self, *_args, **_kwargs):
val = apply(windowsc.wxMenuItem_GetSubMenu,(self,) + _args, _kwargs)
if val: val = wxMenuPtr(val)
return val
def Enable(self, *_args, **_kwargs):
val = apply(windowsc.wxMenuItem_Enable,(self,) + _args, _kwargs)
@@ -1013,13 +946,8 @@ class wxMenuItem(wxMenuItemPtr):
#-------------- FUNCTION WRAPPERS ------------------
wxValidator_IsSilent = windowsc.wxValidator_IsSilent
wxValidator_SetBellOnError = windowsc.wxValidator_SetBellOnError
def wxWindow_FindFocus(*_args, **_kwargs):
val = apply(windowsc.wxWindow_FindFocus,_args,_kwargs)
if val: val = wxWindowPtr(val)
return val
wxWindow_NewControlId = windowsc.wxWindow_NewControlId
@@ -1028,6 +956,10 @@ wxWindow_NextControlId = windowsc.wxWindow_NextControlId
wxWindow_PrevControlId = windowsc.wxWindow_PrevControlId
wxValidator_IsSilent = windowsc.wxValidator_IsSilent
wxValidator_SetBellOnError = windowsc.wxValidator_SetBellOnError
wxMenuItem_GetLabelFromText = windowsc.wxMenuItem_GetLabelFromText
wxPython/src/gtk/windows2.cpp
+58 -40
View File
@@ -61,6 +61,7 @@ extern PyObject *SWIG_newvarlink(void);
#endif
#include <wx/notebook.h>
#include <wx/splitter.h>
#include <wx/imaglist.h>
#ifdef __WXMSW__
#include <wx/msw/taskbar.h>
#endif
@@ -143,6 +144,14 @@ static void *SwigwxNotebookEventTowxEvent(void *ptr) {
return (void *) dest;
}
static void *SwigwxNotebookEventTowxObject(void *ptr) {
wxNotebookEvent *src;
wxObject *dest;
src = (wxNotebookEvent *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
#define wxNotebookEvent_GetSelection(_swigobj) (_swigobj->GetSelection())
static PyObject *_wrap_wxNotebookEvent_GetSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -277,6 +286,14 @@ static void *SwigwxNotebookTowxEvtHandler(void *ptr) {
return (void *) dest;
}
static void *SwigwxNotebookTowxObject(void *ptr) {
wxNotebook *src;
wxObject *dest;
src = (wxNotebook *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
#define new_wxNotebook(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5) (new wxNotebook(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5))
static PyObject *_wrap_new_wxNotebook(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -572,7 +589,6 @@ static PyObject *_wrap_wxNotebook_GetImageList(PyObject *self, PyObject *args, P
wxNotebook * _arg0;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self", NULL };
char _ptemp[128];
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxNotebook_GetImageList",_kwnames,&_argo0))
@@ -589,13 +605,7 @@ static PyObject *_wrap_wxNotebook_GetImageList(PyObject *self, PyObject *args, P
_result = (wxImageList *)wxNotebook_GetImageList(_arg0);
wxPy_END_ALLOW_THREADS;
} if (_result) {
SWIG_MakePtr(_ptemp, (char *) _result,"_wxImageList_p");
_resultobj = Py_BuildValue("s",_ptemp);
} else {
Py_INCREF(Py_None);
_resultobj = Py_None;
}
}{ _resultobj = wxPyMake_wxObject(_result); }
return _resultobj;
}
@@ -971,7 +981,6 @@ static PyObject *_wrap_wxNotebook_GetPage(PyObject *self, PyObject *args, PyObje
int _arg1;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self","nPage", NULL };
char _ptemp[128];
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxNotebook_GetPage",_kwnames,&_argo0,&_arg1))
@@ -988,13 +997,7 @@ static PyObject *_wrap_wxNotebook_GetPage(PyObject *self, PyObject *args, PyObje
_result = (wxWindow *)wxNotebook_GetPage(_arg0,_arg1);
wxPy_END_ALLOW_THREADS;
} if (_result) {
SWIG_MakePtr(_ptemp, (char *) _result,"_wxWindow_p");
_resultobj = Py_BuildValue("s",_ptemp);
} else {
Py_INCREF(Py_None);
_resultobj = Py_None;
}
}{ _resultobj = wxPyMake_wxObject(_result); }
return _resultobj;
}
@@ -1044,6 +1047,14 @@ static void *SwigwxSplitterEventTowxEvent(void *ptr) {
return (void *) dest;
}
static void *SwigwxSplitterEventTowxObject(void *ptr) {
wxSplitterEvent *src;
wxObject *dest;
src = (wxSplitterEvent *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
#define wxSplitterEvent_GetSashPosition(_swigobj) (_swigobj->GetSashPosition())
static PyObject *_wrap_wxSplitterEvent_GetSashPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -1132,7 +1143,6 @@ static PyObject *_wrap_wxSplitterEvent_GetWindowBeingRemoved(PyObject *self, PyO
wxSplitterEvent * _arg0;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self", NULL };
char _ptemp[128];
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSplitterEvent_GetWindowBeingRemoved",_kwnames,&_argo0))
@@ -1149,13 +1159,7 @@ static PyObject *_wrap_wxSplitterEvent_GetWindowBeingRemoved(PyObject *self, PyO
_result = (wxWindow *)wxSplitterEvent_GetWindowBeingRemoved(_arg0);
wxPy_END_ALLOW_THREADS;
} if (_result) {
SWIG_MakePtr(_ptemp, (char *) _result,"_wxWindow_p");
_resultobj = Py_BuildValue("s",_ptemp);
} else {
Py_INCREF(Py_None);
_resultobj = Py_None;
}
}{ _resultobj = wxPyMake_wxObject(_result); }
return _resultobj;
}
@@ -1203,6 +1207,14 @@ static void *SwigwxSplitterWindowTowxEvtHandler(void *ptr) {
return (void *) dest;
}
static void *SwigwxSplitterWindowTowxObject(void *ptr) {
wxSplitterWindow *src;
wxObject *dest;
src = (wxSplitterWindow *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
#define new_wxSplitterWindow(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5) (new wxSplitterWindow(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5))
static PyObject *_wrap_new_wxSplitterWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -1400,7 +1412,6 @@ static PyObject *_wrap_wxSplitterWindow_GetWindow1(PyObject *self, PyObject *arg
wxSplitterWindow * _arg0;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self", NULL };
char _ptemp[128];
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSplitterWindow_GetWindow1",_kwnames,&_argo0))
@@ -1417,13 +1428,7 @@ static PyObject *_wrap_wxSplitterWindow_GetWindow1(PyObject *self, PyObject *arg
_result = (wxWindow *)wxSplitterWindow_GetWindow1(_arg0);
wxPy_END_ALLOW_THREADS;
} if (_result) {
SWIG_MakePtr(_ptemp, (char *) _result,"_wxWindow_p");
_resultobj = Py_BuildValue("s",_ptemp);
} else {
Py_INCREF(Py_None);
_resultobj = Py_None;
}
}{ _resultobj = wxPyMake_wxObject(_result); }
return _resultobj;
}
@@ -1434,7 +1439,6 @@ static PyObject *_wrap_wxSplitterWindow_GetWindow2(PyObject *self, PyObject *arg
wxSplitterWindow * _arg0;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self", NULL };
char _ptemp[128];
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSplitterWindow_GetWindow2",_kwnames,&_argo0))
@@ -1451,13 +1455,7 @@ static PyObject *_wrap_wxSplitterWindow_GetWindow2(PyObject *self, PyObject *arg
_result = (wxWindow *)wxSplitterWindow_GetWindow2(_arg0);
wxPy_END_ALLOW_THREADS;
} if (_result) {
SWIG_MakePtr(_ptemp, (char *) _result,"_wxWindow_p");
_resultobj = Py_BuildValue("s",_ptemp);
} else {
Py_INCREF(Py_None);
_resultobj = Py_None;
}
}{ _resultobj = wxPyMake_wxObject(_result); }
return _resultobj;
}
@@ -1955,8 +1953,18 @@ 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_wxObject","_class_wxSplitterWindow",SwigwxSplitterWindowTowxObject},
{ "_class_wxObject","_wxSplitterWindow",SwigwxSplitterWindowTowxObject},
{ "_class_wxObject","_class_wxSplitterEvent",SwigwxSplitterEventTowxObject},
{ "_class_wxObject","_wxSplitterEvent",SwigwxSplitterEventTowxObject},
{ "_class_wxObject","_class_wxNotebook",SwigwxNotebookTowxObject},
{ "_class_wxObject","_wxNotebook",SwigwxNotebookTowxObject},
{ "_class_wxObject","_class_wxNotebookEvent",SwigwxNotebookEventTowxObject},
{ "_class_wxObject","_wxNotebookEvent",SwigwxNotebookEventTowxObject},
{ "_class_wxObject","_wxObject",0},
{ "_wxSpinEvent","_class_wxSpinEvent",0},
{ "_size_t","_wxCoord",0},
{ "_size_t","_wxPrintQuality",0},
@@ -2108,6 +2116,15 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_class_wxPyBitmapDataObject","_wxPyBitmapDataObject",0},
{ "_wxClientDC","_class_wxClientDC",0},
{ "_wxMouseEvent","_class_wxMouseEvent",0},
{ "_wxObject","_class_wxSplitterWindow",SwigwxSplitterWindowTowxObject},
{ "_wxObject","_wxSplitterWindow",SwigwxSplitterWindowTowxObject},
{ "_wxObject","_class_wxSplitterEvent",SwigwxSplitterEventTowxObject},
{ "_wxObject","_wxSplitterEvent",SwigwxSplitterEventTowxObject},
{ "_wxObject","_class_wxNotebook",SwigwxNotebookTowxObject},
{ "_wxObject","_wxNotebook",SwigwxNotebookTowxObject},
{ "_wxObject","_class_wxNotebookEvent",SwigwxNotebookEventTowxObject},
{ "_wxObject","_wxNotebookEvent",SwigwxNotebookEventTowxObject},
{ "_wxObject","_class_wxObject",0},
{ "_class_wxPoint","_wxPoint",0},
{ "_wxRealPoint","_class_wxRealPoint",0},
{ "_class_wxRadioBox","_wxRadioBox",0},
@@ -2163,6 +2180,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},
wxPython/src/gtk/windows2.py
-5
View File
@@ -65,7 +65,6 @@ class wxNotebookPtr(wxControlPtr):
return val
def GetImageList(self, *_args, **_kwargs):
val = apply(windows2c.wxNotebook_GetImageList,(self,) + _args, _kwargs)
if val: val = wxImageListPtr(val)
return val
def GetPageImage(self, *_args, **_kwargs):
val = apply(windows2c.wxNotebook_GetPageImage,(self,) + _args, _kwargs)
@@ -99,7 +98,6 @@ class wxNotebookPtr(wxControlPtr):
return val
def GetPage(self, *_args, **_kwargs):
val = apply(windows2c.wxNotebook_GetPage,(self,) + _args, _kwargs)
if val: val = wxWindowPtr(val)
return val
def ResizeChildren(self, *_args, **_kwargs):
val = apply(windows2c.wxNotebook_ResizeChildren,(self,) + _args, _kwargs)
@@ -130,7 +128,6 @@ class wxSplitterEventPtr(wxCommandEventPtr):
return val
def GetWindowBeingRemoved(self, *_args, **_kwargs):
val = apply(windows2c.wxSplitterEvent_GetWindowBeingRemoved,(self,) + _args, _kwargs)
if val: val = wxWindowPtr(val)
return val
def SetSashPosition(self, *_args, **_kwargs):
val = apply(windows2c.wxSplitterEvent_SetSashPosition,(self,) + _args, _kwargs)
@@ -165,11 +162,9 @@ class wxSplitterWindowPtr(wxWindowPtr):
return val
def GetWindow1(self, *_args, **_kwargs):
val = apply(windows2c.wxSplitterWindow_GetWindow1,(self,) + _args, _kwargs)
if val: val = wxWindowPtr(val)
return val
def GetWindow2(self, *_args, **_kwargs):
val = apply(windows2c.wxSplitterWindow_GetWindow2,(self,) + _args, _kwargs)
if val: val = wxWindowPtr(val)
return val
def Initialize(self, *_args, **_kwargs):
val = apply(windows2c.wxSplitterWindow_Initialize,(self,) + _args, _kwargs)
wxPython/src/gtk/windows3.cpp
+76
View File
@@ -129,6 +129,14 @@ static void *SwigwxSashEventTowxEvent(void *ptr) {
return (void *) dest;
}
static void *SwigwxSashEventTowxObject(void *ptr) {
wxSashEvent *src;
wxObject *dest;
src = (wxSashEvent *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
#define wxSashEvent_SetEdge(_swigobj,_swigarg0) (_swigobj->SetEdge(_swigarg0))
static PyObject *_wrap_wxSashEvent_SetEdge(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -319,6 +327,14 @@ static void *SwigwxSashWindowTowxEvtHandler(void *ptr) {
return (void *) dest;
}
static void *SwigwxSashWindowTowxObject(void *ptr) {
wxSashWindow *src;
wxObject *dest;
src = (wxSashWindow *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
#define new_wxSashWindow(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5) (new wxSashWindow(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5))
static PyObject *_wrap_new_wxSashWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -858,6 +874,14 @@ static void *SwigwxQueryLayoutInfoEventTowxEvent(void *ptr) {
return (void *) dest;
}
static void *SwigwxQueryLayoutInfoEventTowxObject(void *ptr) {
wxQueryLayoutInfoEvent *src;
wxObject *dest;
src = (wxQueryLayoutInfoEvent *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
#define wxQueryLayoutInfoEvent_SetRequestedLength(_swigobj,_swigarg0) (_swigobj->SetRequestedLength(_swigarg0))
static PyObject *_wrap_wxQueryLayoutInfoEvent_SetRequestedLength(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -1150,6 +1174,14 @@ static void *SwigwxCalculateLayoutEventTowxEvent(void *ptr) {
return (void *) dest;
}
static void *SwigwxCalculateLayoutEventTowxObject(void *ptr) {
wxCalculateLayoutEvent *src;
wxObject *dest;
src = (wxCalculateLayoutEvent *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
#define wxCalculateLayoutEvent_SetFlags(_swigobj,_swigarg0) (_swigobj->SetFlags(_swigarg0))
static PyObject *_wrap_wxCalculateLayoutEvent_SetFlags(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -1293,6 +1325,14 @@ static void *SwigwxSashLayoutWindowTowxEvtHandler(void *ptr) {
return (void *) dest;
}
static void *SwigwxSashLayoutWindowTowxObject(void *ptr) {
wxSashLayoutWindow *src;
wxObject *dest;
src = (wxSashLayoutWindow *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
#define new_wxSashLayoutWindow(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5) (new wxSashLayoutWindow(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5))
static PyObject *_wrap_new_wxSashLayoutWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -1493,6 +1533,14 @@ static PyObject *_wrap_wxSashLayoutWindow_SetOrientation(PyObject *self, PyObjec
return _resultobj;
}
static void *SwigwxLayoutAlgorithmTowxObject(void *ptr) {
wxLayoutAlgorithm *src;
wxObject *dest;
src = (wxLayoutAlgorithm *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
#define new_wxLayoutAlgorithm() (new wxLayoutAlgorithm())
static PyObject *_wrap_new_wxLayoutAlgorithm(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -1802,8 +1850,22 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_class_wxClipboard","_wxClipboard",0},
{ "_class_wxGauge","_wxGauge",0},
{ "_class_wxSashEvent","_wxSashEvent",0},
{ "_wxGDIObject","_class_wxGDIObject",0},
{ "_wxDC","_class_wxDC",0},
{ "_class_wxBitmapDataObject","_wxBitmapDataObject",0},
{ "_class_wxObject","_class_wxLayoutAlgorithm",SwigwxLayoutAlgorithmTowxObject},
{ "_class_wxObject","_wxLayoutAlgorithm",SwigwxLayoutAlgorithmTowxObject},
{ "_class_wxObject","_class_wxSashLayoutWindow",SwigwxSashLayoutWindowTowxObject},
{ "_class_wxObject","_wxSashLayoutWindow",SwigwxSashLayoutWindowTowxObject},
{ "_class_wxObject","_class_wxCalculateLayoutEvent",SwigwxCalculateLayoutEventTowxObject},
{ "_class_wxObject","_wxCalculateLayoutEvent",SwigwxCalculateLayoutEventTowxObject},
{ "_class_wxObject","_class_wxQueryLayoutInfoEvent",SwigwxQueryLayoutInfoEventTowxObject},
{ "_class_wxObject","_wxQueryLayoutInfoEvent",SwigwxQueryLayoutInfoEventTowxObject},
{ "_class_wxObject","_class_wxSashWindow",SwigwxSashWindowTowxObject},
{ "_class_wxObject","_wxSashWindow",SwigwxSashWindowTowxObject},
{ "_class_wxObject","_class_wxSashEvent",SwigwxSashEventTowxObject},
{ "_class_wxObject","_wxSashEvent",SwigwxSashEventTowxObject},
{ "_class_wxObject","_wxObject",0},
{ "_wxSpinEvent","_class_wxSpinEvent",0},
{ "_wxSashLayoutWindow","_class_wxSashLayoutWindow",0},
{ "_size_t","_wxCoord",0},
@@ -1972,6 +2034,19 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_class_wxPyBitmapDataObject","_wxPyBitmapDataObject",0},
{ "_wxClientDC","_class_wxClientDC",0},
{ "_wxMouseEvent","_class_wxMouseEvent",0},
{ "_wxObject","_class_wxLayoutAlgorithm",SwigwxLayoutAlgorithmTowxObject},
{ "_wxObject","_wxLayoutAlgorithm",SwigwxLayoutAlgorithmTowxObject},
{ "_wxObject","_class_wxSashLayoutWindow",SwigwxSashLayoutWindowTowxObject},
{ "_wxObject","_wxSashLayoutWindow",SwigwxSashLayoutWindowTowxObject},
{ "_wxObject","_class_wxCalculateLayoutEvent",SwigwxCalculateLayoutEventTowxObject},
{ "_wxObject","_wxCalculateLayoutEvent",SwigwxCalculateLayoutEventTowxObject},
{ "_wxObject","_class_wxQueryLayoutInfoEvent",SwigwxQueryLayoutInfoEventTowxObject},
{ "_wxObject","_wxQueryLayoutInfoEvent",SwigwxQueryLayoutInfoEventTowxObject},
{ "_wxObject","_class_wxSashWindow",SwigwxSashWindowTowxObject},
{ "_wxObject","_wxSashWindow",SwigwxSashWindowTowxObject},
{ "_wxObject","_class_wxSashEvent",SwigwxSashEventTowxObject},
{ "_wxObject","_wxSashEvent",SwigwxSashEventTowxObject},
{ "_wxObject","_class_wxObject",0},
{ "_class_wxPoint","_wxPoint",0},
{ "_wxRealPoint","_class_wxRealPoint",0},
{ "_class_wxRadioBox","_wxRadioBox",0},
@@ -2030,6 +2105,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},
wxPython/src/gtk/windows3.py
+1 -1
View File
@@ -221,7 +221,7 @@ class wxSashLayoutWindow(wxSashLayoutWindowPtr):
class wxLayoutAlgorithmPtr :
class wxLayoutAlgorithmPtr(wxObjectPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
wxPython/src/gtk/wx.cpp
+24 -8
View File
@@ -687,8 +687,13 @@ static wxPyCoreAPI API = {
wxPyCBH_callCallback,
wxPyCBH_callCallbackObj,
wxPyCBH_delete,
wxPyClassExists,
wxPyMake_wxObject,
wxPyPtrTypeMap_Add,
};
#ifdef __cplusplus
extern "C" {
#endif
@@ -948,6 +953,14 @@ static void *SwigwxPyAppTowxEvtHandler(void *ptr) {
return (void *) dest;
}
static void *SwigwxPyAppTowxObject(void *ptr) {
wxPyApp *src;
wxObject *dest;
src = (wxPyApp *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
static wxPyApp *new_wxPyApp() {
wxPythonApp = new wxPyApp();
return wxPythonApp;
@@ -1129,7 +1142,6 @@ static PyObject *_wrap_wxPyApp_GetTopWindow(PyObject *self, PyObject *args, PyOb
wxPyApp * _arg0;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self", NULL };
char _ptemp[128];
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPyApp_GetTopWindow",_kwnames,&_argo0))
@@ -1146,13 +1158,7 @@ static PyObject *_wrap_wxPyApp_GetTopWindow(PyObject *self, PyObject *args, PyOb
_result = (wxWindow *)wxPyApp_GetTopWindow(_arg0);
wxPy_END_ALLOW_THREADS;
} if (_result) {
SWIG_MakePtr(_ptemp, (char *) _result,"_wxWindow_p");
_resultobj = Py_BuildValue("s",_ptemp);
} else {
Py_INCREF(Py_None);
_resultobj = Py_None;
}
}{ _resultobj = wxPyMake_wxObject(_result); }
return _resultobj;
}
@@ -1812,6 +1818,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_class_wxClipboard","_wxClipboard",0},
{ "_class_wxGauge","_wxGauge",0},
{ "_class_wxSashEvent","_wxSashEvent",0},
{ "_wxGDIObject","_class_wxGDIObject",0},
{ "_wxDC","_class_wxDC",0},
{ "_wxSizerItem","_class_wxSizerItem",0},
{ "_class_wxBitmapDataObject","_wxBitmapDataObject",0},
@@ -1821,6 +1828,9 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_class_wxBMPHandler","_wxBMPHandler",0},
{ "_wxPrintPreview","_class_wxPrintPreview",0},
{ "_class_wxFlexGridSizer","_wxFlexGridSizer",0},
{ "_class_wxObject","_class_wxPyApp",SwigwxPyAppTowxObject},
{ "_class_wxObject","_wxPyApp",SwigwxPyAppTowxObject},
{ "_class_wxObject","_wxObject",0},
{ "_wxSpinEvent","_class_wxSpinEvent",0},
{ "_wxSashLayoutWindow","_class_wxSashLayoutWindow",0},
{ "_size_t","_wxCoord",0},
@@ -2034,6 +2044,9 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_class_wxGenericDragImage","_wxGenericDragImage",0},
{ "_wxListCtrl","_class_wxListCtrl",0},
{ "_wxSingleChoiceDialog","_class_wxSingleChoiceDialog",0},
{ "_wxObject","_class_wxPyApp",SwigwxPyAppTowxObject},
{ "_wxObject","_wxPyApp",SwigwxPyAppTowxObject},
{ "_wxObject","_class_wxObject",0},
{ "_class_wxPoint","_wxPoint",0},
{ "_class_wxPyInputStream","_wxPyInputStream",0},
{ "_wxRealPoint","_class_wxRealPoint",0},
@@ -2109,6 +2122,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},
{ "_class_wxSizerItem","_wxSizerItem",0},
{ "_int","_wxCoord",0},
@@ -2921,6 +2935,8 @@ SWIGEXPORT(void) initwxc() {
PyDict_SetItemString(d,"wxEVT_MEASURE_ITEM", PyInt_FromLong((long) wxEVT_MEASURE_ITEM));
PyDict_SetItemString(d,"wxEVT_COMPARE_ITEM", PyInt_FromLong((long) wxEVT_COMPARE_ITEM));
PyDict_SetItemString(d,"wxEVT_INIT_DIALOG", PyInt_FromLong((long) wxEVT_INIT_DIALOG));
PyDict_SetItemString(d,"wxEVT_HELP", PyInt_FromLong((long) wxEVT_HELP));
PyDict_SetItemString(d,"wxEVT_DETAILED_HELP", PyInt_FromLong((long) wxEVT_DETAILED_HELP));
PyDict_SetItemString(d,"wxEVT_IDLE", PyInt_FromLong((long) wxEVT_IDLE));
PyDict_SetItemString(d,"wxEVT_UPDATE_UI", PyInt_FromLong((long) wxEVT_UPDATE_UI));
PyDict_SetItemString(d,"wxEVT_COMMAND_LEFT_CLICK", PyInt_FromLong((long) wxEVT_COMMAND_LEFT_CLICK));
wxPython/src/gtk/wx.py
+8 -2
View File
@@ -61,7 +61,6 @@ class wxPyAppPtr(wxEvtHandlerPtr):
return val
def GetTopWindow(self, *_args, **_kwargs):
val = apply(wxc.wxPyApp_GetTopWindow,(self,) + _args, _kwargs)
if val: val = wxWindowPtr(val)
return val
def GetVendorName(self, *_args, **_kwargs):
val = apply(wxc.wxPyApp_GetVendorName,(self,) + _args, _kwargs)
@@ -813,6 +812,8 @@ wxEVT_DRAW_ITEM = wxc.wxEVT_DRAW_ITEM
wxEVT_MEASURE_ITEM = wxc.wxEVT_MEASURE_ITEM
wxEVT_COMPARE_ITEM = wxc.wxEVT_COMPARE_ITEM
wxEVT_INIT_DIALOG = wxc.wxEVT_INIT_DIALOG
wxEVT_HELP = wxc.wxEVT_HELP
wxEVT_DETAILED_HELP = wxc.wxEVT_DETAILED_HELP
wxEVT_IDLE = wxc.wxEVT_IDLE
wxEVT_UPDATE_UI = wxc.wxEVT_UPDATE_UI
wxEVT_COMMAND_LEFT_CLICK = wxc.wxEVT_COMMAND_LEFT_CLICK
@@ -1538,11 +1539,14 @@ wxPyDefaultSize = wxDefaultSize
def wxPyTypeCast(obj, typeStr):
if obj is None:
return None
theClass = globals()[typeStr+"Ptr"]
typeStr = __wxPyPtrTypeMap.get(typeStr, typeStr)
if hasattr(obj, "this"):
if obj.__class__ is theClass: # if already the right type then just return it
return obj
newPtr = ptrcast(obj.this, typeStr+"_p")
else:
newPtr = ptrcast(obj, typeStr+"_p")
theClass = globals()[typeStr+"Ptr"]
theObj = theClass(newPtr)
if hasattr(obj, "this"):
theObj.thisown = obj.thisown
@@ -1677,4 +1681,6 @@ class __wxPyCleanup:
self.cleanup()
__cleanMeUp = __wxPyCleanup()
#----------------------------------------------------------------------------
#----------------------------------------------------------------------------