- Updated gtk SWIGged files to SWIG 1.1 cvs level

- changed SOURCES treatment in build.py; the path is stripped from the source
file when the object name is derived; this means sources can be anywhere
(typically might be in GENCODEDIR) but the compiled object will always be
in the current dir. (This is how the implicit makefile rule already behaved)
- updated glcanvas/build.cfg for unix builds to copy glcanvas.cpp from
utils/glcanvas (like Setup.in did)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3459 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

utils/wxPython/distrib/build.py

@@ -209,6 +209,18 @@ def splitlines(st):
 
 #----------------------------------------------------------------------------
 
+def strippath(st):
+    # remove any leading paths, retrieve only file name. Used while
+    # parsing the SOURCES file list, so that object files are local, 
+    # while source may be anywere)
+    if sys.platform == 'win32':
+	sep = '\\'
+    else:
+	sep = '/'
+    return string.split(st,sep)[-1]
+
+#----------------------------------------------------------------------------
+
 class BuildConfig:
     def __init__(self, **kw):
         self.__dict__.update(kw)
@@ -287,7 +299,13 @@ class BuildConfig:
                 raise SystemExit, "Python development files not found"
 
             self.CCC = self.findMFValue(mfText, 'CCC')
+	    if not self.CCC:
+		print "Warning: C++ compiler not specified (CCC). Assuming c++"
+		self.CCC = 'c++'
             self.CC = self.findMFValue(mfText, 'CC')
+	    if not self.CC:
+		print "Warning: C compiler not specified (CCC). Assuming cc"
+		self.CC = 'cc'
             self.OPT = self.findMFValue(mfText, 'OPT')
             self.SO = self.findMFValue(mfText, 'SO')
             self.LDSHARED = self.findMFValue(mfText, 'LDSHARED')
@@ -325,7 +343,8 @@ class BuildConfig:
         for name in self.SWIGFILES:
             objects = objects + os.path.splitext(name)[0] + self.OBJEXT + ' '
         for name in self.SOURCES:
-            objects = objects + os.path.splitext(name)[0] + self.OBJEXT + ' '
+	    obj = strippath(name)
+            objects = objects + os.path.splitext(obj)[0] + self.OBJEXT + ' '
         self.OBJECTS = splitlines(objects)
 
 

utils/wxPython/modules/glcanvas/build.cfg

@@ -1,7 +1,18 @@
 # -*- python -*-
+import sys
 
 MODULE = 'glcanvasc'
 SWIGFILES = ['glcanvas.i', ]
-OTHERCFLAGS = '-DWITH_GLCANVAS -I$(WXDIR)\utils\glcanvas\win'
+OTHERCFLAGS = '-DWITH_GLCANVAS -I$(WXDIR)\utils\glcanvas\%s' % (GENCODEDIR,)
-OTHERLIBS = '$(WXDIR)\lib\glcanvas.lib glu32.lib opengl32.lib'
+# Special action; for win32 we require you make the glcanvas lib. The
-
+# makefile will copy it to WXWIN\lib
+# Unix make system isn't so advanced, so we'll go looking for the source
+# file ourselves...
+if sys.platform == 'win32':
+    OTHERLIBS = '$(WXDIR)\lib\glcanvas.lib glu32.lib opengl32.lib'
+else:
+    SOURCES = [GENCODEDIR+'/_glcanvas.cpp']
+    OTHERRULES = """
+$(GENCODEDIR)/_glcanvas.cpp : 
+	cp $(WXDIR)/utils/glcanvas/$(GENCODEDIR)/glcanvas.cpp $@
+"""

utils/wxPython/modules/glcanvas/gtk/.cvsignore

@@ -1 +1,2 @@
 *~
+

utils/wxPython/modules/glcanvas/gtk/glcanvas.py

@@ -35,46 +35,41 @@ class wxGLContextPtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
-    def __del__(self, glcanvasc=glcanvasc):
+    def __del__(self,glcanvasc=glcanvasc):
         if self.thisown == 1 :
-            glcanvasc.delete_wxGLContext(self.this)
+            glcanvasc.delete_wxGLContext(self)
-    def SetCurrent(self):
+    def SetCurrent(self, *_args, **_kwargs):
-        val = glcanvasc.wxGLContext_SetCurrent(self.this)
+        val = apply(glcanvasc.wxGLContext_SetCurrent,(self,) + _args, _kwargs)
         return val
-    def SetColour(self,arg0):
+    def SetColour(self, *_args, **_kwargs):
-        val = glcanvasc.wxGLContext_SetColour(self.this,arg0)
+        val = apply(glcanvasc.wxGLContext_SetColour,(self,) + _args, _kwargs)
         return val
-    def SwapBuffers(self):
+    def SwapBuffers(self, *_args, **_kwargs):
-        val = glcanvasc.wxGLContext_SwapBuffers(self.this)
+        val = apply(glcanvasc.wxGLContext_SwapBuffers,(self,) + _args, _kwargs)
         return val
