From af4836a25a3b11cc074d96aeaac528bd37941dfb Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Sat, 27 Nov 2010 08:56:14 +0000 Subject: [PATCH] regenerated .sip files git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@66273 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- sip/gen/_core.sip | 897 +++++++++++++++-------------------------- sip/gen/app.sip | 852 ++++++++++++++++++++++++++++++++++++++ sip/gen/apptrait.sip | 47 +++ sip/gen/colour.sip | 383 ++++++++++++++++++ sip/gen/defs.sip | 658 ++++++++++++++++++++++++++++++ sip/gen/display.sip | 81 ++++ sip/gen/event.sip | 339 ++++++++-------- sip/gen/evtloop.sip | 86 ++++ sip/gen/font.sip | 384 ++++++++++++++++++ sip/gen/gdicmn.sip | 158 +++++--- sip/gen/gdiobj.sip | 29 ++ sip/gen/geometry.sip | 32 +- sip/gen/intl.sip | 444 ++++++++++++++++++++ sip/gen/kbdstate.sip | 7 +- sip/gen/mousestate.sip | 7 +- sip/gen/object.sip | 62 +-- sip/gen/platinfo.sip | 241 +++++++++++ sip/gen/tracker.sip | 8 +- sip/gen/vidmode.sip | 62 +++ sip/gen/windowid.sip | 7 +- 20 files changed, 3917 insertions(+), 867 deletions(-) create mode 100644 sip/gen/app.sip create mode 100644 sip/gen/apptrait.sip create mode 100644 sip/gen/colour.sip create mode 100644 sip/gen/defs.sip create mode 100644 sip/gen/display.sip create mode 100644 sip/gen/evtloop.sip create mode 100644 sip/gen/font.sip create mode 100644 sip/gen/gdiobj.sip create mode 100644 sip/gen/intl.sip create mode 100644 sip/gen/platinfo.sip create mode 100644 sip/gen/vidmode.sip diff --git a/sip/gen/_core.sip b/sip/gen/_core.sip index 90279961..36e6089c 100644 --- a/sip/gen/_core.sip +++ b/sip/gen/_core.sip @@ -4,7 +4,7 @@ // Copyright: (c) 2010 by Total Control Software // License: wxWindows License -%Module(name=wx._core, use_argument_names=True, language="C++") +%Module(name=wxPhoenix._core, use_argument_names=True, language="C++") { %AutoPyName(remove_leading="wx") } @@ -14,7 +14,7 @@ License: wxWindows License %End -%Extract pycode +%Extract(id=pycode, order=5) # This file is generated by wxPython's SIP generator. Do not edit by hand. # # Copyright: (c) 2010 by Total Control Software @@ -27,637 +27,378 @@ from _core import * //--------------------------------------------------------------------------- %ModuleHeaderCode -#include + #if defined(__APPLE__) + // When it's possible that we're building universal binaries with both + // 32-bit and 64-bit architectures then these need to be undefed because + // otherwise the values set by configure could conflict with those set + // based on runtime flags in Python's headers. We also do something + // similar in wx/platform.h so it's okay to undef them now because they + // will be defined again soon. + #undef SIZEOF_VOID_P + #undef SIZEOF_LONG + #undef SIZEOF_SIZE_T + + // Turn off the warning about converting string literals to char* + // TODO: fix these the right way... + #pragma GCC diagnostic ignored "-Wwrite-strings" + #endif + #ifdef _MSC_VER + #pragma warning(disable:4800) + #pragma warning(disable:4190) + #endif + + #include + %End +%Include defs.sip +%Include wxpy_utils.sip %Include string.sip %Include clntdata.sip %Include windowid.sip +%Include platinfo.sip +%Include display.sip +%Include vidmode.sip +%Include intl.sip +%Include gdiobj.sip +%Include font.sip +%Include gdicmn.sip +%Include geometry.sip %Include object.sip +%Include colour.sip %Include tracker.sip %Include kbdstate.sip %Include mousestate.sip %Include event.sip -%Include gdicmn.sip -%Include geometry.sip +%Include evtloop.sip +%Include apptrait.sip +%Include app.sip +%ModuleCode + +void wxPyCoreModuleInject(PyObject* moduleDict) +{ +// // Create an exception object to use for wxASSERTions +// wxPyAssertionError = PyErr_NewException("wx._core.PyAssertionError", +// PyExc_AssertionError, NULL); +// PyDict_SetItemString(moduleDict, "PyAssertionError", wxPyAssertionError); +// +// // Create an exception object to use when the app object hasn't been created yet +// wxPyNoAppError = PyErr_NewException("wx._core.PyNoAppError", +// PyExc_RuntimeError, NULL); +// PyDict_SetItemString(moduleDict, "PyNoAppError", wxPyNoAppError); + +#ifdef __WXGTK__ +#define wxPort "__WXGTK__" +#define wxPortName "wxGTK" +#endif +#ifdef __WXMSW__ +#define wxPort "__WXMSW__" +#define wxPortName "wxMSW" +#endif +#ifdef __WXMAC__ +#define wxPort "__WXMAC__" +#define wxPortName "wxMac" +#endif + + PyDict_SetItemString(moduleDict, "Port", PyString_FromString(wxPort)); + + // Make a tuple of strings that gives more info about the platform and build. + PyObject* PortInfo = PyList_New(0); + PyObject* obj; + +#define _AddInfoString(st) obj = PyString_FromString(st); PyList_Append(PortInfo, obj); Py_DECREF(obj) + + _AddInfoString(wxPort); + _AddInfoString(wxPortName); +#if wxUSE_UNICODE + _AddInfoString("unicode"); +#if wxUSE_UNICODE_WCHAR + _AddInfoString("unicode-wchar"); +#else + _AddInfoString("unicode-utf8"); +#endif +#else + _AddInfoString("ansi"); +#endif + +#ifdef __WXOSX__ + _AddInfoString("wxOSX"); +#endif +#ifdef __WXOSX_CARBON__ + _AddInfoString("wxOSX-carbon"); +#endif +#ifdef __WXOSX_COCOA__ + _AddInfoString("wxOSX-cocoa"); +#endif +#ifdef __WXGTK__ +#ifdef __WXGTK20__ + _AddInfoString("gtk2"); +#else + _AddInfoString("gtk1"); +#endif +#endif +#ifdef __WXDEBUG__ + _AddInfoString("wx-assertions-on"); +#else + _AddInfoString("wx-assertions-off"); +#endif +#undef _AddInfoString + + PyObject* PortInfoTuple = PyList_AsTuple(PortInfo); + Py_DECREF(PortInfo); + PyDict_SetItemString(moduleDict, "PortInfo", PortInfoTuple); +} + +%End //--------------------------------------------------------------------------- -typedef signed char wxInt8; +%Extract(id=pycode, order=10) +# A little trick to make 'wx' be a reference to this module so wx.Names can +# be used in the python code here. +import sys as _sys +wx = _sys.modules[__name__] -typedef unsigned char wxUint8; +%End -typedef wxUint8 wxByte; +%Extract(id=pycode) +#-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= +# This code block was included from src/core_ex.py -typedef short wxInt16; +# Load version numbers from __version__... Ensure that major and minor +# versions are the same for both wxPython and wxWidgets. -typedef unsigned short wxUint16; +from __version__ import * +__version__ = VERSION_STRING +import _core +assert MAJOR_VERSION == _core.MAJOR_VERSION, "wxPython/wxWidgets version mismatch" +assert MINOR_VERSION == _core.MINOR_VERSION, "wxPython/wxWidgets version mismatch" +if RELEASE_NUMBER != _core.RELEASE_NUMBER: + import warnings + warnings.warn("wxPython/wxWidgets release number mismatch") +del _core -typedef wxUint16 wxWord; -typedef wxUint16 wxChar16; +def version(): + """Returns a string containing version and port info""" + if wx.Platform == '__WXMSW__': + port = 'msw' + elif wx.Platform == '__WXMAC__': + if 'wxOSX-carbon' in wx.PlatformInfo: + port = 'osx-carbon' + else: + port = 'osx-cocoa' + elif wx.Platform == '__WXGTK__': + port = 'gtk' + if 'gtk2' in wx.PlatformInfo: + port = 'gtk2' + else: + port = '?' + return "%s %s" % (wx.VERSION_STRING, port) + + +## #---------------------------------------------------------------------------- -typedef int wxInt32; +## class PyDeadObjectError(AttributeError): +## pass -typedef unsigned int wxUint32; +## class _wxPyDeadObject(object): +## """ +## Instances of wx objects that are OOR capable will have their __class__ +## changed to this class when the C++ object is deleted. This should help +## prevent crashes due to referencing a bogus C++ pointer. +## """ +## reprStr = "wxPython wrapper for DELETED %s object! (The C++ object no longer exists.)" +## attrStr = "The C++ part of the %s object has been deleted, attribute access no longer allowed." -typedef wxUint32 wxDword; +## def __repr__(self): +## if not hasattr(self, "_name"): +## self._name = "[unknown]" +## return self.reprStr % self._name -typedef wxUint32 wxChar32; +## def __getattr__(self, *args): +## if not hasattr(self, "_name"): +## self._name = "[unknown]" +## raise PyDeadObjectError(self.attrStr % self._name) -typedef long long wxInt64; +## def __nonzero__(self): +## return 0 -typedef unsigned long long wxUint64; -typedef long wxIntPtr; -typedef unsigned long wxUIntPtr; +## class PyUnbornObjectError(AttributeError): +## pass -typedef wchar_t wxChar; +## class _wxPyUnbornObject(object): +## """ +## Some stock objects are created when the wx._core module is +## imported, but their C++ instance is not created until the wx.App +## object is created and initialized. These object instances will +## temporarily have their __class__ changed to this class so an +## exception will be raised if they are used before the C++ instance +## is ready. +## """ -typedef wchar_t wxUChar; +## reprStr = "wxPython wrapper for UNBORN object! (The C++ object is not initialized yet.)" +## attrStr = "The C++ part of this object has not been initialized, attribute access not allowed." -enum wxGeometryCentre -{ - wxCENTRE, - wxCENTER -}; +## def __repr__(self): +## #if not hasattr(self, "_name"): +## # self._name = "[unknown]" +## return self.reprStr #% self._name -enum wxOrientation -{ - wxHORIZONTAL, - wxVERTICAL, - wxBOTH, - wxORIENTATION_MASK -}; +## def __getattr__(self, *args): +## #if not hasattr(self, "_name"): +## # self._name = "[unknown]" +## raise PyUnbornObjectError(self.attrStr) # % self._name ) -enum wxDirection -{ - wxLEFT, - wxRIGHT, - wxUP, - wxDOWN, - wxTOP, - wxBOTTOM, - wxNORTH, - wxSOUTH, - wxWEST, - wxEAST, - wxALL, - wxDIRECTION_MASK -}; +## def __nonzero__(self): +## return 0 -enum wxAlignment -{ - wxALIGN_INVALID, - wxALIGN_NOT, - wxALIGN_CENTER_HORIZONTAL, - wxALIGN_CENTRE_HORIZONTAL, - wxALIGN_LEFT, - wxALIGN_TOP, - wxALIGN_RIGHT, - wxALIGN_BOTTOM, - wxALIGN_CENTER_VERTICAL, - wxALIGN_CENTRE_VERTICAL, - wxALIGN_CENTER, - wxALIGN_CENTRE, - wxALIGN_MASK -}; -enum wxSizerFlagBits -{ - wxFIXED_MINSIZE, - wxRESERVE_SPACE_EVEN_IF_HIDDEN, - wxSIZER_FLAG_BITS_MASK -}; +## #---------------------------------------------------------------------------- -enum wxStretch -{ - wxSTRETCH_NOT, - wxSHRINK, - wxGROW, - wxEXPAND, - wxSHAPED, - wxTILE, - wxSTRETCH_MASK -}; +## def CallAfter(callable, *args, **kw): +## """ +## Call the specified function after the current and pending event +## handlers have been completed. This is also good for making GUI +## method calls from non-GUI threads. Any extra positional or +## keyword args are passed on to the callable when it is called. -enum wxBorder -{ - wxBORDER_DEFAULT, - wxBORDER_NONE, - wxBORDER_STATIC, - wxBORDER_SIMPLE, - wxBORDER_RAISED, - wxBORDER_SUNKEN, - wxBORDER_DOUBLE, - wxBORDER_THEME, - wxBORDER_MASK -}; +## :see: `wx.CallLater` +## """ +## app = wx.GetApp() +## assert app is not None, 'No wx.App created yet' -enum wxBackgroundStyle -{ - wxBG_STYLE_ERASE, - wxBG_STYLE_SYSTEM, - wxBG_STYLE_PAINT -}; +## if not hasattr(app, "_CallAfterId"): +## app._CallAfterId = wx.NewEventType() +## app.Connect(-1, -1, app._CallAfterId, +## lambda event: event.callable(*event.args, **event.kw) ) +## evt = wx.PyEvent() +## evt.SetEventType(app._CallAfterId) +## evt.callable = callable +## evt.args = args +## evt.kw = kw +## wx.PostEvent(app, evt) -enum wxStandardID -{ - wxID_AUTO_LOWEST, - wxID_AUTO_HIGHEST, - wxID_NONE, - wxID_SEPARATOR, - wxID_ANY, - wxID_LOWEST, - wxID_OPEN, - wxID_CLOSE, - wxID_NEW, - wxID_SAVE, - wxID_SAVEAS, - wxID_REVERT, - wxID_EXIT, - wxID_UNDO, - wxID_REDO, - wxID_HELP, - wxID_PRINT, - wxID_PRINT_SETUP, - wxID_PAGE_SETUP, - wxID_PREVIEW, - wxID_ABOUT, - wxID_HELP_CONTENTS, - wxID_HELP_INDEX, - wxID_HELP_SEARCH, - wxID_HELP_COMMANDS, - wxID_HELP_PROCEDURES, - wxID_HELP_CONTEXT, - wxID_CLOSE_ALL, - wxID_PREFERENCES, - wxID_EDIT, - wxID_CUT, - wxID_COPY, - wxID_PASTE, - wxID_CLEAR, - wxID_FIND, - wxID_DUPLICATE, - wxID_SELECTALL, - wxID_DELETE, - wxID_REPLACE, - wxID_REPLACE_ALL, - wxID_PROPERTIES, - wxID_VIEW_DETAILS, - wxID_VIEW_LARGEICONS, - wxID_VIEW_SMALLICONS, - wxID_VIEW_LIST, - wxID_VIEW_SORTDATE, - wxID_VIEW_SORTNAME, - wxID_VIEW_SORTSIZE, - wxID_VIEW_SORTTYPE, - wxID_FILE, - wxID_FILE1, - wxID_FILE2, - wxID_FILE3, - wxID_FILE4, - wxID_FILE5, - wxID_FILE6, - wxID_FILE7, - wxID_FILE8, - wxID_FILE9, - wxID_OK, - wxID_CANCEL, - wxID_APPLY, - wxID_YES, - wxID_NO, - wxID_STATIC, - wxID_FORWARD, - wxID_BACKWARD, - wxID_DEFAULT, - wxID_MORE, - wxID_SETUP, - wxID_RESET, - wxID_CONTEXT_HELP, - wxID_YESTOALL, - wxID_NOTOALL, - wxID_ABORT, - wxID_RETRY, - wxID_IGNORE, - wxID_ADD, - wxID_REMOVE, - wxID_UP, - wxID_DOWN, - wxID_HOME, - wxID_REFRESH, - wxID_STOP, - wxID_INDEX, - wxID_BOLD, - wxID_ITALIC, - wxID_JUSTIFY_CENTER, - wxID_JUSTIFY_FILL, - wxID_JUSTIFY_RIGHT, - wxID_JUSTIFY_LEFT, - wxID_UNDERLINE, - wxID_INDENT, - wxID_UNINDENT, - wxID_ZOOM_100, - wxID_ZOOM_FIT, - wxID_ZOOM_IN, - wxID_ZOOM_OUT, - wxID_UNDELETE, - wxID_REVERT_TO_SAVED, - wxID_CDROM, - wxID_CONVERT, - wxID_EXECUTE, - wxID_FLOPPY, - wxID_HARDDISK, - wxID_BOTTOM, - wxID_FIRST, - wxID_LAST, - wxID_TOP, - wxID_INFO, - wxID_JUMP_TO, - wxID_NETWORK, - wxID_SELECT_COLOR, - wxID_SELECT_FONT, - wxID_SORT_ASCENDING, - wxID_SORT_DESCENDING, - wxID_SPELL_CHECK, - wxID_STRIKETHROUGH, - wxID_SYSTEM_MENU, - wxID_CLOSE_FRAME, - wxID_MOVE_FRAME, - wxID_RESIZE_FRAME, - wxID_MAXIMIZE_FRAME, - wxID_ICONIZE_FRAME, - wxID_RESTORE_FRAME, - wxID_MDI_WINDOW_FIRST, - wxID_MDI_WINDOW_CASCADE, - wxID_MDI_WINDOW_TILE_HORZ, - wxID_MDI_WINDOW_TILE_VERT, - wxID_MDI_WINDOW_ARRANGE_ICONS, - wxID_MDI_WINDOW_PREV, - wxID_MDI_WINDOW_NEXT, - wxID_MDI_WINDOW_LAST, - wxID_FILEDLGG, - wxID_FILECTRL, - wxID_HIGHEST -}; +## #---------------------------------------------------------------------------- -enum wxItemKind -{ - wxITEM_SEPARATOR, - wxITEM_NORMAL, - wxITEM_CHECK, - wxITEM_RADIO, - wxITEM_DROPDOWN, - wxITEM_MAX -}; -enum wxHitTest -{ - wxHT_NOWHERE, - wxHT_SCROLLBAR_FIRST, - wxHT_SCROLLBAR_ARROW_LINE_1, - wxHT_SCROLLBAR_ARROW_LINE_2, - wxHT_SCROLLBAR_ARROW_PAGE_1, - wxHT_SCROLLBAR_ARROW_PAGE_2, - wxHT_SCROLLBAR_THUMB, - wxHT_SCROLLBAR_BAR_1, - wxHT_SCROLLBAR_BAR_2, - wxHT_SCROLLBAR_LAST, - wxHT_WINDOW_OUTSIDE, - wxHT_WINDOW_INSIDE, - wxHT_WINDOW_VERT_SCROLLBAR, - wxHT_WINDOW_HORZ_SCROLLBAR, - wxHT_WINDOW_CORNER, - wxHT_MAX -}; +## class CallLater: +## """ +## A convenience class for `wx.Timer`, that calls the given callable +## object once after the given amount of milliseconds, passing any +## positional or keyword args. The return value of the callable is +## availbale after it has been run with the `GetResult` method. -enum wxDataFormatId -{ - wxDF_INVALID, - wxDF_TEXT, - wxDF_BITMAP, - wxDF_METAFILE, - wxDF_SYLK, - wxDF_DIF, - wxDF_TIFF, - wxDF_OEMTEXT, - wxDF_DIB, - wxDF_PALETTE, - wxDF_PENDATA, - wxDF_RIFF, - wxDF_WAVE, - wxDF_UNICODETEXT, - wxDF_ENHMETAFILE, - wxDF_FILENAME, - wxDF_LOCALE, - wxDF_PRIVATE, - wxDF_HTML, - wxDF_MAX -}; +## If you don't need to get the return value or restart the timer +## then there is no need to hold a reference to this object. It will +## hold a reference to itself while the timer is running (the timer +## has a reference to self.Notify) but the cycle will be broken when +## the timer completes, automatically cleaning up the wx.CallLater +## object. -enum wxKeyCode -{ - WXK_NONE, - WXK_BACK, - WXK_TAB, - WXK_RETURN, - WXK_ESCAPE, - WXK_SPACE, - WXK_DELETE, - WXK_START, - WXK_LBUTTON, - WXK_RBUTTON, - WXK_CANCEL, - WXK_MBUTTON, - WXK_CLEAR, - WXK_SHIFT, - WXK_ALT, - WXK_CONTROL, - WXK_MENU, - WXK_PAUSE, - WXK_CAPITAL, - WXK_END, - WXK_HOME, - WXK_LEFT, - WXK_UP, - WXK_RIGHT, - WXK_DOWN, - WXK_SELECT, - WXK_PRINT, - WXK_EXECUTE, - WXK_SNAPSHOT, - WXK_INSERT, - WXK_HELP, - WXK_NUMPAD0, - WXK_NUMPAD1, - WXK_NUMPAD2, - WXK_NUMPAD3, - WXK_NUMPAD4, - WXK_NUMPAD5, - WXK_NUMPAD6, - WXK_NUMPAD7, - WXK_NUMPAD8, - WXK_NUMPAD9, - WXK_MULTIPLY, - WXK_ADD, - WXK_SEPARATOR, - WXK_SUBTRACT, - WXK_DECIMAL, - WXK_DIVIDE, - WXK_F1, - WXK_F2, - WXK_F3, - WXK_F4, - WXK_F5, - WXK_F6, - WXK_F7, - WXK_F8, - WXK_F9, - WXK_F10, - WXK_F11, - WXK_F12, - WXK_F13, - WXK_F14, - WXK_F15, - WXK_F16, - WXK_F17, - WXK_F18, - WXK_F19, - WXK_F20, - WXK_F21, - WXK_F22, - WXK_F23, - WXK_F24, - WXK_NUMLOCK, - WXK_SCROLL, - WXK_PAGEUP, - WXK_PAGEDOWN, - WXK_NUMPAD_SPACE, - WXK_NUMPAD_TAB, - WXK_NUMPAD_ENTER, - WXK_NUMPAD_F1, - WXK_NUMPAD_F2, - WXK_NUMPAD_F3, - WXK_NUMPAD_F4, - WXK_NUMPAD_HOME, - WXK_NUMPAD_LEFT, - WXK_NUMPAD_UP, - WXK_NUMPAD_RIGHT, - WXK_NUMPAD_DOWN, - WXK_NUMPAD_PAGEUP, - WXK_NUMPAD_PAGEDOWN, - WXK_NUMPAD_END, - WXK_NUMPAD_BEGIN, - WXK_NUMPAD_INSERT, - WXK_NUMPAD_DELETE, - WXK_NUMPAD_EQUAL, - WXK_NUMPAD_MULTIPLY, - WXK_NUMPAD_ADD, - WXK_NUMPAD_SEPARATOR, - WXK_NUMPAD_SUBTRACT, - WXK_NUMPAD_DECIMAL, - WXK_NUMPAD_DIVIDE, - WXK_WINDOWS_LEFT, - WXK_WINDOWS_RIGHT, - WXK_WINDOWS_MENU, - WXK_COMMAND, - WXK_SPECIAL1, - WXK_SPECIAL2, - WXK_SPECIAL3, - WXK_SPECIAL4, - WXK_SPECIAL5, - WXK_SPECIAL6, - WXK_SPECIAL7, - WXK_SPECIAL8, - WXK_SPECIAL9, - WXK_SPECIAL10, - WXK_SPECIAL11, - WXK_SPECIAL12, - WXK_SPECIAL13, - WXK_SPECIAL14, - WXK_SPECIAL15, - WXK_SPECIAL16, - WXK_SPECIAL17, - WXK_SPECIAL18, - WXK_SPECIAL19, - WXK_SPECIAL20 -}; +## :see: `wx.CallAfter` +## """ +## def __init__(self, millis, callable, *args, **kwargs): +## self.millis = millis +## self.callable = callable +## self.SetArgs(*args, **kwargs) +## self.runCount = 0 +## self.running = False +## self.hasRun = False +## self.result = None +## self.timer = None +## self.Start() -enum wxKeyModifier -{ - wxMOD_NONE, - wxMOD_ALT, - wxMOD_CONTROL, - wxMOD_ALTGR, - wxMOD_SHIFT, - wxMOD_META, - wxMOD_WIN, - wxMOD_CMD, - wxMOD_ALL -}; +## def __del__(self): +## self.Stop() -enum wxPaperSize -{ - wxPAPER_NONE, - wxPAPER_LETTER, - wxPAPER_LEGAL, - wxPAPER_A4, - wxPAPER_CSHEET, - wxPAPER_DSHEET, - wxPAPER_ESHEET, - wxPAPER_LETTERSMALL, - wxPAPER_TABLOID, - wxPAPER_LEDGER, - wxPAPER_STATEMENT, - wxPAPER_EXECUTIVE, - wxPAPER_A3, - wxPAPER_A4SMALL, - wxPAPER_A5, - wxPAPER_B4, - wxPAPER_B5, - wxPAPER_FOLIO, - wxPAPER_QUARTO, - wxPAPER_10X14, - wxPAPER_11X17, - wxPAPER_NOTE, - wxPAPER_ENV_9, - wxPAPER_ENV_10, - wxPAPER_ENV_11, - wxPAPER_ENV_12, - wxPAPER_ENV_14, - wxPAPER_ENV_DL, - wxPAPER_ENV_C5, - wxPAPER_ENV_C3, - wxPAPER_ENV_C4, - wxPAPER_ENV_C6, - wxPAPER_ENV_C65, - wxPAPER_ENV_B4, - wxPAPER_ENV_B5, - wxPAPER_ENV_B6, - wxPAPER_ENV_ITALY, - wxPAPER_ENV_MONARCH, - wxPAPER_ENV_PERSONAL, - wxPAPER_FANFOLD_US, - wxPAPER_FANFOLD_STD_GERMAN, - wxPAPER_FANFOLD_LGL_GERMAN, - wxPAPER_ISO_B4, - wxPAPER_JAPANESE_POSTCARD, - wxPAPER_9X11, - wxPAPER_10X11, - wxPAPER_15X11, - wxPAPER_ENV_INVITE, - wxPAPER_LETTER_EXTRA, - wxPAPER_LEGAL_EXTRA, - wxPAPER_TABLOID_EXTRA, - wxPAPER_A4_EXTRA, - wxPAPER_LETTER_TRANSVERSE, - wxPAPER_A4_TRANSVERSE, - wxPAPER_LETTER_EXTRA_TRANSVERSE, - wxPAPER_A_PLUS, - wxPAPER_B_PLUS, - wxPAPER_LETTER_PLUS, - wxPAPER_A4_PLUS, - wxPAPER_A5_TRANSVERSE, - wxPAPER_B5_TRANSVERSE, - wxPAPER_A3_EXTRA, - wxPAPER_A5_EXTRA, - wxPAPER_B5_EXTRA, - wxPAPER_A2, - wxPAPER_A3_TRANSVERSE, - wxPAPER_A3_EXTRA_TRANSVERSE, - wxPAPER_DBL_JAPANESE_POSTCARD, - wxPAPER_A6, - wxPAPER_JENV_KAKU2, - wxPAPER_JENV_KAKU3, - wxPAPER_JENV_CHOU3, - wxPAPER_JENV_CHOU4, - wxPAPER_LETTER_ROTATED, - wxPAPER_A3_ROTATED, - wxPAPER_A4_ROTATED, - wxPAPER_A5_ROTATED, - wxPAPER_B4_JIS_ROTATED, - wxPAPER_B5_JIS_ROTATED, - wxPAPER_JAPANESE_POSTCARD_ROTATED, - wxPAPER_DBL_JAPANESE_POSTCARD_ROTATED, - wxPAPER_A6_ROTATED, - wxPAPER_JENV_KAKU2_ROTATED, - wxPAPER_JENV_KAKU3_ROTATED, - wxPAPER_JENV_CHOU3_ROTATED, - wxPAPER_JENV_CHOU4_ROTATED, - wxPAPER_B6_JIS, - wxPAPER_B6_JIS_ROTATED, - wxPAPER_12X11, - wxPAPER_JENV_YOU4, - wxPAPER_JENV_YOU4_ROTATED, - wxPAPER_P16K, - wxPAPER_P32K, - wxPAPER_P32KBIG, - wxPAPER_PENV_1, - wxPAPER_PENV_2, - wxPAPER_PENV_3, - wxPAPER_PENV_4, - wxPAPER_PENV_5, - wxPAPER_PENV_6, - wxPAPER_PENV_7, - wxPAPER_PENV_8, - wxPAPER_PENV_9, - wxPAPER_PENV_10, - wxPAPER_P16K_ROTATED, - wxPAPER_P32K_ROTATED, - wxPAPER_P32KBIG_ROTATED, - wxPAPER_PENV_1_ROTATED, - wxPAPER_PENV_2_ROTATED, - wxPAPER_PENV_3_ROTATED, - wxPAPER_PENV_4_ROTATED, - wxPAPER_PENV_5_ROTATED, - wxPAPER_PENV_6_ROTATED, - wxPAPER_PENV_7_ROTATED, - wxPAPER_PENV_8_ROTATED, - wxPAPER_PENV_9_ROTATED, - wxPAPER_PENV_10_ROTATED -}; -enum wxPrintOrientation -{ - wxPORTRAIT, - wxLANDSCAPE -}; +## def Start(self, millis=None, *args, **kwargs): +## """ +## (Re)start the timer +## """ +## self.hasRun = False +## if millis is not None: +## self.millis = millis +## if args or kwargs: +## self.SetArgs(*args, **kwargs) +## self.Stop() +## self.timer = wx.PyTimer(self.Notify) +## self.timer.Start(self.millis, wx.TIMER_ONE_SHOT) +## self.running = True +## Restart = Start -enum wxDuplexMode -{ - wxDUPLEX_SIMPLEX, - wxDUPLEX_HORIZONTAL, - wxDUPLEX_VERTICAL -}; -enum wxPrintMode -{ - wxPRINT_MODE_NONE, - wxPRINT_MODE_PREVIEW, - wxPRINT_MODE_FILE, - wxPRINT_MODE_PRINTER, - wxPRINT_MODE_STREAM -}; +## def Stop(self): +## """ +## Stop and destroy the timer. +## """ +## if self.timer is not None: +## self.timer.Stop() +## self.timer = None -enum wxUpdateUI -{ - wxUPDATE_UI_NONE, - wxUPDATE_UI_RECURSE, - wxUPDATE_UI_FROMIDLE -}; -typedef int wxCoord; +## def GetInterval(self): +## if self.timer is not None: +## return self.timer.GetInterval() +## else: +## return 0 -typedef float wxFloat32; -typedef double wxFloat64; +## def IsRunning(self): +## return self.timer is not None and self.timer.IsRunning() -typedef double wxDouble; -wxCoord wxDefaultCoord; +## def SetArgs(self, *args, **kwargs): +## """ +## (Re)set the args passed to the callable object. This is +## useful in conjunction with Restart if you want to schedule a +## new call to the same callable object but with different +## parameters. +## """ +## self.args = args +## self.kwargs = kwargs + + +## def HasRun(self): +## return self.hasRun + +## def GetResult(self): +## return self.result + +## def Notify(self): +## """ +## The timer has expired so call the callable. +## """ +## if self.callable and getattr(self.callable, 'im_self', True): +## self.runCount += 1 +## self.running = False +## self.result = self.callable(*self.args, **self.kwargs) +## self.hasRun = True +## if not self.running: +## # if it wasn't restarted, then cleanup +## wx.CallAfter(self.Stop) + +## Interval = property(GetInterval) +## Result = property(GetResult) + +# End of included code block +#-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= + +%End //--------------------------------------------------------------------------- + +%PostInitialisationCode + + wxPyCoreModuleInject(sipModuleDict); + +%End + +//--------------------------------------------------------------------------- + diff --git a/sip/gen/app.sip b/sip/gen/app.sip new file mode 100644 index 00000000..795f5a50 --- /dev/null +++ b/sip/gen/app.sip @@ -0,0 +1,852 @@ +//--------------------------------------------------------------------------- +// This file is generated by wxPython's SIP generator. Do not edit by hand. +// +// Copyright: (c) 2010 by Total Control Software +// License: wxWindows License +// +// This file will be included by _core.sip +// +//--------------------------------------------------------------------------- + +%ModuleHeaderCode + enum wxAppAssertMode{ + wxPYAPP_ASSERT_SUPPRESS = 1, + wxPYAPP_ASSERT_EXCEPTION = 2, + wxPYAPP_ASSERT_DIALOG = 4, + wxPYAPP_ASSERT_LOG = 8 + }; + + class wxPyApp; + wxPyApp* wxGetApp(); + +%End + + + +//--------------------------------------------------------------------------- + +class wxAppConsole : wxEvtHandler +{ + %TypeHeaderCode + #include + %End + + +public: + virtual + ~wxAppConsole(); + + virtual + int MainLoop(); + + virtual + void ExitMainLoop(); + + virtual + int FilterEvent( + wxEvent & event + ); + + wxEventLoopBase * GetMainLoop(); + + virtual + bool UsesEventLoop(); + + virtual + void ProcessPendingEvents(); + + void DeletePendingEvents(); + + bool HasPendingEvents(); + + void SuspendProcessingOfPendingEvents(); + + void ResumeProcessingOfPendingEvents(); + + void ScheduleForDestruction( + wxObject * object + ); + + bool IsScheduledForDestruction( + wxObject * object + ); + + virtual + void OnAssertFailure( + const wxChar * file, + int line, + const wxChar * func, + const wxChar * cond, + const wxChar * msg + ); + + virtual + void OnEventLoopEnter( + wxEventLoopBase * loop + ); + + virtual + void OnEventLoopExit( + wxEventLoopBase * loop + ); + + virtual + bool OnExceptionInMainLoop(); + + virtual + int OnExit(); + + virtual + void OnFatalException(); + + virtual + bool OnInit(); + + virtual + int OnRun(); + + virtual + void OnUnhandledException(); + + wxString GetAppDisplayName(); + + wxString GetAppName(); + + wxString GetClassName(); + + wxAppTraits * GetTraits(); + + const wxString & GetVendorDisplayName(); + + const wxString & GetVendorName(); + + void SetAppDisplayName( + const wxString & name + ); + + void SetAppName( + const wxString & name + ); + + void SetClassName( + const wxString & name + ); + + void SetVendorDisplayName( + const wxString & name + ); + + void SetVendorName( + const wxString & name + ); + + static + void SetInstance( + wxAppConsole * app + ); + + static + wxAppConsole * GetInstance(); + + static + bool IsMainLoopRunning(); + + %Property(name=AppDisplayName, get=GetAppDisplayName, set=SetAppDisplayName) + + %Property(name=AppName, get=GetAppName, set=SetAppName) + + %Property(name=ClassName, get=GetClassName, set=SetClassName) + + %Property(name=VendorDisplayName, get=GetVendorDisplayName, set=SetVendorDisplayName) + + %Property(name=VendorName, get=GetVendorName, set=SetVendorName) + +}; // end of class wxAppConsole + + + enum wxAppAssertMode{ + wxPYAPP_ASSERT_SUPPRESS = 1, + wxPYAPP_ASSERT_EXCEPTION = 2, + wxPYAPP_ASSERT_DIALOG = 4, + wxPYAPP_ASSERT_LOG = 8 + }; + + +class wxPyApp : wxAppConsole +{ + %TypeHeaderCode + #include + %End + + %TypeCode + + #ifdef __WXGTK__ + #include + #include + #endif + + #ifdef __WXMAC__ + #include + #endif + + + class wxPyApp : public wxApp + { + DECLARE_ABSTRACT_CLASS(wxPyApp) + + public: + wxPyApp() : wxApp() { + m_assertMode = wxPYAPP_ASSERT_EXCEPTION; + m_startupComplete = false; + //m_callFilterEvent = false; + ms_appInstance = this; + } + ~wxPyApp() { + ms_appInstance = NULL; + wxApp::SetInstance(NULL); + } + + + #ifndef __WXMAC__ + virtual void MacNewFile() {} + virtual void MacOpenFile(const wxString &) {} + virtual void MacOpenURL(const wxString &) {} + virtual void MacPrintFile(const wxString &) {} + virtual void MacReopenApp() {} + #endif + + #ifdef __WXMAC__ + static long GetMacAboutMenuItemId() { return s_macAboutMenuItemId; } + static long GetMacPreferencesMenuItemId() { return s_macPreferencesMenuItemId; } + static long GetMacExitMenuItemId() { return s_macExitMenuItemId; } + static wxString GetMacHelpMenuTitleName() { return s_macHelpMenuTitleName; } + static void SetMacAboutMenuItemId(long val) { s_macAboutMenuItemId = val; } + static void SetMacPreferencesMenuItemId(long val) { s_macPreferencesMenuItemId = val; } + static void SetMacExitMenuItemId(long val) { s_macExitMenuItemId = val; } + static void SetMacHelpMenuTitleName(const wxString& val) { s_macHelpMenuTitleName = val; } + #else + static long GetMacAboutMenuItemId() { return 0; } + static long GetMacPreferencesMenuItemId() { return 0; } + static long GetMacExitMenuItemId() { return 0; } + static wxString GetMacHelpMenuTitleName() { return wxEmptyString; } + static void SetMacAboutMenuItemId(long) { } + static void SetMacPreferencesMenuItemId(long) { } + static void SetMacExitMenuItemId(long) { } + static void SetMacHelpMenuTitleName(const wxString&) { } + #endif + + wxAppAssertMode GetAssertMode() { return m_assertMode; } + void SetAssertMode(wxAppAssertMode mode) { m_assertMode = mode; } + + // virtual void OnAssertFailure(const wxChar *file, + // int line, + // const wxChar *func, + // const wxChar *cond, + // const wxChar *msg); + + + // Implementing OnInit is optional for wxPython apps + virtual bool OnInit() { return true; } + virtual void OnPreInit() { } + + void _BootstrapApp(); + + static bool IsDisplayAvailable(); + + // implementation only + void SetStartupComplete(bool val) { m_startupComplete = val; } + static wxPyApp* ms_appInstance; + + private: + wxAppAssertMode m_assertMode; + bool m_startupComplete; + //bool m_callFilterEvent; + }; + + IMPLEMENT_ABSTRACT_CLASS(wxPyApp, wxApp); + + wxPyApp* wxPyApp::ms_appInstance = NULL; + + + + void wxPyApp::_BootstrapApp() + { + static bool haveInitialized = false; + bool result; + wxPyBlock_t blocked; + PyObject* retval = NULL; + PyObject* pyint = NULL; + + // Only initialize wxWidgets once + if (! haveInitialized) { + // Get any command-line args passed to this program from the sys module + int argc = 0; + char** argv = NULL; + blocked = wxPyBeginBlockThreads(); + + PyObject* sysargv = PySys_GetObject("argv"); + PyObject* executable = PySys_GetObject("executable"); + + if (sysargv != NULL && executable != NULL) { + argc = PyList_Size(sysargv) + 1; + argv = new char*[argc+1]; + argv[0] = strdup(PyString_AsString(executable)); + int x; + for(x=1; xargc = 0; + } + + // It's now ok to generate exceptions for assertion errors. + SetStartupComplete(true); + + // Call the Python wxApp's OnPreInit and OnInit functions if they exist + OnPreInit(); + result = OnInit(); + + blocked = wxPyBeginBlockThreads(); + if (! result) { + PyErr_SetString(PyExc_SystemExit, "OnInit returned false, exiting..."); + } + error: + wxPyEndBlockThreads(blocked); + } + + + + // Function to test if the Display (or whatever is the platform equivallent) + // can be connected to. This is accessable from wxPython as a staticmethod of + // wx.App called IsDisplayAvailable(). + bool wxPyApp::IsDisplayAvailable() + { + #ifdef __WXGTK__ + Display* display; + display = XOpenDisplay(NULL); + if (display == NULL) + return false; + XCloseDisplay(display); + return true; + #endif + + #ifdef __WXMAC__ + // This is adapted from Python's Mac/Modules/MacOS.c in the + // MacOS_WMAvailable function. + bool rv; + ProcessSerialNumber psn; + + /* + ** This is a fairly innocuous call to make if we don't have a window + ** manager, or if we have no permission to talk to it. It will print + ** a message on stderr, but at least it won't abort the process. + ** It appears the function caches the result itself, and it's cheap, so + ** no need for us to cache. + */ + #ifdef kCGNullDirectDisplay + /* On 10.1 CGMainDisplayID() isn't available, and + ** kCGNullDirectDisplay isn't defined. + */ + if (CGMainDisplayID() == 0) { + rv = false; + } else + #endif + { + // Also foreground the application on the first call as a side-effect. + if (GetCurrentProcess(&psn) < 0 || SetFrontProcess(&psn) < 0) { + rv = false; + } else { + rv = true; + } + } + return rv; + #endif + + #ifdef __WXMSW__ + // TODO... + return true; + #endif + } + + + + wxPyApp* wxGetApp() + { + return wxPyApp::ms_appInstance; + } + %End + +public: + wxPyApp(); + + virtual + ~wxPyApp(); + + virtual + void MacNewFile(); + + virtual + void MacOpenFile( + const wxString & fileName + ); + + virtual + void MacOpenURL( + const wxString & url + ); + + virtual + void MacPrintFile( + const wxString & fileName + ); + + virtual + void MacReopenApp(); + + static + long GetMacAboutMenuItemId(); + + static + long GetMacPreferencesMenuItemId(); + + static + long GetMacExitMenuItemId(); + + static + wxString GetMacHelpMenuTitleName(); + + static + void SetMacAboutMenuItemId( + long val + ); + + static + void SetMacPreferencesMenuItemId( + long val + ); + + static + void SetMacExitMenuItemId( + long val + ); + + static + void SetMacHelpMenuTitleName( + const wxString & val + ); + + virtual + wxVideoMode GetDisplayMode(); + + bool GetExitOnFrameDelete(); + + virtual + wxLayoutDirection GetLayoutDirection(); + + bool GetUseBestVisual(); + + virtual + wxWindow * GetTopWindow(); + + virtual + bool IsActive(); + + virtual + bool SafeYield( + wxWindow * win, + bool onlyIfNeeded + ); + + virtual + bool SafeYieldFor( + wxWindow * win, + long eventsToProcess + ); + + virtual + bool SendIdleEvents( + wxWindow * win, + wxIdleEvent & event + ); + + virtual + bool SetDisplayMode( + const wxVideoMode & info + ); + + void SetExitOnFrameDelete( + bool flag + ); + + virtual + bool SetNativeTheme( + const wxString & theme + ); + + void SetTopWindow( + wxWindow * window + ); + + void SetUseBestVisual( + bool flag, + bool forceTrueColour = false + ); + + %Property(name=DisplayMode, get=GetDisplayMode, set=SetDisplayMode) + + %Property(name=ExitOnFrameDelete, get=GetExitOnFrameDelete, set=SetExitOnFrameDelete) + + %Property(name=LayoutDirection, get=GetLayoutDirection) + + %Property(name=UseBestVisual, get=GetUseBestVisual, set=SetUseBestVisual) + + %Property(name=TopWindow, get=GetTopWindow, set=SetTopWindow) + + void MacHideApp(); + %MethodCode + #ifdef __WXMAC__ + sipCpp->MacHideApp(); + #endif + %End + + wxAppAssertMode GetAssertMode(); + void SetAssertMode(wxAppAssertMode mode); + void _BootstrapApp(); + virtual void OnPreInit(); + virtual bool OnInit(); + static bool IsDisplayAvailable(); + + +}; // end of class wxPyApp + + + wxPyApp* wxGetApp(); + + +bool wxHandleFatalExceptions( + bool doIt = true +); + +void wxWakeUpIdle(); + +bool wxYield(); + +bool wxSafeYield( + wxWindow * win = NULL, + bool onlyIfNeeded = false +); + +void wxExit(); + +%Extract(id=pycode) +#-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= +# This code block was included from src/app_ex.py + +class PyOnDemandOutputWindow: + """ + A class that can be used for redirecting Python's stdout and + stderr streams. It will do nothing until something is wrriten to + the stream at which point it will create a Frame with a text area + and write the text there. + """ + def __init__(self, title="wxPython: stdout/stderr"): + self.frame = None + self.title = title + self.pos = wx.DefaultPosition + self.size = (450, 300) + self.parent = None + + def SetParent(self, parent): + """Set the window to be used as the popup Frame's parent.""" + self.parent = parent + + + def CreateOutputWindow(self, st): + self.frame = wx.Frame(self.parent, -1, self.title, self.pos, self.size, + style=wx.DEFAULT_FRAME_STYLE) + self.text = wx.TextCtrl(self.frame, -1, "", + style=wx.TE_MULTILINE|wx.TE_READONLY) + self.text.AppendText(st) + self.frame.Show(True) + self.frame.Bind(wx.EVT_CLOSE, self.OnCloseWindow) + + + def OnCloseWindow(self, event): + if self.frame is not None: + self.frame.Destroy() + self.frame = None + self.text = None + self.parent = None + + + # These methods provide the file-like output behaviour. + def write(self, text): + """ + Create the output window if needed and write the string to it. + If not called in the context of the gui thread then uses + CallAfter to do the work there. + """ + if self.frame is None: + if not wx.Thread.IsMain(): + wx.CallAfter(self.CreateOutputWindow, text) + else: + self.CreateOutputWindow(text) + else: + if not wx.Thread.IsMain(): + wx.CallAfter(self.text.AppendText, text) + else: + self.text.AppendText(text) + + + def close(self): + if self.frame is not None: + wx.CallAfter(self.frame.Close) + + + def flush(self): + pass + + + +#---------------------------------------------------------------------- + +class App(wx.PyApp): + """ + The ``wx.App`` class represents the application and is used to: + + * bootstrap the wxPython system and initialize the underlying + gui toolkit + * set and get application-wide properties + * implement the native windowing system main message or event loop, + and to dispatch events to window instances + * etc. + + Every wx application must have a single ``wx.App`` instance, and all + creation of UI objects should be delayed until after the ``wx.App`` object + has been created in order to ensure that the gui platform and wxWidgets + have been fully initialized. + + Normally you would derive from this class and implement an ``OnInit`` + method that creates a frame and then calls ``self.SetTopWindow(frame)``, + however ``wx.App`` is also usable on it's own without derivation. + """ + + outputWindowClass = PyOnDemandOutputWindow + + def __init__(self, + redirect=False, + filename=None, + useBestVisual=False, + clearSigInt=True): + """ + Construct a ``wx.App`` object. + + :param redirect: Should ``sys.stdout`` and ``sys.stderr`` be + redirected? Defaults to False. If ``filename`` is None + then output will be redirected to a window that pops up + as needed. (You can control what kind of window is created + for the output by resetting the class variable + ``outputWindowClass`` to a class of your choosing.) + + :param filename: The name of a file to redirect output to, if + redirect is True. + + :param useBestVisual: Should the app try to use the best + available visual provided by the system (only relevant on + systems that have more than one visual.) This parameter + must be used instead of calling `SetUseBestVisual` later + on because it must be set before the underlying GUI + toolkit is initialized. + + :param clearSigInt: Should SIGINT be cleared? This allows the + app to terminate upon a Ctrl-C in the console like other + GUI apps will. + + :note: You should override OnInit to do applicaition + initialization to ensure that the system, toolkit and + wxWidgets are fully initialized. + """ + + wx.PyApp.__init__(self) + + # make sure we can create a GUI + if not self.IsDisplayAvailable(): + + if wx.Port == "__WXMAC__": + msg = """This program needs access to the screen. +Please run with a Framework build of python, and only when you are +logged in on the main display of your Mac.""" + + elif wx.Port == "__WXGTK__": + msg ="Unable to access the X Display, is $DISPLAY set properly?" + + else: + msg = "Unable to create GUI" + # TODO: more description is needed for wxMSW... + + raise SystemExit(msg) + + # This has to be done before OnInit + self.SetUseBestVisual(useBestVisual) + + # Set the default handler for SIGINT. This fixes a problem + # where if Ctrl-C is pressed in the console that started this + # app then it will not appear to do anything, (not even send + # KeyboardInterrupt???) but will later segfault on exit. By + # setting the default handler then the app will exit, as + # expected (depending on platform.) + if clearSigInt: + try: + import signal + signal.signal(signal.SIGINT, signal.SIG_DFL) + except: + pass + + # Save and redirect the stdio to a window? + self.stdioWin = None + self.saveStdio = (_sys.stdout, _sys.stderr) + if redirect: + self.RedirectStdio(filename) + +## # Use Python's install prefix as the default +## wx.StandardPaths.Get().SetInstallPrefix(_sys.prefix) + +## # Until the new native control for wxMac is up to par, still use the generic one. +## wx.SystemOptions.SetOptionInt("mac.listctrl.always_use_generic", 1) + + # This finishes the initialization of wxWindows and then calls + # the OnInit that should be present in the derived class + self._BootstrapApp() + + + def OnPreInit(self): + """ + Things that must be done after _BootstrapApp has done its + thing, but would be nice if they were already done by the time + that OnInit is called. + """ + print 'OnPreInit' +## wx.StockGDI._initStockObjects() + + + def __del__(self): + self.RestoreStdio() # Just in case the MainLoop was overridden + + def Destroy(self): +## self.this.own(False) + wx.PyApp.Destroy(self) + + def SetTopWindow(self, frame): + """Set the \"main\" top level window""" + if self.stdioWin: + self.stdioWin.SetParent(frame) + wx.PyApp.SetTopWindow(self, frame) + + + def MainLoop(self): + """Execute the main GUI event loop""" + wx.PyApp.MainLoop(self) + self.RestoreStdio() + + + def RedirectStdio(self, filename=None): + """Redirect sys.stdout and sys.stderr to a file or a popup window.""" + if filename: + _sys.stdout = _sys.stderr = open(filename, 'a') + else: + self.stdioWin = self.outputWindowClass() + _sys.stdout = _sys.stderr = self.stdioWin + + + def RestoreStdio(self): + try: + _sys.stdout, _sys.stderr = self.saveStdio + except: + pass + + + def SetOutputWindowAttributes(self, title=None, pos=None, size=None): + """ + Set the title, position and/or size of the output window if + the stdio has been redirected. This should be called before + any output would cause the output window to be created. + """ + if self.stdioWin: + if title is not None: + self.stdioWin.title = title + if pos is not None: + self.stdioWin.pos = pos + if size is not None: + self.stdioWin.size = size + +## #---------------------------------------------------------------------------- + +## # TODO: Move this someplace else? +## def deprecated(func): +## def new_func(*args, **kwargs): +## import warnings +## warnings.warn("Call to deprecated function %s." % func.__name__, +## category=DeprecationWarning) +## return func(*args, **kwargs) +## new_func.__name__ = func.__name__ +## new_func.__doc__ = func.__doc__ +## new_func.__dict__.update(func.__dict__) +## return new_func + + +## @deprecated +## class PySimpleApp(App): +## """ +## This class is deprecated. Please use wx.App isntead. +## """ +## def __init__(self, *args, **kw): +## App.__init__(self, *args, **kw) + + +## #---------------------------------------------------------------------------- +## # DO NOT hold any other references to this object. This is how we +## # know when to cleanup system resources that wxWidgets is holding. When +## # the sys module is unloaded, the refcount on sys.__wxPythonCleanup +## # goes to zero and it calls the wx.App_CleanUp function. + +## #class __wxPyCleanup: +## #def __init__(self): +## #self.cleanup = _core_.App_CleanUp +## #def __del__(self): +## #self.cleanup() + +## #_sys.__wxPythonCleanup = __wxPyCleanup() + +# End of included code block +#-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= + +%End + + +//--------------------------------------------------------------------------- + diff --git a/sip/gen/apptrait.sip b/sip/gen/apptrait.sip new file mode 100644 index 00000000..0dda8070 --- /dev/null +++ b/sip/gen/apptrait.sip @@ -0,0 +1,47 @@ +//--------------------------------------------------------------------------- +// This file is generated by wxPython's SIP generator. Do not edit by hand. +// +// Copyright: (c) 2010 by Total Control Software +// License: wxWindows License +// +// This file will be included by _core.sip +// +//--------------------------------------------------------------------------- + + +//--------------------------------------------------------------------------- + +class wxAppTraits /Abstract/ +{ + %TypeHeaderCode + #include + %End + + +public: + virtual + wxString GetDesktopEnvironment() = 0; + + virtual + wxPortId GetToolkitVersion( + int * major = NULL, + int * minor = NULL + ) = 0; + + virtual + bool HasStderr() = 0; + + virtual + bool IsUsingUniversalWidgets() = 0; + + virtual + bool ShowAssertDialog( + const wxString & msg + ) = 0; + +}; // end of class wxAppTraits + + + +//--------------------------------------------------------------------------- + diff --git a/sip/gen/colour.sip b/sip/gen/colour.sip new file mode 100644 index 00000000..124bf08d --- /dev/null +++ b/sip/gen/colour.sip @@ -0,0 +1,383 @@ +//--------------------------------------------------------------------------- +// This file is generated by wxPython's SIP generator. Do not edit by hand. +// +// Copyright: (c) 2010 by Total Control Software +// License: wxWindows License +// +// This file will be included by _core.sip +// +//--------------------------------------------------------------------------- + +%ModuleCode + #ifdef __WXMAC__ + #include + #endif + + #undef wxTransparentColour + wxColour wxTransparentColour(0, 0, 0, wxALPHA_TRANSPARENT); + + wxColour testColourTypeMap(const wxColour& c) + { + return c; + } + extern void wxInitializeStockLists(); + +%End + +//--------------------------------------------------------------------------- + +class wxColour : wxObject /AllowNone/ +{ + %TypeHeaderCode + #include + %End + + +public: + wxColour(); + + wxColour( + unsigned char red /PyInt/, + unsigned char green /PyInt/, + unsigned char blue /PyInt/, + unsigned char alpha /PyInt/ = wxALPHA_OPAQUE + ); + + wxColour( + unsigned long colRGB + ); + + wxColour( + const wxColour & colour + ); + + void SetRGB( + wxUint32 colRGB + ); + + void SetRGBA( + wxUint32 colRGBA + ); + + wxUint32 GetRGB(); + + wxUint32 GetRGBA(); + + void Set( + unsigned char red /PyInt/, + unsigned char green /PyInt/, + unsigned char blue /PyInt/, + unsigned char alpha /PyInt/ = wxALPHA_OPAQUE + ); + + void Set( + unsigned long RGB + ); + + bool Set( + const wxString & str + ); + + unsigned char Alpha() /PyInt/; + + unsigned char Blue() /PyInt/; + + wxString GetAsString( + long flags = wxC2S_NAME|wxC2S_CSS_SYNTAX + ); + + unsigned char Green() /PyInt/; + + bool IsOk(); + + unsigned char Red() /PyInt/; + + bool operator!=( + const wxColour & colour + ); + + bool operator==( + const wxColour & colour + ); + + wxColour ChangeLightness( + int ialpha + ); + + static + void ChangeLightness( + unsigned char * r /In, Out/, + unsigned char * g /In, Out/, + unsigned char * b /In, Out/, + int ialpha + ); + + static + void MakeMono( + unsigned char * r /Out/, + unsigned char * g /Out/, + unsigned char * b /Out/, + bool on + ); + + static + void MakeDisabled( + unsigned char * r /In, Out/, + unsigned char * g /In, Out/, + unsigned char * b /In, Out/, + unsigned char brightness /PyInt/ = 255 + ); + + static + void MakeGrey( + unsigned char * r /In, Out/, + unsigned char * g /In, Out/, + unsigned char * b /In, Out/ + ); + + static + void MakeGrey( + unsigned char * r /In, Out/, + unsigned char * g /In, Out/, + unsigned char * b /In, Out/, + double weight_r, + double weight_g, + double weight_b + ); + + static + unsigned char AlphaBlend( + unsigned char fg /PyInt/, + unsigned char bg /PyInt/, + double alpha + ) /PyInt/; + + %Property(name=Pixel, get=GetPixel) + + %Property(name=RGB, get=GetRGB, set=SetRGB) + + %Property(name=RGBA, get=GetRGBA, set=SetRGBA) + + %Property(name=red, get=Red) + + %Property(name=green, get=Green) + + %Property(name=blue, get=Blue) + + %Property(name=alpha, get=Alpha) + + wxIntPtr GetPixel(); + %MethodCode + sipRes = (wxIntPtr)sipCpp->GetPixel(); + %End + + SIP_PYOBJECT Get(bool includeAlpha=true); + %MethodCode + int red = -1; + int green = -1; + int blue = -1; + int alpha = wxALPHA_OPAQUE; + if (sipCpp->IsOk()) { + red = sipCpp->Red(); + green = sipCpp->Green(); + blue = sipCpp->Blue(); + alpha = sipCpp->Alpha(); + } + if (includeAlpha) + sipRes = sipBuildResult(&sipIsErr, "(iiii)", red, green, blue, alpha); + else + sipRes = sipBuildResult(&sipIsErr, "(iii)", red, green, blue); + %End + + %ConvertToTypeCode + // is it just a typecheck? + if (!sipIsErr) { + if (sipPy == Py_None) + return 1; + if (sipCanConvertToType(sipPy, sipType_wxColour, SIP_NO_CONVERTORS)) + return 1; + if (PyString_Check(sipPy) || PyUnicode_Check(sipPy)) + return 1; + if (PySequence_Check(sipPy)) { + size_t len = PySequence_Size(sipPy); + if (len != 3 && len != 4) + return 0; + // ensure all the items in the sequence are numbers + for (int idx=0; idx(sipConvertToType( + sipPy, sipType_wxColour, sipTransferObj, SIP_NO_CONVERTORS, 0, sipIsErr)); + return sipGetState(sipTransferObj); + %End +}; // end of class wxColour + + +%Extract pycode +def _Colour___str__(self): + return str(self.Get()) +Colour.__str__ = _Colour___str__ +del _Colour___str__ + +%End + +%Extract pycode +def _Colour___repr__(self): + return "wx.Colour"+str(self.Get()) +Colour.__repr__ = _Colour___repr__ +del _Colour___repr__ + +%End + +%Extract pycode +def _Colour___len__(self): + return len(self.Get()) +Colour.__len__ = _Colour___len__ +del _Colour___len__ + +%End + +%Extract pycode +def _Colour___nonzero__(self): + return self.IsOk() +Colour.__nonzero__ = _Colour___nonzero__ +del _Colour___nonzero__ + +%End + +%Extract pycode +def _Colour___reduce__(self): + return (Colour, self.Get()) +Colour.__reduce__ = _Colour___reduce__ +del _Colour___reduce__ + +%End + +%Extract pycode +def _Colour___getitem__(self, idx): + return self.Get()[idx] +Colour.__getitem__ = _Colour___getitem__ +del _Colour___getitem__ + +%End + +%Extract pycode +def _Colour___setitem__(self, idx, val): + if idx == 0: self.red = val + elif idx == 1: self.green = val + elif idx == 2: self.blue = val + elif idx == 3: self.alpha = val + else: raise IndexError +Colour.__setitem__ = _Colour___setitem__ +del _Colour___setitem__ + +%End + +%Extract pycode +Rect.__safe_for_unpickling__ = True + +%End + +enum +{ + wxC2S_NAME, + wxC2S_CSS_SYNTAX, + wxC2S_HTML_SYNTAX +}; + +wxColour wxNullColour; + +wxColour wxTransparentColour; + +const int wxALPHA_TRANSPARENT; + +const int wxALPHA_OPAQUE; + +wxColour MacThemeColour(int themeBrushID) /Factory/; +%MethodCode + #ifdef __WXMAC__ + sipRes = new wxColour(wxMacCreateCGColorFromHITheme(themeBrushID)); + #else + wxPyRaiseNotImplemented(); + sipIsErr = 1; + sipRes = NULL; + #endif +%End + + wxColour testColourTypeMap(const wxColour& c); + void wxInitializeStockLists(); + + + +//--------------------------------------------------------------------------- + diff --git a/sip/gen/defs.sip b/sip/gen/defs.sip new file mode 100644 index 00000000..4ef539e4 --- /dev/null +++ b/sip/gen/defs.sip @@ -0,0 +1,658 @@ +//--------------------------------------------------------------------------- +// This file is generated by wxPython's SIP generator. Do not edit by hand. +// +// Copyright: (c) 2010 by Total Control Software +// License: wxWindows License +// +// This file will be included by _core.sip +// +//--------------------------------------------------------------------------- + +%ModuleCode + + #include + const int MAJOR_VERSION = wxMAJOR_VERSION; + const int MINOR_VERSION = wxMINOR_VERSION; + const int RELEASE_NUMBER = wxRELEASE_NUMBER; + const int SUBRELEASE_NUMBER = wxSUBRELEASE_NUMBER; + +%End + +//--------------------------------------------------------------------------- + +class wxCursor; // forward declaration + + +class wxMenu; // forward declaration + + +class wxDC; // forward declaration + + +class wxWindow; // forward declaration + + +typedef signed char wxInt8; + +typedef unsigned char wxUint8; + +typedef wxUint8 wxByte; + +typedef short wxInt16; + +typedef unsigned short wxUint16; + +typedef wxUint16 wxWord; + +typedef wxUint16 wxChar16; + +typedef int wxInt32; + +typedef unsigned int wxUint32; + +typedef wxUint32 wxDword; + +typedef wxUint32 wxChar32; + +typedef long long wxInt64; + +typedef unsigned long long wxUint64; + +typedef long wxIntPtr; + +typedef unsigned long wxUIntPtr; + +typedef wchar_t wxChar; + +typedef wchar_t wxUChar; + +enum wxGeometryCentre +{ + wxCENTRE, + wxCENTER +}; + +enum wxOrientation +{ + wxHORIZONTAL, + wxVERTICAL, + wxBOTH, + wxORIENTATION_MASK +}; + +enum wxDirection +{ + wxLEFT, + wxRIGHT, + wxUP, + wxDOWN, + wxTOP, + wxBOTTOM, + wxNORTH, + wxSOUTH, + wxWEST, + wxEAST, + wxALL, + wxDIRECTION_MASK +}; + +enum wxAlignment +{ + wxALIGN_INVALID, + wxALIGN_NOT, + wxALIGN_CENTER_HORIZONTAL, + wxALIGN_CENTRE_HORIZONTAL, + wxALIGN_LEFT, + wxALIGN_TOP, + wxALIGN_RIGHT, + wxALIGN_BOTTOM, + wxALIGN_CENTER_VERTICAL, + wxALIGN_CENTRE_VERTICAL, + wxALIGN_CENTER, + wxALIGN_CENTRE, + wxALIGN_MASK +}; + +enum wxSizerFlagBits +{ + wxFIXED_MINSIZE, + wxRESERVE_SPACE_EVEN_IF_HIDDEN, + wxSIZER_FLAG_BITS_MASK +}; + +enum wxStretch +{ + wxSTRETCH_NOT, + wxSHRINK, + wxGROW, + wxEXPAND, + wxSHAPED, + wxTILE, + wxSTRETCH_MASK +}; + +enum wxBorder +{ + wxBORDER_DEFAULT, + wxBORDER_NONE, + wxBORDER_STATIC, + wxBORDER_SIMPLE, + wxBORDER_RAISED, + wxBORDER_SUNKEN, + wxBORDER_DOUBLE, + wxBORDER_THEME, + wxBORDER_MASK +}; + +enum wxBackgroundStyle +{ + wxBG_STYLE_ERASE, + wxBG_STYLE_SYSTEM, + wxBG_STYLE_PAINT +}; + +enum wxStandardID +{ + wxID_AUTO_LOWEST, + wxID_AUTO_HIGHEST, + wxID_NONE, + wxID_SEPARATOR, + wxID_ANY, + wxID_LOWEST, + wxID_OPEN, + wxID_CLOSE, + wxID_NEW, + wxID_SAVE, + wxID_SAVEAS, + wxID_REVERT, + wxID_EXIT, + wxID_UNDO, + wxID_REDO, + wxID_HELP, + wxID_PRINT, + wxID_PRINT_SETUP, + wxID_PAGE_SETUP, + wxID_PREVIEW, + wxID_ABOUT, + wxID_HELP_CONTENTS, + wxID_HELP_INDEX, + wxID_HELP_SEARCH, + wxID_HELP_COMMANDS, + wxID_HELP_PROCEDURES, + wxID_HELP_CONTEXT, + wxID_CLOSE_ALL, + wxID_PREFERENCES, + wxID_EDIT, + wxID_CUT, + wxID_COPY, + wxID_PASTE, + wxID_CLEAR, + wxID_FIND, + wxID_DUPLICATE, + wxID_SELECTALL, + wxID_DELETE, + wxID_REPLACE, + wxID_REPLACE_ALL, + wxID_PROPERTIES, + wxID_VIEW_DETAILS, + wxID_VIEW_LARGEICONS, + wxID_VIEW_SMALLICONS, + wxID_VIEW_LIST, + wxID_VIEW_SORTDATE, + wxID_VIEW_SORTNAME, + wxID_VIEW_SORTSIZE, + wxID_VIEW_SORTTYPE, + wxID_FILE, + wxID_FILE1, + wxID_FILE2, + wxID_FILE3, + wxID_FILE4, + wxID_FILE5, + wxID_FILE6, + wxID_FILE7, + wxID_FILE8, + wxID_FILE9, + wxID_OK, + wxID_CANCEL, + wxID_APPLY, + wxID_YES, + wxID_NO, + wxID_STATIC, + wxID_FORWARD, + wxID_BACKWARD, + wxID_DEFAULT, + wxID_MORE, + wxID_SETUP, + wxID_RESET, + wxID_CONTEXT_HELP, + wxID_YESTOALL, + wxID_NOTOALL, + wxID_ABORT, + wxID_RETRY, + wxID_IGNORE, + wxID_ADD, + wxID_REMOVE, + wxID_UP, + wxID_DOWN, + wxID_HOME, + wxID_REFRESH, + wxID_STOP, + wxID_INDEX, + wxID_BOLD, + wxID_ITALIC, + wxID_JUSTIFY_CENTER, + wxID_JUSTIFY_FILL, + wxID_JUSTIFY_RIGHT, + wxID_JUSTIFY_LEFT, + wxID_UNDERLINE, + wxID_INDENT, + wxID_UNINDENT, + wxID_ZOOM_100, + wxID_ZOOM_FIT, + wxID_ZOOM_IN, + wxID_ZOOM_OUT, + wxID_UNDELETE, + wxID_REVERT_TO_SAVED, + wxID_CDROM, + wxID_CONVERT, + wxID_EXECUTE, + wxID_FLOPPY, + wxID_HARDDISK, + wxID_BOTTOM, + wxID_FIRST, + wxID_LAST, + wxID_TOP, + wxID_INFO, + wxID_JUMP_TO, + wxID_NETWORK, + wxID_SELECT_COLOR, + wxID_SELECT_FONT, + wxID_SORT_ASCENDING, + wxID_SORT_DESCENDING, + wxID_SPELL_CHECK, + wxID_STRIKETHROUGH, + wxID_SYSTEM_MENU, + wxID_CLOSE_FRAME, + wxID_MOVE_FRAME, + wxID_RESIZE_FRAME, + wxID_MAXIMIZE_FRAME, + wxID_ICONIZE_FRAME, + wxID_RESTORE_FRAME, + wxID_MDI_WINDOW_FIRST, + wxID_MDI_WINDOW_CASCADE, + wxID_MDI_WINDOW_TILE_HORZ, + wxID_MDI_WINDOW_TILE_VERT, + wxID_MDI_WINDOW_ARRANGE_ICONS, + wxID_MDI_WINDOW_PREV, + wxID_MDI_WINDOW_NEXT, + wxID_MDI_WINDOW_LAST, + wxID_FILEDLGG, + wxID_FILECTRL, + wxID_HIGHEST +}; + +enum wxItemKind +{ + wxITEM_SEPARATOR, + wxITEM_NORMAL, + wxITEM_CHECK, + wxITEM_RADIO, + wxITEM_DROPDOWN, + wxITEM_MAX +}; + +enum wxHitTest +{ + wxHT_NOWHERE, + wxHT_SCROLLBAR_FIRST, + wxHT_SCROLLBAR_ARROW_LINE_1, + wxHT_SCROLLBAR_ARROW_LINE_2, + wxHT_SCROLLBAR_ARROW_PAGE_1, + wxHT_SCROLLBAR_ARROW_PAGE_2, + wxHT_SCROLLBAR_THUMB, + wxHT_SCROLLBAR_BAR_1, + wxHT_SCROLLBAR_BAR_2, + wxHT_SCROLLBAR_LAST, + wxHT_WINDOW_OUTSIDE, + wxHT_WINDOW_INSIDE, + wxHT_WINDOW_VERT_SCROLLBAR, + wxHT_WINDOW_HORZ_SCROLLBAR, + wxHT_WINDOW_CORNER, + wxHT_MAX +}; + +enum wxDataFormatId +{ + wxDF_INVALID, + wxDF_TEXT, + wxDF_BITMAP, + wxDF_METAFILE, + wxDF_SYLK, + wxDF_DIF, + wxDF_TIFF, + wxDF_OEMTEXT, + wxDF_DIB, + wxDF_PALETTE, + wxDF_PENDATA, + wxDF_RIFF, + wxDF_WAVE, + wxDF_UNICODETEXT, + wxDF_ENHMETAFILE, + wxDF_FILENAME, + wxDF_LOCALE, + wxDF_PRIVATE, + wxDF_HTML, + wxDF_MAX +}; + +enum wxKeyCode +{ + WXK_NONE, + WXK_BACK, + WXK_TAB, + WXK_RETURN, + WXK_ESCAPE, + WXK_SPACE, + WXK_DELETE, + WXK_START, + WXK_LBUTTON, + WXK_RBUTTON, + WXK_CANCEL, + WXK_MBUTTON, + WXK_CLEAR, + WXK_SHIFT, + WXK_ALT, + WXK_CONTROL, + WXK_MENU, + WXK_PAUSE, + WXK_CAPITAL, + WXK_END, + WXK_HOME, + WXK_LEFT, + WXK_UP, + WXK_RIGHT, + WXK_DOWN, + WXK_SELECT, + WXK_PRINT, + WXK_EXECUTE, + WXK_SNAPSHOT, + WXK_INSERT, + WXK_HELP, + WXK_NUMPAD0, + WXK_NUMPAD1, + WXK_NUMPAD2, + WXK_NUMPAD3, + WXK_NUMPAD4, + WXK_NUMPAD5, + WXK_NUMPAD6, + WXK_NUMPAD7, + WXK_NUMPAD8, + WXK_NUMPAD9, + WXK_MULTIPLY, + WXK_ADD, + WXK_SEPARATOR, + WXK_SUBTRACT, + WXK_DECIMAL, + WXK_DIVIDE, + WXK_F1, + WXK_F2, + WXK_F3, + WXK_F4, + WXK_F5, + WXK_F6, + WXK_F7, + WXK_F8, + WXK_F9, + WXK_F10, + WXK_F11, + WXK_F12, + WXK_F13, + WXK_F14, + WXK_F15, + WXK_F16, + WXK_F17, + WXK_F18, + WXK_F19, + WXK_F20, + WXK_F21, + WXK_F22, + WXK_F23, + WXK_F24, + WXK_NUMLOCK, + WXK_SCROLL, + WXK_PAGEUP, + WXK_PAGEDOWN, + WXK_NUMPAD_SPACE, + WXK_NUMPAD_TAB, + WXK_NUMPAD_ENTER, + WXK_NUMPAD_F1, + WXK_NUMPAD_F2, + WXK_NUMPAD_F3, + WXK_NUMPAD_F4, + WXK_NUMPAD_HOME, + WXK_NUMPAD_LEFT, + WXK_NUMPAD_UP, + WXK_NUMPAD_RIGHT, + WXK_NUMPAD_DOWN, + WXK_NUMPAD_PAGEUP, + WXK_NUMPAD_PAGEDOWN, + WXK_NUMPAD_END, + WXK_NUMPAD_BEGIN, + WXK_NUMPAD_INSERT, + WXK_NUMPAD_DELETE, + WXK_NUMPAD_EQUAL, + WXK_NUMPAD_MULTIPLY, + WXK_NUMPAD_ADD, + WXK_NUMPAD_SEPARATOR, + WXK_NUMPAD_SUBTRACT, + WXK_NUMPAD_DECIMAL, + WXK_NUMPAD_DIVIDE, + WXK_WINDOWS_LEFT, + WXK_WINDOWS_RIGHT, + WXK_WINDOWS_MENU, + WXK_COMMAND, + WXK_SPECIAL1, + WXK_SPECIAL2, + WXK_SPECIAL3, + WXK_SPECIAL4, + WXK_SPECIAL5, + WXK_SPECIAL6, + WXK_SPECIAL7, + WXK_SPECIAL8, + WXK_SPECIAL9, + WXK_SPECIAL10, + WXK_SPECIAL11, + WXK_SPECIAL12, + WXK_SPECIAL13, + WXK_SPECIAL14, + WXK_SPECIAL15, + WXK_SPECIAL16, + WXK_SPECIAL17, + WXK_SPECIAL18, + WXK_SPECIAL19, + WXK_SPECIAL20 +}; + +enum wxKeyModifier +{ + wxMOD_NONE, + wxMOD_ALT, + wxMOD_CONTROL, + wxMOD_ALTGR, + wxMOD_SHIFT, + wxMOD_META, + wxMOD_WIN, + wxMOD_CMD, + wxMOD_ALL +}; + +enum wxPaperSize +{ + wxPAPER_NONE, + wxPAPER_LETTER, + wxPAPER_LEGAL, + wxPAPER_A4, + wxPAPER_CSHEET, + wxPAPER_DSHEET, + wxPAPER_ESHEET, + wxPAPER_LETTERSMALL, + wxPAPER_TABLOID, + wxPAPER_LEDGER, + wxPAPER_STATEMENT, + wxPAPER_EXECUTIVE, + wxPAPER_A3, + wxPAPER_A4SMALL, + wxPAPER_A5, + wxPAPER_B4, + wxPAPER_B5, + wxPAPER_FOLIO, + wxPAPER_QUARTO, + wxPAPER_10X14, + wxPAPER_11X17, + wxPAPER_NOTE, + wxPAPER_ENV_9, + wxPAPER_ENV_10, + wxPAPER_ENV_11, + wxPAPER_ENV_12, + wxPAPER_ENV_14, + wxPAPER_ENV_DL, + wxPAPER_ENV_C5, + wxPAPER_ENV_C3, + wxPAPER_ENV_C4, + wxPAPER_ENV_C6, + wxPAPER_ENV_C65, + wxPAPER_ENV_B4, + wxPAPER_ENV_B5, + wxPAPER_ENV_B6, + wxPAPER_ENV_ITALY, + wxPAPER_ENV_MONARCH, + wxPAPER_ENV_PERSONAL, + wxPAPER_FANFOLD_US, + wxPAPER_FANFOLD_STD_GERMAN, + wxPAPER_FANFOLD_LGL_GERMAN, + wxPAPER_ISO_B4, + wxPAPER_JAPANESE_POSTCARD, + wxPAPER_9X11, + wxPAPER_10X11, + wxPAPER_15X11, + wxPAPER_ENV_INVITE, + wxPAPER_LETTER_EXTRA, + wxPAPER_LEGAL_EXTRA, + wxPAPER_TABLOID_EXTRA, + wxPAPER_A4_EXTRA, + wxPAPER_LETTER_TRANSVERSE, + wxPAPER_A4_TRANSVERSE, + wxPAPER_LETTER_EXTRA_TRANSVERSE, + wxPAPER_A_PLUS, + wxPAPER_B_PLUS, + wxPAPER_LETTER_PLUS, + wxPAPER_A4_PLUS, + wxPAPER_A5_TRANSVERSE, + wxPAPER_B5_TRANSVERSE, + wxPAPER_A3_EXTRA, + wxPAPER_A5_EXTRA, + wxPAPER_B5_EXTRA, + wxPAPER_A2, + wxPAPER_A3_TRANSVERSE, + wxPAPER_A3_EXTRA_TRANSVERSE, + wxPAPER_DBL_JAPANESE_POSTCARD, + wxPAPER_A6, + wxPAPER_JENV_KAKU2, + wxPAPER_JENV_KAKU3, + wxPAPER_JENV_CHOU3, + wxPAPER_JENV_CHOU4, + wxPAPER_LETTER_ROTATED, + wxPAPER_A3_ROTATED, + wxPAPER_A4_ROTATED, + wxPAPER_A5_ROTATED, + wxPAPER_B4_JIS_ROTATED, + wxPAPER_B5_JIS_ROTATED, + wxPAPER_JAPANESE_POSTCARD_ROTATED, + wxPAPER_DBL_JAPANESE_POSTCARD_ROTATED, + wxPAPER_A6_ROTATED, + wxPAPER_JENV_KAKU2_ROTATED, + wxPAPER_JENV_KAKU3_ROTATED, + wxPAPER_JENV_CHOU3_ROTATED, + wxPAPER_JENV_CHOU4_ROTATED, + wxPAPER_B6_JIS, + wxPAPER_B6_JIS_ROTATED, + wxPAPER_12X11, + wxPAPER_JENV_YOU4, + wxPAPER_JENV_YOU4_ROTATED, + wxPAPER_P16K, + wxPAPER_P32K, + wxPAPER_P32KBIG, + wxPAPER_PENV_1, + wxPAPER_PENV_2, + wxPAPER_PENV_3, + wxPAPER_PENV_4, + wxPAPER_PENV_5, + wxPAPER_PENV_6, + wxPAPER_PENV_7, + wxPAPER_PENV_8, + wxPAPER_PENV_9, + wxPAPER_PENV_10, + wxPAPER_P16K_ROTATED, + wxPAPER_P32K_ROTATED, + wxPAPER_P32KBIG_ROTATED, + wxPAPER_PENV_1_ROTATED, + wxPAPER_PENV_2_ROTATED, + wxPAPER_PENV_3_ROTATED, + wxPAPER_PENV_4_ROTATED, + wxPAPER_PENV_5_ROTATED, + wxPAPER_PENV_6_ROTATED, + wxPAPER_PENV_7_ROTATED, + wxPAPER_PENV_8_ROTATED, + wxPAPER_PENV_9_ROTATED, + wxPAPER_PENV_10_ROTATED +}; + +enum wxPrintOrientation +{ + wxPORTRAIT, + wxLANDSCAPE +}; + +enum wxDuplexMode +{ + wxDUPLEX_SIMPLEX, + wxDUPLEX_HORIZONTAL, + wxDUPLEX_VERTICAL +}; + +enum wxPrintMode +{ + wxPRINT_MODE_NONE, + wxPRINT_MODE_PREVIEW, + wxPRINT_MODE_FILE, + wxPRINT_MODE_PRINTER, + wxPRINT_MODE_STREAM +}; + +enum wxUpdateUI +{ + wxUPDATE_UI_NONE, + wxUPDATE_UI_RECURSE, + wxUPDATE_UI_FROMIDLE +}; + +typedef int wxCoord; + +typedef float wxFloat32; + +typedef double wxFloat64; + +typedef double wxDouble; + +wxCoord wxDefaultCoord; + + + const int MAJOR_VERSION; + const int MINOR_VERSION; + const int RELEASE_NUMBER; + const int SUBRELEASE_NUMBER; + + + +//--------------------------------------------------------------------------- + diff --git a/sip/gen/display.sip b/sip/gen/display.sip new file mode 100644 index 00000000..9659bf8f --- /dev/null +++ b/sip/gen/display.sip @@ -0,0 +1,81 @@ +//--------------------------------------------------------------------------- +// This file is generated by wxPython's SIP generator. Do not edit by hand. +// +// Copyright: (c) 2010 by Total Control Software +// License: wxWindows License +// +// This file will be included by _core.sip +// +//--------------------------------------------------------------------------- + +%ModuleHeaderCode +#include +%End + + + +//--------------------------------------------------------------------------- + +class wxDisplay +{ + %TypeHeaderCode + #include + %End + + +public: + wxDisplay( + unsigned int index = 0 + ); + + ~wxDisplay(); + + bool ChangeMode( + const wxVideoMode & mode = wxDefaultVideoMode + ); + + wxRect GetClientArea(); + + wxVideoMode GetCurrentMode(); + + wxRect GetGeometry(); + + wxString GetName(); + + bool IsPrimary(); + + static + unsigned int GetCount(); + + static + int GetFromPoint( + const wxPoint & pt + ); + + static + int GetFromWindow( + const wxWindow * win + ); + + private: + wxDisplay& operator=(const wxDisplay&); + + + private: + wxDisplay(const wxDisplay&); + + + %Property(name=ClientArea, get=GetClientArea) + + %Property(name=CurrentMode, get=GetCurrentMode) + + %Property(name=Geometry, get=GetGeometry) + + %Property(name=Name, get=GetName) + +}; // end of class wxDisplay + + + +//--------------------------------------------------------------------------- + diff --git a/sip/gen/event.sip b/sip/gen/event.sip index 62fee1e5..e641c7e8 100644 --- a/sip/gen/event.sip +++ b/sip/gen/event.sip @@ -10,31 +10,20 @@ %ModuleCode -#if !wxUSE_HOTKEY -#define wxEVT_HOTKEY 0 -#endif - + #if !wxUSE_HOTKEY + #define wxEVT_HOTKEY 0 + #endif + %End //--------------------------------------------------------------------------- -class wxCursor; // forward declaration - - -class wxMenu; // forward declaration - - -class wxDC; // forward declaration - - -class wxWindow; // forward declaration - - class wxEvtHandler : wxObject, wxTrackable { -%TypeHeaderCode - #include -%End + %TypeHeaderCode + #include + %End + public: wxEvtHandler(); @@ -93,7 +82,6 @@ public: bool IsUnlinked(); - private: wxEvtHandler(const wxEvtHandler&); @@ -103,9 +91,10 @@ public: class wxEventBlocker : wxEvtHandler { -%TypeHeaderCode - #include -%End + %TypeHeaderCode + #include + %End + public: wxEventBlocker( @@ -125,9 +114,10 @@ public: class wxEvent : wxObject /Abstract/ { -%TypeHeaderCode - #include -%End + %TypeHeaderCode + #include + %End + public: wxEvent( @@ -191,7 +181,6 @@ public: %Property(name=Timestamp, get=GetTimestamp, set=SetTimestamp) - private: wxEvent& operator=(const wxEvent&); @@ -201,9 +190,10 @@ public: class wxCommandEvent : wxEvent { -%TypeHeaderCode - #include -%End + %TypeHeaderCode + #include + %End + public: wxCommandEvent( @@ -266,7 +256,6 @@ public: virtual wxEvent* Clone(); - private: wxCommandEvent& operator=(const wxCommandEvent&); @@ -276,9 +265,10 @@ public: class wxActivateEvent : wxEvent { -%TypeHeaderCode - #include -%End + %TypeHeaderCode + #include + %End + public: wxActivateEvent( @@ -294,7 +284,6 @@ public: virtual wxEvent* Clone(); - private: wxActivateEvent& operator=(const wxActivateEvent&); @@ -304,9 +293,10 @@ public: class wxChildFocusEvent : wxCommandEvent { -%TypeHeaderCode - #include -%End + %TypeHeaderCode + #include + %End + public: wxChildFocusEvent( @@ -320,7 +310,6 @@ public: virtual wxEvent* Clone(); - private: wxChildFocusEvent& operator=(const wxChildFocusEvent&); @@ -330,9 +319,10 @@ public: class wxClipboardTextEvent : wxCommandEvent { -%TypeHeaderCode - #include -%End + %TypeHeaderCode + #include + %End + public: wxClipboardTextEvent( @@ -343,7 +333,6 @@ public: virtual wxEvent* Clone(); - private: wxClipboardTextEvent& operator=(const wxClipboardTextEvent&); @@ -353,9 +342,10 @@ public: class wxCloseEvent : wxEvent { -%TypeHeaderCode - #include -%End + %TypeHeaderCode + #include + %End + public: wxCloseEvent( @@ -382,7 +372,6 @@ public: virtual wxEvent* Clone(); - private: wxCloseEvent& operator=(const wxCloseEvent&); @@ -392,9 +381,10 @@ public: class wxContextMenuEvent : wxCommandEvent { -%TypeHeaderCode - #include -%End + %TypeHeaderCode + #include + %End + public: wxContextMenuEvent( @@ -414,7 +404,6 @@ public: virtual wxEvent* Clone(); - private: wxContextMenuEvent& operator=(const wxContextMenuEvent&); @@ -424,9 +413,10 @@ public: class wxDisplayChangedEvent : wxEvent { -%TypeHeaderCode - #include -%End + %TypeHeaderCode + #include + %End + public: wxDisplayChangedEvent(); @@ -434,7 +424,6 @@ public: virtual wxEvent* Clone(); - private: wxDisplayChangedEvent& operator=(const wxDisplayChangedEvent&); @@ -444,9 +433,10 @@ public: class wxDropFilesEvent : wxEvent { -%TypeHeaderCode - #include -%End + %TypeHeaderCode + #include + %End + public: wxDropFilesEvent( @@ -470,7 +460,6 @@ public: virtual wxEvent* Clone(); - private: wxDropFilesEvent& operator=(const wxDropFilesEvent&); @@ -480,9 +469,10 @@ public: class wxEraseEvent : wxEvent { -%TypeHeaderCode - #include -%End + %TypeHeaderCode + #include + %End + public: wxEraseEvent( @@ -497,7 +487,6 @@ public: virtual wxEvent* Clone(); - private: wxEraseEvent& operator=(const wxEraseEvent&); @@ -507,9 +496,10 @@ public: class wxFocusEvent : wxEvent { -%TypeHeaderCode - #include -%End + %TypeHeaderCode + #include + %End + public: wxFocusEvent( @@ -528,7 +518,6 @@ public: virtual wxEvent* Clone(); - private: wxFocusEvent& operator=(const wxFocusEvent&); @@ -538,9 +527,10 @@ public: class wxHelpEvent : wxCommandEvent { -%TypeHeaderCode - #include -%End + %TypeHeaderCode + #include + %End + public: wxHelpEvent( @@ -572,7 +562,6 @@ public: virtual wxEvent* Clone(); - private: wxHelpEvent& operator=(const wxHelpEvent&); @@ -582,9 +571,10 @@ public: class wxIconizeEvent : wxEvent { -%TypeHeaderCode - #include -%End + %TypeHeaderCode + #include + %End + public: wxIconizeEvent( @@ -594,12 +584,11 @@ public: bool IsIconized(); - bool Iconized(); + bool Iconized() /Deprecated/; virtual wxEvent* Clone(); - private: wxIconizeEvent& operator=(const wxIconizeEvent&); @@ -609,9 +598,10 @@ public: class wxIdleEvent : wxEvent { -%TypeHeaderCode - #include -%End + %TypeHeaderCode + #include + %End + public: wxIdleEvent(); @@ -633,7 +623,6 @@ public: virtual wxEvent* Clone(); - private: wxIdleEvent& operator=(const wxIdleEvent&); @@ -643,9 +632,10 @@ public: class wxInitDialogEvent : wxEvent { -%TypeHeaderCode - #include -%End + %TypeHeaderCode + #include + %End + public: wxInitDialogEvent( @@ -655,7 +645,6 @@ public: virtual wxEvent* Clone(); - private: wxInitDialogEvent& operator=(const wxInitDialogEvent&); @@ -665,9 +654,10 @@ public: class wxJoystickEvent : wxEvent { -%TypeHeaderCode - #include -%End + %TypeHeaderCode + #include + %End + public: wxJoystickEvent( @@ -708,7 +698,6 @@ public: virtual wxEvent* Clone(); - private: wxJoystickEvent& operator=(const wxJoystickEvent&); @@ -718,9 +707,10 @@ public: class wxKeyEvent : wxEvent, wxKeyboardState { -%TypeHeaderCode - #include -%End + %TypeHeaderCode + #include + %End + public: wxKeyEvent( @@ -762,7 +752,6 @@ public: virtual wxEvent* Clone(); - private: wxKeyEvent& operator=(const wxKeyEvent&); @@ -772,9 +761,10 @@ public: class wxMaximizeEvent : wxEvent { -%TypeHeaderCode - #include -%End + %TypeHeaderCode + #include + %End + public: wxMaximizeEvent( @@ -784,7 +774,6 @@ public: virtual wxEvent* Clone(); - private: wxMaximizeEvent& operator=(const wxMaximizeEvent&); @@ -794,9 +783,10 @@ public: class wxMenuEvent : wxEvent { -%TypeHeaderCode - #include -%End + %TypeHeaderCode + #include + %End + public: wxMenuEvent( @@ -818,7 +808,6 @@ public: virtual wxEvent* Clone(); - private: wxMenuEvent& operator=(const wxMenuEvent&); @@ -828,9 +817,10 @@ public: class wxMouseCaptureChangedEvent : wxEvent { -%TypeHeaderCode - #include -%End + %TypeHeaderCode + #include + %End + public: wxMouseCaptureChangedEvent( @@ -845,7 +835,6 @@ public: virtual wxEvent* Clone(); - private: wxMouseCaptureChangedEvent& operator=(const wxMouseCaptureChangedEvent&); @@ -855,9 +844,10 @@ public: class wxMouseCaptureLostEvent : wxEvent { -%TypeHeaderCode - #include -%End + %TypeHeaderCode + #include + %End + public: wxMouseCaptureLostEvent( @@ -867,7 +857,6 @@ public: virtual wxEvent* Clone(); - private: wxMouseCaptureLostEvent& operator=(const wxMouseCaptureLostEvent&); @@ -877,9 +866,10 @@ public: class wxMouseEvent : wxEvent, wxMouseState { -%TypeHeaderCode - #include -%End + %TypeHeaderCode + #include + %End + public: wxMouseEvent( @@ -973,7 +963,6 @@ public: virtual wxEvent* Clone(); - private: wxMouseEvent& operator=(const wxMouseEvent&); @@ -983,9 +972,10 @@ public: class wxMoveEvent : wxEvent { -%TypeHeaderCode - #include -%End + %TypeHeaderCode + #include + %End + public: wxMoveEvent( @@ -1012,7 +1002,6 @@ public: virtual wxEvent* Clone(); - private: wxMoveEvent& operator=(const wxMoveEvent&); @@ -1022,13 +1011,18 @@ public: class wxNavigationKeyEvent : wxEvent { -%TypeHeaderCode - #include -%End + %TypeHeaderCode + #include + %End + public: wxNavigationKeyEvent(); + wxNavigationKeyEvent( + const wxNavigationKeyEvent & event + ); + enum wxNavigationKeyEventFlags { IsBackward, @@ -1072,7 +1066,6 @@ public: virtual wxEvent* Clone(); - private: wxNavigationKeyEvent& operator=(const wxNavigationKeyEvent&); @@ -1082,9 +1075,10 @@ public: class wxNotifyEvent : wxCommandEvent { -%TypeHeaderCode - #include -%End + %TypeHeaderCode + #include + %End + public: wxNotifyEvent( @@ -1101,7 +1095,6 @@ public: virtual wxEvent* Clone(); - private: wxNotifyEvent& operator=(const wxNotifyEvent&); @@ -1111,9 +1104,10 @@ public: class wxPaintEvent : wxEvent { -%TypeHeaderCode - #include -%End + %TypeHeaderCode + #include + %End + public: wxPaintEvent( @@ -1123,7 +1117,6 @@ public: virtual wxEvent* Clone(); - private: wxPaintEvent& operator=(const wxPaintEvent&); @@ -1133,9 +1126,10 @@ public: class wxPaletteChangedEvent : wxEvent { -%TypeHeaderCode - #include -%End + %TypeHeaderCode + #include + %End + public: wxPaletteChangedEvent( @@ -1153,7 +1147,6 @@ public: virtual wxEvent* Clone(); - private: wxPaletteChangedEvent& operator=(const wxPaletteChangedEvent&); @@ -1163,9 +1156,10 @@ public: class wxQueryNewPaletteEvent : wxEvent { -%TypeHeaderCode - #include -%End + %TypeHeaderCode + #include + %End + public: wxQueryNewPaletteEvent( @@ -1183,7 +1177,6 @@ public: virtual wxEvent* Clone(); - private: wxQueryNewPaletteEvent& operator=(const wxQueryNewPaletteEvent&); @@ -1193,9 +1186,10 @@ public: class wxScrollEvent : wxCommandEvent { -%TypeHeaderCode - #include -%End + %TypeHeaderCode + #include + %End + public: wxScrollEvent( @@ -1224,7 +1218,6 @@ public: virtual wxEvent* Clone(); - private: wxScrollEvent& operator=(const wxScrollEvent&); @@ -1234,9 +1227,10 @@ public: class wxScrollWinEvent : wxEvent { -%TypeHeaderCode - #include -%End + %TypeHeaderCode + #include + %End + public: wxScrollWinEvent( @@ -1264,7 +1258,6 @@ public: virtual wxEvent* Clone(); - private: wxScrollWinEvent& operator=(const wxScrollWinEvent&); @@ -1274,9 +1267,10 @@ public: class wxSetCursorEvent : wxEvent { -%TypeHeaderCode - #include -%End + %TypeHeaderCode + #include + %End + public: wxSetCursorEvent( @@ -1305,7 +1299,6 @@ public: virtual wxEvent* Clone(); - private: wxSetCursorEvent& operator=(const wxSetCursorEvent&); @@ -1315,9 +1308,10 @@ public: class wxShowEvent : wxEvent { -%TypeHeaderCode - #include -%End + %TypeHeaderCode + #include + %End + public: wxShowEvent( @@ -1331,14 +1325,11 @@ public: bool IsShown(); - bool GetShow(); - %Property(name=Show, get=IsShown, set=SetShow) virtual wxEvent* Clone(); - private: wxShowEvent& operator=(const wxShowEvent&); @@ -1348,9 +1339,10 @@ public: class wxSizeEvent : wxEvent { -%TypeHeaderCode - #include -%End + %TypeHeaderCode + #include + %End + public: wxSizeEvent( @@ -1377,7 +1369,6 @@ public: virtual wxEvent* Clone(); - private: wxSizeEvent& operator=(const wxSizeEvent&); @@ -1387,9 +1378,10 @@ public: class wxSysColourChangedEvent : wxEvent { -%TypeHeaderCode - #include -%End + %TypeHeaderCode + #include + %End + public: wxSysColourChangedEvent(); @@ -1397,7 +1389,6 @@ public: virtual wxEvent* Clone(); - private: wxSysColourChangedEvent& operator=(const wxSysColourChangedEvent&); @@ -1407,9 +1398,10 @@ public: class wxUpdateUIEvent : wxCommandEvent { -%TypeHeaderCode - #include -%End + %TypeHeaderCode + #include + %End + public: wxUpdateUIEvent( @@ -1483,7 +1475,6 @@ public: virtual wxEvent* Clone(); - private: wxUpdateUIEvent& operator=(const wxUpdateUIEvent&); @@ -1493,9 +1484,10 @@ public: class wxWindowCreateEvent : wxCommandEvent { -%TypeHeaderCode - #include -%End + %TypeHeaderCode + #include + %End + public: wxWindowCreateEvent( @@ -1509,7 +1501,6 @@ public: virtual wxEvent* Clone(); - private: wxWindowCreateEvent& operator=(const wxWindowCreateEvent&); @@ -1519,9 +1510,10 @@ public: class wxWindowDestroyEvent : wxCommandEvent { -%TypeHeaderCode - #include -%End + %TypeHeaderCode + #include + %End + public: wxWindowDestroyEvent( @@ -1535,7 +1527,6 @@ public: virtual wxEvent* Clone(); - private: wxWindowDestroyEvent& operator=(const wxWindowDestroyEvent&); diff --git a/sip/gen/evtloop.sip b/sip/gen/evtloop.sip new file mode 100644 index 00000000..50284c47 --- /dev/null +++ b/sip/gen/evtloop.sip @@ -0,0 +1,86 @@ +//--------------------------------------------------------------------------- +// This file is generated by wxPython's SIP generator. Do not edit by hand. +// +// Copyright: (c) 2010 by Total Control Software +// License: wxWindows License +// +// This file will be included by _core.sip +// +//--------------------------------------------------------------------------- + + +//--------------------------------------------------------------------------- + +class wxEventLoopBase /Abstract/ +{ + %TypeHeaderCode + #include + %End + + +public: + virtual + int Run() = 0; + + bool IsRunning(); + + virtual + bool IsOk(); + + virtual + void Exit( + int rc = 0 + ) = 0; + + virtual + bool Pending() = 0; + + virtual + bool Dispatch() = 0; + + virtual + int DispatchTimeout( + unsigned long timeout + ) = 0; + + virtual + void WakeUp() = 0; + + virtual + void WakeUpIdle(); + + virtual + bool ProcessIdle(); + + virtual + bool IsYielding(); + + bool Yield( + bool onlyIfNeeded = false + ); + + bool YieldFor( + long eventsToProcess + ); + + virtual + bool IsEventAllowedInsideYield( + wxEventCategory cat + ); + + static + wxEventLoopBase * GetActive(); + + static + void SetActive( + wxEventLoopBase * loop + ); + + bool IsMain(); + +}; // end of class wxEventLoopBase + + + +//--------------------------------------------------------------------------- + diff --git a/sip/gen/font.sip b/sip/gen/font.sip new file mode 100644 index 00000000..c19d4eb2 --- /dev/null +++ b/sip/gen/font.sip @@ -0,0 +1,384 @@ +//--------------------------------------------------------------------------- +// This file is generated by wxPython's SIP generator. Do not edit by hand. +// +// Copyright: (c) 2010 by Total Control Software +// License: wxWindows License +// +// This file will be included by _core.sip +// +//--------------------------------------------------------------------------- + + +//--------------------------------------------------------------------------- + +class wxFont : wxGDIObject +{ + %TypeHeaderCode + #include + %End + + +public: + wxFont(); + + wxFont( + const wxFont & font + ); + + wxFont( + int pointSize, + wxFontFamily family, + wxFontStyle style, + wxFontWeight weight, + bool underline = false, + const wxString & faceName = wxEmptyString, + wxFontEncoding encoding = wxFONTENCODING_DEFAULT + ); + + wxFont( + const wxSize & pixelSize, + wxFontFamily family, + wxFontStyle style, + wxFontWeight weight, + bool underline = false, + const wxString & faceName = wxEmptyString, + wxFontEncoding encoding = wxFONTENCODING_DEFAULT + ); + + wxFont( + const wxString & fontdesc + ); + + ~wxFont(); + + wxFont( + int pointSize, + wxFontFamily family, + int flags = wxFONTFLAG_DEFAULT, + const wxString & faceName = wxEmptyString, + wxFontEncoding encoding = wxFONTENCODING_DEFAULT + ) /NoDerived/; + %MethodCode + // YUCK! + wxFont* font = wxFont::New(pointSize, family, flags, *faceName, encoding); + sipCpp = new sipwxFont(*font); + delete font; + %End + + wxFontEncoding GetEncoding(); + + wxString GetFaceName(); + + wxFontFamily GetFamily(); + + wxString GetNativeFontInfoDesc(); + + wxString GetNativeFontInfoUserDesc(); + + int GetPointSize(); + + wxSize GetPixelSize(); + + wxFontStyle GetStyle(); + + bool GetUnderlined(); + + wxFontWeight GetWeight(); + + bool IsFixedWidth(); + + bool IsOk(); + + wxFont Bold(); + + wxFont Italic(); + + wxFont Larger(); + + wxFont Smaller(); + + wxFont & MakeBold(); + + wxFont & MakeItalic(); + + wxFont & MakeLarger(); + + wxFont & MakeSmaller(); + + wxFont & Scale( + float x + ); + + wxFont Scaled( + float x + ); + + void SetEncoding( + wxFontEncoding encoding + ); + + bool SetFaceName( + const wxString & faceName + ); + + void SetFamily( + wxFontFamily family + ); + + bool SetNativeFontInfo( + const wxString & info + ); + + bool SetNativeFontInfoUserDesc( + const wxString & info + ); + + void SetPointSize( + int pointSize + ); + + void SetPixelSize( + const wxSize & pixelSize + ); + + void SetStyle( + wxFontStyle style + ); + + void SetUnderlined( + bool underlined + ); + + void SetWeight( + wxFontWeight weight + ); + + static + wxFont * New( + int pointSize, + wxFontFamily family, + wxFontStyle style, + wxFontWeight weight, + bool underline = false, + const wxString & faceName = wxEmptyString, + wxFontEncoding encoding = wxFONTENCODING_DEFAULT + ) /Factory/; + + static + wxFont * New( + int pointSize, + wxFontFamily family, + int flags = wxFONTFLAG_DEFAULT, + const wxString & faceName = wxEmptyString, + wxFontEncoding encoding = wxFONTENCODING_DEFAULT + ) /Factory/; + + static + wxFont * New( + const wxSize & pixelSize, + wxFontFamily family, + wxFontStyle style, + wxFontWeight weight, + bool underline = false, + const wxString & faceName = wxEmptyString, + wxFontEncoding encoding = wxFONTENCODING_DEFAULT + ) /Factory/; + + static + wxFont * New( + const wxSize & pixelSize, + wxFontFamily family, + int flags = wxFONTFLAG_DEFAULT, + const wxString & faceName = wxEmptyString, + wxFontEncoding encoding = wxFONTENCODING_DEFAULT + ) /Factory/; + + bool operator!=( + const wxFont & font + ); + + bool operator==( + const wxFont & font + ); + + static + wxFontEncoding GetDefaultEncoding(); + + static + void SetDefaultEncoding( + wxFontEncoding encoding + ); + + %Property(name=Encoding, get=GetEncoding, set=SetEncoding) + + %Property(name=FaceName, get=GetFaceName, set=SetFaceName) + + %Property(name=Family, get=GetFamily, set=SetFamily) + + %Property(name=NativeFontInfoDesc, get=GetNativeFontInfoDesc, set=SetNativeFontInfo) + + %Property(name=NativeFontInfoUserDesc, get=GetNativeFontInfoUserDesc, set=SetNativeFontInfoUserDesc) + + %Property(name=PointSize, get=GetPointSize, set=SetPointSize) + + %Property(name=PixelSize, get=GetPixelSize, set=SetPixelSize) + + %Property(name=Style, get=GetStyle, set=SetStyle) + + %Property(name=Underlined, get=GetUnderlined, set=SetUnderlined) + + %Property(name=Weight, get=GetWeight, set=SetWeight) + +}; // end of class wxFont + + +enum wxFontFamily +{ + wxFONTFAMILY_DEFAULT, + wxFONTFAMILY_DECORATIVE, + wxFONTFAMILY_ROMAN, + wxFONTFAMILY_SCRIPT, + wxFONTFAMILY_SWISS, + wxFONTFAMILY_MODERN, + wxFONTFAMILY_TELETYPE, + wxFONTFAMILY_UNKNOWN +}; + +enum wxFontStyle +{ + wxFONTSTYLE_NORMAL, + wxFONTSTYLE_ITALIC, + wxFONTSTYLE_SLANT, + wxFONTSTYLE_MAX +}; + +enum wxFontWeight +{ + wxFONTWEIGHT_NORMAL, + wxFONTWEIGHT_LIGHT, + wxFONTWEIGHT_BOLD, + wxFONTWEIGHT_MAX +}; + +enum wxFontFlag +{ + wxFONTFLAG_DEFAULT, + wxFONTFLAG_ITALIC, + wxFONTFLAG_SLANT, + wxFONTFLAG_LIGHT, + wxFONTFLAG_BOLD, + wxFONTFLAG_ANTIALIASED, + wxFONTFLAG_NOT_ANTIALIASED, + wxFONTFLAG_UNDERLINED, + wxFONTFLAG_STRIKETHROUGH, + wxFONTFLAG_MASK +}; + +enum wxFontEncoding +{ + wxFONTENCODING_SYSTEM, + wxFONTENCODING_DEFAULT, + wxFONTENCODING_ISO8859_1, + wxFONTENCODING_ISO8859_2, + wxFONTENCODING_ISO8859_3, + wxFONTENCODING_ISO8859_4, + wxFONTENCODING_ISO8859_5, + wxFONTENCODING_ISO8859_6, + wxFONTENCODING_ISO8859_7, + wxFONTENCODING_ISO8859_8, + wxFONTENCODING_ISO8859_9, + wxFONTENCODING_ISO8859_10, + wxFONTENCODING_ISO8859_11, + wxFONTENCODING_ISO8859_12, + wxFONTENCODING_ISO8859_13, + wxFONTENCODING_ISO8859_14, + wxFONTENCODING_ISO8859_15, + wxFONTENCODING_ISO8859_MAX, + wxFONTENCODING_KOI8, + wxFONTENCODING_KOI8_U, + wxFONTENCODING_ALTERNATIVE, + wxFONTENCODING_BULGARIAN, + wxFONTENCODING_CP437, + wxFONTENCODING_CP850, + wxFONTENCODING_CP852, + wxFONTENCODING_CP855, + wxFONTENCODING_CP866, + wxFONTENCODING_CP874, + wxFONTENCODING_CP932, + wxFONTENCODING_CP936, + wxFONTENCODING_CP949, + wxFONTENCODING_CP950, + wxFONTENCODING_CP1250, + wxFONTENCODING_CP1251, + wxFONTENCODING_CP1252, + wxFONTENCODING_CP1253, + wxFONTENCODING_CP1254, + wxFONTENCODING_CP1255, + wxFONTENCODING_CP1256, + wxFONTENCODING_CP1257, + wxFONTENCODING_CP12_MAX, + wxFONTENCODING_UTF7, + wxFONTENCODING_UTF8, + wxFONTENCODING_EUC_JP, + wxFONTENCODING_UTF16BE, + wxFONTENCODING_UTF16LE, + wxFONTENCODING_UTF32BE, + wxFONTENCODING_UTF32LE, + wxFONTENCODING_MACROMAN, + wxFONTENCODING_MACJAPANESE, + wxFONTENCODING_MACCHINESETRAD, + wxFONTENCODING_MACKOREAN, + wxFONTENCODING_MACARABIC, + wxFONTENCODING_MACHEBREW, + wxFONTENCODING_MACGREEK, + wxFONTENCODING_MACCYRILLIC, + wxFONTENCODING_MACDEVANAGARI, + wxFONTENCODING_MACGURMUKHI, + wxFONTENCODING_MACGUJARATI, + wxFONTENCODING_MACORIYA, + wxFONTENCODING_MACBENGALI, + wxFONTENCODING_MACTAMIL, + wxFONTENCODING_MACTELUGU, + wxFONTENCODING_MACKANNADA, + wxFONTENCODING_MACMALAJALAM, + wxFONTENCODING_MACSINHALESE, + wxFONTENCODING_MACBURMESE, + wxFONTENCODING_MACKHMER, + wxFONTENCODING_MACTHAI, + wxFONTENCODING_MACLAOTIAN, + wxFONTENCODING_MACGEORGIAN, + wxFONTENCODING_MACARMENIAN, + wxFONTENCODING_MACCHINESESIMP, + wxFONTENCODING_MACTIBETAN, + wxFONTENCODING_MACMONGOLIAN, + wxFONTENCODING_MACETHIOPIC, + wxFONTENCODING_MACCENTRALEUR, + wxFONTENCODING_MACVIATNAMESE, + wxFONTENCODING_MACARABICEXT, + wxFONTENCODING_MACSYMBOL, + wxFONTENCODING_MACDINGBATS, + wxFONTENCODING_MACTURKISH, + wxFONTENCODING_MACCROATIAN, + wxFONTENCODING_MACICELANDIC, + wxFONTENCODING_MACROMANIAN, + wxFONTENCODING_MACCELTIC, + wxFONTENCODING_MACGAELIC, + wxFONTENCODING_MACKEYBOARD, + wxFONTENCODING_ISO2022_JP, + wxFONTENCODING_MAX, + wxFONTENCODING_MACMIN, + wxFONTENCODING_MACMAX, + wxFONTENCODING_UTF16, + wxFONTENCODING_UTF32, + wxFONTENCODING_UNICODE, + wxFONTENCODING_GB2312, + wxFONTENCODING_BIG5, + wxFONTENCODING_SHIFT_JIS, + wxFONTENCODING_EUC_KR +}; + +wxFont wxNullFont; + + +//--------------------------------------------------------------------------- + diff --git a/sip/gen/gdicmn.sip b/sip/gen/gdicmn.sip index c878c82f..1608a397 100644 --- a/sip/gen/gdicmn.sip +++ b/sip/gen/gdicmn.sip @@ -9,19 +9,20 @@ //--------------------------------------------------------------------------- %ModuleCode -#if !defined(__WXMAC__) -#define wxCURSOR_COPY_ARROW wxCURSOR_ARROW -#endif - + #if !defined(__WXMAC__) + #define wxCURSOR_COPY_ARROW wxCURSOR_ARROW + #endif + %End //--------------------------------------------------------------------------- class wxPoint { -%TypeHeaderCode - #include -%End + %TypeHeaderCode + #include + %End + public: wxPoint(); @@ -96,7 +97,7 @@ public: } *sipCppPtr = reinterpret_cast(sipConvertToType( sipPy, sipType_wxPoint, sipTransferObj, SIP_NO_CONVERTORS, 0, sipIsErr)); - return 0; + return sipGetState(sipTransferObj); %End }; // end of class wxPoint @@ -105,6 +106,7 @@ public: def _Point___str__(self): return str(self.Get()) Point.__str__ = _Point___str__ +del _Point___str__ %End @@ -112,6 +114,7 @@ Point.__str__ = _Point___str__ def _Point___repr__(self): return "wx.Point"+str(self.Get()) Point.__repr__ = _Point___repr__ +del _Point___repr__ %End @@ -119,6 +122,7 @@ Point.__repr__ = _Point___repr__ def _Point___len__(self): return len(self.Get()) Point.__len__ = _Point___len__ +del _Point___len__ %End @@ -126,6 +130,7 @@ Point.__len__ = _Point___len__ def _Point___nonzero__(self): return self.Get() != (0,0) Point.__nonzero__ = _Point___nonzero__ +del _Point___nonzero__ %End @@ -133,6 +138,7 @@ Point.__nonzero__ = _Point___nonzero__ def _Point___reduce__(self): return (Point, self.Get()) Point.__reduce__ = _Point___reduce__ +del _Point___reduce__ %End @@ -140,6 +146,7 @@ Point.__reduce__ = _Point___reduce__ def _Point___getitem__(self, idx): return self.Get()[idx] Point.__getitem__ = _Point___getitem__ +del _Point___getitem__ %End @@ -149,6 +156,7 @@ def _Point___setitem__(self, idx, val): elif idx == 1: self.y = val else: raise IndexError Point.__setitem__ = _Point___setitem__ +del _Point___setitem__ %End @@ -157,25 +165,26 @@ Point.__safe_for_unpickling__ = True %End -bool operator==(const wxPoint& p1, const wxPoint& p2); -bool operator!=(const wxPoint& p1, const wxPoint& p2); -wxPoint operator+(const wxPoint& p, const wxSize& s); -wxPoint operator+(const wxPoint& p1, const wxPoint& p2); -wxPoint operator+(const wxSize& s, const wxPoint& p); -wxPoint operator-(const wxPoint& p); -wxPoint operator-(const wxPoint& p, const wxSize& s); -wxPoint operator-(const wxPoint& p1, const wxPoint& p2); -wxPoint operator-(const wxSize& s, const wxPoint& p); -wxPoint operator*(const wxPoint& s, int i); -wxPoint operator*(int i, const wxPoint& s); -wxPoint operator/(const wxPoint& s, int i); + bool operator==(const wxPoint& p1, const wxPoint& p2); + bool operator!=(const wxPoint& p1, const wxPoint& p2); + wxPoint operator+(const wxPoint& p, const wxSize& s); + wxPoint operator+(const wxPoint& p1, const wxPoint& p2); + wxPoint operator+(const wxSize& s, const wxPoint& p); + wxPoint operator-(const wxPoint& p); + wxPoint operator-(const wxPoint& p, const wxSize& s); + wxPoint operator-(const wxPoint& p1, const wxPoint& p2); + wxPoint operator-(const wxSize& s, const wxPoint& p); + wxPoint operator*(const wxPoint& s, int i); + wxPoint operator*(int i, const wxPoint& s); + wxPoint operator/(const wxPoint& s, int i); class wxSize { -%TypeHeaderCode - #include -%End + %TypeHeaderCode + #include + %End + public: wxSize(); @@ -310,7 +319,7 @@ public: } *sipCppPtr = reinterpret_cast(sipConvertToType( sipPy, sipType_wxSize, sipTransferObj, SIP_NO_CONVERTORS, 0, sipIsErr)); - return 0; + return sipGetState(sipTransferObj); %End }; // end of class wxSize @@ -319,6 +328,7 @@ public: def _Size___str__(self): return str(self.Get()) Size.__str__ = _Size___str__ +del _Size___str__ %End @@ -326,6 +336,7 @@ Size.__str__ = _Size___str__ def _Size___repr__(self): return "wx.Size"+str(self.Get()) Size.__repr__ = _Size___repr__ +del _Size___repr__ %End @@ -333,6 +344,7 @@ Size.__repr__ = _Size___repr__ def _Size___len__(self): return len(self.Get()) Size.__len__ = _Size___len__ +del _Size___len__ %End @@ -340,6 +352,7 @@ Size.__len__ = _Size___len__ def _Size___nonzero__(self): return self.Get() != (0,0) Size.__nonzero__ = _Size___nonzero__ +del _Size___nonzero__ %End @@ -347,6 +360,7 @@ Size.__nonzero__ = _Size___nonzero__ def _Size___reduce__(self): return (Size, self.Get()) Size.__reduce__ = _Size___reduce__ +del _Size___reduce__ %End @@ -354,6 +368,7 @@ Size.__reduce__ = _Size___reduce__ def _Size___getitem__(self, idx): return self.Get()[idx] Size.__getitem__ = _Size___getitem__ +del _Size___getitem__ %End @@ -363,6 +378,7 @@ def _Size___setitem__(self, idx, val): elif idx == 1: self.height = val else: raise IndexError Size.__setitem__ = _Size___setitem__ +del _Size___setitem__ %End @@ -371,20 +387,21 @@ Size.__safe_for_unpickling__ = True %End -bool operator==(const wxSize& s1, const wxSize& s2); -bool operator!=(const wxSize& s1, const wxSize& s2); -wxSize operator*(const wxSize& s, int i); -wxSize operator*(int i, const wxSize& s); -wxSize operator+(const wxSize& s1, const wxSize& s2); -wxSize operator-(const wxSize& s1, const wxSize& s2); -wxSize operator/(const wxSize& s, int i); + bool operator==(const wxSize& s1, const wxSize& s2); + bool operator!=(const wxSize& s1, const wxSize& s2); + wxSize operator*(const wxSize& s, int i); + wxSize operator*(int i, const wxSize& s); + wxSize operator+(const wxSize& s1, const wxSize& s2); + wxSize operator-(const wxSize& s1, const wxSize& s2); + wxSize operator/(const wxSize& s, int i); class wxRect { -%TypeHeaderCode - #include -%End + %TypeHeaderCode + #include + %End + public: wxRect(); @@ -605,7 +622,7 @@ public: } *sipCppPtr = reinterpret_cast(sipConvertToType( sipPy, sipType_wxRect, sipTransferObj, SIP_NO_CONVERTORS, 0, sipIsErr)); - return 0; + return sipGetState(sipTransferObj); %End }; // end of class wxRect @@ -614,6 +631,7 @@ public: def _Rect___str__(self): return str(self.Get()) Rect.__str__ = _Rect___str__ +del _Rect___str__ %End @@ -621,6 +639,7 @@ Rect.__str__ = _Rect___str__ def _Rect___repr__(self): return "wx.Rect"+str(self.Get()) Rect.__repr__ = _Rect___repr__ +del _Rect___repr__ %End @@ -628,6 +647,7 @@ Rect.__repr__ = _Rect___repr__ def _Rect___len__(self): return len(self.Get()) Rect.__len__ = _Rect___len__ +del _Rect___len__ %End @@ -635,6 +655,7 @@ Rect.__len__ = _Rect___len__ def _Rect___nonzero__(self): return self.Get() != (0,0,0,0) Rect.__nonzero__ = _Rect___nonzero__ +del _Rect___nonzero__ %End @@ -642,6 +663,7 @@ Rect.__nonzero__ = _Rect___nonzero__ def _Rect___reduce__(self): return (Rect, self.Get()) Rect.__reduce__ = _Rect___reduce__ +del _Rect___reduce__ %End @@ -649,6 +671,7 @@ Rect.__reduce__ = _Rect___reduce__ def _Rect___getitem__(self, idx): return self.Get()[idx] Rect.__getitem__ = _Rect___getitem__ +del _Rect___getitem__ %End @@ -660,6 +683,7 @@ def _Rect___setitem__(self, idx, val): elif idx == 3: self.height = val else: raise IndexError Rect.__setitem__ = _Rect___setitem__ +del _Rect___setitem__ %End @@ -668,17 +692,18 @@ Rect.__safe_for_unpickling__ = True %End -bool operator==(const wxRect& r1, const wxRect& r2); -bool operator!=(const wxRect& r1, const wxRect& r2); -wxRect operator+(const wxRect& r1, const wxRect& r2); -wxRect operator*(const wxRect& r1, const wxRect& r2); + bool operator==(const wxRect& r1, const wxRect& r2); + bool operator!=(const wxRect& r1, const wxRect& r2); + wxRect operator+(const wxRect& r1, const wxRect& r2); + wxRect operator*(const wxRect& r1, const wxRect& r2); class wxRealPoint { -%TypeHeaderCode - #include -%End + %TypeHeaderCode + #include + %End + public: wxRealPoint(); @@ -748,7 +773,7 @@ public: } *sipCppPtr = reinterpret_cast(sipConvertToType( sipPy, sipType_wxRealPoint, sipTransferObj, SIP_NO_CONVERTORS, 0, sipIsErr)); - return 0; + return sipGetState(sipTransferObj); %End }; // end of class wxRealPoint @@ -757,6 +782,7 @@ public: def _RealPoint___str__(self): return str(self.Get()) RealPoint.__str__ = _RealPoint___str__ +del _RealPoint___str__ %End @@ -764,6 +790,7 @@ RealPoint.__str__ = _RealPoint___str__ def _RealPoint___repr__(self): return "wx.RealPoint"+str(self.Get()) RealPoint.__repr__ = _RealPoint___repr__ +del _RealPoint___repr__ %End @@ -771,6 +798,7 @@ RealPoint.__repr__ = _RealPoint___repr__ def _RealPoint___len__(self): return len(self.Get()) RealPoint.__len__ = _RealPoint___len__ +del _RealPoint___len__ %End @@ -778,6 +806,7 @@ RealPoint.__len__ = _RealPoint___len__ def _RealPoint___nonzero__(self): return self.Get() != (0,0) RealPoint.__nonzero__ = _RealPoint___nonzero__ +del _RealPoint___nonzero__ %End @@ -785,6 +814,7 @@ RealPoint.__nonzero__ = _RealPoint___nonzero__ def _RealPoint___reduce__(self): return (Rect, self.Get()) RealPoint.__reduce__ = _RealPoint___reduce__ +del _RealPoint___reduce__ %End @@ -792,6 +822,7 @@ RealPoint.__reduce__ = _RealPoint___reduce__ def _RealPoint___getitem__(self, idx): return self.Get()[idx] RealPoint.__getitem__ = _RealPoint___getitem__ +del _RealPoint___getitem__ %End @@ -801,6 +832,7 @@ def _RealPoint___setitem__(self, idx, val): elif idx == 1: self.y = val else: raise IndexError RealPoint.__setitem__ = _RealPoint___setitem__ +del _RealPoint___setitem__ %End @@ -809,13 +841,39 @@ RealPoint.__safe_for_unpickling__ = True %End -bool operator==(const wxRealPoint& p1, const wxRealPoint& p2); -bool operator!=(const wxRealPoint& p1, const wxRealPoint& p2); -wxRealPoint operator*(const wxRealPoint& s, double i); -wxRealPoint operator*(double i, const wxRealPoint& s); -wxRealPoint operator+(const wxRealPoint& p1, const wxRealPoint& p2); -wxRealPoint operator-(const wxRealPoint& p1, const wxRealPoint& p2); -wxRealPoint operator/(const wxRealPoint& s, int i); + bool operator==(const wxRealPoint& p1, const wxRealPoint& p2); + bool operator!=(const wxRealPoint& p1, const wxRealPoint& p2); + wxRealPoint operator*(const wxRealPoint& s, double i); + wxRealPoint operator*(double i, const wxRealPoint& s); + wxRealPoint operator+(const wxRealPoint& p1, const wxRealPoint& p2); + wxRealPoint operator-(const wxRealPoint& p1, const wxRealPoint& p2); + wxRealPoint operator/(const wxRealPoint& s, int i); + + +class wxColourDatabase +{ + %TypeHeaderCode + #include + %End + + +public: + wxColourDatabase(); + + void AddColour( + const wxString & colourName, + const wxColour & colour + ); + + wxColour Find( + const wxString & colourName + ); + + wxString FindName( + const wxColour & colour + ); + +}; // end of class wxColourDatabase enum wxBitmapType diff --git a/sip/gen/gdiobj.sip b/sip/gen/gdiobj.sip new file mode 100644 index 00000000..4d4f8681 --- /dev/null +++ b/sip/gen/gdiobj.sip @@ -0,0 +1,29 @@ +//--------------------------------------------------------------------------- +// This file is generated by wxPython's SIP generator. Do not edit by hand. +// +// Copyright: (c) 2010 by Total Control Software +// License: wxWindows License +// +// This file will be included by _core.sip +// +//--------------------------------------------------------------------------- + + +//--------------------------------------------------------------------------- + +class wxGDIObject : wxObject /Abstract/ +{ + %TypeHeaderCode + #include + %End + + +public: + wxGDIObject(); + +}; // end of class wxGDIObject + + + +//--------------------------------------------------------------------------- + diff --git a/sip/gen/geometry.sip b/sip/gen/geometry.sip index 6d899ebe..94985b1a 100644 --- a/sip/gen/geometry.sip +++ b/sip/gen/geometry.sip @@ -18,9 +18,10 @@ class wxPoint2DDouble /PyName=Point2D/ { -%TypeHeaderCode - #include -%End + %TypeHeaderCode + #include + %End + public: wxPoint2DDouble(); @@ -143,7 +144,7 @@ public: } *sipCppPtr = reinterpret_cast(sipConvertToType( sipPy, sipType_wxPoint2DDouble, sipTransferObj, SIP_NO_CONVERTORS, 0, sipIsErr)); - return 0; + return sipGetState(sipTransferObj); %End }; // end of class wxPoint2DDouble @@ -152,6 +153,7 @@ public: def _Point2D___str__(self): return str(self.Get()) Point2D.__str__ = _Point2D___str__ +del _Point2D___str__ %End @@ -159,6 +161,7 @@ Point2D.__str__ = _Point2D___str__ def _Point2D___repr__(self): return "wx.Point2D"+str(self.Get()) Point2D.__repr__ = _Point2D___repr__ +del _Point2D___repr__ %End @@ -166,6 +169,7 @@ Point2D.__repr__ = _Point2D___repr__ def _Point2D___len__(self): return len(self.Get()) Point2D.__len__ = _Point2D___len__ +del _Point2D___len__ %End @@ -173,6 +177,7 @@ Point2D.__len__ = _Point2D___len__ def _Point2D___nonzero__(self): return self.Get() != (0,0) Point2D.__nonzero__ = _Point2D___nonzero__ +del _Point2D___nonzero__ %End @@ -180,6 +185,7 @@ Point2D.__nonzero__ = _Point2D___nonzero__ def _Point2D___reduce__(self): return (Point2D, self.Get()) Point2D.__reduce__ = _Point2D___reduce__ +del _Point2D___reduce__ %End @@ -187,6 +193,7 @@ Point2D.__reduce__ = _Point2D___reduce__ def _Point2D___getitem__(self, idx): return self.Get()[idx] Point2D.__getitem__ = _Point2D___getitem__ +del _Point2D___getitem__ %End @@ -196,6 +203,7 @@ def _Point2D___setitem__(self, idx, val): elif idx == 1: self.y = val else: raise IndexError Point2D.__setitem__ = _Point2D___setitem__ +del _Point2D___setitem__ %End @@ -206,9 +214,10 @@ Point2D.__safe_for_unpickling__ = True class wxRect2DDouble /PyName=Rect2D/ { -%TypeHeaderCode - #include -%End + %TypeHeaderCode + #include + %End + public: wxRect2DDouble(); @@ -467,7 +476,7 @@ public: } *sipCppPtr = reinterpret_cast(sipConvertToType( sipPy, sipType_wxRect2DDouble, sipTransferObj, SIP_NO_CONVERTORS, 0, sipIsErr)); - return 0; + return sipGetState(sipTransferObj); %End }; // end of class wxRect2DDouble @@ -476,6 +485,7 @@ public: def _Rect2D___str__(self): return str(self.Get()) Rect2D.__str__ = _Rect2D___str__ +del _Rect2D___str__ %End @@ -483,6 +493,7 @@ Rect2D.__str__ = _Rect2D___str__ def _Rect2D___repr__(self): return "wx.Rect2D"+str(self.Get()) Rect2D.__repr__ = _Rect2D___repr__ +del _Rect2D___repr__ %End @@ -490,6 +501,7 @@ Rect2D.__repr__ = _Rect2D___repr__ def _Rect2D___len__(self): return len(self.Get()) Rect2D.__len__ = _Rect2D___len__ +del _Rect2D___len__ %End @@ -497,6 +509,7 @@ Rect2D.__len__ = _Rect2D___len__ def _Rect2D___nonzero__(self): return self.Get() != (0,0,0,0) Rect2D.__nonzero__ = _Rect2D___nonzero__ +del _Rect2D___nonzero__ %End @@ -504,6 +517,7 @@ Rect2D.__nonzero__ = _Rect2D___nonzero__ def _Rect2D___reduce__(self): return (Rect2D, self.Get()) Rect2D.__reduce__ = _Rect2D___reduce__ +del _Rect2D___reduce__ %End @@ -511,6 +525,7 @@ Rect2D.__reduce__ = _Rect2D___reduce__ def _Rect2D___getitem__(self, idx): return self.Get()[idx] Rect2D.__getitem__ = _Rect2D___getitem__ +del _Rect2D___getitem__ %End @@ -522,6 +537,7 @@ def _Rect2D___setitem__(self, idx, val): elif idx == 3: self.height = val else: raise IndexError Rect2D.__setitem__ = _Rect2D___setitem__ +del _Rect2D___setitem__ %End diff --git a/sip/gen/intl.sip b/sip/gen/intl.sip new file mode 100644 index 00000000..0e9679be --- /dev/null +++ b/sip/gen/intl.sip @@ -0,0 +1,444 @@ +//--------------------------------------------------------------------------- +// This file is generated by wxPython's SIP generator. Do not edit by hand. +// +// Copyright: (c) 2010 by Total Control Software +// License: wxWindows License +// +// This file will be included by _core.sip +// +//--------------------------------------------------------------------------- + + +//--------------------------------------------------------------------------- + +struct wxLanguageInfo +{ + %TypeHeaderCode + #include + %End + + int Language; + + wxString CanonicalName; + + wxString Description; + + wxLayoutDirection LayoutDirection; + + wxString GetLocaleName(); + +}; // end of class wxLanguageInfo + + +class wxLocale +{ + %TypeHeaderCode + #include + %End + + +public: + wxLocale(); + + wxLocale( + int language, + int flags = wxLOCALE_LOAD_DEFAULT + ); + + wxLocale( + const wxString & name, + const wxString & shortName = wxEmptyString, + const wxString & locale = wxEmptyString, + bool bLoadDefault = true + ); + + ~wxLocale(); + + bool AddCatalog( + const wxString & domain + ); + + bool AddCatalog( + const wxString & domain, + wxLanguage msgIdLanguage + ); + + bool AddCatalog( + const wxString & domain, + wxLanguage msgIdLanguage, + const wxString & msgIdCharset + ); + + wxString GetCanonicalName(); + + wxString GetHeaderValue( + const wxString & header, + const wxString & domain = wxEmptyString + ); + + int GetLanguage(); + + const wxString & GetLocale(); + + const wxString & GetName(); + + const wxString & GetString( + const wxString & origString, + const wxString & domain = wxEmptyString + ); + + const wxString & GetString( + const wxString & origString, + const wxString & origString2, + unsigned n, + const wxString & domain = wxEmptyString + ); + + wxString GetSysName(); + + bool Init( + int language = wxLANGUAGE_DEFAULT, + int flags = wxLOCALE_LOAD_DEFAULT + ); + + bool Init( + const wxString & name, + const wxString & shortName = wxEmptyString, + const wxString & locale = wxEmptyString, + bool bLoadDefault = true + ); + + bool IsLoaded( + const wxString & domain + ); + + bool IsOk(); + + static + void AddCatalogLookupPathPrefix( + const wxString & prefix + ); + + static + void AddLanguage( + const wxLanguageInfo & info + ); + + static + const wxLanguageInfo * FindLanguageInfo( + const wxString & locale + ); + + static + const wxLanguageInfo * GetLanguageInfo( + int lang + ); + + static + wxString GetLanguageName( + int lang + ); + + static + wxString GetLanguageCanonicalName( + int lang + ); + + static + wxFontEncoding GetSystemEncoding(); + + static + wxString GetSystemEncodingName(); + + static + int GetSystemLanguage(); + + static + wxString GetInfo( + wxLocaleInfo index, + wxLocaleCategory cat = wxLOCALE_CAT_DEFAULT + ); + + static + bool IsAvailable( + int lang + ); + + private: + wxLocale& operator=(const wxLocale&); + + + private: + wxLocale(const wxLocale&); + + +}; // end of class wxLocale + + +enum wxLanguage +{ + wxLANGUAGE_DEFAULT, + wxLANGUAGE_UNKNOWN, + wxLANGUAGE_ABKHAZIAN, + wxLANGUAGE_AFAR, + wxLANGUAGE_AFRIKAANS, + wxLANGUAGE_ALBANIAN, + wxLANGUAGE_AMHARIC, + wxLANGUAGE_ARABIC, + wxLANGUAGE_ARABIC_ALGERIA, + wxLANGUAGE_ARABIC_BAHRAIN, + wxLANGUAGE_ARABIC_EGYPT, + wxLANGUAGE_ARABIC_IRAQ, + wxLANGUAGE_ARABIC_JORDAN, + wxLANGUAGE_ARABIC_KUWAIT, + wxLANGUAGE_ARABIC_LEBANON, + wxLANGUAGE_ARABIC_LIBYA, + wxLANGUAGE_ARABIC_MOROCCO, + wxLANGUAGE_ARABIC_OMAN, + wxLANGUAGE_ARABIC_QATAR, + wxLANGUAGE_ARABIC_SAUDI_ARABIA, + wxLANGUAGE_ARABIC_SUDAN, + wxLANGUAGE_ARABIC_SYRIA, + wxLANGUAGE_ARABIC_TUNISIA, + wxLANGUAGE_ARABIC_UAE, + wxLANGUAGE_ARABIC_YEMEN, + wxLANGUAGE_ARMENIAN, + wxLANGUAGE_ASSAMESE, + wxLANGUAGE_ASTURIAN, + wxLANGUAGE_AYMARA, + wxLANGUAGE_AZERI, + wxLANGUAGE_AZERI_CYRILLIC, + wxLANGUAGE_AZERI_LATIN, + wxLANGUAGE_BASHKIR, + wxLANGUAGE_BASQUE, + wxLANGUAGE_BELARUSIAN, + wxLANGUAGE_BENGALI, + wxLANGUAGE_BHUTANI, + wxLANGUAGE_BIHARI, + wxLANGUAGE_BISLAMA, + wxLANGUAGE_BOSNIAN, + wxLANGUAGE_BRETON, + wxLANGUAGE_BULGARIAN, + wxLANGUAGE_BURMESE, + wxLANGUAGE_CAMBODIAN, + wxLANGUAGE_CATALAN, + wxLANGUAGE_CHINESE, + wxLANGUAGE_CHINESE_SIMPLIFIED, + wxLANGUAGE_CHINESE_TRADITIONAL, + wxLANGUAGE_CHINESE_HONGKONG, + wxLANGUAGE_CHINESE_MACAU, + wxLANGUAGE_CHINESE_SINGAPORE, + wxLANGUAGE_CHINESE_TAIWAN, + wxLANGUAGE_CORSICAN, + wxLANGUAGE_CROATIAN, + wxLANGUAGE_CZECH, + wxLANGUAGE_DANISH, + wxLANGUAGE_DUTCH, + wxLANGUAGE_DUTCH_BELGIAN, + wxLANGUAGE_ENGLISH, + wxLANGUAGE_ENGLISH_UK, + wxLANGUAGE_ENGLISH_US, + wxLANGUAGE_ENGLISH_AUSTRALIA, + wxLANGUAGE_ENGLISH_BELIZE, + wxLANGUAGE_ENGLISH_BOTSWANA, + wxLANGUAGE_ENGLISH_CANADA, + wxLANGUAGE_ENGLISH_CARIBBEAN, + wxLANGUAGE_ENGLISH_DENMARK, + wxLANGUAGE_ENGLISH_EIRE, + wxLANGUAGE_ENGLISH_JAMAICA, + wxLANGUAGE_ENGLISH_NEW_ZEALAND, + wxLANGUAGE_ENGLISH_PHILIPPINES, + wxLANGUAGE_ENGLISH_SOUTH_AFRICA, + wxLANGUAGE_ENGLISH_TRINIDAD, + wxLANGUAGE_ENGLISH_ZIMBABWE, + wxLANGUAGE_ESPERANTO, + wxLANGUAGE_ESTONIAN, + wxLANGUAGE_FAEROESE, + wxLANGUAGE_FARSI, + wxLANGUAGE_FIJI, + wxLANGUAGE_FINNISH, + wxLANGUAGE_FRENCH, + wxLANGUAGE_FRENCH_BELGIAN, + wxLANGUAGE_FRENCH_CANADIAN, + wxLANGUAGE_FRENCH_LUXEMBOURG, + wxLANGUAGE_FRENCH_MONACO, + wxLANGUAGE_FRENCH_SWISS, + wxLANGUAGE_FRISIAN, + wxLANGUAGE_GALICIAN, + wxLANGUAGE_GEORGIAN, + wxLANGUAGE_GERMAN, + wxLANGUAGE_GERMAN_AUSTRIAN, + wxLANGUAGE_GERMAN_BELGIUM, + wxLANGUAGE_GERMAN_LIECHTENSTEIN, + wxLANGUAGE_GERMAN_LUXEMBOURG, + wxLANGUAGE_GERMAN_SWISS, + wxLANGUAGE_GREEK, + wxLANGUAGE_GREENLANDIC, + wxLANGUAGE_GUARANI, + wxLANGUAGE_GUJARATI, + wxLANGUAGE_HAUSA, + wxLANGUAGE_HEBREW, + wxLANGUAGE_HINDI, + wxLANGUAGE_HUNGARIAN, + wxLANGUAGE_ICELANDIC, + wxLANGUAGE_INDONESIAN, + wxLANGUAGE_INTERLINGUA, + wxLANGUAGE_INTERLINGUE, + wxLANGUAGE_INUKTITUT, + wxLANGUAGE_INUPIAK, + wxLANGUAGE_IRISH, + wxLANGUAGE_ITALIAN, + wxLANGUAGE_ITALIAN_SWISS, + wxLANGUAGE_JAPANESE, + wxLANGUAGE_JAVANESE, + wxLANGUAGE_KANNADA, + wxLANGUAGE_KASHMIRI, + wxLANGUAGE_KASHMIRI_INDIA, + wxLANGUAGE_KAZAKH, + wxLANGUAGE_KERNEWEK, + wxLANGUAGE_KINYARWANDA, + wxLANGUAGE_KIRGHIZ, + wxLANGUAGE_KIRUNDI, + wxLANGUAGE_KONKANI, + wxLANGUAGE_KOREAN, + wxLANGUAGE_KURDISH, + wxLANGUAGE_LAOTHIAN, + wxLANGUAGE_LATIN, + wxLANGUAGE_LATVIAN, + wxLANGUAGE_LINGALA, + wxLANGUAGE_LITHUANIAN, + wxLANGUAGE_MACEDONIAN, + wxLANGUAGE_MALAGASY, + wxLANGUAGE_MALAY, + wxLANGUAGE_MALAYALAM, + wxLANGUAGE_MALAY_BRUNEI_DARUSSALAM, + wxLANGUAGE_MALAY_MALAYSIA, + wxLANGUAGE_MALTESE, + wxLANGUAGE_MANIPURI, + wxLANGUAGE_MAORI, + wxLANGUAGE_MARATHI, + wxLANGUAGE_MOLDAVIAN, + wxLANGUAGE_MONGOLIAN, + wxLANGUAGE_NAURU, + wxLANGUAGE_NEPALI, + wxLANGUAGE_NEPALI_INDIA, + wxLANGUAGE_NORWEGIAN_BOKMAL, + wxLANGUAGE_NORWEGIAN_NYNORSK, + wxLANGUAGE_OCCITAN, + wxLANGUAGE_ORIYA, + wxLANGUAGE_OROMO, + wxLANGUAGE_PASHTO, + wxLANGUAGE_POLISH, + wxLANGUAGE_PORTUGUESE, + wxLANGUAGE_PORTUGUESE_BRAZILIAN, + wxLANGUAGE_PUNJABI, + wxLANGUAGE_QUECHUA, + wxLANGUAGE_RHAETO_ROMANCE, + wxLANGUAGE_ROMANIAN, + wxLANGUAGE_RUSSIAN, + wxLANGUAGE_RUSSIAN_UKRAINE, + wxLANGUAGE_SAMI, + wxLANGUAGE_SAMOAN, + wxLANGUAGE_SANGHO, + wxLANGUAGE_SANSKRIT, + wxLANGUAGE_SCOTS_GAELIC, + wxLANGUAGE_SERBIAN, + wxLANGUAGE_SERBIAN_CYRILLIC, + wxLANGUAGE_SERBIAN_LATIN, + wxLANGUAGE_SERBO_CROATIAN, + wxLANGUAGE_SESOTHO, + wxLANGUAGE_SETSWANA, + wxLANGUAGE_SHONA, + wxLANGUAGE_SINDHI, + wxLANGUAGE_SINHALESE, + wxLANGUAGE_SISWATI, + wxLANGUAGE_SLOVAK, + wxLANGUAGE_SLOVENIAN, + wxLANGUAGE_SOMALI, + wxLANGUAGE_SPANISH, + wxLANGUAGE_SPANISH_ARGENTINA, + wxLANGUAGE_SPANISH_BOLIVIA, + wxLANGUAGE_SPANISH_CHILE, + wxLANGUAGE_SPANISH_COLOMBIA, + wxLANGUAGE_SPANISH_COSTA_RICA, + wxLANGUAGE_SPANISH_DOMINICAN_REPUBLIC, + wxLANGUAGE_SPANISH_ECUADOR, + wxLANGUAGE_SPANISH_EL_SALVADOR, + wxLANGUAGE_SPANISH_GUATEMALA, + wxLANGUAGE_SPANISH_HONDURAS, + wxLANGUAGE_SPANISH_MEXICAN, + wxLANGUAGE_SPANISH_MODERN, + wxLANGUAGE_SPANISH_NICARAGUA, + wxLANGUAGE_SPANISH_PANAMA, + wxLANGUAGE_SPANISH_PARAGUAY, + wxLANGUAGE_SPANISH_PERU, + wxLANGUAGE_SPANISH_PUERTO_RICO, + wxLANGUAGE_SPANISH_URUGUAY, + wxLANGUAGE_SPANISH_US, + wxLANGUAGE_SPANISH_VENEZUELA, + wxLANGUAGE_SUNDANESE, + wxLANGUAGE_SWAHILI, + wxLANGUAGE_SWEDISH, + wxLANGUAGE_SWEDISH_FINLAND, + wxLANGUAGE_TAGALOG, + wxLANGUAGE_TAJIK, + wxLANGUAGE_TAMIL, + wxLANGUAGE_TATAR, + wxLANGUAGE_TELUGU, + wxLANGUAGE_THAI, + wxLANGUAGE_TIBETAN, + wxLANGUAGE_TIGRINYA, + wxLANGUAGE_TONGA, + wxLANGUAGE_TSONGA, + wxLANGUAGE_TURKISH, + wxLANGUAGE_TURKMEN, + wxLANGUAGE_TWI, + wxLANGUAGE_UIGHUR, + wxLANGUAGE_UKRAINIAN, + wxLANGUAGE_URDU, + wxLANGUAGE_URDU_INDIA, + wxLANGUAGE_URDU_PAKISTAN, + wxLANGUAGE_UZBEK, + wxLANGUAGE_UZBEK_CYRILLIC, + wxLANGUAGE_UZBEK_LATIN, + wxLANGUAGE_VALENCIAN, + wxLANGUAGE_VIETNAMESE, + wxLANGUAGE_VOLAPUK, + wxLANGUAGE_WELSH, + wxLANGUAGE_WOLOF, + wxLANGUAGE_XHOSA, + wxLANGUAGE_YIDDISH, + wxLANGUAGE_YORUBA, + wxLANGUAGE_ZHUANG, + wxLANGUAGE_ZULU, + wxLANGUAGE_USER_DEFINED +}; + +enum wxLayoutDirection +{ + wxLayout_Default, + wxLayout_LeftToRight, + wxLayout_RightToLeft +}; + +enum wxLocaleCategory +{ + wxLOCALE_CAT_NUMBER, + wxLOCALE_CAT_DATE, + wxLOCALE_CAT_MONEY, + wxLOCALE_CAT_DEFAULT +}; + +enum wxLocaleInfo +{ + wxLOCALE_THOUSANDS_SEP, + wxLOCALE_DECIMAL_POINT, + wxLOCALE_SHORT_DATE_FMT, + wxLOCALE_LONG_DATE_FMT, + wxLOCALE_DATE_TIME_FMT, + wxLOCALE_TIME_FMT +}; + + +//--------------------------------------------------------------------------- + diff --git a/sip/gen/kbdstate.sip b/sip/gen/kbdstate.sip index 4cad58c0..3ab007f9 100644 --- a/sip/gen/kbdstate.sip +++ b/sip/gen/kbdstate.sip @@ -13,9 +13,10 @@ class wxKeyboardState { -%TypeHeaderCode - #include -%End + %TypeHeaderCode + #include + %End + public: wxKeyboardState( diff --git a/sip/gen/mousestate.sip b/sip/gen/mousestate.sip index 83999e24..f7b230b4 100644 --- a/sip/gen/mousestate.sip +++ b/sip/gen/mousestate.sip @@ -13,9 +13,10 @@ class wxMouseState : wxKeyboardState { -%TypeHeaderCode - #include -%End + %TypeHeaderCode + #include + %End + public: wxMouseState(); diff --git a/sip/gen/object.sip b/sip/gen/object.sip index 0628e95b..fe26388b 100644 --- a/sip/gen/object.sip +++ b/sip/gen/object.sip @@ -13,9 +13,10 @@ class wxRefCounter { -%TypeHeaderCode - #include -%End + %TypeHeaderCode + #include + %End + public: wxRefCounter(); @@ -36,9 +37,10 @@ protected: class wxObject { -%TypeHeaderCode - #include -%End + %TypeHeaderCode + #include + %End + public: wxObject(); @@ -50,15 +52,8 @@ public: virtual ~wxObject(); - virtual - wxClassInfo * GetClassInfo(); - wxObjectRefData * GetRefData(); - bool IsKindOf( - const wxClassInfo * info - ); - bool IsSameAs( const wxObject & obj ); @@ -75,40 +70,19 @@ public: void UnShare(); + const wxChar* GetClassName(); + %MethodCode + sipRes = sipCpp->GetClassInfo()->GetClassName(); + %End + + void Destroy() /TranserThis/; + %MethodCode + delete sipCpp; + %End + }; // end of class wxObject -class wxClassInfo /Abstract/ -{ -%TypeHeaderCode - #include -%End - -public: - wxObject * CreateObject(); - - const wxChar * GetBaseClassName1(); - - const wxChar * GetBaseClassName2(); - - const wxChar * GetClassName(); - - int GetSize(); - - bool IsDynamic(); - - bool IsKindOf( - const wxClassInfo * info - ); - - static - wxClassInfo * FindClass( - const wxString & className - ); - -}; // end of class wxClassInfo - - typedef wxRefCounter wxObjectRefData; diff --git a/sip/gen/platinfo.sip b/sip/gen/platinfo.sip new file mode 100644 index 00000000..1c477f63 --- /dev/null +++ b/sip/gen/platinfo.sip @@ -0,0 +1,241 @@ +//--------------------------------------------------------------------------- +// This file is generated by wxPython's SIP generator. Do not edit by hand. +// +// Copyright: (c) 2010 by Total Control Software +// License: wxWindows License +// +// This file will be included by _core.sip +// +//--------------------------------------------------------------------------- + + +//--------------------------------------------------------------------------- + +class wxPlatformInfo +{ + %TypeHeaderCode + #include + %End + + +public: + wxPlatformInfo( + wxPortId pid = wxPORT_UNKNOWN, + int tkMajor = -1, + int tkMinor = -1, + wxOperatingSystemId id = wxOS_UNKNOWN, + int osMajor = -1, + int osMinor = -1, + wxArchitecture arch = wxARCH_INVALID, + wxEndianness endian = wxENDIAN_INVALID + ); + + wxArchitecture GetArchitecture(); + + wxEndianness GetEndianness(); + + static + wxEndianness GetEndianness( + const wxString & end + ); + + int GetOSMajorVersion(); + + int GetOSMinorVersion(); + + wxOperatingSystemId GetOperatingSystemId(); + + static + wxOperatingSystemId GetOperatingSystemId( + const wxString & name + ); + + wxString GetOperatingSystemDescription(); + + wxPortId GetPortId(); + + static + wxPortId GetPortId( + const wxString & portname + ); + + wxString GetDesktopEnvironment(); + + int GetToolkitMajorVersion(); + + int GetToolkitMinorVersion(); + + wxString GetArchName(); + + static + wxString GetArchName( + wxArchitecture arch + ); + + wxString GetEndiannessName(); + + static + wxString GetEndiannessName( + wxEndianness end + ); + + wxString GetOperatingSystemFamilyName(); + + static + wxString GetOperatingSystemFamilyName( + wxOperatingSystemId os + ); + + wxString GetOperatingSystemIdName(); + + static + wxString GetOperatingSystemIdName( + wxOperatingSystemId os + ); + + wxString GetPortIdName(); + + static + wxString GetPortIdName( + wxPortId port, + bool usingUniversal + ); + + wxString GetPortIdShortName(); + + static + wxString GetPortIdShortName( + wxPortId port, + bool usingUniversal + ); + + void SetArchitecture( + wxArchitecture n + ); + + void SetEndianness( + wxEndianness n + ); + + void SetOSVersion( + int major, + int minor + ); + + void SetOperatingSystemId( + wxOperatingSystemId n + ); + + void SetPortId( + wxPortId n + ); + + void SetToolkitVersion( + int major, + int minor + ); + + void SetOperatingSystemDescription( + const wxString & desc + ); + + void SetDesktopEnvironment( + const wxString & de + ); + + static + wxArchitecture GetArch( + const wxString & arch + ); + + static + wxString GetOperatingSystemDirectory(); + + bool CheckOSVersion( + int major, + int minor + ); + + bool CheckToolkitVersion( + int major, + int minor + ); + + bool IsOk(); + + bool IsUsingUniversalWidgets(); + + bool operator!=( + const wxPlatformInfo & t + ); + + bool operator==( + const wxPlatformInfo & t + ); + + static + const wxPlatformInfo & Get(); + +}; // end of class wxPlatformInfo + + +enum wxOperatingSystemId +{ + wxOS_UNKNOWN, + wxOS_MAC_OS, + wxOS_MAC_OSX_DARWIN, + wxOS_MAC, + wxOS_WINDOWS_9X, + wxOS_WINDOWS_NT, + wxOS_WINDOWS_MICRO, + wxOS_WINDOWS_CE, + wxOS_WINDOWS, + wxOS_UNIX_LINUX, + wxOS_UNIX_FREEBSD, + wxOS_UNIX_OPENBSD, + wxOS_UNIX_NETBSD, + wxOS_UNIX_SOLARIS, + wxOS_UNIX_AIX, + wxOS_UNIX_HPUX, + wxOS_UNIX, + wxOS_DOS, + wxOS_OS2 +}; + +enum wxPortId +{ + wxPORT_UNKNOWN, + wxPORT_BASE, + wxPORT_MSW, + wxPORT_MOTIF, + wxPORT_GTK, + wxPORT_MGL, + wxPORT_X11, + wxPORT_OS2, + wxPORT_MAC, + wxPORT_COCOA, + wxPORT_WINCE, + wxPORT_PALMOS, + wxPORT_DFB +}; + +enum wxArchitecture +{ + wxARCH_INVALID, + wxARCH_32, + wxARCH_64, + wxARCH_MAX +}; + +enum wxEndianness +{ + wxENDIAN_INVALID, + wxENDIAN_BIG, + wxENDIAN_LITTLE, + wxENDIAN_PDP, + wxENDIAN_MAX +}; + + +//--------------------------------------------------------------------------- + diff --git a/sip/gen/tracker.sip b/sip/gen/tracker.sip index 6292c1e1..9a98727a 100644 --- a/sip/gen/tracker.sip +++ b/sip/gen/tracker.sip @@ -13,12 +13,12 @@ class wxTrackable /Abstract/ { -%TypeHeaderCode - #include -%End + %TypeHeaderCode + #include + %End + public: - private: ~wxTrackable(); diff --git a/sip/gen/vidmode.sip b/sip/gen/vidmode.sip new file mode 100644 index 00000000..043a301c --- /dev/null +++ b/sip/gen/vidmode.sip @@ -0,0 +1,62 @@ +//--------------------------------------------------------------------------- +// This file is generated by wxPython's SIP generator. Do not edit by hand. +// +// Copyright: (c) 2010 by Total Control Software +// License: wxWindows License +// +// This file will be included by _core.sip +// +//--------------------------------------------------------------------------- + + +//--------------------------------------------------------------------------- + +struct wxVideoMode +{ + %TypeHeaderCode + #include + %End + + wxVideoMode( + int width = 0, + int height = 0, + int depth = 0, + int freq = 0 + ); + + int w; + + int h; + + int bpp; + + int refresh; + + bool Matches( + const wxVideoMode & other + ); + + int GetWidth(); + + int GetHeight(); + + int GetDepth(); + + bool IsOk(); + + bool operator==( + const wxVideoMode & m + ); + + bool operator!=( + const wxVideoMode & mode + ); + +}; // end of class wxVideoMode + + +const wxVideoMode wxDefaultVideoMode; + + +//--------------------------------------------------------------------------- + diff --git a/sip/gen/windowid.sip b/sip/gen/windowid.sip index 5c955075..c6124602 100644 --- a/sip/gen/windowid.sip +++ b/sip/gen/windowid.sip @@ -13,9 +13,10 @@ class wxIdManager { -%TypeHeaderCode - #include -%End + %TypeHeaderCode + #include + %End + public: static