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

reSWIGged

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25514 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2004-02-05 01:12:26 +00:00
parent e8e4a2a4d4
commit 02a34c4c56
15 changed files with 1877 additions and 1486 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wxPython/src/mac/calendar_wrap.cpp
+19 -31
View File
@@ -238,14 +238,13 @@ SWIGIMPORT(float) SWIG_PyObj_AsFloatConv(PyObject *obj, py_objasdbl_co
#define SWIGTYPE_p_wxWindow swig_types[5]
#define SWIGTYPE_p_wxCommandEvent swig_types[6]
#define SWIGTYPE_p_char swig_types[7]
#define SWIGTYPE_p_wxString swig_types[8]
#define SWIGTYPE_p_wxEvtHandler swig_types[9]
#define SWIGTYPE_p_wxFont swig_types[10]
#define SWIGTYPE_p_wxDateTime swig_types[11]
#define SWIGTYPE_p_wxControl swig_types[12]
#define SWIGTYPE_p_wxCalendarCtrl swig_types[13]
#define SWIGTYPE_p_wxEvent swig_types[14]
static swig_type_info *swig_types[16];
#define SWIGTYPE_p_wxEvtHandler swig_types[8]
#define SWIGTYPE_p_wxFont swig_types[9]
#define SWIGTYPE_p_wxDateTime swig_types[10]
#define SWIGTYPE_p_wxControl swig_types[11]
#define SWIGTYPE_p_wxCalendarCtrl swig_types[12]
#define SWIGTYPE_p_wxEvent swig_types[13]
static swig_type_info *swig_types[15];
/* -------- TYPES TABLE (END) -------- */
@@ -315,15 +314,6 @@ SWIG_PyObj_AsBool(PyObject *obj)
return PyObject_IsTrue(obj) ? true : false;
}
SWIGSTATIC(PyObject*)
SWIG_PyObj_FromBool(bool value)
{
PyObject *obj = value ? Py_True : Py_False;
Py_INCREF(obj);
return obj;
}
static const wxString wxPyCalendarNameStr(wxCalendarNameStr);
SWIGSTATIC(long)
@@ -640,7 +630,7 @@ static PyObject *_wrap_CalendarDateAttr_HasTextColour(PyObject *self, PyObject *
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_PyObj_FromBool((bool)result);
resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
return resultobj;
fail:
return NULL;
@@ -665,7 +655,7 @@ static PyObject *_wrap_CalendarDateAttr_HasBackgroundColour(PyObject *self, PyOb
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_PyObj_FromBool((bool)result);
resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
return resultobj;
fail:
return NULL;
@@ -690,7 +680,7 @@ static PyObject *_wrap_CalendarDateAttr_HasBorderColour(PyObject *self, PyObject
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_PyObj_FromBool((bool)result);
resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
return resultobj;
fail:
return NULL;
@@ -715,7 +705,7 @@ static PyObject *_wrap_CalendarDateAttr_HasFont(PyObject *self, PyObject *args,
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_PyObj_FromBool((bool)result);
resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
return resultobj;
fail:
return NULL;
@@ -740,7 +730,7 @@ static PyObject *_wrap_CalendarDateAttr_HasBorder(PyObject *self, PyObject *args
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_PyObj_FromBool((bool)result);
resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
return resultobj;
fail:
return NULL;
@@ -765,7 +755,7 @@ static PyObject *_wrap_CalendarDateAttr_IsHoliday(PyObject *self, PyObject *args
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_PyObj_FromBool((bool)result);
resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
return resultobj;
fail:
return NULL;
@@ -1276,7 +1266,7 @@ static PyObject *_wrap_CalendarCtrl_Create(PyObject *self, PyObject *args, PyObj
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_PyObj_FromBool((bool)result);
resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
{
if (temp8)
delete arg8;
@@ -1376,7 +1366,7 @@ static PyObject *_wrap_CalendarCtrl_SetLowerDateLimit(PyObject *self, PyObject *
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_PyObj_FromBool((bool)result);
resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
return resultobj;
fail:
return NULL;
@@ -1438,7 +1428,7 @@ static PyObject *_wrap_CalendarCtrl_SetUpperDateLimit(PyObject *self, PyObject *
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_PyObj_FromBool((bool)result);
resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
return resultobj;
fail:
return NULL;
@@ -1509,7 +1499,7 @@ static PyObject *_wrap_CalendarCtrl_SetDateRange(PyObject *self, PyObject *args,
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_PyObj_FromBool((bool)result);
resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
return resultobj;
fail:
return NULL;
@@ -2092,7 +2082,7 @@ static PyObject *_wrap_CalendarCtrl_Enable(PyObject *self, PyObject *args, PyObj
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_PyObj_FromBool((bool)result);
resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
return resultobj;
fail:
return NULL;
@@ -2125,7 +2115,7 @@ static PyObject *_wrap_CalendarCtrl_Show(PyObject *self, PyObject *args, PyObjec
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_PyObj_FromBool((bool)result);
resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
return resultobj;
fail:
return NULL;
@@ -2716,7 +2706,6 @@ static swig_type_info _swigt__p_wxCalendarDateAttr[] = {{"_p_wxCalendarDateAttr"
static swig_type_info _swigt__p_wxWindow[] = {{"_p_wxWindow", 0, "wxWindow *", 0},{"_p_wxControl", _p_wxControlTo_p_wxWindow},{"_p_wxWindow"},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxWindow},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxWindow},{"_p_wxCalendarCtrl", _p_wxCalendarCtrlTo_p_wxWindow},{0}};
static swig_type_info _swigt__p_wxCommandEvent[] = {{"_p_wxCommandEvent", 0, "wxCommandEvent *", 0},{"_p_wxChildFocusEvent", _p_wxChildFocusEventTo_p_wxCommandEvent},{"_p_wxScrollEvent", _p_wxScrollEventTo_p_wxCommandEvent},{"_p_wxWindowCreateEvent", _p_wxWindowCreateEventTo_p_wxCommandEvent},{"_p_wxUpdateUIEvent", _p_wxUpdateUIEventTo_p_wxCommandEvent},{"_p_wxWindowDestroyEvent", _p_wxWindowDestroyEventTo_p_wxCommandEvent},{"_p_wxContextMenuEvent", _p_wxContextMenuEventTo_p_wxCommandEvent},{"_p_wxCalendarEvent", _p_wxCalendarEventTo_p_wxCommandEvent},{"_p_wxCommandEvent"},{"_p_wxNotifyEvent", _p_wxNotifyEventTo_p_wxCommandEvent},{"_p_wxPyCommandEvent", _p_wxPyCommandEventTo_p_wxCommandEvent},{0}};
static swig_type_info _swigt__p_char[] = {{"_p_char", 0, "char *", 0},{"_p_char"},{0}};
static swig_type_info _swigt__p_wxString[] = {{"_p_wxString", 0, "wxString *", 0},{"_p_wxString"},{0}};
static swig_type_info _swigt__p_wxEvtHandler[] = {{"_p_wxEvtHandler", 0, "wxEvtHandler *", 0},{"_p_wxControl", _p_wxControlTo_p_wxEvtHandler},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxEvtHandler},{"_p_wxWindow", _p_wxWindowTo_p_wxEvtHandler},{"_p_wxEvtHandler"},{"_p_wxPyApp", _p_wxPyAppTo_p_wxEvtHandler},{"_p_wxPyTimer", _p_wxPyTimerTo_p_wxEvtHandler},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxEvtHandler},{"_p_wxValidator", _p_wxValidatorTo_p_wxEvtHandler},{"_p_wxPyValidator", _p_wxPyValidatorTo_p_wxEvtHandler},{"_p_wxMenu", _p_wxMenuTo_p_wxEvtHandler},{"_p_wxCalendarCtrl", _p_wxCalendarCtrlTo_p_wxEvtHandler},{"_p_wxPyProcess", _p_wxPyProcessTo_p_wxEvtHandler},{0}};
static swig_type_info _swigt__p_wxFont[] = {{"_p_wxFont", 0, "wxFont *", 0},{"_p_wxFont"},{0}};
static swig_type_info _swigt__p_wxDateTime[] = {{"_p_wxDateTime", 0, "wxDateTime *", 0},{"_p_wxDateTime"},{0}};
@@ -2733,7 +2722,6 @@ _swigt__p_wxCalendarDateAttr,
_swigt__p_wxWindow,
_swigt__p_wxCommandEvent,
_swigt__p_char,
_swigt__p_wxString,
_swigt__p_wxEvtHandler,
_swigt__p_wxFont,
_swigt__p_wxDateTime,
wxPython/src/mac/controls.py
+27 -12
View File
@@ -289,7 +289,7 @@ class Choice(core.ControlWithItems):
def __init__(self, *args, **kwargs):
"""
__init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize,
int choices=0, String choices_array=None,
wxArrayString choices=wxPyEmptyStringArray,
long style=0, Validator validator=DefaultValidator,
String name=ChoiceNameStr) -> Choice
"""
@@ -302,7 +302,7 @@ class Choice(core.ControlWithItems):
def Create(*args, **kwargs):
"""
Create(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize,
int choices=0, String choices_array=None,
wxArrayString choices=wxPyEmptyStringArray,
long style=0, Validator validator=DefaultValidator,
String name=ChoiceNameStr) -> bool
"""
@@ -352,7 +352,7 @@ class ComboBox(core.Control,core.ItemContainer):
"""
__init__(Window parent, int id, String value=EmptyString, Point pos=DefaultPosition,
Size size=DefaultSize,
int choices=0, String choices_array=None,
wxArrayString choices=wxPyEmptyStringArray,
long style=0, Validator validator=DefaultValidator,
String name=ComboBoxNameStr) -> ComboBox
"""
@@ -366,7 +366,7 @@ class ComboBox(core.Control,core.ItemContainer):
"""
Create(Window parent, int id, String value=EmptyString, Point pos=DefaultPosition,
Size size=DefaultSize,
int choices=0, String choices_array=None,
wxArrayString choices=wxPyEmptyStringArray,
long style=0, Validator validator=DefaultValidator,
String name=ComboBoxNameStr) -> bool
"""
@@ -715,7 +715,7 @@ class ListBox(core.ControlWithItems):
def __init__(self, *args, **kwargs):
"""
__init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize,
int choices=0, String choices_array=None,
wxArrayString choices=wxPyEmptyStringArray,
long style=0, Validator validator=DefaultValidator,
String name=ListBoxNameStr) -> ListBox
"""
@@ -728,7 +728,7 @@ class ListBox(core.ControlWithItems):
def Create(*args, **kwargs):
"""
Create(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize,
int choices=0, String choices_array=None,
wxArrayString choices=wxPyEmptyStringArray,
long style=0, Validator validator=DefaultValidator,
String name=ListBoxNameStr) -> bool
"""
@@ -817,7 +817,7 @@ class CheckListBox(ListBox):
def __init__(self, *args, **kwargs):
"""
__init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize,
int choices=0, String choices_array=None,
wxArrayString choices=wxPyEmptyStringArray,
long style=0, Validator validator=DefaultValidator,
String name=ListBoxNameStr) -> CheckListBox
"""
@@ -830,7 +830,7 @@ class CheckListBox(ListBox):
def Create(*args, **kwargs):
"""
Create(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize,
int choices=0, String choices_array=None,
wxArrayString choices=wxPyEmptyStringArray,
long style=0, Validator validator=DefaultValidator,
String name=ListBoxNameStr) -> bool
"""
@@ -904,6 +904,11 @@ TEXT_ATTR_ALIGNMENT = _controls.TEXT_ATTR_ALIGNMENT
TEXT_ATTR_LEFT_INDENT = _controls.TEXT_ATTR_LEFT_INDENT
TEXT_ATTR_RIGHT_INDENT = _controls.TEXT_ATTR_RIGHT_INDENT
TEXT_ATTR_TABS = _controls.TEXT_ATTR_TABS
TE_HT_UNKNOWN = _controls.TE_HT_UNKNOWN
TE_HT_BEFORE = _controls.TE_HT_BEFORE
TE_HT_ON_TEXT = _controls.TE_HT_ON_TEXT
TE_HT_BELOW = _controls.TE_HT_BELOW
TE_HT_BEYOND = _controls.TE_HT_BEYOND
class TextAttr(object):
def __repr__(self):
return "<%s.%s; proxy of C++ wxTextAttr instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
@@ -1194,6 +1199,16 @@ class TextCtrl(core.Control):
"""ShowPosition(long pos)"""
return _controls.TextCtrl_ShowPosition(*args, **kwargs)
def HitTest(*args, **kwargs):
"""
HitTest(Point pt) -> (result, row, col)
Find the character at position given in pixels.
NB: pt is in device coords (not adjusted for the client area
origin nor scrolling)
"""
return _controls.TextCtrl_HitTest(*args, **kwargs)
def Copy(*args, **kwargs):
"""Copy()"""
return _controls.TextCtrl_Copy(*args, **kwargs)
@@ -1577,8 +1592,8 @@ class RadioBox(core.Control):
def __init__(self, *args, **kwargs):
"""
__init__(Window parent, int id, String label, Point pos=DefaultPosition,
Size size=DefaultSize, int choices=0,
String choices_array=None, int majorDimension=0,
Size size=DefaultSize, wxArrayString choices=wxPyEmptyStringArray,
int majorDimension=0,
long style=RA_HORIZONTAL, Validator validator=DefaultValidator,
String name=RadioBoxNameStr) -> RadioBox
"""
@@ -1592,8 +1607,8 @@ class RadioBox(core.Control):
def Create(*args, **kwargs):
"""
Create(Window parent, int id, String label, Point pos=DefaultPosition,
Size size=DefaultSize, int choices=0,
String choices_array=None, int majorDimension=0,
Size size=DefaultSize, wxArrayString choices=wxPyEmptyStringArray,
int majorDimension=0,
long style=RA_HORIZONTAL, Validator validator=DefaultValidator,
String name=RadioBoxNameStr) -> bool
"""
wxPython/src/mac/controls_wrap.cpp
+537 -351
View File
File diff suppressed because it is too large Load Diff
wxPython/src/mac/core_wrap.cpp
+255 -267
View File
File diff suppressed because it is too large Load Diff
wxPython/src/mac/gdi_wrap.cpp
+73 -100
View File
File diff suppressed because it is too large Load Diff
wxPython/src/mac/grid_wrap.cpp
+84 -93
View File
File diff suppressed because it is too large Load Diff
wxPython/src/mac/html_wrap.cpp
+25 -34
View File
@@ -347,15 +347,6 @@ static swig_type_info *swig_types[53];
static const wxString wxPyHtmlPrintoutTitleStr(wxT("Printout"));
static const wxString wxPyHtmlPrintingTitleStr(wxT("Printing"));
SWIGSTATIC(PyObject*)
SWIG_PyObj_FromBool(bool value)
{
PyObject *obj = value ? Py_True : Py_False;
Py_INCREF(obj);
return obj;
}
SWIGSTATIC(int)
SWIG_PyObj_AsInt(PyObject *obj)
{
@@ -1068,7 +1059,7 @@ static PyObject *_wrap_HtmlTag_HasParam(PyObject *self, PyObject *args, PyObject
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_PyObj_FromBool((bool)result);
resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
{
if (temp2)
delete arg2;
@@ -1187,7 +1178,7 @@ static PyObject *_wrap_HtmlTag_HasEnding(PyObject *self, PyObject *args, PyObjec
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_PyObj_FromBool((bool)result);
resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
return resultobj;
fail:
return NULL;
@@ -3170,7 +3161,7 @@ static PyObject *_wrap_HtmlSelection_IsEmpty(PyObject *self, PyObject *args, PyO
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_PyObj_FromBool((bool)result);
resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
return resultobj;
fail:
return NULL;
@@ -4140,7 +4131,7 @@ static PyObject *_wrap_HtmlCell_IsFormattingCell(PyObject *self, PyObject *args,
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_PyObj_FromBool((bool)result);
resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
return resultobj;
fail:
return NULL;
@@ -4465,7 +4456,7 @@ static PyObject *_wrap_HtmlCell_AdjustPagebreak(PyObject *self, PyObject *args,
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_PyObj_FromBool((bool)result);
resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
{
PyObject *o = PyInt_FromLong((long) (*arg2));
resultobj = t_output_helper(resultobj,o);
@@ -4524,7 +4515,7 @@ static PyObject *_wrap_HtmlCell_IsLinebreakAllowed(PyObject *self, PyObject *arg
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_PyObj_FromBool((bool)result);
resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
return resultobj;
fail:
return NULL;
@@ -4549,7 +4540,7 @@ static PyObject *_wrap_HtmlCell_IsTerminalCell(PyObject *self, PyObject *args, P
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_PyObj_FromBool((bool)result);
resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
return resultobj;
fail:
return NULL;
@@ -4726,7 +4717,7 @@ static PyObject *_wrap_HtmlCell_IsBefore(PyObject *self, PyObject *args, PyObjec
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_PyObj_FromBool((bool)result);
resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
return resultobj;
fail:
return NULL;
@@ -5704,7 +5695,7 @@ static PyObject *_wrap_HtmlWindow_Create(PyObject *self, PyObject *args, PyObjec
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_PyObj_FromBool((bool)result);
resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
{
if (temp7)
delete arg7;
@@ -5775,7 +5766,7 @@ static PyObject *_wrap_HtmlWindow_SetPage(PyObject *self, PyObject *args, PyObje
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_PyObj_FromBool((bool)result);
resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
{
if (temp2)
delete arg2;
@@ -5816,7 +5807,7 @@ static PyObject *_wrap_HtmlWindow_LoadPage(PyObject *self, PyObject *args, PyObj
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_PyObj_FromBool((bool)result);
resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
{
if (temp2)
delete arg2;
@@ -5857,7 +5848,7 @@ static PyObject *_wrap_HtmlWindow_LoadFile(PyObject *self, PyObject *args, PyObj
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_PyObj_FromBool((bool)result);
resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
{
if (temp2)
delete arg2;
@@ -5898,7 +5889,7 @@ static PyObject *_wrap_HtmlWindow_AppendToPage(PyObject *self, PyObject *args, P
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_PyObj_FromBool((bool)result);
resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
{
if (temp2)
delete arg2;
@@ -6313,7 +6304,7 @@ static PyObject *_wrap_HtmlWindow_HistoryBack(PyObject *self, PyObject *args, Py
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_PyObj_FromBool((bool)result);
resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
return resultobj;
fail:
return NULL;
@@ -6338,7 +6329,7 @@ static PyObject *_wrap_HtmlWindow_HistoryForward(PyObject *self, PyObject *args,
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_PyObj_FromBool((bool)result);
resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
return resultobj;
fail:
return NULL;
@@ -6363,7 +6354,7 @@ static PyObject *_wrap_HtmlWindow_HistoryCanBack(PyObject *self, PyObject *args,
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_PyObj_FromBool((bool)result);
resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
return resultobj;
fail:
return NULL;
@@ -6388,7 +6379,7 @@ static PyObject *_wrap_HtmlWindow_HistoryCanForward(PyObject *self, PyObject *ar
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_PyObj_FromBool((bool)result);
resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
return resultobj;
fail:
return NULL;
@@ -6495,7 +6486,7 @@ static PyObject *_wrap_HtmlWindow_ScrollToAnchor(PyObject *self, PyObject *args,
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_PyObj_FromBool((bool)result);
resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
{
if (temp2)
delete arg2;
@@ -6536,7 +6527,7 @@ static PyObject *_wrap_HtmlWindow_HasAnchor(PyObject *self, PyObject *args, PyOb
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_PyObj_FromBool((bool)result);
resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
{
if (temp2)
delete arg2;
@@ -8620,7 +8611,7 @@ static PyObject *_wrap_HtmlSearchStatus_Search(PyObject *self, PyObject *args, P
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_PyObj_FromBool((bool)result);
resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
return resultobj;
fail:
return NULL;
@@ -8645,7 +8636,7 @@ static PyObject *_wrap_HtmlSearchStatus_IsActive(PyObject *self, PyObject *args,
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_PyObj_FromBool((bool)result);
resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
return resultobj;
fail:
return NULL;
@@ -8880,7 +8871,7 @@ static PyObject *_wrap_HtmlHelpData_AddBook(PyObject *self, PyObject *args, PyOb
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_PyObj_FromBool((bool)result);
resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
{
if (temp2)
delete arg2;
@@ -9386,7 +9377,7 @@ static PyObject *_wrap_HtmlHelpFrame_KeywordSearch(PyObject *self, PyObject *arg
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_PyObj_FromBool((bool)result);
resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
{
if (temp2)
delete arg2;
@@ -9696,7 +9687,7 @@ static PyObject *_wrap_HtmlHelpController_AddBook(PyObject *self, PyObject *args
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_PyObj_FromBool((bool)result);
resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
{
if (temp2)
delete arg2;
@@ -9855,7 +9846,7 @@ static PyObject *_wrap_HtmlHelpController_KeywordSearch(PyObject *self, PyObject
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_PyObj_FromBool((bool)result);
resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
{
if (temp2)
delete arg2;
wxPython/src/mac/misc.py
+44 -18
View File
@@ -2012,43 +2012,69 @@ EVT_JOYSTICK_EVENTS = wx.PyEventBinder([ wxEVT_JOY_BUTTON_DOWN,
#---------------------------------------------------------------------------
class Wave(object):
SOUND_SYNC = _misc.SOUND_SYNC
SOUND_ASYNC = _misc.SOUND_ASYNC
SOUND_LOOP = _misc.SOUND_LOOP
class Sound(object):
def __repr__(self):
return "<%s.%s; proxy of C++ wxWave instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
def __init__(self, *args, **kwargs):
"""__init__(String fileName, bool isResource=False) -> Wave"""
newobj = _misc.new_Wave(*args, **kwargs)
return "<%s.%s; proxy of C++ wxSound instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
def __init__(self, *args):
"""
__init__() -> Sound
__init__(String fileName, bool isResource=false) -> Sound
__init__(int size, wxByte data) -> Sound
"""
newobj = _misc.new_Sound(*args)
self.this = newobj.this
self.thisown = 1
del newobj.thisown
def __del__(self, destroy=_misc.delete_Wave):
def __del__(self, destroy=_misc.delete_Sound):
"""__del__()"""
try:
if self.thisown: destroy(self)
except: pass
def Create(*args):
"""
Create(String fileName, bool isResource=false) -> bool
Create(int size, wxByte data) -> bool
"""
return _misc.Sound_Create(*args)
def IsOk(*args, **kwargs):
"""IsOk() -> bool"""
return _misc.Wave_IsOk(*args, **kwargs)
return _misc.Sound_IsOk(*args, **kwargs)
def Play(*args, **kwargs):
"""Play(bool async=True, bool looped=False) -> bool"""
return _misc.Wave_Play(*args, **kwargs)
def Play(*args):
"""Play(unsigned int flags=SOUND_ASYNC) -> bool"""
return _misc.Sound_Play(*args)
def PlaySound(*args):
"""PlaySound(String filename, unsigned int flags=SOUND_ASYNC) -> bool"""
return _misc.Sound_PlaySound(*args)
PlaySound = staticmethod(PlaySound)
def Stop(*args, **kwargs):
"""Stop()"""
return _misc.Sound_Stop(*args, **kwargs)
Stop = staticmethod(Stop)
def __nonzero__(self): return self.IsOk()
class WavePtr(Wave):
class SoundPtr(Sound):
def __init__(self, this):
self.this = this
if not hasattr(self,"thisown"): self.thisown = 0
self.__class__ = Wave
_misc.Wave_swigregister(WavePtr)
self.__class__ = Sound
_misc.Sound_swigregister(SoundPtr)
def WaveData(*args, **kwargs):
"""WaveData(String data) -> Wave"""
val = _misc.new_WaveData(*args, **kwargs)
val.thisown = 1
return val
def Sound_PlaySound(*args):
"""Sound_PlaySound(String filename, unsigned int flags=SOUND_ASYNC) -> bool"""
return _misc.Sound_PlaySound(*args)
def Sound_Stop(*args, **kwargs):
"""Sound_Stop()"""
return _misc.Sound_Stop(*args, **kwargs)
#---------------------------------------------------------------------------
wxPython/src/mac/misc_wrap.cpp
+571 -287
View File
File diff suppressed because it is too large Load Diff
wxPython/src/mac/windows.py
+2 -2
View File
@@ -1821,8 +1821,8 @@ class MultiChoiceDialog(Dialog):
return "<%s.%s; proxy of C++ wxMultiChoiceDialog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
def __init__(self, *args, **kwargs):
"""
__init__(Window parent, String message, String caption, int LCOUNT,
String choices, long style=CHOICEDLG_STYLE,
__init__(Window parent, String message, String caption, int choices=0,
String choices_array, long style=CHOICEDLG_STYLE,
Point pos=DefaultPosition) -> MultiChoiceDialog
"""
newobj = _windows.new_MultiChoiceDialog(*args, **kwargs)
wxPython/src/mac/windows_wrap.cpp
+118 -133
View File
File diff suppressed because it is too large Load Diff
wxPython/src/mac/wizard_wrap.cpp
+15 -24
View File
@@ -323,15 +323,6 @@ SWIG_PyObj_AsBool(PyObject *obj)
return PyObject_IsTrue(obj) ? true : false;
}
SWIGSTATIC(PyObject*)
SWIG_PyObj_FromBool(bool value)
{
PyObject *obj = value ? Py_True : Py_False;
Py_INCREF(obj);
return obj;
}
bool wxWizardPage_Create(wxWizardPage *self,wxWizard *parent,wxBitmap const &bitmap,wxString const &resource){
wxChar* res = NULL;
if (resource.Length())
@@ -529,7 +520,7 @@ static PyObject *_wrap_WizardEvent_GetDirection(PyObject *self, PyObject *args,
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_PyObj_FromBool((bool)result);
resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
return resultobj;
fail:
return NULL;
@@ -611,7 +602,7 @@ static PyObject *_wrap_WizardPage_Create(PyObject *self, PyObject *args, PyObjec
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_PyObj_FromBool((bool)result);
resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
{
if (temp4)
delete arg4;
@@ -827,7 +818,7 @@ static PyObject *_wrap_PyWizardPage_Create(PyObject *self, PyObject *args, PyObj
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_PyObj_FromBool((bool)result);
resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
{
if (temp4)
delete arg4;
@@ -1262,7 +1253,7 @@ static PyObject *_wrap_PyWizardPage_base_TransferDataToWindow(PyObject *self, Py
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_PyObj_FromBool((bool)result);
resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
return resultobj;
fail:
return NULL;
@@ -1287,7 +1278,7 @@ static PyObject *_wrap_PyWizardPage_base_TransferDataFromWindow(PyObject *self,
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_PyObj_FromBool((bool)result);
resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
return resultobj;
fail:
return NULL;
@@ -1312,7 +1303,7 @@ static PyObject *_wrap_PyWizardPage_base_Validate(PyObject *self, PyObject *args
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_PyObj_FromBool((bool)result);
resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
return resultobj;
fail:
return NULL;
@@ -1337,7 +1328,7 @@ static PyObject *_wrap_PyWizardPage_base_AcceptsFocus(PyObject *self, PyObject *
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_PyObj_FromBool((bool)result);
resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
return resultobj;
fail:
return NULL;
@@ -1362,7 +1353,7 @@ static PyObject *_wrap_PyWizardPage_base_AcceptsFocusFromKeyboard(PyObject *self
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_PyObj_FromBool((bool)result);
resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
return resultobj;
fail:
return NULL;
@@ -1577,7 +1568,7 @@ static PyObject *_wrap_WizardPageSimple_Create(PyObject *self, PyObject *args, P
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_PyObj_FromBool((bool)result);
resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
return resultobj;
fail:
return NULL;
@@ -1832,7 +1823,7 @@ static PyObject *_wrap_Wizard_Create(PyObject *self, PyObject *args, PyObject *k
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_PyObj_FromBool((bool)result);
resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
{
if (temp4)
delete arg4;
@@ -1892,7 +1883,7 @@ static PyObject *_wrap_Wizard_RunWizard(PyObject *self, PyObject *args, PyObject
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_PyObj_FromBool((bool)result);
resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
return resultobj;
fail:
return NULL;
@@ -2088,7 +2079,7 @@ static PyObject *_wrap_Wizard_IsRunning(PyObject *self, PyObject *args, PyObject
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_PyObj_FromBool((bool)result);
resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
return resultobj;
fail:
return NULL;
@@ -2124,7 +2115,7 @@ static PyObject *_wrap_Wizard_ShowPage(PyObject *self, PyObject *args, PyObject
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_PyObj_FromBool((bool)result);
resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
return resultobj;
fail:
return NULL;
@@ -2152,7 +2143,7 @@ static PyObject *_wrap_Wizard_HasNextPage(PyObject *self, PyObject *args, PyObje
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_PyObj_FromBool((bool)result);
resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
return resultobj;
fail:
return NULL;
@@ -2180,7 +2171,7 @@ static PyObject *_wrap_Wizard_HasPrevPage(PyObject *self, PyObject *args, PyObje
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_PyObj_FromBool((bool)result);
resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
return resultobj;
fail:
return NULL;