-    def SetupPixelFormat(self):
+    def SetupPixelFormat(self, *_args, **_kwargs):
-        val = glcanvasc.wxGLContext_SetupPixelFormat(self.this)
+        val = apply(glcanvasc.wxGLContext_SetupPixelFormat,(self,) + _args, _kwargs)
         return val
-    def SetupPalette(self,arg0):
+    def SetupPalette(self, *_args, **_kwargs):
-        val = glcanvasc.wxGLContext_SetupPalette(self.this,arg0.this)
+        val = apply(glcanvasc.wxGLContext_SetupPalette,(self,) + _args, _kwargs)
         return val
-    def CreateDefaultPalette(self):
+    def CreateDefaultPalette(self, *_args, **_kwargs):
-        val = glcanvasc.wxGLContext_CreateDefaultPalette(self.this)
+        val = apply(glcanvasc.wxGLContext_CreateDefaultPalette,(self,) + _args, _kwargs)
-        val = wxPalettePtr(val)
+        if val: val = wxPalettePtr(val) ; val.thisown = 1
-        val.thisown = 1
         return val
-    def GetPalette(self):
+    def GetPalette(self, *_args, **_kwargs):
-        val = glcanvasc.wxGLContext_GetPalette(self.this)
+        val = apply(glcanvasc.wxGLContext_GetPalette,(self,) + _args, _kwargs)
-        val = wxPalettePtr(val)
+        if val: val = wxPalettePtr(val) 
         return val
-    def GetWindow(self):
+    def GetWindow(self, *_args, **_kwargs):
-        val = glcanvasc.wxGLContext_GetWindow(self.this)
+        val = apply(glcanvasc.wxGLContext_GetWindow,(self,) + _args, _kwargs)
-        val = wxWindowPtr(val)
+        if val: val = wxWindowPtr(val) 
         return val
     def __repr__(self):
-        return "<C wxGLContext instance>"
+        return "<C wxGLContext instance at %s>" % (self.this,)
 class wxGLContext(wxGLContextPtr):
-    def __init__(self,arg0,arg1,*args) :
+    def __init__(self,*_args,**_kwargs):
-        argl = map(None,args)
+        self.this = apply(glcanvasc.new_wxGLContext,_args,_kwargs)
-        try: argl[0] = argl[0].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(glcanvasc.new_wxGLContext,(arg0,arg1.this,)+args)
         self.thisown = 1
 
 
