wxPython 2.0b9, second phase (gtk)

Added gobs of stuff, see wxPython/README.txt for details


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

utils/wxPython/.cvsignore

@@ -1,4 +1,6 @@
 *.zip
+*.pyc
+*.pyo
 .cvsignore
 .emacs.desktop
 __init__.py

utils/wxPython/distrib/wxPython.rsp

@@ -3,7 +3,7 @@ wxPython\*.txt
 wxPython\demo\*.py
 wxPython\demo\bitmaps\*.bmp
 wxPython\demo\bitmaps\*.ico
-
+wxPython\demo\README.txt
 
 
 wxPython\src\*.i

utils/wxPython/lib/wxPlotCanvas.py

@@ -36,8 +36,7 @@ information on downloading source or binaries.""",
     if d.ShowModal() == wx.wxID_CANCEL:
 	d = wx.wxMessageDialog(wx.NULL, "I kid you not! Pressing Cancel won't help you!", "Not a joke", wx.wxOK)
 	d.ShowModal()
-    import sys
+    raise ImportError
-    sys.exit()
 
 #
 # Plotting classes...

utils/wxPython/src/.cvsignore

@@ -2,9 +2,11 @@
 Makefile
 Makefile.pre
 Setup
+Setup.in.new
 Setup.save
 Setup.save
 config.c
+glcanvas.h
 glcanvasc.exp
 make.bat
 sedscript

utils/wxPython/src/Makefile.pre.in

@@ -335,6 +335,7 @@ PYMODULES = $(GENCODEDIR)/wx.py        $(GENCODEDIR)/events.py    \
             $(GENCODEDIR)/windows2.py  $(GENCODEDIR)/cmndlgs.py   \
             $(GENCODEDIR)/frames.py    $(GENCODEDIR)/stattool.py   \
 	    $(GENCODEDIR)/utils.py     $(GENCODEDIR)/windows3.py  \
+	    $(GENCODEDIR)/image.py     $(GENCODEDIR)/glcanvas.py  \
 	    __init__.py
 
 
@@ -350,12 +351,6 @@ $(GENCODEDIR)/%.py : %.i
 $(GENCODEDIR)/wx.cpp $(GENCODEDIR)/wx.py : wx.i my_typemaps.i _defs.i _extras.py
 	swig $(SWIGFLAGS) -o $(GENCODEDIR)/wx.cpp wx.i
 
-ifdef SEPARATE
-$(GENCODEDIR)/utils.cpp $(GENCODEDIR)/utils.py : utils.i my_typemaps.i
-	swig $(SWIGFLAGS) -o $(GENCODEDIR)/utils.cpp utils.i
-else
-$(GENCODEDIR)/utils.cpp     $(GENCODEDIR)/utils.py     : utils.i      my_typemaps.i _defs.i
-endif
 
 # define some dependencies
 $(GENCODEDIR)/windows.cpp   $(GENCODEDIR)/windows.py   : windows.i    my_typemaps.i _defs.i
@@ -370,11 +365,17 @@ $(GENCODEDIR)/controls2.cpp $(GENCODEDIR)/controls2.py : controls2.i  my_typemap
 $(GENCODEDIR)/cmndlgs.cpp   $(GENCODEDIR)/cmndlgs.py   : cmndlgs.i    my_typemaps.i _defs.i
 $(GENCODEDIR)/frames.cpp    $(GENCODEDIR)/frames.py    : frames.i     my_typemaps.i _defs.i
 $(GENCODEDIR)/stattool.cpp  $(GENCODEDIR)/stattool.py  : stattool.i   my_typemaps.i _defs.i
+$(GENCODEDIR)/image.cpp     $(GENCODEDIR)/image.py     : image.i      my_typemaps.i _defs.i
 $(GENCODEDIR)/utils.cpp     $(GENCODEDIR)/utils.py     : utils.i      my_typemaps.i _defs.i
+$(GENCODEDIR)/glcanvas.cpp  $(GENCODEDIR)/glcanvas.py  : glcanvas.i   my_typemaps.i _defs.i
 
 $(GENCODEDIR)/helpers.cpp:
 	ln -s `pwd`/helpers.cpp $@
 
+$(GENCODEDIR)/_glcanvas.cpp:
+	-cp $(WXWIN)/utils/glcanvas/$(GENCODEDIR)/glcanvas.cpp $@
+	-cp $(WXWIN)/utils/glcanvas/$(GENCODEDIR)/glcanvas.h ./glcanvas.h
+
 
 wxInstall :	sharedmods $(PYMODULES)
 	if test ! -d $(TARGETDIR) ; then \

utils/wxPython/src/Setup.in

@@ -7,6 +7,7 @@
 *shared*
 
 CCC=c++
+WXWIN=../../..
 GENCODEDIR=gtk
 srcdir=$(GENCODEDIR)
 WX_CONFIG_CFLAGS=`wx-config --cflags`
@@ -32,16 +33,14 @@ TARGETDIR=..
 #TARGETDIR=$(BINLIBDEST)/site-packages/wxPython
 #TARGETDIR=$(BINLIBDEST)/wxPython
 
-SEPARATE=-DSEPARATE
-
-utilsc  utils.cpp \
-	-I. $(WX_CONFIG_CFLAGS) \
-	-DSWIG_GLOBAL -DWXP_WITH_THREAD $(SEPARATE) -Xlinker $(WX_CONFIG_LIBS)
 
 wxc	wx.cpp helpers.cpp windows.cpp events.cpp misc.cpp gdi.cpp \
 	mdi.cpp controls.cpp controls2.cpp windows2.cpp cmndlgs.cpp \
-	frames.cpp stattool.cpp windows3.cpp \
+	frames.cpp stattool.cpp windows3.cpp image.cpp \
+	utils.cpp \
+	## comment out the next line to disable wxGLCanvas
+	_glcanvas.cpp glcanvas.cpp -DWITH_GLCANVAS -lGL -lGLU \
 	-I. $(WX_CONFIG_CFLAGS) -I/usr/local/lib/glib/include \
 	-DSWIG_GLOBAL -DWXP_WITH_THREAD $(SEPARATE) -Xlinker $(WX_CONFIG_LIBS)
 
-
+##-Xlinker -Bstatic

utils/wxPython/src/glcanvas.i

@@ -123,16 +123,23 @@ void glNormalPointerEXT(GLenum type, GLsizei stride, GLsizei count, const GLvoid
 void glTexCoordPointerEXT(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
 void glVertexPointerEXT(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
 
+#ifndef __WXGTK__
 /* EXT_color_subtable */
 void glColorSubtableEXT(GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid *table);
+#endif
 
 /* EXT_color_table */
 void glColorTableEXT(GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table);
+#ifndef __WXGTK__
 void glCopyColorTableEXT(GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
+#endif
 void glGetColorTableEXT(GLenum target, GLenum format, GLenum type, GLvoid *table);
+#ifndef __WXGTK__
 void glGetColorTableParamaterfvEXT(GLenum target, GLenum pname, GLfloat *params);
 void glGetColorTavleParameterivEXT(GLenum target, GLenum pname, GLint *params);
+#endif
 
+#ifndef __WXGTK__
 /* SGI_compiled_vertex_array */
 void glLockArraysSGI(GLint first, GLsizei count);
 void glUnlockArraysSGI();
@@ -149,7 +156,7 @@ void glIndexMaterialSGI(GLenum face, GLenum mode);
 
 /* WIN_swap_hint */
 void glAddSwapHintRectWin(GLint x, GLint y, GLsizei width, GLsizei height);
-
+#endif
 
 //----------------------------------------------------------------------
 // From GL.H
@@ -199,8 +206,10 @@ enum {
     GL_BACK,
     GL_BACK_LEFT,
     GL_BACK_RIGHT,
+#ifndef __WXGTK__
     GL_BGRA_EXT,
     GL_BGR_EXT,
+#endif
     GL_BITMAP,
     GL_BITMAP_TOKEN,
     GL_BLEND,
@@ -303,7 +312,9 @@ enum {
     GL_DONT_CARE,
     GL_DOUBLE,
     GL_DOUBLEBUFFER,
+#ifndef __WXGTK__
     GL_DOUBLE_EXT,
+#endif
     GL_DRAW_BUFFER,
     GL_DRAW_PIXEL_TOKEN,
     GL_DST_ALPHA,
@@ -324,7 +335,9 @@ enum {
     GL_EXP,
     GL_EXP2,
     GL_EXTENSIONS,
+#ifndef __WXGTK__
     GL_EXT_bgra,
+#endif
     GL_EXT_paletted_texture,
     GL_EXT_vertex_array,
     GL_EYE_LINEAR,
@@ -346,7 +359,6 @@ enum {
     GL_FOG_HINT,
     GL_FOG_INDEX,
     GL_FOG_MODE,
-    GL_FOG_SPECULAR_TEXTURE_WIN,
     GL_FOG_START,
     GL_FRONT,
     GL_FRONT_AND_BACK,
@@ -470,8 +482,6 @@ enum {
     GL_MAX_ATTRIB_STACK_DEPTH,
     GL_MAX_CLIENT_ATTRIB_STACK_DEPTH,
     GL_MAX_CLIP_PLANES,
-    GL_MAX_ELEMENTS_INDICES_WIN,
-    GL_MAX_ELEMENTS_VERTICES_WIN,
     GL_MAX_EVAL_ORDER,
     GL_MAX_LIGHTS,
     GL_MAX_LIST_NESTING,
@@ -530,8 +540,6 @@ enum {
     GL_PACK_SWAP_BYTES,
     GL_PASS_THROUGH_TOKEN,
     GL_PERSPECTIVE_CORRECTION_HINT,
-    GL_PHONG_HINT_WIN,
-    GL_PHONG_WIN,
     GL_PIXEL_MAP_A_TO_A,
     GL_PIXEL_MAP_A_TO_A_SIZE,
     GL_PIXEL_MAP_B_TO_B,
@@ -736,8 +744,6 @@ enum {
     GL_VERTEX_ARRAY_TYPE_EXT,
     GL_VIEWPORT,
     GL_VIEWPORT_BIT,
-    GL_WIN_draw_range_elements,
-    GL_WIN_swap_hint,
     GL_XOR,
     GL_ZERO,
     GL_ZOOM_X,
@@ -1086,7 +1092,12 @@ void glViewport (GLint x, GLint y, GLsizei width, GLsizei height);
 /////////////////////////////////////////////////////////////////////////////
 //
 // $Log$
+// Revision 1.2  1999/05/01 04:40:57  RD
+// wxPython 2.0b9, second phase (gtk)
+// Added gobs of stuff, see wxPython/README.txt for details
+//
 // Revision 1.1  1999/04/30 03:29:18  RD
+//
 // wxPython 2.0b9, first phase (win32)
 // Added gobs of stuff, see wxPython/README.txt for details
 //

utils/wxPython/src/gtk/.cvsignore

@@ -0,0 +1 @@
+_glcanvas.cpp

utils/wxPython/src/gtk/cmndlgs.py

@@ -318,106 +318,113 @@ class wxFontDialog(wxFontDialogPtr):
 
 
 
-class wxPageSetupDataPtr :
+class wxPageSetupDialogDataPtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __del__(self):
         if self.thisown == 1 :
-            cmndlgsc.delete_wxPageSetupData(self.this)
+            cmndlgsc.delete_wxPageSetupDialogData(self.this)
     def EnableHelp(self,arg0):
-        val = cmndlgsc.wxPageSetupData_EnableHelp(self.this,arg0)
+        val = cmndlgsc.wxPageSetupDialogData_EnableHelp(self.this,arg0)
         return val
     def EnableMargins(self,arg0):
-        val = cmndlgsc.wxPageSetupData_EnableMargins(self.this,arg0)
+        val = cmndlgsc.wxPageSetupDialogData_EnableMargins(self.this,arg0)
         return val
     def EnableOrientation(self,arg0):
-        val = cmndlgsc.wxPageSetupData_EnableOrientation(self.this,arg0)
+        val = cmndlgsc.wxPageSetupDialogData_EnableOrientation(self.this,arg0)
         return val
     def EnablePaper(self,arg0):
-        val = cmndlgsc.wxPageSetupData_EnablePaper(self.this,arg0)
+        val = cmndlgsc.wxPageSetupDialogData_EnablePaper(self.this,arg0)
         return val
     def EnablePrinter(self,arg0):
-        val = cmndlgsc.wxPageSetupData_EnablePrinter(self.this,arg0)
+        val = cmndlgsc.wxPageSetupDialogData_EnablePrinter(self.this,arg0)
         return val
-    def GetPaperSize(self):
+    def GetDefaultMinMargins(self):
-        val = cmndlgsc.wxPageSetupData_GetPaperSize(self.this)
+        val = cmndlgsc.wxPageSetupDialogData_GetDefaultMinMargins(self.this)
-        val = wxPointPtr(val)
+        return val
-        val.thisown = 1
+    def GetEnableMargins(self):
+        val = cmndlgsc.wxPageSetupDialogData_GetEnableMargins(self.this)
+        return val
+    def GetEnableOrientation(self):
+        val = cmndlgsc.wxPageSetupDialogData_GetEnableOrientation(self.this)
+        return val
+    def GetEnablePaper(self):
+        val = cmndlgsc.wxPageSetupDialogData_GetEnablePaper(self.this)
+        return val
+    def GetEnablePrinter(self):
+        val = cmndlgsc.wxPageSetupDialogData_GetEnablePrinter(self.this)
+        return val
+    def GetEnableHelp(self):
+        val = cmndlgsc.wxPageSetupDialogData_GetEnableHelp(self.this)
+        return val
+    def GetDefaultInfo(self):
+        val = cmndlgsc.wxPageSetupDialogData_GetDefaultInfo(self.this)
         return val
     def GetMarginTopLeft(self):
-        val = cmndlgsc.wxPageSetupData_GetMarginTopLeft(self.this)
+        val = cmndlgsc.wxPageSetupDialogData_GetMarginTopLeft(self.this)
         val = wxPointPtr(val)
         val.thisown = 1
         return val
     def GetMarginBottomRight(self):
-        val = cmndlgsc.wxPageSetupData_GetMarginBottomRight(self.this)
+        val = cmndlgsc.wxPageSetupDialogData_GetMarginBottomRight(self.this)
         val = wxPointPtr(val)
         val.thisown = 1
         return val
     def GetMinMarginTopLeft(self):
-        val = cmndlgsc.wxPageSetupData_GetMinMarginTopLeft(self.this)
+        val = cmndlgsc.wxPageSetupDialogData_GetMinMarginTopLeft(self.this)
         val = wxPointPtr(val)
         val.thisown = 1
         return val
     def GetMinMarginBottomRight(self):
-        val = cmndlgsc.wxPageSetupData_GetMinMarginBottomRight(self.this)
+        val = cmndlgsc.wxPageSetupDialogData_GetMinMarginBottomRight(self.this)
         val = wxPointPtr(val)
         val.thisown = 1
         return val
-    def GetOrientation(self):
+    def GetPaperId(self):
-        val = cmndlgsc.wxPageSetupData_GetOrientation(self.this)
+        val = cmndlgsc.wxPageSetupDialogData_GetPaperId(self.this)
         return val
-    def GetDefaultMinMargins(self):
+    def GetPaperSize(self):
-        val = cmndlgsc.wxPageSetupData_GetDefaultMinMargins(self.this)
+        val = cmndlgsc.wxPageSetupDialogData_GetPaperSize(self.this)
+        val = wxSizePtr(val)
+        val.thisown = 1
         return val
-    def GetEnableMargins(self):
+    def GetPrintData(self):
-        val = cmndlgsc.wxPageSetupData_GetEnableMargins(self.this)
+        val = cmndlgsc.wxPageSetupDialogData_GetPrintData(self.this)
-        return val
+        val = wxPrintDataPtr(val)
-    def GetEnableOrientation(self):
-        val = cmndlgsc.wxPageSetupData_GetEnableOrientation(self.this)
-        return val
-    def GetEnablePaper(self):
-        val = cmndlgsc.wxPageSetupData_GetEnablePaper(self.this)
-        return val
-    def GetEnablePrinter(self):
-        val = cmndlgsc.wxPageSetupData_GetEnablePrinter(self.this)
-        return val
-    def GetEnableHelp(self):
-        val = cmndlgsc.wxPageSetupData_GetEnableHelp(self.this)
-        return val
-    def GetDefaultInfo(self):
-        val = cmndlgsc.wxPageSetupData_GetDefaultInfo(self.this)
-        return val
-    def SetPaperSize(self,arg0):
-        val = cmndlgsc.wxPageSetupData_SetPaperSize(self.this,arg0.this)
-        return val
-    def SetMarginTopLeft(self,arg0):
-        val = cmndlgsc.wxPageSetupData_SetMarginTopLeft(self.this,arg0.this)
-        return val
-    def SetMarginBottomRight(self,arg0):
-        val = cmndlgsc.wxPageSetupData_SetMarginBottomRight(self.this,arg0.this)
-        return val
-    def SetMinMarginTopLeft(self,arg0):
-        val = cmndlgsc.wxPageSetupData_SetMinMarginTopLeft(self.this,arg0.this)
-        return val
-    def SetMinMarginBottomRight(self,arg0):
-        val = cmndlgsc.wxPageSetupData_SetMinMarginBottomRight(self.this,arg0.this)
-        return val
-    def SetOrientation(self,arg0):
-        val = cmndlgsc.wxPageSetupData_SetOrientation(self.this,arg0)
-        return val
-    def SetDefaultMinMargins(self,arg0):
-        val = cmndlgsc.wxPageSetupData_SetDefaultMinMargins(self.this,arg0)
         return val
     def SetDefaultInfo(self,arg0):
-        val = cmndlgsc.wxPageSetupData_SetDefaultInfo(self.this,arg0)
+        val = cmndlgsc.wxPageSetupDialogData_SetDefaultInfo(self.this,arg0)
+        return val
+    def SetDefaultMinMargins(self,arg0):
+        val = cmndlgsc.wxPageSetupDialogData_SetDefaultMinMargins(self.this,arg0)
+        return val
+    def SetMarginTopLeft(self,arg0):
+        val = cmndlgsc.wxPageSetupDialogData_SetMarginTopLeft(self.this,arg0.this)
+        return val
+    def SetMarginBottomRight(self,arg0):
+        val = cmndlgsc.wxPageSetupDialogData_SetMarginBottomRight(self.this,arg0.this)
+        return val
+    def SetMinMarginTopLeft(self,arg0):
+        val = cmndlgsc.wxPageSetupDialogData_SetMinMarginTopLeft(self.this,arg0.this)
+        return val
+    def SetMinMarginBottomRight(self,arg0):
+        val = cmndlgsc.wxPageSetupDialogData_SetMinMarginBottomRight(self.this,arg0.this)
+        return val
+    def SetPaperId(self,arg0):
+        val = cmndlgsc.wxPageSetupDialogData_SetPaperId(self.this,arg0)
+        return val
+    def SetPaperSize(self,arg0):
+        val = cmndlgsc.wxPageSetupDialogData_SetPaperSize(self.this,arg0.this)
+        return val
+    def SetPrintData(self,arg0):
+        val = cmndlgsc.wxPageSetupDialogData_SetPrintData(self.this,arg0.this)
         return val
     def __repr__(self):
-        return "<C wxPageSetupData instance>"
+        return "<C wxPageSetupDialogData instance>"
-class wxPageSetupData(wxPageSetupDataPtr):
+class wxPageSetupDialogData(wxPageSetupDialogDataPtr):
     def __init__(self) :
-        self.this = cmndlgsc.new_wxPageSetupData()
+        self.this = cmndlgsc.new_wxPageSetupDialogData()
         self.thisown = 1
 
 
@@ -429,7 +436,7 @@ class wxPageSetupDialogPtr(wxDialogPtr):
         self.thisown = 0
     def GetPageSetupData(self):
         val = cmndlgsc.wxPageSetupDialog_GetPageSetupData(self.this)
-        val = wxPageSetupDataPtr(val)
+        val = wxPageSetupDialogDataPtr(val)
         return val
     def ShowModal(self):
         val = cmndlgsc.wxPageSetupDialog_ShowModal(self.this)
@@ -449,81 +456,85 @@ class wxPageSetupDialog(wxPageSetupDialogPtr):
 
 
 
-class wxPrintDataPtr :
+class wxPrintDialogDataPtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __del__(self):
         if self.thisown == 1 :
-            cmndlgsc.delete_wxPrintData(self.this)
+            cmndlgsc.delete_wxPrintDialogData(self.this)
     def EnableHelp(self,arg0):
-        val = cmndlgsc.wxPrintData_EnableHelp(self.this,arg0)
+        val = cmndlgsc.wxPrintDialogData_EnableHelp(self.this,arg0)
         return val
     def EnablePageNumbers(self,arg0):
-        val = cmndlgsc.wxPrintData_EnablePageNumbers(self.this,arg0)
+        val = cmndlgsc.wxPrintDialogData_EnablePageNumbers(self.this,arg0)
         return val
     def EnablePrintToFile(self,arg0):
-        val = cmndlgsc.wxPrintData_EnablePrintToFile(self.this,arg0)
+        val = cmndlgsc.wxPrintDialogData_EnablePrintToFile(self.this,arg0)
         return val
     def EnableSelection(self,arg0):
-        val = cmndlgsc.wxPrintData_EnableSelection(self.this,arg0)
+        val = cmndlgsc.wxPrintDialogData_EnableSelection(self.this,arg0)
         return val
     def GetAllPages(self):
-        val = cmndlgsc.wxPrintData_GetAllPages(self.this)
+        val = cmndlgsc.wxPrintDialogData_GetAllPages(self.this)
         return val
     def GetCollate(self):
-        val = cmndlgsc.wxPrintData_GetCollate(self.this)
+        val = cmndlgsc.wxPrintDialogData_GetCollate(self.this)
         return val
     def GetFromPage(self):
-        val = cmndlgsc.wxPrintData_GetFromPage(self.this)
+        val = cmndlgsc.wxPrintDialogData_GetFromPage(self.this)
         return val
     def GetMaxPage(self):
-        val = cmndlgsc.wxPrintData_GetMaxPage(self.this)
+        val = cmndlgsc.wxPrintDialogData_GetMaxPage(self.this)
         return val
     def GetMinPage(self):
-        val = cmndlgsc.wxPrintData_GetMinPage(self.this)
+        val = cmndlgsc.wxPrintDialogData_GetMinPage(self.this)
         return val
     def GetNoCopies(self):
-        val = cmndlgsc.wxPrintData_GetNoCopies(self.this)
+        val = cmndlgsc.wxPrintDialogData_GetNoCopies(self.this)
         return val
-    def GetOrientation(self):
+    def GetPrintData(self):
-        val = cmndlgsc.wxPrintData_GetOrientation(self.this)
+        val = cmndlgsc.wxPrintDialogData_GetPrintData(self.this)
+        val = wxPrintDataPtr(val)
+        return val
+    def GetPrintToFile(self):
+        val = cmndlgsc.wxPrintDialogData_GetPrintToFile(self.this)
         return val
     def GetToPage(self):
-        val = cmndlgsc.wxPrintData_GetToPage(self.this)
+        val = cmndlgsc.wxPrintDialogData_GetToPage(self.this)
         return val
     def SetCollate(self,arg0):
-        val = cmndlgsc.wxPrintData_SetCollate(self.this,arg0)
+        val = cmndlgsc.wxPrintDialogData_SetCollate(self.this,arg0)
         return val
     def SetFromPage(self,arg0):
-        val = cmndlgsc.wxPrintData_SetFromPage(self.this,arg0)
+        val = cmndlgsc.wxPrintDialogData_SetFromPage(self.this,arg0)
         return val
     def SetMaxPage(self,arg0):
-        val = cmndlgsc.wxPrintData_SetMaxPage(self.this,arg0)
+        val = cmndlgsc.wxPrintDialogData_SetMaxPage(self.this,arg0)
         return val
     def SetMinPage(self,arg0):
-        val = cmndlgsc.wxPrintData_SetMinPage(self.this,arg0)
+        val = cmndlgsc.wxPrintDialogData_SetMinPage(self.this,arg0)
-        return val
-    def SetOrientation(self,arg0):
-        val = cmndlgsc.wxPrintData_SetOrientation(self.this,arg0)
         return val
     def SetNoCopies(self,arg0):
-        val = cmndlgsc.wxPrintData_SetNoCopies(self.this,arg0)
+        val = cmndlgsc.wxPrintDialogData_SetNoCopies(self.this,arg0)
+        return val
+    def SetPrintData(self,arg0):
+        val = cmndlgsc.wxPrintDialogData_SetPrintData(self.this,arg0.this)
         return val
     def SetPrintToFile(self,arg0):
-        val = cmndlgsc.wxPrintData_SetPrintToFile(self.this,arg0)
+        val = cmndlgsc.wxPrintDialogData_SetPrintToFile(self.this,arg0)
         return val
     def SetSetupDialog(self,arg0):
-        val = cmndlgsc.wxPrintData_SetSetupDialog(self.this,arg0)
+        val = cmndlgsc.wxPrintDialogData_SetSetupDialog(self.this,arg0)
         return val
     def SetToPage(self,arg0):
-        val = cmndlgsc.wxPrintData_SetToPage(self.this,arg0)
+        val = cmndlgsc.wxPrintDialogData_SetToPage(self.this,arg0)
         return val
     def __repr__(self):
-        return "<C wxPrintData instance>"
+        return "<C wxPrintDialogData instance>"
-class wxPrintData(wxPrintDataPtr):
+class wxPrintDialogData(wxPrintDialogDataPtr):
     def __init__(self) :
-        self.this = cmndlgsc.new_wxPrintData()
+        self.this = cmndlgsc.new_wxPrintDialogData()
         self.thisown = 1
 
 
@@ -533,9 +544,9 @@ class wxPrintDialogPtr(wxDialogPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
-    def GetPrintData(self):
+    def GetPrintDialogData(self):
-        val = cmndlgsc.wxPrintDialog_GetPrintData(self.this)
+        val = cmndlgsc.wxPrintDialog_GetPrintDialogData(self.this)
-        val = wxPrintDataPtr(val)
+        val = wxPrintDialogDataPtr(val)
         return val
     def GetPrintDC(self):
         val = cmndlgsc.wxPrintDialog_GetPrintDC(self.this)

utils/wxPython/src/gtk/controls.py

@@ -383,6 +383,9 @@ class wxListBoxPtr(wxControlPtr):
     def GetSelection(self):
         val = controlsc.wxListBox_GetSelection(self.this)
         return val
+    def GetSelections(self):
+        val = controlsc.wxListBox_GetSelections(self.this)
+        return val
     def GetString(self,arg0):
         val = controlsc.wxListBox_GetString(self.this,arg0)
         return val
@@ -536,6 +539,9 @@ class wxTextCtrlPtr(wxControlPtr):
     def WriteText(self,arg0):
         val = controlsc.wxTextCtrl_WriteText(self.this,arg0)
         return val
+    def AppendText(self,arg0):
+        val = controlsc.wxTextCtrl_AppendText(self.this,arg0)
+        return val
     def XYToPosition(self,arg0,arg1):
         val = controlsc.wxTextCtrl_XYToPosition(self.this,arg0,arg1)
         return val

utils/wxPython/src/gtk/controls2.py

@@ -324,9 +324,12 @@ class wxTreeItemDataPtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
-    def __del__(self):
+    def GetData(self):
-        if self.thisown == 1 :
+        val = controls2c.wxTreeItemData_GetData(self.this)
-            controls2c.delete_wxTreeItemData(self.this)
+        return val
+    def SetData(self,arg0):
+        val = controls2c.wxTreeItemData_SetData(self.this,arg0)
+        return val
     def GetId(self):
         val = controls2c.wxTreeItemData_GetId(self.this)
         val = wxTreeItemIdPtr(val)
@@ -337,8 +340,8 @@ class wxTreeItemDataPtr :
     def __repr__(self):
         return "<C wxTreeItemData instance>"
 class wxTreeItemData(wxTreeItemDataPtr):
-    def __init__(self) :
+    def __init__(self,*args) :
-        self.this = controls2c.new_wxTreeItemData()
+        self.this = apply(controls2c.new_wxTreeItemData,()+args)
         self.thisown = 1
 
 
@@ -414,10 +417,6 @@ class wxTreeCtrlPtr(wxControlPtr):
     def GetItemSelectedImage(self,arg0):
         val = controls2c.wxTreeCtrl_GetItemSelectedImage(self.this,arg0.this)
         return val
-    def GetItemData(self,arg0):
-        val = controls2c.wxTreeCtrl_GetItemData(self.this,arg0.this)
-        val = wxTreeItemDataPtr(val)
-        return val
     def SetItemText(self,arg0,arg1):
         val = controls2c.wxTreeCtrl_SetItemText(self.this,arg0.this,arg1)
         return val
@@ -427,11 +426,21 @@ class wxTreeCtrlPtr(wxControlPtr):
     def SetItemSelectedImage(self,arg0,arg1):
         val = controls2c.wxTreeCtrl_SetItemSelectedImage(self.this,arg0.this,arg1)
         return val
+    def SetItemHasChildren(self,arg0,*args):
+        val = apply(controls2c.wxTreeCtrl_SetItemHasChildren,(self.this,arg0.this,)+args)
+        return val
+    def GetItemData(self,arg0):
+        val = controls2c.wxTreeCtrl_GetItemData(self.this,arg0.this)
+        val = wxTreeItemDataPtr(val)
+        return val
     def SetItemData(self,arg0,arg1):
         val = controls2c.wxTreeCtrl_SetItemData(self.this,arg0.this,arg1.this)
         return val
-    def SetItemHasChildren(self,arg0,*args):
+    def GetPyData(self,arg0):
-        val = apply(controls2c.wxTreeCtrl_SetItemHasChildren,(self.this,arg0.this,)+args)
+        val = controls2c.wxTreeCtrl_GetPyData(self.this,arg0.this)
+        return val
+    def SetPyData(self,arg0,arg1):
+        val = controls2c.wxTreeCtrl_SetPyData(self.this,arg0.this,arg1)
         return val
     def IsVisible(self,arg0):
         val = controls2c.wxTreeCtrl_IsVisible(self.this,arg0.this)

utils/wxPython/src/gtk/events.py

@@ -605,6 +605,29 @@ class wxSysColourChangedEvent(wxSysColourChangedEventPtr):
 
 
 
+class wxPyEventPtr(wxCommandEventPtr):
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def __del__(self):
+        if self.thisown == 1 :
+            eventsc.delete_wxPyEvent(self.this)
+    def SetUserData(self,arg0):
+        val = eventsc.wxPyEvent_SetUserData(self.this,arg0)
+        return val
+    def GetUserData(self):
+        val = eventsc.wxPyEvent_GetUserData(self.this)
+        return val
+    def __repr__(self):
+        return "<C wxPyEvent instance>"
+class wxPyEvent(wxPyEventPtr):
+    def __init__(self,*args) :
+        self.this = apply(eventsc.new_wxPyEvent,()+args)
+        self.thisown = 1
+
+
+
+
 
 
 #-------------- FUNCTION WRAPPERS ------------------

utils/wxPython/src/gtk/frames.cpp

@@ -162,7 +162,7 @@ static PyObject *_wrap_new_wxFrame(PyObject *self, PyObject *args) {
         PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
         return NULL;
     }
-    _arg2 = new wxString(PyString_AsString(_obj2));
+    _arg2 = new wxString(PyString_AsString(_obj2), PyString_Size(_obj2));
 }
     if (_argc3) {
         if (SWIG_GetPtr(_argc3,(void **) &_arg3,"_wxPoint_p")) {
@@ -176,8 +176,12 @@ static PyObject *_wrap_new_wxFrame(PyObject *self, PyObject *args) {
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         _result = (wxFrame *)new_wxFrame(_arg0,_arg1,*_arg2,*_arg3,*_arg4,_arg5,_arg6);
-    SWIG_MakePtr(_ptemp, (char *) _result,"_wxFrame_p");
+
+    wxPy_END_ALLOW_THREADS;
+}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxFrame_p");
     _resultobj = Py_BuildValue("s",_ptemp);
 {
     if (_obj2)
@@ -202,8 +206,12 @@ static PyObject *_wrap_wxFrame_Centre(PyObject *self, PyObject *args) {
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         wxFrame_Centre(_arg0,_arg1);
-    Py_INCREF(Py_None);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
     _resultobj = Py_None;
     return _resultobj;
 }
@@ -214,7 +222,7 @@ static PyObject *_wrap_wxFrame_CreateStatusBar(PyObject *self, PyObject *args) {
     wxStatusBar * _result;
     wxFrame * _arg0;
     int  _arg1 = 1;
-    long  _arg2 = wxST_SIZEGRIP;
+    long  _arg2 = (wxST_SIZEGRIP);
     wxWindowID  _arg3 = -1;
     char * _arg4 = "statusBar";
     char * _argc0 = 0;
@@ -229,8 +237,12 @@ static PyObject *_wrap_wxFrame_CreateStatusBar(PyObject *self, PyObject *args) {
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         _result = (wxStatusBar *)wxFrame_CreateStatusBar(_arg0,_arg1,_arg2,_arg3,_arg4);
-    SWIG_MakePtr(_ptemp, (char *) _result,"_wxStatusBar_p");
+
+    wxPy_END_ALLOW_THREADS;
+}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxStatusBar_p");
     _resultobj = Py_BuildValue("s",_ptemp);
     return _resultobj;
 }
@@ -255,8 +267,12 @@ static PyObject *_wrap_wxFrame_CreateToolBar(PyObject *self, PyObject *args) {
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         _result = (wxToolBar *)wxFrame_CreateToolBar(_arg0,_arg1,_arg2,_arg3);
-    SWIG_MakePtr(_ptemp, (char *) _result,"_wxToolBar_p");
+
+    wxPy_END_ALLOW_THREADS;
+}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxToolBar_p");
     _resultobj = Py_BuildValue("s",_ptemp);
     return _resultobj;
 }
@@ -278,8 +294,12 @@ static PyObject *_wrap_wxFrame_GetMenuBar(PyObject *self, PyObject *args) {
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         _result = (wxMenuBar *)wxFrame_GetMenuBar(_arg0);
-    SWIG_MakePtr(_ptemp, (char *) _result,"_wxMenuBar_p");
+
+    wxPy_END_ALLOW_THREADS;
+}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxMenuBar_p");
     _resultobj = Py_BuildValue("s",_ptemp);
     return _resultobj;
 }
@@ -301,8 +321,12 @@ static PyObject *_wrap_wxFrame_GetStatusBar(PyObject *self, PyObject *args) {
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         _result = (wxStatusBar *)wxFrame_GetStatusBar(_arg0);
-    SWIG_MakePtr(_ptemp, (char *) _result,"_wxStatusBar_p");
+
+    wxPy_END_ALLOW_THREADS;
+}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxStatusBar_p");
     _resultobj = Py_BuildValue("s",_ptemp);
     return _resultobj;
 }
@@ -323,8 +347,12 @@ static PyObject *_wrap_wxFrame_GetTitle(PyObject *self, PyObject *args) {
         return NULL;
         }
     }
-    _result = new wxString (wxFrame_GetTitle(_arg0));
 {
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = new wxString (wxFrame_GetTitle(_arg0));
+
+    wxPy_END_ALLOW_THREADS;
+}{
     _resultobj = PyString_FromString(WXSTRINGCAST *(_result));
 }
 {
@@ -350,8 +378,12 @@ static PyObject *_wrap_wxFrame_GetToolBar(PyObject *self, PyObject *args) {
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         _result = (wxToolBar *)wxFrame_GetToolBar(_arg0);
-    SWIG_MakePtr(_ptemp, (char *) _result,"_wxToolBar_p");
+
+    wxPy_END_ALLOW_THREADS;
+}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxToolBar_p");
     _resultobj = Py_BuildValue("s",_ptemp);
     return _resultobj;
 }
@@ -374,8 +406,12 @@ static PyObject *_wrap_wxFrame_Iconize(PyObject *self, PyObject *args) {
         }
     }
     _arg1 = (bool ) tempbool1;
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         wxFrame_Iconize(_arg0,_arg1);
-    Py_INCREF(Py_None);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
     _resultobj = Py_None;
     return _resultobj;
 }
@@ -396,8 +432,12 @@ static PyObject *_wrap_wxFrame_IsIconized(PyObject *self, PyObject *args) {
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         _result = (bool )wxFrame_IsIconized(_arg0);
-    _resultobj = Py_BuildValue("i",_result);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);
     return _resultobj;
 }
 
@@ -419,8 +459,12 @@ static PyObject *_wrap_wxFrame_Maximize(PyObject *self, PyObject *args) {
         }
     }
     _arg1 = (bool ) tempbool1;
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         wxFrame_Maximize(_arg0,_arg1);
-    Py_INCREF(Py_None);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
     _resultobj = Py_None;
     return _resultobj;
 }
@@ -448,8 +492,12 @@ static PyObject *_wrap_wxFrame_SetAcceleratorTable(PyObject *self, PyObject *arg
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         wxFrame_SetAcceleratorTable(_arg0,*_arg1);
-    Py_INCREF(Py_None);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
     _resultobj = Py_None;
     return _resultobj;
 }
@@ -477,8 +525,12 @@ static PyObject *_wrap_wxFrame_SetIcon(PyObject *self, PyObject *args) {
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         wxFrame_SetIcon(_arg0,*_arg1);
-    Py_INCREF(Py_None);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
     _resultobj = Py_None;
     return _resultobj;
 }
@@ -506,8 +558,12 @@ static PyObject *_wrap_wxFrame_SetMenuBar(PyObject *self, PyObject *args) {
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         wxFrame_SetMenuBar(_arg0,_arg1);
-    Py_INCREF(Py_None);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
     _resultobj = Py_None;
     return _resultobj;
 }
@@ -535,8 +591,12 @@ static PyObject *_wrap_wxFrame_SetStatusBar(PyObject *self, PyObject *args) {
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         wxFrame_SetStatusBar(_arg0,_arg1);
-    Py_INCREF(Py_None);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
     _resultobj = Py_None;
     return _resultobj;
 }
@@ -564,10 +624,14 @@ static PyObject *_wrap_wxFrame_SetStatusText(PyObject *self, PyObject *args) {
         PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
         return NULL;
     }
-    _arg1 = new wxString(PyString_AsString(_obj1));
+    _arg1 = new wxString(PyString_AsString(_obj1), PyString_Size(_obj1));
 }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         wxFrame_SetStatusText(_arg0,*_arg1,_arg2);
-    Py_INCREF(Py_None);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
     _resultobj = Py_None;
 {
     if (_obj1)
@@ -602,10 +666,19 @@ static PyObject *_wrap_wxFrame_SetStatusWidths(PyObject *self, PyObject *args) {
     }
 }
 {
+    if (_obj2) {
         _arg1 = PyList_Size(_obj2);
     }
+    else {
+        _arg1 = 0;
+    }
+}
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         wxFrame_SetStatusWidths(_arg0,_arg1,_arg2);
-    Py_INCREF(Py_None);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
     _resultobj = Py_None;
 {
     delete [] _arg2;
@@ -635,10 +708,14 @@ static PyObject *_wrap_wxFrame_SetTitle(PyObject *self, PyObject *args) {
         PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
         return NULL;
     }
-    _arg1 = new wxString(PyString_AsString(_obj1));
+    _arg1 = new wxString(PyString_AsString(_obj1), PyString_Size(_obj1));
 }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         wxFrame_SetTitle(_arg0,*_arg1);
-    Py_INCREF(Py_None);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
     _resultobj = Py_None;
 {
     if (_obj1)
@@ -670,8 +747,12 @@ static PyObject *_wrap_wxFrame_SetToolBar(PyObject *self, PyObject *args) {
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         wxFrame_SetToolBar(_arg0,_arg1);
-    Py_INCREF(Py_None);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
     _resultobj = Py_None;
     return _resultobj;
 }
@@ -731,7 +812,7 @@ static PyObject *_wrap_new_wxMiniFrame(PyObject *self, PyObject *args) {
         PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
         return NULL;
     }
-    _arg2 = new wxString(PyString_AsString(_obj2));
+    _arg2 = new wxString(PyString_AsString(_obj2), PyString_Size(_obj2));
 }
     if (_argc3) {
         if (SWIG_GetPtr(_argc3,(void **) &_arg3,"_wxPoint_p")) {
@@ -745,8 +826,12 @@ static PyObject *_wrap_new_wxMiniFrame(PyObject *self, PyObject *args) {
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         _result = (wxMiniFrame *)new_wxMiniFrame(_arg0,_arg1,*_arg2,*_arg3,*_arg4,_arg5,_arg6);
-    SWIG_MakePtr(_ptemp, (char *) _result,"_wxMiniFrame_p");
+
+    wxPy_END_ALLOW_THREADS;
+}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxMiniFrame_p");
     _resultobj = Py_BuildValue("s",_ptemp);
 {
     if (_obj2)
@@ -834,6 +919,7 @@ SWIGEXPORT(void,initframesc)() {
 	 SWIG_RegisterMapping("_wxPanel","_class_wxPanel",0);
 	 SWIG_RegisterMapping("_wxInitDialogEvent","_class_wxInitDialogEvent",0);
 	 SWIG_RegisterMapping("_wxCheckBox","_class_wxCheckBox",0);
+	 SWIG_RegisterMapping("_wxPyEvent","_class_wxPyEvent",0);
 	 SWIG_RegisterMapping("_wxTextCtrl","_class_wxTextCtrl",0);
 	 SWIG_RegisterMapping("_class_wxToolTip","_wxToolTip",0);
 	 SWIG_RegisterMapping("_class_wxMask","_wxMask",0);
@@ -864,6 +950,7 @@ SWIGEXPORT(void,initframesc)() {
 	 SWIG_RegisterMapping("_wxSpinButton","_class_wxSpinButton",0);
 	 SWIG_RegisterMapping("_wxToolBarTool","_class_wxToolBarTool",0);
 	 SWIG_RegisterMapping("_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0);
+	 SWIG_RegisterMapping("_class_wxPyEvent","_wxPyEvent",0);
 	 SWIG_RegisterMapping("_class_wxIconizeEvent","_wxIconizeEvent",0);
 	 SWIG_RegisterMapping("_class_wxStaticBitmap","_wxStaticBitmap",0);
 	 SWIG_RegisterMapping("_class_wxToolBar","_wxToolBar",0);

utils/wxPython/src/gtk/image.py

@@ -0,0 +1,226 @@
+# This file was created automatically by SWIG.
+import imagec
+
+from misc import *
+
+from gdi import *
+class wxImageHandlerPtr :
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def GetName(self):
+        val = imagec.wxImageHandler_GetName(self.this)
+        return val
+    def GetExtension(self):
+        val = imagec.wxImageHandler_GetExtension(self.this)
+        return val
+    def GetType(self):
+        val = imagec.wxImageHandler_GetType(self.this)
+        return val
+    def GetMimeType(self):
+        val = imagec.wxImageHandler_GetMimeType(self.this)
+        return val
+    def SetName(self,arg0):
+        val = imagec.wxImageHandler_SetName(self.this,arg0)
+        return val
+    def SetExtension(self,arg0):
+        val = imagec.wxImageHandler_SetExtension(self.this,arg0)
+        return val
+    def SetType(self,arg0):
+        val = imagec.wxImageHandler_SetType(self.this,arg0)
+        return val
+    def SetMimeType(self,arg0):
+        val = imagec.wxImageHandler_SetMimeType(self.this,arg0)
+        return val
+    def __repr__(self):
+        return "<C wxImageHandler instance>"
+class wxImageHandler(wxImageHandlerPtr):
+    def __init__(self) :
+        self.this = imagec.new_wxImageHandler()
+        self.thisown = 1
+
+
+
+
+class wxPNGHandlerPtr(wxImageHandlerPtr):
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def __repr__(self):
+        return "<C wxPNGHandler instance>"
+class wxPNGHandler(wxPNGHandlerPtr):
+    def __init__(self) :
+        self.this = imagec.new_wxPNGHandler()
+        self.thisown = 1
+
+
+
+
+class wxJPEGHandlerPtr(wxImageHandlerPtr):
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def __repr__(self):
+        return "<C wxJPEGHandler instance>"
+class wxJPEGHandler(wxJPEGHandlerPtr):
+    def __init__(self) :
+        self.this = imagec.new_wxJPEGHandler()
+        self.thisown = 1
+
+
+
+
+class wxBMPHandlerPtr(wxImageHandlerPtr):
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def __repr__(self):
+        return "<C wxBMPHandler instance>"
+class wxBMPHandler(wxBMPHandlerPtr):
+    def __init__(self) :
+        self.this = imagec.new_wxBMPHandler()
+        self.thisown = 1
+
+
+
+
+class wxGIFHandlerPtr(wxImageHandlerPtr):
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def __repr__(self):
+        return "<C wxGIFHandler instance>"
+class wxGIFHandler(wxGIFHandlerPtr):
+    def __init__(self) :
+        self.this = imagec.new_wxGIFHandler()
+        self.thisown = 1
+
+
+
+
+class wxImagePtr :
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def __del__(self):
+        if self.thisown == 1 :
+            imagec.delete_wxImage(self.this)
+    def ConvertToBitmap(self):
+        val = imagec.wxImage_ConvertToBitmap(self.this)
+        val = wxBitmapPtr(val)
+        val.thisown = 1
+        return val
+    def Create(self,arg0,arg1):
+        val = imagec.wxImage_Create(self.this,arg0,arg1)
+        return val
+    def Destroy(self):
+        val = imagec.wxImage_Destroy(self.this)
+        return val
+    def Scale(self,arg0,arg1):
+        val = imagec.wxImage_Scale(self.this,arg0,arg1)
+        val = wxImagePtr(val)
+        val.thisown = 1
+        return val
+    def SetRGB(self,arg0,arg1,arg2,arg3,arg4):
+        val = imagec.wxImage_SetRGB(self.this,arg0,arg1,arg2,arg3,arg4)
+        return val
+    def GetRed(self,arg0,arg1):
+        val = imagec.wxImage_GetRed(self.this,arg0,arg1)
+        return val
+    def GetGreen(self,arg0,arg1):
+        val = imagec.wxImage_GetGreen(self.this,arg0,arg1)
+        return val
+    def GetBlue(self,arg0,arg1):
+        val = imagec.wxImage_GetBlue(self.this,arg0,arg1)
+        return val
+    def LoadFile(self,arg0,*args):
+        val = apply(imagec.wxImage_LoadFile,(self.this,arg0,)+args)
+        return val
+    def LoadMimeFile(self,arg0,arg1):
+        val = imagec.wxImage_LoadMimeFile(self.this,arg0,arg1)
+        return val
+    def SaveFile(self,arg0,arg1):
+        val = imagec.wxImage_SaveFile(self.this,arg0,arg1)
+        return val
+    def SaveMimeFile(self,arg0,arg1):
+        val = imagec.wxImage_SaveMimeFile(self.this,arg0,arg1)
+        return val
+    def Ok(self):
+        val = imagec.wxImage_Ok(self.this)
+        return val
+    def GetWidth(self):
+        val = imagec.wxImage_GetWidth(self.this)
+        return val
+    def GetHeight(self):
+        val = imagec.wxImage_GetHeight(self.this)
+        return val
+    def GetData(self):
+        val = imagec.wxImage_GetData(self.this)
+        return val
+    def SetData(self,arg0):
+        val = imagec.wxImage_SetData(self.this,arg0)
+        return val
+    def SetMaskColour(self,arg0,arg1,arg2):
+        val = imagec.wxImage_SetMaskColour(self.this,arg0,arg1,arg2)
+        return val
+    def GetMaskRed(self):
+        val = imagec.wxImage_GetMaskRed(self.this)
+        return val
+    def GetMaskGreen(self):
+        val = imagec.wxImage_GetMaskGreen(self.this)
+        return val
+    def GetMaskBlue(self):
+        val = imagec.wxImage_GetMaskBlue(self.this)
+        return val
+    def SetMask(self,*args):
+        val = apply(imagec.wxImage_SetMask,(self.this,)+args)
+        return val
+    def HasMask(self):
+        val = imagec.wxImage_HasMask(self.this)
+        return val
+    def __repr__(self):
+        return "<C wxImage instance>"
+class wxImage(wxImagePtr):
+    def __init__(self,arg0,*args) :
+        self.this = apply(imagec.new_wxImage,(arg0,)+args)
+        self.thisown = 1
+
+
+
+
+
+
+#-------------- FUNCTION WRAPPERS ------------------
+
+def wxNullImage():
+    val = imagec.wxNullImage()
+    val = wxImagePtr(val)
+    val.thisown = 1
+    return val
+
+def wxEmptyImage(arg0,arg1):
+    val = imagec.wxEmptyImage(arg0,arg1)
+    val = wxImagePtr(val)
+    val.thisown = 1
+    return val
+
+def wxImageFromMime(arg0,arg1):
+    val = imagec.wxImageFromMime(arg0,arg1)
+    val = wxImagePtr(val)
+    val.thisown = 1
+    return val
+
+def wxImageFromBitmap(arg0):
+    val = imagec.wxImageFromBitmap(arg0.this)
+    val = wxImagePtr(val)
+    val.thisown = 1
+    return val
+
+def wxImage_AddHandler(arg0):
+    val = imagec.wxImage_AddHandler(arg0.this)
+    return val
+
+
+
+#-------------- VARIABLE WRAPPERS ------------------
+

utils/wxPython/src/gtk/mdi.cpp

@@ -169,7 +169,7 @@ static PyObject *_wrap_new_wxMDIParentFrame(PyObject *self, PyObject *args) {
         PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
         return NULL;
     }
-    _arg2 = new wxString(PyString_AsString(_obj2));
+    _arg2 = new wxString(PyString_AsString(_obj2), PyString_Size(_obj2));
 }
     if (_argc3) {
         if (SWIG_GetPtr(_argc3,(void **) &_arg3,"_wxPoint_p")) {
@@ -183,8 +183,12 @@ static PyObject *_wrap_new_wxMDIParentFrame(PyObject *self, PyObject *args) {
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         _result = (wxMDIParentFrame *)new_wxMDIParentFrame(_arg0,_arg1,*_arg2,*_arg3,*_arg4,_arg5,_arg6);
-    SWIG_MakePtr(_ptemp, (char *) _result,"_wxMDIParentFrame_p");
+
+    wxPy_END_ALLOW_THREADS;
+}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxMDIParentFrame_p");
     _resultobj = Py_BuildValue("s",_ptemp);
 {
     if (_obj2)
@@ -208,8 +212,12 @@ static PyObject *_wrap_wxMDIParentFrame_ActivateNext(PyObject *self, PyObject *a
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         wxMDIParentFrame_ActivateNext(_arg0);
-    Py_INCREF(Py_None);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
     _resultobj = Py_None;
     return _resultobj;
 }
@@ -229,8 +237,12 @@ static PyObject *_wrap_wxMDIParentFrame_ActivatePrevious(PyObject *self, PyObjec
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         wxMDIParentFrame_ActivatePrevious(_arg0);
-    Py_INCREF(Py_None);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
     _resultobj = Py_None;
     return _resultobj;
 }
@@ -250,8 +262,12 @@ static PyObject *_wrap_wxMDIParentFrame_ArrangeIcons(PyObject *self, PyObject *a
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         wxMDIParentFrame_ArrangeIcons(_arg0);
-    Py_INCREF(Py_None);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
     _resultobj = Py_None;
     return _resultobj;
 }
@@ -271,8 +287,12 @@ static PyObject *_wrap_wxMDIParentFrame_Cascade(PyObject *self, PyObject *args)
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         wxMDIParentFrame_Cascade(_arg0);
-    Py_INCREF(Py_None);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
     _resultobj = Py_None;
     return _resultobj;
 }
@@ -294,8 +314,12 @@ static PyObject *_wrap_wxMDIParentFrame_GetActiveChild(PyObject *self, PyObject
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         _result = (wxMDIChildFrame *)wxMDIParentFrame_GetActiveChild(_arg0);
-    SWIG_MakePtr(_ptemp, (char *) _result,"_wxMDIChildFrame_p");
+
+    wxPy_END_ALLOW_THREADS;
+}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxMDIChildFrame_p");
     _resultobj = Py_BuildValue("s",_ptemp);
     return _resultobj;
 }
@@ -317,8 +341,12 @@ static PyObject *_wrap_wxMDIParentFrame_GetClientWindow(PyObject *self, PyObject
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         _result = (wxMDIClientWindow *)wxMDIParentFrame_GetClientWindow(_arg0);
-    SWIG_MakePtr(_ptemp, (char *) _result,"_wxMDIClientWindow_p");
+
+    wxPy_END_ALLOW_THREADS;
+}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxMDIClientWindow_p");
     _resultobj = Py_BuildValue("s",_ptemp);
     return _resultobj;
 }
@@ -340,8 +368,12 @@ static PyObject *_wrap_wxMDIParentFrame_GetToolBar(PyObject *self, PyObject *arg
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         _result = (wxWindow *)wxMDIParentFrame_GetToolBar(_arg0);
-    SWIG_MakePtr(_ptemp, (char *) _result,"_wxWindow_p");
+
+    wxPy_END_ALLOW_THREADS;
+}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxWindow_p");
     _resultobj = Py_BuildValue("s",_ptemp);
     return _resultobj;
 }
@@ -361,8 +393,12 @@ static PyObject *_wrap_wxMDIParentFrame_Tile(PyObject *self, PyObject *args) {
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         wxMDIParentFrame_Tile(_arg0);
-    Py_INCREF(Py_None);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
     _resultobj = Py_None;
     return _resultobj;
 }
@@ -422,7 +458,7 @@ static PyObject *_wrap_new_wxMDIChildFrame(PyObject *self, PyObject *args) {
         PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
         return NULL;
     }
-    _arg2 = new wxString(PyString_AsString(_obj2));
+    _arg2 = new wxString(PyString_AsString(_obj2), PyString_Size(_obj2));
 }
     if (_argc3) {
         if (SWIG_GetPtr(_argc3,(void **) &_arg3,"_wxPoint_p")) {
@@ -436,8 +472,12 @@ static PyObject *_wrap_new_wxMDIChildFrame(PyObject *self, PyObject *args) {
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         _result = (wxMDIChildFrame *)new_wxMDIChildFrame(_arg0,_arg1,*_arg2,*_arg3,*_arg4,_arg5,_arg6);
-    SWIG_MakePtr(_ptemp, (char *) _result,"_wxMDIChildFrame_p");
+
+    wxPy_END_ALLOW_THREADS;
+}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxMDIChildFrame_p");
     _resultobj = Py_BuildValue("s",_ptemp);
 {
     if (_obj2)
@@ -461,20 +501,26 @@ static PyObject *_wrap_wxMDIChildFrame_Activate(PyObject *self, PyObject *args)
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         wxMDIChildFrame_Activate(_arg0);
-    Py_INCREF(Py_None);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
     _resultobj = Py_None;
     return _resultobj;
 }
 
-#define wxMDIChildFrame_Maximize(_swigobj)  (_swigobj->Maximize())
+#define wxMDIChildFrame_Maximize(_swigobj,_swigarg0)  (_swigobj->Maximize(_swigarg0))
 static PyObject *_wrap_wxMDIChildFrame_Maximize(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxMDIChildFrame * _arg0;
+    bool  _arg1;
     char * _argc0 = 0;
+    int tempbool1;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxMDIChildFrame_Maximize",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"si:wxMDIChildFrame_Maximize",&_argc0,&tempbool1)) 
         return NULL;
     if (_argc0) {
         if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMDIChildFrame_p")) {
@@ -482,8 +528,13 @@ static PyObject *_wrap_wxMDIChildFrame_Maximize(PyObject *self, PyObject *args)
         return NULL;
         }
     }
-    wxMDIChildFrame_Maximize(_arg0);
+    _arg1 = (bool ) tempbool1;
-    Py_INCREF(Py_None);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxMDIChildFrame_Maximize(_arg0,_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
     _resultobj = Py_None;
     return _resultobj;
 }
@@ -503,8 +554,12 @@ static PyObject *_wrap_wxMDIChildFrame_Restore(PyObject *self, PyObject *args) {
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         wxMDIChildFrame_Restore(_arg0);
-    Py_INCREF(Py_None);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
     _resultobj = Py_None;
     return _resultobj;
 }
@@ -543,8 +598,12 @@ static PyObject *_wrap_new_wxMDIClientWindow(PyObject *self, PyObject *args) {
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         _result = (wxMDIClientWindow *)new_wxMDIClientWindow(_arg0,_arg1);
-    SWIG_MakePtr(_ptemp, (char *) _result,"_wxMDIClientWindow_p");
+
+    wxPy_END_ALLOW_THREADS;
+}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxMDIClientWindow_p");
     _resultobj = Py_BuildValue("s",_ptemp);
     return _resultobj;
 }
@@ -624,6 +683,7 @@ SWIGEXPORT(void,initmdic)() {
 	 SWIG_RegisterMapping("_wxPanel","_class_wxPanel",0);
 	 SWIG_RegisterMapping("_wxInitDialogEvent","_class_wxInitDialogEvent",0);
 	 SWIG_RegisterMapping("_wxCheckBox","_class_wxCheckBox",0);
+	 SWIG_RegisterMapping("_wxPyEvent","_class_wxPyEvent",0);
 	 SWIG_RegisterMapping("_wxTextCtrl","_class_wxTextCtrl",0);
 	 SWIG_RegisterMapping("_class_wxToolTip","_wxToolTip",0);
 	 SWIG_RegisterMapping("_class_wxMask","_wxMask",0);
@@ -654,6 +714,7 @@ SWIGEXPORT(void,initmdic)() {
 	 SWIG_RegisterMapping("_wxSpinButton","_class_wxSpinButton",0);
 	 SWIG_RegisterMapping("_wxToolBarTool","_class_wxToolBarTool",0);
 	 SWIG_RegisterMapping("_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0);
+	 SWIG_RegisterMapping("_class_wxPyEvent","_wxPyEvent",0);
 	 SWIG_RegisterMapping("_class_wxIconizeEvent","_wxIconizeEvent",0);
 	 SWIG_RegisterMapping("_class_wxStaticBitmap","_wxStaticBitmap",0);
 	 SWIG_RegisterMapping("_wxMDIChildFrame","_class_wxMDIChildFrame",0);

utils/wxPython/src/gtk/mdi.py

@@ -70,8 +70,8 @@ class wxMDIChildFramePtr(wxFramePtr):
     def Activate(self):
         val = mdic.wxMDIChildFrame_Activate(self.this)
         return val
-    def Maximize(self):
+    def Maximize(self,arg0):
-        val = mdic.wxMDIChildFrame_Maximize(self.this)
+        val = mdic.wxMDIChildFrame_Maximize(self.this,arg0)
         return val
     def Restore(self):
         val = mdic.wxMDIChildFrame_Restore(self.this)

utils/wxPython/src/gtk/misc.py

@@ -561,6 +561,10 @@ def wxSetCursor(arg0):
     val = miscc.wxSetCursor(arg0.this)
     return val
 
+wxNewId = miscc.wxNewId
+
+wxRegisterId = miscc.wxRegisterId
+
 NewId = miscc.NewId
 
 RegisterId = miscc.RegisterId
@@ -607,6 +611,8 @@ wxNow = miscc.wxNow
 
 wxYield = miscc.wxYield
 
+wxSafeYield = miscc.wxSafeYield
+
 wxGetResource = miscc.wxGetResource
 
 wxResourceAddIdentifier = miscc.wxResourceAddIdentifier

utils/wxPython/src/gtk/stattool.cpp

@@ -140,7 +140,7 @@ static PyObject *_wrap_new_wxStatusBar(PyObject *self, PyObject *args) {
     wxWindowID  _arg1;
     wxPoint * _arg2 = &wxPyDefaultPosition;
     wxSize * _arg3 = &wxPyDefaultSize;
-    long  _arg4 = wxST_SIZEGRIP;
+    long  _arg4 = (wxST_SIZEGRIP);
     char * _arg5 = "statusBar";
     char * _argc0 = 0;
     char * _argc2 = 0;
@@ -168,8 +168,12 @@ static PyObject *_wrap_new_wxStatusBar(PyObject *self, PyObject *args) {
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         _result = (wxStatusBar *)new_wxStatusBar(_arg0,_arg1,*_arg2,*_arg3,_arg4,_arg5);
-    SWIG_MakePtr(_ptemp, (char *) _result,"_wxStatusBar_p");
+
+    wxPy_END_ALLOW_THREADS;
+}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxStatusBar_p");
     _resultobj = Py_BuildValue("s",_ptemp);
     return _resultobj;
 }
@@ -196,8 +200,12 @@ static PyObject *_wrap_wxStatusBar_GetFieldRect(PyObject *self, PyObject *args)
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         _result = (wxRect *)wxStatusBar_GetFieldRect(_arg0,_arg1);
-    SWIG_MakePtr(_ptemp, (char *) _result,"_wxRect_p");
+
+    wxPy_END_ALLOW_THREADS;
+}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxRect_p");
     _resultobj = Py_BuildValue("s",_ptemp);
     return _resultobj;
 }
@@ -218,8 +226,12 @@ static PyObject *_wrap_wxStatusBar_GetFieldsCount(PyObject *self, PyObject *args
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         _result = (int )wxStatusBar_GetFieldsCount(_arg0);
-    _resultobj = Py_BuildValue("i",_result);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);
     return _resultobj;
 }
 
@@ -240,8 +252,12 @@ static PyObject *_wrap_wxStatusBar_GetStatusText(PyObject *self, PyObject *args)
         return NULL;
         }
     }
-    _result = new wxString (wxStatusBar_GetStatusText(_arg0,_arg1));
 {
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = new wxString (wxStatusBar_GetStatusText(_arg0,_arg1));
+
+    wxPy_END_ALLOW_THREADS;
+}{
     _resultobj = PyString_FromString(WXSTRINGCAST *(_result));
 }
 {
@@ -274,8 +290,12 @@ static PyObject *_wrap_wxStatusBar_DrawField(PyObject *self, PyObject *args) {
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         wxStatusBar_DrawField(_arg0,*_arg1,_arg2);
-    Py_INCREF(Py_None);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
     _resultobj = Py_None;
     return _resultobj;
 }
@@ -304,8 +324,12 @@ static PyObject *_wrap_wxStatusBar_DrawFieldText(PyObject *self, PyObject *args)
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         wxStatusBar_DrawFieldText(_arg0,*_arg1,_arg2);
-    Py_INCREF(Py_None);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
     _resultobj = Py_None;
     return _resultobj;
 }
@@ -325,8 +349,12 @@ static PyObject *_wrap_wxStatusBar_InitColours(PyObject *self, PyObject *args) {
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         wxStatusBar_InitColours(_arg0);
-    Py_INCREF(Py_None);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
     _resultobj = Py_None;
     return _resultobj;
 }
@@ -347,8 +375,12 @@ static PyObject *_wrap_wxStatusBar_SetFieldsCount(PyObject *self, PyObject *args
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         wxStatusBar_SetFieldsCount(_arg0,_arg1);
-    Py_INCREF(Py_None);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
     _resultobj = Py_None;
     return _resultobj;
 }
@@ -376,10 +408,14 @@ static PyObject *_wrap_wxStatusBar_SetStatusText(PyObject *self, PyObject *args)
         PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
         return NULL;
     }
-    _arg1 = new wxString(PyString_AsString(_obj1));
+    _arg1 = new wxString(PyString_AsString(_obj1), PyString_Size(_obj1));
 }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         wxStatusBar_SetStatusText(_arg0,*_arg1,_arg2);
-    Py_INCREF(Py_None);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
     _resultobj = Py_None;
 {
     if (_obj1)
@@ -414,10 +450,19 @@ static PyObject *_wrap_wxStatusBar_SetStatusWidths(PyObject *self, PyObject *arg
     }
 }
 {
+    if (_obj2) {
         _arg1 = PyList_Size(_obj2);
     }
+    else {
+        _arg1 = 0;
+    }
+}
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         wxStatusBar_SetStatusWidths(_arg0,_arg1,_arg2);
-    Py_INCREF(Py_None);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
     _resultobj = Py_None;
 {
     delete [] _arg2;
@@ -434,8 +479,12 @@ static PyObject *_wrap_new_wxToolBarTool(PyObject *self, PyObject *args) {
     self = self;
     if(!PyArg_ParseTuple(args,":new_wxToolBarTool")) 
         return NULL;
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         _result = (wxToolBarTool *)new_wxToolBarTool();
-    SWIG_MakePtr(_ptemp, (char *) _result,"_wxToolBarTool_p");
+
+    wxPy_END_ALLOW_THREADS;
+}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxToolBarTool_p");
     _resultobj = Py_BuildValue("s",_ptemp);
     return _resultobj;
 }
@@ -455,8 +504,12 @@ static PyObject *_wrap_delete_wxToolBarTool(PyObject *self, PyObject *args) {
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         delete_wxToolBarTool(_arg0);
-    Py_INCREF(Py_None);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
     _resultobj = Py_None;
     return _resultobj;
 }
@@ -478,8 +531,12 @@ static PyObject *_wrap_wxToolBarTool_m_toolStyle_set(PyObject *self, PyObject *a
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         _result = (int )wxToolBarTool_m_toolStyle_set(_arg0,_arg1);
-    _resultobj = Py_BuildValue("i",_result);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);
     return _resultobj;
 }
 
@@ -499,8 +556,12 @@ static PyObject *_wrap_wxToolBarTool_m_toolStyle_get(PyObject *self, PyObject *a
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         _result = (int )wxToolBarTool_m_toolStyle_get(_arg0);
-    _resultobj = Py_BuildValue("i",_result);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);
     return _resultobj;
 }
 
@@ -529,8 +590,12 @@ static PyObject *_wrap_wxToolBarTool_m_clientData_set(PyObject *self, PyObject *
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         _result = (wxObject *)wxToolBarTool_m_clientData_set(_arg0,_arg1);
-    SWIG_MakePtr(_ptemp, (char *) _result,"_wxObject_p");
+
+    wxPy_END_ALLOW_THREADS;
+}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxObject_p");
     _resultobj = Py_BuildValue("s",_ptemp);
     return _resultobj;
 }
@@ -552,8 +617,12 @@ static PyObject *_wrap_wxToolBarTool_m_clientData_get(PyObject *self, PyObject *
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         _result = (wxObject *)wxToolBarTool_m_clientData_get(_arg0);
-    SWIG_MakePtr(_ptemp, (char *) _result,"_wxObject_p");
+
+    wxPy_END_ALLOW_THREADS;
+}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxObject_p");
     _resultobj = Py_BuildValue("s",_ptemp);
     return _resultobj;
 }
@@ -575,8 +644,12 @@ static PyObject *_wrap_wxToolBarTool_m_index_set(PyObject *self, PyObject *args)
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         _result = (int )wxToolBarTool_m_index_set(_arg0,_arg1);
-    _resultobj = Py_BuildValue("i",_result);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);
     return _resultobj;
 }
 
@@ -596,8 +669,12 @@ static PyObject *_wrap_wxToolBarTool_m_index_get(PyObject *self, PyObject *args)
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         _result = (int )wxToolBarTool_m_index_get(_arg0);
-    _resultobj = Py_BuildValue("i",_result);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);
     return _resultobj;
 }
 
@@ -620,8 +697,12 @@ static PyObject *_wrap_wxToolBarTool_m_toggleState_set(PyObject *self, PyObject
         }
     }
     _arg1 = (bool ) tempbool1;
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         _result = (bool )wxToolBarTool_m_toggleState_set(_arg0,_arg1);
-    _resultobj = Py_BuildValue("i",_result);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);
     return _resultobj;
 }
 
@@ -641,8 +722,12 @@ static PyObject *_wrap_wxToolBarTool_m_toggleState_get(PyObject *self, PyObject
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         _result = (bool )wxToolBarTool_m_toggleState_get(_arg0);
-    _resultobj = Py_BuildValue("i",_result);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);
     return _resultobj;
 }
 
@@ -665,8 +750,12 @@ static PyObject *_wrap_wxToolBarTool_m_isToggle_set(PyObject *self, PyObject *ar
         }
     }
     _arg1 = (bool ) tempbool1;
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         _result = (bool )wxToolBarTool_m_isToggle_set(_arg0,_arg1);
-    _resultobj = Py_BuildValue("i",_result);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);
     return _resultobj;
 }
 
@@ -686,8 +775,12 @@ static PyObject *_wrap_wxToolBarTool_m_isToggle_get(PyObject *self, PyObject *ar
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         _result = (bool )wxToolBarTool_m_isToggle_get(_arg0);
-    _resultobj = Py_BuildValue("i",_result);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);
     return _resultobj;
 }
 
@@ -710,8 +803,12 @@ static PyObject *_wrap_wxToolBarTool_m_deleteSecondBitmap_set(PyObject *self, Py
         }
     }
     _arg1 = (bool ) tempbool1;
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         _result = (bool )wxToolBarTool_m_deleteSecondBitmap_set(_arg0,_arg1);
-    _resultobj = Py_BuildValue("i",_result);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);
     return _resultobj;
 }
 
@@ -731,8 +828,12 @@ static PyObject *_wrap_wxToolBarTool_m_deleteSecondBitmap_get(PyObject *self, Py
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         _result = (bool )wxToolBarTool_m_deleteSecondBitmap_get(_arg0);
-    _resultobj = Py_BuildValue("i",_result);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);
     return _resultobj;
 }
 
@@ -755,8 +856,12 @@ static PyObject *_wrap_wxToolBarTool_m_enabled_set(PyObject *self, PyObject *arg
         }
     }
     _arg1 = (bool ) tempbool1;
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         _result = (bool )wxToolBarTool_m_enabled_set(_arg0,_arg1);
-    _resultobj = Py_BuildValue("i",_result);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);
     return _resultobj;
 }
 
@@ -776,8 +881,12 @@ static PyObject *_wrap_wxToolBarTool_m_enabled_get(PyObject *self, PyObject *arg
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         _result = (bool )wxToolBarTool_m_enabled_get(_arg0);
-    _resultobj = Py_BuildValue("i",_result);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);
     return _resultobj;
 }
 
@@ -806,8 +915,12 @@ static PyObject *_wrap_wxToolBarTool_m_bitmap1_set(PyObject *self, PyObject *arg
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         _result = (wxBitmap *)wxToolBarTool_m_bitmap1_set(_arg0,_arg1);
-    SWIG_MakePtr(_ptemp, (char *) _result,"_wxBitmap_p");
+
+    wxPy_END_ALLOW_THREADS;
+}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxBitmap_p");
     _resultobj = Py_BuildValue("s",_ptemp);
     return _resultobj;
 }
@@ -829,8 +942,12 @@ static PyObject *_wrap_wxToolBarTool_m_bitmap1_get(PyObject *self, PyObject *arg
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         _result = (wxBitmap *)wxToolBarTool_m_bitmap1_get(_arg0);
-    SWIG_MakePtr(_ptemp, (char *) _result,"_wxBitmap_p");
+
+    wxPy_END_ALLOW_THREADS;
+}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxBitmap_p");
     _resultobj = Py_BuildValue("s",_ptemp);
     return _resultobj;
 }
@@ -860,8 +977,12 @@ static PyObject *_wrap_wxToolBarTool_m_bitmap2_set(PyObject *self, PyObject *arg
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         _result = (wxBitmap *)wxToolBarTool_m_bitmap2_set(_arg0,_arg1);
-    SWIG_MakePtr(_ptemp, (char *) _result,"_wxBitmap_p");
+
+    wxPy_END_ALLOW_THREADS;
+}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxBitmap_p");
     _resultobj = Py_BuildValue("s",_ptemp);
     return _resultobj;
 }
@@ -883,8 +1004,12 @@ static PyObject *_wrap_wxToolBarTool_m_bitmap2_get(PyObject *self, PyObject *arg
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         _result = (wxBitmap *)wxToolBarTool_m_bitmap2_get(_arg0);
-    SWIG_MakePtr(_ptemp, (char *) _result,"_wxBitmap_p");
+
+    wxPy_END_ALLOW_THREADS;
+}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxBitmap_p");
     _resultobj = Py_BuildValue("s",_ptemp);
     return _resultobj;
 }
@@ -908,8 +1033,12 @@ static PyObject *_wrap_wxToolBarTool_m_isMenuCommand_set(PyObject *self, PyObjec
         }
     }
     _arg1 = (bool ) tempbool1;
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         _result = (bool )wxToolBarTool_m_isMenuCommand_set(_arg0,_arg1);
-    _resultobj = Py_BuildValue("i",_result);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);
     return _resultobj;
 }
 
@@ -929,8 +1058,12 @@ static PyObject *_wrap_wxToolBarTool_m_isMenuCommand_get(PyObject *self, PyObjec
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         _result = (bool )wxToolBarTool_m_isMenuCommand_get(_arg0);
-    _resultobj = Py_BuildValue("i",_result);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);
     return _resultobj;
 }
 
@@ -957,10 +1090,14 @@ static PyObject *_wrap_wxToolBarTool_m_shortHelpString_set(PyObject *self, PyObj
         PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
         return NULL;
     }
-    _arg1 = new wxString(PyString_AsString(_obj1));
+    _arg1 = new wxString(PyString_AsString(_obj1), PyString_Size(_obj1));
 }
-    _result = (wxString *)wxToolBarTool_m_shortHelpString_set(_arg0,_arg1);
 {
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (wxString *)wxToolBarTool_m_shortHelpString_set(_arg0,_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}{
     _resultobj = PyString_FromString(WXSTRINGCAST (*_result));
 }
 {
@@ -986,8 +1123,12 @@ static PyObject *_wrap_wxToolBarTool_m_shortHelpString_get(PyObject *self, PyObj
         return NULL;
         }
     }
-    _result = (wxString *)wxToolBarTool_m_shortHelpString_get(_arg0);
 {
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (wxString *)wxToolBarTool_m_shortHelpString_get(_arg0);
+
+    wxPy_END_ALLOW_THREADS;
+}{
     _resultobj = PyString_FromString(WXSTRINGCAST (*_result));
 }
     return _resultobj;
@@ -1016,10 +1157,14 @@ static PyObject *_wrap_wxToolBarTool_m_longHelpString_set(PyObject *self, PyObje
         PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
         return NULL;
     }
-    _arg1 = new wxString(PyString_AsString(_obj1));
+    _arg1 = new wxString(PyString_AsString(_obj1), PyString_Size(_obj1));
 }
-    _result = (wxString *)wxToolBarTool_m_longHelpString_set(_arg0,_arg1);
 {
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (wxString *)wxToolBarTool_m_longHelpString_set(_arg0,_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}{
     _resultobj = PyString_FromString(WXSTRINGCAST (*_result));
 }
 {
@@ -1045,8 +1190,12 @@ static PyObject *_wrap_wxToolBarTool_m_longHelpString_get(PyObject *self, PyObje
         return NULL;
         }
     }
-    _result = (wxString *)wxToolBarTool_m_longHelpString_get(_arg0);
 {
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (wxString *)wxToolBarTool_m_longHelpString_get(_arg0);
+
+    wxPy_END_ALLOW_THREADS;
+}{
     _resultobj = PyString_FromString(WXSTRINGCAST (*_result));
 }
     return _resultobj;
@@ -1112,8 +1261,12 @@ static PyObject *_wrap_new_wxToolBar(PyObject *self, PyObject *args) {
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         _result = (wxToolBar *)new_wxToolBar(_arg0,_arg1,*_arg2,*_arg3,_arg4,_arg5);
-    SWIG_MakePtr(_ptemp, (char *) _result,"_wxToolBar_p");
+
+    wxPy_END_ALLOW_THREADS;
+}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxToolBar_p");
     _resultobj = Py_BuildValue("s",_ptemp);
     return _resultobj;
 }
@@ -1133,8 +1286,12 @@ static PyObject *_wrap_wxToolBar_AddSeparator(PyObject *self, PyObject *args) {
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         wxToolBar_AddSeparator(_arg0);
-    Py_INCREF(Py_None);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
     _resultobj = Py_None;
     return _resultobj;
 }
@@ -1190,7 +1347,7 @@ static PyObject *_wrap_wxToolBar_AddTool(PyObject *self, PyObject *args) {
         PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
         return NULL;
     }
-    _arg7 = new wxString(PyString_AsString(_obj7));
+    _arg7 = new wxString(PyString_AsString(_obj7), PyString_Size(_obj7));
 }
     if (_obj8)
 {
@@ -1198,10 +1355,14 @@ static PyObject *_wrap_wxToolBar_AddTool(PyObject *self, PyObject *args) {
         PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
         return NULL;
     }
-    _arg8 = new wxString(PyString_AsString(_obj8));
+    _arg8 = new wxString(PyString_AsString(_obj8), PyString_Size(_obj8));
 }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         _result = (wxToolBarTool *)wxToolBar_AddTool(_arg0,_arg1,*_arg2,*_arg3,_arg4,_arg5,_arg6,*_arg7,*_arg8);
-    SWIG_MakePtr(_ptemp, (char *) _result,"_wxToolBarTool_p");
+
+    wxPy_END_ALLOW_THREADS;
+}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxToolBarTool_p");
     _resultobj = Py_BuildValue("s",_ptemp);
 {
     if (_obj7)
@@ -1254,7 +1415,7 @@ static PyObject *_wrap_wxToolBar_AddSimpleTool(PyObject *self, PyObject *args) {
         PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
         return NULL;
     }
-    _arg3 = new wxString(PyString_AsString(_obj3));
+    _arg3 = new wxString(PyString_AsString(_obj3), PyString_Size(_obj3));
 }
     if (_obj4)
 {
@@ -1262,10 +1423,14 @@ static PyObject *_wrap_wxToolBar_AddSimpleTool(PyObject *self, PyObject *args) {
         PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
         return NULL;
     }
-    _arg4 = new wxString(PyString_AsString(_obj4));
+    _arg4 = new wxString(PyString_AsString(_obj4), PyString_Size(_obj4));
 }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         _result = (wxToolBarTool *)wxToolBar_AddSimpleTool(_arg0,_arg1,*_arg2,*_arg3,*_arg4);
-    SWIG_MakePtr(_ptemp, (char *) _result,"_wxToolBarTool_p");
+
+    wxPy_END_ALLOW_THREADS;
+}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxToolBarTool_p");
     _resultobj = Py_BuildValue("s",_ptemp);
 {
     if (_obj3)
@@ -1297,8 +1462,12 @@ static PyObject *_wrap_wxToolBar_EnableTool(PyObject *self, PyObject *args) {
         }
     }
     _arg2 = (bool ) tempbool2;
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         wxToolBar_EnableTool(_arg0,_arg1,_arg2);
-    Py_INCREF(Py_None);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
     _resultobj = Py_None;
     return _resultobj;
 }
@@ -1320,8 +1489,12 @@ static PyObject *_wrap_wxToolBar_GetToolEnabled(PyObject *self, PyObject *args)
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         _result = (bool )wxToolBar_GetToolEnabled(_arg0,_arg1);
-    _resultobj = Py_BuildValue("i",_result);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);
     return _resultobj;
 }
 
@@ -1342,8 +1515,12 @@ static PyObject *_wrap_wxToolBar_GetToolLongHelp(PyObject *self, PyObject *args)
         return NULL;
         }
     }
-    _result = new wxString (wxToolBar_GetToolLongHelp(_arg0,_arg1));
 {
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = new wxString (wxToolBar_GetToolLongHelp(_arg0,_arg1));
+
+    wxPy_END_ALLOW_THREADS;
+}{
     _resultobj = PyString_FromString(WXSTRINGCAST *(_result));
 }
 {
@@ -1368,8 +1545,12 @@ static PyObject *_wrap_wxToolBar_GetToolPacking(PyObject *self, PyObject *args)
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         _result = (int )wxToolBar_GetToolPacking(_arg0);
-    _resultobj = Py_BuildValue("i",_result);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);
     return _resultobj;
 }
 
@@ -1389,8 +1570,12 @@ static PyObject *_wrap_wxToolBar_GetToolSeparation(PyObject *self, PyObject *arg
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         _result = (int )wxToolBar_GetToolSeparation(_arg0);
-    _resultobj = Py_BuildValue("i",_result);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);
     return _resultobj;
 }
 
@@ -1411,8 +1596,12 @@ static PyObject *_wrap_wxToolBar_GetToolShortHelp(PyObject *self, PyObject *args
         return NULL;
         }
     }
-    _result = new wxString (wxToolBar_GetToolShortHelp(_arg0,_arg1));
 {
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = new wxString (wxToolBar_GetToolShortHelp(_arg0,_arg1));
+
+    wxPy_END_ALLOW_THREADS;
+}{
     _resultobj = PyString_FromString(WXSTRINGCAST *(_result));
 }
 {
@@ -1438,8 +1627,12 @@ static PyObject *_wrap_wxToolBar_GetToolState(PyObject *self, PyObject *args) {
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         _result = (bool )wxToolBar_GetToolState(_arg0,_arg1);
-    _resultobj = Py_BuildValue("i",_result);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);
     return _resultobj;
 }
 
@@ -1459,8 +1652,12 @@ static PyObject *_wrap_wxToolBar_Realize(PyObject *self, PyObject *args) {
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         _result = (bool )wxToolBar_Realize(_arg0);
-    _resultobj = Py_BuildValue("i",_result);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);
     return _resultobj;
 }
 
@@ -1487,10 +1684,14 @@ static PyObject *_wrap_wxToolBar_SetToolLongHelp(PyObject *self, PyObject *args)
         PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
         return NULL;
     }
-    _arg2 = new wxString(PyString_AsString(_obj2));
+    _arg2 = new wxString(PyString_AsString(_obj2), PyString_Size(_obj2));
 }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         wxToolBar_SetToolLongHelp(_arg0,_arg1,*_arg2);
-    Py_INCREF(Py_None);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
     _resultobj = Py_None;
 {
     if (_obj2)
@@ -1522,10 +1723,14 @@ static PyObject *_wrap_wxToolBar_SetToolShortHelp(PyObject *self, PyObject *args
         PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
         return NULL;
     }
-    _arg2 = new wxString(PyString_AsString(_obj2));
+    _arg2 = new wxString(PyString_AsString(_obj2), PyString_Size(_obj2));
 }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         wxToolBar_SetToolShortHelp(_arg0,_arg1,*_arg2);
-    Py_INCREF(Py_None);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
     _resultobj = Py_None;
 {
     if (_obj2)
@@ -1557,8 +1762,12 @@ static PyObject *_wrap_wxToolBar_SetMargins(PyObject *self, PyObject *args) {
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         wxToolBar_SetMargins(_arg0,*_arg1);
-    Py_INCREF(Py_None);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
     _resultobj = Py_None;
     return _resultobj;
 }
@@ -1579,8 +1788,12 @@ static PyObject *_wrap_wxToolBar_SetToolPacking(PyObject *self, PyObject *args)
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         wxToolBar_SetToolPacking(_arg0,_arg1);
-    Py_INCREF(Py_None);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
     _resultobj = Py_None;
     return _resultobj;
 }
@@ -1601,8 +1814,12 @@ static PyObject *_wrap_wxToolBar_SetToolSeparation(PyObject *self, PyObject *arg
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         wxToolBar_SetToolSeparation(_arg0,_arg1);
-    Py_INCREF(Py_None);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
     _resultobj = Py_None;
     return _resultobj;
 }
@@ -1626,8 +1843,12 @@ static PyObject *_wrap_wxToolBar_ToggleTool(PyObject *self, PyObject *args) {
         }
     }
     _arg2 = (bool ) tempbool2;
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         wxToolBar_ToggleTool(_arg0,_arg1,_arg2);
-    Py_INCREF(Py_None);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
     _resultobj = Py_None;
     return _resultobj;
 }
@@ -1745,6 +1966,7 @@ SWIGEXPORT(void,initstattoolc)() {
 	 SWIG_RegisterMapping("_wxPanel","_class_wxPanel",0);
 	 SWIG_RegisterMapping("_wxInitDialogEvent","_class_wxInitDialogEvent",0);
 	 SWIG_RegisterMapping("_wxCheckBox","_class_wxCheckBox",0);
+	 SWIG_RegisterMapping("_wxPyEvent","_class_wxPyEvent",0);
 	 SWIG_RegisterMapping("_wxTextCtrl","_class_wxTextCtrl",0);
 	 SWIG_RegisterMapping("_class_wxToolTip","_wxToolTip",0);
 	 SWIG_RegisterMapping("_class_wxMask","_wxMask",0);
@@ -1774,6 +1996,7 @@ SWIGEXPORT(void,initstattoolc)() {
 	 SWIG_RegisterMapping("_wxSpinButton","_class_wxSpinButton",0);
 	 SWIG_RegisterMapping("_wxToolBarTool","_class_wxToolBarTool",0);
 	 SWIG_RegisterMapping("_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0);
+	 SWIG_RegisterMapping("_class_wxPyEvent","_wxPyEvent",0);
 	 SWIG_RegisterMapping("_class_wxIconizeEvent","_wxIconizeEvent",0);
 	 SWIG_RegisterMapping("_class_wxStaticBitmap","_wxStaticBitmap",0);
 	 SWIG_RegisterMapping("_class_wxToolBar","_wxToolBar",0);

utils/wxPython/src/gtk/utils.cpp

@@ -117,7 +117,7 @@ extern wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source);
 static char* wxStringErrorMsg = "string type is required for parameter";
 
 #ifdef SEPARATE
-    static wxString wxPyEmptyStr("");
+    wxString wxPyEmptyStr("");
 #endif
 
     static PyObject* __EnumerationHelper(bool flag, wxString& str, long index) {
@@ -153,7 +153,7 @@ static PyObject *_wrap_new_wxConfig(PyObject *self, PyObject *args) {
         PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
         return NULL;
     }
-    _arg0 = new wxString(PyString_AsString(_obj0));
+    _arg0 = new wxString(PyString_AsString(_obj0), PyString_Size(_obj0));
 }
     if (_obj1)
 {
@@ -161,7 +161,7 @@ static PyObject *_wrap_new_wxConfig(PyObject *self, PyObject *args) {
         PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
         return NULL;
     }
-    _arg1 = new wxString(PyString_AsString(_obj1));
+    _arg1 = new wxString(PyString_AsString(_obj1), PyString_Size(_obj1));
 }
     if (_obj2)
 {
@@ -169,7 +169,7 @@ static PyObject *_wrap_new_wxConfig(PyObject *self, PyObject *args) {
         PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
         return NULL;
     }
-    _arg2 = new wxString(PyString_AsString(_obj2));
+    _arg2 = new wxString(PyString_AsString(_obj2), PyString_Size(_obj2));
 }
     if (_obj3)
 {
@@ -177,10 +177,14 @@ static PyObject *_wrap_new_wxConfig(PyObject *self, PyObject *args) {
         PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
         return NULL;
     }
-    _arg3 = new wxString(PyString_AsString(_obj3));
+    _arg3 = new wxString(PyString_AsString(_obj3), PyString_Size(_obj3));
 }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         _result = (wxConfig *)new_wxConfig(*_arg0,*_arg1,*_arg2,*_arg3,_arg4);
-    SWIG_MakePtr(_ptemp, (char *) _result,"_wxConfig_p");
+
+    wxPy_END_ALLOW_THREADS;
+}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxConfig_p");
     _resultobj = Py_BuildValue("s",_ptemp);
 {
     if (_obj0)
@@ -216,8 +220,12 @@ static PyObject *_wrap_delete_wxConfig(PyObject *self, PyObject *args) {
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         delete_wxConfig(_arg0);
-    Py_INCREF(Py_None);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
     _resultobj = Py_None;
     return _resultobj;
 }
@@ -237,8 +245,12 @@ static PyObject *_wrap_wxConfig_DontCreateOnDemand(PyObject *self, PyObject *arg
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         wxConfig_DontCreateOnDemand(_arg0);
-    Py_INCREF(Py_None);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
     _resultobj = Py_None;
     return _resultobj;
 }
@@ -259,8 +271,12 @@ static PyObject *_wrap_wxConfig_DeleteAll(PyObject *self, PyObject *args) {
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         _result = (bool )wxConfig_DeleteAll(_arg0);
-    _resultobj = Py_BuildValue("i",_result);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);
     return _resultobj;
 }
 
@@ -289,11 +305,15 @@ static PyObject *_wrap_wxConfig_DeleteEntry(PyObject *self, PyObject *args) {
         PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
         return NULL;
     }
-    _arg1 = new wxString(PyString_AsString(_obj1));
+    _arg1 = new wxString(PyString_AsString(_obj1), PyString_Size(_obj1));
 }
     _arg2 = (bool ) tempbool2;
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         _result = (bool )wxConfig_DeleteEntry(_arg0,*_arg1,_arg2);
-    _resultobj = Py_BuildValue("i",_result);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);
 {
     if (_obj1)
         delete _arg1;
@@ -324,10 +344,14 @@ static PyObject *_wrap_wxConfig_DeleteGroup(PyObject *self, PyObject *args) {
         PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
         return NULL;
     }
-    _arg1 = new wxString(PyString_AsString(_obj1));
+    _arg1 = new wxString(PyString_AsString(_obj1), PyString_Size(_obj1));
 }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         _result = (bool )wxConfig_DeleteGroup(_arg0,*_arg1);
-    _resultobj = Py_BuildValue("i",_result);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);
 {
     if (_obj1)
         delete _arg1;
@@ -358,10 +382,14 @@ static PyObject *_wrap_wxConfig_Exists(PyObject *self, PyObject *args) {
         PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
         return NULL;
     }
-    _arg1 = new wxString(PyString_AsString(_obj1));
+    _arg1 = new wxString(PyString_AsString(_obj1), PyString_Size(_obj1));
 }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         _result = (bool )wxConfig_Exists(_arg0,*_arg1);
-    _resultobj = Py_BuildValue("i",_result);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);
 {
     if (_obj1)
         delete _arg1;
@@ -388,8 +416,12 @@ static PyObject *_wrap_wxConfig_Flush(PyObject *self, PyObject *args) {
         }
     }
     _arg1 = (bool ) tempbool1;
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         _result = (bool )wxConfig_Flush(_arg0,_arg1);
-    _resultobj = Py_BuildValue("i",_result);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);
     return _resultobj;
 }
 
@@ -409,8 +441,12 @@ static PyObject *_wrap_wxConfig_GetAppName(PyObject *self, PyObject *args) {
         return NULL;
         }
     }
-    _result = new wxString (wxConfig_GetAppName(_arg0));
 {
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = new wxString (wxConfig_GetAppName(_arg0));
+
+    wxPy_END_ALLOW_THREADS;
+}{
     _resultobj = PyString_FromString(WXSTRINGCAST *(_result));
 }
 {
@@ -442,8 +478,12 @@ static PyObject *_wrap_wxConfig_GetFirstGroup(PyObject *self, PyObject *args) {
         return NULL;
         }
     }
-    _result = (PyObject *)wxConfig_GetFirstGroup(_arg0);
 {
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (PyObject *)wxConfig_GetFirstGroup(_arg0);
+
+    wxPy_END_ALLOW_THREADS;
+}{
   _resultobj = _result;
 }
     return _resultobj;
@@ -472,8 +512,12 @@ static PyObject *_wrap_wxConfig_GetFirstEntry(PyObject *self, PyObject *args) {
         return NULL;
         }
     }
-    _result = (PyObject *)wxConfig_GetFirstEntry(_arg0);
 {
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (PyObject *)wxConfig_GetFirstEntry(_arg0);
+
+    wxPy_END_ALLOW_THREADS;
+}{
   _resultobj = _result;
 }
     return _resultobj;
@@ -502,8 +546,12 @@ static PyObject *_wrap_wxConfig_GetNextGroup(PyObject *self, PyObject *args) {
         return NULL;
         }
     }
-    _result = (PyObject *)wxConfig_GetNextGroup(_arg0,_arg1);
 {
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (PyObject *)wxConfig_GetNextGroup(_arg0,_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}{
   _resultobj = _result;
 }
     return _resultobj;
@@ -532,8 +580,12 @@ static PyObject *_wrap_wxConfig_GetNextEntry(PyObject *self, PyObject *args) {
         return NULL;
         }
     }
-    _result = (PyObject *)wxConfig_GetNextEntry(_arg0,_arg1);
 {
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (PyObject *)wxConfig_GetNextEntry(_arg0,_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}{
   _resultobj = _result;
 }
     return _resultobj;
@@ -558,8 +610,12 @@ static PyObject *_wrap_wxConfig_GetNumberOfEntries(PyObject *self, PyObject *arg
         }
     }
     _arg1 = (bool ) tempbool1;
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         _result = (int )wxConfig_GetNumberOfEntries(_arg0,_arg1);
-    _resultobj = Py_BuildValue("i",_result);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);
     return _resultobj;
 }
 
@@ -582,8 +638,12 @@ static PyObject *_wrap_wxConfig_GetNumberOfGroups(PyObject *self, PyObject *args
         }
     }
     _arg1 = (bool ) tempbool1;
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         _result = (int )wxConfig_GetNumberOfGroups(_arg0,_arg1);
-    _resultobj = Py_BuildValue("i",_result);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);
     return _resultobj;
 }
 
@@ -603,8 +663,12 @@ static PyObject *_wrap_wxConfig_GetPath(PyObject *self, PyObject *args) {
         return NULL;
         }
     }
-    _result = new wxString (wxConfig_GetPath(_arg0));
 {
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = new wxString (wxConfig_GetPath(_arg0));
+
+    wxPy_END_ALLOW_THREADS;
+}{
     _resultobj = PyString_FromString(WXSTRINGCAST *(_result));
 }
 {
@@ -629,8 +693,12 @@ static PyObject *_wrap_wxConfig_GetVendorName(PyObject *self, PyObject *args) {
         return NULL;
         }
     }
-    _result = new wxString (wxConfig_GetVendorName(_arg0));
 {
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = new wxString (wxConfig_GetVendorName(_arg0));
+
+    wxPy_END_ALLOW_THREADS;
+}{
     _resultobj = PyString_FromString(WXSTRINGCAST *(_result));
 }
 {
@@ -662,10 +730,14 @@ static PyObject *_wrap_wxConfig_HasEntry(PyObject *self, PyObject *args) {
         PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
         return NULL;
     }
-    _arg1 = new wxString(PyString_AsString(_obj1));
+    _arg1 = new wxString(PyString_AsString(_obj1), PyString_Size(_obj1));
 }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         _result = (bool )wxConfig_HasEntry(_arg0,*_arg1);
-    _resultobj = Py_BuildValue("i",_result);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);
 {
     if (_obj1)
         delete _arg1;
@@ -696,10 +768,14 @@ static PyObject *_wrap_wxConfig_HasGroup(PyObject *self, PyObject *args) {
         PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
         return NULL;
     }
-    _arg1 = new wxString(PyString_AsString(_obj1));
+    _arg1 = new wxString(PyString_AsString(_obj1), PyString_Size(_obj1));
 }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         _result = (bool )wxConfig_HasGroup(_arg0,*_arg1);
-    _resultobj = Py_BuildValue("i",_result);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);
 {
     if (_obj1)
         delete _arg1;
@@ -723,8 +799,12 @@ static PyObject *_wrap_wxConfig_IsExpandingEnvVars(PyObject *self, PyObject *arg
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         _result = (bool )wxConfig_IsExpandingEnvVars(_arg0);
-    _resultobj = Py_BuildValue("i",_result);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);
     return _resultobj;
 }
 
@@ -744,8 +824,12 @@ static PyObject *_wrap_wxConfig_IsRecordingDefaults(PyObject *self, PyObject *ar
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         _result = (bool )wxConfig_IsRecordingDefaults(_arg0);
-    _resultobj = Py_BuildValue("i",_result);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);
     return _resultobj;
 }
 
@@ -774,7 +858,7 @@ static PyObject *_wrap_wxConfig_Read(PyObject *self, PyObject *args) {
         PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
         return NULL;
     }
-    _arg1 = new wxString(PyString_AsString(_obj1));
+    _arg1 = new wxString(PyString_AsString(_obj1), PyString_Size(_obj1));
 }
     if (_obj2)
 {
@@ -782,10 +866,14 @@ static PyObject *_wrap_wxConfig_Read(PyObject *self, PyObject *args) {
         PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
         return NULL;
     }
-    _arg2 = new wxString(PyString_AsString(_obj2));
+    _arg2 = new wxString(PyString_AsString(_obj2), PyString_Size(_obj2));
 }
-    _result = new wxString (wxConfig_Read(_arg0,*_arg1,*_arg2));
 {
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = new wxString (wxConfig_Read(_arg0,*_arg1,*_arg2));
+
+    wxPy_END_ALLOW_THREADS;
+}{
     _resultobj = PyString_FromString(WXSTRINGCAST *(_result));
 }
 {
@@ -826,10 +914,14 @@ static PyObject *_wrap_wxConfig_ReadInt(PyObject *self, PyObject *args) {
         PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
         return NULL;
     }
-    _arg1 = new wxString(PyString_AsString(_obj1));
+    _arg1 = new wxString(PyString_AsString(_obj1), PyString_Size(_obj1));
 }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         _result = (long )wxConfig_ReadInt(_arg0,*_arg1,_arg2);
-    _resultobj = Py_BuildValue("l",_result);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("l",_result);
 {
     if (_obj1)
         delete _arg1;
@@ -861,44 +953,14 @@ static PyObject *_wrap_wxConfig_ReadFloat(PyObject *self, PyObject *args) {
         PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
         return NULL;
     }
-    _arg1 = new wxString(PyString_AsString(_obj1));
+    _arg1 = new wxString(PyString_AsString(_obj1), PyString_Size(_obj1));
 }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         _result = (double )wxConfig_ReadFloat(_arg0,*_arg1,_arg2);
-    _resultobj = Py_BuildValue("d",_result);
-{
-    if (_obj1)
-        delete _arg1;
-}
-    return _resultobj;
-}
 
-#define wxConfig_SetAppName(_swigobj,_swigarg0)  (_swigobj->SetAppName(_swigarg0))
+    wxPy_END_ALLOW_THREADS;
-static PyObject *_wrap_wxConfig_SetAppName(PyObject *self, PyObject *args) {
+}    _resultobj = Py_BuildValue("d",_result);
-    PyObject * _resultobj;
-    wxConfig * _arg0;
-    wxString * _arg1;
-    char * _argc0 = 0;
-    PyObject * _obj1 = 0;
-
-    self = self;
-    if(!PyArg_ParseTuple(args,"sO:wxConfig_SetAppName",&_argc0,&_obj1)) 
-        return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxConfig_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxConfig_SetAppName. Expected _wxConfig_p.");
-        return NULL;
-        }
-    }
-{
-    if (!PyString_Check(_obj1)) {
-        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
-        return NULL;
-    }
-    _arg1 = new wxString(PyString_AsString(_obj1));
-}
-    wxConfig_SetAppName(_arg0,*_arg1);
-    Py_INCREF(Py_None);
-    _resultobj = Py_None;
 {
     if (_obj1)
         delete _arg1;
@@ -924,8 +986,12 @@ static PyObject *_wrap_wxConfig_SetExpandEnvVars(PyObject *self, PyObject *args)
         }
     }
     _arg1 = (bool ) tempbool1;
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         wxConfig_SetExpandEnvVars(_arg0,_arg1);
-    Py_INCREF(Py_None);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
     _resultobj = Py_None;
     return _resultobj;
 }
@@ -952,10 +1018,14 @@ static PyObject *_wrap_wxConfig_SetPath(PyObject *self, PyObject *args) {
         PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
         return NULL;
     }
-    _arg1 = new wxString(PyString_AsString(_obj1));
+    _arg1 = new wxString(PyString_AsString(_obj1), PyString_Size(_obj1));
 }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         wxConfig_SetPath(_arg0,*_arg1);
-    Py_INCREF(Py_None);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
     _resultobj = Py_None;
 {
     if (_obj1)
@@ -982,43 +1052,13 @@ static PyObject *_wrap_wxConfig_SetRecordDefaults(PyObject *self, PyObject *args
         }
     }
     _arg1 = (bool ) tempbool1;
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         wxConfig_SetRecordDefaults(_arg0,_arg1);
-    Py_INCREF(Py_None);
-    _resultobj = Py_None;
-    return _resultobj;
-}
 
-#define wxConfig_SetVendorName(_swigobj,_swigarg0)  (_swigobj->SetVendorName(_swigarg0))
+    wxPy_END_ALLOW_THREADS;
-static PyObject *_wrap_wxConfig_SetVendorName(PyObject *self, PyObject *args) {
+}    Py_INCREF(Py_None);
-    PyObject * _resultobj;
-    wxConfig * _arg0;
-    wxString * _arg1;
-    char * _argc0 = 0;
-    PyObject * _obj1 = 0;
-
-    self = self;
-    if(!PyArg_ParseTuple(args,"sO:wxConfig_SetVendorName",&_argc0,&_obj1)) 
-        return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxConfig_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxConfig_SetVendorName. Expected _wxConfig_p.");
-        return NULL;
-        }
-    }
-{
-    if (!PyString_Check(_obj1)) {
-        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
-        return NULL;
-    }
-    _arg1 = new wxString(PyString_AsString(_obj1));
-}
-    wxConfig_SetVendorName(_arg0,*_arg1);
-    Py_INCREF(Py_None);
     _resultobj = Py_None;
-{
-    if (_obj1)
-        delete _arg1;
-}
     return _resultobj;
 }
 
@@ -1047,17 +1087,21 @@ static PyObject *_wrap_wxConfig_Write(PyObject *self, PyObject *args) {
         PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
         return NULL;
     }
-    _arg1 = new wxString(PyString_AsString(_obj1));
+    _arg1 = new wxString(PyString_AsString(_obj1), PyString_Size(_obj1));
 }
 {
     if (!PyString_Check(_obj2)) {
         PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
         return NULL;
     }
-    _arg2 = new wxString(PyString_AsString(_obj2));
+    _arg2 = new wxString(PyString_AsString(_obj2), PyString_Size(_obj2));
 }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         _result = (bool )wxConfig_Write(_arg0,*_arg1,*_arg2);
-    _resultobj = Py_BuildValue("i",_result);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);
 {
     if (_obj1)
         delete _arg1;
@@ -1093,10 +1137,14 @@ static PyObject *_wrap_wxConfig_WriteInt(PyObject *self, PyObject *args) {
         PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
         return NULL;
     }
-    _arg1 = new wxString(PyString_AsString(_obj1));
+    _arg1 = new wxString(PyString_AsString(_obj1), PyString_Size(_obj1));
 }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         _result = (bool )wxConfig_WriteInt(_arg0,*_arg1,_arg2);
-    _resultobj = Py_BuildValue("i",_result);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);
 {
     if (_obj1)
         delete _arg1;
@@ -1128,10 +1176,14 @@ static PyObject *_wrap_wxConfig_WriteFloat(PyObject *self, PyObject *args) {
         PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
         return NULL;
     }
-    _arg1 = new wxString(PyString_AsString(_obj1));
+    _arg1 = new wxString(PyString_AsString(_obj1), PyString_Size(_obj1));
 }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         _result = (bool )wxConfig_WriteFloat(_arg0,*_arg1,_arg2);
-    _resultobj = Py_BuildValue("i",_result);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);
 {
     if (_obj1)
         delete _arg1;
@@ -1143,11 +1195,9 @@ static PyMethodDef utilscMethods[] = {
 	 { "wxConfig_WriteFloat", _wrap_wxConfig_WriteFloat, 1 },
 	 { "wxConfig_WriteInt", _wrap_wxConfig_WriteInt, 1 },
 	 { "wxConfig_Write", _wrap_wxConfig_Write, 1 },
-	 { "wxConfig_SetVendorName", _wrap_wxConfig_SetVendorName, 1 },
 	 { "wxConfig_SetRecordDefaults", _wrap_wxConfig_SetRecordDefaults, 1 },
 	 { "wxConfig_SetPath", _wrap_wxConfig_SetPath, 1 },
 	 { "wxConfig_SetExpandEnvVars", _wrap_wxConfig_SetExpandEnvVars, 1 },
-	 { "wxConfig_SetAppName", _wrap_wxConfig_SetAppName, 1 },
 	 { "wxConfig_ReadFloat", _wrap_wxConfig_ReadFloat, 1 },
 	 { "wxConfig_ReadInt", _wrap_wxConfig_ReadInt, 1 },
 	 { "wxConfig_Read", _wrap_wxConfig_Read, 1 },

utils/wxPython/src/gtk/utils.py

@@ -73,9 +73,6 @@ class wxConfigPtr :
     def ReadFloat(self,arg0,*args):
         val = apply(utilsc.wxConfig_ReadFloat,(self.this,arg0,)+args)
         return val
-    def SetAppName(self,arg0):
-        val = utilsc.wxConfig_SetAppName(self.this,arg0)
-        return val
     def SetExpandEnvVars(self,*args):
         val = apply(utilsc.wxConfig_SetExpandEnvVars,(self.this,)+args)
         return val
@@ -85,9 +82,6 @@ class wxConfigPtr :
     def SetRecordDefaults(self,*args):
         val = apply(utilsc.wxConfig_SetRecordDefaults,(self.this,)+args)
         return val
-    def SetVendorName(self,arg0):
-        val = utilsc.wxConfig_SetVendorName(self.this,arg0)
-        return val
     def Write(self,arg0,arg1):
         val = utilsc.wxConfig_Write(self.this,arg0,arg1)
         return val

utils/wxPython/src/gtk/windows.py

@@ -16,6 +16,9 @@ class wxEvtHandlerPtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
+    def ProcessEvent(self,arg0):
+        val = windowsc.wxEvtHandler_ProcessEvent(self.this,arg0.this)
+        return val
     def Connect(self,arg0,arg1,arg2,arg3):
         val = windowsc.wxEvtHandler_Connect(self.this,arg0,arg1,arg2,arg3)
         return val
@@ -309,6 +312,16 @@ class wxWindowPtr(wxEvtHandlerPtr):
         val = wxSizePtr(val)
         val.thisown = 1
         return val
+    def DLG_PNT(self,arg0):
+        val = windowsc.wxWindow_DLG_PNT(self.this,arg0.this)
+        val = wxPointPtr(val)
+        val.thisown = 1
+        return val
+    def DLG_SZE(self,arg0):
+        val = windowsc.wxWindow_DLG_SZE(self.this,arg0.this)
+        val = wxSizePtr(val)
+        val.thisown = 1
+        return val
     def ConvertPixelPointToDialog(self,arg0):
         val = windowsc.wxWindow_ConvertPixelPointToDialog(self.this,arg0.this)
         val = wxPointPtr(val)
@@ -634,8 +647,9 @@ class wxMenuItemPtr :
     def __repr__(self):
         return "<C wxMenuItem instance>"
 class wxMenuItem(wxMenuItemPtr):
-    def __init__(self,this):
+    def __init__(self) :
-        self.this = this
+        self.this = windowsc.new_wxMenuItem()
+        self.thisown = 1
 
 
 

utils/wxPython/src/gtk/windows2.py

@@ -155,6 +155,7 @@ class wxGridPtr(wxPanelPtr):
     def GetCurrentRect(self):
         val = windows2c.wxGrid_GetCurrentRect(self.this)
         val = wxRectPtr(val)
+        val.thisown = 1
         return val
     def GetCursorColumn(self):
         val = windows2c.wxGrid_GetCursorColumn(self.this)
@@ -420,6 +421,9 @@ class wxNotebookPtr(wxControlPtr):
     def DeletePage(self,arg0):
         val = windows2c.wxNotebook_DeletePage(self.this,arg0)
         return val
+    def RemovePage(self,arg0):
+        val = windows2c.wxNotebook_RemovePage(self.this,arg0)
+        return val
     def DeleteAllPages(self):
         val = windows2c.wxNotebook_DeleteAllPages(self.this)
         return val
@@ -429,6 +433,9 @@ class wxNotebookPtr(wxControlPtr):
     def GetPage(self,arg0):
         val = windows2c.wxNotebook_GetPage(self.this,arg0)
         return val
+    def ResizeChildren(self):
+        val = windows2c.wxNotebook_ResizeChildren(self.this)
+        return val
     def __repr__(self):
         return "<C wxNotebook instance>"
 class wxNotebook(wxNotebookPtr):

utils/wxPython/src/gtk/windows3.cpp

@@ -148,8 +148,12 @@ static PyObject *_wrap_wxSashEvent_SetEdge(PyObject *self, PyObject *args) {
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         wxSashEvent_SetEdge(_arg0,_arg1);
-    Py_INCREF(Py_None);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
     _resultobj = Py_None;
     return _resultobj;
 }
@@ -170,8 +174,12 @@ static PyObject *_wrap_wxSashEvent_GetEdge(PyObject *self, PyObject *args) {
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         _result = (wxSashEdgePosition )wxSashEvent_GetEdge(_arg0);
-    _resultobj = Py_BuildValue("i",_result);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);
     return _resultobj;
 }
 
@@ -198,8 +206,12 @@ static PyObject *_wrap_wxSashEvent_SetDragRect(PyObject *self, PyObject *args) {
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         wxSashEvent_SetDragRect(_arg0,*_arg1);
-    Py_INCREF(Py_None);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
     _resultobj = Py_None;
     return _resultobj;
 }
@@ -221,8 +233,12 @@ static PyObject *_wrap_wxSashEvent_GetDragRect(PyObject *self, PyObject *args) {
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         _result = new wxRect (wxSashEvent_GetDragRect(_arg0));
-    SWIG_MakePtr(_ptemp, (void *) _result,"_wxRect_p");
+
+    wxPy_END_ALLOW_THREADS;
+}    SWIG_MakePtr(_ptemp, (void *) _result,"_wxRect_p");
     _resultobj = Py_BuildValue("s",_ptemp);
     return _resultobj;
 }
@@ -243,8 +259,12 @@ static PyObject *_wrap_wxSashEvent_SetDragStatus(PyObject *self, PyObject *args)
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         wxSashEvent_SetDragStatus(_arg0,_arg1);
-    Py_INCREF(Py_None);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
     _resultobj = Py_None;
     return _resultobj;
 }
@@ -265,8 +285,12 @@ static PyObject *_wrap_wxSashEvent_GetDragStatus(PyObject *self, PyObject *args)
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         _result = (wxSashDragStatus )wxSashEvent_GetDragStatus(_arg0);
-    _resultobj = Py_BuildValue("i",_result);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);
     return _resultobj;
 }
 
@@ -322,8 +346,12 @@ static PyObject *_wrap_new_wxSashWindow(PyObject *self, PyObject *args) {
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         _result = (wxSashWindow *)new_wxSashWindow(_arg0,_arg1,*_arg2,*_arg3,_arg4,_arg5);
-    SWIG_MakePtr(_ptemp, (char *) _result,"_wxSashWindow_p");
+
+    wxPy_END_ALLOW_THREADS;
+}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxSashWindow_p");
     _resultobj = Py_BuildValue("s",_ptemp);
     return _resultobj;
 }
@@ -345,8 +373,12 @@ static PyObject *_wrap_wxSashWindow_GetSashVisible(PyObject *self, PyObject *arg
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         _result = (bool )wxSashWindow_GetSashVisible(_arg0,_arg1);
-    _resultobj = Py_BuildValue("i",_result);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);
     return _resultobj;
 }
 
@@ -366,8 +398,12 @@ static PyObject *_wrap_wxSashWindow_GetDefaultBorderSize(PyObject *self, PyObjec
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         _result = (int )wxSashWindow_GetDefaultBorderSize(_arg0);
-    _resultobj = Py_BuildValue("i",_result);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);
     return _resultobj;
 }
 
@@ -388,8 +424,12 @@ static PyObject *_wrap_wxSashWindow_GetEdgeMargin(PyObject *self, PyObject *args
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         _result = (int )wxSashWindow_GetEdgeMargin(_arg0,_arg1);
-    _resultobj = Py_BuildValue("i",_result);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);
     return _resultobj;
 }
 
@@ -409,8 +449,12 @@ static PyObject *_wrap_wxSashWindow_GetExtraBorderSize(PyObject *self, PyObject
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         _result = (int )wxSashWindow_GetExtraBorderSize(_arg0);
-    _resultobj = Py_BuildValue("i",_result);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);
     return _resultobj;
 }
 
@@ -430,8 +474,12 @@ static PyObject *_wrap_wxSashWindow_GetMaximumSizeX(PyObject *self, PyObject *ar
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         _result = (int )wxSashWindow_GetMaximumSizeX(_arg0);
-    _resultobj = Py_BuildValue("i",_result);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);
     return _resultobj;
 }
 
@@ -451,8 +499,12 @@ static PyObject *_wrap_wxSashWindow_GetMaximumSizeY(PyObject *self, PyObject *ar
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         _result = (int )wxSashWindow_GetMaximumSizeY(_arg0);
-    _resultobj = Py_BuildValue("i",_result);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);
     return _resultobj;
 }
 
@@ -472,8 +524,12 @@ static PyObject *_wrap_wxSashWindow_GetMinimumSizeX(PyObject *self, PyObject *ar
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         _result = (int )wxSashWindow_GetMinimumSizeX(_arg0);
-    _resultobj = Py_BuildValue("i",_result);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);
     return _resultobj;
 }
 
@@ -493,8 +549,12 @@ static PyObject *_wrap_wxSashWindow_GetMinimumSizeY(PyObject *self, PyObject *ar
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         _result = (int )wxSashWindow_GetMinimumSizeY(_arg0);
-    _resultobj = Py_BuildValue("i",_result);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);
     return _resultobj;
 }
 
@@ -515,8 +575,12 @@ static PyObject *_wrap_wxSashWindow_HasBorder(PyObject *self, PyObject *args) {
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         _result = (bool )wxSashWindow_HasBorder(_arg0,_arg1);
-    _resultobj = Py_BuildValue("i",_result);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);
     return _resultobj;
 }
 
@@ -536,8 +600,12 @@ static PyObject *_wrap_wxSashWindow_SetDefaultBorderSize(PyObject *self, PyObjec
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         wxSashWindow_SetDefaultBorderSize(_arg0,_arg1);
-    Py_INCREF(Py_None);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
     _resultobj = Py_None;
     return _resultobj;
 }
@@ -558,8 +626,12 @@ static PyObject *_wrap_wxSashWindow_SetExtraBorderSize(PyObject *self, PyObject
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         wxSashWindow_SetExtraBorderSize(_arg0,_arg1);
-    Py_INCREF(Py_None);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
     _resultobj = Py_None;
     return _resultobj;
 }
@@ -580,8 +652,12 @@ static PyObject *_wrap_wxSashWindow_SetMaximumSizeX(PyObject *self, PyObject *ar
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         wxSashWindow_SetMaximumSizeX(_arg0,_arg1);
-    Py_INCREF(Py_None);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
     _resultobj = Py_None;
     return _resultobj;
 }
@@ -602,8 +678,12 @@ static PyObject *_wrap_wxSashWindow_SetMaximumSizeY(PyObject *self, PyObject *ar
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         wxSashWindow_SetMaximumSizeY(_arg0,_arg1);
-    Py_INCREF(Py_None);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
     _resultobj = Py_None;
     return _resultobj;
 }
@@ -624,8 +704,12 @@ static PyObject *_wrap_wxSashWindow_SetMinimumSizeX(PyObject *self, PyObject *ar
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         wxSashWindow_SetMinimumSizeX(_arg0,_arg1);
-    Py_INCREF(Py_None);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
     _resultobj = Py_None;
     return _resultobj;
 }
@@ -646,8 +730,12 @@ static PyObject *_wrap_wxSashWindow_SetMinimumSizeY(PyObject *self, PyObject *ar
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         wxSashWindow_SetMinimumSizeY(_arg0,_arg1);
-    Py_INCREF(Py_None);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
     _resultobj = Py_None;
     return _resultobj;
 }
@@ -671,8 +759,12 @@ static PyObject *_wrap_wxSashWindow_SetSashVisible(PyObject *self, PyObject *arg
         }
     }
     _arg2 = (bool ) tempbool2;
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         wxSashWindow_SetSashVisible(_arg0,_arg1,_arg2);
-    Py_INCREF(Py_None);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
     _resultobj = Py_None;
     return _resultobj;
 }
@@ -696,8 +788,12 @@ static PyObject *_wrap_wxSashWindow_SetSashBorder(PyObject *self, PyObject *args
         }
     }
     _arg2 = (bool ) tempbool2;
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         wxSashWindow_SetSashBorder(_arg0,_arg1,_arg2);
-    Py_INCREF(Py_None);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
     _resultobj = Py_None;
     return _resultobj;
 }
@@ -726,8 +822,12 @@ static PyObject *_wrap_wxQueryLayoutInfoEvent_SetRequestedLength(PyObject *self,
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         wxQueryLayoutInfoEvent_SetRequestedLength(_arg0,_arg1);
-    Py_INCREF(Py_None);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
     _resultobj = Py_None;
     return _resultobj;
 }
@@ -748,8 +848,12 @@ static PyObject *_wrap_wxQueryLayoutInfoEvent_GetRequestedLength(PyObject *self,
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         _result = (int )wxQueryLayoutInfoEvent_GetRequestedLength(_arg0);
-    _resultobj = Py_BuildValue("i",_result);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);
     return _resultobj;
 }
 
@@ -769,8 +873,12 @@ static PyObject *_wrap_wxQueryLayoutInfoEvent_SetFlags(PyObject *self, PyObject
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         wxQueryLayoutInfoEvent_SetFlags(_arg0,_arg1);
-    Py_INCREF(Py_None);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
     _resultobj = Py_None;
     return _resultobj;
 }
@@ -791,8 +899,12 @@ static PyObject *_wrap_wxQueryLayoutInfoEvent_GetFlags(PyObject *self, PyObject
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         _result = (int )wxQueryLayoutInfoEvent_GetFlags(_arg0);
-    _resultobj = Py_BuildValue("i",_result);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);
     return _resultobj;
 }
 
@@ -819,8 +931,12 @@ static PyObject *_wrap_wxQueryLayoutInfoEvent_SetSize(PyObject *self, PyObject *
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         wxQueryLayoutInfoEvent_SetSize(_arg0,*_arg1);
-    Py_INCREF(Py_None);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
     _resultobj = Py_None;
     return _resultobj;
 }
@@ -842,8 +958,12 @@ static PyObject *_wrap_wxQueryLayoutInfoEvent_GetSize(PyObject *self, PyObject *
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         _result = new wxSize (wxQueryLayoutInfoEvent_GetSize(_arg0));
-    SWIG_MakePtr(_ptemp, (void *) _result,"_wxSize_p");
+
+    wxPy_END_ALLOW_THREADS;
+}    SWIG_MakePtr(_ptemp, (void *) _result,"_wxSize_p");
     _resultobj = Py_BuildValue("s",_ptemp);
     return _resultobj;
 }
@@ -864,8 +984,12 @@ static PyObject *_wrap_wxQueryLayoutInfoEvent_SetOrientation(PyObject *self, PyO
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         wxQueryLayoutInfoEvent_SetOrientation(_arg0,_arg1);
-    Py_INCREF(Py_None);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
     _resultobj = Py_None;
     return _resultobj;
 }
@@ -886,8 +1010,12 @@ static PyObject *_wrap_wxQueryLayoutInfoEvent_GetOrientation(PyObject *self, PyO
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         _result = (wxLayoutOrientation )wxQueryLayoutInfoEvent_GetOrientation(_arg0);
-    _resultobj = Py_BuildValue("i",_result);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);
     return _resultobj;
 }
 
@@ -907,8 +1035,12 @@ static PyObject *_wrap_wxQueryLayoutInfoEvent_SetAlignment(PyObject *self, PyObj
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         wxQueryLayoutInfoEvent_SetAlignment(_arg0,_arg1);
-    Py_INCREF(Py_None);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
     _resultobj = Py_None;
     return _resultobj;
 }
@@ -929,8 +1061,12 @@ static PyObject *_wrap_wxQueryLayoutInfoEvent_GetAlignment(PyObject *self, PyObj
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         _result = (wxLayoutAlignment )wxQueryLayoutInfoEvent_GetAlignment(_arg0);
-    _resultobj = Py_BuildValue("i",_result);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);
     return _resultobj;
 }
 
@@ -958,8 +1094,12 @@ static PyObject *_wrap_wxCalculateLayoutEvent_SetFlags(PyObject *self, PyObject
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         wxCalculateLayoutEvent_SetFlags(_arg0,_arg1);
-    Py_INCREF(Py_None);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
     _resultobj = Py_None;
     return _resultobj;
 }
@@ -980,8 +1120,12 @@ static PyObject *_wrap_wxCalculateLayoutEvent_GetFlags(PyObject *self, PyObject
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         _result = (int )wxCalculateLayoutEvent_GetFlags(_arg0);
-    _resultobj = Py_BuildValue("i",_result);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);
     return _resultobj;
 }
 
@@ -1008,8 +1152,12 @@ static PyObject *_wrap_wxCalculateLayoutEvent_SetRect(PyObject *self, PyObject *
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         wxCalculateLayoutEvent_SetRect(_arg0,*_arg1);
-    Py_INCREF(Py_None);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
     _resultobj = Py_None;
     return _resultobj;
 }
@@ -1031,8 +1179,12 @@ static PyObject *_wrap_wxCalculateLayoutEvent_GetRect(PyObject *self, PyObject *
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         _result = new wxRect (wxCalculateLayoutEvent_GetRect(_arg0));
-    SWIG_MakePtr(_ptemp, (void *) _result,"_wxRect_p");
+
+    wxPy_END_ALLOW_THREADS;
+}    SWIG_MakePtr(_ptemp, (void *) _result,"_wxRect_p");
     _resultobj = Py_BuildValue("s",_ptemp);
     return _resultobj;
 }
@@ -1097,8 +1249,12 @@ static PyObject *_wrap_new_wxSashLayoutWindow(PyObject *self, PyObject *args) {
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         _result = (wxSashLayoutWindow *)new_wxSashLayoutWindow(_arg0,_arg1,*_arg2,*_arg3,_arg4,_arg5);
-    SWIG_MakePtr(_ptemp, (char *) _result,"_wxSashLayoutWindow_p");
+
+    wxPy_END_ALLOW_THREADS;
+}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxSashLayoutWindow_p");
     _resultobj = Py_BuildValue("s",_ptemp);
     return _resultobj;
 }
@@ -1119,8 +1275,12 @@ static PyObject *_wrap_wxSashLayoutWindow_GetAlignment(PyObject *self, PyObject
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         _result = (wxLayoutAlignment )wxSashLayoutWindow_GetAlignment(_arg0);
-    _resultobj = Py_BuildValue("i",_result);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);
     return _resultobj;
 }
 
@@ -1140,8 +1300,12 @@ static PyObject *_wrap_wxSashLayoutWindow_GetOrientation(PyObject *self, PyObjec
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         _result = (wxLayoutOrientation )wxSashLayoutWindow_GetOrientation(_arg0);
-    _resultobj = Py_BuildValue("i",_result);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);
     return _resultobj;
 }
 
@@ -1161,8 +1325,12 @@ static PyObject *_wrap_wxSashLayoutWindow_SetAlignment(PyObject *self, PyObject
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         wxSashLayoutWindow_SetAlignment(_arg0,_arg1);
-    Py_INCREF(Py_None);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
     _resultobj = Py_None;
     return _resultobj;
 }
@@ -1190,8 +1358,12 @@ static PyObject *_wrap_wxSashLayoutWindow_SetDefaultSize(PyObject *self, PyObjec
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         wxSashLayoutWindow_SetDefaultSize(_arg0,*_arg1);
-    Py_INCREF(Py_None);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
     _resultobj = Py_None;
     return _resultobj;
 }
@@ -1212,8 +1384,12 @@ static PyObject *_wrap_wxSashLayoutWindow_SetOrientation(PyObject *self, PyObjec
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         wxSashLayoutWindow_SetOrientation(_arg0,_arg1);
-    Py_INCREF(Py_None);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
     _resultobj = Py_None;
     return _resultobj;
 }
@@ -1227,8 +1403,12 @@ static PyObject *_wrap_new_wxLayoutAlgorithm(PyObject *self, PyObject *args) {
     self = self;
     if(!PyArg_ParseTuple(args,":new_wxLayoutAlgorithm")) 
         return NULL;
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         _result = (wxLayoutAlgorithm *)new_wxLayoutAlgorithm();
-    SWIG_MakePtr(_ptemp, (char *) _result,"_wxLayoutAlgorithm_p");
+
+    wxPy_END_ALLOW_THREADS;
+}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxLayoutAlgorithm_p");
     _resultobj = Py_BuildValue("s",_ptemp);
     return _resultobj;
 }
@@ -1248,8 +1428,12 @@ static PyObject *_wrap_delete_wxLayoutAlgorithm(PyObject *self, PyObject *args)
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         delete_wxLayoutAlgorithm(_arg0);
-    Py_INCREF(Py_None);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
     _resultobj = Py_None;
     return _resultobj;
 }
@@ -1286,8 +1470,12 @@ static PyObject *_wrap_wxLayoutAlgorithm_LayoutMDIFrame(PyObject *self, PyObject
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         _result = (bool )wxLayoutAlgorithm_LayoutMDIFrame(_arg0,_arg1,_arg2);
-    _resultobj = Py_BuildValue("i",_result);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);
     return _resultobj;
 }
 
@@ -1323,12 +1511,58 @@ static PyObject *_wrap_wxLayoutAlgorithm_LayoutFrame(PyObject *self, PyObject *a
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         _result = (bool )wxLayoutAlgorithm_LayoutFrame(_arg0,_arg1,_arg2);
-    _resultobj = Py_BuildValue("i",_result);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);
+    return _resultobj;
+}
+
+#define wxLayoutAlgorithm_LayoutWindow(_swigobj,_swigarg0,_swigarg1)  (_swigobj->LayoutWindow(_swigarg0,_swigarg1))
+static PyObject *_wrap_wxLayoutAlgorithm_LayoutWindow(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    bool  _result;
+    wxLayoutAlgorithm * _arg0;
+    wxWindow * _arg1;
+    wxWindow * _arg2 = NULL;
+    char * _argc0 = 0;
+    char * _argc1 = 0;
+    char * _argc2 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"ss|s:wxLayoutAlgorithm_LayoutWindow",&_argc0,&_argc1,&_argc2)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxLayoutAlgorithm_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxLayoutAlgorithm_LayoutWindow. Expected _wxLayoutAlgorithm_p.");
+        return NULL;
+        }
+    }
+    if (_argc1) {
+        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxWindow_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxLayoutAlgorithm_LayoutWindow. Expected _wxWindow_p.");
+        return NULL;
+        }
+    }
+    if (_argc2) {
+        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_wxWindow_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxLayoutAlgorithm_LayoutWindow. Expected _wxWindow_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (bool )wxLayoutAlgorithm_LayoutWindow(_arg0,_arg1,_arg2);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);
     return _resultobj;
 }
 
 static PyMethodDef windows3cMethods[] = {
+	 { "wxLayoutAlgorithm_LayoutWindow", _wrap_wxLayoutAlgorithm_LayoutWindow, 1 },
 	 { "wxLayoutAlgorithm_LayoutFrame", _wrap_wxLayoutAlgorithm_LayoutFrame, 1 },
 	 { "wxLayoutAlgorithm_LayoutMDIFrame", _wrap_wxLayoutAlgorithm_LayoutMDIFrame, 1 },
 	 { "delete_wxLayoutAlgorithm", _wrap_delete_wxLayoutAlgorithm, 1 },
@@ -1466,6 +1700,7 @@ SWIGEXPORT(void,initwindows3c)() {
 	 SWIG_RegisterMapping("_wxPanel","_class_wxPanel",0);
 	 SWIG_RegisterMapping("_wxInitDialogEvent","_class_wxInitDialogEvent",0);
 	 SWIG_RegisterMapping("_wxCheckBox","_class_wxCheckBox",0);
+	 SWIG_RegisterMapping("_wxPyEvent","_class_wxPyEvent",0);
 	 SWIG_RegisterMapping("_wxTextCtrl","_class_wxTextCtrl",0);
 	 SWIG_RegisterMapping("_class_wxToolTip","_wxToolTip",0);
 	 SWIG_RegisterMapping("_class_wxMask","_wxMask",0);
@@ -1512,6 +1747,7 @@ SWIGEXPORT(void,initwindows3c)() {
 	 SWIG_RegisterMapping("_wxSpinButton","_class_wxSpinButton",0);
 	 SWIG_RegisterMapping("_wxToolBarTool","_class_wxToolBarTool",0);
 	 SWIG_RegisterMapping("_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0);
+	 SWIG_RegisterMapping("_class_wxPyEvent","_wxPyEvent",0);
 	 SWIG_RegisterMapping("_class_wxIconizeEvent","_wxIconizeEvent",0);
 	 SWIG_RegisterMapping("_class_wxStaticBitmap","_wxStaticBitmap",0);
 	 SWIG_RegisterMapping("_wxMDIChildFrame","_class_wxMDIChildFrame",0);

utils/wxPython/src/gtk/windows3.py

@@ -255,6 +255,13 @@ class wxLayoutAlgorithmPtr :
         args = tuple(argl)
         val = apply(windows3c.wxLayoutAlgorithm_LayoutFrame,(self.this,arg0.this,)+args)
         return val
+    def LayoutWindow(self,arg0,*args):
+        argl = map(None,args)
+        try: argl[0] = argl[0].this
+        except: pass
+        args = tuple(argl)
+        val = apply(windows3c.wxLayoutAlgorithm_LayoutWindow,(self.this,arg0.this,)+args)
+        return val
     def __repr__(self):
         return "<C wxLayoutAlgorithm instance>"
 class wxLayoutAlgorithm(wxLayoutAlgorithmPtr):

utils/wxPython/src/gtk/wx.cpp

@@ -33,8 +33,9 @@
  * and things like that.
  *
  * $Log$
- * Revision 1.9  1999/03/01 23:21:37  RD
+ * Revision 1.10  1999/05/01 04:41:07  RD
- * Changes for allowing wxRA_SPECIFY_ROWS and wxRA_SPECIFY_COLS.
+ * wxPython 2.0b9, second phase (gtk)
+ * Added gobs of stuff, see wxPython/README.txt for details
  *
  ************************************************************************/
 
@@ -630,8 +631,10 @@ extern "C" SWIGEXPORT(void,initcmndlgsc)();
 extern "C" SWIGEXPORT(void,initstattoolc)();
 extern "C" SWIGEXPORT(void,initframesc)();
 extern "C" SWIGEXPORT(void,initwindows3c)();
+extern "C" SWIGEXPORT(void,initimagec)();
 #ifndef SEPARATE
 extern "C" SWIGEXPORT(void,initutilsc)();
+extern "C" SWIGEXPORT(void,initglcanvasc)();
 #endif
 static int _wrap_wxPyDefaultPosition_set(PyObject *val) {
     char * tval;
@@ -710,8 +713,12 @@ static PyObject *_wrap_new_wxPyApp(PyObject *self, PyObject *args) {
     self = self;
     if(!PyArg_ParseTuple(args,":new_wxPyApp")) 
         return NULL;
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         _result = (wxPyApp *)new_wxPyApp();
-    SWIG_MakePtr(_ptemp, (char *) _result,"_wxPyApp_p");
+
+    wxPy_END_ALLOW_THREADS;
+}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxPyApp_p");
     _resultobj = Py_BuildValue("s",_ptemp);
     return _resultobj;
 }
@@ -732,8 +739,12 @@ static PyObject *_wrap_wxPyApp_GetAppName(PyObject *self, PyObject *args) {
         return NULL;
         }
     }
-    _result = new wxString (wxPyApp_GetAppName(_arg0));
 {
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = new wxString (wxPyApp_GetAppName(_arg0));
+
+    wxPy_END_ALLOW_THREADS;
+}{
     _resultobj = PyString_FromString(WXSTRINGCAST *(_result));
 }
 {
@@ -758,8 +769,12 @@ static PyObject *_wrap_wxPyApp_GetClassName(PyObject *self, PyObject *args) {
         return NULL;
         }
     }
-    _result = new wxString (wxPyApp_GetClassName(_arg0));
 {
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = new wxString (wxPyApp_GetClassName(_arg0));
+
+    wxPy_END_ALLOW_THREADS;
+}{
     _resultobj = PyString_FromString(WXSTRINGCAST *(_result));
 }
 {
@@ -784,8 +799,12 @@ static PyObject *_wrap_wxPyApp_GetExitOnFrameDelete(PyObject *self, PyObject *ar
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         _result = (bool )wxPyApp_GetExitOnFrameDelete(_arg0);
-    _resultobj = Py_BuildValue("i",_result);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);
     return _resultobj;
 }
 
@@ -805,8 +824,12 @@ static PyObject *_wrap_wxPyApp_GetPrintMode(PyObject *self, PyObject *args) {
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         _result = (int )wxPyApp_GetPrintMode(_arg0);
-    _resultobj = Py_BuildValue("i",_result);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);
     return _resultobj;
 }
 
@@ -827,8 +850,12 @@ static PyObject *_wrap_wxPyApp_GetTopWindow(PyObject *self, PyObject *args) {
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         _result = (wxWindow *)wxPyApp_GetTopWindow(_arg0);
-    SWIG_MakePtr(_ptemp, (char *) _result,"_wxWindow_p");
+
+    wxPy_END_ALLOW_THREADS;
+}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxWindow_p");
     _resultobj = Py_BuildValue("s",_ptemp);
     return _resultobj;
 }
@@ -849,8 +876,12 @@ static PyObject *_wrap_wxPyApp_GetVendorName(PyObject *self, PyObject *args) {
         return NULL;
         }
     }
-    _result = new wxString (wxPyApp_GetVendorName(_arg0));
 {
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = new wxString (wxPyApp_GetVendorName(_arg0));
+
+    wxPy_END_ALLOW_THREADS;
+}{
     _resultobj = PyString_FromString(WXSTRINGCAST *(_result));
 }
 {
@@ -874,8 +905,12 @@ static PyObject *_wrap_wxPyApp_Dispatch(PyObject *self, PyObject *args) {
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         wxPyApp_Dispatch(_arg0);
-    Py_INCREF(Py_None);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
     _resultobj = Py_None;
     return _resultobj;
 }
@@ -895,8 +930,12 @@ static PyObject *_wrap_wxPyApp_ExitMainLoop(PyObject *self, PyObject *args) {
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         wxPyApp_ExitMainLoop(_arg0);
-    Py_INCREF(Py_None);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
     _resultobj = Py_None;
     return _resultobj;
 }
@@ -917,8 +956,12 @@ static PyObject *_wrap_wxPyApp_Initialized(PyObject *self, PyObject *args) {
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         _result = (bool )wxPyApp_Initialized(_arg0);
-    _resultobj = Py_BuildValue("i",_result);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);
     return _resultobj;
 }
 
@@ -938,8 +981,12 @@ static PyObject *_wrap_wxPyApp_MainLoop(PyObject *self, PyObject *args) {
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         _result = (int )wxPyApp_MainLoop(_arg0);
-    _resultobj = Py_BuildValue("i",_result);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);
     return _resultobj;
 }
 
@@ -959,8 +1006,12 @@ static PyObject *_wrap_wxPyApp_Pending(PyObject *self, PyObject *args) {
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         _result = (bool )wxPyApp_Pending(_arg0);
-    _resultobj = Py_BuildValue("i",_result);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);
     return _resultobj;
 }
 
@@ -986,10 +1037,14 @@ static PyObject *_wrap_wxPyApp_SetAppName(PyObject *self, PyObject *args) {
         PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
         return NULL;
     }
-    _arg1 = new wxString(PyString_AsString(_obj1));
+    _arg1 = new wxString(PyString_AsString(_obj1), PyString_Size(_obj1));
 }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         wxPyApp_SetAppName(_arg0,*_arg1);
-    Py_INCREF(Py_None);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
     _resultobj = Py_None;
 {
     if (_obj1)
@@ -1020,10 +1075,14 @@ static PyObject *_wrap_wxPyApp_SetClassName(PyObject *self, PyObject *args) {
         PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
         return NULL;
     }
-    _arg1 = new wxString(PyString_AsString(_obj1));
+    _arg1 = new wxString(PyString_AsString(_obj1), PyString_Size(_obj1));
 }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         wxPyApp_SetClassName(_arg0,*_arg1);
-    Py_INCREF(Py_None);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
     _resultobj = Py_None;
 {
     if (_obj1)
@@ -1050,8 +1109,12 @@ static PyObject *_wrap_wxPyApp_SetExitOnFrameDelete(PyObject *self, PyObject *ar
         }
     }
     _arg1 = (bool ) tempbool1;
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         wxPyApp_SetExitOnFrameDelete(_arg0,_arg1);
-    Py_INCREF(Py_None);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
     _resultobj = Py_None;
     return _resultobj;
 }
@@ -1072,8 +1135,12 @@ static PyObject *_wrap_wxPyApp_SetPrintMode(PyObject *self, PyObject *args) {
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         wxPyApp_SetPrintMode(_arg0,_arg1);
-    Py_INCREF(Py_None);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
     _resultobj = Py_None;
     return _resultobj;
 }
@@ -1101,8 +1168,12 @@ static PyObject *_wrap_wxPyApp_SetTopWindow(PyObject *self, PyObject *args) {
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         wxPyApp_SetTopWindow(_arg0,_arg1);
-    Py_INCREF(Py_None);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
     _resultobj = Py_None;
     return _resultobj;
 }
@@ -1129,10 +1200,14 @@ static PyObject *_wrap_wxPyApp_SetVendorName(PyObject *self, PyObject *args) {
         PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
         return NULL;
     }
-    _arg1 = new wxString(PyString_AsString(_obj1));
+    _arg1 = new wxString(PyString_AsString(_obj1), PyString_Size(_obj1));
 }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         wxPyApp_SetVendorName(_arg0,*_arg1);
-    Py_INCREF(Py_None);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
     _resultobj = Py_None;
 {
     if (_obj1)
@@ -1156,8 +1231,12 @@ static PyObject *_wrap_wxPyApp_AfterMainLoop(PyObject *self, PyObject *args) {
         return NULL;
         }
     }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
         wxPyApp_AfterMainLoop(_arg0);
-    Py_INCREF(Py_None);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
     _resultobj = Py_None;
     return _resultobj;
 }
@@ -1285,6 +1364,7 @@ SWIGEXPORT(void,initwxc)() {
 	 PyDict_SetItemString(d,"wxSL_SELRANGE", PyInt_FromLong((long) wxSL_SELRANGE));
 	 PyDict_SetItemString(d,"wxSB_HORIZONTAL", PyInt_FromLong((long) wxSB_HORIZONTAL));
 	 PyDict_SetItemString(d,"wxSB_VERTICAL", PyInt_FromLong((long) wxSB_VERTICAL));
+	 PyDict_SetItemString(d,"wxST_SIZEGRIP", PyInt_FromLong((long) wxST_SIZEGRIP));
 	 PyDict_SetItemString(d,"wxBU_AUTODRAW", PyInt_FromLong((long) wxBU_AUTODRAW));
 	 PyDict_SetItemString(d,"wxBU_NOAUTODRAW", PyInt_FromLong((long) wxBU_NOAUTODRAW));
 	 PyDict_SetItemString(d,"wxTR_HAS_BUTTONS", PyInt_FromLong((long) wxTR_HAS_BUTTONS));
@@ -1314,10 +1394,6 @@ SWIGEXPORT(void,initwxc)() {
 	 PyDict_SetItemString(d,"wxSP_NOBORDER", PyInt_FromLong((long) wxSP_NOBORDER));
 	 PyDict_SetItemString(d,"wxSP_3D", PyInt_FromLong((long) wxSP_3D));
 	 PyDict_SetItemString(d,"wxSP_BORDER", PyInt_FromLong((long) wxSP_BORDER));
-	 PyDict_SetItemString(d,"wxTAB_MULTILINE", PyInt_FromLong((long) wxTAB_MULTILINE));
-	 PyDict_SetItemString(d,"wxTAB_RIGHTJUSTIFY", PyInt_FromLong((long) wxTAB_RIGHTJUSTIFY));
-	 PyDict_SetItemString(d,"wxTAB_FIXEDWIDTH", PyInt_FromLong((long) wxTAB_FIXEDWIDTH));
-	 PyDict_SetItemString(d,"wxTAB_OWNERDRAW", PyInt_FromLong((long) wxTAB_OWNERDRAW));
 	 PyDict_SetItemString(d,"wxFLOOD_SURFACE", PyInt_FromLong((long) wxFLOOD_SURFACE));
 	 PyDict_SetItemString(d,"wxFLOOD_BORDER", PyInt_FromLong((long) wxFLOOD_BORDER));
 	 PyDict_SetItemString(d,"wxODDEVEN_RULE", PyInt_FromLong((long) wxODDEVEN_RULE));
@@ -1384,6 +1460,7 @@ SWIGEXPORT(void,initwxc)() {
 	 PyDict_SetItemString(d,"wxID_APPLY", PyInt_FromLong((long) wxID_APPLY));
 	 PyDict_SetItemString(d,"wxID_YES", PyInt_FromLong((long) wxID_YES));
 	 PyDict_SetItemString(d,"wxID_NO", PyInt_FromLong((long) wxID_NO));
+	 PyDict_SetItemString(d,"wxID_STATIC", PyInt_FromLong((long) wxID_STATIC));
 	 PyDict_SetItemString(d,"wxBITMAP_TYPE_BMP", PyInt_FromLong((long) wxBITMAP_TYPE_BMP));
 	 PyDict_SetItemString(d,"wxBITMAP_TYPE_BMP_RESOURCE", PyInt_FromLong((long) wxBITMAP_TYPE_BMP_RESOURCE));
 	 PyDict_SetItemString(d,"wxBITMAP_TYPE_ICO", PyInt_FromLong((long) wxBITMAP_TYPE_ICO));
@@ -1402,6 +1479,7 @@ SWIGEXPORT(void,initwxc)() {
 	 PyDict_SetItemString(d,"wxBITMAP_TYPE_PNG_RESOURCE", PyInt_FromLong((long) wxBITMAP_TYPE_PNG_RESOURCE));
 	 PyDict_SetItemString(d,"wxBITMAP_TYPE_ANY", PyInt_FromLong((long) wxBITMAP_TYPE_ANY));
 	 PyDict_SetItemString(d,"wxBITMAP_TYPE_RESOURCE", PyInt_FromLong((long) wxBITMAP_TYPE_RESOURCE));
+	 PyDict_SetItemString(d,"wxBITMAP_TYPE_JPEG", PyInt_FromLong((long) wxBITMAP_TYPE_JPEG));
 	 PyDict_SetItemString(d,"wxOPEN", PyInt_FromLong((long) wxOPEN));
 	 PyDict_SetItemString(d,"wxSAVE", PyInt_FromLong((long) wxSAVE));
 	 PyDict_SetItemString(d,"wxHIDE_READONLY", PyInt_FromLong((long) wxHIDE_READONLY));
@@ -1409,10 +1487,6 @@ SWIGEXPORT(void,initwxc)() {
 	 PyDict_SetItemString(d,"wxACCEL_ALT", PyInt_FromLong((long) wxACCEL_ALT));
 	 PyDict_SetItemString(d,"wxACCEL_CTRL", PyInt_FromLong((long) wxACCEL_CTRL));
 	 PyDict_SetItemString(d,"wxACCEL_SHIFT", PyInt_FromLong((long) wxACCEL_SHIFT));
-	 PyDict_SetItemString(d,"ERR_PARAM", PyInt_FromLong((long) ERR_PARAM));
-	 PyDict_SetItemString(d,"ERR_NODATA", PyInt_FromLong((long) ERR_NODATA));
-	 PyDict_SetItemString(d,"ERR_CANCEL", PyInt_FromLong((long) ERR_CANCEL));
-	 PyDict_SetItemString(d,"ERR_SUCCESS", PyInt_FromLong((long) ERR_SUCCESS));
 	 PyDict_SetItemString(d,"wxDEFAULT", PyInt_FromLong((long) wxDEFAULT));
 	 PyDict_SetItemString(d,"wxDECORATIVE", PyInt_FromLong((long) wxDECORATIVE));
 	 PyDict_SetItemString(d,"wxROMAN", PyInt_FromLong((long) wxROMAN));
@@ -1566,6 +1640,73 @@ SWIGEXPORT(void,initwxc)() {
 	 PyDict_SetItemString(d,"wxCURSOR_WAIT", PyInt_FromLong((long) wxCURSOR_WAIT));
 	 PyDict_SetItemString(d,"wxCURSOR_WATCH", PyInt_FromLong((long) wxCURSOR_WATCH));
 	 PyDict_SetItemString(d,"wxCURSOR_BLANK", PyInt_FromLong((long) wxCURSOR_BLANK));
+	 PyDict_SetItemString(d,"wxPAPER_NONE", PyInt_FromLong((long) wxPAPER_NONE));
+	 PyDict_SetItemString(d,"wxPAPER_LETTER", PyInt_FromLong((long) wxPAPER_LETTER));
+	 PyDict_SetItemString(d,"wxPAPER_LEGAL", PyInt_FromLong((long) wxPAPER_LEGAL));
+	 PyDict_SetItemString(d,"wxPAPER_A4", PyInt_FromLong((long) wxPAPER_A4));
+	 PyDict_SetItemString(d,"wxPAPER_CSHEET", PyInt_FromLong((long) wxPAPER_CSHEET));
+	 PyDict_SetItemString(d,"wxPAPER_DSHEET", PyInt_FromLong((long) wxPAPER_DSHEET));
+	 PyDict_SetItemString(d,"wxPAPER_ESHEET", PyInt_FromLong((long) wxPAPER_ESHEET));
+	 PyDict_SetItemString(d,"wxPAPER_LETTERSMALL", PyInt_FromLong((long) wxPAPER_LETTERSMALL));
+	 PyDict_SetItemString(d,"wxPAPER_TABLOID", PyInt_FromLong((long) wxPAPER_TABLOID));
+	 PyDict_SetItemString(d,"wxPAPER_LEDGER", PyInt_FromLong((long) wxPAPER_LEDGER));
+	 PyDict_SetItemString(d,"wxPAPER_STATEMENT", PyInt_FromLong((long) wxPAPER_STATEMENT));
+	 PyDict_SetItemString(d,"wxPAPER_EXECUTIVE", PyInt_FromLong((long) wxPAPER_EXECUTIVE));
+	 PyDict_SetItemString(d,"wxPAPER_A3", PyInt_FromLong((long) wxPAPER_A3));
+	 PyDict_SetItemString(d,"wxPAPER_A4SMALL", PyInt_FromLong((long) wxPAPER_A4SMALL));
+	 PyDict_SetItemString(d,"wxPAPER_A5", PyInt_FromLong((long) wxPAPER_A5));
+	 PyDict_SetItemString(d,"wxPAPER_B4", PyInt_FromLong((long) wxPAPER_B4));
+	 PyDict_SetItemString(d,"wxPAPER_B5", PyInt_FromLong((long) wxPAPER_B5));
+	 PyDict_SetItemString(d,"wxPAPER_FOLIO", PyInt_FromLong((long) wxPAPER_FOLIO));
+	 PyDict_SetItemString(d,"wxPAPER_QUARTO", PyInt_FromLong((long) wxPAPER_QUARTO));
+	 PyDict_SetItemString(d,"wxPAPER_10X14", PyInt_FromLong((long) wxPAPER_10X14));
+	 PyDict_SetItemString(d,"wxPAPER_11X17", PyInt_FromLong((long) wxPAPER_11X17));
+	 PyDict_SetItemString(d,"wxPAPER_NOTE", PyInt_FromLong((long) wxPAPER_NOTE));
+	 PyDict_SetItemString(d,"wxPAPER_ENV_9", PyInt_FromLong((long) wxPAPER_ENV_9));
+	 PyDict_SetItemString(d,"wxPAPER_ENV_10", PyInt_FromLong((long) wxPAPER_ENV_10));
+	 PyDict_SetItemString(d,"wxPAPER_ENV_11", PyInt_FromLong((long) wxPAPER_ENV_11));
+	 PyDict_SetItemString(d,"wxPAPER_ENV_12", PyInt_FromLong((long) wxPAPER_ENV_12));
+	 PyDict_SetItemString(d,"wxPAPER_ENV_14", PyInt_FromLong((long) wxPAPER_ENV_14));
+	 PyDict_SetItemString(d,"wxPAPER_ENV_DL", PyInt_FromLong((long) wxPAPER_ENV_DL));
+	 PyDict_SetItemString(d,"wxPAPER_ENV_C5", PyInt_FromLong((long) wxPAPER_ENV_C5));
+	 PyDict_SetItemString(d,"wxPAPER_ENV_C3", PyInt_FromLong((long) wxPAPER_ENV_C3));
+	 PyDict_SetItemString(d,"wxPAPER_ENV_C4", PyInt_FromLong((long) wxPAPER_ENV_C4));
+	 PyDict_SetItemString(d,"wxPAPER_ENV_C6", PyInt_FromLong((long) wxPAPER_ENV_C6));
+	 PyDict_SetItemString(d,"wxPAPER_ENV_C65", PyInt_FromLong((long) wxPAPER_ENV_C65));
+	 PyDict_SetItemString(d,"wxPAPER_ENV_B4", PyInt_FromLong((long) wxPAPER_ENV_B4));
+	 PyDict_SetItemString(d,"wxPAPER_ENV_B5", PyInt_FromLong((long) wxPAPER_ENV_B5));
+	 PyDict_SetItemString(d,"wxPAPER_ENV_B6", PyInt_FromLong((long) wxPAPER_ENV_B6));
+	 PyDict_SetItemString(d,"wxPAPER_ENV_ITALY", PyInt_FromLong((long) wxPAPER_ENV_ITALY));
+	 PyDict_SetItemString(d,"wxPAPER_ENV_MONARCH", PyInt_FromLong((long) wxPAPER_ENV_MONARCH));
+	 PyDict_SetItemString(d,"wxPAPER_ENV_PERSONAL", PyInt_FromLong((long) wxPAPER_ENV_PERSONAL));
+	 PyDict_SetItemString(d,"wxPAPER_FANFOLD_US", PyInt_FromLong((long) wxPAPER_FANFOLD_US));
+	 PyDict_SetItemString(d,"wxPAPER_FANFOLD_STD_GERMAN", PyInt_FromLong((long) wxPAPER_FANFOLD_STD_GERMAN));
+	 PyDict_SetItemString(d,"wxPAPER_FANFOLD_LGL_GERMAN", PyInt_FromLong((long) wxPAPER_FANFOLD_LGL_GERMAN));
+	 PyDict_SetItemString(d,"wxPAPER_ISO_B4", PyInt_FromLong((long) wxPAPER_ISO_B4));
+	 PyDict_SetItemString(d,"wxPAPER_JAPANESE_POSTCARD", PyInt_FromLong((long) wxPAPER_JAPANESE_POSTCARD));
+	 PyDict_SetItemString(d,"wxPAPER_9X11", PyInt_FromLong((long) wxPAPER_9X11));
+	 PyDict_SetItemString(d,"wxPAPER_10X11", PyInt_FromLong((long) wxPAPER_10X11));
+	 PyDict_SetItemString(d,"wxPAPER_15X11", PyInt_FromLong((long) wxPAPER_15X11));
+	 PyDict_SetItemString(d,"wxPAPER_ENV_INVITE", PyInt_FromLong((long) wxPAPER_ENV_INVITE));
+	 PyDict_SetItemString(d,"wxPAPER_LETTER_EXTRA", PyInt_FromLong((long) wxPAPER_LETTER_EXTRA));
+	 PyDict_SetItemString(d,"wxPAPER_LEGAL_EXTRA", PyInt_FromLong((long) wxPAPER_LEGAL_EXTRA));
+	 PyDict_SetItemString(d,"wxPAPER_TABLOID_EXTRA", PyInt_FromLong((long) wxPAPER_TABLOID_EXTRA));
+	 PyDict_SetItemString(d,"wxPAPER_A4_EXTRA", PyInt_FromLong((long) wxPAPER_A4_EXTRA));
+	 PyDict_SetItemString(d,"wxPAPER_LETTER_TRANSVERSE", PyInt_FromLong((long) wxPAPER_LETTER_TRANSVERSE));
+	 PyDict_SetItemString(d,"wxPAPER_A4_TRANSVERSE", PyInt_FromLong((long) wxPAPER_A4_TRANSVERSE));
+	 PyDict_SetItemString(d,"wxPAPER_LETTER_EXTRA_TRANSVERSE", PyInt_FromLong((long) wxPAPER_LETTER_EXTRA_TRANSVERSE));
+	 PyDict_SetItemString(d,"wxPAPER_A_PLUS", PyInt_FromLong((long) wxPAPER_A_PLUS));
+	 PyDict_SetItemString(d,"wxPAPER_B_PLUS", PyInt_FromLong((long) wxPAPER_B_PLUS));
+	 PyDict_SetItemString(d,"wxPAPER_LETTER_PLUS", PyInt_FromLong((long) wxPAPER_LETTER_PLUS));
+	 PyDict_SetItemString(d,"wxPAPER_A4_PLUS", PyInt_FromLong((long) wxPAPER_A4_PLUS));
+	 PyDict_SetItemString(d,"wxPAPER_A5_TRANSVERSE", PyInt_FromLong((long) wxPAPER_A5_TRANSVERSE));
+	 PyDict_SetItemString(d,"wxPAPER_B5_TRANSVERSE", PyInt_FromLong((long) wxPAPER_B5_TRANSVERSE));
+	 PyDict_SetItemString(d,"wxPAPER_A3_EXTRA", PyInt_FromLong((long) wxPAPER_A3_EXTRA));
+	 PyDict_SetItemString(d,"wxPAPER_A5_EXTRA", PyInt_FromLong((long) wxPAPER_A5_EXTRA));
+	 PyDict_SetItemString(d,"wxPAPER_B5_EXTRA", PyInt_FromLong((long) wxPAPER_B5_EXTRA));
+	 PyDict_SetItemString(d,"wxPAPER_A2", PyInt_FromLong((long) wxPAPER_A2));
+	 PyDict_SetItemString(d,"wxPAPER_A3_TRANSVERSE", PyInt_FromLong((long) wxPAPER_A3_TRANSVERSE));
+	 PyDict_SetItemString(d,"wxPAPER_A3_EXTRA_TRANSVERSE", PyInt_FromLong((long) wxPAPER_A3_EXTRA_TRANSVERSE));
 	 PyDict_SetItemString(d,"FALSE", PyInt_FromLong((long) 0));
 	 PyDict_SetItemString(d,"false", PyInt_FromLong((long) 0));
 	 PyDict_SetItemString(d,"TRUE", PyInt_FromLong((long) 1));
@@ -1703,7 +1844,7 @@ SWIGEXPORT(void,initwxc)() {
 	 PyDict_SetItemString(d,"wxEVT_COMMAND_TAB_SEL_CHANGING", PyInt_FromLong((long) wxEVT_COMMAND_TAB_SEL_CHANGING));
 	 PyDict_SetItemString(d,"wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED", PyInt_FromLong((long) wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED));
 	 PyDict_SetItemString(d,"wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING", PyInt_FromLong((long) wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING));
-	 PyDict_SetItemString(d,"__version__", PyString_FromString("2.0b5"));
+	 PyDict_SetItemString(d,"__version__", PyString_FromString("2.0b9"));
 	 PyDict_SetItemString(d,"cvar", SWIG_globals);
 	 SWIG_addvarlink(SWIG_globals,"wxPyDefaultPosition",_wrap_wxPyDefaultPosition_get, _wrap_wxPyDefaultPosition_set);
 	 SWIG_addvarlink(SWIG_globals,"wxPyDefaultSize",_wrap_wxPyDefaultSize_get, _wrap_wxPyDefaultSize_set);
@@ -1728,8 +1869,12 @@ SWIGEXPORT(void,initwxc)() {
     initstattoolc();
     initframesc();
     initwindows3c();
+    initimagec();
 #ifndef SEPARATE
     initutilsc();
+#ifdef WITH_GLCANVAS
+    initglcanvasc();
+#endif
 #endif
 /*
  * These are the pointer type-equivalency mappings. 
@@ -1740,22 +1885,29 @@ SWIGEXPORT(void,initwxc)() {
 	 SWIG_RegisterMapping("_class_wxActivateEvent","_wxActivateEvent",0);
 	 SWIG_RegisterMapping("_signed_long","_long",0);
 	 SWIG_RegisterMapping("_wxMenuEvent","_class_wxMenuEvent",0);
+	 SWIG_RegisterMapping("_class_wxJPEGHandler","_wxJPEGHandler",0);
+	 SWIG_RegisterMapping("_wxBMPHandler","_class_wxBMPHandler",0);
+	 SWIG_RegisterMapping("_wxImage","_class_wxImage",0);
 	 SWIG_RegisterMapping("_wxFontData","_class_wxFontData",0);
 	 SWIG_RegisterMapping("_class_wxRegionIterator","_wxRegionIterator",0);
 	 SWIG_RegisterMapping("_class_wxMenuBar","_wxMenuBar",0);
+	 SWIG_RegisterMapping("_class_wxPyTreeItemData","_wxPyTreeItemData",0);
 	 SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxPyApp",SwigwxPyAppTowxEvtHandler);
 	 SWIG_RegisterMapping("_class_wxEvtHandler","_wxPyApp",SwigwxPyAppTowxEvtHandler);
 	 SWIG_RegisterMapping("_class_wxEvtHandler","_wxEvtHandler",0);
 	 SWIG_RegisterMapping("_wxPaintEvent","_class_wxPaintEvent",0);
+	 SWIG_RegisterMapping("_wxGIFHandler","_class_wxGIFHandler",0);
 	 SWIG_RegisterMapping("_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0);
 	 SWIG_RegisterMapping("_wxCursor","_class_wxCursor",0);
+	 SWIG_RegisterMapping("_wxImageHandler","_class_wxImageHandler",0);
 	 SWIG_RegisterMapping("_class_wxTreeCtrl","_wxTreeCtrl",0);
 	 SWIG_RegisterMapping("_wxToolTip","_class_wxToolTip",0);
 	 SWIG_RegisterMapping("_wxMask","_class_wxMask",0);
 	 SWIG_RegisterMapping("_wxGrid","_class_wxGrid",0);
-	 SWIG_RegisterMapping("_wxPageSetupData","_class_wxPageSetupData",0);
+	 SWIG_RegisterMapping("_wxPNGHandler","_class_wxPNGHandler",0);
 	 SWIG_RegisterMapping("_wxPyMenu","_class_wxPyMenu",0);
 	 SWIG_RegisterMapping("_class_wxColourData","_wxColourData",0);
+	 SWIG_RegisterMapping("_class_wxPageSetupDialogData","_wxPageSetupDialogData",0);
 	 SWIG_RegisterMapping("_wxPen","_class_wxPen",0);
 	 SWIG_RegisterMapping("_wxUpdateUIEvent","_class_wxUpdateUIEvent",0);
 	 SWIG_RegisterMapping("_byte","_unsigned_char",0);
@@ -1770,12 +1922,14 @@ SWIGEXPORT(void,initwxc)() {
 	 SWIG_RegisterMapping("_wxDropFilesEvent","_class_wxDropFilesEvent",0);
 	 SWIG_RegisterMapping("_wxBitmapButton","_class_wxBitmapButton",0);
 	 SWIG_RegisterMapping("_wxSashWindow","_class_wxSashWindow",0);
+	 SWIG_RegisterMapping("_class_wxPrintDialogData","_wxPrintDialogData",0);
 	 SWIG_RegisterMapping("_class_wxAcceleratorTable","_wxAcceleratorTable",0);
 	 SWIG_RegisterMapping("_class_wxGauge","_wxGauge",0);
 	 SWIG_RegisterMapping("_class_wxSashEvent","_wxSashEvent",0);
 	 SWIG_RegisterMapping("_wxDC","_class_wxDC",0);
 	 SWIG_RegisterMapping("_wxListEvent","_class_wxListEvent",0);
 	 SWIG_RegisterMapping("_class_wxSingleChoiceDialog","_wxSingleChoiceDialog",0);
+	 SWIG_RegisterMapping("_class_wxBMPHandler","_wxBMPHandler",0);
 	 SWIG_RegisterMapping("_wxSpinEvent","_class_wxSpinEvent",0);
 	 SWIG_RegisterMapping("_wxSashLayoutWindow","_class_wxSashLayoutWindow",0);
 	 SWIG_RegisterMapping("_class_wxRealPoint","_wxRealPoint",0);
@@ -1783,16 +1937,18 @@ SWIGEXPORT(void,initwxc)() {
 	 SWIG_RegisterMapping("_class_wxPaintEvent","_wxPaintEvent",0);
 	 SWIG_RegisterMapping("_wxSysColourChangedEvent","_class_wxSysColourChangedEvent",0);
 	 SWIG_RegisterMapping("_class_wxStatusBar","_wxStatusBar",0);
+	 SWIG_RegisterMapping("_class_wxGIFHandler","_wxGIFHandler",0);
 	 SWIG_RegisterMapping("_class_wxPostScriptDC","_wxPostScriptDC",0);
 	 SWIG_RegisterMapping("_wxPanel","_class_wxPanel",0);
 	 SWIG_RegisterMapping("_wxInitDialogEvent","_class_wxInitDialogEvent",0);
 	 SWIG_RegisterMapping("_wxCheckBox","_class_wxCheckBox",0);
+	 SWIG_RegisterMapping("_wxPyEvent","_class_wxPyEvent",0);
 	 SWIG_RegisterMapping("_wxTextCtrl","_class_wxTextCtrl",0);
 	 SWIG_RegisterMapping("_class_wxToolTip","_wxToolTip",0);
 	 SWIG_RegisterMapping("_class_wxMask","_wxMask",0);
 	 SWIG_RegisterMapping("_class_wxKeyEvent","_wxKeyEvent",0);
 	 SWIG_RegisterMapping("_class_wxGrid","_wxGrid",0);
-	 SWIG_RegisterMapping("_class_wxPageSetupData","_wxPageSetupData",0);
+	 SWIG_RegisterMapping("_class_wxPNGHandler","_wxPNGHandler",0);
 	 SWIG_RegisterMapping("_wxColour","_class_wxColour",0);
 	 SWIG_RegisterMapping("_class_wxDialog","_wxDialog",0);
 	 SWIG_RegisterMapping("_wxPageSetupDialog","_class_wxPageSetupDialog",0);
@@ -1814,11 +1970,11 @@ SWIGEXPORT(void,initwxc)() {
 	 SWIG_RegisterMapping("_wxRect","_class_wxRect",0);
 	 SWIG_RegisterMapping("_wxCommandEvent","_class_wxCommandEvent",0);
 	 SWIG_RegisterMapping("_wxSizeEvent","_class_wxSizeEvent",0);
+	 SWIG_RegisterMapping("_class_wxImage","_wxImage",0);
 	 SWIG_RegisterMapping("_wxPoint","_class_wxPoint",0);
 	 SWIG_RegisterMapping("_class_wxSashLayoutWindow","_wxSashLayoutWindow",0);
 	 SWIG_RegisterMapping("_class_wxButton","_wxButton",0);
 	 SWIG_RegisterMapping("_wxRadioBox","_class_wxRadioBox",0);
-	 SWIG_RegisterMapping("_wxTreeItemData","_class_wxTreeItemData",0);
 	 SWIG_RegisterMapping("_class_wxFontData","_wxFontData",0);
 	 SWIG_RegisterMapping("_wxBitmap","_class_wxBitmap",0);
 	 SWIG_RegisterMapping("_wxPrintDialog","_class_wxPrintDialog",0);
@@ -1828,11 +1984,10 @@ SWIGEXPORT(void,initwxc)() {
 	 SWIG_RegisterMapping("_wxSpinButton","_class_wxSpinButton",0);
 	 SWIG_RegisterMapping("_wxToolBarTool","_class_wxToolBarTool",0);
 	 SWIG_RegisterMapping("_wxColourDialog","_class_wxColourDialog",0);
-	 SWIG_RegisterMapping("_wxPrintData","_class_wxPrintData",0);
 	 SWIG_RegisterMapping("_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0);
 	 SWIG_RegisterMapping("_wxMessageDialog","_class_wxMessageDialog",0);
+	 SWIG_RegisterMapping("_class_wxPyEvent","_wxPyEvent",0);
 	 SWIG_RegisterMapping("_wxTextEntryDialog","_class_wxTextEntryDialog",0);
-	 SWIG_RegisterMapping("_wxConfig","_class_wxConfig",0);
 	 SWIG_RegisterMapping("_class_wxIconizeEvent","_wxIconizeEvent",0);
 	 SWIG_RegisterMapping("_class_wxStaticBitmap","_wxStaticBitmap",0);
 	 SWIG_RegisterMapping("_wxMDIChildFrame","_class_wxMDIChildFrame",0);
@@ -1888,6 +2043,7 @@ SWIGEXPORT(void,initwxc)() {
 	 SWIG_RegisterMapping("_class_wxWindow","_wxWindow",0);
 	 SWIG_RegisterMapping("_wxSplitterWindow","_class_wxSplitterWindow",0);
 	 SWIG_RegisterMapping("_class_wxStaticText","_wxStaticText",0);
+	 SWIG_RegisterMapping("_wxPrintDialogData","_class_wxPrintDialogData",0);
 	 SWIG_RegisterMapping("_class_wxFont","_wxFont",0);
 	 SWIG_RegisterMapping("_class_wxCloseEvent","_wxCloseEvent",0);
 	 SWIG_RegisterMapping("_wxSashEvent","_class_wxSashEvent",0);
@@ -1913,6 +2069,7 @@ SWIGEXPORT(void,initwxc)() {
 	 SWIG_RegisterMapping("_class_wxAcceleratorEntry","_wxAcceleratorEntry",0);
 	 SWIG_RegisterMapping("_class_wxCursor","_wxCursor",0);
 	 SWIG_RegisterMapping("_wxPostScriptDC","_class_wxPostScriptDC",0);
+	 SWIG_RegisterMapping("_class_wxImageHandler","_wxImageHandler",0);
 	 SWIG_RegisterMapping("_wxScrolledWindow","_class_wxScrolledWindow",0);
 	 SWIG_RegisterMapping("_wxTreeItemId","_class_wxTreeItemId",0);
 	 SWIG_RegisterMapping("_unsigned_char","_byte",0);
@@ -1943,6 +2100,7 @@ SWIGEXPORT(void,initwxc)() {
 	 SWIG_RegisterMapping("_class_wxBitmapButton","_wxBitmapButton",0);
 	 SWIG_RegisterMapping("_wxFrame","_class_wxFrame",0);
 	 SWIG_RegisterMapping("_class_wxNotebook","_wxNotebook",0);
+	 SWIG_RegisterMapping("_wxJPEGHandler","_class_wxJPEGHandler",0);
 	 SWIG_RegisterMapping("_wxWindowID","_EBool",0);
 	 SWIG_RegisterMapping("_wxWindowID","_uint",0);
 	 SWIG_RegisterMapping("_wxWindowID","_int",0);
@@ -1961,6 +2119,7 @@ SWIGEXPORT(void,initwxc)() {
 	 SWIG_RegisterMapping("_wxSize","_class_wxSize",0);
 	 SWIG_RegisterMapping("_wxRegionIterator","_class_wxRegionIterator",0);
 	 SWIG_RegisterMapping("_class_wxMDIParentFrame","_wxMDIParentFrame",0);
+	 SWIG_RegisterMapping("_wxPyTreeItemData","_class_wxPyTreeItemData",0);
 	 SWIG_RegisterMapping("_class_wxPaintDC","_wxPaintDC",0);
 	 SWIG_RegisterMapping("_class_wxSysColourChangedEvent","_wxSysColourChangedEvent",0);
 	 SWIG_RegisterMapping("_class_wxInitDialogEvent","_wxInitDialogEvent",0);
@@ -1993,7 +2152,6 @@ SWIGEXPORT(void,initwxc)() {
 	 SWIG_RegisterMapping("_class_wxClientDC","_wxClientDC",0);
 	 SWIG_RegisterMapping("_class_wxSizeEvent","_wxSizeEvent",0);
 	 SWIG_RegisterMapping("_class_wxListCtrl","_wxListCtrl",0);
-	 SWIG_RegisterMapping("_class_wxTreeItemData","_wxTreeItemData",0);
 	 SWIG_RegisterMapping("_class_wxGridCell","_wxGridCell",0);
 	 SWIG_RegisterMapping("_class_wxSize","_wxSize",0);
 	 SWIG_RegisterMapping("_class_wxBitmap","_wxBitmap",0);
@@ -2007,15 +2165,14 @@ SWIGEXPORT(void,initwxc)() {
 	 SWIG_RegisterMapping("_wxMenuItem","_class_wxMenuItem",0);
 	 SWIG_RegisterMapping("_class_wxScrollBar","_wxScrollBar",0);
 	 SWIG_RegisterMapping("_class_wxColourDialog","_wxColourDialog",0);
-	 SWIG_RegisterMapping("_class_wxPrintData","_wxPrintData",0);
 	 SWIG_RegisterMapping("_wxDash","_unsigned_long",0);
 	 SWIG_RegisterMapping("_wxDash","_long",0);
 	 SWIG_RegisterMapping("_class_wxScrolledWindow","_wxScrolledWindow",0);
 	 SWIG_RegisterMapping("_class_wxTextEntryDialog","_wxTextEntryDialog",0);
-	 SWIG_RegisterMapping("_class_wxConfig","_wxConfig",0);
 	 SWIG_RegisterMapping("_wxKeyEvent","_class_wxKeyEvent",0);
 	 SWIG_RegisterMapping("_wxMoveEvent","_class_wxMoveEvent",0);
 	 SWIG_RegisterMapping("_wxColourData","_class_wxColourData",0);
+	 SWIG_RegisterMapping("_wxPageSetupDialogData","_class_wxPageSetupDialogData",0);
 	 SWIG_RegisterMapping("_class_wxPalette","_wxPalette",0);
 	 SWIG_RegisterMapping("_class_wxQueryLayoutInfoEvent","_wxQueryLayoutInfoEvent",0);
 	 SWIG_RegisterMapping("_class_wxEraseEvent","_wxEraseEvent",0);

utils/wxPython/src/gtk/wx.py

@@ -25,7 +25,7 @@ from cmndlgs import *
 
 from windows3 import *
 
-from utils import *
+from image import *
 class wxPyAppPtr(wxEvtHandlerPtr):
     def __init__(self,this):
         self.this = this
@@ -197,6 +197,7 @@ wxSL_BOTH = wxc.wxSL_BOTH
 wxSL_SELRANGE = wxc.wxSL_SELRANGE
 wxSB_HORIZONTAL = wxc.wxSB_HORIZONTAL
 wxSB_VERTICAL = wxc.wxSB_VERTICAL
+wxST_SIZEGRIP = wxc.wxST_SIZEGRIP
 wxBU_AUTODRAW = wxc.wxBU_AUTODRAW
 wxBU_NOAUTODRAW = wxc.wxBU_NOAUTODRAW
 wxTR_HAS_BUTTONS = wxc.wxTR_HAS_BUTTONS
@@ -226,10 +227,6 @@ wxSP_WRAP = wxc.wxSP_WRAP
 wxSP_NOBORDER = wxc.wxSP_NOBORDER
 wxSP_3D = wxc.wxSP_3D
 wxSP_BORDER = wxc.wxSP_BORDER
-wxTAB_MULTILINE = wxc.wxTAB_MULTILINE
-wxTAB_RIGHTJUSTIFY = wxc.wxTAB_RIGHTJUSTIFY
-wxTAB_FIXEDWIDTH = wxc.wxTAB_FIXEDWIDTH
-wxTAB_OWNERDRAW = wxc.wxTAB_OWNERDRAW
 wxFLOOD_SURFACE = wxc.wxFLOOD_SURFACE
 wxFLOOD_BORDER = wxc.wxFLOOD_BORDER
 wxODDEVEN_RULE = wxc.wxODDEVEN_RULE
@@ -296,6 +293,7 @@ wxID_CANCEL = wxc.wxID_CANCEL
 wxID_APPLY = wxc.wxID_APPLY
 wxID_YES = wxc.wxID_YES
 wxID_NO = wxc.wxID_NO
+wxID_STATIC = wxc.wxID_STATIC
 wxBITMAP_TYPE_BMP = wxc.wxBITMAP_TYPE_BMP
 wxBITMAP_TYPE_BMP_RESOURCE = wxc.wxBITMAP_TYPE_BMP_RESOURCE
 wxBITMAP_TYPE_ICO = wxc.wxBITMAP_TYPE_ICO
@@ -314,6 +312,7 @@ wxBITMAP_TYPE_PNG = wxc.wxBITMAP_TYPE_PNG
 wxBITMAP_TYPE_PNG_RESOURCE = wxc.wxBITMAP_TYPE_PNG_RESOURCE
 wxBITMAP_TYPE_ANY = wxc.wxBITMAP_TYPE_ANY
 wxBITMAP_TYPE_RESOURCE = wxc.wxBITMAP_TYPE_RESOURCE
+wxBITMAP_TYPE_JPEG = wxc.wxBITMAP_TYPE_JPEG
 wxOPEN = wxc.wxOPEN
 wxSAVE = wxc.wxSAVE
 wxHIDE_READONLY = wxc.wxHIDE_READONLY
@@ -321,10 +320,6 @@ wxOVERWRITE_PROMPT = wxc.wxOVERWRITE_PROMPT
 wxACCEL_ALT = wxc.wxACCEL_ALT
 wxACCEL_CTRL = wxc.wxACCEL_CTRL
 wxACCEL_SHIFT = wxc.wxACCEL_SHIFT
-ERR_PARAM = wxc.ERR_PARAM
-ERR_NODATA = wxc.ERR_NODATA
-ERR_CANCEL = wxc.ERR_CANCEL
-ERR_SUCCESS = wxc.ERR_SUCCESS
 wxDEFAULT = wxc.wxDEFAULT
 wxDECORATIVE = wxc.wxDECORATIVE
 wxROMAN = wxc.wxROMAN
@@ -478,6 +473,73 @@ wxCURSOR_SPRAYCAN = wxc.wxCURSOR_SPRAYCAN
 wxCURSOR_WAIT = wxc.wxCURSOR_WAIT
 wxCURSOR_WATCH = wxc.wxCURSOR_WATCH
 wxCURSOR_BLANK = wxc.wxCURSOR_BLANK
+wxPAPER_NONE = wxc.wxPAPER_NONE
+wxPAPER_LETTER = wxc.wxPAPER_LETTER
+wxPAPER_LEGAL = wxc.wxPAPER_LEGAL
+wxPAPER_A4 = wxc.wxPAPER_A4
+wxPAPER_CSHEET = wxc.wxPAPER_CSHEET
+wxPAPER_DSHEET = wxc.wxPAPER_DSHEET
+wxPAPER_ESHEET = wxc.wxPAPER_ESHEET
+wxPAPER_LETTERSMALL = wxc.wxPAPER_LETTERSMALL
+wxPAPER_TABLOID = wxc.wxPAPER_TABLOID
+wxPAPER_LEDGER = wxc.wxPAPER_LEDGER
+wxPAPER_STATEMENT = wxc.wxPAPER_STATEMENT
+wxPAPER_EXECUTIVE = wxc.wxPAPER_EXECUTIVE
+wxPAPER_A3 = wxc.wxPAPER_A3
+wxPAPER_A4SMALL = wxc.wxPAPER_A4SMALL
+wxPAPER_A5 = wxc.wxPAPER_A5
+wxPAPER_B4 = wxc.wxPAPER_B4
+wxPAPER_B5 = wxc.wxPAPER_B5
+wxPAPER_FOLIO = wxc.wxPAPER_FOLIO
+wxPAPER_QUARTO = wxc.wxPAPER_QUARTO
+wxPAPER_10X14 = wxc.wxPAPER_10X14
+wxPAPER_11X17 = wxc.wxPAPER_11X17
+wxPAPER_NOTE = wxc.wxPAPER_NOTE
+wxPAPER_ENV_9 = wxc.wxPAPER_ENV_9
+wxPAPER_ENV_10 = wxc.wxPAPER_ENV_10
+wxPAPER_ENV_11 = wxc.wxPAPER_ENV_11
+wxPAPER_ENV_12 = wxc.wxPAPER_ENV_12
+wxPAPER_ENV_14 = wxc.wxPAPER_ENV_14
+wxPAPER_ENV_DL = wxc.wxPAPER_ENV_DL
+wxPAPER_ENV_C5 = wxc.wxPAPER_ENV_C5
+wxPAPER_ENV_C3 = wxc.wxPAPER_ENV_C3
+wxPAPER_ENV_C4 = wxc.wxPAPER_ENV_C4
+wxPAPER_ENV_C6 = wxc.wxPAPER_ENV_C6
+wxPAPER_ENV_C65 = wxc.wxPAPER_ENV_C65
+wxPAPER_ENV_B4 = wxc.wxPAPER_ENV_B4
+wxPAPER_ENV_B5 = wxc.wxPAPER_ENV_B5
+wxPAPER_ENV_B6 = wxc.wxPAPER_ENV_B6
+wxPAPER_ENV_ITALY = wxc.wxPAPER_ENV_ITALY
+wxPAPER_ENV_MONARCH = wxc.wxPAPER_ENV_MONARCH
+wxPAPER_ENV_PERSONAL = wxc.wxPAPER_ENV_PERSONAL
+wxPAPER_FANFOLD_US = wxc.wxPAPER_FANFOLD_US
+wxPAPER_FANFOLD_STD_GERMAN = wxc.wxPAPER_FANFOLD_STD_GERMAN
+wxPAPER_FANFOLD_LGL_GERMAN = wxc.wxPAPER_FANFOLD_LGL_GERMAN
+wxPAPER_ISO_B4 = wxc.wxPAPER_ISO_B4
+wxPAPER_JAPANESE_POSTCARD = wxc.wxPAPER_JAPANESE_POSTCARD
+wxPAPER_9X11 = wxc.wxPAPER_9X11
+wxPAPER_10X11 = wxc.wxPAPER_10X11
+wxPAPER_15X11 = wxc.wxPAPER_15X11
+wxPAPER_ENV_INVITE = wxc.wxPAPER_ENV_INVITE
+wxPAPER_LETTER_EXTRA = wxc.wxPAPER_LETTER_EXTRA
+wxPAPER_LEGAL_EXTRA = wxc.wxPAPER_LEGAL_EXTRA
+wxPAPER_TABLOID_EXTRA = wxc.wxPAPER_TABLOID_EXTRA
+wxPAPER_A4_EXTRA = wxc.wxPAPER_A4_EXTRA
+wxPAPER_LETTER_TRANSVERSE = wxc.wxPAPER_LETTER_TRANSVERSE
+wxPAPER_A4_TRANSVERSE = wxc.wxPAPER_A4_TRANSVERSE
+wxPAPER_LETTER_EXTRA_TRANSVERSE = wxc.wxPAPER_LETTER_EXTRA_TRANSVERSE
+wxPAPER_A_PLUS = wxc.wxPAPER_A_PLUS
+wxPAPER_B_PLUS = wxc.wxPAPER_B_PLUS
+wxPAPER_LETTER_PLUS = wxc.wxPAPER_LETTER_PLUS
+wxPAPER_A4_PLUS = wxc.wxPAPER_A4_PLUS
+wxPAPER_A5_TRANSVERSE = wxc.wxPAPER_A5_TRANSVERSE
+wxPAPER_B5_TRANSVERSE = wxc.wxPAPER_B5_TRANSVERSE
+wxPAPER_A3_EXTRA = wxc.wxPAPER_A3_EXTRA
+wxPAPER_A5_EXTRA = wxc.wxPAPER_A5_EXTRA
+wxPAPER_B5_EXTRA = wxc.wxPAPER_B5_EXTRA
+wxPAPER_A2 = wxc.wxPAPER_A2
+wxPAPER_A3_TRANSVERSE = wxc.wxPAPER_A3_TRANSVERSE
+wxPAPER_A3_EXTRA_TRANSVERSE = wxc.wxPAPER_A3_EXTRA_TRANSVERSE
 FALSE = wxc.FALSE
 false = wxc.false
 TRUE = wxc.TRUE
@@ -660,8 +722,9 @@ def _StdWindowCallbacks(win):
     _checkForCallback(win, "OnEraseBackground",    wxEVT_ERASE_BACKGROUND)
     _checkForCallback(win, "OnSysColourChanged",   wxEVT_SYS_COLOUR_CHANGED)
     _checkForCallback(win, "OnInitDialog",         wxEVT_INIT_DIALOG)
-    _checkForCallback(win, "OnIdle",               wxEVT_IDLE)
     _checkForCallback(win, "OnPaint",              wxEVT_PAINT)
+    _checkForCallback(win, "OnIdle",               wxEVT_IDLE)
+
 
 def _StdFrameCallbacks(win):
     _StdWindowCallbacks(win)
@@ -679,7 +742,7 @@ def _StdDialogCallbacks(win):
     _checkForCallback(win, "OnCharHook",    wxEVT_CHAR_HOOK)
 
 
-def _StdOnScrollCallback(win):
+def _StdOnScrollCallbacks(win):
     try:    cb = getattr(win, "OnScroll")
     except: pass
     else:   EVT_SCROLL(win, cb)
@@ -758,6 +821,9 @@ def EVT_ICONIZE(win, func):
 def EVT_NAVIGATION_KEY(win, func):
     win.Connect(-1, -1, wxEVT_NAVIGATION_KEY, func)
 
+def EVT_IDLE(win, func):
+    win.Connect(-1, -1, wxEVT_IDLE, func)
+
 
 # Mouse Events
 def EVT_LEFT_DOWN(win, func):
@@ -1184,27 +1250,32 @@ class wxAcceleratorTable(wxAcceleratorTablePtr):
 
 #----------------------------------------------------------------------
 
-## class wxPyStdOutWindow(wxFrame):
+##  class wxPyStdOutWindow:
 ##       def __init__(self, title = "wxPython: stdout/stderr"):
-##         wxFrame.__init__(self, NULL, title)
+##          self.frame = None
 ##          self.title = title
-##         self.text = wxTextWindow(self)
-##         self.text.SetFont(wxFont(10, wxMODERN, wxNORMAL, wxBOLD))
-##         self.SetSize(-1,-1,400,200)
-##         self.Show(false)
-##         self.isShown = false
 
-##     def write(self, str):  # with this method,
+##      def write(self, str):
-##         if not self.isShown:
+##          if not self.frame:
-##             self.Show(true)
+##              self.frame = wxFrame(NULL, -1, self.title)
-##             self.isShown = true
+##              self.text  = wxTextCtrl(self.frame, -1, "", wxPoint(0,0), wxDefaultSize,
-##         self.text.WriteText(str)
+##                                      wxTE_MULTILINE|wxTE_READONLY)
+##              self.frame.SetSize(wxSize(450, 300))
+##              self.frame.Show(true)
+##              EVT_CLOSE(self.frame, self.OnCloseWindow)
+##          self.text.AppendText(str)
 
-##     def OnCloseWindow(self, event): # doesn't allow the window to close, just hides it
+##      def OnCloseWindow(self, event):
-##         self.Show(false)
+##          wxBell()
-##         self.isShown = false
+##          self.frame.Destroy()
+##          self.frame = None
+##          self.text  = None
 
 
+##      def close(self):
+##          if self.frame:
+##              self.frame.Close(true)
+
 _defRedirect = (wxPlatform == '__WXMSW__')
 
 #----------------------------------------------------------------------
@@ -1235,22 +1306,40 @@ class wxApp(wxPyApp):
         if filename:
             sys.stdout = sys.stderr = open(filename, 'a')
         else:
-            raise self.error, 'wxPyStdOutWindow not yet implemented.'
+            #raise self.error, 'wxPyStdOutWindow not yet implemented.'
-            #self.stdioWin = sys.stdout = sys.stderr = wxPyStdOutWindow()
+            self.stdioWin = sys.stdout = sys.stderr = wxPyStdOutWindow()
 
     def RestoreStdio(self):
         sys.stdout, sys.stderr = self.saveStdio
         if self.stdioWin != None:
-            self.stdioWin.Show(false)
+            self.stdioWin.close()
-            self.stdioWin.Destroy()
-            self.stdioWin = None
 
 
 #----------------------------------------------------------------------------
 #
 # $Log$
-# Revision 1.8  1999/03/01 23:21:39  RD
+# Revision 1.9  1999/05/01 04:41:08  RD
-# Changes for allowing wxRA_SPECIFY_ROWS and wxRA_SPECIFY_COLS.
+# wxPython 2.0b9, second phase (gtk)
+# Added gobs of stuff, see wxPython/README.txt for details
+#
+# Revision 1.12  1999/04/30 03:29:18  RD
+#
+# wxPython 2.0b9, first phase (win32)
+# Added gobs of stuff, see wxPython/README.txt for details
+#
+# Revision 1.11.4.2  1999/03/28 06:35:01  RD
+#
+# wxPython 2.0b8
+#     Python thread support
+#     various minor additions
+#     various minor fixes
+#
+# Revision 1.11.4.1  1999/03/27 23:29:13  RD
+#
+# wxPython 2.0b8
+#     Python thread support
+#     various minor additions
+#     various minor fixes
 #
 # Revision 1.11  1999/02/20 09:02:55  RD
 # Added wxWindow_FromHWND(hWnd) for wxMSW to construct a wxWindow from a

utils/wxPython/src/mdi.i

@@ -76,7 +76,7 @@ public:
     %pragma(python) addtomethod = "__init__:wx._StdFrameCallbacks(self)"
 
     void Activate();
-    void Maximize();
+    void Maximize(bool maximize);
     void Restore();
 
 };
@@ -95,7 +95,12 @@ public:
 /////////////////////////////////////////////////////////////////////////////
 //
 // $Log$
+// Revision 1.7  1999/05/01 04:40:57  RD
+// wxPython 2.0b9, second phase (gtk)
+// Added gobs of stuff, see wxPython/README.txt for details
+//
 // Revision 1.6  1999/02/25 07:08:34  RD
+//
 // wxPython version 2.0b5
 //
 // Revision 1.5  1998/12/15 20:41:21  RD

utils/wxPython/src/utils.i

@@ -26,7 +26,7 @@
 
 %{
 #ifdef SEPARATE
-    static wxString wxPyEmptyStr("");
+    wxString wxPyEmptyStr("");
 #endif
 %}
 
@@ -131,7 +131,12 @@ public:
 /////////////////////////////////////////////////////////////////////////////
 //
 // $Log$
+// Revision 1.5  1999/05/01 04:40:57  RD
+// wxPython 2.0b9, second phase (gtk)
+// Added gobs of stuff, see wxPython/README.txt for details
+//
 // Revision 1.4  1999/04/30 03:29:19  RD
+//
 // wxPython 2.0b9, first phase (win32)
 // Added gobs of stuff, see wxPython/README.txt for details
 //

utils/wxPython/tests/.cvsignore

@@ -0,0 +1,2 @@
+hh_test.py
+th_test.py