Mirrors_UI_SDK/wxWidgets
1
0
Fork 0
mirror of https://github.com/wxWidgets/wxWidgets.git synced 2026-09-20 04:48:48 +08:00
Code Issues Actions 2 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@10197 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2001-05-17 22:47:09 +00:00
parent 6618870d16
commit 9416aa89ca
106 changed files with 6303 additions and 3423 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wxPython/src/_defs.i
+2
View File
@@ -937,6 +937,8 @@ enum wxEventType {
wxEVT_MEASURE_ITEM,
wxEVT_COMPARE_ITEM,
wxEVT_INIT_DIALOG,
wxEVT_HELP,
wxEVT_DETAILED_HELP,
wxEVT_IDLE,
wxEVT_UPDATE_UI,
wxPython/src/_extras.py
+6 -1
View File
@@ -704,11 +704,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
@@ -843,4 +846,6 @@ class __wxPyCleanup:
self.cleanup()
__cleanMeUp = __wxPyCleanup()
#----------------------------------------------------------------------------
#----------------------------------------------------------------------------
wxPython/src/_htmlextras.py
-1
View File
@@ -11,4 +11,3 @@ wx.wxHtmlContainerCellPtr = wxHtmlContainerCellPtr
wx.wxHtmlWidgetCellPtr = wxHtmlWidgetCellPtr
wx.wxHtmlWindowPtr = wxHtmlWindowPtr
wx.wxHtmlLinkInfoPtr = wxHtmlLinkInfoPtr
wxPython/src/clip_dnd.i
+4 -2
View File
@@ -363,7 +363,7 @@ public:
//----------------------------------------------------------------------
//----------------------------------------------------------------------
class wxClipboard {
class wxClipboard : public wxObject {
public:
wxClipboard();
@@ -629,7 +629,9 @@ public:
%init %{
wxPyTheClipboard = wxTheClipboard;
wxPyPtrTypeMap_Add("wxDropSource", "wxPyDropSource");
wxPyPtrTypeMap_Add("wxTextDropTarget", "wxPyTextDropTarget");
wxPyPtrTypeMap_Add("wxFileDropTarget", "wxPyFileDropTarget");
%}
//----------------------------------------------------------------------
wxPython/src/cmndlgs.i
+2 -2
View File
@@ -36,7 +36,7 @@
//----------------------------------------------------------------------
class wxColourData {
class wxColourData : public wxObject {
public:
wxColourData();
~wxColourData();
@@ -191,7 +191,7 @@ public:
//----------------------------------------------------------------------
class wxFontData {
class wxFontData : public wxObject {
public:
wxFontData();
~wxFontData();
wxPython/src/controls2.i
+12 -2
View File
@@ -19,6 +19,7 @@
#endif
#include <wx/listctrl.h>
#include <wx/treectrl.h>
#include <wx/imaglist.h>
%}
//----------------------------------------------------------------------
@@ -139,7 +140,7 @@ public:
};
class wxListItem {
class wxListItem : public wxObject {
public:
wxListItem();
~wxListItem();
@@ -241,6 +242,7 @@ public:
bool Arrange(int flag = wxLIST_ALIGN_DEFAULT);
void AssignImageList(wxImageList* imageList, int which);
%pragma(python) addtomethod = "AssignImageList:_args[0].thisown = 0"
bool DeleteItem(long item);
bool DeleteAllItems();
bool DeleteColumn(int col);
@@ -464,7 +466,7 @@ public:
%name(wxTreeItemData) class wxPyTreeItemData {
%name(wxTreeItemData) class wxPyTreeItemData : public wxObject {
public:
wxPyTreeItemData(PyObject* obj = NULL);
@@ -540,6 +542,7 @@ public:
%pragma(python) addtomethod = "__init__:self._setSelf(self, wxTreeCtrl)"
void AssignImageList(wxImageList* imageList);
%pragma(python) addtomethod = "AssignImageList:_args[0].thisown = 0"
size_t GetCount();
unsigned int GetIndent();
void SetIndent(unsigned int indent);
@@ -810,4 +813,11 @@ public:
//----------------------------------------------------------------------
%init %{
wxPyPtrTypeMap_Add("wxTreeItemData", "wxPyTreeItemData");
wxPyPtrTypeMap_Add("wxTreeCtrl", "wxPyTreeCtrl");
%}
//----------------------------------------------------------------------
wxPython/src/events.i
+1 -1
View File
@@ -33,7 +33,7 @@
int wxNewEventType();
class wxEvent {
class wxEvent : public wxObject {
public:
wxEvent(int id = 0);
~wxEvent();
wxPython/src/export.h
+4
View File
@@ -58,6 +58,10 @@ static void wxPyCoreAPI_IMPORT() {
#define wxPyCBH_callCallbackObj(a, b) (wxPyCoreAPIPtr->p_wxPyCBH_callCallbackObj(a, b))
#define wxPyCBH_delete(a) (wxPyCoreAPIPtr->p_wxPyCBH_delete(a))
#define wxPyClassExists(a) (wxPyCoreAPIPtr->p_wxPyClassExists(a))
#define wxPyMake_wxObject(a) (wxPyCoreAPIPtr->p_wxPyMake_wxObject(a))
#define wxPyPtrTypeMap_Add(a, b) (wxPyCoreAPIPtr->p_wxPyPtrTypeMap_Add(a, b))
// This one is special. It's the first function called in SWIG generated
// modules, so we'll use it to also import the API.
wxPython/src/filesys.i
+10 -4
View File
@@ -87,7 +87,7 @@
class wxFSFile {
class wxFSFile : public wxObject {
public:
wxFSFile(wxInputStream *stream, const wxString& loc,
const wxString& mimetype, const wxString& anchor,
@@ -151,8 +151,8 @@ IMP_PYCALLBACK_STRING__pure(wxPyFileSystemHandler, wxFileSystemHandler, FindNext
%}
%name(wxCPPFileSystemHandler)class wxFileSystemHandler {
wxFileSystemHandler();
%name(wxCPPFileSystemHandler)class wxFileSystemHandler : public wxObject {
wxFileSystemHandler();
}
%name(wxFileSystemHandler)class wxPyFileSystemHandler : public wxFileSystemHandler {
@@ -176,7 +176,7 @@ public:
//---------------------------------------------------------------------------
class wxFileSystem {
class wxFileSystem : public wxObject {
public:
wxFileSystem();
@@ -273,4 +273,10 @@ def wxMemoryFSHandler_AddFile(filename, a, b=''):
"
//---------------------------------------------------------------------------
%init %{
wxPyPtrTypeMap_Add("wxFileSystemHandler", "wxPyFileSystemHandler");
%}
//---------------------------------------------------------------------------
wxPython/src/frames.i
-2
View File
@@ -85,9 +85,7 @@ public:
wxPoint GetClientAreaOrigin() const;
bool Command(int id);
bool ProcessCommand(int id);
#ifdef __WXMSW__
bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL);
#endif
};
//---------------------------------------------------------------------------
wxPython/src/gdi.i
+90 -30
View File
@@ -37,24 +37,21 @@
//---------------------------------------------------------------------------
// class wxGDIImage {
// public:
// long GetHandle();
// void SetHandle(long handle);
// bool Ok();
// int GetWidth();
// int GetHeight();
// int GetDepth();
// void SetWidth(int w);
// void SetHeight(int h);
// void SetDepth(int d);
// void SetSize(const wxSize& size);
// };
class wxGDIObject : public wxObject {
public:
wxGDIObject();
~wxGDIObject();
bool GetVisible();
void SetVisible( bool visible );
bool IsNull();
};
//---------------------------------------------------------------------------
class wxBitmap
//: public wxGDIImage
class wxBitmap : public wxGDIObject
{
public:
wxBitmap(const wxString& name, wxBitmapType type);
@@ -174,7 +171,7 @@ public:
//---------------------------------------------------------------------------
class wxMask {
class wxMask : public wxObject {
public:
wxMask(const wxBitmap& bitmap);
//~wxMask();
@@ -193,8 +190,7 @@ public:
//---------------------------------------------------------------------------
class wxIcon
//: public wxGDIImage
class wxIcon : public wxGDIObject
{
public:
wxIcon(const wxString& name, long flags,
@@ -255,8 +251,7 @@ public:
//---------------------------------------------------------------------------
class wxCursor
//: public wxGDIImage
class wxCursor : public wxGDIObject
{
public:
#ifdef __WXMSW__
@@ -336,7 +331,7 @@ enum wxFontEncoding
};
class wxFont {
class wxFont : public wxGDIObject {
public:
wxFont( int pointSize, int family, int style, int weight,
int underline=FALSE, char* faceName = "",
@@ -377,7 +372,7 @@ public:
%}
class wxFontList {
class wxFontList : public wxObject {
public:
void AddFont(wxFont* font);
@@ -390,7 +385,7 @@ public:
//----------------------------------------------------------------------
class wxColour {
class wxColour : public wxObject {
public:
wxColour(unsigned char red=0, unsigned char green=0, unsigned char blue=0);
~wxColour();
@@ -424,7 +419,7 @@ public:
class wxColourDatabase {
class wxColourDatabase : public wxObject {
public:
wxColour *FindColour(const wxString& colour);
@@ -441,7 +436,7 @@ public:
//----------------------------------------------------------------------
class wxPen {
class wxPen : public wxGDIObject {
public:
wxPen(wxColour& colour, int width=1, int style=wxSOLID);
~wxPen();
@@ -470,7 +465,7 @@ public:
};
class wxPenList {
class wxPenList : public wxObject {
public:
void AddPen(wxPen* pen);
@@ -482,7 +477,7 @@ public:
//----------------------------------------------------------------------
class wxBrush {
class wxBrush : public wxGDIObject {
public:
wxBrush(const wxColour& colour, int style=wxSOLID);
~wxBrush();
@@ -509,7 +504,7 @@ public:
class wxDC {
class wxDC : public wxObject {
public:
// wxDC(); **** abstract base class, can't instantiate.
~wxDC();
@@ -765,7 +760,7 @@ extern wxColourDatabase* wxTheColourDatabase;
//---------------------------------------------------------------------------
class wxPalette {
class wxPalette : public wxGDIObject {
public:
wxPalette(int LCOUNT, byte* choices, byte* choices, byte* choices);
~wxPalette();
@@ -787,7 +782,7 @@ enum {
wxIMAGE_LIST_STATE
};
class wxImageList {
class wxImageList : public wxObject {
public:
wxImageList(int width, int height, int mask=TRUE, int initialCount=1);
~wxImageList();
@@ -813,5 +808,70 @@ public:
};
//---------------------------------------------------------------------------
// Regions, etc.
enum wxRegionContain {
wxOutRegion, wxPartRegion, wxInRegion
};
class wxRegion : public wxGDIObject {
public:
wxRegion(long x=0, long y=0, long width=0, long height=0);
~wxRegion();
void Clear();
wxRegionContain Contains(long x, long y);
%name(ContainsPoint)wxRegionContain Contains(const wxPoint& pt);
%name(ContainsRect)wxRegionContain Contains(const wxRect& rect);
%name(ContainsRectDim)wxRegionContain Contains(long x, long y, long w, long h);
wxRect GetBox();
bool Intersect(long x, long y, long width, long height);
%name(IntersectRect)bool Intersect(const wxRect& rect);
%name(IntersectRegion)bool Intersect(const wxRegion& region);
bool IsEmpty();
bool Union(long x, long y, long width, long height);
%name(UnionRect)bool Union(const wxRect& rect);
%name(UnionRegion)bool Union(const wxRegion& region);
bool Subtract(long x, long y, long width, long height);
%name(SubtractRect)bool Subtract(const wxRect& rect);
%name(SubtractRegion)bool Subtract(const wxRegion& region);
bool Xor(long x, long y, long width, long height);
%name(XorRect)bool Xor(const wxRect& rect);
%name(XorRegion)bool Xor(const wxRegion& region);
};
class wxRegionIterator : public wxObject {
public:
wxRegionIterator(const wxRegion& region);
~wxRegionIterator();
long GetX();
long GetY();
long GetW();
long GetWidth();
long GetH();
long GetHeight();
wxRect GetRect();
bool HaveRects();
void Reset();
%addmethods {
void Next() {
(*self) ++;
}
};
};
//---------------------------------------------------------------------------
wxPython/src/grid.i
+57 -27
View File
@@ -43,27 +43,27 @@
%{
#define PYCALLBACK_GCA_INTINT(PCLASS, CBNAME) \
wxGridCellAttr* CBNAME(int a, int b) { \
wxGridCellAttr* rval = NULL; \
bool doSave = wxPyRestoreThread(); \
if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \
PyObject* ro; \
wxGridCellAttr* ptr; \
ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(ii)", a, b)); \
if (ro) { \
#define PYCALLBACK_GCA_INTINTKIND(PCLASS, CBNAME) \
wxGridCellAttr* CBNAME(int a, int b, wxGridCellAttr::wxAttrKind c) { \
wxGridCellAttr* rval = NULL; \
bool doSave = wxPyRestoreThread(); \
if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \
PyObject* ro; \
wxGridCellAttr* ptr; \
ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(iii)", a, b, c)); \
if (ro) { \
if (!SWIG_GetPtrObj(ro, (void **)&ptr, "_wxGridCellAttr_p")) \
rval = ptr; \
Py_DECREF(ro); \
} \
} \
else \
rval = PCLASS::CBNAME(a, b); \
wxPySaveThread(doSave); \
return rval; \
} \
wxGridCellAttr *base_##CBNAME(int a, int b) { \
return PCLASS::CBNAME(a, b); \
rval = ptr; \
Py_DECREF(ro); \
} \
} \
else \
rval = PCLASS::CBNAME(a, b, c); \
wxPySaveThread(doSave); \
return rval; \
} \
wxGridCellAttr *base_##CBNAME(int a, int b, wxGridCellAttr::wxAttrKind c) { \
return PCLASS::CBNAME(a, b, c); \
}
@@ -809,9 +809,20 @@ public:
class wxGridCellAttr
{
public:
enum wxAttrKind
{
Any,
Default,
Cell,
Row,
Col,
Merged
};
wxGridCellAttr();
wxGridCellAttr *Clone() const;
void MergeWith(wxGridCellAttr *mergefrom);
void IncRef();
void DecRef();
void SetTextColour(const wxColour& colText);
@@ -822,6 +833,7 @@ public:
void SetRenderer(wxGridCellRenderer *renderer);
void SetEditor(wxGridCellEditor* editor);
void SetKind(wxAttrKind kind);
bool HasTextColour() const;
bool HasBackgroundColour() const;
@@ -829,6 +841,7 @@ public:
bool HasAlignment() const;
bool HasRenderer() const;
bool HasEditor() const;
bool HasReadWriteMode() const;
const wxColour& GetTextColour() const;
const wxColour& GetBackgroundColour() const;
@@ -849,7 +862,8 @@ public:
wxGridCellAttrProvider();
// ???? virtual ~wxGridCellAttrProvider();
wxGridCellAttr *GetAttr(int row, int col) const;
wxGridCellAttr *GetAttr(int row, int col,
wxGridCellAttr::wxAttrKind kind) const;
void SetAttr(wxGridCellAttr *attr, int row, int col);
void SetRowAttr(wxGridCellAttr *attr, int row);
void SetColAttr(wxGridCellAttr *attr, int col);
@@ -867,7 +881,7 @@ class wxPyGridCellAttrProvider : public wxGridCellAttrProvider
public:
wxPyGridCellAttrProvider() : wxGridCellAttrProvider() {};
PYCALLBACK_GCA_INTINT(wxGridCellAttrProvider, GetAttr);
PYCALLBACK_GCA_INTINTKIND(wxGridCellAttrProvider, GetAttr);
PYCALLBACK__GCAINTINT(wxGridCellAttrProvider, SetAttr);
PYCALLBACK__GCAINT(wxGridCellAttrProvider, SetRowAttr);
PYCALLBACK__GCAINT(wxGridCellAttrProvider, SetColAttr);
@@ -885,7 +899,8 @@ public:
void _setSelf(PyObject* self, PyObject* _class);
%pragma(python) addtomethod = "__init__:self._setSelf(self, wxPyGridCellAttrProvider)"
wxGridCellAttr *base_GetAttr(int row, int col);
wxGridCellAttr *base_GetAttr(int row, int col,
wxGridCellAttr::wxAttrKind kind);
void base_SetAttr(wxGridCellAttr *attr, int row, int col);
void base_SetRowAttr(wxGridCellAttr *attr, int row);
void base_SetColAttr(wxGridCellAttr *attr, int col);
@@ -897,7 +912,7 @@ public:
class wxGridTableBase
class wxGridTableBase : public wxObject
{
public:
// wxGridTableBase(); This is an ABC
@@ -946,7 +961,8 @@ public:
virtual bool CanHaveAttributes();
virtual wxGridCellAttr *GetAttr( int row, int col );
virtual wxGridCellAttr *GetAttr( int row, int col,
wxGridCellAttr::wxAttrKind kind);
virtual void SetAttr(wxGridCellAttr* attr, int row, int col);
virtual void SetRowAttr(wxGridCellAttr *attr, int row);
virtual void SetColAttr(wxGridCellAttr *attr, int col);
@@ -980,7 +996,7 @@ public:
PYCALLBACK__INTSTRING(wxGridTableBase, SetRowLabelValue);
PYCALLBACK__INTSTRING(wxGridTableBase, SetColLabelValue);
PYCALLBACK_BOOL_(wxGridTableBase, CanHaveAttributes);
PYCALLBACK_GCA_INTINT(wxGridTableBase, GetAttr);
PYCALLBACK_GCA_INTINTKIND(wxGridTableBase, GetAttr);
PYCALLBACK__GCAINTINT(wxGridTableBase, SetAttr);
PYCALLBACK__GCAINT(wxGridTableBase, SetRowAttr);
PYCALLBACK__GCAINT(wxGridTableBase, SetColAttr);
@@ -1108,7 +1124,8 @@ public:
void base_SetRowLabelValue( int row, const wxString& value );
void base_SetColLabelValue( int col, const wxString& value );
bool base_CanHaveAttributes();
wxGridCellAttr *base_GetAttr( int row, int col );
wxGridCellAttr *base_GetAttr( int row, int col,
wxGridCellAttr::wxAttrKind kind );
void base_SetAttr(wxGridCellAttr* attr, int row, int col);
void base_SetRowAttr(wxGridCellAttr *attr, int row);
void base_SetColAttr(wxGridCellAttr *attr, int col);
@@ -1431,6 +1448,8 @@ public:
wxString GetColLabelValue( int col );
wxColour GetGridLineColour();
wxColour GetCellHighlightColour();
int GetCellHighlightPenWidth();
int GetCellHighlightROPenWidth();
void SetRowLabelSize( int width );
void SetColLabelSize( int height );
@@ -1443,6 +1462,8 @@ public:
void SetColLabelValue( int col, const wxString& );
void SetGridLineColour( const wxColour& );
void SetCellHighlightColour( const wxColour& );
void SetCellHighlightPenWidth(int width);
void SetCellHighlightROPenWidth(int width);
void EnableDragRowSize( bool enable = TRUE );
void DisableDragRowSize();
@@ -1595,6 +1616,15 @@ public:
// grid may occupy more space than needed for its rows/columns, this
// function allows to set how big this extra space is
void SetMargins(int extraWidth, int extraHeight);
// Accessors for component windows
wxWindow* GetGridWindow();
wxWindow* GetGridRowLabelWindow();
wxWindow* GetGridColLabelWindow();
wxWindow* GetGridCornerLabelWindow();
};
wxPython/src/helpers.cpp
+127 -63
View File
@@ -29,12 +29,6 @@
#include <gtk/gtk.h>
#include <gdk/gdkprivate.h>
#include <wx/gtk/win_gtk.h>
//#include <gdk/gdk.h>
//#include <gdk/gdkx.h>
//#include <gtk/gtkwindow.h>
//extern GtkWidget *wxRootWindow;
#endif
@@ -122,13 +116,8 @@ void __wxPreStart()
#endif
#ifdef WXP_WITH_THREAD
#if 0 // OLD THREAD STUFF
PyEval_InitThreads();
wxPyEventThreadState = PyThreadState_Get();
#else
PyEval_InitThreads();
wxPyEventThreadState = PyThreadState_New(PyThreadState_Get()->interp);
#endif
#endif
// Bail out if there is already windows created. This means that the
@@ -138,13 +127,17 @@ void __wxPreStart()
return;
int argc = 0;
char** argv = NULL;
PyObject* sysargv = PySys_GetObject("argv");
int argc = PyList_Size(sysargv);
char** argv = new char*[argc+1];
int x;
for(x=0; x<argc; x++)
argv[x] = PyString_AsString(PyList_GetItem(sysargv, x));
argv[argc] = NULL;
if (sysargv != NULL) {
argc = PyList_Size(sysargv);
argv = new char*[argc+1];
int x;
for(x=0; x<argc; x++)
argv[x] = copystring(PyString_AsString(PyList_GetItem(sysargv, x)));
argv[argc] = NULL;
}
wxEntryStart(argc, argv);
delete [] argv;
@@ -171,14 +164,17 @@ PyObject* __wxStart(PyObject* /* self */, PyObject* args)
#endif
// This is the next part of the wxEntry functionality...
int argc = 0;
char** argv = NULL;
PyObject* sysargv = PySys_GetObject("argv");
int argc = PyList_Size(sysargv);
char** argv = new char*[argc+1];
int x;
for(x=0; x<argc; x++)
argv[x] = copystring(PyString_AsString(PyList_GetItem(sysargv, x)));
argv[argc] = NULL;
if (sysargv != NULL) {
argc = PyList_Size(sysargv);
argv = new char*[argc+1];
int x;
for(x=0; x<argc; x++)
argv[x] = copystring(PyString_AsString(PyList_GetItem(sysargv, x)));
argv[argc] = NULL;
}
wxPythonApp->argc = argc;
wxPythonApp->argv = argv;
@@ -215,7 +211,9 @@ void __wxCleanup() {
PyObject* wxPython_dict;
static PyObject* wxPython_dict = NULL;
static PyObject* wxPyPtrTypeMap = NULL;
PyObject* __wxSetDictionary(PyObject* /* self */, PyObject* args)
{
@@ -226,6 +224,12 @@ PyObject* __wxSetDictionary(PyObject* /* self */, PyObject* args)
PyErr_SetString(PyExc_TypeError, "_wxSetDictionary must have dictionary object!");
return NULL;
}
if (! wxPyPtrTypeMap)
wxPyPtrTypeMap = PyDict_New();
PyDict_SetItemString(wxPython_dict, "__wxPyPtrTypeMap", wxPyPtrTypeMap);
#ifdef __WXMOTIF__
#define wxPlatform "__WXMOTIF__"
#endif
@@ -250,39 +254,86 @@ PyObject* __wxSetDictionary(PyObject* /* self */, PyObject* args)
//---------------------------------------------------------------------------
// Stuff used by OOR to find the right wxPython class type to return and to
// build it.
PyObject* wxPyConstructObject(void* ptr,
const char* className,
int setThisOwn) {
PyObject* obj;
PyObject* arg;
if (!ptr) {
Py_INCREF(Py_None);
return Py_None;
}
// The pointer type map is used when the "pointer" type name generated by SWIG
// is not the same as the shadow class name, for example wxPyTreeCtrl
// vs. wxTreeCtrl. It needs to be referenced in Python as well as from C++,
// so we'll just make it a Python dictionary in the wx module's namespace.
void wxPyPtrTypeMap_Add(const char* commonName, const char* ptrName) {
if (! wxPyPtrTypeMap)
wxPyPtrTypeMap = PyDict_New();
PyDict_SetItemString(wxPyPtrTypeMap,
(char*)commonName,
PyString_FromString((char*)ptrName));
}
PyObject* wxPyClassExists(const char* className) {
if (!className)
return NULL;
char buff[64]; // should always be big enough...
char swigptr[64];
sprintf(buff, "_%s_p", className);
SWIG_MakePtr(swigptr, ptr, buff);
sprintf(buff, "%sPtr", className);
PyObject* classobj = PyDict_GetItemString(wxPython_dict, buff);
if (! classobj) {
//Py_INCREF(Py_None);
//return Py_None;
char temp[128];
sprintf(temp,
"*** Unknown class name %s, tell Robin about it please ***",
buff);
obj = PyString_FromString(temp);
return obj;
return classobj; // returns NULL if not found
}
PyObject* wxPyMake_wxObject(wxObject* source) {
PyObject* target;
if (source) {
wxClassInfo* info = source->GetClassInfo();
wxChar* name = (wxChar*)info->GetClassName();
PyObject* klass = wxPyClassExists(name);
while (info && !klass) {
name = (wxChar*)info->GetBaseClassName1();
info = wxClassInfo::FindClass(name);
klass = wxPyClassExists(name);
}
if (info) {
target = wxPyConstructObject(source, name, klass, FALSE);
} else {
wxString msg("wxPython class not found for ");
msg += source->GetClassInfo()->GetClassName();
PyErr_SetString(PyExc_NameError, msg.c_str());
return NULL;
}
} else { // source was NULL so return None.
Py_INCREF(Py_None); target = Py_None;
}
return target;
}
//---------------------------------------------------------------------------
PyObject* wxPyConstructObject(void* ptr,
const char* className,
PyObject* klass,
int setThisOwn) {
PyObject* obj;
PyObject* arg;
PyObject* item;
char swigptr[64]; // should always be big enough...
char buff[64];
if ((item = PyDict_GetItemString(wxPyPtrTypeMap, (char*)className)) != NULL) {
className = PyString_AsString(item);
}
sprintf(buff, "_%s_p", className);
SWIG_MakePtr(swigptr, ptr, buff);
arg = Py_BuildValue("(s)", swigptr);
obj = PyInstance_New(classobj, arg, NULL);
obj = PyInstance_New(klass, arg, NULL);
Py_DECREF(arg);
if (setThisOwn) {
@@ -294,6 +345,33 @@ PyObject* wxPyConstructObject(void* ptr,
return obj;
}
PyObject* wxPyConstructObject(void* ptr,
const char* className,
int setThisOwn) {
PyObject* obj;
if (!ptr) {
Py_INCREF(Py_None);
return Py_None;
}
char buff[64]; // should always be big enough...
sprintf(buff, "%sPtr", className);
PyObject* classobj = PyDict_GetItemString(wxPython_dict, buff);
if (! classobj) {
char temp[128];
sprintf(temp,
"*** Unknown class name %s, tell Robin about it please ***",
buff);
obj = PyString_FromString(temp);
return obj;
}
return wxPyConstructObject(ptr, className, classobj, setThisOwn);
}
//---------------------------------------------------------------------------
static PyThreadState* myPyThreadState_Get() {
@@ -313,19 +391,11 @@ bool wxPyRestoreThread() {
// already have the lock. (I hope!)
//
#ifdef WXP_WITH_THREAD
#if 0 // OLD THREAD STUFF
if (wxPyEventThreadState != myPyThreadState_Get()) {
PyEval_RestoreThread(wxPyEventThreadState);
return TRUE;
}
else
#else
if (wxPyEventThreadState != myPyThreadState_Get()) {
PyEval_AcquireThread(wxPyEventThreadState);
return TRUE;
}
else
#endif
#endif
return FALSE;
}
@@ -333,16 +403,10 @@ bool wxPyRestoreThread() {
void wxPySaveThread(bool doSave) {
#ifdef WXP_WITH_THREAD
#if 0 // OLD THREAD STUFF
if (doSave) {
wxPyEventThreadState = PyEval_SaveThread();
}
#else
if (doSave) {
PyEval_ReleaseThread(wxPyEventThreadState);
}
#endif
#endif
}
//---------------------------------------------------------------------------
@@ -634,7 +698,7 @@ PyObject* wxPy_ConvertList(wxListBase* list, const char* className) {
pyList = PyList_New(0);
while (node) {
wxObj = node->Data();
pyObj = wxPyConstructObject(wxObj, className);
pyObj = wxPyMake_wxObject(wxObj); //wxPyConstructObject(wxObj, className);
PyList_Append(pyList, pyObj);
node = node->Next();
}
wxPython/src/helpers.h
+25 -13
View File
@@ -52,7 +52,7 @@ void __wxPreStart();
PyObject* __wxStart(PyObject*, PyObject* args);
void __wxCleanup();
extern PyObject* wxPython_dict;
//extern PyObject* wxPython_dict;
PyObject* __wxSetDictionary(PyObject*, PyObject* args);
void wxPyEventThunker(wxObject*, wxEvent& event);
@@ -60,6 +60,14 @@ void wxPyEventThunker(wxObject*, wxEvent& event);
PyObject* wxPyConstructObject(void* ptr,
const char* className,
int setThisOwn=0);
PyObject* wxPyConstructObject(void* ptr,
const char* className,
PyObject* klass,
int setThisOwn=0);
PyObject* wxPyClassExists(const char* className);
PyObject* wxPyMake_wxObject(wxObject* source);
void wxPyPtrTypeMap_Add(const char* commonName, const char* ptrName);
bool wxPyRestoreThread();
void wxPySaveThread(bool doSave);
PyObject* wxPy_ConvertList(wxListBase* list, const char* className);
@@ -247,6 +255,10 @@ struct wxPyCoreAPI {
PyObject* (*p_wxPyCBH_callCallbackObj)(const wxPyCallbackHelper& cbh, PyObject* argTuple);
void (*p_wxPyCBH_delete)(wxPyCallbackHelper* cbh);
PyObject* (*p_wxPyClassExists)(const char* className);
PyObject* (*p_wxPyMake_wxObject)(wxObject* source);
void (*p_wxPyPtrTypeMap_Add)(const char* commonName, const char* ptrName);
};
#ifdef wxPyUSE_EXPORT
@@ -454,7 +466,7 @@ public:
void CLASS::CBNAME(wxDC& a) { \
bool doSave = wxPyRestoreThread(); \
if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \
PyObject* obj = wxPyConstructObject(&a, "wxDC", 0); \
PyObject* obj = wxPyMake_wxObject(&a); \
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", obj)); \
Py_DECREF(obj); \
} \
@@ -479,7 +491,7 @@ public:
void CLASS::CBNAME(wxDC& a, bool b) { \
bool doSave = wxPyRestoreThread(); \
if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \
PyObject* obj = wxPyConstructObject(&a, "wxDC", 0); \
PyObject* obj = wxPyMake_wxObject(&a); \
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(Oi)", obj, (int)b)); \
Py_DECREF(obj); \
} \
@@ -502,7 +514,7 @@ public:
void CLASS::CBNAME(wxDC& a, bool b) { \
bool doSave = wxPyRestoreThread(); \
if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \
PyObject* obj = wxPyConstructObject(&a, "wxDC", 0); \
PyObject* obj = wxPyMake_wxObject(&a); \
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(Oi)", obj, (int)b)); \
Py_DECREF(obj); \
} \
@@ -566,7 +578,7 @@ public:
void CLASS::CBNAME(wxDC& a, double b, double c, double d, double e, bool f) { \
bool doSave = wxPyRestoreThread(); \
if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \
PyObject* obj = wxPyConstructObject(&a, "wxDC", 0); \
PyObject* obj = wxPyMake_wxObject(&a); \
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(Oddddi)", obj, b, c, d, e, (int)f)); \
Py_DECREF(obj); \
} \
@@ -590,7 +602,7 @@ public:
bool doSave = wxPyRestoreThread(); \
bool rval; \
if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \
PyObject* obj = wxPyConstructObject(&a, "wxDC", 0); \
PyObject* obj = wxPyMake_wxObject(&a); \
rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(Oddddi)", obj, b, c, d, e, (int)f));\
Py_DECREF(obj); \
} \
@@ -635,7 +647,7 @@ public:
void CLASS::CBNAME(wxDC& a, double b, double c, double d, double e) { \
bool doSave = wxPyRestoreThread(); \
if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \
PyObject* obj = wxPyConstructObject(&a, "wxDC", 0); \
PyObject* obj = wxPyMake_wxObject(&a); \
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(Odddd)", obj, b, c, d, e)); \
Py_DECREF(obj); \
} \
@@ -658,7 +670,7 @@ public:
void CLASS::CBNAME(wxDC& a, bool b) { \
bool doSave = wxPyRestoreThread(); \
if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \
PyObject* obj = wxPyConstructObject(&a, "wxDC", 0); \
PyObject* obj = wxPyMake_wxObject(&a); \
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(Oi)", obj, (int)b)); \
Py_DECREF(obj); \
} \
@@ -682,7 +694,7 @@ public:
int e, int f) { \
bool doSave = wxPyRestoreThread(); \
if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \
PyObject* obj = wxPyConstructObject(a, "wxPyControlPoint", 0); \
PyObject* obj = wxPyMake_wxObject(a); \
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(Oiddii)", obj, (int)b, c, d, e, f));\
Py_DECREF(obj); \
} \
@@ -706,7 +718,7 @@ public:
void CLASS::CBNAME(wxControlPoint* a, double b, double c, int d, int e) { \
bool doSave = wxPyRestoreThread(); \
if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \
PyObject* obj = wxPyConstructObject(a, "wxPyControlPoint", 0); \
PyObject* obj = wxPyMake_wxObject(a); \
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(Oddii)", obj, b, c, d, e)); \
Py_DECREF(obj); \
} \
@@ -947,7 +959,7 @@ public:
bool rval = FALSE; \
bool doSave = wxPyRestoreThread(); \
if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \
PyObject* obj = wxPyConstructObject((void*)&a,"wxHtmlTag", 0); \
PyObject* obj = wxPyConstructObject((void*)&a, "wxHtmlTag", 0); \
rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", obj)); \
Py_DECREF(obj); \
} \
@@ -1005,7 +1017,7 @@ public:
bool rval; \
bool doSave = wxPyRestoreThread(); \
if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \
PyObject* obj = wxPyConstructObject((void*)a,"wxWindow", 0);\
PyObject* obj = wxPyMake_wxObject(a); \
rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", obj)); \
Py_DECREF(obj); \
} \
@@ -1073,7 +1085,7 @@ public:
wxFSFile* rval=0; \
if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \
PyObject* ro; \
PyObject* obj = wxPyConstructObject(&a, "wxFileSystem", 0); \
PyObject* obj = wxPyMake_wxObject(&a); \
ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(Os)", \
obj, b.c_str())); \
if (ro) { \
wxPython/src/html.i
+31 -8
View File
@@ -75,7 +75,7 @@ enum {
//---------------------------------------------------------------------------
class wxHtmlLinkInfo {
class wxHtmlLinkInfo : public wxObject {
public:
wxHtmlLinkInfo(const wxString& href, const wxString& target = wxEmptyString);
wxString GetHref();
@@ -89,7 +89,7 @@ public:
//---------------------------------------------------------------------------
class wxHtmlTag {
class wxHtmlTag : public wxObject {
public:
// Never need to create a new tag from Python...
//wxHtmlTag(const wxString& source, int pos, int end_pos, wxHtmlTagsCache* cache);
@@ -112,7 +112,7 @@ public:
//---------------------------------------------------------------------------
class wxHtmlParser {
class wxHtmlParser : public wxObject {
public:
// wxHtmlParser(); This is an abstract base class...
@@ -189,6 +189,7 @@ public:
%{
class wxPyHtmlTagHandler : public wxHtmlTagHandler {
DECLARE_DYNAMIC_CLASS(wxPyHtmlTagHandler);
public:
wxPyHtmlTagHandler() : wxHtmlTagHandler() {};
@@ -201,12 +202,14 @@ public:
PYPRIVATE;
};
IMPLEMENT_DYNAMIC_CLASS(wxPyHtmlTagHandler, wxHtmlTagHandler);
IMP_PYCALLBACK_STRING__pure(wxPyHtmlTagHandler, wxHtmlTagHandler, GetSupportedTags);
IMP_PYCALLBACK_BOOL_TAG_pure(wxPyHtmlTagHandler, wxHtmlTagHandler, HandleTag);
%}
%name(wxHtmlTagHandler) class wxPyHtmlTagHandler {
%name(wxHtmlTagHandler) class wxPyHtmlTagHandler : public wxObject {
public:
wxPyHtmlTagHandler();
@@ -223,6 +226,7 @@ public:
%{
class wxPyHtmlWinTagHandler : public wxHtmlWinTagHandler {
DECLARE_DYNAMIC_CLASS(wxPyHtmlWinTagHandler);
public:
wxPyHtmlWinTagHandler() : wxHtmlWinTagHandler() {};
@@ -236,6 +240,8 @@ public:
PYPRIVATE;
};
IMPLEMENT_DYNAMIC_CLASS( wxPyHtmlWinTagHandler, wxHtmlWinTagHandler);
IMP_PYCALLBACK_STRING__pure(wxPyHtmlWinTagHandler, wxHtmlWinTagHandler, GetSupportedTags);
IMP_PYCALLBACK_BOOL_TAG_pure(wxPyHtmlWinTagHandler, wxHtmlWinTagHandler, HandleTag);
%}
@@ -321,7 +327,7 @@ private:
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
class wxHtmlCell {
class wxHtmlCell : public wxObject {
public:
wxHtmlCell();
@@ -348,6 +354,13 @@ public:
};
class wxHtmlWordCell : public wxHtmlCell
{
public:
wxHtmlWordCell(const wxString& word, wxDC& dc);
};
class wxHtmlContainerCell : public wxHtmlCell {
public:
wxHtmlContainerCell(wxHtmlContainerCell *parent);
@@ -378,6 +391,12 @@ public:
};
class wxHtmlFontCell : public wxHtmlCell
{
public:
wxHtmlFontCell(wxFont *font);
};
class wxHtmlWidgetCell : public wxHtmlCell {
public:
@@ -411,7 +430,7 @@ public:
IMP_PYCALLBACK__STRING(wxPyHtmlWindow, wxHtmlWindow, OnSetTitle);
void wxPyHtmlWindow::OnLinkClicked(const wxHtmlLinkInfo& link) {
void wxPyHtmlWindow::OnLinkClicked(const wxHtmlLinkInfo& link) {
bool doSave = wxPyRestoreThread();
if (wxPyCBH_findCallback(m_myInst, "OnLinkClicked")) {
PyObject* obj = wxPyConstructObject((void*)&link, "wxHtmlLinkInfo", 0);
@@ -492,7 +511,7 @@ public:
//---------------------------------------------------------------------------
class wxHtmlDCRenderer {
class wxHtmlDCRenderer : public wxObject {
public:
wxHtmlDCRenderer();
~wxHtmlDCRenderer();
@@ -533,7 +552,7 @@ public:
class wxHtmlEasyPrinting {
class wxHtmlEasyPrinting : public wxObject {
public:
wxHtmlEasyPrinting(const char* name = "Printing",
wxFrame *parent_frame = NULL);
@@ -569,6 +588,10 @@ public:
wxClassInfo::CleanUpClasses();
wxClassInfo::InitializeClasses();
wxPyPtrTypeMap_Add("wxHtmlTagHandler", "wxPyHtmlTagHandler");
wxPyPtrTypeMap_Add("wxHtmlWinTagHandler", "wxPyHtmlWinTagHandler");
wxPyPtrTypeMap_Add("wxHtmlWindow", "wxPyHtmlWindow");
%}
//----------------------------------------------------------------------
wxPython/src/image.i
+2 -2
View File
@@ -30,7 +30,7 @@
//---------------------------------------------------------------------------
class wxImageHandler {
class wxImageHandler : public wxObject {
public:
// wxImageHandler(); Abstract Base Class
wxString GetName();
@@ -90,7 +90,7 @@ public:
//---------------------------------------------------------------------------
class wxImage {
class wxImage : public wxObject {
public:
wxImage( const wxString& name, long type = wxBITMAP_TYPE_ANY );
~wxImage();
wxPython/src/libpy.c
+1 -1
View File
@@ -362,7 +362,7 @@ SWIG_GetPtr(char *c, void **ptr, char *t)
sp = &SwigPtrTable[start];
/* Try to find a match */
while (start <= end) {
while (start < end) { /* was "<=" --robin */
if (strncmp(t,sp->name,sp->len) == 0) {
name = sp->name;
len = sp->len;
wxPython/src/misc.i
+20 -69
View File
@@ -35,6 +35,22 @@
//---------------------------------------------------------------------------
class wxObject {
public:
%addmethods {
const char* GetClassName() {
return self->GetClassInfo()->GetClassName();
}
void Destroy() {
delete self;
}
}
};
//---------------------------------------------------------------------------
class wxSize {
public:
long x;
@@ -369,7 +385,7 @@ enum wxRelationship { wxUnconstrained = 0,
wxAbsolute };
class wxIndividualLayoutConstraint {
class wxIndividualLayoutConstraint : public wxObject {
public:
// wxIndividualLayoutConstraint();
// ~wxIndividualLayoutConstraint();
@@ -387,7 +403,7 @@ public:
};
class wxLayoutConstraints {
class wxLayoutConstraints : public wxObject {
public:
wxLayoutConstraints();
@@ -404,71 +420,6 @@ public:
}
//---------------------------------------------------------------------------
// Regions, etc.
enum wxRegionContain {
wxOutRegion, wxPartRegion, wxInRegion
};
class wxRegion {
public:
wxRegion(long x=0, long y=0, long width=0, long height=0);
~wxRegion();
void Clear();
wxRegionContain Contains(long x, long y);
%name(ContainsPoint)wxRegionContain Contains(const wxPoint& pt);
%name(ContainsRect)wxRegionContain Contains(const wxRect& rect);
%name(ContainsRectDim)wxRegionContain Contains(long x, long y, long w, long h);
wxRect GetBox();
bool Intersect(long x, long y, long width, long height);
%name(IntersectRect)bool Intersect(const wxRect& rect);
%name(IntersectRegion)bool Intersect(const wxRegion& region);
bool IsEmpty();
bool Union(long x, long y, long width, long height);
%name(UnionRect)bool Union(const wxRect& rect);
%name(UnionRegion)bool Union(const wxRegion& region);
bool Subtract(long x, long y, long width, long height);
%name(SubtractRect)bool Subtract(const wxRect& rect);
%name(SubtractRegion)bool Subtract(const wxRegion& region);
bool Xor(long x, long y, long width, long height);
%name(XorRect)bool Xor(const wxRect& rect);
%name(XorRegion)bool Xor(const wxRegion& region);
};
class wxRegionIterator {
public:
wxRegionIterator(const wxRegion& region);
~wxRegionIterator();
long GetX();
long GetY();
long GetW();
long GetWidth();
long GetH();
long GetHeight();
wxRect GetRect();
bool HaveRects();
void Reset();
%addmethods {
void Next() {
(*self) ++;
}
};
};
//---------------------------------------------------------------------------
// Accelerator Entry and Table
@@ -485,7 +436,7 @@ public:
};
class wxAcceleratorTable {
class wxAcceleratorTable : public wxObject {
public:
// Can also accept a list of 3-tuples
wxAcceleratorTable(int LCOUNT, wxAcceleratorEntry* choices);
@@ -508,7 +459,7 @@ extern wxAcceleratorTable wxNullAcceleratorTable;
//---------------------------------------------------------------------------
class wxBusyInfo {
class wxBusyInfo : public wxObject {
public:
wxBusyInfo(const wxString& message);
~wxBusyInfo();
wxPython/src/misc2.i
+11 -4
View File
@@ -264,7 +264,7 @@ enum {
//---------------------------------------------------------------------------
// wxToolTip
class wxToolTip {
class wxToolTip : public wxObject {
public:
wxToolTip(const wxString &tip);
@@ -464,7 +464,7 @@ bool wxShowTip(wxWindow *parent, wxTipProvider *tipProvider, bool showAtStartup
static wxPoint wxPyNullPoint;
%}
%name (wxDragImage) class wxGenericDragImage
%name (wxDragImage) class wxGenericDragImage : public wxObject
{
public:
@@ -532,7 +532,7 @@ wxGenericDragImage* wxDragListItem(const wxListCtrl& listCtrl, long id) {
//----------------------------------------------------------------------
class wxPyTimer {
class wxPyTimer : public wxObject {
public:
wxPyTimer(PyObject* notify);
~wxPyTimer();
@@ -722,7 +722,7 @@ long wxExecute(const wxString& command,
//----------------------------------------------------------------------
#ifdef __WXMSW__
class wxJoystick {
class wxJoystick : public wxObject {
public:
wxJoystick(int joystick = wxJOYSTICK1);
wxPoint GetPosition();
@@ -774,5 +774,12 @@ public:
#endif
//----------------------------------------------------------------------
%init %{
wxPyPtrTypeMap_Add("wxFontEnumerator", "wxPyFontEnumerator");
wxPyPtrTypeMap_Add("wxDragImage", "wxGenericDragImage");
wxPyPtrTypeMap_Add("wxProcess", "wxPyProcess");
%}
//----------------------------------------------------------------------
wxPython/src/msw/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/msw/clip_dnd.cpp
+19 -1
View File
@@ -1960,6 +1960,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;
@@ -3508,10 +3516,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},
@@ -3634,6 +3646,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},
@@ -3671,6 +3686,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},
@@ -3766,7 +3782,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/msw/clip_dnd.py
+1 -1
View File
@@ -258,7 +258,7 @@ class wxCustomDataObject(wxCustomDataObjectPtr):
class wxClipboardPtr :
class wxClipboardPtr(wxObjectPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
wxPython/src/msw/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/msw/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/msw/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/msw/controls2.cpp
+91 -88
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;
@@ -513,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;
@@ -2023,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;
@@ -2385,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))
@@ -2409,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;
}
@@ -2426,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))
@@ -2443,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;
}
@@ -2792,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))
@@ -2810,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;
}
@@ -2844,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;
@@ -3118,7 +3122,6 @@ static PyObject *_wrap_wxListCtrl_EditLabel(PyObject *self, PyObject *args, PyOb
long _arg1;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self","item", NULL };
char _ptemp[128];
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxListCtrl_EditLabel",_kwnames,&_argo0,&_arg1))
@@ -3135,13 +3138,7 @@ static PyObject *_wrap_wxListCtrl_EditLabel(PyObject *self, PyObject *args, PyOb
_result = (wxTextCtrl *)wxListCtrl_EditLabel(_arg0,_arg1);
wxPy_END_ALLOW_THREADS;
} if (_result) {
SWIG_MakePtr(_ptemp, (char *) _result,"_wxTextCtrl_p");
_resultobj = Py_BuildValue("s",_ptemp);
} else {
Py_INCREF(Py_None);
_resultobj = Py_None;
}
}{ _resultobj = wxPyMake_wxObject(_result); }
return _resultobj;
}
@@ -3182,7 +3179,6 @@ static PyObject *_wrap_wxListCtrl_GetEditControl(PyObject *self, PyObject *args,
wxListCtrl * _arg0;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self", NULL };
char _ptemp[128];
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxListCtrl_GetEditControl",_kwnames,&_argo0))
@@ -3199,13 +3195,7 @@ static PyObject *_wrap_wxListCtrl_GetEditControl(PyObject *self, PyObject *args,
_result = (wxTextCtrl *)wxListCtrl_GetEditControl(_arg0);
wxPy_END_ALLOW_THREADS;
} if (_result) {
SWIG_MakePtr(_ptemp, (char *) _result,"_wxTextCtrl_p");
_resultobj = Py_BuildValue("s",_ptemp);
} else {
Py_INCREF(Py_None);
_resultobj = Py_None;
}
}{ _resultobj = wxPyMake_wxObject(_result); }
return _resultobj;
}
@@ -3458,7 +3448,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))
@@ -3475,13 +3464,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;
}
@@ -3529,7 +3512,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))
@@ -3546,13 +3528,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;
}
@@ -4856,6 +4832,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;
@@ -5043,6 +5027,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;
@@ -5211,6 +5203,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;
@@ -5437,7 +5437,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))
@@ -5454,13 +5453,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;
}
@@ -5471,7 +5464,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))
@@ -5488,13 +5480,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;
}
@@ -7527,7 +7513,6 @@ static PyObject *_wrap_wxTreeCtrl_EditLabel(PyObject *self, PyObject *args, PyOb
PyObject * _argo0 = 0;
PyObject * _argo1 = 0;
char *_kwnames[] = { "self","item", NULL };
char _ptemp[128];
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxTreeCtrl_EditLabel",_kwnames,&_argo0,&_argo1))
@@ -7551,13 +7536,7 @@ static PyObject *_wrap_wxTreeCtrl_EditLabel(PyObject *self, PyObject *args, PyOb
_result = (wxTextCtrl *)wxTreeCtrl_EditLabel(_arg0,*_arg1);
wxPy_END_ALLOW_THREADS;
} if (_result) {
SWIG_MakePtr(_ptemp, (char *) _result,"_wxTextCtrl_p");
_resultobj = Py_BuildValue("s",_ptemp);
} else {
Py_INCREF(Py_None);
_resultobj = Py_None;
}
}{ _resultobj = wxPyMake_wxObject(_result); }
return _resultobj;
}
@@ -7568,7 +7547,6 @@ static PyObject *_wrap_wxTreeCtrl_GetEditControl(PyObject *self, PyObject *args,
wxPyTreeCtrl * _arg0;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self", NULL };
char _ptemp[128];
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxTreeCtrl_GetEditControl",_kwnames,&_argo0))
@@ -7585,13 +7563,7 @@ static PyObject *_wrap_wxTreeCtrl_GetEditControl(PyObject *self, PyObject *args,
_result = (wxTextCtrl *)wxTreeCtrl_GetEditControl(_arg0);
wxPy_END_ALLOW_THREADS;
} if (_result) {
SWIG_MakePtr(_ptemp, (char *) _result,"_wxTextCtrl_p");
_resultobj = Py_BuildValue("s",_ptemp);
} else {
Py_INCREF(Py_None);
_resultobj = Py_None;
}
}{ _resultobj = wxPyMake_wxObject(_result); }
return _resultobj;
}
@@ -8306,9 +8278,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},
@@ -8462,6 +8448,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},
@@ -8520,6 +8519,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},
@@ -8734,6 +8734,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/msw/controls2.py
+4 -11
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)
@@ -339,14 +339,12 @@ class wxListCtrlPtr(wxControlPtr):
return val
def EditLabel(self, *_args, **_kwargs):
val = apply(controls2c.wxListCtrl_EditLabel,(self,) + _args, _kwargs)
if val: val = wxTextCtrlPtr(val)
return val
def EndEditLabel(self, *_args, **_kwargs):
val = apply(controls2c.wxListCtrl_EndEditLabel,(self,) + _args, _kwargs)
return val
def GetEditControl(self, *_args, **_kwargs):
val = apply(controls2c.wxListCtrl_GetEditControl,(self,) + _args, _kwargs)
if val: val = wxTextCtrlPtr(val)
return val
def EnsureVisible(self, *_args, **_kwargs):
val = apply(controls2c.wxListCtrl_EnsureVisible,(self,) + _args, _kwargs)
@@ -371,14 +369,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)
@@ -516,7 +512,7 @@ class wxTreeItemId(wxTreeItemIdPtr):
class wxTreeItemDataPtr :
class wxTreeItemDataPtr(wxObjectPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
@@ -583,6 +579,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)
@@ -595,11 +592,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)
@@ -765,11 +760,9 @@ class wxTreeCtrlPtr(wxControlPtr):
return val
def EditLabel(self, *_args, **_kwargs):
val = apply(controls2c.wxTreeCtrl_EditLabel,(self,) + _args, _kwargs)
if val: val = wxTextCtrlPtr(val)
return val
def GetEditControl(self, *_args, **_kwargs):
val = apply(controls2c.wxTreeCtrl_GetEditControl,(self,) + _args, _kwargs)
if val: val = wxTextCtrlPtr(val)
return val
def EndEditLabel(self, *_args, **_kwargs):
val = apply(controls2c.wxTreeCtrl_EndEditLabel,(self,) + _args, _kwargs)
wxPython/src/msw/events.cpp
+406 -48
View File
File diff suppressed because it is too large Load Diff
wxPython/src/msw/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/msw/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/msw/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/msw/frames.cpp
+33 -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;
}
@@ -1121,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;
@@ -1290,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},
@@ -1435,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},
@@ -1491,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/msw/frames.py
-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)
wxPython/src/msw/gdi.cpp
+1565
View File
File diff suppressed because it is too large Load Diff
wxPython/src/msw/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
@@ -93,7 +119,7 @@ class wxBitmap(wxBitmapPtr):
class wxMaskPtr :
class wxMaskPtr(wxObjectPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
@@ -110,7 +136,7 @@ class wxMask(wxMaskPtr):
class wxIconPtr :
class wxIconPtr(wxGDIObjectPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
@@ -171,7 +197,7 @@ class wxIcon(wxIconPtr):
class wxCursorPtr :
class wxCursorPtr(wxGDIObjectPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
@@ -218,7 +244,7 @@ class wxCursor(wxCursorPtr):
class wxFontPtr :
class wxFontPtr(wxGDIObjectPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
@@ -292,7 +318,7 @@ class wxFont(wxFontPtr):
class wxFontListPtr :
class wxFontListPtr(wxObjectPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
@@ -315,7 +341,7 @@ class wxFontList(wxFontListPtr):
class wxColourPtr :
class wxColourPtr(wxObjectPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
@@ -353,7 +379,7 @@ class wxColour(wxColourPtr):
class wxColourDatabasePtr :
class wxColourDatabasePtr(wxObjectPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
@@ -376,7 +402,7 @@ class wxColourDatabase(wxColourDatabasePtr):
class wxPenPtr :
class wxPenPtr(wxGDIObjectPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
@@ -440,7 +466,7 @@ class wxPen(wxPenPtr):
class wxPenListPtr :
class wxPenListPtr(wxObjectPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
@@ -463,7 +489,7 @@ class wxPenList(wxPenListPtr):
class wxBrushPtr :
class wxBrushPtr(wxGDIObjectPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
@@ -526,7 +552,7 @@ class wxBrushList(wxBrushListPtr):
class wxDCPtr :
class wxDCPtr(wxObjectPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
@@ -903,7 +929,7 @@ class wxMetaFileDC(wxMetaFileDCPtr):
class wxPalettePtr :
class wxPalettePtr(wxGDIObjectPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
@@ -929,7 +955,7 @@ class wxPalette(wxPalettePtr):
class wxImageListPtr :
class wxImageListPtr(wxObjectPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
@@ -973,6 +999,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 ------------------
@@ -1117,3 +1266,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/msw/grid.cpp
+460 -70
View File
File diff suppressed because it is too large Load Diff
wxPython/src/msw/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/msw/html.cpp
+335 -49
View File
File diff suppressed because it is too large Load Diff
wxPython/src/msw/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/msw/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},
@@ -3163,6 +3185,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},
@@ -3178,6 +3201,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},
@@ -3208,6 +3232,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},
@@ -3296,6 +3325,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},
@@ -3430,6 +3460,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},
@@ -3442,6 +3473,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/msw/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;
@@ -2322,8 +2394,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},
@@ -2387,6 +2479,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},
@@ -2437,6 +2548,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/msw/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/msw/mdi.cpp
+44 -32
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;
}
@@ -431,7 +418,6 @@ static PyObject *_wrap_wxMDIParentFrame_GetWindowMenu(PyObject *self, PyObject *
wxMDIParentFrame * _arg0;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self", NULL };
char _ptemp[128];
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxMDIParentFrame_GetWindowMenu",_kwnames,&_argo0))
@@ -448,13 +434,7 @@ static PyObject *_wrap_wxMDIParentFrame_GetWindowMenu(PyObject *self, PyObject *
_result = (wxMenu *)wxMDIParentFrame_GetWindowMenu(_arg0);
wxPy_END_ALLOW_THREADS;
} if (_result) {
SWIG_MakePtr(_ptemp, (char *) _result,"_wxMenu_p");
_resultobj = Py_BuildValue("s",_ptemp);
} else {
Py_INCREF(Py_None);
_resultobj = Py_None;
}
}{ _resultobj = wxPyMake_wxObject(_result); }
return _resultobj;
}
@@ -581,6 +561,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;
@@ -760,6 +748,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;
@@ -876,8 +872,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},
@@ -1027,6 +1031,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},
@@ -1085,6 +1096,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/msw/mdi.py
-4
View File
@@ -35,19 +35,15 @@ 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 GetWindowMenu(self, *_args, **_kwargs):
val = apply(mdic.wxMDIParentFrame_GetWindowMenu,(self,) + _args, _kwargs)
if val: val = wxMenuPtr(val)
return val
def SetWindowMenu(self, *_args, **_kwargs):
val = apply(mdic.wxMDIParentFrame_SetWindowMenu,(self,) + _args, _kwargs)
wxPython/src/msw/misc.cpp
+110 -1052
View File
File diff suppressed because it is too large Load Diff
wxPython/src/msw/misc.py
+23 -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
@@ -353,7 +372,7 @@ class wxRect(wxRectPtr):
class wxIndividualLayoutConstraintPtr :
class wxIndividualLayoutConstraintPtr(wxObjectPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
@@ -396,7 +415,7 @@ class wxIndividualLayoutConstraint(wxIndividualLayoutConstraintPtr):
class wxLayoutConstraintsPtr :
class wxLayoutConstraintsPtr(wxObjectPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
@@ -454,129 +473,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 +502,7 @@ class wxAcceleratorEntry(wxAcceleratorEntryPtr):
class wxAcceleratorTablePtr :
class wxAcceleratorTablePtr(wxObjectPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
@@ -623,7 +519,7 @@ class wxAcceleratorTable(wxAcceleratorTablePtr):
class wxBusyInfoPtr :
class wxBusyInfoPtr(wxObjectPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
@@ -732,8 +628,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/msw/misc2.cpp
+89 -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;
}
@@ -2316,6 +2288,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;
@@ -2455,7 +2435,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))
@@ -2472,13 +2451,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;
}
@@ -2764,7 +2737,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))
@@ -2781,13 +2753,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;
}
@@ -3486,6 +3452,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;
@@ -3876,6 +3850,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;
@@ -4772,7 +4754,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))
@@ -4789,13 +4770,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;
}
@@ -4950,6 +4925,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;
@@ -5150,6 +5133,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;
@@ -5388,28 +5379,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;
}
@@ -5443,28 +5413,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;
}
@@ -5530,6 +5479,14 @@ static PyObject *_wrap_wxProcess_CloseOutput(PyObject *self, PyObject *args, PyO
return _resultobj;
}
static void *SwigwxJoystickTowxObject(void *ptr) {
wxJoystick *src;
wxObject *dest;
src = (wxJoystick *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
#define new_wxJoystick(_swigarg0) (new wxJoystick(_swigarg0))
static PyObject *_wrap_new_wxJoystick(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -6985,8 +6942,22 @@ 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_wxJoystick",SwigwxJoystickTowxObject},
{ "_class_wxObject","_wxJoystick",SwigwxJoystickTowxObject},
{ "_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},
@@ -7123,6 +7094,19 @@ 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_wxJoystick",SwigwxJoystickTowxObject},
{ "_wxObject","_wxJoystick",SwigwxJoystickTowxObject},
{ "_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},
@@ -7180,6 +7164,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},
@@ -7379,6 +7364,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/msw/misc2.py
+4 -11
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)
@@ -488,7 +485,7 @@ class wxProcess(wxProcessPtr):
class wxJoystickPtr :
class wxJoystickPtr(wxObjectPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
@@ -678,19 +675,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
@@ -709,7 +703,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/msw/printfw.cpp
+133 -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;
@@ -1521,6 +1529,14 @@ static void *SwigwxPrinterDCTowxDC(void *ptr) {
return (void *) dest;
}
static void *SwigwxPrinterDCTowxObject(void *ptr) {
wxPrinterDC *src;
wxObject *dest;
src = (wxPrinterDC *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
#define new_wxPrinterDC(_swigarg0) (new wxPrinterDC(_swigarg0))
static PyObject *_wrap_new_wxPrinterDC(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -1656,6 +1672,14 @@ static PyObject *_wrap_new_wxPrinterDC2(PyObject *self, PyObject *args, PyObject
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;
@@ -2586,6 +2610,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;
@@ -2691,6 +2723,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;
@@ -3413,6 +3453,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;
@@ -3498,7 +3546,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))
@@ -3515,13 +3562,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;
}
@@ -3552,6 +3593,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;
@@ -3649,7 +3698,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))
@@ -3666,13 +3714,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;
}
@@ -4123,6 +4165,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;
@@ -4319,7 +4369,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))
@@ -4343,13 +4392,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;
}
@@ -4435,6 +4478,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;
@@ -4494,7 +4545,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))
@@ -4511,13 +4561,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;
}
@@ -4555,7 +4599,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))
@@ -4572,13 +4615,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;
}
@@ -4678,7 +4715,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))
@@ -4695,13 +4731,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;
}
@@ -4712,7 +4742,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))
@@ -4729,13 +4758,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;
}
@@ -5011,6 +5034,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;
@@ -5343,6 +5374,7 @@ 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_wxPrinterDC",SwigwxPrinterDCTowxDC},
{ "_wxDC","_wxPrinterDC",SwigwxPrinterDCTowxDC},
{ "_wxDC","_class_wxDC",0},
@@ -5350,6 +5382,27 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_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_wxPrinterDC",SwigwxPrinterDCTowxObject},
{ "_class_wxObject","_wxPrinterDC",SwigwxPrinterDCTowxObject},
{ "_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},
@@ -5526,6 +5579,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_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_wxPrinterDC",SwigwxPrinterDCTowxObject},
{ "_wxObject","_wxPrinterDC",SwigwxPrinterDCTowxObject},
{ "_wxObject","_class_wxPrintData",SwigwxPrintDataTowxObject},
{ "_wxObject","_wxPrintData",SwigwxPrintDataTowxObject},
{ "_wxObject","_class_wxObject",0},
{ "_class_wxPoint","_wxPoint",0},
{ "_wxRealPoint","_class_wxRealPoint",0},
{ "_class_wxRadioBox","_wxRadioBox",0},
@@ -5588,6 +5662,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},
@@ -5714,6 +5789,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/msw/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
@@ -176,7 +176,7 @@ def wxPrinterDC2(*_args,**_kwargs):
return val
class wxPageSetupDialogDataPtr :
class wxPageSetupDialogDataPtr(wxObjectPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
@@ -305,7 +305,7 @@ class wxPageSetupDialog(wxPageSetupDialogPtr):
class wxPrintDialogDataPtr :
class wxPrintDialogDataPtr(wxObjectPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
@@ -399,7 +399,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)
@@ -415,7 +414,7 @@ class wxPrintDialog(wxPrintDialogPtr):
class wxPrintoutPtr :
class wxPrintoutPtr(wxObjectPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
@@ -427,7 +426,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)
@@ -476,7 +474,7 @@ class wxPrintout(wxPrintoutPtr):
class wxPrinterPtr :
class wxPrinterPtr(wxObjectPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
@@ -495,7 +493,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)
@@ -513,20 +510,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)
@@ -540,11 +535,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)

Some files were not shown because too many files have changed in this diff Show More