From b2eb030f9e79819015f714ba5e4054b432fa6837 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Wed, 2 Jun 2004 02:29:55 +0000 Subject: [PATCH] set the modules' pacakge name to "wx" using a new SWIG feature git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27578 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxPython/contrib/activex/activex.i | 2 +- wxPython/contrib/gizmos/gizmos.i | 2 +- wxPython/contrib/glcanvas/glcanvas.i | 3 ++- wxPython/contrib/iewin/iewin.i | 2 +- wxPython/contrib/ogl/ogl.i | 3 ++- wxPython/contrib/stc/stc.i | 3 ++- wxPython/contrib/xrc/gtk/xrc_wrap.cpp | 1 - wxPython/contrib/xrc/xrc.i | 4 ++-- wxPython/src/calendar.i | 3 ++- wxPython/src/controls.i | 2 +- wxPython/src/core.i | 2 +- wxPython/src/gdi.i | 2 +- wxPython/src/grid.i | 3 ++- wxPython/src/html.i | 2 +- wxPython/src/misc.i | 2 +- wxPython/src/windows.i | 2 +- wxPython/src/wizard.i | 3 ++- 17 files changed, 23 insertions(+), 18 deletions(-) diff --git a/wxPython/contrib/activex/activex.i b/wxPython/contrib/activex/activex.i index c663e332a4..6fe37547fa 100644 --- a/wxPython/contrib/activex/activex.i +++ b/wxPython/contrib/activex/activex.i @@ -11,7 +11,7 @@ ///////////////////////////////////////////////////////////////////////////// -%module activex +%module(package="wx") activex %{ #include "wx/wxPython/wxPython.h" diff --git a/wxPython/contrib/gizmos/gizmos.i b/wxPython/contrib/gizmos/gizmos.i index e24377889e..7f5b9f5fd4 100644 --- a/wxPython/contrib/gizmos/gizmos.i +++ b/wxPython/contrib/gizmos/gizmos.i @@ -15,7 +15,7 @@ `LEDNumberCtrl`, `TreeListCtrl`, etc." %enddef -%module(docstring=DOCSTRING) gizmos +%module(package="wx", docstring=DOCSTRING) gizmos %{ diff --git a/wxPython/contrib/glcanvas/glcanvas.i b/wxPython/contrib/glcanvas/glcanvas.i index ab3dd14b29..5c44932c06 100644 --- a/wxPython/contrib/glcanvas/glcanvas.i +++ b/wxPython/contrib/glcanvas/glcanvas.i @@ -14,7 +14,8 @@ %define DOCSTRING "`GLCanvas` provides an OpenGL Context on a `wx.Window`." %enddef -%module(docstring=DOCSTRING) glcanvas + +%module(package="wx", docstring=DOCSTRING) glcanvas %{ #include "wx/wxPython/wxPython.h" diff --git a/wxPython/contrib/iewin/iewin.i b/wxPython/contrib/iewin/iewin.i index b97f5fca0b..e76a1f80bd 100644 --- a/wxPython/contrib/iewin/iewin.i +++ b/wxPython/contrib/iewin/iewin.i @@ -11,7 +11,7 @@ ///////////////////////////////////////////////////////////////////////////// -%module iewin +%module(package="wx") iewin %{ #include "wx/wxPython/wxPython.h" diff --git a/wxPython/contrib/ogl/ogl.i b/wxPython/contrib/ogl/ogl.i index e8bca42799..fff16bd5a4 100644 --- a/wxPython/contrib/ogl/ogl.i +++ b/wxPython/contrib/ogl/ogl.i @@ -14,7 +14,8 @@ "The Object Graphics Library provides for simple drawing and manipulation of 2D objects. (This version is deprecated, please use wx.lib.ogl instead.)" %enddef -%module(docstring=DOCSTRING) ogl + +%module(package="wx", docstring=DOCSTRING) ogl %{ #include "wx/wxPython/wxPython.h" diff --git a/wxPython/contrib/stc/stc.i b/wxPython/contrib/stc/stc.i index 8e476e8394..d8c7bd87dd 100644 --- a/wxPython/contrib/stc/stc.i +++ b/wxPython/contrib/stc/stc.i @@ -15,7 +15,8 @@ highlighting source code editor, or similar. Lexers for several programming languages are built-in." %enddef -%module(docstring=DOCSTRING) stc + +%module(package="wx", docstring=DOCSTRING) stc %{ diff --git a/wxPython/contrib/xrc/gtk/xrc_wrap.cpp b/wxPython/contrib/xrc/gtk/xrc_wrap.cpp index b253d2e678..f35d937304 100644 --- a/wxPython/contrib/xrc/gtk/xrc_wrap.cpp +++ b/wxPython/contrib/xrc/gtk/xrc_wrap.cpp @@ -290,7 +290,6 @@ static swig_type_info *swig_types[23]; #include #include - static const wxString wxPyEmptyString(wxEmptyString); static const wxString wxPyUTF8String(wxT("UTF-8")); static const wxString wxPyStyleString(wxT("style")); diff --git a/wxPython/contrib/xrc/xrc.i b/wxPython/contrib/xrc/xrc.i index e2615c7d0e..546e614e27 100644 --- a/wxPython/contrib/xrc/xrc.i +++ b/wxPython/contrib/xrc/xrc.i @@ -14,7 +14,8 @@ "The `XmlResource` class allows program resources defining menus, layout of controls on a panel, etc. to be loaded from an XML file." %enddef -%module(docstring=DOCSTRING) xrc + +%module(package="wx", docstring=DOCSTRING) xrc %{ @@ -24,7 +25,6 @@ controls on a panel, etc. to be loaded from an XML file." #include #include - %} //--------------------------------------------------------------------------- diff --git a/wxPython/src/calendar.i b/wxPython/src/calendar.i index 225444160c..d26c1de916 100644 --- a/wxPython/src/calendar.i +++ b/wxPython/src/calendar.i @@ -13,7 +13,8 @@ %define DOCSTRING "Classes for an interactive Calendar control." %enddef -%module(docstring=DOCSTRING) calendar + +%module(package="wx", docstring=DOCSTRING) calendar %{ diff --git a/wxPython/src/controls.i b/wxPython/src/controls.i index e51a2e628f..c72ff6fc2e 100644 --- a/wxPython/src/controls.i +++ b/wxPython/src/controls.i @@ -10,7 +10,7 @@ // Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// -%module _controls +%module(package="wx") _controls //--------------------------------------------------------------------------- diff --git a/wxPython/src/core.i b/wxPython/src/core.i index 2dfef883e2..93df66902a 100644 --- a/wxPython/src/core.i +++ b/wxPython/src/core.i @@ -10,7 +10,7 @@ // Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// -%module _core +%module(package="wx") _core %{ #include "wx/wxPython/wxPython_int.h" diff --git a/wxPython/src/gdi.i b/wxPython/src/gdi.i index 453b0e9f8e..9b0078e018 100644 --- a/wxPython/src/gdi.i +++ b/wxPython/src/gdi.i @@ -10,7 +10,7 @@ // Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// -%module _gdi +%module(package="wx") _gdi //--------------------------------------------------------------------------- diff --git a/wxPython/src/grid.i b/wxPython/src/grid.i index ab5fd1a864..5d28b11971 100644 --- a/wxPython/src/grid.i +++ b/wxPython/src/grid.i @@ -13,7 +13,8 @@ %define DOCSTRING "Classes for implementing a spreadsheet-like control." %enddef -%module(docstring=DOCSTRING) grid + +%module(package="wx", docstring=DOCSTRING) grid %{ diff --git a/wxPython/src/html.i b/wxPython/src/html.i index ca4889fded..74cc3ac90f 100644 --- a/wxPython/src/html.i +++ b/wxPython/src/html.i @@ -14,7 +14,7 @@ "Classes for a simple HTML rendering window, HTML Help Window, etc." %enddef -%module(docstring=DOCSTRING) html +%module(package="wx", docstring=DOCSTRING) html %{ #include "wx/wxPython/wxPython.h" diff --git a/wxPython/src/misc.i b/wxPython/src/misc.i index 61579d8d0f..270d49696d 100644 --- a/wxPython/src/misc.i +++ b/wxPython/src/misc.i @@ -10,7 +10,7 @@ // Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// -%module _misc +%module(package="wx") _misc //--------------------------------------------------------------------------- diff --git a/wxPython/src/windows.i b/wxPython/src/windows.i index 5044563f2a..d9dfc0e849 100644 --- a/wxPython/src/windows.i +++ b/wxPython/src/windows.i @@ -10,7 +10,7 @@ // Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// -%module _windows +%module(package="wx") _windows //--------------------------------------------------------------------------- diff --git a/wxPython/src/wizard.i b/wxPython/src/wizard.i index 48a8e9d31c..da7624931f 100644 --- a/wxPython/src/wizard.i +++ b/wxPython/src/wizard.i @@ -14,7 +14,8 @@ "`Wizard` is a dialog class that guides the user through a sequence of steps, or pages." %enddef -%module(docstring=DOCSTRING) wizard + +%module(package="wx", docstring=DOCSTRING) wizard %{ #include "wx/wxPython/wxPython.h"