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

Renamed the core namespace's submodules to have a leading underscore.

Browse Source 
This is so epydoc will automatically mark them as private and won't
document the objects they contain (they'll be docmented via the wx
module.)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26945 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2004-04-25 06:51:10 +00:00
parent a95a71334c
commit 54f9ee4509
83 changed files with 9395 additions and 371341 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wxPython/config.py
+15 -6
View File
@@ -274,7 +274,8 @@ def Verify_WX_CONFIG():
def run_swig(files, dir, gendir, package, USE_SWIG, force, swig_args, swig_deps=[]):
def run_swig(files, dir, gendir, package, USE_SWIG, force, swig_args,
swig_deps=[], add_under=False):
"""Run SWIG the way I want it done"""
if USE_SWIG and not os.path.exists(os.path.join(dir, gendir)):
@@ -285,13 +286,21 @@ def run_swig(files, dir, gendir, package, USE_SWIG, force, swig_args, swig_deps=
sources = []
if add_under: pre = '_'
else: pre = ''
for file in files:
basefile = os.path.splitext(file)[0]
i_file = os.path.join(dir, file)
py_file = os.path.join(dir, gendir, basefile+'.py')
cpp_file = os.path.join(dir, gendir, basefile+'_wrap.cpp')
py_file = os.path.join(dir, gendir, pre+basefile+'.py')
cpp_file = os.path.join(dir, gendir, pre+basefile+'_wrap.cpp')
xml_file = os.path.join("docs", "xml-raw", basefile+'_swig.xml')
if add_under:
interface = ['-interface', '_'+basefile+'_']
else:
interface = []
sources.append(cpp_file)
if not cleaning and USE_SWIG:
@@ -320,14 +329,14 @@ def run_swig(files, dir, gendir, package, USE_SWIG, force, swig_args, swig_deps=
# Next run build_renamers to process the XML
cmd = [ sys.executable, '-u',
'./distrib/build_renamers.py', dir, basefile, xmltemp]
'./distrib/build_renamers.py', dir, pre+basefile, xmltemp]
msg(' '.join(cmd))
spawn(cmd)
os.remove(xmltemp)
# Then run swig for real
cmd = [ swig_cmd ] + swig_args + ['-I'+dir, '-o', cpp_file,
'-xmlout', xml_file, i_file]
cmd = [ swig_cmd ] + swig_args + interface + \
['-I'+dir, '-o', cpp_file, '-xmlout', xml_file, i_file]
msg(' '.join(cmd))
spawn(cmd)
wxPython/contrib/activex/activex.i
+1 -1
View File
@@ -24,7 +24,7 @@
//---------------------------------------------------------------------------
%import core.i
%pythoncode { wx = core }
%pythoncode { wx = _core }
%pythoncode { __docfilter__ = wx.__docfilter__ }
MAKE_CONST_WXSTRING_NOSWIG(PanelNameStr);
wxPython/contrib/gizmos/gizmos.i
+1 -1
View File
@@ -35,7 +35,7 @@
%import windows.i
%import controls.i
%pythoncode { wx = core }
%pythoncode { wx = _core }
%pythoncode { __docfilter__ = wx.__docfilter__ }
wxPython/contrib/gizmos/gtk/gizmos.py
+15 -15
View File
@@ -3,16 +3,16 @@
import _gizmos
import windows
import core
import controls
wx = core
import _windows
import _core
import _controls
wx = _core
__docfilter__ = wx.__docfilter__
wxEVT_DYNAMIC_SASH_SPLIT = _gizmos.wxEVT_DYNAMIC_SASH_SPLIT
wxEVT_DYNAMIC_SASH_UNIFY = _gizmos.wxEVT_DYNAMIC_SASH_UNIFY
DS_MANAGE_SCROLLBARS = _gizmos.DS_MANAGE_SCROLLBARS
DS_DRAG_CORNER = _gizmos.DS_DRAG_CORNER
class DynamicSashSplitEvent(core.CommandEvent):
class DynamicSashSplitEvent(_core.CommandEvent):
def __repr__(self):
return "<%s.%s; proxy of C++ wxDynamicSashSplitEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
def __init__(self, *args, **kwargs):
@@ -33,7 +33,7 @@ DynamicSashNameStr = cvar.DynamicSashNameStr
EditableListBoxNameStr = cvar.EditableListBoxNameStr
TreeListCtrlNameStr = cvar.TreeListCtrlNameStr
class DynamicSashUnifyEvent(core.CommandEvent):
class DynamicSashUnifyEvent(_core.CommandEvent):
def __repr__(self):
return "<%s.%s; proxy of C++ wxDynamicSashUnifyEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
def __init__(self, *args, **kwargs):
@@ -50,7 +50,7 @@ class DynamicSashUnifyEventPtr(DynamicSashUnifyEvent):
self.__class__ = DynamicSashUnifyEvent
_gizmos.DynamicSashUnifyEvent_swigregister(DynamicSashUnifyEventPtr)
class DynamicSashWindow(core.Window):
class DynamicSashWindow(_core.Window):
def __repr__(self):
return "<%s.%s; proxy of C++ wxDynamicSashWindow instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
def __init__(self, *args, **kwargs):
@@ -101,7 +101,7 @@ EVT_DYNAMIC_SASH_UNIFY = wx.PyEventBinder( wxEVT_DYNAMIC_SASH_UNIFY, 1 )
EL_ALLOW_NEW = _gizmos.EL_ALLOW_NEW
EL_ALLOW_EDIT = _gizmos.EL_ALLOW_EDIT
EL_ALLOW_DELETE = _gizmos.EL_ALLOW_DELETE
class EditableListBox(windows.Panel):
class EditableListBox(_windows.Panel):
def __repr__(self):
return "<%s.%s; proxy of C++ wxEditableListBox instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
def __init__(self, *args, **kwargs):
@@ -156,7 +156,7 @@ class EditableListBoxPtr(EditableListBox):
self.__class__ = EditableListBox
_gizmos.EditableListBox_swigregister(EditableListBoxPtr)
class RemotelyScrolledTreeCtrl(controls.TreeCtrl):
class RemotelyScrolledTreeCtrl(_controls.TreeCtrl):
def __repr__(self):
return "<%s.%s; proxy of C++ wxRemotelyScrolledTreeCtrl instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
def __init__(self, *args, **kwargs):
@@ -202,7 +202,7 @@ class RemotelyScrolledTreeCtrlPtr(RemotelyScrolledTreeCtrl):
self.__class__ = RemotelyScrolledTreeCtrl
_gizmos.RemotelyScrolledTreeCtrl_swigregister(RemotelyScrolledTreeCtrlPtr)
class TreeCompanionWindow(core.Window):
class TreeCompanionWindow(_core.Window):
def __repr__(self):
return "<%s.%s; proxy of C++ wxPyTreeCompanionWindow instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
def __init__(self, *args, **kwargs):
@@ -236,7 +236,7 @@ class TreeCompanionWindowPtr(TreeCompanionWindow):
self.__class__ = TreeCompanionWindow
_gizmos.TreeCompanionWindow_swigregister(TreeCompanionWindowPtr)
class ThinSplitterWindow(windows.SplitterWindow):
class ThinSplitterWindow(_windows.SplitterWindow):
def __repr__(self):
return "<%s.%s; proxy of C++ wxThinSplitterWindow instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
def __init__(self, *args, **kwargs):
@@ -258,7 +258,7 @@ class ThinSplitterWindowPtr(ThinSplitterWindow):
self.__class__ = ThinSplitterWindow
_gizmos.ThinSplitterWindow_swigregister(ThinSplitterWindowPtr)
class SplitterScrolledWindow(windows.ScrolledWindow):
class SplitterScrolledWindow(_windows.ScrolledWindow):
def __repr__(self):
return "<%s.%s; proxy of C++ wxSplitterScrolledWindow instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
def __init__(self, *args, **kwargs):
@@ -285,7 +285,7 @@ LED_ALIGN_RIGHT = _gizmos.LED_ALIGN_RIGHT
LED_ALIGN_CENTER = _gizmos.LED_ALIGN_CENTER
LED_ALIGN_MASK = _gizmos.LED_ALIGN_MASK
LED_DRAW_FADED = _gizmos.LED_DRAW_FADED
class LEDNumberCtrl(core.Control):
class LEDNumberCtrl(_core.Control):
def __repr__(self):
return "<%s.%s; proxy of C++ wxLEDNumberCtrl instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
def __init__(self, *args, **kwargs):
@@ -348,7 +348,7 @@ TL_ALIGN_LEFT = _gizmos.TL_ALIGN_LEFT
TL_ALIGN_RIGHT = _gizmos.TL_ALIGN_RIGHT
TL_ALIGN_CENTER = _gizmos.TL_ALIGN_CENTER
TREE_HITTEST_ONITEMCOLUMN = _gizmos.TREE_HITTEST_ONITEMCOLUMN
class TreeListColumnInfo(core.Object):
class TreeListColumnInfo(_core.Object):
def __repr__(self):
return "<%s.%s; proxy of C++ wxTreeListColumnInfo instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
def __init__(self, *args, **kwargs):
@@ -408,7 +408,7 @@ class TreeListColumnInfoPtr(TreeListColumnInfo):
self.__class__ = TreeListColumnInfo
_gizmos.TreeListColumnInfo_swigregister(TreeListColumnInfoPtr)
class TreeListCtrl(core.Control):
class TreeListCtrl(_core.Control):
def __repr__(self):
return "<%s.%s; proxy of C++ wxPyTreeListCtrl instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
def __init__(self, *args, **kwargs):
wxPython/contrib/glcanvas/glcanvas.i
+1 -1
View File
@@ -24,7 +24,7 @@
//---------------------------------------------------------------------------
%import core.i
%pythoncode { wx = core }
%pythoncode { wx = _core }
%pythoncode { __docfilter__ = wx.__docfilter__ }
wxPython/contrib/glcanvas/gtk/glcanvas.py
+4 -4
View File
@@ -3,10 +3,10 @@
import _glcanvas
import core
wx = core
import _core
wx = _core
__docfilter__ = wx.__docfilter__
class GLContext(core.Object):
class GLContext(_core.Object):
def __repr__(self):
return "<%s.%s; proxy of C++ wxGLContext instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
def __init__(self, *args, **kwargs):
@@ -82,7 +82,7 @@ WX_GL_MIN_ACCUM_RED = _glcanvas.WX_GL_MIN_ACCUM_RED
WX_GL_MIN_ACCUM_GREEN = _glcanvas.WX_GL_MIN_ACCUM_GREEN
WX_GL_MIN_ACCUM_BLUE = _glcanvas.WX_GL_MIN_ACCUM_BLUE
WX_GL_MIN_ACCUM_ALPHA = _glcanvas.WX_GL_MIN_ACCUM_ALPHA
class GLCanvas(core.Window):
class GLCanvas(_core.Window):
def __repr__(self):
return "<%s.%s; proxy of C++ wxGLCanvas instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
def __init__(self, *args, **kwargs):
wxPython/contrib/iewin/iewin.i
+1 -1
View File
@@ -24,7 +24,7 @@
//---------------------------------------------------------------------------
%import core.i
%pythoncode { wx = core }
%pythoncode { wx = _core }
%pythoncode { __docfilter__ = wx.__docfilter__ }
MAKE_CONST_WXSTRING_NOSWIG(PanelNameStr);
wxPython/contrib/ogl/gtk/ogl.py
+11 -11
View File
@@ -3,13 +3,13 @@
import _ogl
import windows
import core
wx = core
import _windows
import _core
wx = _core
__docfilter__ = wx.__docfilter__
#---------------------------------------------------------------------------
class ShapeRegion(core.Object):
class ShapeRegion(_core.Object):
def __repr__(self):
return "<%s.%s; proxy of C++ wxShapeRegion instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
def __init__(self, *args, **kwargs):
@@ -138,7 +138,7 @@ class ShapeRegionPtr(ShapeRegion):
self.__class__ = ShapeRegion
_ogl.ShapeRegion_swigregister(ShapeRegionPtr)
class AttachmentPoint(core.Object):
class AttachmentPoint(_core.Object):
def __repr__(self):
return "<%s.%s; proxy of C++ wxAttachmentPoint instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
def __init__(self, *args, **kwargs):
@@ -158,7 +158,7 @@ class AttachmentPointPtr(AttachmentPoint):
self.__class__ = AttachmentPoint
_ogl.AttachmentPoint_swigregister(AttachmentPointPtr)
class PyShapeEvtHandler(core.Object):
class PyShapeEvtHandler(_core.Object):
def __repr__(self):
return "<%s.%s; proxy of C++ wxPyShapeEvtHandler instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
def __init__(self, *args, **kwargs):
@@ -1066,7 +1066,7 @@ _ogl.PyShape_swigregister(PyShapePtr)
oglMETAFLAGS_OUTLINE = _ogl.oglMETAFLAGS_OUTLINE
oglMETAFLAGS_ATTACHMENTS = _ogl.oglMETAFLAGS_ATTACHMENTS
class PseudoMetaFile(core.Object):
class PseudoMetaFile(_core.Object):
def __repr__(self):
return "<%s.%s; proxy of C++ wxPseudoMetaFile instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
def __init__(self, *args, **kwargs):
@@ -2005,7 +2005,7 @@ class PyDrawnShapePtr(PyDrawnShape):
self.__class__ = PyDrawnShape
_ogl.PyDrawnShape_swigregister(PyDrawnShapePtr)
class OGLConstraint(core.Object):
class OGLConstraint(_core.Object):
def __repr__(self):
return "<%s.%s; proxy of C++ wxOGLConstraint instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
def __init__(self, *args, **kwargs):
@@ -2960,7 +2960,7 @@ class PyCircleShapePtr(PyCircleShape):
self.__class__ = PyCircleShape
_ogl.PyCircleShape_swigregister(PyCircleShapePtr)
class ArrowHead(core.Object):
class ArrowHead(_core.Object):
def __repr__(self):
return "<%s.%s; proxy of C++ wxArrowHead instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
def __init__(self, *args, **kwargs):
@@ -3737,7 +3737,7 @@ class PyTextShapePtr(PyTextShape):
self.__class__ = PyTextShape
_ogl.PyTextShape_swigregister(PyTextShapePtr)
class Diagram(core.Object):
class Diagram(_core.Object):
def __repr__(self):
return "<%s.%s; proxy of C++ wxDiagram instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
def __init__(self, *args, **kwargs):
@@ -3850,7 +3850,7 @@ class DiagramPtr(Diagram):
self.__class__ = Diagram
_ogl.Diagram_swigregister(DiagramPtr)
class PyShapeCanvas(windows.ScrolledWindow):
class PyShapeCanvas(_windows.ScrolledWindow):
def __repr__(self):
return "<%s.%s; proxy of C++ wxPyShapeCanvas instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
def __init__(self, *args, **kwargs):
wxPython/contrib/ogl/ogl.i
+1 -1
View File
@@ -23,7 +23,7 @@
//---------------------------------------------------------------------------
%import windows.i
%pythoncode { wx = core }
%pythoncode { wx = _core }
%pythoncode { __docfilter__ = wx.__docfilter__ }
wxPython/contrib/stc/gtk/stc.py
+5 -5
View File
@@ -3,9 +3,9 @@
import _stc
import core
import misc
wx = core
import _core
import _misc
wx = _core
__docfilter__ = wx.__docfilter__
STC_USE_DND = _stc.STC_USE_DND
STC_USE_POPUP = _stc.STC_USE_POPUP
@@ -889,7 +889,7 @@ STC_CMD_WORDLEFTEND = _stc.STC_CMD_WORDLEFTEND
STC_CMD_WORDLEFTENDEXTEND = _stc.STC_CMD_WORDLEFTENDEXTEND
STC_CMD_WORDRIGHTEND = _stc.STC_CMD_WORDRIGHTEND
STC_CMD_WORDRIGHTENDEXTEND = _stc.STC_CMD_WORDRIGHTENDEXTEND
class StyledTextCtrl(core.Control):
class StyledTextCtrl(_core.Control):
def __repr__(self):
return "<%s.%s; proxy of C++ wxStyledTextCtrl instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
def __init__(self, *args, **kwargs):
@@ -2627,7 +2627,7 @@ def PreStyledTextCtrl(*args, **kwargs):
val.thisown = 1
return val
class StyledTextEvent(core.CommandEvent):
class StyledTextEvent(_core.CommandEvent):
def __repr__(self):
return "<%s.%s; proxy of C++ wxStyledTextEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
def __init__(self, *args, **kwargs):
wxPython/contrib/stc/stc.i
+1 -1
View File
@@ -24,7 +24,7 @@
%import core.i
%import misc.i // for DnD
%pythoncode { wx = core }
%pythoncode { wx = _core }
%pythoncode { __docfilter__ = wx.__docfilter__ }
MAKE_CONST_WXSTRING(STCNameStr);
wxPython/contrib/xrc/gtk/xrc.py
+5 -5
View File
@@ -3,8 +3,8 @@
import _xrc
import core
wx = core
import _core
wx = _core
__docfilter__ = wx.__docfilter__
#---------------------------------------------------------------------------
@@ -14,7 +14,7 @@ WX_XMLRES_CURRENT_VERSION_RELEASE = _xrc.WX_XMLRES_CURRENT_VERSION_RELEASE
WX_XMLRES_CURRENT_VERSION_REVISION = _xrc.WX_XMLRES_CURRENT_VERSION_REVISION
XRC_USE_LOCALE = _xrc.XRC_USE_LOCALE
XRC_NO_SUBCLASSING = _xrc.XRC_NO_SUBCLASSING
class XmlResource(core.Object):
class XmlResource(_core.Object):
def __repr__(self):
return "<%s.%s; proxy of C++ wxXmlResource instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
def __init__(self, *args, **kwargs):
@@ -401,7 +401,7 @@ def XmlNodeEasy(*args, **kwargs):
val.thisown = 1
return val
class XmlDocument(core.Object):
class XmlDocument(_core.Object):
def __repr__(self):
return "<%s.%s; proxy of C++ wxXmlDocument instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
def __init__(self, *args, **kwargs):
@@ -482,7 +482,7 @@ def EmptyXmlDocument(*args, **kwargs):
#---------------------------------------------------------------------------
class XmlResourceHandler(core.Object):
class XmlResourceHandler(_core.Object):
def __repr__(self):
return "<%s.%s; proxy of C++ wxPyXmlResourceHandler instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
def __init__(self, *args, **kwargs):
wxPython/contrib/xrc/xrc.i
+1 -1
View File
@@ -26,7 +26,7 @@
//---------------------------------------------------------------------------
%import core.i
%pythoncode { wx = core }
%pythoncode { wx = _core }
%pythoncode { __docfilter__ = wx.__docfilter__ }
wxPython/include/wx/wxPython/wxPython.h
+2 -2
View File
@@ -27,9 +27,9 @@
// exported by the wxPython API. It sets a static pointer to a structure of
// function pointers located in the wx._core extension module.
static void wxPyCoreAPI_IMPORT() {
wxPyCoreAPIPtr = (wxPyCoreAPI*)PyCObject_Import("wx._core", "_wxPyCoreAPI");
wxPyCoreAPIPtr = (wxPyCoreAPI*)PyCObject_Import("wx._core_", "_wxPyCoreAPI");
if (! wxPyCoreAPIPtr)
wxPyCoreAPIPtr = (wxPyCoreAPI*)PyCObject_Import("_core", "_wxPyCoreAPI");
wxPyCoreAPIPtr = (wxPyCoreAPI*)PyCObject_Import("_core_", "_wxPyCoreAPI");
}
wxPython/setup.py
+27 -20
View File
@@ -78,8 +78,8 @@ swig_sources = run_swig(['core.i'], 'src', GENDIR, PKGDIR,
'src/_constraints.i',
'src/_core_api.i',
'src/_core_ex.py',
'src/_core_rename.i',
'src/_core_reverse.txt',
'src/__core_rename.i',
'src/__core_reverse.txt',
'src/_defs.i',
'src/_event.i',
'src/_event_ex.py',
@@ -95,7 +95,8 @@ swig_sources = run_swig(['core.i'], 'src', GENDIR, PKGDIR,
'src/_validator.i',
'src/_window.i',
'src/_control.i',
])
],
True)
copy_file('src/__init__.py', PKGDIR, update=1, verbose=0)
CLEANUP.append(opj(PKGDIR, '__init__.py'))
@@ -120,9 +121,9 @@ else:
rc_file = []
ext = Extension('_core', ['src/helpers.cpp',
'src/libpy.c',
] + rc_file + swig_sources,
ext = Extension('_core_', ['src/helpers.cpp',
'src/libpy.c',
] + rc_file + swig_sources,
include_dirs = includes,
define_macros = defines,
@@ -144,7 +145,7 @@ wxpExtensions.append(ext)
# Extension for the GDI module
swig_sources = run_swig(['gdi.i'], 'src', GENDIR, PKGDIR,
USE_SWIG, swig_force, swig_args, swig_deps +
['src/_gdi_rename.i',
['src/__gdi_rename.i',
'src/_bitmap.i',
'src/_colour.i',
'src/_dc.i',
@@ -161,8 +162,9 @@ swig_sources = run_swig(['gdi.i'], 'src', GENDIR, PKGDIR,
'src/_icon.i',
'src/_pen.i',
'src/_palette.i',
])
ext = Extension('_gdi', ['src/drawlist.cpp'] + swig_sources,
],
True)
ext = Extension('_gdi_', ['src/drawlist.cpp'] + swig_sources,
include_dirs = includes,
define_macros = defines,
library_dirs = libdirs,
@@ -181,8 +183,8 @@ wxpExtensions.append(ext)
# Extension for the windows module
swig_sources = run_swig(['windows.i'], 'src', GENDIR, PKGDIR,
USE_SWIG, swig_force, swig_args, swig_deps +
['src/_windows_rename.i',
'src/_windows_reverse.txt',
['src/__windows_rename.i',
'src/__windows_reverse.txt',
'src/_panel.i',
'src/_toplvl.i',
'src/_statusbar.i',
@@ -196,8 +198,9 @@ swig_sources = run_swig(['windows.i'], 'src', GENDIR, PKGDIR,
'src/_mdi.i',
'src/_pywindows.i',
'src/_printfw.i',
])
ext = Extension('_windows', swig_sources,
],
True)
ext = Extension('_windows_', swig_sources,
include_dirs = includes,
define_macros = defines,
library_dirs = libdirs,
@@ -214,8 +217,8 @@ wxpExtensions.append(ext)
# Extension for the controls module
swig_sources = run_swig(['controls.i'], 'src', GENDIR, PKGDIR,
USE_SWIG, swig_force, swig_args, swig_deps +
[ 'src/_controls_rename.i',
'src/_controls_reverse.txt',
[ 'src/__controls_rename.i',
'src/__controls_reverse.txt',
'src/_toolbar.i',
'src/_button.i',
'src/_checkbox.i',
@@ -237,8 +240,9 @@ swig_sources = run_swig(['controls.i'], 'src', GENDIR, PKGDIR,
'src/_pycontrol.i',
'src/_cshelp.i',
'src/_dragimg.i',
])
ext = Extension('_controls', swig_sources,
],
True)
ext = Extension('_controls_', swig_sources,
include_dirs = includes,
define_macros = defines,
library_dirs = libdirs,
@@ -255,7 +259,9 @@ wxpExtensions.append(ext)
# Extension for the misc module
swig_sources = run_swig(['misc.i'], 'src', GENDIR, PKGDIR,
USE_SWIG, swig_force, swig_args, swig_deps +
[ 'src/_settings.i',
[ 'src/__misc_rename.i',
'src/__misc_reverse.txt',
'src/_settings.i',
'src/_functions.i',
'src/_misc.i',
'src/_tipdlg.i',
@@ -272,8 +278,9 @@ swig_sources = run_swig(['misc.i'], 'src', GENDIR, PKGDIR,
'src/_dnd.i',
'src/_display.i',
'src/_clipbrd.i',
])
ext = Extension('_misc', swig_sources,
],
True)
ext = Extension('_misc_', swig_sources,
include_dirs = includes,
define_macros = defines,
library_dirs = libdirs,
wxPython/src/_controls_rename.i → wxPython/src/__controls_rename.i
View File
wxPython/src/_controls_reverse.txt → wxPython/src/__controls_reverse.txt
View File
wxPython/src/_core_rename.i → wxPython/src/__core_rename.i
View File
wxPython/src/_core_reverse.txt → wxPython/src/__core_reverse.txt
View File
wxPython/src/_gdi_rename.i → wxPython/src/__gdi_rename.i
View File
wxPython/src/_gdi_reverse.txt → wxPython/src/__gdi_reverse.txt
View File
wxPython/src/__init__.py
+25 -5
View File
@@ -15,13 +15,33 @@ import __version__
__version__ = __version__.VERSION_STRING
# Load the package namespace with the core classes and such
from wx.core import *
from wx.core import __docfilter__
__all__ = [
# Sub-packages
'build',
'lib',
'py',
'tools',
# wx.core has a 'wx' symbol for internal use. That's kinda silly for
# this namespace so get rid of it.
# other modules
'calendar',
'grid',
'html',
'wizard',
]
# Load the package namespace with the core classes and such
from wx._core import *
del wx
# Load up __all__ with all the names of items that should appear to be
# defined in this pacakge so epydoc will document them that way.
import wx._core
__docfilter__ = wx._core.__docfilter__
__all__ += [name for name in dir(wx._core)
if not (name.startswith('__') and name.endswith('__'))]
#----------------------------------------------------------------------------
wxPython/src/_misc_rename.i → wxPython/src/__misc_rename.i
View File
wxPython/src/_misc_reverse.txt → wxPython/src/__misc_reverse.txt
View File
wxPython/src/_windows_rename.i → wxPython/src/__windows_rename.i
View File
wxPython/src/_windows_reverse.txt → wxPython/src/__windows_reverse.txt
View File
wxPython/src/_app_ex.py
+14 -14
View File
@@ -148,17 +148,17 @@ your Mac."""
# change from wxPyApp_ to wxApp_
App_GetMacSupportPCMenuShortcuts = _core.PyApp_GetMacSupportPCMenuShortcuts
App_GetMacAboutMenuItemId = _core.PyApp_GetMacAboutMenuItemId
App_GetMacPreferencesMenuItemId = _core.PyApp_GetMacPreferencesMenuItemId
App_GetMacExitMenuItemId = _core.PyApp_GetMacExitMenuItemId
App_GetMacHelpMenuTitleName = _core.PyApp_GetMacHelpMenuTitleName
App_SetMacSupportPCMenuShortcuts = _core.PyApp_SetMacSupportPCMenuShortcuts
App_SetMacAboutMenuItemId = _core.PyApp_SetMacAboutMenuItemId
App_SetMacPreferencesMenuItemId = _core.PyApp_SetMacPreferencesMenuItemId
App_SetMacExitMenuItemId = _core.PyApp_SetMacExitMenuItemId
App_SetMacHelpMenuTitleName = _core.PyApp_SetMacHelpMenuTitleName
App_GetComCtl32Version = _core.PyApp_GetComCtl32Version
App_GetMacSupportPCMenuShortcuts = _core_.PyApp_GetMacSupportPCMenuShortcuts
App_GetMacAboutMenuItemId = _core_.PyApp_GetMacAboutMenuItemId
App_GetMacPreferencesMenuItemId = _core_.PyApp_GetMacPreferencesMenuItemId
App_GetMacExitMenuItemId = _core_.PyApp_GetMacExitMenuItemId
App_GetMacHelpMenuTitleName = _core_.PyApp_GetMacHelpMenuTitleName
App_SetMacSupportPCMenuShortcuts = _core_.PyApp_SetMacSupportPCMenuShortcuts
App_SetMacAboutMenuItemId = _core_.PyApp_SetMacAboutMenuItemId
App_SetMacPreferencesMenuItemId = _core_.PyApp_SetMacPreferencesMenuItemId
App_SetMacExitMenuItemId = _core_.PyApp_SetMacExitMenuItemId
App_SetMacHelpMenuTitleName = _core_.PyApp_SetMacHelpMenuTitleName
App_GetComCtl32Version = _core_.PyApp_GetComCtl32Version
#----------------------------------------------------------------------------
@@ -199,7 +199,7 @@ class PyWidgetTester(wx.App):
class __wxPyCleanup:
def __init__(self):
self.cleanup = _core.App_CleanUp
self.cleanup = _core_.App_CleanUp
def __del__(self):
self.cleanup()
@@ -208,9 +208,9 @@ _sys.__wxPythonCleanup = __wxPyCleanup()
## # another possible solution, but it gets called too early...
## if sys.version[0] == '2':
## import atexit
## atexit.register(_core.wxApp_CleanUp)
## atexit.register(_core_.wxApp_CleanUp)
## else:
## sys.exitfunc = _core.wxApp_CleanUp
## sys.exitfunc = _core_.wxApp_CleanUp
#----------------------------------------------------------------------------
wxPython/src/_core_api.i
+2 -2
View File
@@ -128,8 +128,8 @@ PyObject* wxPyMakeSwigPtr(void* ptr, const wxChar* className) {
// Export a C API in a struct. Other modules will be able to load this from
// the wx.core module and will then have safe access to these functions, even if
// they are located in another shared library.
// the wx._core_ module and will then have safe access to these functions,
// even if they are located in another shared library.
static wxPyCoreAPI API = {
(p_SWIG_Python_TypeRegister_t)SWIG_Python_TypeRegister,
wxPython/src/_core_ex.py
+9 -9
View File
@@ -24,9 +24,9 @@ __wxPyPtrTypeMap['wxStatusBar95'] = 'wxStatusBar'
from __version__ import *
__version__ = VERSION_STRING
assert MAJOR_VERSION == _core.MAJOR_VERSION, "wxPython/wxWindows version mismatch"
assert MINOR_VERSION == _core.MINOR_VERSION, "wxPython/wxWindows version mismatch"
if RELEASE_VERSION != _core.RELEASE_VERSION:
assert MAJOR_VERSION == _core_.MAJOR_VERSION, "wxPython/wxWindows version mismatch"
assert MINOR_VERSION == _core_.MINOR_VERSION, "wxPython/wxWindows version mismatch"
if RELEASE_VERSION != _core_.RELEASE_VERSION:
import warnings
warnings.warn("wxPython/wxWindows release number mismatch")
@@ -64,7 +64,7 @@ class PyUnbornObjectError(AttributeError):
class _wxPyUnbornObject(object):
"""
Some stock objects are created when the wx.core module is
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
@@ -236,15 +236,15 @@ def __docfilter__(name):
# Import other modules in this package that should show up in the
# "core" wx namespace
from gdi import *
from windows import *
from controls import *
from misc import *
from _gdi import *
from _windows import *
from _controls import *
from _misc import *
# Fixup the stock objects since they can't be used yet. (They will be
# restored in wx.PyApp.OnInit.)
_core._wxPyFixStockObjects()
_core_._wxPyFixStockObjects()
#----------------------------------------------------------------------------
#----------------------------------------------------------------------------
wxPython/src/calendar.i
+1 -1
View File
@@ -23,7 +23,7 @@
//----------------------------------------------------------------------
%import misc.i
%pythoncode { wx = core }
%pythoncode { wx = _core }
%pythoncode { __docfilter__ = wx.__docfilter__ }
%include _calendar_rename.i
wxPython/src/controls.i
+3 -3
View File
@@ -10,7 +10,7 @@
// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
%module controls
%module _controls
//---------------------------------------------------------------------------
@@ -22,10 +22,10 @@
//---------------------------------------------------------------------------
%import core.i
%pythoncode { wx = core }
%pythoncode { wx = _core }
%pythoncode { __docfilter__ = wx.__docfilter__ }
%include _controls_rename.i
%include __controls_rename.i
MAKE_CONST_WXSTRING_NOSWIG(PanelNameStr);
MAKE_CONST_WXSTRING_NOSWIG(EmptyString);
wxPython/src/core.i
+3 -4
View File
@@ -10,8 +10,7 @@
// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
%module core
%module _core
%{
#include "wx/wxPython/wxPython_int.h"
@@ -26,7 +25,7 @@
%include my_typemaps.i
%include _core_api.i
%include _core_rename.i
%include __core_rename.i
%native(_wxPySetDictionary) __wxPySetDictionary;
%native(_wxPyFixStockObjects) __wxPyFixStockObjects;
@@ -34,7 +33,7 @@
%pythoncode {
%#// Give a reference to the dictionary of this module to the C++ extension
%#// code.
_core._wxPySetDictionary(vars())
_core_._wxPySetDictionary(vars())
%#// A little trick to make 'wx' be a reference to this module so wx.Names can
%#// be used here.
wxPython/src/gdi.i
+3 -3
View File
@@ -10,7 +10,7 @@
// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
%module gdi
%module _gdi
//---------------------------------------------------------------------------
@@ -23,10 +23,10 @@
//---------------------------------------------------------------------------
%import core.i
%pythoncode { wx = core }
%pythoncode { wx = _core }
%pythoncode { __docfilter__ = wx.__docfilter__ }
%include _gdi_rename.i
%include __gdi_rename.i
MAKE_CONST_WXSTRING_NOSWIG(EmptyString);
wxPython/src/grid.i
+1 -1
View File
@@ -26,7 +26,7 @@
//---------------------------------------------------------------------------
%import windows.i
%pythoncode { wx = core }
%pythoncode { wx = _core }
%pythoncode { __docfilter__ = wx.__docfilter__ }
wxPython/src/gtk/controls.py → wxPython/src/gtk/_controls.py
+1101 -1101
View File
File diff suppressed because it is too large Load Diff
wxPython/src/gtk/controls_wrap.cpp → wxPython/src/gtk/_controls_wrap.cpp
+3 -3
View File
@@ -297,11 +297,11 @@ static swig_type_info *swig_types[86];
/*-----------------------------------------------
@(target):= _controls.so
@(target):= _controls_.so
------------------------------------------------*/
#define SWIG_init init_controls
#define SWIG_init init_controls_
#define SWIG_name "_controls"
#define SWIG_name "_controls_"
/* Auxiliar swig macros */
wxPython/src/gtk/core.py → wxPython/src/gtk/_core.py
+2001 -2001
View File
File diff suppressed because it is too large Load Diff
wxPython/src/mac/core_wrap.cpp → wxPython/src/gtk/_core_wrap.cpp
+3 -3
View File
@@ -327,11 +327,11 @@ static swig_type_info *swig_types[116];
/*-----------------------------------------------
@(target):= _core.so
@(target):= _core_.so
------------------------------------------------*/
#define SWIG_init init_core
#define SWIG_init init_core_
#define SWIG_name "_core"
#define SWIG_name "_core_"
/* Auxiliar swig macros */
wxPython/src/gtk/gdi.py → wxPython/src/gtk/_gdi.py
+933 -933
View File
File diff suppressed because it is too large Load Diff
wxPython/src/gtk/gdi_wrap.cpp → wxPython/src/gtk/_gdi_wrap.cpp
+3 -3
View File
@@ -268,11 +268,11 @@ static swig_type_info *swig_types[57];
/*-----------------------------------------------
@(target):= _gdi.so
@(target):= _gdi_.so
------------------------------------------------*/
#define SWIG_init init_gdi
#define SWIG_init init_gdi_
#define SWIG_name "_gdi"
#define SWIG_name "_gdi_"
/* Auxiliar swig macros */
wxPython/src/gtk/misc.py → wxPython/src/gtk/_misc.py
+1243 -1243
View File
File diff suppressed because it is too large Load Diff
wxPython/src/gtk/misc_wrap.cpp → wxPython/src/gtk/_misc_wrap.cpp
+3 -3
View File
@@ -298,11 +298,11 @@ static swig_type_info *swig_types[87];
/*-----------------------------------------------
@(target):= _misc.so
@(target):= _misc_.so
------------------------------------------------*/
#define SWIG_init init_misc
#define SWIG_init init_misc_
#define SWIG_name "_misc"
#define SWIG_name "_misc_"
/* Auxiliar swig macros */
wxPython/src/gtk/windows.py → wxPython/src/gtk/_windows.py
+859 -859
View File
File diff suppressed because it is too large Load Diff
wxPython/src/gtk/windows_wrap.cpp → wxPython/src/gtk/_windows_wrap.cpp
+3 -3
View File
@@ -297,11 +297,11 @@ static swig_type_info *swig_types[86];
/*-----------------------------------------------
@(target):= _windows.so
@(target):= _windows_.so
------------------------------------------------*/
#define SWIG_init init_windows
#define SWIG_init init_windows_
#define SWIG_name "_windows"
#define SWIG_name "_windows_"
/* Auxiliar swig macros */
wxPython/src/gtk/calendar.py
+5 -5
View File
@@ -3,9 +3,9 @@
import _calendar
import misc
import core
wx = core
import _misc
import _core
wx = _core
__docfilter__ = wx.__docfilter__
CAL_SUNDAY_FIRST = _calendar.CAL_SUNDAY_FIRST
CAL_MONDAY_FIRST = _calendar.CAL_MONDAY_FIRST
@@ -118,7 +118,7 @@ class CalendarDateAttrPtr(CalendarDateAttr):
self.__class__ = CalendarDateAttr
_calendar.CalendarDateAttr_swigregister(CalendarDateAttrPtr)
class CalendarEvent(core.CommandEvent):
class CalendarEvent(_core.CommandEvent):
def __repr__(self):
return "<%s.%s; proxy of C++ wxCalendarEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
def __init__(self, *args, **kwargs):
@@ -164,7 +164,7 @@ EVT_CALENDAR_MONTH = wx.PyEventBinder( wxEVT_CALENDAR_MONTH_CHANGED, 1
EVT_CALENDAR_YEAR = wx.PyEventBinder( wxEVT_CALENDAR_YEAR_CHANGED, 1)
EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED, 1)
class CalendarCtrl(core.Control):
class CalendarCtrl(_core.Control):
"""The calendar control allows the user to pick a date interactively."""
def __repr__(self):
return "<%s.%s; proxy of C++ wxCalendarCtrl instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
wxPython/src/gtk/core_wrap.cpp
-43049
View File
File diff suppressed because one or more lines are too long
wxPython/src/gtk/grid.py
+9 -9
View File
@@ -3,9 +3,9 @@
import _grid
import windows
import core
wx = core
import _windows
import _core
wx = _core
__docfilter__ = wx.__docfilter__
GRID_VALUE_STRING = _grid.GRID_VALUE_STRING
GRID_VALUE_BOOL = _grid.GRID_VALUE_BOOL
@@ -802,7 +802,7 @@ class PyGridCellAttrProviderPtr(PyGridCellAttrProvider):
self.__class__ = PyGridCellAttrProvider
_grid.PyGridCellAttrProvider_swigregister(PyGridCellAttrProviderPtr)
class GridTableBase(core.Object):
class GridTableBase(_core.Object):
def __init__(self): raise RuntimeError, "No constructor defined"
def __repr__(self):
return "<%s.%s; proxy of C++ wxGridTableBase instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
@@ -1207,7 +1207,7 @@ class GridCellCoordsPtr(GridCellCoords):
self.__class__ = GridCellCoords
_grid.GridCellCoords_swigregister(GridCellCoordsPtr)
class Grid(windows.ScrolledWindow):
class Grid(_windows.ScrolledWindow):
def __repr__(self):
return "<%s.%s; proxy of C++ wxGrid instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
def __init__(self, *args, **kwargs):
@@ -1991,7 +1991,7 @@ class GridPtr(Grid):
self.__class__ = Grid
_grid.Grid_swigregister(GridPtr)
class GridEvent(core.NotifyEvent):
class GridEvent(_core.NotifyEvent):
def __repr__(self):
return "<%s.%s; proxy of C++ wxGridEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
def __init__(self, *args, **kwargs):
@@ -2045,7 +2045,7 @@ class GridEventPtr(GridEvent):
self.__class__ = GridEvent
_grid.GridEvent_swigregister(GridEventPtr)
class GridSizeEvent(core.NotifyEvent):
class GridSizeEvent(_core.NotifyEvent):
def __repr__(self):
return "<%s.%s; proxy of C++ wxGridSizeEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
def __init__(self, *args, **kwargs):
@@ -2090,7 +2090,7 @@ class GridSizeEventPtr(GridSizeEvent):
self.__class__ = GridSizeEvent
_grid.GridSizeEvent_swigregister(GridSizeEventPtr)
class GridRangeSelectEvent(core.NotifyEvent):
class GridRangeSelectEvent(_core.NotifyEvent):
def __repr__(self):
return "<%s.%s; proxy of C++ wxGridRangeSelectEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
def __init__(self, *args, **kwargs):
@@ -2156,7 +2156,7 @@ class GridRangeSelectEventPtr(GridRangeSelectEvent):
self.__class__ = GridRangeSelectEvent
_grid.GridRangeSelectEvent_swigregister(GridRangeSelectEventPtr)
class GridEditorCreatedEvent(core.CommandEvent):
class GridEditorCreatedEvent(_core.CommandEvent):
def __repr__(self):
return "<%s.%s; proxy of C++ wxGridEditorCreatedEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
def __init__(self, *args, **kwargs):
wxPython/src/gtk/html.py
+15 -15
View File
@@ -3,9 +3,9 @@
import _html
import windows
import core
wx = core
import _windows
import _core
wx = _core
__docfilter__ = wx.__docfilter__
#---------------------------------------------------------------------------
@@ -45,7 +45,7 @@ HTML_REDIRECT = _html.HTML_REDIRECT
HTML_URL_PAGE = _html.HTML_URL_PAGE
HTML_URL_IMAGE = _html.HTML_URL_IMAGE
HTML_URL_OTHER = _html.HTML_URL_OTHER
class HtmlLinkInfo(core.Object):
class HtmlLinkInfo(_core.Object):
def __repr__(self):
return "<%s.%s; proxy of C++ wxHtmlLinkInfo instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
def __init__(self, *args, **kwargs):
@@ -90,7 +90,7 @@ HtmlWindowNameStr = cvar.HtmlWindowNameStr
HtmlPrintoutTitleStr = cvar.HtmlPrintoutTitleStr
HtmlPrintingTitleStr = cvar.HtmlPrintingTitleStr
class HtmlTag(core.Object):
class HtmlTag(_core.Object):
def __init__(self): raise RuntimeError, "No constructor defined"
def __repr__(self):
return "<%s.%s; proxy of C++ wxHtmlTag instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
@@ -134,7 +134,7 @@ class HtmlTagPtr(HtmlTag):
self.__class__ = HtmlTag
_html.HtmlTag_swigregister(HtmlTagPtr)
class HtmlParser(core.Object):
class HtmlParser(_core.Object):
def __init__(self): raise RuntimeError, "No constructor defined"
def __repr__(self):
return "<%s.%s; proxy of C++ wxHtmlParser instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
@@ -323,7 +323,7 @@ class HtmlWinParserPtr(HtmlWinParser):
self.__class__ = HtmlWinParser
_html.HtmlWinParser_swigregister(HtmlWinParserPtr)
class HtmlTagHandler(core.Object):
class HtmlTagHandler(_core.Object):
def __repr__(self):
return "<%s.%s; proxy of C++ wxPyHtmlTagHandler instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
def __init__(self, *args, **kwargs):
@@ -608,7 +608,7 @@ _html.HtmlRenderingInfo_swigregister(HtmlRenderingInfoPtr)
HTML_FIND_EXACT = _html.HTML_FIND_EXACT
HTML_FIND_NEAREST_BEFORE = _html.HTML_FIND_NEAREST_BEFORE
HTML_FIND_NEAREST_AFTER = _html.HTML_FIND_NEAREST_AFTER
class HtmlCell(core.Object):
class HtmlCell(_core.Object):
def __repr__(self):
return "<%s.%s; proxy of C++ wxHtmlCell instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
def __init__(self, *args, **kwargs):
@@ -908,7 +908,7 @@ _html.HtmlWidgetCell_swigregister(HtmlWidgetCellPtr)
#---------------------------------------------------------------------------
class HtmlFilter(core.Object):
class HtmlFilter(_core.Object):
def __repr__(self):
return "<%s.%s; proxy of C++ wxPyHtmlFilter instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
def __init__(self, *args, **kwargs):
@@ -933,7 +933,7 @@ _html.HtmlFilter_swigregister(HtmlFilterPtr)
#---------------------------------------------------------------------------
class HtmlWindow(windows.ScrolledWindow):
class HtmlWindow(_windows.ScrolledWindow):
def __repr__(self):
return "<%s.%s; proxy of C++ wxPyHtmlWindow instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
def __init__(self, *args, **kwargs):
@@ -1109,7 +1109,7 @@ def HtmlWindow_AddFilter(*args, **kwargs):
#---------------------------------------------------------------------------
class HtmlDCRenderer(core.Object):
class HtmlDCRenderer(_core.Object):
def __repr__(self):
return "<%s.%s; proxy of C++ wxHtmlDCRenderer instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
def __init__(self, *args, **kwargs):
@@ -1162,7 +1162,7 @@ _html.HtmlDCRenderer_swigregister(HtmlDCRendererPtr)
PAGE_ODD = _html.PAGE_ODD
PAGE_EVEN = _html.PAGE_EVEN
PAGE_ALL = _html.PAGE_ALL
class HtmlPrintout(windows.Printout):
class HtmlPrintout(_windows.Printout):
def __repr__(self):
return "<%s.%s; proxy of C++ wxHtmlPrintout instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
def __init__(self, *args, **kwargs):
@@ -1224,7 +1224,7 @@ def HtmlPrintout_CleanUpStatics(*args, **kwargs):
"""HtmlPrintout_CleanUpStatics()"""
return _html.HtmlPrintout_CleanUpStatics(*args, **kwargs)
class HtmlEasyPrinting(core.Object):
class HtmlEasyPrinting(_core.Object):
def __repr__(self):
return "<%s.%s; proxy of C++ wxHtmlEasyPrinting instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
def __init__(self, *args, **kwargs):
@@ -1481,7 +1481,7 @@ class HtmlHelpDataPtr(HtmlHelpData):
self.__class__ = HtmlHelpData
_html.HtmlHelpData_swigregister(HtmlHelpDataPtr)
class HtmlHelpFrame(windows.Frame):
class HtmlHelpFrame(_windows.Frame):
def __repr__(self):
return "<%s.%s; proxy of C++ wxHtmlHelpFrame instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
def __init__(self, *args, **kwargs):
@@ -1552,7 +1552,7 @@ HF_BOOKMARKS = _html.HF_BOOKMARKS
HF_OPENFILES = _html.HF_OPENFILES
HF_PRINT = _html.HF_PRINT
HF_DEFAULTSTYLE = _html.HF_DEFAULTSTYLE
class HtmlHelpController(core.EvtHandler):
class HtmlHelpController(_core.EvtHandler):
def __repr__(self):
return "<%s.%s; proxy of C++ wxHtmlHelpController instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
def __init__(self, *args, **kwargs):
wxPython/src/gtk/wizard.py
+6 -6
View File
@@ -3,9 +3,9 @@
import _wizard
import windows
import core
wx = core
import _windows
import _core
wx = _core
WIZARD_EX_HELPBUTTON = _wizard.WIZARD_EX_HELPBUTTON
wxEVT_WIZARD_PAGE_CHANGED = _wizard.wxEVT_WIZARD_PAGE_CHANGED
wxEVT_WIZARD_PAGE_CHANGING = _wizard.wxEVT_WIZARD_PAGE_CHANGING
@@ -18,7 +18,7 @@ EVT_WIZARD_CANCEL = wx.PyEventBinder( wxEVT_WIZARD_CANCEL, 1)
EVT_WIZARD_HELP = wx.PyEventBinder( wxEVT_WIZARD_HELP, 1)
EVT_WIZARD_FINISHED = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
class WizardEvent(core.NotifyEvent):
class WizardEvent(_core.NotifyEvent):
def __repr__(self):
return "<%s.%s; proxy of C++ wxWizardEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
def __init__(self, *args, **kwargs):
@@ -46,7 +46,7 @@ class WizardEventPtr(WizardEvent):
self.__class__ = WizardEvent
_wizard.WizardEvent_swigregister(WizardEventPtr)
class WizardPage(windows.Panel):
class WizardPage(_windows.Panel):
def __init__(self): raise RuntimeError, "No constructor defined"
def __repr__(self):
return "<%s.%s; proxy of C++ wxWizardPage instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
@@ -231,7 +231,7 @@ def WizardPageSimple_Chain(*args, **kwargs):
"""WizardPageSimple_Chain(WizardPageSimple first, WizardPageSimple second)"""
return _wizard.WizardPageSimple_Chain(*args, **kwargs)
class Wizard(windows.Dialog):
class Wizard(_windows.Dialog):
def __repr__(self):
return "<%s.%s; proxy of C++ wxWizard instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
def __init__(self, *args, **kwargs):
wxPython/src/html.i
+1 -1
View File
@@ -29,7 +29,7 @@
//---------------------------------------------------------------------------
%import windows.i
%pythoncode { wx = core }
%pythoncode { wx = _core }
%pythoncode { __docfilter__ = wx.__docfilter__ }
%include _html_rename.i

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