Mirrors_UI_SDK/wxWidgets
1
0
Fork 0
mirror of https://github.com/wxWidgets/wxWidgets.git synced 2026-09-20 12:59:31 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

reSWIGged

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24931 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2003-12-20 01:17:52 +00:00
parent e732529375
commit d03fd34d3c
26 changed files with 3084 additions and 1915 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wxPython/src/_misc_rename.i
+1
View File
@@ -151,6 +151,7 @@
%rename(GenericFindWindowAtPoint) wxGenericFindWindowAtPoint;
%rename(FindWindowAtPoint) wxFindWindowAtPoint;
%rename(GetTopLevelParent) wxGetTopLevelParent;
%rename(GetKeyState) wxGetKeyState;
%rename(WakeUpMainThread) wxWakeUpMainThread;
%rename(MutexGuiEnter) wxMutexGuiEnter;
%rename(MutexGuiLeave) wxMutexGuiLeave;
wxPython/src/msw/calendar.py
+30 -28
View File
@@ -27,32 +27,32 @@ class CalendarDateAttr(object):
return "<%s.%s; proxy of C++ wxCalendarDateAttr instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
def __init__(self, *args, **kwargs):
"""
__init__(wxColour colText, wxColour colBack=wxNullColour, wxColour colBorder=wxNullColour,
wxFont font=wxNullFont,
wxCalendarDateBorder border=CAL_BORDER_NONE) -> CalendarDateAttr
__init__(Colour colText, Colour colBack=wxNullColour, Colour colBorder=wxNullColour,
Font font=wxNullFont,
int border=CAL_BORDER_NONE) -> CalendarDateAttr
"""
newobj = _calendar.new_CalendarDateAttr(*args, **kwargs)
self.this = newobj.this
self.thisown = 1
del newobj.thisown
def SetTextColour(*args, **kwargs):
"""SetTextColour(wxColour colText)"""
"""SetTextColour(Colour colText)"""
return _calendar.CalendarDateAttr_SetTextColour(*args, **kwargs)
def SetBackgroundColour(*args, **kwargs):
"""SetBackgroundColour(wxColour colBack)"""
"""SetBackgroundColour(Colour colBack)"""
return _calendar.CalendarDateAttr_SetBackgroundColour(*args, **kwargs)
def SetBorderColour(*args, **kwargs):
"""SetBorderColour(wxColour col)"""
"""SetBorderColour(Colour col)"""
return _calendar.CalendarDateAttr_SetBorderColour(*args, **kwargs)
def SetFont(*args, **kwargs):
"""SetFont(wxFont font)"""
"""SetFont(Font font)"""
return _calendar.CalendarDateAttr_SetFont(*args, **kwargs)
def SetBorder(*args, **kwargs):
"""SetBorder(wxCalendarDateBorder border)"""
"""SetBorder(int border)"""
return _calendar.CalendarDateAttr_SetBorder(*args, **kwargs)
def SetHoliday(*args, **kwargs):
@@ -84,23 +84,23 @@ class CalendarDateAttr(object):
return _calendar.CalendarDateAttr_IsHoliday(*args, **kwargs)
def GetTextColour(*args, **kwargs):
"""GetTextColour() -> wxColour"""
"""GetTextColour() -> Colour"""
return _calendar.CalendarDateAttr_GetTextColour(*args, **kwargs)
def GetBackgroundColour(*args, **kwargs):
"""GetBackgroundColour() -> wxColour"""
"""GetBackgroundColour() -> Colour"""
return _calendar.CalendarDateAttr_GetBackgroundColour(*args, **kwargs)
def GetBorderColour(*args, **kwargs):
"""GetBorderColour() -> wxColour"""
"""GetBorderColour() -> Colour"""
return _calendar.CalendarDateAttr_GetBorderColour(*args, **kwargs)
def GetFont(*args, **kwargs):
"""GetFont() -> wxFont"""
"""GetFont() -> Font"""
return _calendar.CalendarDateAttr_GetFont(*args, **kwargs)
def GetBorder(*args, **kwargs):
"""GetBorder() -> wxCalendarDateBorder"""
"""GetBorder() -> int"""
return _calendar.CalendarDateAttr_GetBorder(*args, **kwargs)
@@ -112,7 +112,7 @@ class CalendarDateAttrPtr(CalendarDateAttr):
_calendar.CalendarDateAttr_swigregister(CalendarDateAttrPtr)
def CalendarDateAttrBorder(*args, **kwargs):
"""CalendarDateAttrBorder(wxCalendarDateBorder border, wxColour colBorder=wxNullColour) -> CalendarDateAttr"""
"""CalendarDateAttrBorder(int border, Colour colBorder=wxNullColour) -> CalendarDateAttr"""
val = _calendar.new_CalendarDateAttrBorder(*args, **kwargs)
val.thisown = 1
return val
@@ -135,11 +135,11 @@ class CalendarEvent(core.CommandEvent):
return _calendar.CalendarEvent_SetDate(*args, **kwargs)
def SetWeekDay(*args, **kwargs):
"""SetWeekDay(wxDateTime::WeekDay wd)"""
"""SetWeekDay(int wd)"""
return _calendar.CalendarEvent_SetWeekDay(*args, **kwargs)
def GetWeekDay(*args, **kwargs):
"""GetWeekDay() -> wxDateTime::WeekDay"""
"""GetWeekDay() -> int"""
return _calendar.CalendarEvent_GetWeekDay(*args, **kwargs)
@@ -171,7 +171,7 @@ class CalendarCtrl(core.Control):
__init__(Window parent, int id, DateTime date=wxDefaultDateTime,
Point pos=DefaultPosition, Size size=DefaultSize,
long style=wxCAL_SHOW_HOLIDAYS|wxWANTS_CHARS,
wxString name=wxPyCalendarNameStr) -> CalendarCtrl
String name=CalendarNameStr) -> CalendarCtrl
"""
newobj = _calendar.new_CalendarCtrl(*args, **kwargs)
self.this = newobj.this
@@ -184,7 +184,7 @@ class CalendarCtrl(core.Control):
Create(Window parent, int id, DateTime date=wxDefaultDateTime,
Point pos=DefaultPosition, Size size=DefaultSize,
long style=wxCAL_SHOW_HOLIDAYS|wxWANTS_CHARS,
wxString name=wxPyCalendarNameStr) -> bool
String name=CalendarNameStr) -> bool
"""
return _calendar.CalendarCtrl_Create(*args, **kwargs)
@@ -229,39 +229,39 @@ class CalendarCtrl(core.Control):
return _calendar.CalendarCtrl_EnableHolidayDisplay(*args, **kwargs)
def SetHeaderColours(*args, **kwargs):
"""SetHeaderColours(wxColour colFg, wxColour colBg)"""
"""SetHeaderColours(Colour colFg, Colour colBg)"""
return _calendar.CalendarCtrl_SetHeaderColours(*args, **kwargs)
def GetHeaderColourFg(*args, **kwargs):
"""GetHeaderColourFg() -> wxColour"""
"""GetHeaderColourFg() -> Colour"""
return _calendar.CalendarCtrl_GetHeaderColourFg(*args, **kwargs)
def GetHeaderColourBg(*args, **kwargs):
"""GetHeaderColourBg() -> wxColour"""
"""GetHeaderColourBg() -> Colour"""
return _calendar.CalendarCtrl_GetHeaderColourBg(*args, **kwargs)
def SetHighlightColours(*args, **kwargs):
"""SetHighlightColours(wxColour colFg, wxColour colBg)"""
"""SetHighlightColours(Colour colFg, Colour colBg)"""
return _calendar.CalendarCtrl_SetHighlightColours(*args, **kwargs)
def GetHighlightColourFg(*args, **kwargs):
"""GetHighlightColourFg() -> wxColour"""
"""GetHighlightColourFg() -> Colour"""
return _calendar.CalendarCtrl_GetHighlightColourFg(*args, **kwargs)
def GetHighlightColourBg(*args, **kwargs):
"""GetHighlightColourBg() -> wxColour"""
"""GetHighlightColourBg() -> Colour"""
return _calendar.CalendarCtrl_GetHighlightColourBg(*args, **kwargs)
def SetHolidayColours(*args, **kwargs):
"""SetHolidayColours(wxColour colFg, wxColour colBg)"""
"""SetHolidayColours(Colour colFg, Colour colBg)"""
return _calendar.CalendarCtrl_SetHolidayColours(*args, **kwargs)
def GetHolidayColourFg(*args, **kwargs):
"""GetHolidayColourFg() -> wxColour"""
"""GetHolidayColourFg() -> Colour"""
return _calendar.CalendarCtrl_GetHolidayColourFg(*args, **kwargs)
def GetHolidayColourBg(*args, **kwargs):
"""GetHolidayColourBg() -> wxColour"""
"""GetHolidayColourBg() -> Colour"""
return _calendar.CalendarCtrl_GetHolidayColourBg(*args, **kwargs)
def GetAttr(*args, **kwargs):
@@ -281,7 +281,7 @@ class CalendarCtrl(core.Control):
return _calendar.CalendarCtrl_ResetAttr(*args, **kwargs)
def HitTest(*args, **kwargs):
"""HitTest(Point pos, DateTime date=None, wxDateTime::WeekDay wd=None) -> wxCalendarHitTestResult"""
"""HitTest(Point pos, DateTime date=None, int wd=None) -> int"""
return _calendar.CalendarCtrl_HitTest(*args, **kwargs)
def Enable(*args, **kwargs):
@@ -307,6 +307,8 @@ class CalendarCtrlPtr(CalendarCtrl):
if not hasattr(self,"thisown"): self.thisown = 0
self.__class__ = CalendarCtrl
_calendar.CalendarCtrl_swigregister(CalendarCtrlPtr)
cvar = _calendar.cvar
CalendarNameStr = cvar.CalendarNameStr
def PreCalendarCtrl(*args, **kwargs):
"""PreCalendarCtrl() -> CalendarCtrl"""
wxPython/src/msw/calendar_wrap.cpp
+23 -3
View File
@@ -240,9 +240,7 @@ static swig_type_info *swig_types[15];
#include <wx/calctrl.h>
DECLARE_DEF_STRING(CalendarNameStr);
static const wxString wxPyCalendarNameStr(wxCalendarNameStr);
#ifdef __cplusplus
extern "C" {
#endif
@@ -953,6 +951,26 @@ static PyObject * CalendarEvent_swigregister(PyObject *self, PyObject *args) {
Py_INCREF(obj);
return Py_BuildValue((char *)"");
}
static int _wrap_CalendarNameStr_set(PyObject *_val) {
PyErr_SetString(PyExc_TypeError,"Variable CalendarNameStr is read-only.");
return 1;
}
static PyObject *_wrap_CalendarNameStr_get() {
PyObject *pyobj;
{
#if wxUSE_UNICODE
pyobj = PyUnicode_FromWideChar((&wxPyCalendarNameStr)->c_str(), (&wxPyCalendarNameStr)->Len());
#else
pyobj = PyString_FromStringAndSize((&wxPyCalendarNameStr)->c_str(), (&wxPyCalendarNameStr)->Len());
#endif
}
return pyobj;
}
static PyObject *_wrap_new_CalendarCtrl(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxWindow *arg1 = (wxWindow *) 0 ;
@@ -2618,6 +2636,8 @@ SWIGEXPORT(void) SWIG_init(void) {
PyDict_SetItemString(d, "wxEVT_CALENDAR_MONTH_CHANGED", PyInt_FromLong(wxEVT_CALENDAR_MONTH_CHANGED));
PyDict_SetItemString(d, "wxEVT_CALENDAR_YEAR_CHANGED", PyInt_FromLong(wxEVT_CALENDAR_YEAR_CHANGED));
PyDict_SetItemString(d, "wxEVT_CALENDAR_WEEKDAY_CLICKED", PyInt_FromLong(wxEVT_CALENDAR_WEEKDAY_CLICKED));
PyDict_SetItemString(d,(char*)"cvar", SWIG_globals);
SWIG_addvarlink(SWIG_globals,(char*)"CalendarNameStr",_wrap_CalendarNameStr_get, _wrap_CalendarNameStr_set);
}
wxPython/src/msw/controls.py
+306 -287
View File
File diff suppressed because it is too large Load Diff
wxPython/src/msw/controls_wrap.cpp
+581 -80
View File
File diff suppressed because it is too large Load Diff
wxPython/src/msw/core.py
+271 -254
View File
File diff suppressed because it is too large Load Diff
wxPython/src/msw/core_wrap.cpp
+45 -20
View File
@@ -537,10 +537,6 @@ static wxPyCoreAPI API = {
#endif
DECLARE_DEF_STRING(EmptyString);
// DECLARE_DEF_STRING(PanelNameStr);
#if ! wxUSE_HOTKEY
enum wxHotkeyModifier
{
@@ -553,6 +549,7 @@ enum wxHotkeyModifier
#define wxEVT_HOTKEY 9999
#endif
static const wxString wxPyEmptyString(wxEmptyString);
wxString wxObject_GetClassName(wxObject *self){
return self->GetClassInfo()->GetClassName();
}
@@ -1030,9 +1027,7 @@ PyObject *wxMenu_GetMenuItems(wxMenu *self){
wxMenuItemList& list = self->GetMenuItems();
return wxPy_ConvertList(&list);
}
DECLARE_DEF_STRING(ControlNameStr);
static const wxString wxPyControlNameStr(wxControlNameStr);
int wxItemContainer_Append(wxItemContainer *self,wxString const &item,PyObject *clientData){
if (clientData) {
wxPyClientData* data = new wxPyClientData(clientData);
@@ -1313,6 +1308,26 @@ bool wxGridBagSizer_Add(wxGridBagSizer *self,PyObject *item,wxGBPosition const &
#ifdef __cplusplus
extern "C" {
#endif
static int _wrap_EmptyString_set(PyObject *_val) {
PyErr_SetString(PyExc_TypeError,"Variable EmptyString is read-only.");
return 1;
}
static PyObject *_wrap_EmptyString_get() {
PyObject *pyobj;
{
#if wxUSE_UNICODE
pyobj = PyUnicode_FromWideChar((&wxPyEmptyString)->c_str(), (&wxPyEmptyString)->Len());
#else
pyobj = PyString_FromStringAndSize((&wxPyEmptyString)->c_str(), (&wxPyEmptyString)->Len());
#endif
}
return pyobj;
}
static PyObject *_wrap_Object_GetClassName(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxObject *arg1 = (wxObject *) 0 ;
@@ -29103,6 +29118,26 @@ static PyObject * MenuItem_swigregister(PyObject *self, PyObject *args) {
Py_INCREF(obj);
return Py_BuildValue((char *)"");
}
static int _wrap_ControlNameStr_set(PyObject *_val) {
PyErr_SetString(PyExc_TypeError,"Variable ControlNameStr is read-only.");
return 1;
}
static PyObject *_wrap_ControlNameStr_get() {
PyObject *pyobj;
{
#if wxUSE_UNICODE
pyobj = PyUnicode_FromWideChar((&wxPyControlNameStr)->c_str(), (&wxPyControlNameStr)->Len());
#else
pyobj = PyString_FromStringAndSize((&wxPyControlNameStr)->c_str(), (&wxPyControlNameStr)->Len());
#endif
}
return pyobj;
}
static PyObject *_wrap_new_Control(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxWindow *arg1 = (wxWindow *) 0 ;
@@ -35929,6 +35964,7 @@ static PyObject * LayoutConstraints_swigregister(PyObject *self, PyObject *args)
}
static PyMethodDef SwigMethods[] = {
{ (char *)"_wxPySetDictionary", __wxPySetDictionary, METH_VARARGS },
{ (char *)"_wxPyFixStockObjects", __wxPyFixStockObjects, METH_VARARGS },
{ (char *)"Object_GetClassName", (PyCFunction) _wrap_Object_GetClassName, METH_VARARGS | METH_KEYWORDS },
{ (char *)"Object_Destroy", (PyCFunction) _wrap_Object_Destroy, METH_VARARGS | METH_KEYWORDS },
{ (char *)"Object_swigregister", Object_swigregister, METH_VARARGS },
@@ -38423,36 +38459,23 @@ static swig_const_info swig_const_table[] = {
{ SWIG_PY_INT, (char *)"UPDATE_UI_FROMIDLE", (long) wxUPDATE_UI_FROMIDLE, 0, 0, 0},
{ SWIG_PY_INT, (char *)"BITMAP_TYPE_INVALID", (long) wxBITMAP_TYPE_INVALID, 0, 0, 0},
{ SWIG_PY_INT, (char *)"BITMAP_TYPE_BMP", (long) wxBITMAP_TYPE_BMP, 0, 0, 0},
{ SWIG_PY_INT, (char *)"BITMAP_TYPE_BMP_RESOURCE", (long) wxBITMAP_TYPE_BMP_RESOURCE, 0, 0, 0},
{ SWIG_PY_INT, (char *)"BITMAP_TYPE_RESOURCE", (long) wxBITMAP_TYPE_RESOURCE, 0, 0, 0},
{ SWIG_PY_INT, (char *)"BITMAP_TYPE_ICO", (long) wxBITMAP_TYPE_ICO, 0, 0, 0},
{ SWIG_PY_INT, (char *)"BITMAP_TYPE_ICO_RESOURCE", (long) wxBITMAP_TYPE_ICO_RESOURCE, 0, 0, 0},
{ SWIG_PY_INT, (char *)"BITMAP_TYPE_CUR", (long) wxBITMAP_TYPE_CUR, 0, 0, 0},
{ SWIG_PY_INT, (char *)"BITMAP_TYPE_CUR_RESOURCE", (long) wxBITMAP_TYPE_CUR_RESOURCE, 0, 0, 0},
{ SWIG_PY_INT, (char *)"BITMAP_TYPE_XBM", (long) wxBITMAP_TYPE_XBM, 0, 0, 0},
{ SWIG_PY_INT, (char *)"BITMAP_TYPE_XBM_DATA", (long) wxBITMAP_TYPE_XBM_DATA, 0, 0, 0},
{ SWIG_PY_INT, (char *)"BITMAP_TYPE_XPM", (long) wxBITMAP_TYPE_XPM, 0, 0, 0},
{ SWIG_PY_INT, (char *)"BITMAP_TYPE_XPM_DATA", (long) wxBITMAP_TYPE_XPM_DATA, 0, 0, 0},
{ SWIG_PY_INT, (char *)"BITMAP_TYPE_TIF", (long) wxBITMAP_TYPE_TIF, 0, 0, 0},
{ SWIG_PY_INT, (char *)"BITMAP_TYPE_TIF_RESOURCE", (long) wxBITMAP_TYPE_TIF_RESOURCE, 0, 0, 0},
{ SWIG_PY_INT, (char *)"BITMAP_TYPE_GIF", (long) wxBITMAP_TYPE_GIF, 0, 0, 0},
{ SWIG_PY_INT, (char *)"BITMAP_TYPE_GIF_RESOURCE", (long) wxBITMAP_TYPE_GIF_RESOURCE, 0, 0, 0},
{ SWIG_PY_INT, (char *)"BITMAP_TYPE_PNG", (long) wxBITMAP_TYPE_PNG, 0, 0, 0},
{ SWIG_PY_INT, (char *)"BITMAP_TYPE_PNG_RESOURCE", (long) wxBITMAP_TYPE_PNG_RESOURCE, 0, 0, 0},
{ SWIG_PY_INT, (char *)"BITMAP_TYPE_JPEG", (long) wxBITMAP_TYPE_JPEG, 0, 0, 0},
{ SWIG_PY_INT, (char *)"BITMAP_TYPE_JPEG_RESOURCE", (long) wxBITMAP_TYPE_JPEG_RESOURCE, 0, 0, 0},
{ SWIG_PY_INT, (char *)"BITMAP_TYPE_PNM", (long) wxBITMAP_TYPE_PNM, 0, 0, 0},
{ SWIG_PY_INT, (char *)"BITMAP_TYPE_PNM_RESOURCE", (long) wxBITMAP_TYPE_PNM_RESOURCE, 0, 0, 0},
{ SWIG_PY_INT, (char *)"BITMAP_TYPE_PCX", (long) wxBITMAP_TYPE_PCX, 0, 0, 0},
{ SWIG_PY_INT, (char *)"BITMAP_TYPE_PCX_RESOURCE", (long) wxBITMAP_TYPE_PCX_RESOURCE, 0, 0, 0},
{ SWIG_PY_INT, (char *)"BITMAP_TYPE_PICT", (long) wxBITMAP_TYPE_PICT, 0, 0, 0},
{ SWIG_PY_INT, (char *)"BITMAP_TYPE_PICT_RESOURCE", (long) wxBITMAP_TYPE_PICT_RESOURCE, 0, 0, 0},
{ SWIG_PY_INT, (char *)"BITMAP_TYPE_ICON", (long) wxBITMAP_TYPE_ICON, 0, 0, 0},
{ SWIG_PY_INT, (char *)"BITMAP_TYPE_ICON_RESOURCE", (long) wxBITMAP_TYPE_ICON_RESOURCE, 0, 0, 0},
{ SWIG_PY_INT, (char *)"BITMAP_TYPE_ANI", (long) wxBITMAP_TYPE_ANI, 0, 0, 0},
{ SWIG_PY_INT, (char *)"BITMAP_TYPE_IFF", (long) wxBITMAP_TYPE_IFF, 0, 0, 0},
{ SWIG_PY_INT, (char *)"BITMAP_TYPE_MACCURSOR", (long) wxBITMAP_TYPE_MACCURSOR, 0, 0, 0},
{ SWIG_PY_INT, (char *)"BITMAP_TYPE_MACCURSOR_RESOURCE", (long) wxBITMAP_TYPE_MACCURSOR_RESOURCE, 0, 0, 0},
{ SWIG_PY_INT, (char *)"BITMAP_TYPE_ANY", (long) wxBITMAP_TYPE_ANY, 0, 0, 0},
{ SWIG_PY_INT, (char *)"CURSOR_NONE", (long) wxCURSOR_NONE, 0, 0, 0},
{ SWIG_PY_INT, (char *)"CURSOR_ARROW", (long) wxCURSOR_ARROW, 0, 0, 0},
@@ -38688,6 +38711,7 @@ SWIGEXPORT(void) SWIG_init(void) {
#endif
PyDict_SetItemString(d,(char*)"cvar", SWIG_globals);
SWIG_addvarlink(SWIG_globals,(char*)"EmptyString",_wrap_EmptyString_get, _wrap_EmptyString_set);
SWIG_addvarlink(SWIG_globals,(char*)"DefaultPosition",_wrap_DefaultPosition_get, _wrap_DefaultPosition_set);
SWIG_addvarlink(SWIG_globals,(char*)"DefaultSize",_wrap_DefaultSize_get, _wrap_DefaultSize_set);
@@ -38819,6 +38843,7 @@ SWIGEXPORT(void) SWIG_init(void) {
SWIG_addvarlink(SWIG_globals,(char*)"NullAcceleratorTable",_wrap_NullAcceleratorTable_get, _wrap_NullAcceleratorTable_set);
SWIG_addvarlink(SWIG_globals,(char*)"PanelNameStr",_wrap_PanelNameStr_get, _wrap_PanelNameStr_set);
SWIG_addvarlink(SWIG_globals,(char*)"DefaultValidator",_wrap_DefaultValidator_get, _wrap_DefaultValidator_set);
SWIG_addvarlink(SWIG_globals,(char*)"ControlNameStr",_wrap_ControlNameStr_get, _wrap_ControlNameStr_set);
SWIG_addvarlink(SWIG_globals,(char*)"DefaultSpan",_wrap_DefaultSpan_get, _wrap_DefaultSpan_set);
// Initialize threading, some globals and such
wxPython/src/msw/gdi.py
+118 -124
View File
File diff suppressed because it is too large Load Diff
wxPython/src/msw/gdi_wrap.cpp
+22 -37
View File
@@ -279,8 +279,8 @@ static swig_type_info *swig_types[56];
#include "wx/wxPython/wxPython.h"
#include "wx/wxPython/pyclasses.h"
DECLARE_DEF_STRING(EmptyString);
static const wxString wxPyEmptyString(wxEmptyString);
PyObject *wxColour_Get(wxColour *self){
PyObject* rv = PyTuple_New(3);
int red = -1;
@@ -6154,7 +6154,7 @@ static PyObject * NativeFontInfo_swigregister(PyObject *self, PyObject *args) {
static PyObject *_wrap_NativeEncodingInfo_facename_set(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxNativeEncodingInfo *arg1 = (wxNativeEncodingInfo *) 0 ;
wxString arg2 ;
wxString *arg2 = (wxString *) 0 ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
char *kwnames[] = {
@@ -6163,13 +6163,8 @@ static PyObject *_wrap_NativeEncodingInfo_facename_set(PyObject *self, PyObject
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:NativeEncodingInfo_facename_set",kwnames,&obj0,&obj1)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxNativeEncodingInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
{
wxString* sptr = wxString_in_helper(obj1);
if (sptr == NULL) SWIG_fail;
arg2 = *sptr;
delete sptr;
}
if (arg1) (arg1)->facename = arg2;
if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxString,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
if (arg1) (arg1)->facename = *arg2;
Py_INCREF(Py_None); resultobj = Py_None;
return resultobj;
@@ -6181,7 +6176,7 @@ static PyObject *_wrap_NativeEncodingInfo_facename_set(PyObject *self, PyObject
static PyObject *_wrap_NativeEncodingInfo_facename_get(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxNativeEncodingInfo *arg1 = (wxNativeEncodingInfo *) 0 ;
wxString result;
wxString *result;
PyObject * obj0 = 0 ;
char *kwnames[] = {
(char *) "self", NULL
@@ -6189,13 +6184,13 @@ static PyObject *_wrap_NativeEncodingInfo_facename_get(PyObject *self, PyObject
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:NativeEncodingInfo_facename_get",kwnames,&obj0)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxNativeEncodingInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
result = ((arg1)->facename);
result = (wxString *)& ((arg1)->facename);
{
#if wxUSE_UNICODE
resultobj = PyUnicode_FromWideChar((&result)->c_str(), (&result)->Len());
resultobj = PyUnicode_FromWideChar(result->c_str(), result->Len());
#else
resultobj = PyString_FromStringAndSize((&result)->c_str(), (&result)->Len());
resultobj = PyString_FromStringAndSize(result->c_str(), result->Len());
#endif
}
return resultobj;
@@ -8256,7 +8251,7 @@ static PyObject *_wrap_LanguageInfo_Language_get(PyObject *self, PyObject *args,
static PyObject *_wrap_LanguageInfo_CanonicalName_set(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxLanguageInfo *arg1 = (wxLanguageInfo *) 0 ;
wxString arg2 ;
wxString *arg2 = (wxString *) 0 ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
char *kwnames[] = {
@@ -8265,13 +8260,8 @@ static PyObject *_wrap_LanguageInfo_CanonicalName_set(PyObject *self, PyObject *
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:LanguageInfo_CanonicalName_set",kwnames,&obj0,&obj1)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxLanguageInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
{
wxString* sptr = wxString_in_helper(obj1);
if (sptr == NULL) SWIG_fail;
arg2 = *sptr;
delete sptr;
}
if (arg1) (arg1)->CanonicalName = arg2;
if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxString,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
if (arg1) (arg1)->CanonicalName = *arg2;
Py_INCREF(Py_None); resultobj = Py_None;
return resultobj;
@@ -8283,7 +8273,7 @@ static PyObject *_wrap_LanguageInfo_CanonicalName_set(PyObject *self, PyObject *
static PyObject *_wrap_LanguageInfo_CanonicalName_get(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxLanguageInfo *arg1 = (wxLanguageInfo *) 0 ;
wxString result;
wxString *result;
PyObject * obj0 = 0 ;
char *kwnames[] = {
(char *) "self", NULL
@@ -8291,13 +8281,13 @@ static PyObject *_wrap_LanguageInfo_CanonicalName_get(PyObject *self, PyObject *
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:LanguageInfo_CanonicalName_get",kwnames,&obj0)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxLanguageInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
result = ((arg1)->CanonicalName);
result = (wxString *)& ((arg1)->CanonicalName);
{
#if wxUSE_UNICODE
resultobj = PyUnicode_FromWideChar((&result)->c_str(), (&result)->Len());
resultobj = PyUnicode_FromWideChar(result->c_str(), result->Len());
#else
resultobj = PyString_FromStringAndSize((&result)->c_str(), (&result)->Len());
resultobj = PyString_FromStringAndSize(result->c_str(), result->Len());
#endif
}
return resultobj;
@@ -8309,7 +8299,7 @@ static PyObject *_wrap_LanguageInfo_CanonicalName_get(PyObject *self, PyObject *
static PyObject *_wrap_LanguageInfo_Description_set(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxLanguageInfo *arg1 = (wxLanguageInfo *) 0 ;
wxString arg2 ;
wxString *arg2 = (wxString *) 0 ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
char *kwnames[] = {
@@ -8318,13 +8308,8 @@ static PyObject *_wrap_LanguageInfo_Description_set(PyObject *self, PyObject *ar
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:LanguageInfo_Description_set",kwnames,&obj0,&obj1)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxLanguageInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
{
wxString* sptr = wxString_in_helper(obj1);
if (sptr == NULL) SWIG_fail;
arg2 = *sptr;
delete sptr;
}
if (arg1) (arg1)->Description = arg2;
if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxString,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
if (arg1) (arg1)->Description = *arg2;
Py_INCREF(Py_None); resultobj = Py_None;
return resultobj;
@@ -8336,7 +8321,7 @@ static PyObject *_wrap_LanguageInfo_Description_set(PyObject *self, PyObject *ar
static PyObject *_wrap_LanguageInfo_Description_get(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxLanguageInfo *arg1 = (wxLanguageInfo *) 0 ;
wxString result;
wxString *result;
PyObject * obj0 = 0 ;
char *kwnames[] = {
(char *) "self", NULL
@@ -8344,13 +8329,13 @@ static PyObject *_wrap_LanguageInfo_Description_get(PyObject *self, PyObject *ar
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:LanguageInfo_Description_get",kwnames,&obj0)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxLanguageInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
result = ((arg1)->Description);
result = (wxString *)& ((arg1)->Description);
{
#if wxUSE_UNICODE
resultobj = PyUnicode_FromWideChar((&result)->c_str(), (&result)->Len());
resultobj = PyUnicode_FromWideChar(result->c_str(), result->Len());
#else
resultobj = PyString_FromStringAndSize((&result)->c_str(), (&result)->Len());
resultobj = PyString_FromStringAndSize(result->c_str(), result->Len());
#endif
}
return resultobj;
wxPython/src/msw/grid.py
+84 -83
View File
File diff suppressed because it is too large Load Diff
wxPython/src/msw/grid_wrap.cpp
+24 -3
View File
@@ -279,10 +279,10 @@ static swig_type_info *swig_types[52];
#include <wx/grid.h>
#include <wx/generic/gridctrl.h>
DECLARE_DEF_STRING(PanelNameStr);
DECLARE_DEF_STRING2(DateTimeFormatStr, wxT("%c"));
static const wxString wxPyEmptyString(wxT(""));
static const wxString wxPyEmptyString(wxEmptyString);
static const wxString wxPyPanelNameStr(wxPanelNameStr);
static const wxString wxPyDateTimeFormatStr(wxT(wxT("%c")));
#define wxPyMake_TEMPLATE(TYPE) \
@@ -1204,6 +1204,26 @@ wxGridCellCoords wxGrid_XYToCell(wxGrid *self,int x,int y){
#ifdef __cplusplus
extern "C" {
#endif
static int _wrap_DateTimeFormatStr_set(PyObject *_val) {
PyErr_SetString(PyExc_TypeError,"Variable DateTimeFormatStr is read-only.");
return 1;
}
static PyObject *_wrap_DateTimeFormatStr_get() {
PyObject *pyobj;
{
#if wxUSE_UNICODE
pyobj = PyUnicode_FromWideChar((&wxPyDateTimeFormatStr)->c_str(), (&wxPyDateTimeFormatStr)->Len());
#else
pyobj = PyString_FromStringAndSize((&wxPyDateTimeFormatStr)->c_str(), (&wxPyDateTimeFormatStr)->Len());
#endif
}
return pyobj;
}
static int _wrap_GridNoCellCoords_set(PyObject *_val) {
PyErr_SetString(PyExc_TypeError,"Variable GridNoCellCoords is read-only.");
return 1;
@@ -15333,6 +15353,7 @@ SWIGEXPORT(void) SWIG_init(void) {
SWIG_InstallConstants(d,swig_const_table);
PyDict_SetItemString(d,(char*)"cvar", SWIG_globals);
SWIG_addvarlink(SWIG_globals,(char*)"DateTimeFormatStr",_wrap_DateTimeFormatStr_get, _wrap_DateTimeFormatStr_set);
SWIG_addvarlink(SWIG_globals,(char*)"GridNoCellCoords",_wrap_GridNoCellCoords_get, _wrap_GridNoCellCoords_set);
SWIG_addvarlink(SWIG_globals,(char*)"GridNoCellRect",_wrap_GridNoCellRect_get, _wrap_GridNoCellRect_set);
PyDict_SetItemString(d, "wxEVT_GRID_CELL_LEFT_CLICK", PyInt_FromLong(wxEVT_GRID_CELL_LEFT_CLICK));
wxPython/src/msw/html.py
+111 -110
View File
File diff suppressed because it is too large Load Diff
wxPython/src/msw/html_wrap.cpp
+68 -9
View File
@@ -282,15 +282,10 @@ static swig_type_info *swig_types[52];
#include <wx/html/helpctrl.h>
DECLARE_DEF_STRING(EmptyString);
static const wxChar* wxHtmlWindowNameStr = wxT("htmlWindow");
DECLARE_DEF_STRING(HtmlWindowNameStr);
static const wxChar* wxHtmlPrintoutTitleStr = wxT("Printout");
DECLARE_DEF_STRING(HtmlPrintoutTitleStr);
static const wxChar* wxHtmlPrintingTitleStr = wxT("Printing");
DECLARE_DEF_STRING(HtmlPrintingTitleStr);
static const wxString wxPyEmptyString(wxEmptyString);
static const wxString wxPyHtmlWindowNameStr(wxT("htmlWindow"));
static const wxString wxPyHtmlPrintoutTitleStr(wxT("Printout"));
static const wxString wxPyHtmlPrintingTitleStr(wxT("Printing"));
void wxHtmlWinParser_SetFonts(wxHtmlWinParser *self,wxString normal_face,wxString fixed_face,PyObject *sizes){
int* temp = NULL;
if (sizes) temp = int_LIST_helper(sizes);
@@ -598,6 +593,66 @@ wxHtmlBookRecord *wxHtmlContentsItem_GetBook(wxHtmlContentsItem *self){ return s
#ifdef __cplusplus
extern "C" {
#endif
static int _wrap_HtmlWindowNameStr_set(PyObject *_val) {
PyErr_SetString(PyExc_TypeError,"Variable HtmlWindowNameStr is read-only.");
return 1;
}
static PyObject *_wrap_HtmlWindowNameStr_get() {
PyObject *pyobj;
{
#if wxUSE_UNICODE
pyobj = PyUnicode_FromWideChar((&wxPyHtmlWindowNameStr)->c_str(), (&wxPyHtmlWindowNameStr)->Len());
#else
pyobj = PyString_FromStringAndSize((&wxPyHtmlWindowNameStr)->c_str(), (&wxPyHtmlWindowNameStr)->Len());
#endif
}
return pyobj;
}
static int _wrap_HtmlPrintoutTitleStr_set(PyObject *_val) {
PyErr_SetString(PyExc_TypeError,"Variable HtmlPrintoutTitleStr is read-only.");
return 1;
}
static PyObject *_wrap_HtmlPrintoutTitleStr_get() {
PyObject *pyobj;
{
#if wxUSE_UNICODE
pyobj = PyUnicode_FromWideChar((&wxPyHtmlPrintoutTitleStr)->c_str(), (&wxPyHtmlPrintoutTitleStr)->Len());
#else
pyobj = PyString_FromStringAndSize((&wxPyHtmlPrintoutTitleStr)->c_str(), (&wxPyHtmlPrintoutTitleStr)->Len());
#endif
}
return pyobj;
}
static int _wrap_HtmlPrintingTitleStr_set(PyObject *_val) {
PyErr_SetString(PyExc_TypeError,"Variable HtmlPrintingTitleStr is read-only.");
return 1;
}
static PyObject *_wrap_HtmlPrintingTitleStr_get() {
PyObject *pyobj;
{
#if wxUSE_UNICODE
pyobj = PyUnicode_FromWideChar((&wxPyHtmlPrintingTitleStr)->c_str(), (&wxPyHtmlPrintingTitleStr)->Len());
#else
pyobj = PyString_FromStringAndSize((&wxPyHtmlPrintingTitleStr)->c_str(), (&wxPyHtmlPrintingTitleStr)->Len());
#endif
}
return pyobj;
}
static PyObject *_wrap_new_HtmlLinkInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxString *arg1 = 0 ;
@@ -10725,6 +10780,10 @@ SWIGEXPORT(void) SWIG_init(void) {
}
SWIG_InstallConstants(d,swig_const_table);
PyDict_SetItemString(d,(char*)"cvar", SWIG_globals);
SWIG_addvarlink(SWIG_globals,(char*)"HtmlWindowNameStr",_wrap_HtmlWindowNameStr_get, _wrap_HtmlWindowNameStr_set);
SWIG_addvarlink(SWIG_globals,(char*)"HtmlPrintoutTitleStr",_wrap_HtmlPrintoutTitleStr_get, _wrap_HtmlPrintoutTitleStr_set);
SWIG_addvarlink(SWIG_globals,(char*)"HtmlPrintingTitleStr",_wrap_HtmlPrintingTitleStr_get, _wrap_HtmlPrintingTitleStr_set);
wxPyPtrTypeMap_Add("wxHtmlTagHandler", "wxPyHtmlTagHandler");
wxPyPtrTypeMap_Add("wxHtmlWinTagHandler", "wxPyHtmlWinTagHandler");
wxPython/src/msw/misc.py
+275 -287
View File
File diff suppressed because it is too large Load Diff
wxPython/src/msw/misc_wrap.cpp
+140 -15
View File
@@ -308,16 +308,13 @@ static swig_type_info *swig_types[84];
#include "wx/wxPython/pyclasses.h"
#include "wx/wxPython/pyistream.h"
DECLARE_DEF_STRING(EmptyString);
static const wxString wxPyEmptyString(wxEmptyString);
DECLARE_DEF_STRING(FileSelectorPromptStr);
DECLARE_DEF_STRING(FileSelectorDefaultWildcardStr);
DECLARE_DEF_STRING(DirSelectorPromptStr);
static const wxString wxPyFileSelectorPromptStr(wxFileSelectorPromptStr);
static const wxString wxPyFileSelectorDefaultWildcardStr(wxFileSelectorDefaultWildcardStr);
static const wxString wxPyDirSelectorPromptStr(wxDirSelectorPromptStr);
static PyObject* t_output_helper(PyObject* target, PyObject* o) {
PyObject* o2;
@@ -839,10 +836,9 @@ bool wxConfigBase_ReadBool(wxConfigBase *self,wxString const &key,bool defaultVa
#include <wx/datetime.h>
DECLARE_DEF_STRING2(DateFormatStr, wxT("%c"));
DECLARE_DEF_STRING2(TimeSpanFormatStr, wxT("%H:%M:%S"));
static const wxString wxPyDateFormatStr(wxT(wxT("%c")));
static const wxString wxPyTimeSpanFormatStr(wxT(wxT("%H:%M:%S")));
#define LOCAL_TZ wxDateTime::Local
@@ -1513,6 +1509,66 @@ static PyObject * SystemOptions_swigregister(PyObject *self, PyObject *args) {
Py_INCREF(obj);
return Py_BuildValue((char *)"");
}
static int _wrap_FileSelectorPromptStr_set(PyObject *_val) {
PyErr_SetString(PyExc_TypeError,"Variable FileSelectorPromptStr is read-only.");
return 1;
}
static PyObject *_wrap_FileSelectorPromptStr_get() {
PyObject *pyobj;
{
#if wxUSE_UNICODE
pyobj = PyUnicode_FromWideChar((&wxPyFileSelectorPromptStr)->c_str(), (&wxPyFileSelectorPromptStr)->Len());
#else
pyobj = PyString_FromStringAndSize((&wxPyFileSelectorPromptStr)->c_str(), (&wxPyFileSelectorPromptStr)->Len());
#endif
}
return pyobj;
}
static int _wrap_FileSelectorDefaultWildcardStr_set(PyObject *_val) {
PyErr_SetString(PyExc_TypeError,"Variable FileSelectorDefaultWildcardStr is read-only.");
return 1;
}
static PyObject *_wrap_FileSelectorDefaultWildcardStr_get() {
PyObject *pyobj;
{
#if wxUSE_UNICODE
pyobj = PyUnicode_FromWideChar((&wxPyFileSelectorDefaultWildcardStr)->c_str(), (&wxPyFileSelectorDefaultWildcardStr)->Len());
#else
pyobj = PyString_FromStringAndSize((&wxPyFileSelectorDefaultWildcardStr)->c_str(), (&wxPyFileSelectorDefaultWildcardStr)->Len());
#endif
}
return pyobj;
}
static int _wrap_DirSelectorPromptStr_set(PyObject *_val) {
PyErr_SetString(PyExc_TypeError,"Variable DirSelectorPromptStr is read-only.");
return 1;
}
static PyObject *_wrap_DirSelectorPromptStr_get() {
PyObject *pyobj;
{
#if wxUSE_UNICODE
pyobj = PyUnicode_FromWideChar((&wxPyDirSelectorPromptStr)->c_str(), (&wxPyDirSelectorPromptStr)->Len());
#else
pyobj = PyString_FromStringAndSize((&wxPyDirSelectorPromptStr)->c_str(), (&wxPyDirSelectorPromptStr)->Len());
#endif
}
return pyobj;
}
static PyObject *_wrap_NewId(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
long result;
@@ -3596,6 +3652,29 @@ static PyObject *_wrap_GetTopLevelParent(PyObject *self, PyObject *args, PyObjec
}
static PyObject *_wrap_GetKeyState(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
int arg1 ;
bool result;
char *kwnames[] = {
(char *) "key", NULL
};
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"i:GetKeyState",kwnames,&arg1)) goto fail;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (bool)wxGetKeyState((wxKeyCode )arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = PyInt_FromLong((long)result);
return resultobj;
fail:
return NULL;
}
static PyObject *_wrap_WakeUpMainThread(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
char *kwnames[] = {
@@ -15148,6 +15227,46 @@ static PyObject *_wrap_ExpandEnvVars(PyObject *self, PyObject *args, PyObject *k
}
static int _wrap_DateFormatStr_set(PyObject *_val) {
PyErr_SetString(PyExc_TypeError,"Variable DateFormatStr is read-only.");
return 1;
}
static PyObject *_wrap_DateFormatStr_get() {
PyObject *pyobj;
{
#if wxUSE_UNICODE
pyobj = PyUnicode_FromWideChar((&wxPyDateFormatStr)->c_str(), (&wxPyDateFormatStr)->Len());
#else
pyobj = PyString_FromStringAndSize((&wxPyDateFormatStr)->c_str(), (&wxPyDateFormatStr)->Len());
#endif
}
return pyobj;
}
static int _wrap_TimeSpanFormatStr_set(PyObject *_val) {
PyErr_SetString(PyExc_TypeError,"Variable TimeSpanFormatStr is read-only.");
return 1;
}
static PyObject *_wrap_TimeSpanFormatStr_get() {
PyObject *pyobj;
{
#if wxUSE_UNICODE
pyobj = PyUnicode_FromWideChar((&wxPyTimeSpanFormatStr)->c_str(), (&wxPyTimeSpanFormatStr)->Len());
#else
pyobj = PyString_FromStringAndSize((&wxPyTimeSpanFormatStr)->c_str(), (&wxPyTimeSpanFormatStr)->Len());
#endif
}
return pyobj;
}
static PyObject *_wrap_DateTime_SetCountry(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
int arg1 ;
@@ -23441,7 +23560,7 @@ static PyObject * DropSource_swigregister(PyObject *self, PyObject *args) {
Py_INCREF(obj);
return Py_BuildValue((char *)"");
}
static PyObject *_wrap_new_DropTarget(PyObject *self, PyObject *args, PyObject *kwargs) {
static PyObject *_wrap_new_PyDropTarget(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxDataObject *arg1 = (wxDataObject *) NULL ;
wxPyDropTarget *result;
@@ -23450,7 +23569,7 @@ static PyObject *_wrap_new_DropTarget(PyObject *self, PyObject *args, PyObject *
(char *) "dataObject", NULL
};
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_DropTarget",kwnames,&obj0)) goto fail;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_PyDropTarget",kwnames,&obj0)) goto fail;
if (obj0) {
if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDataObject,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
}
@@ -24590,6 +24709,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"GenericFindWindowAtPoint", (PyCFunction) _wrap_GenericFindWindowAtPoint, METH_VARARGS | METH_KEYWORDS },
{ (char *)"FindWindowAtPoint", (PyCFunction) _wrap_FindWindowAtPoint, METH_VARARGS | METH_KEYWORDS },
{ (char *)"GetTopLevelParent", (PyCFunction) _wrap_GetTopLevelParent, METH_VARARGS | METH_KEYWORDS },
{ (char *)"GetKeyState", (PyCFunction) _wrap_GetKeyState, METH_VARARGS | METH_KEYWORDS },
{ (char *)"WakeUpMainThread", (PyCFunction) _wrap_WakeUpMainThread, METH_VARARGS | METH_KEYWORDS },
{ (char *)"MutexGuiEnter", (PyCFunction) _wrap_MutexGuiEnter, METH_VARARGS | METH_KEYWORDS },
{ (char *)"MutexGuiLeave", (PyCFunction) _wrap_MutexGuiLeave, METH_VARARGS | METH_KEYWORDS },
@@ -25233,7 +25353,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"DropSource_DoDragDrop", (PyCFunction) _wrap_DropSource_DoDragDrop, METH_VARARGS | METH_KEYWORDS },
{ (char *)"DropSource_base_GiveFeedback", (PyCFunction) _wrap_DropSource_base_GiveFeedback, METH_VARARGS | METH_KEYWORDS },
{ (char *)"DropSource_swigregister", DropSource_swigregister, METH_VARARGS },
{ (char *)"new_DropTarget", (PyCFunction) _wrap_new_DropTarget, METH_VARARGS | METH_KEYWORDS },
{ (char *)"new_PyDropTarget", (PyCFunction) _wrap_new_PyDropTarget, METH_VARARGS | METH_KEYWORDS },
{ (char *)"DropTarget__setCallbackInfo", (PyCFunction) _wrap_DropTarget__setCallbackInfo, METH_VARARGS | METH_KEYWORDS },
{ (char *)"delete_DropTarget", (PyCFunction) _wrap_delete_DropTarget, METH_VARARGS | METH_KEYWORDS },
{ (char *)"DropTarget_GetDataObject", (PyCFunction) _wrap_DropTarget_GetDataObject, METH_VARARGS | METH_KEYWORDS },
@@ -26343,6 +26463,10 @@ SWIGEXPORT(void) SWIG_init(void) {
}
SWIG_InstallConstants(d,swig_const_table);
PyDict_SetItemString(d,(char*)"cvar", SWIG_globals);
SWIG_addvarlink(SWIG_globals,(char*)"FileSelectorPromptStr",_wrap_FileSelectorPromptStr_get, _wrap_FileSelectorPromptStr_set);
SWIG_addvarlink(SWIG_globals,(char*)"FileSelectorDefaultWildcardStr",_wrap_FileSelectorDefaultWildcardStr_get, _wrap_FileSelectorDefaultWildcardStr_set);
SWIG_addvarlink(SWIG_globals,(char*)"DirSelectorPromptStr",_wrap_DirSelectorPromptStr_get, _wrap_DirSelectorPromptStr_set);
PyDict_SetItemString(d, "wxEVT_TIMER", PyInt_FromLong(wxEVT_TIMER));
PyDict_SetItemString(d, "wxEVT_END_PROCESS", PyInt_FromLong(wxEVT_END_PROCESS));
@@ -26352,7 +26476,6 @@ SWIGEXPORT(void) SWIG_init(void) {
PyDict_SetItemString(d, "wxEVT_JOY_BUTTON_UP", PyInt_FromLong(wxEVT_JOY_BUTTON_UP));
PyDict_SetItemString(d, "wxEVT_JOY_MOVE", PyInt_FromLong(wxEVT_JOY_MOVE));
PyDict_SetItemString(d, "wxEVT_JOY_ZMOVE", PyInt_FromLong(wxEVT_JOY_ZMOVE));
PyDict_SetItemString(d,(char*)"cvar", SWIG_globals);
SWIG_addvarlink(SWIG_globals,(char*)"TheMimeTypesManager",_wrap_TheMimeTypesManager_get, _wrap_TheMimeTypesManager_set);
SWIG_addvarlink(SWIG_globals,(char*)"ART_TOOLBAR",_wrap_ART_TOOLBAR_get, _wrap_ART_TOOLBAR_set);
SWIG_addvarlink(SWIG_globals,(char*)"ART_MENU",_wrap_ART_MENU_get, _wrap_ART_MENU_set);
@@ -26395,6 +26518,8 @@ SWIGEXPORT(void) SWIG_init(void) {
wxPyPtrTypeMap_Add("wxArtProvider", "wxPyArtProvider");
SWIG_addvarlink(SWIG_globals,(char*)"DateFormatStr",_wrap_DateFormatStr_get, _wrap_DateFormatStr_set);
SWIG_addvarlink(SWIG_globals,(char*)"TimeSpanFormatStr",_wrap_TimeSpanFormatStr_get, _wrap_TimeSpanFormatStr_set);
SWIG_addvarlink(SWIG_globals,(char*)"FormatInvalid",_wrap_FormatInvalid_get, _wrap_FormatInvalid_set);
wxPyPtrTypeMap_Add("wxDropSource", "wxPyDropSource");
wxPython/src/msw/windows.py
+201 -186
View File
File diff suppressed because it is too large Load Diff
wxPython/src/msw/windows_wrap.cpp
+368 -60
View File
File diff suppressed because it is too large Load Diff
wxPython/src/msw/wizard.py
+10 -10
View File
@@ -51,7 +51,7 @@ class WizardPage(windows.Panel):
def __repr__(self):
return "<%s.%s; proxy of C++ wxWizardPage instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
def Create(*args, **kwargs):
"""Create(Wizard parent, wxBitmap bitmap=wxNullBitmap, wxString resource=wxPyEmptyString) -> bool"""
"""Create(Wizard parent, Bitmap bitmap=wxNullBitmap, String resource=EmptyString) -> bool"""
return _wizard.WizardPage_Create(*args, **kwargs)
def GetPrev(*args, **kwargs):
@@ -63,7 +63,7 @@ class WizardPage(windows.Panel):
return _wizard.WizardPage_GetNext(*args, **kwargs)
def GetBitmap(*args, **kwargs):
"""GetBitmap() -> wxBitmap"""
"""GetBitmap() -> Bitmap"""
return _wizard.WizardPage_GetBitmap(*args, **kwargs)
@@ -78,7 +78,7 @@ class PyWizardPage(WizardPage):
def __repr__(self):
return "<%s.%s; proxy of C++ wxPyWizardPage instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
def __init__(self, *args, **kwargs):
"""__init__(Wizard parent, wxBitmap bitmap=&wxNullBitmap, wxString resource=&wxPyEmptyString) -> PyWizardPage"""
"""__init__(Wizard parent, Bitmap bitmap=&wxNullBitmap, String resource=&wxPyEmptyString) -> PyWizardPage"""
newobj = _wizard.new_PyWizardPage(*args, **kwargs)
self.this = newobj.this
self.thisown = 1
@@ -86,7 +86,7 @@ class PyWizardPage(WizardPage):
self._setCallbackInfo(self, PyWizardPage);self._setOORInfo(self)
def Create(*args, **kwargs):
"""Create(Wizard parent, wxBitmap bitmap=wxNullBitmap, wxString resource=wxPyEmptyString) -> bool"""
"""Create(Wizard parent, Bitmap bitmap=wxNullBitmap, String resource=EmptyString) -> bool"""
return _wizard.PyWizardPage_Create(*args, **kwargs)
def _setCallbackInfo(*args, **kwargs):
@@ -185,7 +185,7 @@ class WizardPageSimple(WizardPage):
def __init__(self, *args, **kwargs):
"""
__init__(Wizard parent, WizardPage prev=None, WizardPage next=None,
wxBitmap bitmap=wxNullBitmap, wxChar resource=None) -> WizardPageSimple
Bitmap bitmap=wxNullBitmap, wxChar resource=None) -> WizardPageSimple
"""
newobj = _wizard.new_WizardPageSimple(*args, **kwargs)
self.this = newobj.this
@@ -196,7 +196,7 @@ class WizardPageSimple(WizardPage):
def Create(*args, **kwargs):
"""
Create(Wizard parent=None, WizardPage prev=None, WizardPage next=None,
wxBitmap bitmap=wxNullBitmap, wxChar resource=None) -> bool
Bitmap bitmap=wxNullBitmap, wxChar resource=None) -> bool
"""
return _wizard.WizardPageSimple_Create(*args, **kwargs)
@@ -236,8 +236,8 @@ class Wizard(windows.Dialog):
return "<%s.%s; proxy of C++ wxWizard instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
def __init__(self, *args, **kwargs):
"""
__init__(Window parent, int id=-1, wxString title=wxEmptyString,
wxBitmap bitmap=wxNullBitmap, Point pos=DefaultPosition,
__init__(Window parent, int id=-1, String title=EmptyString,
Bitmap bitmap=wxNullBitmap, Point pos=DefaultPosition,
long style=DEFAULT_DIALOG_STYLE) -> Wizard
"""
newobj = _wizard.new_Wizard(*args, **kwargs)
@@ -248,8 +248,8 @@ class Wizard(windows.Dialog):
def Create(*args, **kwargs):
"""
Create(Window parent, int id=-1, wxString title=wxEmptyString,
wxBitmap bitmap=wxNullBitmap, Point pos=DefaultPosition) -> bool
Create(Window parent, int id=-1, String title=EmptyString,
Bitmap bitmap=wxNullBitmap, Point pos=DefaultPosition) -> bool
"""
return _wizard.Wizard_Create(*args, **kwargs)
wxPython/src/msw/wizard_wrap.cpp
+3 -3
View File
@@ -246,8 +246,8 @@ static swig_type_info *swig_types[20];
#include <wx/wizard.h>
static const wxString wxPyEmptyString(wxT(""));
static const wxString wxPyEmptyString(wxEmptyString);
bool wxWizardPage_Create(wxWizardPage *self,wxWizard *parent,wxBitmap const &bitmap,wxString const &resource){
wxChar* res = NULL;
if (resource.Length())
@@ -1489,7 +1489,7 @@ static PyObject *_wrap_new_Wizard(PyObject *self, PyObject *args, PyObject *kwar
PyObject *resultobj;
wxWindow *arg1 = (wxWindow *) 0 ;
int arg2 = (int) -1 ;
wxString const &arg3_defvalue = wxEmptyString ;
wxString const &arg3_defvalue = wxPyEmptyString ;
wxString *arg3 = (wxString *) &arg3_defvalue ;
wxBitmap const &arg4_defvalue = wxNullBitmap ;
wxBitmap *arg4 = (wxBitmap *) &arg4_defvalue ;
@@ -1577,7 +1577,7 @@ static PyObject *_wrap_Wizard_Create(PyObject *self, PyObject *args, PyObject *k
wxWizard *arg1 = (wxWizard *) 0 ;
wxWindow *arg2 = (wxWindow *) 0 ;
int arg3 = (int) -1 ;
wxString const &arg4_defvalue = wxEmptyString ;
wxString const &arg4_defvalue = wxPyEmptyString ;
wxString *arg4 = (wxString *) &arg4_defvalue ;
wxBitmap const &arg5_defvalue = wxNullBitmap ;
wxBitmap *arg5 = (wxBitmap *) &arg5_defvalue ;