Mirrors_UI_SDK/wxWidgets
1
0
Fork 0
mirror of https://github.com/wxWidgets/wxWidgets.git synced 2026-09-24 15:45:11 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Added wxPalette, wxRegion, wxRegionIterator, wxTaskbarIcon

Browse Source 
Added events for wxGrid
Other various fixes and additions


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1044 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
1998-11-25 08:47:28 +00:00
parent 7f985bd39a
commit b639c3c5ef
31 changed files with 2173 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files
utils/wxPython/src/_extras.py
+63 -3
View File
@@ -347,7 +347,7 @@ def EVT_NOTEBOOK_PAGE_CHANGING(win, id, func):
win.Connect(id, -1, wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, func)
#wxTreeCtrl events
# wxTreeCtrl events
def EVT_TREE_BEGIN_DRAG(win, id, func):
win.Connect(id, -1, wxEVT_COMMAND_TREE_BEGIN_DRAG, func)
@@ -391,7 +391,7 @@ def EVT_TREE_DELETE_ITEM(win, id, func):
win.Connect(id, -1, wxEVT_COMMAND_TREE_DELETE_ITEM, func)
# wxSpinButton
def EVT_SPIN_UP(win, id, func):
win.Connect(id, -1, wxEVT_SCROLL_LINEUP, func)
@@ -409,6 +409,61 @@ def EVT_SPIN(win, id, func):
# wxTaskBarIcon
def EVT_TASKBAR_MOVE(win, func):
win.Connect(-1, -1, wxEVT_TASKBAR_MOVE, func)
def EVT_TASKBAR_LEFT_DOWN(win, func):
win.Connect(-1, -1, wxEVT_TASKBAR_LEFT_DOWN, func)
def EVT_TASKBAR_LEFT_UP(win, func):
win.Connect(-1, -1, wxEVT_TASKBAR_LEFT_UP, func)
def EVT_TASKBAR_RIGHT_DOWN(win, func):
win.Connect(-1, -1, wxEVT_TASKBAR_RIGHT_DOWN, func)
def EVT_TASKBAR_RIGHT_UP(win, func):
win.Connect(-1, -1, wxEVT_TASKBAR_RIGHT_UP, func)
def EVT_TASKBAR_LEFT_DCLICK(win, func):
win.Connect(-1, -1, wxEVT_TASKBAR_LEFT_DCLICK, func)
def EVT_TASKBAR_RIGHT_DCLICK(win, func):
win.Connect(-1, -1, wxEVT_TASKBAR_RIGHT_DCLICK, func)
# wxGrid
def EVT_GRID_SELECT_CELL(win, fn):
win.Connect(-1, -1, wxEVT_GRID_SELECT_CELL, fn)
def EVT_GRID_CREATE_CELL(win, fn):
win.Connect(-1, -1, wxEVT_GRID_CREATE_CELL, fn)
def EVT_GRID_CHANGE_LABELS(win, fn):
win.Connect(-1, -1, wxEVT_GRID_CHANGE_LABELS, fn)
def EVT_GRID_CHANGE_SEL_LABEL(win, fn):
win.Connect(-1, -1, wxEVT_GRID_CHANGE_SEL_LABEL, fn)
def EVT_GRID_CELL_CHANGE(win, fn):
win.Connect(-1, -1, wxEVT_GRID_CELL_CHANGE, fn)
def EVT_GRID_CELL_LCLICK(win, fn):
win.Connect(-1, -1, wxEVT_GRID_CELL_LCLICK, fn)
def EVT_GRID_CELL_RCLICK(win, fn):
win.Connect(-1, -1, wxEVT_GRID_CELL_RCLICK, fn)
def EVT_GRID_LABEL_LCLICK(win, fn):
win.Connect(-1, -1, wxEVT_GRID_LABEL_LCLICK, fn)
def EVT_GRID_LABEL_RCLICK(win, fn):
win.Connect(-1, -1, wxEVT_GRID_LABEL_RCLICK, fn)
#----------------------------------------------------------------------
class wxTimer(wxPyTimer):
@@ -430,7 +485,7 @@ NULL = NullObj()
#----------------------------------------------------------------------
# aliases
wxColor = wxColour
wxColor = wxColour
wxNamedColor = wxNamedColour
wxPyDefaultPosition.Set(-1,-1)
@@ -503,6 +558,11 @@ class wxApp(wxPyApp):
#----------------------------------------------------------------------------
#
# $Log$
# Revision 1.7 1998/11/25 08:45:21 RD
# Added wxPalette, wxRegion, wxRegionIterator, wxTaskbarIcon
# Added events for wxGrid
# Other various fixes and additions
#
# Revision 1.6 1998/11/16 00:00:52 RD
# Generic treectrl for wxPython/GTK compiles...
#
utils/wxPython/src/cmndlgs.i
+6 -1
View File
@@ -285,7 +285,7 @@ public:
%pragma(python) addtomethod = "__init__:wxp._StdDialogCallbacks(self)"
wxPrintData& GetPrintData();
wxDC* GetPrintDC();
%new wxDC* GetPrintDC();
int ShowModal();
};
@@ -310,6 +310,11 @@ public:
/////////////////////////////////////////////////////////////////////////////
//
// $Log$
// Revision 1.6 1998/11/25 08:45:22 RD
// Added wxPalette, wxRegion, wxRegionIterator, wxTaskbarIcon
// Added events for wxGrid
// Other various fixes and additions
//
// Revision 1.5 1998/11/15 23:03:43 RD
// Removing some ifdef's for wxGTK
//
utils/wxPython/src/controls2.i
+5 -5
View File
@@ -16,9 +16,6 @@
#include "helpers.h"
#include <wx/listctrl.h>
#include <wx/treectrl.h>
#if 0
#include <wx/tabctrl.h>
#endif
%}
//----------------------------------------------------------------------
@@ -181,7 +178,6 @@ public:
//----------------------------------------------------------------------
//#ifdef __WXMSW__
class wxTreeItemId {
public:
wxTreeItemId();
@@ -322,7 +318,6 @@ public:
};
//#endif
//----------------------------------------------------------------------
@@ -384,6 +379,11 @@ public:
/////////////////////////////////////////////////////////////////////////////
//
// $Log$
// Revision 1.10 1998/11/25 08:45:23 RD
// Added wxPalette, wxRegion, wxRegionIterator, wxTaskbarIcon
// Added events for wxGrid
// Other various fixes and additions
//
// Revision 1.9 1998/11/16 00:00:54 RD
// Generic treectrl for wxPython/GTK compiles...
//
utils/wxPython/src/gdi.i
+29
View File
@@ -402,6 +402,15 @@ public:
//---------------------------------------------------------------------------
#ifdef __WXMSW__
class wxWindowDC : public wxDC {
public:
wxWindowDC(wxWindow* win);
};
#endif
//---------------------------------------------------------------------------
#ifndef __WXMSW__
class wxPostScriptDC : public wxDC {
public:
@@ -482,11 +491,31 @@ extern wxPalette wxNullPalette;
extern wxFont wxNullFont;
extern wxColour wxNullColour;
//---------------------------------------------------------------------------
class wxPalette {
public:
wxPalette(int LCOUNT, byte* LIST, byte* LIST, byte* LIST);
~wxPalette();
int GetPixel(byte red, byte green, byte blue);
bool GetRGB(int pixel, byte* OUTPUT, byte* OUTPUT, byte* OUTPUT);
bool Ok();
};
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
/////////////////////////////////////////////////////////////////////////////
//
// $Log$
// Revision 1.6 1998/11/25 08:45:24 RD
// Added wxPalette, wxRegion, wxRegionIterator, wxTaskbarIcon
// Added events for wxGrid
// Other various fixes and additions
//
// Revision 1.5 1998/10/20 06:43:57 RD
// New wxTreeCtrl wrappers (untested)
// some changes in helpers
utils/wxPython/src/helpers.cpp
+28
View File
@@ -370,6 +370,29 @@ void wxPyTimer::Notify() {
// imcluded in every file...
byte* byte_LIST_helper(PyObject* source) {
if (!PyList_Check(source)) {
PyErr_SetString(PyExc_TypeError, "Expected a list object.");
return NULL;
}
int count = PyList_Size(source);
byte* temp = new byte[count];
if (! temp) {
PyErr_SetString(PyExc_MemoryError, "Unable to allocate temporary array");
return NULL;
}
for (int x=0; x<count; x++) {
PyObject* o = PyList_GetItem(source, x);
if (! PyInt_Check(o)) {
PyErr_SetString(PyExc_TypeError, "Expected a list of integers.");
return NULL;
}
temp[x] = (byte)PyInt_AsLong(o);
}
return temp;
}
int* int_LIST_helper(PyObject* source) {
if (!PyList_Check(source)) {
PyErr_SetString(PyExc_TypeError, "Expected a list object.");
@@ -579,6 +602,11 @@ wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source) {
/////////////////////////////////////////////////////////////////////////////
//
// $Log$
// Revision 1.14 1998/11/25 08:45:25 RD
// Added wxPalette, wxRegion, wxRegionIterator, wxTaskbarIcon
// Added events for wxGrid
// Other various fixes and additions
//
// Revision 1.13 1998/11/15 23:03:45 RD
// Removing some ifdef's for wxGTK
//
utils/wxPython/src/helpers.h
+8
View File
@@ -54,6 +54,8 @@ extern "C" char *SWIG_GetPtr(char *, void **, char *);
# pragma warning(disable:4800)
#endif
typedef unsigned char byte;
// Non-const versions to keep SWIG happy.
extern wxPoint wxPyDefaultPosition;
@@ -102,7 +104,13 @@ private:
/////////////////////////////////////////////////////////////////////////////
//
// $Log$
// Revision 1.6 1998/11/25 08:45:26 RD
// Added wxPalette, wxRegion, wxRegionIterator, wxTaskbarIcon
// Added events for wxGrid
// Other various fixes and additions
//
// Revision 1.5 1998/10/02 06:40:40 RD
//
// Version 0.4 of wxPython for MSW.
//
// Revision 1.4 1998/08/27 21:59:09 RD
utils/wxPython/src/misc.i
+57
View File
@@ -279,6 +279,58 @@ public:
}
//---------------------------------------------------------------------------
// Regions, etc.
enum wxRegionContain {
wxOutRegion, wxPartRegion, wxInRegion
};
class wxRegion {
public:
wxRegion();
~wxRegion();
void Clear();
wxRegionContain Contains(long x, long y);
%name(ContainsPoint)wxRegionContain Contains(const wxPoint& pt);
%name(ContainsRect)wxRegionContain Contains(const wxRect& rect);
wxRect GetBox();
bool Intersect(const wxRect& rect);
bool IsEmpty();
bool Subtract(const wxRect& rect);
bool Union(const wxRect& rect);
bool Xor(const wxRect& rect);
};
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
@@ -306,6 +358,11 @@ public:
/////////////////////////////////////////////////////////////////////////////
//
// $Log$
// Revision 1.7 1998/11/25 08:45:27 RD
// Added wxPalette, wxRegion, wxRegionIterator, wxTaskbarIcon
// Added events for wxGrid
// Other various fixes and additions
//
// Revision 1.6 1998/11/15 23:03:46 RD
// Removing some ifdef's for wxGTK
//
utils/wxPython/src/msw/cmndlgs.cpp
+9 -2
View File
@@ -106,15 +106,14 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
}
extern byte* byte_LIST_helper(PyObject* source);
extern int* int_LIST_helper(PyObject* source);
extern long* long_LIST_helper(PyObject* source);
extern char** string_LIST_helper(PyObject* source);
extern wxPoint* wxPoint_LIST_helper(PyObject* source);
extern wxBitmap** wxBitmap_LIST_helper(PyObject* source);
extern wxString* wxString_LIST_helper(PyObject* source);
#ifdef __WXMSW__
extern wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source);
#endif
static char* wxStringErrorMsg = "string type is required for parameter";
@@ -3546,6 +3545,7 @@ SWIGEXPORT(void,initcmndlgsc)() {
SWIG_RegisterMapping("_wxAcceleratorTable","_class_wxAcceleratorTable",0);
SWIG_RegisterMapping("_signed_long","_long",0);
SWIG_RegisterMapping("_wxFontData","_class_wxFontData",0);
SWIG_RegisterMapping("_class_wxRegionIterator","_wxRegionIterator",0);
SWIG_RegisterMapping("_class_wxMenuBar","_wxMenuBar",0);
SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxMessageDialog",SwigwxMessageDialogTowxEvtHandler);
SWIG_RegisterMapping("_class_wxEvtHandler","_wxMessageDialog",SwigwxMessageDialogTowxEvtHandler);
@@ -3635,6 +3635,7 @@ SWIGEXPORT(void,initcmndlgsc)() {
SWIG_RegisterMapping("_wxBitmap","_class_wxBitmap",0);
SWIG_RegisterMapping("_wxPrintDialog","_class_wxPrintDialog",0);
SWIG_RegisterMapping("_wxPyTimer","_class_wxPyTimer",0);
SWIG_RegisterMapping("_wxWindowDC","_class_wxWindowDC",0);
SWIG_RegisterMapping("_wxColourDialog","_class_wxColourDialog",0);
SWIG_RegisterMapping("_wxPrintData","_class_wxPrintData",0);
SWIG_RegisterMapping("_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0);
@@ -3643,6 +3644,7 @@ SWIGEXPORT(void,initcmndlgsc)() {
SWIG_RegisterMapping("_EBool","_signed_int",0);
SWIG_RegisterMapping("_EBool","_int",0);
SWIG_RegisterMapping("_EBool","_wxWindowID",0);
SWIG_RegisterMapping("_class_wxRegion","_wxRegion",0);
SWIG_RegisterMapping("_wxFont","_class_wxFont",0);
SWIG_RegisterMapping("_unsigned_long","_wxDash",0);
SWIG_RegisterMapping("_unsigned_long","_long",0);
@@ -3714,6 +3716,7 @@ SWIGEXPORT(void,initcmndlgsc)() {
SWIG_RegisterMapping("_wxMemoryDC","_class_wxMemoryDC",0);
SWIG_RegisterMapping("_class_wxPrintDialog","_wxPrintDialog",0);
SWIG_RegisterMapping("_wxPaintDC","_class_wxPaintDC",0);
SWIG_RegisterMapping("_class_wxWindowDC","_wxWindowDC",0);
SWIG_RegisterMapping("_class_wxAcceleratorEntry","_wxAcceleratorEntry",0);
SWIG_RegisterMapping("_class_wxCursor","_wxCursor",0);
SWIG_RegisterMapping("_wxScrolledWindow","_class_wxScrolledWindow",0);
@@ -3760,6 +3763,7 @@ SWIGEXPORT(void,initcmndlgsc)() {
SWIG_RegisterMapping("_int","_unsigned_int",0);
SWIG_RegisterMapping("_int","_signed_int",0);
SWIG_RegisterMapping("_wxSize","_class_wxSize",0);
SWIG_RegisterMapping("_wxRegionIterator","_class_wxRegionIterator",0);
SWIG_RegisterMapping("_class_wxPrinterDC","_wxPrinterDC",0);
SWIG_RegisterMapping("_class_wxPaintDC","_wxPaintDC",0);
SWIG_RegisterMapping("_class_wxLayoutConstraints","_wxLayoutConstraints",0);
@@ -3767,7 +3771,9 @@ SWIGEXPORT(void,initcmndlgsc)() {
SWIG_RegisterMapping("_class_wxColour","_wxColour",0);
SWIG_RegisterMapping("_class_wxScreenDC","_wxScreenDC",0);
SWIG_RegisterMapping("_class_wxPageSetupDialog","_wxPageSetupDialog",0);
SWIG_RegisterMapping("_wxPalette","_class_wxPalette",0);
SWIG_RegisterMapping("_wxFontDialog","_class_wxFontDialog",0);
SWIG_RegisterMapping("_wxRegion","_class_wxRegion",0);
SWIG_RegisterMapping("_class_wxClientDC","_wxClientDC",0);
SWIG_RegisterMapping("_class_wxSize","_wxSize",0);
SWIG_RegisterMapping("_class_wxBitmap","_wxBitmap",0);
@@ -3801,6 +3807,7 @@ SWIGEXPORT(void,initcmndlgsc)() {
SWIG_RegisterMapping("_class_wxScrolledWindow","_wxScrolledWindow",0);
SWIG_RegisterMapping("_class_wxTextEntryDialog","_wxTextEntryDialog",0);
SWIG_RegisterMapping("_wxColourData","_class_wxColourData",0);
SWIG_RegisterMapping("_class_wxPalette","_wxPalette",0);
SWIG_RegisterMapping("_class_wxFontDialog","_wxFontDialog",0);
SWIG_RegisterMapping("_wxWindow","_class_wxMessageDialog",SwigwxMessageDialogTowxWindow);
SWIG_RegisterMapping("_wxWindow","_wxMessageDialog",SwigwxMessageDialogTowxWindow);
utils/wxPython/src/msw/cmndlgs.py
+1
View File
@@ -539,6 +539,7 @@ class wxPrintDialogPtr(wxDialogPtr):
def GetPrintDC(self):
val = cmndlgsc.wxPrintDialog_GetPrintDC(self.this)
val = wxDCPtr(val)
val.thisown = 1
return val
def ShowModal(self):
val = cmndlgsc.wxPrintDialog_ShowModal(self.this)
utils/wxPython/src/msw/controls.cpp
+8 -3
View File
@@ -55,9 +55,9 @@ extern PyObject *SWIG_newvarlink(void);
#include "helpers.h"
#include <wx/slider.h>
#include <wx/spinbutt.h>
#ifdef __WXMSW__
#include <wx/spinbutt.h>
#if wxUSE_OWNER_DRAWN
#include <wx/checklst.h>
#endif
@@ -110,15 +110,14 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
}
extern byte* byte_LIST_helper(PyObject* source);
extern int* int_LIST_helper(PyObject* source);
extern long* long_LIST_helper(PyObject* source);
extern char** string_LIST_helper(PyObject* source);
extern wxPoint* wxPoint_LIST_helper(PyObject* source);
extern wxBitmap** wxBitmap_LIST_helper(PyObject* source);
extern wxString* wxString_LIST_helper(PyObject* source);
#ifdef __WXMSW__
extern wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source);
#endif
static char* wxStringErrorMsg = "string type is required for parameter";
@@ -5509,6 +5508,7 @@ SWIGEXPORT(void,initcontrolsc)() {
SWIG_RegisterMapping("_class_wxAcceleratorTable","_wxAcceleratorTable",0);
SWIG_RegisterMapping("_class_wxGauge","_wxGauge",0);
SWIG_RegisterMapping("_wxDC","_class_wxDC",0);
SWIG_RegisterMapping("_wxSpinEvent","_class_wxSpinEvent",0);
SWIG_RegisterMapping("_class_wxRealPoint","_wxRealPoint",0);
SWIG_RegisterMapping("_wxPrinterDC","_class_wxPrinterDC",0);
SWIG_RegisterMapping("_class_wxMenuItem","_wxMenuItem",0);
@@ -5541,6 +5541,7 @@ SWIGEXPORT(void,initcontrolsc)() {
SWIG_RegisterMapping("_wxRadioBox","_class_wxRadioBox",0);
SWIG_RegisterMapping("_wxBitmap","_class_wxBitmap",0);
SWIG_RegisterMapping("_wxPyTimer","_class_wxPyTimer",0);
SWIG_RegisterMapping("_wxWindowDC","_class_wxWindowDC",0);
SWIG_RegisterMapping("_wxScrollBar","_class_wxScrollBar",0);
SWIG_RegisterMapping("_wxSpinButton","_class_wxSpinButton",0);
SWIG_RegisterMapping("_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0);
@@ -5635,6 +5636,7 @@ SWIGEXPORT(void,initcontrolsc)() {
SWIG_RegisterMapping("_signed_short","_short",0);
SWIG_RegisterMapping("_wxMemoryDC","_class_wxMemoryDC",0);
SWIG_RegisterMapping("_wxPaintDC","_class_wxPaintDC",0);
SWIG_RegisterMapping("_class_wxWindowDC","_wxWindowDC",0);
SWIG_RegisterMapping("_class_wxFocusEvent","_wxFocusEvent",0);
SWIG_RegisterMapping("_class_wxMaximizeEvent","_wxMaximizeEvent",0);
SWIG_RegisterMapping("_class_wxAcceleratorEntry","_wxAcceleratorEntry",0);
@@ -5708,6 +5710,7 @@ SWIGEXPORT(void,initcontrolsc)() {
SWIG_RegisterMapping("_int","_unsigned_int",0);
SWIG_RegisterMapping("_int","_signed_int",0);
SWIG_RegisterMapping("_class_wxMouseEvent","_wxMouseEvent",0);
SWIG_RegisterMapping("_class_wxSpinEvent","_wxSpinEvent",0);
SWIG_RegisterMapping("_wxButton","_class_wxBitmapButton",SwigwxBitmapButtonTowxButton);
SWIG_RegisterMapping("_wxButton","_wxBitmapButton",SwigwxBitmapButtonTowxButton);
SWIG_RegisterMapping("_wxButton","_class_wxButton",0);
@@ -5759,6 +5762,7 @@ SWIGEXPORT(void,initcontrolsc)() {
SWIG_RegisterMapping("_class_wxIcon","_wxIcon",0);
SWIG_RegisterMapping("_class_wxColour","_wxColour",0);
SWIG_RegisterMapping("_class_wxScreenDC","_wxScreenDC",0);
SWIG_RegisterMapping("_wxPalette","_class_wxPalette",0);
SWIG_RegisterMapping("_class_wxIdleEvent","_wxIdleEvent",0);
SWIG_RegisterMapping("_wxEraseEvent","_class_wxEraseEvent",0);
SWIG_RegisterMapping("_class_wxJoystickEvent","_wxJoystickEvent",0);
@@ -5817,6 +5821,7 @@ SWIGEXPORT(void,initcontrolsc)() {
SWIG_RegisterMapping("_class_wxScrolledWindow","_wxScrolledWindow",0);
SWIG_RegisterMapping("_wxKeyEvent","_class_wxKeyEvent",0);
SWIG_RegisterMapping("_wxMoveEvent","_class_wxMoveEvent",0);
SWIG_RegisterMapping("_class_wxPalette","_wxPalette",0);
SWIG_RegisterMapping("_class_wxEraseEvent","_wxEraseEvent",0);
SWIG_RegisterMapping("_wxWindow","_class_wxSlider",SwigwxSliderTowxWindow);
SWIG_RegisterMapping("_wxWindow","_wxSlider",SwigwxSliderTowxWindow);
utils/wxPython/src/msw/controls2.cpp
+7 -57
View File
@@ -56,9 +56,6 @@ extern PyObject *SWIG_newvarlink(void);
#include "helpers.h"
#include <wx/listctrl.h>
#include <wx/treectrl.h>
#if 0
#include <wx/tabctrl.h>
#endif
static PyObject* l_output_helper(PyObject* target, PyObject* o) {
PyObject* o2;
@@ -107,15 +104,14 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
}
extern byte* byte_LIST_helper(PyObject* source);
extern int* int_LIST_helper(PyObject* source);
extern long* long_LIST_helper(PyObject* source);
extern char** string_LIST_helper(PyObject* source);
extern wxPoint* wxPoint_LIST_helper(PyObject* source);
extern wxBitmap** wxBitmap_LIST_helper(PyObject* source);
extern wxString* wxString_LIST_helper(PyObject* source);
#ifdef __WXMSW__
extern wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source);
#endif
static char* wxStringErrorMsg = "string type is required for parameter";
@@ -2010,27 +2006,6 @@ static PyObject *_wrap_wxTreeItemId_IsOk(PyObject *self, PyObject *args) {
return _resultobj;
}
static long wxTreeItemId_GetId(wxTreeItemId *self) { return (long)(*self); }
static PyObject *_wrap_wxTreeItemId_GetId(PyObject *self, PyObject *args) {
PyObject * _resultobj;
long _result;
wxTreeItemId * _arg0;
char * _argc0 = 0;
self = self;
if(!PyArg_ParseTuple(args,"s:wxTreeItemId_GetId",&_argc0))
return NULL;
if (_argc0) {
if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeItemId_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeItemId_GetId. Expected _wxTreeItemId_p.");
return NULL;
}
}
_result = (long )wxTreeItemId_GetId(_arg0);
_resultobj = Py_BuildValue("l",_result);
return _resultobj;
}
#define new_wxTreeItemData() (new wxTreeItemData())
static PyObject *_wrap_new_wxTreeItemData(PyObject *self, PyObject *args) {
PyObject * _resultobj;
@@ -3755,37 +3730,7 @@ static PyObject *_wrap_wxTreeCtrl_EndEditLabel(PyObject *self, PyObject *args) {
return _resultobj;
}
#define wxTreeCtrl_SortChildren(_swigobj,_swigarg0) (_swigobj->SortChildren(_swigarg0))
static PyObject *_wrap_wxTreeCtrl_SortChildren(PyObject *self, PyObject *args) {
PyObject * _resultobj;
wxTreeCtrl * _arg0;
wxTreeItemId * _arg1;
char * _argc0 = 0;
char * _argc1 = 0;
self = self;
if(!PyArg_ParseTuple(args,"ss:wxTreeCtrl_SortChildren",&_argc0,&_argc1))
return NULL;
if (_argc0) {
if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeCtrl_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_SortChildren. Expected _wxTreeCtrl_p.");
return NULL;
}
}
if (_argc1) {
if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxTreeItemId_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_SortChildren. Expected _wxTreeItemId_p.");
return NULL;
}
}
wxTreeCtrl_SortChildren(_arg0,*_arg1);
Py_INCREF(Py_None);
_resultobj = Py_None;
return _resultobj;
}
static PyMethodDef controls2cMethods[] = {
{ "wxTreeCtrl_SortChildren", _wrap_wxTreeCtrl_SortChildren, 1 },
{ "wxTreeCtrl_EndEditLabel", _wrap_wxTreeCtrl_EndEditLabel, 1 },
{ "wxTreeCtrl_GetEditControl", _wrap_wxTreeCtrl_GetEditControl, 1 },
{ "wxTreeCtrl_EditLabel", _wrap_wxTreeCtrl_EditLabel, 1 },
@@ -3842,7 +3787,6 @@ static PyMethodDef controls2cMethods[] = {
{ "wxTreeItemData_GetId", _wrap_wxTreeItemData_GetId, 1 },
{ "delete_wxTreeItemData", _wrap_delete_wxTreeItemData, 1 },
{ "new_wxTreeItemData", _wrap_new_wxTreeItemData, 1 },
{ "wxTreeItemId_GetId", _wrap_wxTreeItemId_GetId, 1 },
{ "wxTreeItemId_IsOk", _wrap_wxTreeItemId_IsOk, 1 },
{ "delete_wxTreeItemId", _wrap_delete_wxTreeItemId, 1 },
{ "new_wxTreeItemId", _wrap_new_wxTreeItemId, 1 },
@@ -3968,6 +3912,7 @@ SWIGEXPORT(void,initcontrols2c)() {
SWIG_RegisterMapping("_class_wxGauge","_wxGauge",0);
SWIG_RegisterMapping("_wxDC","_class_wxDC",0);
SWIG_RegisterMapping("_wxListEvent","_class_wxListEvent",0);
SWIG_RegisterMapping("_wxSpinEvent","_class_wxSpinEvent",0);
SWIG_RegisterMapping("_class_wxRealPoint","_wxRealPoint",0);
SWIG_RegisterMapping("_wxPrinterDC","_class_wxPrinterDC",0);
SWIG_RegisterMapping("_class_wxMenuItem","_wxMenuItem",0);
@@ -4007,6 +3952,7 @@ SWIGEXPORT(void,initcontrols2c)() {
SWIG_RegisterMapping("_wxTreeItemData","_class_wxTreeItemData",0);
SWIG_RegisterMapping("_wxBitmap","_class_wxBitmap",0);
SWIG_RegisterMapping("_wxPyTimer","_class_wxPyTimer",0);
SWIG_RegisterMapping("_wxWindowDC","_class_wxWindowDC",0);
SWIG_RegisterMapping("_wxScrollBar","_class_wxScrollBar",0);
SWIG_RegisterMapping("_wxSpinButton","_class_wxSpinButton",0);
SWIG_RegisterMapping("_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0);
@@ -4070,6 +4016,7 @@ SWIGEXPORT(void,initcontrols2c)() {
SWIG_RegisterMapping("_signed_short","_short",0);
SWIG_RegisterMapping("_wxMemoryDC","_class_wxMemoryDC",0);
SWIG_RegisterMapping("_wxPaintDC","_class_wxPaintDC",0);
SWIG_RegisterMapping("_class_wxWindowDC","_wxWindowDC",0);
SWIG_RegisterMapping("_class_wxFocusEvent","_wxFocusEvent",0);
SWIG_RegisterMapping("_class_wxMaximizeEvent","_wxMaximizeEvent",0);
SWIG_RegisterMapping("_class_wxAcceleratorEntry","_wxAcceleratorEntry",0);
@@ -4114,6 +4061,7 @@ SWIGEXPORT(void,initcontrols2c)() {
SWIG_RegisterMapping("_int","_signed_int",0);
SWIG_RegisterMapping("_class_wxMouseEvent","_wxMouseEvent",0);
SWIG_RegisterMapping("_class_wxListEvent","_wxListEvent",0);
SWIG_RegisterMapping("_class_wxSpinEvent","_wxSpinEvent",0);
SWIG_RegisterMapping("_wxButton","_class_wxButton",0);
SWIG_RegisterMapping("_wxSize","_class_wxSize",0);
SWIG_RegisterMapping("_class_wxPrinterDC","_wxPrinterDC",0);
@@ -4135,6 +4083,7 @@ SWIGEXPORT(void,initcontrols2c)() {
SWIG_RegisterMapping("_class_wxIcon","_wxIcon",0);
SWIG_RegisterMapping("_class_wxColour","_wxColour",0);
SWIG_RegisterMapping("_class_wxScreenDC","_wxScreenDC",0);
SWIG_RegisterMapping("_wxPalette","_class_wxPalette",0);
SWIG_RegisterMapping("_class_wxIdleEvent","_wxIdleEvent",0);
SWIG_RegisterMapping("_wxEraseEvent","_class_wxEraseEvent",0);
SWIG_RegisterMapping("_class_wxJoystickEvent","_wxJoystickEvent",0);
@@ -4168,6 +4117,7 @@ SWIGEXPORT(void,initcontrols2c)() {
SWIG_RegisterMapping("_class_wxScrolledWindow","_wxScrolledWindow",0);
SWIG_RegisterMapping("_wxKeyEvent","_class_wxKeyEvent",0);
SWIG_RegisterMapping("_wxMoveEvent","_class_wxMoveEvent",0);
SWIG_RegisterMapping("_class_wxPalette","_wxPalette",0);
SWIG_RegisterMapping("_class_wxEraseEvent","_wxEraseEvent",0);
SWIG_RegisterMapping("_wxWindow","_class_wxTreeCtrl",SwigwxTreeCtrlTowxWindow);
SWIG_RegisterMapping("_wxWindow","_wxTreeCtrl",SwigwxTreeCtrlTowxWindow);
utils/wxPython/src/msw/controls2.py
-6
View File
@@ -328,9 +328,6 @@ class wxTreeItemIdPtr :
def IsOk(self):
val = controls2c.wxTreeItemId_IsOk(self.this)
return val
def GetId(self):
val = controls2c.wxTreeItemId_GetId(self.this)
return val
def __repr__(self):
return "<C wxTreeItemId instance>"
class wxTreeItemId(wxTreeItemIdPtr):
@@ -584,9 +581,6 @@ class wxTreeCtrlPtr(wxControlPtr):
def EndEditLabel(self,arg0,*args):
val = apply(controls2c.wxTreeCtrl_EndEditLabel,(self.this,arg0.this,)+args)
return val
def SortChildren(self,arg0):
val = controls2c.wxTreeCtrl_SortChildren(self.this,arg0.this)
return val
def __repr__(self):
return "<C wxTreeCtrl instance>"
class wxTreeCtrl(wxTreeCtrlPtr):
utils/wxPython/src/msw/events.cpp
+40 -2
View File
@@ -54,6 +54,7 @@ extern PyObject *SWIG_newvarlink(void);
#define SWIG_name "eventsc"
#include "helpers.h"
#include <wx/spinbutt.h>
static PyObject* l_output_helper(PyObject* target, PyObject* o) {
PyObject* o2;
@@ -102,15 +103,14 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
}
extern byte* byte_LIST_helper(PyObject* source);
extern int* int_LIST_helper(PyObject* source);
extern long* long_LIST_helper(PyObject* source);
extern char** string_LIST_helper(PyObject* source);
extern wxPoint* wxPoint_LIST_helper(PyObject* source);
extern wxBitmap** wxBitmap_LIST_helper(PyObject* source);
extern wxString* wxString_LIST_helper(PyObject* source);
#ifdef __WXMSW__
extern wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source);
#endif
static char* wxStringErrorMsg = "string type is required for parameter";
@@ -682,6 +682,30 @@ static PyObject *_wrap_wxScrollEvent_GetPosition(PyObject *self, PyObject *args)
return _resultobj;
}
static void *SwigwxSpinEventTowxScrollEvent(void *ptr) {
wxSpinEvent *src;
wxScrollEvent *dest;
src = (wxSpinEvent *) ptr;
dest = (wxScrollEvent *) src;
return (void *) dest;
}
static void *SwigwxSpinEventTowxCommandEvent(void *ptr) {
wxSpinEvent *src;
wxCommandEvent *dest;
src = (wxSpinEvent *) ptr;
dest = (wxCommandEvent *) src;
return (void *) dest;
}
static void *SwigwxSpinEventTowxEvent(void *ptr) {
wxSpinEvent *src;
wxEvent *dest;
src = (wxSpinEvent *) ptr;
dest = (wxEvent *) src;
return (void *) dest;
}
static void *SwigwxMouseEventTowxEvent(void *ptr) {
wxMouseEvent *src;
wxEvent *dest;
@@ -2669,6 +2693,8 @@ SWIGEXPORT(void,initeventsc)() {
SWIG_RegisterMapping("_wxEvent","_wxKeyEvent",SwigwxKeyEventTowxEvent);
SWIG_RegisterMapping("_wxEvent","_class_wxMouseEvent",SwigwxMouseEventTowxEvent);
SWIG_RegisterMapping("_wxEvent","_wxMouseEvent",SwigwxMouseEventTowxEvent);
SWIG_RegisterMapping("_wxEvent","_class_wxSpinEvent",SwigwxSpinEventTowxEvent);
SWIG_RegisterMapping("_wxEvent","_wxSpinEvent",SwigwxSpinEventTowxEvent);
SWIG_RegisterMapping("_wxEvent","_class_wxScrollEvent",SwigwxScrollEventTowxEvent);
SWIG_RegisterMapping("_wxEvent","_wxScrollEvent",SwigwxScrollEventTowxEvent);
SWIG_RegisterMapping("_wxEvent","_class_wxCommandEvent",SwigwxCommandEventTowxEvent);
@@ -2689,6 +2715,7 @@ SWIGEXPORT(void,initeventsc)() {
SWIG_RegisterMapping("_long","_signed_long",0);
SWIG_RegisterMapping("_wxDropFilesEvent","_class_wxDropFilesEvent",0);
SWIG_RegisterMapping("_class_wxAcceleratorTable","_wxAcceleratorTable",0);
SWIG_RegisterMapping("_wxSpinEvent","_class_wxSpinEvent",0);
SWIG_RegisterMapping("_class_wxRealPoint","_wxRealPoint",0);
SWIG_RegisterMapping("_class_wxPaintEvent","_wxPaintEvent",0);
SWIG_RegisterMapping("_wxSysColourChangedEvent","_class_wxSysColourChangedEvent",0);
@@ -2734,6 +2761,8 @@ SWIGEXPORT(void,initeventsc)() {
SWIG_RegisterMapping("_class_wxEvent","_wxKeyEvent",SwigwxKeyEventTowxEvent);
SWIG_RegisterMapping("_class_wxEvent","_class_wxMouseEvent",SwigwxMouseEventTowxEvent);
SWIG_RegisterMapping("_class_wxEvent","_wxMouseEvent",SwigwxMouseEventTowxEvent);
SWIG_RegisterMapping("_class_wxEvent","_class_wxSpinEvent",SwigwxSpinEventTowxEvent);
SWIG_RegisterMapping("_class_wxEvent","_wxSpinEvent",SwigwxSpinEventTowxEvent);
SWIG_RegisterMapping("_class_wxEvent","_class_wxScrollEvent",SwigwxScrollEventTowxEvent);
SWIG_RegisterMapping("_class_wxEvent","_wxScrollEvent",SwigwxScrollEventTowxEvent);
SWIG_RegisterMapping("_class_wxEvent","_class_wxCommandEvent",SwigwxCommandEventTowxEvent);
@@ -2744,6 +2773,8 @@ SWIGEXPORT(void,initeventsc)() {
SWIG_RegisterMapping("_class_wxEvent","_wxSizeEvent",SwigwxSizeEventTowxEvent);
SWIG_RegisterMapping("_class_wxEvent","_wxEvent",0);
SWIG_RegisterMapping("_wxRect","_class_wxRect",0);
SWIG_RegisterMapping("_wxCommandEvent","_class_wxSpinEvent",SwigwxSpinEventTowxCommandEvent);
SWIG_RegisterMapping("_wxCommandEvent","_wxSpinEvent",SwigwxSpinEventTowxCommandEvent);
SWIG_RegisterMapping("_wxCommandEvent","_class_wxScrollEvent",SwigwxScrollEventTowxCommandEvent);
SWIG_RegisterMapping("_wxCommandEvent","_wxScrollEvent",SwigwxScrollEventTowxCommandEvent);
SWIG_RegisterMapping("_wxCommandEvent","_class_wxCommandEvent",0);
@@ -2752,6 +2783,8 @@ SWIGEXPORT(void,initeventsc)() {
SWIG_RegisterMapping("_wxPyTimer","_class_wxPyTimer",0);
SWIG_RegisterMapping("_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0);
SWIG_RegisterMapping("_class_wxIconizeEvent","_wxIconizeEvent",0);
SWIG_RegisterMapping("_wxScrollEvent","_class_wxSpinEvent",SwigwxSpinEventTowxScrollEvent);
SWIG_RegisterMapping("_wxScrollEvent","_wxSpinEvent",SwigwxSpinEventTowxScrollEvent);
SWIG_RegisterMapping("_wxScrollEvent","_class_wxScrollEvent",0);
SWIG_RegisterMapping("_EBool","_signed_int",0);
SWIG_RegisterMapping("_EBool","_int",0);
@@ -2791,6 +2824,8 @@ SWIGEXPORT(void,initeventsc)() {
SWIG_RegisterMapping("_short","_WXTYPE",0);
SWIG_RegisterMapping("_short","_unsigned_short",0);
SWIG_RegisterMapping("_short","_signed_short",0);
SWIG_RegisterMapping("_class_wxScrollEvent","_class_wxSpinEvent",SwigwxSpinEventTowxScrollEvent);
SWIG_RegisterMapping("_class_wxScrollEvent","_wxSpinEvent",SwigwxSpinEventTowxScrollEvent);
SWIG_RegisterMapping("_class_wxScrollEvent","_wxScrollEvent",0);
SWIG_RegisterMapping("_wxJoystickEvent","_class_wxJoystickEvent",0);
SWIG_RegisterMapping("_wxWindowID","_EBool",0);
@@ -2804,6 +2839,7 @@ SWIGEXPORT(void,initeventsc)() {
SWIG_RegisterMapping("_int","_unsigned_int",0);
SWIG_RegisterMapping("_int","_signed_int",0);
SWIG_RegisterMapping("_class_wxMouseEvent","_wxMouseEvent",0);
SWIG_RegisterMapping("_class_wxSpinEvent","_wxSpinEvent",0);
SWIG_RegisterMapping("_wxSize","_class_wxSize",0);
SWIG_RegisterMapping("_class_wxSysColourChangedEvent","_wxSysColourChangedEvent",0);
SWIG_RegisterMapping("_class_wxInitDialogEvent","_wxInitDialogEvent",0);
@@ -2814,6 +2850,8 @@ SWIGEXPORT(void,initeventsc)() {
SWIG_RegisterMapping("_class_wxJoystickEvent","_wxJoystickEvent",0);
SWIG_RegisterMapping("_class_wxShowEvent","_wxShowEvent",0);
SWIG_RegisterMapping("_wxActivateEvent","_class_wxActivateEvent",0);
SWIG_RegisterMapping("_class_wxCommandEvent","_class_wxSpinEvent",SwigwxSpinEventTowxCommandEvent);
SWIG_RegisterMapping("_class_wxCommandEvent","_wxSpinEvent",SwigwxSpinEventTowxCommandEvent);
SWIG_RegisterMapping("_class_wxCommandEvent","_class_wxScrollEvent",SwigwxScrollEventTowxCommandEvent);
SWIG_RegisterMapping("_class_wxCommandEvent","_wxScrollEvent",SwigwxScrollEventTowxCommandEvent);
SWIG_RegisterMapping("_class_wxCommandEvent","_wxCommandEvent",0);
utils/wxPython/src/msw/events.py
+13
View File
@@ -141,6 +141,19 @@ class wxScrollEvent(wxScrollEventPtr):
class wxSpinEventPtr(wxScrollEventPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
def __repr__(self):
return "<C wxSpinEvent instance>"
class wxSpinEvent(wxSpinEventPtr):
def __init__(self,this):
self.this = this
class wxMouseEventPtr(wxEventPtr):
def __init__(self,this):
self.this = this
utils/wxPython/src/msw/frames.cpp
+7 -2
View File
@@ -106,15 +106,14 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
}
extern byte* byte_LIST_helper(PyObject* source);
extern int* int_LIST_helper(PyObject* source);
extern long* long_LIST_helper(PyObject* source);
extern char** string_LIST_helper(PyObject* source);
extern wxPoint* wxPoint_LIST_helper(PyObject* source);
extern wxBitmap** wxBitmap_LIST_helper(PyObject* source);
extern wxString* wxString_LIST_helper(PyObject* source);
#ifdef __WXMSW__
extern wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source);
#endif
static char* wxStringErrorMsg = "string type is required for parameter";
@@ -847,6 +846,7 @@ SWIGEXPORT(void,initframesc)() {
SWIG_RegisterMapping("_class_wxAcceleratorTable","_wxAcceleratorTable",0);
SWIG_RegisterMapping("_class_wxGauge","_wxGauge",0);
SWIG_RegisterMapping("_wxDC","_class_wxDC",0);
SWIG_RegisterMapping("_wxSpinEvent","_class_wxSpinEvent",0);
SWIG_RegisterMapping("_class_wxRealPoint","_wxRealPoint",0);
SWIG_RegisterMapping("_wxPrinterDC","_class_wxPrinterDC",0);
SWIG_RegisterMapping("_class_wxMenuItem","_wxMenuItem",0);
@@ -880,6 +880,7 @@ SWIGEXPORT(void,initframesc)() {
SWIG_RegisterMapping("_wxRadioBox","_class_wxRadioBox",0);
SWIG_RegisterMapping("_wxBitmap","_class_wxBitmap",0);
SWIG_RegisterMapping("_wxPyTimer","_class_wxPyTimer",0);
SWIG_RegisterMapping("_wxWindowDC","_class_wxWindowDC",0);
SWIG_RegisterMapping("_wxScrollBar","_class_wxScrollBar",0);
SWIG_RegisterMapping("_wxSpinButton","_class_wxSpinButton",0);
SWIG_RegisterMapping("_wxToolBarTool","_class_wxToolBarTool",0);
@@ -942,6 +943,7 @@ SWIGEXPORT(void,initframesc)() {
SWIG_RegisterMapping("_signed_short","_short",0);
SWIG_RegisterMapping("_wxMemoryDC","_class_wxMemoryDC",0);
SWIG_RegisterMapping("_wxPaintDC","_class_wxPaintDC",0);
SWIG_RegisterMapping("_class_wxWindowDC","_wxWindowDC",0);
SWIG_RegisterMapping("_class_wxFocusEvent","_wxFocusEvent",0);
SWIG_RegisterMapping("_class_wxMaximizeEvent","_wxMaximizeEvent",0);
SWIG_RegisterMapping("_wxStatusBar","_class_wxStatusBar",0);
@@ -984,6 +986,7 @@ SWIGEXPORT(void,initframesc)() {
SWIG_RegisterMapping("_int","_unsigned_int",0);
SWIG_RegisterMapping("_int","_signed_int",0);
SWIG_RegisterMapping("_class_wxMouseEvent","_wxMouseEvent",0);
SWIG_RegisterMapping("_class_wxSpinEvent","_wxSpinEvent",0);
SWIG_RegisterMapping("_wxButton","_class_wxButton",0);
SWIG_RegisterMapping("_wxSize","_class_wxSize",0);
SWIG_RegisterMapping("_class_wxPrinterDC","_wxPrinterDC",0);
@@ -999,6 +1002,7 @@ SWIGEXPORT(void,initframesc)() {
SWIG_RegisterMapping("_class_wxIcon","_wxIcon",0);
SWIG_RegisterMapping("_class_wxColour","_wxColour",0);
SWIG_RegisterMapping("_class_wxScreenDC","_wxScreenDC",0);
SWIG_RegisterMapping("_wxPalette","_class_wxPalette",0);
SWIG_RegisterMapping("_class_wxIdleEvent","_wxIdleEvent",0);
SWIG_RegisterMapping("_wxEraseEvent","_class_wxEraseEvent",0);
SWIG_RegisterMapping("_class_wxJoystickEvent","_wxJoystickEvent",0);
@@ -1026,6 +1030,7 @@ SWIGEXPORT(void,initframesc)() {
SWIG_RegisterMapping("_class_wxScrolledWindow","_wxScrolledWindow",0);
SWIG_RegisterMapping("_wxKeyEvent","_class_wxKeyEvent",0);
SWIG_RegisterMapping("_wxMoveEvent","_class_wxMoveEvent",0);
SWIG_RegisterMapping("_class_wxPalette","_wxPalette",0);
SWIG_RegisterMapping("_class_wxEraseEvent","_wxEraseEvent",0);
SWIG_RegisterMapping("_wxWindow","_class_wxMiniFrame",SwigwxMiniFrameTowxWindow);
SWIG_RegisterMapping("_wxWindow","_wxMiniFrame",SwigwxMiniFrameTowxWindow);
utils/wxPython/src/msw/gdi.cpp
+211 -2
View File
@@ -103,15 +103,14 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
}
extern byte* byte_LIST_helper(PyObject* source);
extern int* int_LIST_helper(PyObject* source);
extern long* long_LIST_helper(PyObject* source);
extern char** string_LIST_helper(PyObject* source);
extern wxPoint* wxPoint_LIST_helper(PyObject* source);
extern wxBitmap** wxBitmap_LIST_helper(PyObject* source);
extern wxString* wxString_LIST_helper(PyObject* source);
#ifdef __WXMSW__
extern wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source);
#endif
static char* wxStringErrorMsg = "string type is required for parameter";
@@ -4781,6 +4780,37 @@ static PyObject *_wrap_new_wxPaintDC(PyObject *self, PyObject *args) {
return _resultobj;
}
static void *SwigwxWindowDCTowxDC(void *ptr) {
wxWindowDC *src;
wxDC *dest;
src = (wxWindowDC *) ptr;
dest = (wxDC *) src;
return (void *) dest;
}
#define new_wxWindowDC(_swigarg0) (new wxWindowDC(_swigarg0))
static PyObject *_wrap_new_wxWindowDC(PyObject *self, PyObject *args) {
PyObject * _resultobj;
wxWindowDC * _result;
wxWindow * _arg0;
char * _argc0 = 0;
char _ptemp[128];
self = self;
if(!PyArg_ParseTuple(args,"s:new_wxWindowDC",&_argc0))
return NULL;
if (_argc0) {
if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxWindowDC. Expected _wxWindow_p.");
return NULL;
}
}
_result = (wxWindowDC *)new_wxWindowDC(_arg0);
SWIG_MakePtr(_ptemp, (char *) _result,"_wxWindowDC_p");
_resultobj = Py_BuildValue("s",_ptemp);
return _resultobj;
}
static void *SwigwxPrinterDCTowxDC(void *ptr) {
wxPrinterDC *src;
wxDC *dest;
@@ -4907,10 +4937,181 @@ static PyObject *_wrap_wxMetaFileDC_Close(PyObject *self, PyObject *args) {
return _resultobj;
}
#define new_wxPalette(_swigarg0,_swigarg1,_swigarg2,_swigarg3) (new wxPalette(_swigarg0,_swigarg1,_swigarg2,_swigarg3))
static PyObject *_wrap_new_wxPalette(PyObject *self, PyObject *args) {
PyObject * _resultobj;
wxPalette * _result;
int _arg0;
byte * _arg1;
byte * _arg2;
byte * _arg3;
PyObject * _obj1 = 0;
PyObject * _obj2 = 0;
PyObject * _obj3 = 0;
char _ptemp[128];
self = self;
if(!PyArg_ParseTuple(args,"OOO:new_wxPalette",&_obj1,&_obj2,&_obj3))
return NULL;
{
_arg1 = byte_LIST_helper(_obj1);
if (_arg1 == NULL) {
return NULL;
}
}
{
_arg2 = byte_LIST_helper(_obj2);
if (_arg2 == NULL) {
return NULL;
}
}
if (_obj3)
{
_arg3 = byte_LIST_helper(_obj3);
if (_arg3 == NULL) {
return NULL;
}
}
{
_arg0 = PyList_Size(_obj1);
}
_result = (wxPalette *)new_wxPalette(_arg0,_arg1,_arg2,_arg3);
SWIG_MakePtr(_ptemp, (char *) _result,"_wxPalette_p");
_resultobj = Py_BuildValue("s",_ptemp);
{
delete [] _arg1;
}
{
delete [] _arg2;
}
{
delete [] _arg3;
}
return _resultobj;
}
#define delete_wxPalette(_swigobj) (delete _swigobj)
static PyObject *_wrap_delete_wxPalette(PyObject *self, PyObject *args) {
PyObject * _resultobj;
wxPalette * _arg0;
char * _argc0 = 0;
self = self;
if(!PyArg_ParseTuple(args,"s:delete_wxPalette",&_argc0))
return NULL;
if (_argc0) {
if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPalette_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxPalette. Expected _wxPalette_p.");
return NULL;
}
}
delete_wxPalette(_arg0);
Py_INCREF(Py_None);
_resultobj = Py_None;
return _resultobj;
}
#define wxPalette_GetPixel(_swigobj,_swigarg0,_swigarg1,_swigarg2) (_swigobj->GetPixel(_swigarg0,_swigarg1,_swigarg2))
static PyObject *_wrap_wxPalette_GetPixel(PyObject *self, PyObject *args) {
PyObject * _resultobj;
int _result;
wxPalette * _arg0;
byte _arg1;
byte _arg2;
byte _arg3;
char * _argc0 = 0;
self = self;
if(!PyArg_ParseTuple(args,"sbbb:wxPalette_GetPixel",&_argc0,&_arg1,&_arg2,&_arg3))
return NULL;
if (_argc0) {
if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPalette_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPalette_GetPixel. Expected _wxPalette_p.");
return NULL;
}
}
_result = (int )wxPalette_GetPixel(_arg0,_arg1,_arg2,_arg3);
_resultobj = Py_BuildValue("i",_result);
return _resultobj;
}
#define wxPalette_GetRGB(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3) (_swigobj->GetRGB(_swigarg0,_swigarg1,_swigarg2,_swigarg3))
static PyObject *_wrap_wxPalette_GetRGB(PyObject *self, PyObject *args) {
PyObject * _resultobj;
bool _result;
wxPalette * _arg0;
int _arg1;
byte * _arg2;
byte * _arg3;
byte * _arg4;
char * _argc0 = 0;
char * _argc2 = 0;
char * _argc3 = 0;
char * _argc4 = 0;
self = self;
if(!PyArg_ParseTuple(args,"sisss:wxPalette_GetRGB",&_argc0,&_arg1,&_argc2,&_argc3,&_argc4))
return NULL;
if (_argc0) {
if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPalette_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPalette_GetRGB. Expected _wxPalette_p.");
return NULL;
}
}
if (_argc2) {
if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_byte_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxPalette_GetRGB. Expected _byte_p.");
return NULL;
}
}
if (_argc3) {
if (SWIG_GetPtr(_argc3,(void **) &_arg3,"_byte_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of wxPalette_GetRGB. Expected _byte_p.");
return NULL;
}
}
if (_argc4) {
if (SWIG_GetPtr(_argc4,(void **) &_arg4,"_byte_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 5 of wxPalette_GetRGB. Expected _byte_p.");
return NULL;
}
}
_result = (bool )wxPalette_GetRGB(_arg0,_arg1,_arg2,_arg3,_arg4);
_resultobj = Py_BuildValue("i",_result);
return _resultobj;
}
#define wxPalette_Ok(_swigobj) (_swigobj->Ok())
static PyObject *_wrap_wxPalette_Ok(PyObject *self, PyObject *args) {
PyObject * _resultobj;
bool _result;
wxPalette * _arg0;
char * _argc0 = 0;
self = self;
if(!PyArg_ParseTuple(args,"s:wxPalette_Ok",&_argc0))
return NULL;
if (_argc0) {
if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPalette_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPalette_Ok. Expected _wxPalette_p.");
return NULL;
}
}
_result = (bool )wxPalette_Ok(_arg0);
_resultobj = Py_BuildValue("i",_result);
return _resultobj;
}
static PyMethodDef gdicMethods[] = {
{ "wxPalette_Ok", _wrap_wxPalette_Ok, 1 },
{ "wxPalette_GetRGB", _wrap_wxPalette_GetRGB, 1 },
{ "wxPalette_GetPixel", _wrap_wxPalette_GetPixel, 1 },
{ "delete_wxPalette", _wrap_delete_wxPalette, 1 },
{ "new_wxPalette", _wrap_new_wxPalette, 1 },
{ "wxMetaFileDC_Close", _wrap_wxMetaFileDC_Close, 1 },
{ "new_wxMetaFileDC", _wrap_new_wxMetaFileDC, 1 },
{ "new_wxPrinterDC", _wrap_new_wxPrinterDC, 1 },
{ "new_wxWindowDC", _wrap_new_wxWindowDC, 1 },
{ "new_wxPaintDC", _wrap_new_wxPaintDC, 1 },
{ "new_wxClientDC", _wrap_new_wxClientDC, 1 },
{ "wxScreenDC_EndDrawingOnTop", _wrap_wxScreenDC_EndDrawingOnTop, 1 },
@@ -5141,6 +5342,8 @@ SWIGEXPORT(void,initgdic)() {
SWIG_RegisterMapping("_wxDC","_wxMetaFileDC",SwigwxMetaFileDCTowxDC);
SWIG_RegisterMapping("_wxDC","_class_wxPrinterDC",SwigwxPrinterDCTowxDC);
SWIG_RegisterMapping("_wxDC","_wxPrinterDC",SwigwxPrinterDCTowxDC);
SWIG_RegisterMapping("_wxDC","_class_wxWindowDC",SwigwxWindowDCTowxDC);
SWIG_RegisterMapping("_wxDC","_wxWindowDC",SwigwxWindowDCTowxDC);
SWIG_RegisterMapping("_wxDC","_class_wxPaintDC",SwigwxPaintDCTowxDC);
SWIG_RegisterMapping("_wxDC","_wxPaintDC",SwigwxPaintDCTowxDC);
SWIG_RegisterMapping("_wxDC","_class_wxClientDC",SwigwxClientDCTowxDC);
@@ -5166,6 +5369,7 @@ SWIGEXPORT(void,initgdic)() {
SWIG_RegisterMapping("_wxBitmap","_wxIcon",SwigwxIconTowxBitmap);
SWIG_RegisterMapping("_wxBitmap","_class_wxBitmap",0);
SWIG_RegisterMapping("_wxPyTimer","_class_wxPyTimer",0);
SWIG_RegisterMapping("_wxWindowDC","_class_wxWindowDC",0);
SWIG_RegisterMapping("_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0);
SWIG_RegisterMapping("_EBool","_signed_int",0);
SWIG_RegisterMapping("_EBool","_int",0);
@@ -5178,6 +5382,8 @@ SWIGEXPORT(void,initgdic)() {
SWIG_RegisterMapping("_class_wxDC","_wxMetaFileDC",SwigwxMetaFileDCTowxDC);
SWIG_RegisterMapping("_class_wxDC","_class_wxPrinterDC",SwigwxPrinterDCTowxDC);
SWIG_RegisterMapping("_class_wxDC","_wxPrinterDC",SwigwxPrinterDCTowxDC);
SWIG_RegisterMapping("_class_wxDC","_class_wxWindowDC",SwigwxWindowDCTowxDC);
SWIG_RegisterMapping("_class_wxDC","_wxWindowDC",SwigwxWindowDCTowxDC);
SWIG_RegisterMapping("_class_wxDC","_class_wxPaintDC",SwigwxPaintDCTowxDC);
SWIG_RegisterMapping("_class_wxDC","_wxPaintDC",SwigwxPaintDCTowxDC);
SWIG_RegisterMapping("_class_wxDC","_class_wxClientDC",SwigwxClientDCTowxDC);
@@ -5209,6 +5415,7 @@ SWIGEXPORT(void,initgdic)() {
SWIG_RegisterMapping("_signed_short","_short",0);
SWIG_RegisterMapping("_wxMemoryDC","_class_wxMemoryDC",0);
SWIG_RegisterMapping("_wxPaintDC","_class_wxPaintDC",0);
SWIG_RegisterMapping("_class_wxWindowDC","_wxWindowDC",0);
SWIG_RegisterMapping("_class_wxAcceleratorEntry","_wxAcceleratorEntry",0);
SWIG_RegisterMapping("_class_wxCursor","_wxCursor",0);
SWIG_RegisterMapping("_unsigned_char","_byte",0);
@@ -5238,6 +5445,7 @@ SWIGEXPORT(void,initgdic)() {
SWIG_RegisterMapping("_class_wxIcon","_wxIcon",0);
SWIG_RegisterMapping("_class_wxColour","_wxColour",0);
SWIG_RegisterMapping("_class_wxScreenDC","_wxScreenDC",0);
SWIG_RegisterMapping("_wxPalette","_class_wxPalette",0);
SWIG_RegisterMapping("_class_wxClientDC","_wxClientDC",0);
SWIG_RegisterMapping("_class_wxSize","_wxSize",0);
SWIG_RegisterMapping("_class_wxBitmap","_class_wxCursor",SwigwxCursorTowxBitmap);
@@ -5248,4 +5456,5 @@ SWIGEXPORT(void,initgdic)() {
SWIG_RegisterMapping("_class_wxMemoryDC","_wxMemoryDC",0);
SWIG_RegisterMapping("_wxDash","_unsigned_long",0);
SWIG_RegisterMapping("_wxDash","_long",0);
SWIG_RegisterMapping("_class_wxPalette","_wxPalette",0);
}
utils/wxPython/src/msw/gdi.py
+47 -2
View File
@@ -20,6 +20,7 @@ class wxBitmapPtr :
return val
def GetPalette(self):
val = gdic.wxBitmap_GetPalette(self.this)
val = wxPalettePtr(val)
return val
def GetMask(self):
val = gdic.wxBitmap_GetMask(self.this)
@@ -35,6 +36,10 @@ class wxBitmapPtr :
val = gdic.wxBitmap_Ok(self.this)
return val
def SaveFile(self,arg0,arg1,*args):
argl = map(None,args)
try: argl[0] = argl[0].this
except: pass
args = tuple(argl)
val = apply(gdic.wxBitmap_SaveFile,(self.this,arg0,arg1,)+args)
return val
def SetDepth(self,arg0):
@@ -47,7 +52,7 @@ class wxBitmapPtr :
val = gdic.wxBitmap_SetMask(self.this,arg0.this)
return val
def SetPalette(self,arg0):
val = gdic.wxBitmap_SetPalette(self.this,arg0)
val = gdic.wxBitmap_SetPalette(self.this,arg0.this)
return val
def SetWidth(self,arg0):
val = gdic.wxBitmap_SetWidth(self.this,arg0)
@@ -510,7 +515,7 @@ class wxDCPtr :
val = gdic.wxDC_SetClippingRegion(self.this,arg0,arg1,arg2,arg3)
return val
def SetPalette(self,arg0):
val = gdic.wxDC_SetPalette(self.this,arg0)
val = gdic.wxDC_SetPalette(self.this,arg0.this)
return val
def SetBrush(self,arg0):
val = gdic.wxDC_SetBrush(self.this,arg0.this)
@@ -629,6 +634,20 @@ class wxPaintDC(wxPaintDCPtr):
class wxWindowDCPtr(wxDCPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
def __repr__(self):
return "<C wxWindowDC instance>"
class wxWindowDC(wxWindowDCPtr):
def __init__(self,arg0) :
self.this = gdic.new_wxWindowDC(arg0.this)
self.thisown = 1
class wxPrinterDCPtr(wxDCPtr):
def __init__(self,this):
self.this = this
@@ -660,6 +679,32 @@ class wxMetaFileDC(wxMetaFileDCPtr):
class wxPalettePtr :
def __init__(self,this):
self.this = this
self.thisown = 0
def __del__(self):
if self.thisown == 1 :
gdic.delete_wxPalette(self.this)
def GetPixel(self,arg0,arg1,arg2):
val = gdic.wxPalette_GetPixel(self.this,arg0,arg1,arg2)
return val
def GetRGB(self,arg0,arg1,arg2,arg3):
val = gdic.wxPalette_GetRGB(self.this,arg0,arg1,arg2,arg3)
return val
def Ok(self):
val = gdic.wxPalette_Ok(self.this)
return val
def __repr__(self):
return "<C wxPalette instance>"
class wxPalette(wxPalettePtr):
def __init__(self,arg0,arg1,arg2) :
self.this = gdic.new_wxPalette(arg0,arg1,arg2)
self.thisown = 1
#-------------- FUNCTION WRAPPERS ------------------
utils/wxPython/src/msw/mdi.cpp
+7 -2
View File
@@ -102,15 +102,14 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
}
extern byte* byte_LIST_helper(PyObject* source);
extern int* int_LIST_helper(PyObject* source);
extern long* long_LIST_helper(PyObject* source);
extern char** string_LIST_helper(PyObject* source);
extern wxPoint* wxPoint_LIST_helper(PyObject* source);
extern wxBitmap** wxBitmap_LIST_helper(PyObject* source);
extern wxString* wxString_LIST_helper(PyObject* source);
#ifdef __WXMSW__
extern wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source);
#endif
static char* wxStringErrorMsg = "string type is required for parameter";
@@ -779,6 +778,7 @@ SWIGEXPORT(void,initmdic)() {
SWIG_RegisterMapping("_class_wxAcceleratorTable","_wxAcceleratorTable",0);
SWIG_RegisterMapping("_class_wxGauge","_wxGauge",0);
SWIG_RegisterMapping("_wxDC","_class_wxDC",0);
SWIG_RegisterMapping("_wxSpinEvent","_class_wxSpinEvent",0);
SWIG_RegisterMapping("_class_wxRealPoint","_wxRealPoint",0);
SWIG_RegisterMapping("_wxPrinterDC","_class_wxPrinterDC",0);
SWIG_RegisterMapping("_class_wxMenuItem","_wxMenuItem",0);
@@ -812,6 +812,7 @@ SWIGEXPORT(void,initmdic)() {
SWIG_RegisterMapping("_wxRadioBox","_class_wxRadioBox",0);
SWIG_RegisterMapping("_wxBitmap","_class_wxBitmap",0);
SWIG_RegisterMapping("_wxPyTimer","_class_wxPyTimer",0);
SWIG_RegisterMapping("_wxWindowDC","_class_wxWindowDC",0);
SWIG_RegisterMapping("_wxScrollBar","_class_wxScrollBar",0);
SWIG_RegisterMapping("_wxSpinButton","_class_wxSpinButton",0);
SWIG_RegisterMapping("_wxToolBarTool","_class_wxToolBarTool",0);
@@ -880,6 +881,7 @@ SWIGEXPORT(void,initmdic)() {
SWIG_RegisterMapping("_signed_short","_short",0);
SWIG_RegisterMapping("_wxMemoryDC","_class_wxMemoryDC",0);
SWIG_RegisterMapping("_wxPaintDC","_class_wxPaintDC",0);
SWIG_RegisterMapping("_class_wxWindowDC","_wxWindowDC",0);
SWIG_RegisterMapping("_class_wxFocusEvent","_wxFocusEvent",0);
SWIG_RegisterMapping("_class_wxMaximizeEvent","_wxMaximizeEvent",0);
SWIG_RegisterMapping("_wxStatusBar","_class_wxStatusBar",0);
@@ -924,6 +926,7 @@ SWIGEXPORT(void,initmdic)() {
SWIG_RegisterMapping("_int","_unsigned_int",0);
SWIG_RegisterMapping("_int","_signed_int",0);
SWIG_RegisterMapping("_class_wxMouseEvent","_wxMouseEvent",0);
SWIG_RegisterMapping("_class_wxSpinEvent","_wxSpinEvent",0);
SWIG_RegisterMapping("_wxButton","_class_wxButton",0);
SWIG_RegisterMapping("_wxSize","_class_wxSize",0);
SWIG_RegisterMapping("_class_wxPrinterDC","_wxPrinterDC",0);
@@ -940,6 +943,7 @@ SWIGEXPORT(void,initmdic)() {
SWIG_RegisterMapping("_class_wxIcon","_wxIcon",0);
SWIG_RegisterMapping("_class_wxColour","_wxColour",0);
SWIG_RegisterMapping("_class_wxScreenDC","_wxScreenDC",0);
SWIG_RegisterMapping("_wxPalette","_class_wxPalette",0);
SWIG_RegisterMapping("_class_wxIdleEvent","_wxIdleEvent",0);
SWIG_RegisterMapping("_wxEraseEvent","_class_wxEraseEvent",0);
SWIG_RegisterMapping("_class_wxJoystickEvent","_wxJoystickEvent",0);
@@ -969,6 +973,7 @@ SWIGEXPORT(void,initmdic)() {
SWIG_RegisterMapping("_class_wxScrolledWindow","_wxScrolledWindow",0);
SWIG_RegisterMapping("_wxKeyEvent","_class_wxKeyEvent",0);
SWIG_RegisterMapping("_wxMoveEvent","_class_wxMoveEvent",0);
SWIG_RegisterMapping("_class_wxPalette","_wxPalette",0);
SWIG_RegisterMapping("_class_wxEraseEvent","_wxEraseEvent",0);
SWIG_RegisterMapping("_wxMDIClientWindow","_class_wxMDIClientWindow",0);
SWIG_RegisterMapping("_wxWindow","_class_wxMDIClientWindow",SwigwxMDIClientWindowTowxWindow);
utils/wxPython/src/msw/misc.cpp
+588 -2
View File
File diff suppressed because it is too large Load Diff
utils/wxPython/src/msw/misc.py
+101
View File
@@ -325,6 +325,104 @@ class wxLayoutConstraints(wxLayoutConstraintsPtr):
class wxRegionPtr :
def __init__(self,this):
self.this = this
self.thisown = 0
def __del__(self):
if self.thisown == 1 :
miscc.delete_wxRegion(self.this)
def Clear(self):
val = miscc.wxRegion_Clear(self.this)
return val
def Contains(self,arg0,arg1):
val = miscc.wxRegion_Contains(self.this,arg0,arg1)
return val
def ContainsPoint(self,arg0):
val = miscc.wxRegion_ContainsPoint(self.this,arg0.this)
return val
def ContainsRect(self,arg0):
val = miscc.wxRegion_ContainsRect(self.this,arg0.this)
return val
def GetBox(self):
val = miscc.wxRegion_GetBox(self.this)
val = wxRectPtr(val)
val.thisown = 1
return val
def Intersect(self,arg0):
val = miscc.wxRegion_Intersect(self.this,arg0.this)
return val
def IsEmpty(self):
val = miscc.wxRegion_IsEmpty(self.this)
return val
def Subtract(self,arg0):
val = miscc.wxRegion_Subtract(self.this,arg0.this)
return val
def Union(self,arg0):
val = miscc.wxRegion_Union(self.this,arg0.this)
return val
def Xor(self,arg0):
val = miscc.wxRegion_Xor(self.this,arg0.this)
return val
def __repr__(self):
return "<C wxRegion instance>"
class wxRegion(wxRegionPtr):
def __init__(self) :
self.this = miscc.new_wxRegion()
self.thisown = 1
class wxRegionIteratorPtr :
def __init__(self,this):
self.this = this
self.thisown = 0
def __del__(self):
if self.thisown == 1 :
miscc.delete_wxRegionIterator(self.this)
def GetX(self):
val = miscc.wxRegionIterator_GetX(self.this)
return val
def GetY(self):
val = miscc.wxRegionIterator_GetY(self.this)
return val
def GetW(self):
val = miscc.wxRegionIterator_GetW(self.this)
return val
def GetWidth(self):
val = miscc.wxRegionIterator_GetWidth(self.this)
return val
def GetH(self):
val = miscc.wxRegionIterator_GetH(self.this)
return val
def GetHeight(self):
val = miscc.wxRegionIterator_GetHeight(self.this)
return val
def GetRect(self):
val = miscc.wxRegionIterator_GetRect(self.this)
val = wxRectPtr(val)
val.thisown = 1
return val
def HaveRects(self):
val = miscc.wxRegionIterator_HaveRects(self.this)
return val
def Reset(self):
val = miscc.wxRegionIterator_Reset(self.this)
return val
def Next(self):
val = miscc.wxRegionIterator_Next(self.this)
return val
def __repr__(self):
return "<C wxRegionIterator instance>"
class wxRegionIterator(wxRegionIteratorPtr):
def __init__(self,arg0) :
self.this = miscc.new_wxRegionIterator(arg0.this)
self.thisown = 1
class wxAcceleratorEntryPtr :
def __init__(self,this):
self.this = this
@@ -532,3 +630,6 @@ wxLeftOf = miscc.wxLeftOf
wxRightOf = miscc.wxRightOf
wxSameAs = miscc.wxSameAs
wxAbsolute = miscc.wxAbsolute
wxOutRegion = miscc.wxOutRegion
wxPartRegion = miscc.wxPartRegion
wxInRegion = miscc.wxInRegion
utils/wxPython/src/msw/stattool.cpp
+7 -2
View File
@@ -104,15 +104,14 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
}
extern byte* byte_LIST_helper(PyObject* source);
extern int* int_LIST_helper(PyObject* source);
extern long* long_LIST_helper(PyObject* source);
extern char** string_LIST_helper(PyObject* source);
extern wxPoint* wxPoint_LIST_helper(PyObject* source);
extern wxBitmap** wxBitmap_LIST_helper(PyObject* source);
extern wxString* wxString_LIST_helper(PyObject* source);
#ifdef __WXMSW__
extern wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source);
#endif
static char* wxStringErrorMsg = "string type is required for parameter";
@@ -1610,6 +1609,7 @@ SWIGEXPORT(void,initstattoolc)() {
SWIG_RegisterMapping("_class_wxAcceleratorTable","_wxAcceleratorTable",0);
SWIG_RegisterMapping("_class_wxGauge","_wxGauge",0);
SWIG_RegisterMapping("_wxDC","_class_wxDC",0);
SWIG_RegisterMapping("_wxSpinEvent","_class_wxSpinEvent",0);
SWIG_RegisterMapping("_class_wxRealPoint","_wxRealPoint",0);
SWIG_RegisterMapping("_wxPrinterDC","_class_wxPrinterDC",0);
SWIG_RegisterMapping("_class_wxMenuItem","_wxMenuItem",0);
@@ -1642,6 +1642,7 @@ SWIGEXPORT(void,initstattoolc)() {
SWIG_RegisterMapping("_wxRadioBox","_class_wxRadioBox",0);
SWIG_RegisterMapping("_wxBitmap","_class_wxBitmap",0);
SWIG_RegisterMapping("_wxPyTimer","_class_wxPyTimer",0);
SWIG_RegisterMapping("_wxWindowDC","_class_wxWindowDC",0);
SWIG_RegisterMapping("_wxScrollBar","_class_wxScrollBar",0);
SWIG_RegisterMapping("_wxSpinButton","_class_wxSpinButton",0);
SWIG_RegisterMapping("_wxToolBarTool","_class_wxToolBarTool",0);
@@ -1704,6 +1705,7 @@ SWIGEXPORT(void,initstattoolc)() {
SWIG_RegisterMapping("_signed_short","_short",0);
SWIG_RegisterMapping("_wxMemoryDC","_class_wxMemoryDC",0);
SWIG_RegisterMapping("_wxPaintDC","_class_wxPaintDC",0);
SWIG_RegisterMapping("_class_wxWindowDC","_wxWindowDC",0);
SWIG_RegisterMapping("_class_wxFocusEvent","_wxFocusEvent",0);
SWIG_RegisterMapping("_class_wxMaximizeEvent","_wxMaximizeEvent",0);
SWIG_RegisterMapping("_wxStatusBar","_class_wxStatusBar",0);
@@ -1745,6 +1747,7 @@ SWIGEXPORT(void,initstattoolc)() {
SWIG_RegisterMapping("_int","_unsigned_int",0);
SWIG_RegisterMapping("_int","_signed_int",0);
SWIG_RegisterMapping("_class_wxMouseEvent","_wxMouseEvent",0);
SWIG_RegisterMapping("_class_wxSpinEvent","_wxSpinEvent",0);
SWIG_RegisterMapping("_wxButton","_class_wxButton",0);
SWIG_RegisterMapping("_wxSize","_class_wxSize",0);
SWIG_RegisterMapping("_class_wxPrinterDC","_wxPrinterDC",0);
@@ -1762,6 +1765,7 @@ SWIGEXPORT(void,initstattoolc)() {
SWIG_RegisterMapping("_class_wxIcon","_wxIcon",0);
SWIG_RegisterMapping("_class_wxColour","_wxColour",0);
SWIG_RegisterMapping("_class_wxScreenDC","_wxScreenDC",0);
SWIG_RegisterMapping("_wxPalette","_class_wxPalette",0);
SWIG_RegisterMapping("_class_wxIdleEvent","_wxIdleEvent",0);
SWIG_RegisterMapping("_wxEraseEvent","_class_wxEraseEvent",0);
SWIG_RegisterMapping("_class_wxJoystickEvent","_wxJoystickEvent",0);
@@ -1788,6 +1792,7 @@ SWIGEXPORT(void,initstattoolc)() {
SWIG_RegisterMapping("_class_wxScrolledWindow","_wxScrolledWindow",0);
SWIG_RegisterMapping("_wxKeyEvent","_class_wxKeyEvent",0);
SWIG_RegisterMapping("_wxMoveEvent","_class_wxMoveEvent",0);
SWIG_RegisterMapping("_class_wxPalette","_wxPalette",0);
SWIG_RegisterMapping("_class_wxEraseEvent","_wxEraseEvent",0);
SWIG_RegisterMapping("_wxWindow","_class_wxToolBar",SwigwxToolBarTowxWindow);
SWIG_RegisterMapping("_wxWindow","_wxToolBar",SwigwxToolBarTowxWindow);
utils/wxPython/src/msw/windows.cpp
+5 -2
View File
@@ -111,15 +111,14 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
}
extern byte* byte_LIST_helper(PyObject* source);
extern int* int_LIST_helper(PyObject* source);
extern long* long_LIST_helper(PyObject* source);
extern char** string_LIST_helper(PyObject* source);
extern wxPoint* wxPoint_LIST_helper(PyObject* source);
extern wxBitmap** wxBitmap_LIST_helper(PyObject* source);
extern wxString* wxString_LIST_helper(PyObject* source);
#ifdef __WXMSW__
extern wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source);
#endif
static char* wxStringErrorMsg = "string type is required for parameter";
@@ -4455,6 +4454,7 @@ SWIGEXPORT(void,initwindowsc)() {
SWIG_RegisterMapping("_wxPoint","_class_wxPoint",0);
SWIG_RegisterMapping("_wxBitmap","_class_wxBitmap",0);
SWIG_RegisterMapping("_wxPyTimer","_class_wxPyTimer",0);
SWIG_RegisterMapping("_wxWindowDC","_class_wxWindowDC",0);
SWIG_RegisterMapping("_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0);
SWIG_RegisterMapping("_EBool","_signed_int",0);
SWIG_RegisterMapping("_EBool","_int",0);
@@ -4499,6 +4499,7 @@ SWIGEXPORT(void,initwindowsc)() {
SWIG_RegisterMapping("_signed_short","_short",0);
SWIG_RegisterMapping("_wxMemoryDC","_class_wxMemoryDC",0);
SWIG_RegisterMapping("_wxPaintDC","_class_wxPaintDC",0);
SWIG_RegisterMapping("_class_wxWindowDC","_wxWindowDC",0);
SWIG_RegisterMapping("_class_wxAcceleratorEntry","_wxAcceleratorEntry",0);
SWIG_RegisterMapping("_class_wxCursor","_wxCursor",0);
SWIG_RegisterMapping("_wxScrolledWindow","_class_wxScrolledWindow",0);
@@ -4534,6 +4535,7 @@ SWIGEXPORT(void,initwindowsc)() {
SWIG_RegisterMapping("_class_wxIcon","_wxIcon",0);
SWIG_RegisterMapping("_class_wxColour","_wxColour",0);
SWIG_RegisterMapping("_class_wxScreenDC","_wxScreenDC",0);
SWIG_RegisterMapping("_wxPalette","_class_wxPalette",0);
SWIG_RegisterMapping("_class_wxClientDC","_wxClientDC",0);
SWIG_RegisterMapping("_class_wxSize","_wxSize",0);
SWIG_RegisterMapping("_class_wxBitmap","_wxBitmap",0);
@@ -4558,6 +4560,7 @@ SWIGEXPORT(void,initwindowsc)() {
SWIG_RegisterMapping("_wxDash","_unsigned_long",0);
SWIG_RegisterMapping("_wxDash","_long",0);
SWIG_RegisterMapping("_class_wxScrolledWindow","_wxScrolledWindow",0);
SWIG_RegisterMapping("_class_wxPalette","_wxPalette",0);
SWIG_RegisterMapping("_wxWindow","_class_wxScrolledWindow",SwigwxScrolledWindowTowxWindow);
SWIG_RegisterMapping("_wxWindow","_wxScrolledWindow",SwigwxScrolledWindowTowxWindow);
SWIG_RegisterMapping("_wxWindow","_class_wxDialog",SwigwxDialogTowxWindow);
utils/wxPython/src/msw/windows2.cpp
+459 -3
View File
File diff suppressed because it is too large Load Diff
utils/wxPython/src/msw/windows2.py
+128 -2
View File
@@ -15,6 +15,9 @@ class wxGridCellPtr :
def __init__(self,this):
self.this = this
self.thisown = 0
def __del__(self):
if self.thisown == 1 :
windows2c.delete_wxGridCell(self.this)
def GetTextValue(self):
val = windows2c.wxGridCell_GetTextValue(self.this)
return val
@@ -62,8 +65,9 @@ class wxGridCellPtr :
def __repr__(self):
return "<C wxGridCell instance>"
class wxGridCell(wxGridCellPtr):
def __init__(self,this):
self.this = this
def __init__(self) :
self.this = windows2c.new_wxGridCell()
self.thisown = 1
@@ -212,6 +216,9 @@ class wxGridPtr(wxPanelPtr):
def InsertRows(self,*args):
val = apply(windows2c.wxGrid_InsertRows,(self.this,)+args)
return val
def OnActivate(self,arg0):
val = windows2c.wxGrid_OnActivate(self.this,arg0)
return val
def SetCellAlignment(self,arg0,arg1,arg2):
val = windows2c.wxGrid_SetCellAlignment(self.this,arg0,arg1,arg2)
return val
@@ -288,6 +295,67 @@ class wxGrid(wxGridPtr):
self.this = apply(windows2c.new_wxGrid,(arg0.this,arg1,)+args)
self.thisown = 1
wxp._StdWindowCallbacks(self)
wxp._checkForCallback(self, 'OnSelectCell', wxEVT_GRID_SELECT_CELL)
wxp._checkForCallback(self, 'OnCreateCell', wxEVT_GRID_CREATE_CELL)
wxp._checkForCallback(self, 'OnChangeLabels', wxEVT_GRID_CHANGE_LABELS)
wxp._checkForCallback(self, 'OnChangeSelectionLabel', wxEVT_GRID_CHANGE_SEL_LABEL)
wxp._checkForCallback(self, 'OnCellChange', wxEVT_GRID_CELL_CHANGE)
wxp._checkForCallback(self, 'OnCellLeftClick', wxEVT_GRID_CELL_LCLICK)
wxp._checkForCallback(self, 'OnCellRightClick', wxEVT_GRID_CELL_RCLICK)
wxp._checkForCallback(self, 'OnLabelLeftClick', wxEVT_GRID_LABEL_LCLICK)
wxp._checkForCallback(self, 'OnLabelRightClick', wxEVT_GRID_LABEL_RCLICK)
class wxGridEventPtr(wxEventPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
def __setattr__(self,name,value):
if name == "m_row" :
windows2c.wxGridEvent_m_row_set(self.this,value)
return
if name == "m_col" :
windows2c.wxGridEvent_m_col_set(self.this,value)
return
if name == "m_x" :
windows2c.wxGridEvent_m_x_set(self.this,value)
return
if name == "m_y" :
windows2c.wxGridEvent_m_y_set(self.this,value)
return
if name == "m_control" :
windows2c.wxGridEvent_m_control_set(self.this,value)
return
if name == "m_shift" :
windows2c.wxGridEvent_m_shift_set(self.this,value)
return
if name == "m_cell" :
windows2c.wxGridEvent_m_cell_set(self.this,value.this)
return
self.__dict__[name] = value
def __getattr__(self,name):
if name == "m_row" :
return windows2c.wxGridEvent_m_row_get(self.this)
if name == "m_col" :
return windows2c.wxGridEvent_m_col_get(self.this)
if name == "m_x" :
return windows2c.wxGridEvent_m_x_get(self.this)
if name == "m_y" :
return windows2c.wxGridEvent_m_y_get(self.this)
if name == "m_control" :
return windows2c.wxGridEvent_m_control_get(self.this)
if name == "m_shift" :
return windows2c.wxGridEvent_m_shift_get(self.this)
if name == "m_cell" :
return wxGridCellPtr(windows2c.wxGridEvent_m_cell_get(self.this))
raise AttributeError,name
def __repr__(self):
return "<C wxGridEvent instance>"
class wxGridEvent(wxGridEventPtr):
def __init__(self,this):
self.this = this
@@ -384,12 +452,18 @@ class wxSplitterWindowPtr(wxWindowPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
def GetBorderSize(self):
val = windows2c.wxSplitterWindow_GetBorderSize(self.this)
return val
def GetMinimumPaneSize(self):
val = windows2c.wxSplitterWindow_GetMinimumPaneSize(self.this)
return val
def GetSashPosition(self):
val = windows2c.wxSplitterWindow_GetSashPosition(self.this)
return val
def GetSashSize(self):
val = windows2c.wxSplitterWindow_GetSashSize(self.this)
return val
def GetSplitMode(self):
val = windows2c.wxSplitterWindow_GetSplitMode(self.this)
return val
@@ -407,9 +481,15 @@ class wxSplitterWindowPtr(wxWindowPtr):
def IsSplit(self):
val = windows2c.wxSplitterWindow_IsSplit(self.this)
return val
def SetBorderSize(self,arg0):
val = windows2c.wxSplitterWindow_SetBorderSize(self.this,arg0)
return val
def SetSashPosition(self,arg0,*args):
val = apply(windows2c.wxSplitterWindow_SetSashPosition,(self.this,arg0,)+args)
return val
def SetSashSize(self,arg0):
val = windows2c.wxSplitterWindow_SetSashSize(self.this,arg0)
return val
def SetMinimumPaneSize(self,arg0):
val = windows2c.wxSplitterWindow_SetMinimumPaneSize(self.this,arg0)
return val
@@ -446,6 +526,36 @@ class wxSplitterWindow(wxSplitterWindowPtr):
class wxTaskBarIconPtr(wxEvtHandlerPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
def __del__(self):
if self.thisown == 1 :
windows2c.delete_wxTaskBarIcon(self.this)
def SetIcon(self,arg0,*args):
val = apply(windows2c.wxTaskBarIcon_SetIcon,(self.this,arg0.this,)+args)
return val
def RemoveIcon(self):
val = windows2c.wxTaskBarIcon_RemoveIcon(self.this)
return val
def __repr__(self):
return "<C wxTaskBarIcon instance>"
class wxTaskBarIcon(wxTaskBarIconPtr):
def __init__(self) :
self.this = windows2c.new_wxTaskBarIcon()
self.thisown = 1
wxp._checkForCallback(self, 'OnMouseMove', wxEVT_TASKBAR_MOVE)
wxp._checkForCallback(self, 'OnLButtonDown', wxEVT_TASKBAR_LEFT_DOWN)
wxp._checkForCallback(self, 'OnLButtonUp', wxEVT_TASKBAR_LEFT_UP)
wxp._checkForCallback(self, 'OnRButtonDown', wxEVT_TASKBAR_RIGHT_DOWN)
wxp._checkForCallback(self, 'OnRButtonUp', wxEVT_TASKBAR_RIGHT_UP)
wxp._checkForCallback(self, 'OnLButtonDClick',wxEVT_TASKBAR_LEFT_DCLICK)
wxp._checkForCallback(self, 'OnRButtonDClick',wxEVT_TASKBAR_RIGHT_DCLICK)
#-------------- FUNCTION WRAPPERS ------------------
@@ -457,3 +567,19 @@ class wxSplitterWindow(wxSplitterWindowPtr):
wxGRID_TEXT_CTRL = windows2c.wxGRID_TEXT_CTRL
wxGRID_HSCROLL = windows2c.wxGRID_HSCROLL
wxGRID_VSCROLL = windows2c.wxGRID_VSCROLL
wxEVT_GRID_SELECT_CELL = windows2c.wxEVT_GRID_SELECT_CELL
wxEVT_GRID_CREATE_CELL = windows2c.wxEVT_GRID_CREATE_CELL
wxEVT_GRID_CHANGE_LABELS = windows2c.wxEVT_GRID_CHANGE_LABELS
wxEVT_GRID_CHANGE_SEL_LABEL = windows2c.wxEVT_GRID_CHANGE_SEL_LABEL
wxEVT_GRID_CELL_CHANGE = windows2c.wxEVT_GRID_CELL_CHANGE
wxEVT_GRID_CELL_LCLICK = windows2c.wxEVT_GRID_CELL_LCLICK
wxEVT_GRID_CELL_RCLICK = windows2c.wxEVT_GRID_CELL_RCLICK
wxEVT_GRID_LABEL_LCLICK = windows2c.wxEVT_GRID_LABEL_LCLICK
wxEVT_GRID_LABEL_RCLICK = windows2c.wxEVT_GRID_LABEL_RCLICK
wxEVT_TASKBAR_MOVE = windows2c.wxEVT_TASKBAR_MOVE
wxEVT_TASKBAR_LEFT_DOWN = windows2c.wxEVT_TASKBAR_LEFT_DOWN
wxEVT_TASKBAR_LEFT_UP = windows2c.wxEVT_TASKBAR_LEFT_UP
wxEVT_TASKBAR_RIGHT_DOWN = windows2c.wxEVT_TASKBAR_RIGHT_DOWN
wxEVT_TASKBAR_RIGHT_UP = windows2c.wxEVT_TASKBAR_RIGHT_UP
wxEVT_TASKBAR_LEFT_DCLICK = windows2c.wxEVT_TASKBAR_LEFT_DCLICK
wxEVT_TASKBAR_RIGHT_DCLICK = windows2c.wxEVT_TASKBAR_RIGHT_DCLICK
utils/wxPython/src/msw/wxp.cpp
+19 -4
View File
@@ -33,8 +33,10 @@
* and things like that.
*
* $Log$
* Revision 1.5 1998/11/11 03:12:53 RD
* Additions for wxTreeCtrl
* Revision 1.6 1998/11/25 08:46:46 RD
* Added wxPalette, wxRegion, wxRegionIterator, wxTaskbarIcon
* Added events for wxGrid
* Other various fixes and additions
*
************************************************************************/
@@ -605,15 +607,14 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
}
extern byte* byte_LIST_helper(PyObject* source);
extern int* int_LIST_helper(PyObject* source);
extern long* long_LIST_helper(PyObject* source);
extern char** string_LIST_helper(PyObject* source);
extern wxPoint* wxPoint_LIST_helper(PyObject* source);
extern wxBitmap** wxBitmap_LIST_helper(PyObject* source);
extern wxString* wxString_LIST_helper(PyObject* source);
#ifdef __WXMSW__
extern wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source);
#endif
static char* wxStringErrorMsg = "string type is required for parameter";
@@ -1757,6 +1758,7 @@ SWIGEXPORT(void,initwxpc)() {
SWIG_RegisterMapping("_signed_long","_long",0);
SWIG_RegisterMapping("_wxMenuEvent","_class_wxMenuEvent",0);
SWIG_RegisterMapping("_wxFontData","_class_wxFontData",0);
SWIG_RegisterMapping("_class_wxRegionIterator","_wxRegionIterator",0);
SWIG_RegisterMapping("_class_wxMenuBar","_wxMenuBar",0);
SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxPyApp",SwigwxPyAppTowxEvtHandler);
SWIG_RegisterMapping("_class_wxEvtHandler","_wxPyApp",SwigwxPyAppTowxEvtHandler);
@@ -1787,6 +1789,7 @@ SWIGEXPORT(void,initwxpc)() {
SWIG_RegisterMapping("_wxDC","_class_wxDC",0);
SWIG_RegisterMapping("_wxListEvent","_class_wxListEvent",0);
SWIG_RegisterMapping("_class_wxSingleChoiceDialog","_wxSingleChoiceDialog",0);
SWIG_RegisterMapping("_wxSpinEvent","_class_wxSpinEvent",0);
SWIG_RegisterMapping("_class_wxRealPoint","_wxRealPoint",0);
SWIG_RegisterMapping("_wxPrinterDC","_class_wxPrinterDC",0);
SWIG_RegisterMapping("_class_wxMenuItem","_wxMenuItem",0);
@@ -1816,6 +1819,7 @@ SWIGEXPORT(void,initwxpc)() {
SWIG_RegisterMapping("_uint","_wxWindowID",0);
SWIG_RegisterMapping("_class_wxEvent","_wxEvent",0);
SWIG_RegisterMapping("_wxCheckListBox","_class_wxCheckListBox",0);
SWIG_RegisterMapping("_wxGridEvent","_class_wxGridEvent",0);
SWIG_RegisterMapping("_wxRect","_class_wxRect",0);
SWIG_RegisterMapping("_wxCommandEvent","_class_wxCommandEvent",0);
SWIG_RegisterMapping("_wxSizeEvent","_class_wxSizeEvent",0);
@@ -1825,8 +1829,10 @@ SWIGEXPORT(void,initwxpc)() {
SWIG_RegisterMapping("_wxTreeItemData","_class_wxTreeItemData",0);
SWIG_RegisterMapping("_class_wxFontData","_wxFontData",0);
SWIG_RegisterMapping("_wxBitmap","_class_wxBitmap",0);
SWIG_RegisterMapping("_wxTaskBarIcon","_class_wxTaskBarIcon",0);
SWIG_RegisterMapping("_wxPrintDialog","_class_wxPrintDialog",0);
SWIG_RegisterMapping("_wxPyTimer","_class_wxPyTimer",0);
SWIG_RegisterMapping("_wxWindowDC","_class_wxWindowDC",0);
SWIG_RegisterMapping("_wxScrollBar","_class_wxScrollBar",0);
SWIG_RegisterMapping("_wxSpinButton","_class_wxSpinButton",0);
SWIG_RegisterMapping("_wxToolBarTool","_class_wxToolBarTool",0);
@@ -1844,6 +1850,7 @@ SWIGEXPORT(void,initwxpc)() {
SWIG_RegisterMapping("_EBool","_signed_int",0);
SWIG_RegisterMapping("_EBool","_int",0);
SWIG_RegisterMapping("_EBool","_wxWindowID",0);
SWIG_RegisterMapping("_class_wxRegion","_wxRegion",0);
SWIG_RegisterMapping("_class_wxDropFilesEvent","_wxDropFilesEvent",0);
SWIG_RegisterMapping("_wxStaticText","_class_wxStaticText",0);
SWIG_RegisterMapping("_wxFont","_class_wxFont",0);
@@ -1903,8 +1910,10 @@ SWIGEXPORT(void,initwxpc)() {
SWIG_RegisterMapping("_signed_short","_WXTYPE",0);
SWIG_RegisterMapping("_signed_short","_short",0);
SWIG_RegisterMapping("_wxMemoryDC","_class_wxMemoryDC",0);
SWIG_RegisterMapping("_class_wxTaskBarIcon","_wxTaskBarIcon",0);
SWIG_RegisterMapping("_class_wxPrintDialog","_wxPrintDialog",0);
SWIG_RegisterMapping("_wxPaintDC","_class_wxPaintDC",0);
SWIG_RegisterMapping("_class_wxWindowDC","_wxWindowDC",0);
SWIG_RegisterMapping("_class_wxFocusEvent","_wxFocusEvent",0);
SWIG_RegisterMapping("_class_wxMaximizeEvent","_wxMaximizeEvent",0);
SWIG_RegisterMapping("_wxStatusBar","_class_wxStatusBar",0);
@@ -1950,9 +1959,11 @@ SWIGEXPORT(void,initwxpc)() {
SWIG_RegisterMapping("_int","_signed_int",0);
SWIG_RegisterMapping("_class_wxMouseEvent","_wxMouseEvent",0);
SWIG_RegisterMapping("_class_wxListEvent","_wxListEvent",0);
SWIG_RegisterMapping("_class_wxSpinEvent","_wxSpinEvent",0);
SWIG_RegisterMapping("_wxButton","_class_wxButton",0);
SWIG_RegisterMapping("_class_wxPyApp","_wxPyApp",0);
SWIG_RegisterMapping("_wxSize","_class_wxSize",0);
SWIG_RegisterMapping("_wxRegionIterator","_class_wxRegionIterator",0);
SWIG_RegisterMapping("_class_wxPrinterDC","_wxPrinterDC",0);
SWIG_RegisterMapping("_class_wxMDIParentFrame","_wxMDIParentFrame",0);
SWIG_RegisterMapping("_class_wxPaintDC","_wxPaintDC",0);
@@ -1970,16 +1981,19 @@ SWIGEXPORT(void,initwxpc)() {
SWIG_RegisterMapping("_class_wxColour","_wxColour",0);
SWIG_RegisterMapping("_class_wxScreenDC","_wxScreenDC",0);
SWIG_RegisterMapping("_class_wxPageSetupDialog","_wxPageSetupDialog",0);
SWIG_RegisterMapping("_wxPalette","_class_wxPalette",0);
SWIG_RegisterMapping("_class_wxIdleEvent","_wxIdleEvent",0);
SWIG_RegisterMapping("_wxEraseEvent","_class_wxEraseEvent",0);
SWIG_RegisterMapping("_class_wxJoystickEvent","_wxJoystickEvent",0);
SWIG_RegisterMapping("_class_wxMiniFrame","_wxMiniFrame",0);
SWIG_RegisterMapping("_wxFontDialog","_class_wxFontDialog",0);
SWIG_RegisterMapping("_wxRegion","_class_wxRegion",0);
SWIG_RegisterMapping("_class_wxSplitterWindow","_wxSplitterWindow",0);
SWIG_RegisterMapping("_class_wxShowEvent","_wxShowEvent",0);
SWIG_RegisterMapping("_wxActivateEvent","_class_wxActivateEvent",0);
SWIG_RegisterMapping("_wxGauge","_class_wxGauge",0);
SWIG_RegisterMapping("_class_wxCheckListBox","_wxCheckListBox",0);
SWIG_RegisterMapping("_class_wxGridEvent","_wxGridEvent",0);
SWIG_RegisterMapping("_class_wxCommandEvent","_wxCommandEvent",0);
SWIG_RegisterMapping("_class_wxClientDC","_wxClientDC",0);
SWIG_RegisterMapping("_class_wxSizeEvent","_wxSizeEvent",0);
@@ -2006,6 +2020,7 @@ SWIGEXPORT(void,initwxpc)() {
SWIG_RegisterMapping("_wxKeyEvent","_class_wxKeyEvent",0);
SWIG_RegisterMapping("_wxMoveEvent","_class_wxMoveEvent",0);
SWIG_RegisterMapping("_wxColourData","_class_wxColourData",0);
SWIG_RegisterMapping("_class_wxPalette","_wxPalette",0);
SWIG_RegisterMapping("_class_wxEraseEvent","_wxEraseEvent",0);
SWIG_RegisterMapping("_wxMDIClientWindow","_class_wxMDIClientWindow",0);
SWIG_RegisterMapping("_class_wxFontDialog","_wxFontDialog",0);
utils/wxPython/src/msw/wxp.py
+80 -4
View File
@@ -975,7 +975,7 @@ def EVT_NOTEBOOK_PAGE_CHANGING(win, id, func):
win.Connect(id, -1, wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, func)
#wxTreeCtrl events
# wxTreeCtrl events
def EVT_TREE_BEGIN_DRAG(win, id, func):
win.Connect(id, -1, wxEVT_COMMAND_TREE_BEGIN_DRAG, func)
@@ -1019,6 +1019,77 @@ def EVT_TREE_DELETE_ITEM(win, id, func):
win.Connect(id, -1, wxEVT_COMMAND_TREE_DELETE_ITEM, func)
# wxSpinButton
def EVT_SPIN_UP(win, id, func):
win.Connect(id, -1, wxEVT_SCROLL_LINEUP, func)
def EVT_SPIN_DOWN(win, id, func):
win.Connect(id, -1,wxEVT_SCROLL_LINEDOWN, func)
def EVT_SPIN(win, id, func):
win.Connect(id, -1, wxEVT_SCROLL_TOP, func)
win.Connect(id, -1, wxEVT_SCROLL_BOTTOM, func)
win.Connect(id, -1, wxEVT_SCROLL_LINEUP, func)
win.Connect(id, -1, wxEVT_SCROLL_LINEDOWN, func)
win.Connect(id, -1, wxEVT_SCROLL_PAGEUP, func)
win.Connect(id, -1, wxEVT_SCROLL_PAGEDOWN, func)
win.Connect(id, -1, wxEVT_SCROLL_THUMBTRACK,func)
# wxTaskBarIcon
def EVT_TASKBAR_MOVE(win, func):
win.Connect(-1, -1, wxEVT_TASKBAR_MOVE, func)
def EVT_TASKBAR_LEFT_DOWN(win, func):
win.Connect(-1, -1, wxEVT_TASKBAR_LEFT_DOWN, func)
def EVT_TASKBAR_LEFT_UP(win, func):
win.Connect(-1, -1, wxEVT_TASKBAR_LEFT_UP, func)
def EVT_TASKBAR_RIGHT_DOWN(win, func):
win.Connect(-1, -1, wxEVT_TASKBAR_RIGHT_DOWN, func)
def EVT_TASKBAR_RIGHT_UP(win, func):
win.Connect(-1, -1, wxEVT_TASKBAR_RIGHT_UP, func)
def EVT_TASKBAR_LEFT_DCLICK(win, func):
win.Connect(-1, -1, wxEVT_TASKBAR_LEFT_DCLICK, func)
def EVT_TASKBAR_RIGHT_DCLICK(win, func):
win.Connect(-1, -1, wxEVT_TASKBAR_RIGHT_DCLICK, func)
# wxGrid
def EVT_GRID_SELECT_CELL(win, fn):
win.Connect(-1, -1, wxEVT_GRID_SELECT_CELL, fn)
def EVT_GRID_CREATE_CELL(win, fn):
win.Connect(-1, -1, wxEVT_GRID_CREATE_CELL, fn)
def EVT_GRID_CHANGE_LABELS(win, fn):
win.Connect(-1, -1, wxEVT_GRID_CHANGE_LABELS, fn)
def EVT_GRID_CHANGE_SEL_LABEL(win, fn):
win.Connect(-1, -1, wxEVT_GRID_CHANGE_SEL_LABEL, fn)
def EVT_GRID_CELL_CHANGE(win, fn):
win.Connect(-1, -1, wxEVT_GRID_CELL_CHANGE, fn)
def EVT_GRID_CELL_LCLICK(win, fn):
win.Connect(-1, -1, wxEVT_GRID_CELL_LCLICK, fn)
def EVT_GRID_CELL_RCLICK(win, fn):
win.Connect(-1, -1, wxEVT_GRID_CELL_RCLICK, fn)
def EVT_GRID_LABEL_LCLICK(win, fn):
win.Connect(-1, -1, wxEVT_GRID_LABEL_LCLICK, fn)
def EVT_GRID_LABEL_RCLICK(win, fn):
win.Connect(-1, -1, wxEVT_GRID_LABEL_RCLICK, fn)
#----------------------------------------------------------------------
@@ -1042,7 +1113,7 @@ NULL = NullObj()
#----------------------------------------------------------------------
# aliases
wxColor = wxColour
wxColor = wxColour
wxNamedColor = wxNamedColour
wxPyDefaultPosition.Set(-1,-1)
@@ -1115,8 +1186,13 @@ class wxApp(wxPyApp):
#----------------------------------------------------------------------------
#
# $Log$
# Revision 1.5 1998/11/11 03:12:55 RD
# Additions for wxTreeCtrl
# Revision 1.6 1998/11/25 08:46:48 RD
# Added wxPalette, wxRegion, wxRegionIterator, wxTaskbarIcon
# Added events for wxGrid
# Other various fixes and additions
#
# Revision 1.6 1998/11/16 00:00:52 RD
# Generic treectrl for wxPython/GTK compiles...
#
# Revision 1.5 1998/10/20 07:38:02 RD
# bug fix
utils/wxPython/src/my_typemaps.i
+17
View File
@@ -16,6 +16,7 @@
%{
extern byte* byte_LIST_helper(PyObject* source);
extern int* int_LIST_helper(PyObject* source);
extern long* long_LIST_helper(PyObject* source);
extern char** string_LIST_helper(PyObject* source);
@@ -34,6 +35,17 @@ extern wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source);
%typemap(python,in) byte* LIST {
$target = byte_LIST_helper($source);
if ($target == NULL) {
return NULL;
}
}
%typemap(python,freearg) byte* LIST {
delete [] $source;
}
%typemap(python,in) int* LIST {
$target = int_LIST_helper($source);
if ($target == NULL) {
@@ -186,6 +198,11 @@ static char* wxStringErrorMsg = "string type is required for parameter";
/////////////////////////////////////////////////////////////////////////////
//
// $Log$
// Revision 1.4 1998/11/25 08:45:27 RD
// Added wxPalette, wxRegion, wxRegionIterator, wxTaskbarIcon
// Added events for wxGrid
// Other various fixes and additions
//
// Revision 1.3 1998/11/15 23:03:47 RD
// Removing some ifdef's for wxGTK
//
utils/wxPython/src/windows2.i
+98 -31
View File
@@ -17,6 +17,9 @@
#include <wx/grid.h>
#include <wx/notebook.h>
#include <wx/splitter.h>
#ifdef __WXMSW__
#include <wx/msw/taskbar.h>
#endif
%}
//----------------------------------------------------------------------
@@ -36,31 +39,32 @@
//---------------------------------------------------------------------------
enum {
wxGRID_TEXT_CTRL,
wxGRID_HSCROLL,
wxGRID_VSCROLL,
wxGRID_VSCROLL
};
class wxGridCell {
public:
wxString& GetTextValue();
void SetTextValue(const wxString& str);
wxFont *GetFont();
void SetFont(wxFont *f);
wxColour& GetTextColour();
void SetTextColour(const wxColour& colour);
wxColour& GetBackgroundColour();
void SetBackgroundColour(const wxColour& colour);
wxBrush *GetBackgroundBrush();
int GetAlignment();
void SetAlignment(int align);
wxBitmap *GetCellBitmap();
void SetCellBitmap(wxBitmap *bitmap);
};
wxGridCell();
~wxGridCell();
wxString& GetTextValue();
void SetTextValue(const wxString& str);
wxFont* GetFont();
void SetFont(wxFont *f);
wxColour& GetTextColour();
void SetTextColour(const wxColour& colour);
wxColour& GetBackgroundColour();
void SetBackgroundColour(const wxColour& colour);
wxBrush* GetBackgroundBrush();
int GetAlignment();
void SetAlignment(int align);
wxBitmap* GetCellBitmap();
void SetCellBitmap(wxBitmap *bitmap);
};
@@ -74,6 +78,16 @@ public:
char* name="grid");
%pragma(python) addtomethod = "__init__:wxp._StdWindowCallbacks(self)"
%pragma(python) addtomethod = "__init__:wxp._checkForCallback(self, 'OnSelectCell', wxEVT_GRID_SELECT_CELL)"
%pragma(python) addtomethod = "__init__:wxp._checkForCallback(self, 'OnCreateCell', wxEVT_GRID_CREATE_CELL)"
%pragma(python) addtomethod = "__init__:wxp._checkForCallback(self, 'OnChangeLabels', wxEVT_GRID_CHANGE_LABELS)"
%pragma(python) addtomethod = "__init__:wxp._checkForCallback(self, 'OnChangeSelectionLabel', wxEVT_GRID_CHANGE_SEL_LABEL)"
%pragma(python) addtomethod = "__init__:wxp._checkForCallback(self, 'OnCellChange', wxEVT_GRID_CELL_CHANGE)"
%pragma(python) addtomethod = "__init__:wxp._checkForCallback(self, 'OnCellLeftClick', wxEVT_GRID_CELL_LCLICK)"
%pragma(python) addtomethod = "__init__:wxp._checkForCallback(self, 'OnCellRightClick', wxEVT_GRID_CELL_RCLICK)"
%pragma(python) addtomethod = "__init__:wxp._checkForCallback(self, 'OnLabelLeftClick', wxEVT_GRID_LABEL_LCLICK)"
%pragma(python) addtomethod = "__init__:wxp._checkForCallback(self, 'OnLabelRightClick', wxEVT_GRID_LABEL_RCLICK)"
void AdjustScrollbars();
bool AppendCols(int n=1, bool updateLabels=TRUE);
@@ -136,19 +150,7 @@ public:
bool InsertCols(int pos=0, int n=1, bool updateLabels=TRUE);
bool InsertRows(int pos=0, int n=1, bool updateLabels=TRUE);
// TODO: How to handle callbacks that don't come from
// event system???
//
//void OnActivate(bool active);
//void OnChangeLabels();
//void OnChangeSelectionLabel();
//wxGridCell* OnCreateCell();
//void OnLeftClick(int row, int col, int x, int y, bool control, bool shift);
//void OnRightClick(int row, int col, int x, int y, bool control, bool shift);
//void OnLabelLeftClick(int row, int col, int x, int y, bool control, bool shift);
//void OnLabelRightClick(int row, int col, int x, int y, bool control, bool shift);
//void OnSelectCell(int row, int col);
//void OnSelectCellImplementation(wxDC *dc, int row, int col);
void OnActivate(bool active);
void SetCellAlignment(int alignment, int row, int col);
%name(SetDefCellAlignment)void SetCellAlignment(int alignment);
@@ -175,6 +177,32 @@ public:
void UpdateDimensions();
};
class wxGridEvent : public wxEvent {
public:
int m_row;
int m_col;
int m_x;
int m_y;
bool m_control;
bool m_shift;
wxGridCell* m_cell;
};
enum {
wxEVT_GRID_SELECT_CELL,
wxEVT_GRID_CREATE_CELL,
wxEVT_GRID_CHANGE_LABELS,
wxEVT_GRID_CHANGE_SEL_LABEL,
wxEVT_GRID_CELL_CHANGE,
wxEVT_GRID_CELL_LCLICK,
wxEVT_GRID_CELL_RCLICK,
wxEVT_GRID_LABEL_LCLICK,
wxEVT_GRID_LABEL_RCLICK,
};
//---------------------------------------------------------------------------
class wxNotebookEvent : public wxCommandEvent {
@@ -234,13 +262,15 @@ public:
wxSplitterWindow(wxWindow* parent, wxWindowID id,
const wxPoint& point = wxPyDefaultPosition,
const wxSize& size = wxPyDefaultSize,
long style=wxSP_3D,
long style=wxSP_3D|wxCLIP_CHILDREN,
char* name = "splitterWindow");
%pragma(python) addtomethod = "__init__:wxp._StdWindowCallbacks(self)"
int GetBorderSize();
int GetMinimumPaneSize();
int GetSashPosition();
int GetSashSize();
int GetSplitMode();
wxWindow* GetWindow1();
wxWindow* GetWindow2();
@@ -251,9 +281,12 @@ public:
// event system???
//
//void OnDoubleClickSash(int x, int y);
//bool OnSashPositionChange(int newSashPosition);
//void OnUnsplit(wxWindow* removed);
void SetBorderSize(int width);
void SetSashPosition(int position, int redraw = TRUE);
void SetSashSize(int width);
void SetMinimumPaneSize(int paneSize);
void SetSplitMode(int mode);
bool SplitHorizontally(wxWindow* window1, wxWindow* window2, int sashPosition = 0);
@@ -263,12 +296,46 @@ public:
//---------------------------------------------------------------------------
#ifdef __WXMSW__
enum {
wxEVT_TASKBAR_MOVE,
wxEVT_TASKBAR_LEFT_DOWN,
wxEVT_TASKBAR_LEFT_UP,
wxEVT_TASKBAR_RIGHT_DOWN,
wxEVT_TASKBAR_RIGHT_UP,
wxEVT_TASKBAR_LEFT_DCLICK,
wxEVT_TASKBAR_RIGHT_DCLICK
};
class wxTaskBarIcon : public wxEvtHandler {
public:
wxTaskBarIcon();
~wxTaskBarIcon();
%pragma(python) addtomethod = "__init__:wxp._checkForCallback(self, 'OnMouseMove', wxEVT_TASKBAR_MOVE)"
%pragma(python) addtomethod = "__init__:wxp._checkForCallback(self, 'OnLButtonDown', wxEVT_TASKBAR_LEFT_DOWN)"
%pragma(python) addtomethod = "__init__:wxp._checkForCallback(self, 'OnLButtonUp', wxEVT_TASKBAR_LEFT_UP)"
%pragma(python) addtomethod = "__init__:wxp._checkForCallback(self, 'OnRButtonDown', wxEVT_TASKBAR_RIGHT_DOWN)"
%pragma(python) addtomethod = "__init__:wxp._checkForCallback(self, 'OnRButtonUp', wxEVT_TASKBAR_RIGHT_UP)"
%pragma(python) addtomethod = "__init__:wxp._checkForCallback(self, 'OnLButtonDClick',wxEVT_TASKBAR_LEFT_DCLICK)"
%pragma(python) addtomethod = "__init__:wxp._checkForCallback(self, 'OnRButtonDClick',wxEVT_TASKBAR_RIGHT_DCLICK)"
bool SetIcon(const wxIcon& icon, const char* tooltip = "");
bool RemoveIcon(void);
};
#endif
//---------------------------------------------------------------------------
/////////////////////////////////////////////////////////////////////////////
//
// $Log$
// Revision 1.6 1998/11/25 08:45:28 RD
// Added wxPalette, wxRegion, wxRegionIterator, wxTaskbarIcon
// Added events for wxGrid
// Other various fixes and additions
//
// Revision 1.5 1998/11/03 09:21:57 RD
// fixed a typo
//