@@ -84,32 +79,24 @@ class wxGLCanvasPtr(wxScrolledWindowPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
-    def SetCurrent(self):
+    def SetCurrent(self, *_args, **_kwargs):
-        val = glcanvasc.wxGLCanvas_SetCurrent(self.this)
+        val = apply(glcanvasc.wxGLCanvas_SetCurrent,(self,) + _args, _kwargs)
         return val
-    def SetColour(self,arg0):
+    def SetColour(self, *_args, **_kwargs):
-        val = glcanvasc.wxGLCanvas_SetColour(self.this,arg0)
+        val = apply(glcanvasc.wxGLCanvas_SetColour,(self,) + _args, _kwargs)
         return val
-    def SwapBuffers(self):
+    def SwapBuffers(self, *_args, **_kwargs):
-        val = glcanvasc.wxGLCanvas_SwapBuffers(self.this)
+        val = apply(glcanvasc.wxGLCanvas_SwapBuffers,(self,) + _args, _kwargs)
         return val
-    def GetContext(self):
+    def GetContext(self, *_args, **_kwargs):
-        val = glcanvasc.wxGLCanvas_GetContext(self.this)
+        val = apply(glcanvasc.wxGLCanvas_GetContext,(self,) + _args, _kwargs)
-        val = wxGLContextPtr(val)
+        if val: val = wxGLContextPtr(val) 
         return val
     def __repr__(self):
-        return "<C wxGLCanvas instance>"
+        return "<C wxGLCanvas instance at %s>" % (self.this,)
 class wxGLCanvas(wxGLCanvasPtr):
-    def __init__(self,arg0,*args) :
+    def __init__(self,*_args,**_kwargs):
-        argl = map(None,args)
+        self.this = apply(glcanvasc.new_wxGLCanvas,_args,_kwargs)
-        try: argl[1] = argl[1].this
-        except: pass
-        try: argl[2] = argl[2].this
-        except: pass
-        try: argl[6] = argl[6].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(glcanvasc.new_wxGLCanvas,(arg0.this,)+args)
         self.thisown = 1
         wx._StdWindowCallbacks(self)
 

utils/wxPython/modules/html/gtk/html.py

@@ -36,23 +36,23 @@ class HtmlHistoryItemPtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
-    def GetPos(self):
+    def GetPos(self, *_args, **_kwargs):
-        val = htmlc.HtmlHistoryItem_GetPos(self.this)
+        val = apply(htmlc.HtmlHistoryItem_GetPos,(self,) + _args, _kwargs)
         return val
-    def SetPos(self,arg0):
+    def SetPos(self, *_args, **_kwargs):
-        val = htmlc.HtmlHistoryItem_SetPos(self.this,arg0)
+        val = apply(htmlc.HtmlHistoryItem_SetPos,(self,) + _args, _kwargs)
         return val
-    def GetPage(self):
+    def GetPage(self, *_args, **_kwargs):
-        val = htmlc.HtmlHistoryItem_GetPage(self.this)
+        val = apply(htmlc.HtmlHistoryItem_GetPage,(self,) + _args, _kwargs)
         return val
-    def GetAnchor(self):
+    def GetAnchor(self, *_args, **_kwargs):
-        val = htmlc.HtmlHistoryItem_GetAnchor(self.this)
+        val = apply(htmlc.HtmlHistoryItem_GetAnchor,(self,) + _args, _kwargs)
         return val
     def __repr__(self):
-        return "<C HtmlHistoryItem instance>"
+        return "<C HtmlHistoryItem instance at %s>" % (self.this,)
 class HtmlHistoryItem(HtmlHistoryItemPtr):
-    def __init__(self,arg0,arg1) :
+    def __init__(self,*_args,**_kwargs):
-        self.this = htmlc.new_HtmlHistoryItem(arg0,arg1)
+        self.this = apply(htmlc.new_HtmlHistoryItem,_args,_kwargs)
         self.thisown = 1
 
 
@@ -62,54 +62,48 @@ class wxHtmlWindowPtr(wxScrolledWindowPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
-    def SetPage(self,arg0):
+    def SetPage(self, *_args, **_kwargs):
-        val = htmlc.wxHtmlWindow_SetPage(self.this,arg0)
+        val = apply(htmlc.wxHtmlWindow_SetPage,(self,) + _args, _kwargs)
         return val
-    def LoadPage(self,arg0):
+    def LoadPage(self, *_args, **_kwargs):
-        val = htmlc.wxHtmlWindow_LoadPage(self.this,arg0)
+        val = apply(htmlc.wxHtmlWindow_LoadPage,(self,) + _args, _kwargs)
         return val
-    def GetOpenedPage(self):
+    def GetOpenedPage(self, *_args, **_kwargs):
-        val = htmlc.wxHtmlWindow_GetOpenedPage(self.this)
+        val = apply(htmlc.wxHtmlWindow_GetOpenedPage,(self,) + _args, _kwargs)
         return val
-    def SetRelatedFrame(self,arg0,arg1):
+    def SetRelatedFrame(self, *_args, **_kwargs):
-        val = htmlc.wxHtmlWindow_SetRelatedFrame(self.this,arg0.this,arg1)
+        val = apply(htmlc.wxHtmlWindow_SetRelatedFrame,(self,) + _args, _kwargs)
         return val
-    def GetRelatedFrame(self):
+    def GetRelatedFrame(self, *_args, **_kwargs):
-        val = htmlc.wxHtmlWindow_GetRelatedFrame(self.this)
+        val = apply(htmlc.wxHtmlWindow_GetRelatedFrame,(self,) + _args, _kwargs)
-        val = wxFramePtr(val)
+        if val: val = wxFramePtr(val) 
         return val
-    def SetRelatedStatusBar(self,arg0):
+    def SetRelatedStatusBar(self, *_args, **_kwargs):
-        val = htmlc.wxHtmlWindow_SetRelatedStatusBar(self.this,arg0)
+        val = apply(htmlc.wxHtmlWindow_SetRelatedStatusBar,(self,) + _args, _kwargs)
         return val
-    def SetFonts(self,arg0,arg1,arg2,arg3,arg4):
+    def SetFonts(self, *_args, **_kwargs):
-        val = htmlc.wxHtmlWindow_SetFonts(self.this,arg0,arg1,arg2,arg3,arg4)
+        val = apply(htmlc.wxHtmlWindow_SetFonts,(self,) + _args, _kwargs)
         return val
-    def SetTitle(self,arg0):
+    def SetTitle(self, *_args, **_kwargs):
-        val = htmlc.wxHtmlWindow_SetTitle(self.this,arg0)
+        val = apply(htmlc.wxHtmlWindow_SetTitle,(self,) + _args, _kwargs)
         return val
-    def SetBorders(self,arg0):
+    def SetBorders(self, *_args, **_kwargs):
-        val = htmlc.wxHtmlWindow_SetBorders(self.this,arg0)
+        val = apply(htmlc.wxHtmlWindow_SetBorders,(self,) + _args, _kwargs)
         return val
-    def HistoryBack(self):
+    def HistoryBack(self, *_args, **_kwargs):
-        val = htmlc.wxHtmlWindow_HistoryBack(self.this)
+        val = apply(htmlc.wxHtmlWindow_HistoryBack,(self,) + _args, _kwargs)
         return val
-    def HistoryForward(self):
+    def HistoryForward(self, *_args, **_kwargs):
-        val = htmlc.wxHtmlWindow_HistoryForward(self.this)
+        val = apply(htmlc.wxHtmlWindow_HistoryForward,(self,) + _args, _kwargs)
         return val
-    def HistoryClear(self):
+    def HistoryClear(self, *_args, **_kwargs):
-        val = htmlc.wxHtmlWindow_HistoryClear(self.this)
+        val = apply(htmlc.wxHtmlWindow_HistoryClear,(self,) + _args, _kwargs)
         return val
     def __repr__(self):
-        return "<C wxHtmlWindow instance>"
+        return "<C wxHtmlWindow instance at %s>" % (self.this,)
 class wxHtmlWindow(wxHtmlWindowPtr):
-    def __init__(self,arg0,*args) :
+    def __init__(self,*_args,**_kwargs):
-        argl = map(None,args)
+        self.this = apply(htmlc.new_wxHtmlWindow,_args,_kwargs)
-        try: argl[1] = argl[1].this
-        except: pass
-        try: argl[2] = argl[2].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(htmlc.new_wxHtmlWindow,(arg0.this,)+args)
         self.thisown = 1
         wx._StdWindowCallbacks(self)
         wx._StdOnScrollCallbacks(self)

utils/wxPython/modules/lseditor/gtk/lseditor.py

@@ -35,146 +35,145 @@ class wxsLSEditorPluginPtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
-    def __del__(self, lseditorc=lseditorc):
+    def __del__(self,lseditorc=lseditorc):
         if self.thisown == 1 :
-            lseditorc.delete_wxsLSEditorPlugin(self.this)
+            lseditorc.delete_wxsLSEditorPlugin(self)
-    def Create(self,arg0,arg1):
+    def Create(self, *_args, **_kwargs):
-        val = lseditorc.wxsLSEditorPlugin_Create(self.this,arg0.this,arg1)
+        val = apply(lseditorc.wxsLSEditorPlugin_Create,(self,) + _args, _kwargs)
         return val
-    def OnOpen(self,arg0):
+    def OnOpen(self, *_args, **_kwargs):
-        val = lseditorc.wxsLSEditorPlugin_OnOpen(self.this,arg0)
+        val = apply(lseditorc.wxsLSEditorPlugin_OnOpen,(self,) + _args, _kwargs)
         return val
-    def OnSave(self,arg0):
+    def OnSave(self, *_args, **_kwargs):
-        val = lseditorc.wxsLSEditorPlugin_OnSave(self.this,arg0)
+        val = apply(lseditorc.wxsLSEditorPlugin_OnSave,(self,) + _args, _kwargs)
         return val
-    def OnCopy(self):
+    def OnCopy(self, *_args, **_kwargs):
-        val = lseditorc.wxsLSEditorPlugin_OnCopy(self.this)
+        val = apply(lseditorc.wxsLSEditorPlugin_OnCopy,(self,) + _args, _kwargs)
         return val
-    def OnCut(self):
+    def OnCut(self, *_args, **_kwargs):
-        val = lseditorc.wxsLSEditorPlugin_OnCut(self.this)
+        val = apply(lseditorc.wxsLSEditorPlugin_OnCut,(self,) + _args, _kwargs)
         return val
-    def OnPaste(self):
+    def OnPaste(self, *_args, **_kwargs):
-        val = lseditorc.wxsLSEditorPlugin_OnPaste(self.this)
+        val = apply(lseditorc.wxsLSEditorPlugin_OnPaste,(self,) + _args, _kwargs)
         return val
-    def OnDelete(self):
+    def OnDelete(self, *_args, **_kwargs):
-        val = lseditorc.wxsLSEditorPlugin_OnDelete(self.this)
+        val = apply(lseditorc.wxsLSEditorPlugin_OnDelete,(self,) + _args, _kwargs)
         return val
-    def OnUndo(self):
+    def OnUndo(self, *_args, **_kwargs):
-        val = lseditorc.wxsLSEditorPlugin_OnUndo(self.this)
+        val = apply(lseditorc.wxsLSEditorPlugin_OnUndo,(self,) + _args, _kwargs)
         return val
-    def OnRedo(self):
+    def OnRedo(self, *_args, **_kwargs):
-        val = lseditorc.wxsLSEditorPlugin_OnRedo(self.this)
+        val = apply(lseditorc.wxsLSEditorPlugin_OnRedo,(self,) + _args, _kwargs)
         return val
-    def SelectAll(self):
+    def SelectAll(self, *_args, **_kwargs):
-        val = lseditorc.wxsLSEditorPlugin_SelectAll(self.this)
+        val = apply(lseditorc.wxsLSEditorPlugin_SelectAll,(self,) + _args, _kwargs)
         return val
-    def OnGotoLine(self,arg0,*args):
+    def OnGotoLine(self, *_args, **_kwargs):
-        val = apply(lseditorc.wxsLSEditorPlugin_OnGotoLine,(self.this,arg0,)+args)
+        val = apply(lseditorc.wxsLSEditorPlugin_OnGotoLine,(self,) + _args, _kwargs)
         return val
-    def OnProperties(self):
+    def OnProperties(self, *_args, **_kwargs):
-        val = lseditorc.wxsLSEditorPlugin_OnProperties(self.this)
+        val = apply(lseditorc.wxsLSEditorPlugin_OnProperties,(self,) + _args, _kwargs)
         return val
-    def OnFind(self):
+    def OnFind(self, *_args, **_kwargs):
-        val = lseditorc.wxsLSEditorPlugin_OnFind(self.this)
+        val = apply(lseditorc.wxsLSEditorPlugin_OnFind,(self,) + _args, _kwargs)
         return val
-    def OnFindNext(self):
+    def OnFindNext(self, *_args, **_kwargs):
-        val = lseditorc.wxsLSEditorPlugin_OnFindNext(self.this)
+        val = apply(lseditorc.wxsLSEditorPlugin_OnFindNext,(self,) + _args, _kwargs)
         return val
-    def OnFindPrevious(self):
+    def OnFindPrevious(self, *_args, **_kwargs):
-        val = lseditorc.wxsLSEditorPlugin_OnFindPrevious(self.this)
+        val = apply(lseditorc.wxsLSEditorPlugin_OnFindPrevious,(self,) + _args, _kwargs)
         return val
-    def OnReplace(self):
+    def OnReplace(self, *_args, **_kwargs):
-        val = lseditorc.wxsLSEditorPlugin_OnReplace(self.this)
+        val = apply(lseditorc.wxsLSEditorPlugin_OnReplace,(self,) + _args, _kwargs)
         return val
-    def OnToggleBookmark(self):
+    def OnToggleBookmark(self, *_args, **_kwargs):
-        val = lseditorc.wxsLSEditorPlugin_OnToggleBookmark(self.this)
+        val = apply(lseditorc.wxsLSEditorPlugin_OnToggleBookmark,(self,) + _args, _kwargs)
         return val
-    def OnNextBookmark(self):
+    def OnNextBookmark(self, *_args, **_kwargs):
-        val = lseditorc.wxsLSEditorPlugin_OnNextBookmark(self.this)
+        val = apply(lseditorc.wxsLSEditorPlugin_OnNextBookmark,(self,) + _args, _kwargs)
         return val
-    def OnPreviousBookmark(self):
+    def OnPreviousBookmark(self, *_args, **_kwargs):
-        val = lseditorc.wxsLSEditorPlugin_OnPreviousBookmark(self.this)
+        val = apply(lseditorc.wxsLSEditorPlugin_OnPreviousBookmark,(self,) + _args, _kwargs)
         return val
-    def OnShowBookmarks(self):
+    def OnShowBookmarks(self, *_args, **_kwargs):
-        val = lseditorc.wxsLSEditorPlugin_OnShowBookmarks(self.this)
+        val = apply(lseditorc.wxsLSEditorPlugin_OnShowBookmarks,(self,) + _args, _kwargs)
         return val
-    def SetCheckpoint(self):
+    def SetCheckpoint(self, *_args, **_kwargs):
-        val = lseditorc.wxsLSEditorPlugin_SetCheckpoint(self.this)
+        val = apply(lseditorc.wxsLSEditorPlugin_SetCheckpoint,(self,) + _args, _kwargs)
         return val
-    def CheckpointModified(self):
+    def CheckpointModified(self, *_args, **_kwargs):
-        val = lseditorc.wxsLSEditorPlugin_CheckpointModified(self.this)
+        val = apply(lseditorc.wxsLSEditorPlugin_CheckpointModified,(self,) + _args, _kwargs)
         return val
-    def CanCopy(self):
+    def CanCopy(self, *_args, **_kwargs):
-        val = lseditorc.wxsLSEditorPlugin_CanCopy(self.this)
+        val = apply(lseditorc.wxsLSEditorPlugin_CanCopy,(self,) + _args, _kwargs)
         return val
-    def CanCut(self):
+    def CanCut(self, *_args, **_kwargs):
-        val = lseditorc.wxsLSEditorPlugin_CanCut(self.this)
+        val = apply(lseditorc.wxsLSEditorPlugin_CanCut,(self,) + _args, _kwargs)
         return val
-    def CanPaste(self):
+    def CanPaste(self, *_args, **_kwargs):
-        val = lseditorc.wxsLSEditorPlugin_CanPaste(self.this)
+        val = apply(lseditorc.wxsLSEditorPlugin_CanPaste,(self,) + _args, _kwargs)
         return val
-    def CanUndo(self):
+    def CanUndo(self, *_args, **_kwargs):
-        val = lseditorc.wxsLSEditorPlugin_CanUndo(self.this)
+        val = apply(lseditorc.wxsLSEditorPlugin_CanUndo,(self,) + _args, _kwargs)
         return val
-    def CanRedo(self):
+    def CanRedo(self, *_args, **_kwargs):
-        val = lseditorc.wxsLSEditorPlugin_CanRedo(self.this)
+        val = apply(lseditorc.wxsLSEditorPlugin_CanRedo,(self,) + _args, _kwargs)
         return val
-    def GetName(self):
+    def GetName(self, *_args, **_kwargs):
-        val = lseditorc.wxsLSEditorPlugin_GetName(self.this)
+        val = apply(lseditorc.wxsLSEditorPlugin_GetName,(self,) + _args, _kwargs)
         return val
-    def IsModified(self):
+    def IsModified(self, *_args, **_kwargs):
-        val = lseditorc.wxsLSEditorPlugin_IsModified(self.this)
+        val = apply(lseditorc.wxsLSEditorPlugin_IsModified,(self,) + _args, _kwargs)
         return val
-    def GetWindow(self):
+    def GetWindow(self, *_args, **_kwargs):
-        val = lseditorc.wxsLSEditorPlugin_GetWindow(self.this)
+        val = apply(lseditorc.wxsLSEditorPlugin_GetWindow,(self,) + _args, _kwargs)
-        val = wxWindowPtr(val)
+        if val: val = wxWindowPtr(val) 
         return val
-    def SetFileName(self,arg0):
+    def SetFileName(self, *_args, **_kwargs):
-        val = lseditorc.wxsLSEditorPlugin_SetFileName(self.this,arg0)
+        val = apply(lseditorc.wxsLSEditorPlugin_SetFileName,(self,) + _args, _kwargs)
         return val
-    def HoldCursor(self,arg0):
+    def HoldCursor(self, *_args, **_kwargs):
-        val = lseditorc.wxsLSEditorPlugin_HoldCursor(self.this,arg0)
+        val = apply(lseditorc.wxsLSEditorPlugin_HoldCursor,(self,) + _args, _kwargs)
         return val
-    def FindWordAtCursor(self):
+    def FindWordAtCursor(self, *_args, **_kwargs):
-        val = lseditorc.wxsLSEditorPlugin_FindWordAtCursor(self.this)
+        val = apply(lseditorc.wxsLSEditorPlugin_FindWordAtCursor,(self,) + _args, _kwargs)
         return val
-    def GetCursorPos(self,arg0,arg1):
+    def GetCursorPos(self, *_args, **_kwargs):
-        val = lseditorc.wxsLSEditorPlugin_GetCursorPos(self.this,arg0,arg1)
+        val = apply(lseditorc.wxsLSEditorPlugin_GetCursorPos,(self,) + _args, _kwargs)
         return val
-    def SetCursorPos(self,arg0,arg1):
+    def SetCursorPos(self, *_args, **_kwargs):
-        val = lseditorc.wxsLSEditorPlugin_SetCursorPos(self.this,arg0,arg1)
+        val = apply(lseditorc.wxsLSEditorPlugin_SetCursorPos,(self,) + _args, _kwargs)
         return val
-    def GetPagePos(self,arg0,arg1):
+    def GetPagePos(self, *_args, **_kwargs):
-        val = lseditorc.wxsLSEditorPlugin_GetPagePos(self.this,arg0,arg1)
+        val = apply(lseditorc.wxsLSEditorPlugin_GetPagePos,(self,) + _args, _kwargs)
         return val
-    def GetText(self,arg0,arg1,arg2,arg3,arg4,arg5):
+    def GetText(self, *_args, **_kwargs):
-        val = lseditorc.wxsLSEditorPlugin_GetText(self.this,arg0,arg1,arg2,arg3,arg4,arg5)
+        val = apply(lseditorc.wxsLSEditorPlugin_GetText,(self,) + _args, _kwargs)
         return val
-    def InsertText(self,arg0,arg1,arg2,arg3):
+    def InsertText(self, *_args, **_kwargs):
-        val = lseditorc.wxsLSEditorPlugin_InsertText(self.this,arg0,arg1,arg2,arg3)
+        val = apply(lseditorc.wxsLSEditorPlugin_InsertText,(self,) + _args, _kwargs)
         return val
-    def DeleteText(self,arg0,arg1,arg2,arg3):
+    def DeleteText(self, *_args, **_kwargs):
-        val = lseditorc.wxsLSEditorPlugin_DeleteText(self.this,arg0,arg1,arg2,arg3)
+        val = apply(lseditorc.wxsLSEditorPlugin_DeleteText,(self,) + _args, _kwargs)
         return val
-    def PositionToXY(self,arg0,arg1,arg2,arg3):
+    def PositionToXY(self, *_args, **_kwargs):
-        val = lseditorc.wxsLSEditorPlugin_PositionToXY(self.this,arg0,arg1,arg2,arg3)
+        val = apply(lseditorc.wxsLSEditorPlugin_PositionToXY,(self,) + _args, _kwargs)
         return val
-    def GetSelectionRange(self,arg0,arg1,arg2,arg3):
+    def GetSelectionRange(self, *_args, **_kwargs):
-        val = lseditorc.wxsLSEditorPlugin_GetSelectionRange(self.this,arg0,arg1,arg2,arg3)
+        val = apply(lseditorc.wxsLSEditorPlugin_GetSelectionRange,(self,) + _args, _kwargs)
         return val
-    def GetCharacterSize(self):
+    def GetCharacterSize(self, *_args, **_kwargs):
-        val = lseditorc.wxsLSEditorPlugin_GetCharacterSize(self.this)
+        val = apply(lseditorc.wxsLSEditorPlugin_GetCharacterSize,(self,) + _args, _kwargs)
-        val = wxSizePtr(val)
+        if val: val = wxSizePtr(val) ; val.thisown = 1
-        val.thisown = 1
         return val
-    def IsUnixText(self):
+    def IsUnixText(self, *_args, **_kwargs):
-        val = lseditorc.wxsLSEditorPlugin_IsUnixText(self.this)
+        val = apply(lseditorc.wxsLSEditorPlugin_IsUnixText,(self,) + _args, _kwargs)
         return val
     def __repr__(self):
-        return "<C wxsLSEditorPlugin instance>"
+        return "<C wxsLSEditorPlugin instance at %s>" % (self.this,)
 class wxsLSEditorPlugin(wxsLSEditorPluginPtr):
-    def __init__(self) :
+    def __init__(self,*_args,**_kwargs):
-        self.this = lseditorc.new_wxsLSEditorPlugin()
+        self.this = apply(lseditorc.new_wxsLSEditorPlugin,_args,_kwargs)
         self.thisown = 1
 
 

utils/wxPython/modules/utils/gtk/utils.py

@@ -0,0 +1,111 @@
+# This file was created automatically by SWIG.
+import utilsc
+class wxConfigPtr :
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def __del__(self,utilsc=utilsc):
+        if self.thisown == 1 :
+            utilsc.delete_wxConfig(self)
+    def DontCreateOnDemand(self, *_args, **_kwargs):
+        val = apply(utilsc.wxConfig_DontCreateOnDemand,(self,) + _args, _kwargs)
+        return val
+    def DeleteAll(self, *_args, **_kwargs):
+        val = apply(utilsc.wxConfig_DeleteAll,(self,) + _args, _kwargs)
+        return val
+    def DeleteEntry(self, *_args, **_kwargs):
+        val = apply(utilsc.wxConfig_DeleteEntry,(self,) + _args, _kwargs)
+        return val
+    def DeleteGroup(self, *_args, **_kwargs):
+        val = apply(utilsc.wxConfig_DeleteGroup,(self,) + _args, _kwargs)
+        return val
+    def Exists(self, *_args, **_kwargs):
+        val = apply(utilsc.wxConfig_Exists,(self,) + _args, _kwargs)
+        return val
+    def Flush(self, *_args, **_kwargs):
+        val = apply(utilsc.wxConfig_Flush,(self,) + _args, _kwargs)
+        return val
+    def GetAppName(self, *_args, **_kwargs):
+        val = apply(utilsc.wxConfig_GetAppName,(self,) + _args, _kwargs)
+        return val
+    def GetFirstGroup(self, *_args, **_kwargs):
+        val = apply(utilsc.wxConfig_GetFirstGroup,(self,) + _args, _kwargs)
+        return val
+    def GetFirstEntry(self, *_args, **_kwargs):
+        val = apply(utilsc.wxConfig_GetFirstEntry,(self,) + _args, _kwargs)
+        return val
+    def GetNextGroup(self, *_args, **_kwargs):
+        val = apply(utilsc.wxConfig_GetNextGroup,(self,) + _args, _kwargs)
+        return val
+    def GetNextEntry(self, *_args, **_kwargs):
+        val = apply(utilsc.wxConfig_GetNextEntry,(self,) + _args, _kwargs)
+        return val
+    def GetNumberOfEntries(self, *_args, **_kwargs):
+        val = apply(utilsc.wxConfig_GetNumberOfEntries,(self,) + _args, _kwargs)
+        return val
+    def GetNumberOfGroups(self, *_args, **_kwargs):
+        val = apply(utilsc.wxConfig_GetNumberOfGroups,(self,) + _args, _kwargs)
+        return val
+    def GetPath(self, *_args, **_kwargs):
+        val = apply(utilsc.wxConfig_GetPath,(self,) + _args, _kwargs)
+        return val
+    def GetVendorName(self, *_args, **_kwargs):
+        val = apply(utilsc.wxConfig_GetVendorName,(self,) + _args, _kwargs)
+        return val
+    def HasEntry(self, *_args, **_kwargs):
+        val = apply(utilsc.wxConfig_HasEntry,(self,) + _args, _kwargs)
+        return val
+    def HasGroup(self, *_args, **_kwargs):
+        val = apply(utilsc.wxConfig_HasGroup,(self,) + _args, _kwargs)
+        return val
+    def IsExpandingEnvVars(self, *_args, **_kwargs):
+        val = apply(utilsc.wxConfig_IsExpandingEnvVars,(self,) + _args, _kwargs)
+        return val
+    def IsRecordingDefaults(self, *_args, **_kwargs):
+        val = apply(utilsc.wxConfig_IsRecordingDefaults,(self,) + _args, _kwargs)
+        return val
+    def Read(self, *_args, **_kwargs):
+        val = apply(utilsc.wxConfig_Read,(self,) + _args, _kwargs)
+        return val
+    def ReadInt(self, *_args, **_kwargs):
+        val = apply(utilsc.wxConfig_ReadInt,(self,) + _args, _kwargs)
+        return val
+    def ReadFloat(self, *_args, **_kwargs):
+        val = apply(utilsc.wxConfig_ReadFloat,(self,) + _args, _kwargs)
+        return val
+    def SetExpandEnvVars(self, *_args, **_kwargs):
+        val = apply(utilsc.wxConfig_SetExpandEnvVars,(self,) + _args, _kwargs)
+        return val
+    def SetPath(self, *_args, **_kwargs):
+        val = apply(utilsc.wxConfig_SetPath,(self,) + _args, _kwargs)
+        return val
+    def SetRecordDefaults(self, *_args, **_kwargs):
+        val = apply(utilsc.wxConfig_SetRecordDefaults,(self,) + _args, _kwargs)
+        return val
+    def Write(self, *_args, **_kwargs):
+        val = apply(utilsc.wxConfig_Write,(self,) + _args, _kwargs)
+        return val
+    def WriteInt(self, *_args, **_kwargs):
+        val = apply(utilsc.wxConfig_WriteInt,(self,) + _args, _kwargs)
+        return val
+    def WriteFloat(self, *_args, **_kwargs):
+        val = apply(utilsc.wxConfig_WriteFloat,(self,) + _args, _kwargs)
+        return val
+    def __repr__(self):
+        return "<C wxConfig instance at %s>" % (self.this,)
+class wxConfig(wxConfigPtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(utilsc.new_wxConfig,_args,_kwargs)
+        self.thisown = 1
+
+
+
+
+
+
+#-------------- FUNCTION WRAPPERS ------------------
+
+
+
+#-------------- VARIABLE WRAPPERS ------------------
+

utils/wxPython/src/gtk/controls.cpp

@@ -3,7 +3,7 @@
  * 
  * This file was automatically generated by :
  * Simplified Wrapper and Interface Generator (SWIG)
- * Version 1.1 (Patch 6)
+ * Version 1.1 (Build 798)
  * 
  * Portions Copyright (c) 1995-1998
  * The University of Utah and The Regents of the University of California.

utils/wxPython/src/gtk/wx.cpp

@@ -3,7 +3,7 @@
  * 
  * This file was automatically generated by :
  * Simplified Wrapper and Interface Generator (SWIG)
- * Version 1.1 (Patch 6)
+ * Version 1.1 (Build 798)
  * 
  * Portions Copyright (c) 1995-1998
  * The University of Utah and The Regents of the University of California.
@@ -646,11 +646,6 @@ extern "C" SWIGEXPORT(void) initframesc();
 extern "C" SWIGEXPORT(void) initwindows3c();
 extern "C" SWIGEXPORT(void) initimagec();
 extern "C" SWIGEXPORT(void) initprintfwc();
-#ifndef SEPARATE
-extern "C" SWIGEXPORT(void) initutilsc();
-//extern "C" SWIGEXPORT(void) initoglc();
-extern "C" SWIGEXPORT(void) initglcanvasc();
-#endif
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -2577,13 +2572,6 @@ SWIGEXPORT(void) initwxc() {
     initwindows3c();
     initimagec();
     initprintfwc();
-#ifndef SEPARATE
-    initutilsc();
-//    initoglc();
-#ifdef WITH_GLCANVAS
-    initglcanvasc();
-#endif
-#endif
 {
    int i;
    for (i = 0; _swig_mapping[i].n1; i++)