reSWIGged

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

diff --git a/wxPython/contrib/gizmos/gtk/gizmos.py b/wxPython/contrib/gizmos/gtk/gizmos.py
index dcaf9314fc5700618498461bd0f360dcd1c29d93..50f396c9cb173809841fba21555e8399d6a0d106 100644 (file)
--- a/wxPython/contrib/gizmos/gtk/gizmos.py
+++ b/wxPython/contrib/gizmos/gtk/gizmos.py
@@ -52,7 +52,7 @@ class DynamicSashWindow(core.Window):
         """
         __init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
             long style=wxCLIP_CHILDREN|wxDS_MANAGE_SCROLLBARS|wxDS_DRAG_CORNER, 
         """
         __init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
             long style=wxCLIP_CHILDREN|wxDS_MANAGE_SCROLLBARS|wxDS_DRAG_CORNER, 

-            wxString name=wxPyDynamicSashNameStr) -> DynamicSashWindow
+            String name=wxPyDynamicSashNameStr) -> DynamicSashWindow

         """
         newobj = _gizmos.new_DynamicSashWindow(*args, **kwargs)
         self.this = newobj.this
         """
         newobj = _gizmos.new_DynamicSashWindow(*args, **kwargs)
         self.this = newobj.this


@@ -64,7 +64,7 @@ class DynamicSashWindow(core.Window):
         """
         Create(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
             long style=wxCLIP_CHILDREN|wxDS_MANAGE_SCROLLBARS|wxDS_DRAG_CORNER, 
         """
         Create(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
             long style=wxCLIP_CHILDREN|wxDS_MANAGE_SCROLLBARS|wxDS_DRAG_CORNER, 

-            wxString name=wxPyDynamicSashNameStr) -> bool
+            String name=wxPyDynamicSashNameStr) -> bool

         """
         return _gizmos.DynamicSashWindow_Create(*args, **kwargs)
 
         """
         return _gizmos.DynamicSashWindow_Create(*args, **kwargs)
 


@@ -101,9 +101,9 @@ class EditableListBox(windows.Panel):
         return "<%s.%s; proxy of C++ wxEditableListBox instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """
         return "<%s.%s; proxy of C++ wxEditableListBox instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """

-        __init__(Window parent, int id, wxString label, Point pos=DefaultPosition, 
+        __init__(Window parent, int id, String label, Point pos=DefaultPosition, 

             Size size=DefaultSize, long style=wxEL_ALLOW_NEW|wxEL_ALLOW_EDIT|wxEL_ALLOW_DELETE, 
             Size size=DefaultSize, long style=wxEL_ALLOW_NEW|wxEL_ALLOW_EDIT|wxEL_ALLOW_DELETE, 

-            wxString name=wxPyEditableListBoxNameStr) -> EditableListBox
+            String name=wxPyEditableListBoxNameStr) -> EditableListBox

         """
         newobj = _gizmos.new_EditableListBox(*args, **kwargs)
         self.this = newobj.this
         """
         newobj = _gizmos.new_EditableListBox(*args, **kwargs)
         self.this = newobj.this


@@ -302,7 +302,7 @@ class LEDNumberCtrl(core.Control):
         return _gizmos.LEDNumberCtrl_Create(*args, **kwargs)
 
     def GetAlignment(*args, **kwargs):
         return _gizmos.LEDNumberCtrl_Create(*args, **kwargs)
 
     def GetAlignment(*args, **kwargs):

-        """GetAlignment() -> wxLEDValueAlign"""
+        """GetAlignment() -> int"""

         return _gizmos.LEDNumberCtrl_GetAlignment(*args, **kwargs)
 
     def GetDrawFaded(*args, **kwargs):
         return _gizmos.LEDNumberCtrl_GetAlignment(*args, **kwargs)
 
     def GetDrawFaded(*args, **kwargs):


@@ -310,11 +310,11 @@ class LEDNumberCtrl(core.Control):
         return _gizmos.LEDNumberCtrl_GetDrawFaded(*args, **kwargs)
 
     def GetValue(*args, **kwargs):
         return _gizmos.LEDNumberCtrl_GetDrawFaded(*args, **kwargs)
 
     def GetValue(*args, **kwargs):

-        """GetValue() -> wxString"""
+        """GetValue() -> String"""

         return _gizmos.LEDNumberCtrl_GetValue(*args, **kwargs)
 
     def SetAlignment(*args, **kwargs):
         return _gizmos.LEDNumberCtrl_GetValue(*args, **kwargs)
 
     def SetAlignment(*args, **kwargs):

-        """SetAlignment(wxLEDValueAlign Alignment, bool Redraw=true)"""
+        """SetAlignment(int Alignment, bool Redraw=true)"""

         return _gizmos.LEDNumberCtrl_SetAlignment(*args, **kwargs)
 
     def SetDrawFaded(*args, **kwargs):
         return _gizmos.LEDNumberCtrl_SetAlignment(*args, **kwargs)
 
     def SetDrawFaded(*args, **kwargs):


@@ -322,7 +322,7 @@ class LEDNumberCtrl(core.Control):
         return _gizmos.LEDNumberCtrl_SetDrawFaded(*args, **kwargs)
 
     def SetValue(*args, **kwargs):
         return _gizmos.LEDNumberCtrl_SetDrawFaded(*args, **kwargs)
 
     def SetValue(*args, **kwargs):

-        """SetValue(wxString Value, bool Redraw=true)"""
+        """SetValue(String Value, bool Redraw=true)"""

         return _gizmos.LEDNumberCtrl_SetValue(*args, **kwargs)
 
 
         return _gizmos.LEDNumberCtrl_SetValue(*args, **kwargs)
 
 


@@ -348,19 +348,19 @@ class TreeListColumnInfo(core.Object):
         return "<%s.%s; proxy of C++ wxTreeListColumnInfo instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """
         return "<%s.%s; proxy of C++ wxTreeListColumnInfo instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """

-        __init__(wxString text=wxPyEmptyString, int image=-1, size_t width=100, 
-            wxTreeListColumnAlign alignment=TL_ALIGN_LEFT) -> TreeListColumnInfo
+        __init__(String text=EmptyString, int image=-1, size_t width=100, 
+            int alignment=TL_ALIGN_LEFT) -> TreeListColumnInfo

         """
         newobj = _gizmos.new_TreeListColumnInfo(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def GetAlignment(*args, **kwargs):
         """
         newobj = _gizmos.new_TreeListColumnInfo(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def GetAlignment(*args, **kwargs):

-        """GetAlignment() -> wxTreeListColumnAlign"""
+        """GetAlignment() -> int"""

         return _gizmos.TreeListColumnInfo_GetAlignment(*args, **kwargs)
 
     def GetText(*args, **kwargs):
         return _gizmos.TreeListColumnInfo_GetAlignment(*args, **kwargs)
 
     def GetText(*args, **kwargs):

-        """GetText() -> wxString"""
+        """GetText() -> String"""

         return _gizmos.TreeListColumnInfo_GetText(*args, **kwargs)
 
     def GetImage(*args, **kwargs):
         return _gizmos.TreeListColumnInfo_GetText(*args, **kwargs)
 
     def GetImage(*args, **kwargs):


@@ -376,11 +376,11 @@ class TreeListColumnInfo(core.Object):
         return _gizmos.TreeListColumnInfo_GetWidth(*args, **kwargs)
 
     def SetAlignment(*args, **kwargs):
         return _gizmos.TreeListColumnInfo_GetWidth(*args, **kwargs)
 
     def SetAlignment(*args, **kwargs):

-        """SetAlignment(wxTreeListColumnAlign alignment)"""
+        """SetAlignment(int alignment)"""

         return _gizmos.TreeListColumnInfo_SetAlignment(*args, **kwargs)
 
     def SetText(*args, **kwargs):
         return _gizmos.TreeListColumnInfo_SetAlignment(*args, **kwargs)
 
     def SetText(*args, **kwargs):

-        """SetText(wxString text)"""
+        """SetText(String text)"""

         return _gizmos.TreeListColumnInfo_SetText(*args, **kwargs)
 
     def SetImage(*args, **kwargs):
         return _gizmos.TreeListColumnInfo_SetText(*args, **kwargs)
 
     def SetImage(*args, **kwargs):


@@ -411,7 +411,7 @@ class TreeListCtrl(core.Control):
         __init__(Window parent, int id=-1, Point pos=DefaultPosition, 
             Size size=DefaultSize, long style=TR_DEFAULT_STYLE, 
             Validator validator=DefaultValidator, 
         __init__(Window parent, int id=-1, Point pos=DefaultPosition, 
             Size size=DefaultSize, long style=TR_DEFAULT_STYLE, 
             Validator validator=DefaultValidator, 

-            wxString name=wxPyTreeListCtrlNameStr) -> TreeListCtrl
+            String name=wxPyTreeListCtrlNameStr) -> TreeListCtrl

         """
         newobj = _gizmos.new_TreeListCtrl(*args, **kwargs)
         self.this = newobj.this
         """
         newobj = _gizmos.new_TreeListCtrl(*args, **kwargs)
         self.this = newobj.this


@@ -424,7 +424,7 @@ class TreeListCtrl(core.Control):
         Create(Window parent, int id=-1, Point pos=DefaultPosition, 
             Size size=DefaultSize, long style=TR_DEFAULT_STYLE, 
             Validator validator=DefaultValidator, 
         Create(Window parent, int id=-1, Point pos=DefaultPosition, 
             Size size=DefaultSize, long style=TR_DEFAULT_STYLE, 
             Validator validator=DefaultValidator, 

-            wxString name=wxPyTreeListCtrlNameStr) -> bool
+            String name=wxPyTreeListCtrlNameStr) -> bool

         """
         return _gizmos.TreeListCtrl_Create(*args, **kwargs)
 
         """
         return _gizmos.TreeListCtrl_Create(*args, **kwargs)
 


@@ -503,7 +503,7 @@ class TreeListCtrl(core.Control):
         return val
 
     def AddColumn(*args, **kwargs):
         return val
 
     def AddColumn(*args, **kwargs):

-        """AddColumn(wxString text)"""
+        """AddColumn(String text)"""

         return _gizmos.TreeListCtrl_AddColumn(*args, **kwargs)
 
     def AddColumnInfo(*args, **kwargs):
         return _gizmos.TreeListCtrl_AddColumn(*args, **kwargs)
 
     def AddColumnInfo(*args, **kwargs):


@@ -511,7 +511,7 @@ class TreeListCtrl(core.Control):
         return _gizmos.TreeListCtrl_AddColumnInfo(*args, **kwargs)
 
     def InsertColumn(*args, **kwargs):
         return _gizmos.TreeListCtrl_AddColumnInfo(*args, **kwargs)
 
     def InsertColumn(*args, **kwargs):

-        """InsertColumn(size_t before, wxString text)"""
+        """InsertColumn(size_t before, String text)"""

         return _gizmos.TreeListCtrl_InsertColumn(*args, **kwargs)
 
     def InsertColumnInfo(*args, **kwargs):
         return _gizmos.TreeListCtrl_InsertColumn(*args, **kwargs)
 
     def InsertColumnInfo(*args, **kwargs):


@@ -543,11 +543,11 @@ class TreeListCtrl(core.Control):
         return _gizmos.TreeListCtrl_GetMainColumn(*args, **kwargs)
 
     def SetColumnText(*args, **kwargs):
         return _gizmos.TreeListCtrl_GetMainColumn(*args, **kwargs)
 
     def SetColumnText(*args, **kwargs):

-        """SetColumnText(size_t column, wxString text)"""
+        """SetColumnText(size_t column, String text)"""

         return _gizmos.TreeListCtrl_SetColumnText(*args, **kwargs)
 
     def GetColumnText(*args, **kwargs):
         return _gizmos.TreeListCtrl_SetColumnText(*args, **kwargs)
 
     def GetColumnText(*args, **kwargs):

-        """GetColumnText(size_t column) -> wxString"""
+        """GetColumnText(size_t column) -> String"""

         return _gizmos.TreeListCtrl_GetColumnText(*args, **kwargs)
 
     def SetColumn(*args, **kwargs):
         return _gizmos.TreeListCtrl_GetColumnText(*args, **kwargs)
 
     def SetColumn(*args, **kwargs):


@@ -559,11 +559,11 @@ class TreeListCtrl(core.Control):
         return _gizmos.TreeListCtrl_GetColumn(*args, **kwargs)
 
     def SetColumnAlignment(*args, **kwargs):
         return _gizmos.TreeListCtrl_GetColumn(*args, **kwargs)
 
     def SetColumnAlignment(*args, **kwargs):

-        """SetColumnAlignment(size_t column, wxTreeListColumnAlign align)"""
+        """SetColumnAlignment(size_t column, int align)"""

         return _gizmos.TreeListCtrl_SetColumnAlignment(*args, **kwargs)
 
     def GetColumnAlignment(*args, **kwargs):
         return _gizmos.TreeListCtrl_SetColumnAlignment(*args, **kwargs)
 
     def GetColumnAlignment(*args, **kwargs):

-        """GetColumnAlignment(size_t column) -> wxTreeListColumnAlign"""
+        """GetColumnAlignment(size_t column) -> int"""

         return _gizmos.TreeListCtrl_GetColumnAlignment(*args, **kwargs)
 
     def SetColumnImage(*args, **kwargs):
         return _gizmos.TreeListCtrl_GetColumnAlignment(*args, **kwargs)
 
     def SetColumnImage(*args, **kwargs):


@@ -575,19 +575,19 @@ class TreeListCtrl(core.Control):
         return _gizmos.TreeListCtrl_GetColumnImage(*args, **kwargs)
 
     def GetItemText(*args, **kwargs):
         return _gizmos.TreeListCtrl_GetColumnImage(*args, **kwargs)
 
     def GetItemText(*args, **kwargs):

-        """GetItemText(TreeItemId item, int column=-1) -> wxString"""
+        """GetItemText(TreeItemId item, int column=-1) -> String"""

         return _gizmos.TreeListCtrl_GetItemText(*args, **kwargs)
 
     def GetItemImage(*args, **kwargs):
         return _gizmos.TreeListCtrl_GetItemText(*args, **kwargs)
 
     def GetItemImage(*args, **kwargs):

-        """GetItemImage(TreeItemId item, int column=-1, wxTreeItemIcon which=TreeItemIcon_Normal) -> int"""
+        """GetItemImage(TreeItemId item, int column=-1, int which=TreeItemIcon_Normal) -> int"""

         return _gizmos.TreeListCtrl_GetItemImage(*args, **kwargs)
 
     def SetItemText(*args, **kwargs):
         return _gizmos.TreeListCtrl_GetItemImage(*args, **kwargs)
 
     def SetItemText(*args, **kwargs):

-        """SetItemText(TreeItemId item, wxString text, int column=-1)"""
+        """SetItemText(TreeItemId item, String text, int column=-1)"""

         return _gizmos.TreeListCtrl_SetItemText(*args, **kwargs)
 
     def SetItemImage(*args, **kwargs):
         return _gizmos.TreeListCtrl_SetItemText(*args, **kwargs)
 
     def SetItemImage(*args, **kwargs):

-        """SetItemImage(TreeItemId item, int image, int column=-1, wxTreeItemIcon which=TreeItemIcon_Normal)"""
+        """SetItemImage(TreeItemId item, int image, int column=-1, int which=TreeItemIcon_Normal)"""

         return _gizmos.TreeListCtrl_SetItemImage(*args, **kwargs)
 
     def GetItemData(*args, **kwargs):
         return _gizmos.TreeListCtrl_SetItemImage(*args, **kwargs)
 
     def GetItemData(*args, **kwargs):


@@ -615,15 +615,15 @@ class TreeListCtrl(core.Control):
         return _gizmos.TreeListCtrl_SetItemBold(*args, **kwargs)
 
     def SetItemTextColour(*args, **kwargs):
         return _gizmos.TreeListCtrl_SetItemBold(*args, **kwargs)
 
     def SetItemTextColour(*args, **kwargs):

-        """SetItemTextColour(TreeItemId item, wxColour col)"""
+        """SetItemTextColour(TreeItemId item, Colour col)"""

         return _gizmos.TreeListCtrl_SetItemTextColour(*args, **kwargs)
 
     def SetItemBackgroundColour(*args, **kwargs):
         return _gizmos.TreeListCtrl_SetItemTextColour(*args, **kwargs)
 
     def SetItemBackgroundColour(*args, **kwargs):

-        """SetItemBackgroundColour(TreeItemId item, wxColour col)"""
+        """SetItemBackgroundColour(TreeItemId item, Colour col)"""

         return _gizmos.TreeListCtrl_SetItemBackgroundColour(*args, **kwargs)
 
     def SetItemFont(*args, **kwargs):
         return _gizmos.TreeListCtrl_SetItemBackgroundColour(*args, **kwargs)
 
     def SetItemFont(*args, **kwargs):

-        """SetItemFont(TreeItemId item, wxFont font)"""
+        """SetItemFont(TreeItemId item, Font font)"""

         return _gizmos.TreeListCtrl_SetItemFont(*args, **kwargs)
 
     def GetItemBold(*args, **kwargs):
         return _gizmos.TreeListCtrl_SetItemFont(*args, **kwargs)
 
     def GetItemBold(*args, **kwargs):


@@ -631,15 +631,15 @@ class TreeListCtrl(core.Control):
         return _gizmos.TreeListCtrl_GetItemBold(*args, **kwargs)
 
     def GetItemTextColour(*args, **kwargs):
         return _gizmos.TreeListCtrl_GetItemBold(*args, **kwargs)
 
     def GetItemTextColour(*args, **kwargs):

-        """GetItemTextColour(TreeItemId item) -> wxColour"""
+        """GetItemTextColour(TreeItemId item) -> Colour"""

         return _gizmos.TreeListCtrl_GetItemTextColour(*args, **kwargs)
 
     def GetItemBackgroundColour(*args, **kwargs):
         return _gizmos.TreeListCtrl_GetItemTextColour(*args, **kwargs)
 
     def GetItemBackgroundColour(*args, **kwargs):

-        """GetItemBackgroundColour(TreeItemId item) -> wxColour"""
+        """GetItemBackgroundColour(TreeItemId item) -> Colour"""

         return _gizmos.TreeListCtrl_GetItemBackgroundColour(*args, **kwargs)
 
     def GetItemFont(*args, **kwargs):
         return _gizmos.TreeListCtrl_GetItemBackgroundColour(*args, **kwargs)
 
     def GetItemFont(*args, **kwargs):

-        """GetItemFont(TreeItemId item) -> wxFont"""
+        """GetItemFont(TreeItemId item) -> Font"""

         return _gizmos.TreeListCtrl_GetItemFont(*args, **kwargs)
 
     def IsVisible(*args, **kwargs):
         return _gizmos.TreeListCtrl_GetItemFont(*args, **kwargs)
 
     def IsVisible(*args, **kwargs):


@@ -719,36 +719,33 @@ class TreeListCtrl(core.Control):
         return _gizmos.TreeListCtrl_GetNext(*args, **kwargs)
 
     def AddRoot(*args, **kwargs):
         return _gizmos.TreeListCtrl_GetNext(*args, **kwargs)
 
     def AddRoot(*args, **kwargs):

-        """
-        AddRoot(wxString text, int image=-1, int selectedImage=-1, 
-            TreeItemData data=None) -> TreeItemId
-        """
+        """AddRoot(String text, int image=-1, int selectedImage=-1, TreeItemData data=None) -> TreeItemId"""

         return _gizmos.TreeListCtrl_AddRoot(*args, **kwargs)
 
     def PrependItem(*args, **kwargs):
         """
         return _gizmos.TreeListCtrl_AddRoot(*args, **kwargs)
 
     def PrependItem(*args, **kwargs):
         """

-        PrependItem(TreeItemId parent, wxString text, int image=-1, int selectedImage=-1, 
+        PrependItem(TreeItemId parent, String text, int image=-1, int selectedImage=-1, 

             TreeItemData data=None) -> TreeItemId
         """
         return _gizmos.TreeListCtrl_PrependItem(*args, **kwargs)
 
     def InsertItem(*args, **kwargs):
         """
             TreeItemData data=None) -> TreeItemId
         """
         return _gizmos.TreeListCtrl_PrependItem(*args, **kwargs)
 
     def InsertItem(*args, **kwargs):
         """

-        InsertItem(TreeItemId parent, TreeItemId idPrevious, wxString text, 
+        InsertItem(TreeItemId parent, TreeItemId idPrevious, String text, 

             int image=-1, int selectedImage=-1, TreeItemData data=None) -> TreeItemId
         """
         return _gizmos.TreeListCtrl_InsertItem(*args, **kwargs)
 
     def InsertItemBefore(*args, **kwargs):
         """
             int image=-1, int selectedImage=-1, TreeItemData data=None) -> TreeItemId
         """
         return _gizmos.TreeListCtrl_InsertItem(*args, **kwargs)
 
     def InsertItemBefore(*args, **kwargs):
         """

-        InsertItemBefore(TreeItemId parent, size_t index, wxString text, int image=-1, 
+        InsertItemBefore(TreeItemId parent, size_t index, String text, int image=-1, 

             int selectedImage=-1, TreeItemData data=None) -> TreeItemId
         """
         return _gizmos.TreeListCtrl_InsertItemBefore(*args, **kwargs)
 
     def AppendItem(*args, **kwargs):
         """
             int selectedImage=-1, TreeItemData data=None) -> TreeItemId
         """
         return _gizmos.TreeListCtrl_InsertItemBefore(*args, **kwargs)
 
     def AppendItem(*args, **kwargs):
         """

-        AppendItem(TreeItemId parent, wxString text, int image=-1, int selectedImage=-1, 
+        AppendItem(TreeItemId parent, String text, int image=-1, int selectedImage=-1, 

             TreeItemData data=None) -> TreeItemId
         """
         return _gizmos.TreeListCtrl_AppendItem(*args, **kwargs)
             TreeItemData data=None) -> TreeItemId
         """
         return _gizmos.TreeListCtrl_AppendItem(*args, **kwargs)

diff --git a/wxPython/contrib/glcanvas/gtk/glcanvas.py b/wxPython/contrib/glcanvas/gtk/glcanvas.py
index e51a645336c64e7bda8453c5022356ea4ee42626..fbbd08a79137edb88e8230c5d8c6728194eab3fb 100644 (file)
--- a/wxPython/contrib/glcanvas/gtk/glcanvas.py
+++ b/wxPython/contrib/glcanvas/gtk/glcanvas.py
@@ -28,7 +28,7 @@ class GLContext(core.Object):
         return _glcanvas.GLContext_SetCurrent(*args, **kwargs)
 
     def SetColour(*args, **kwargs):
         return _glcanvas.GLContext_SetCurrent(*args, **kwargs)
 
     def SetColour(*args, **kwargs):

-        """SetColour(wxString colour)"""
+        """SetColour(String colour)"""

         return _glcanvas.GLContext_SetColour(*args, **kwargs)
 
     def SwapBuffers(*args, **kwargs):
         return _glcanvas.GLContext_SetColour(*args, **kwargs)
 
     def SwapBuffers(*args, **kwargs):


@@ -85,7 +85,7 @@ class GLCanvas(core.Window):
     def __init__(self, *args, **kwargs):
         """
         __init__(Window parent, int id=-1, Point pos=DefaultPosition, 
     def __init__(self, *args, **kwargs):
         """
         __init__(Window parent, int id=-1, Point pos=DefaultPosition, 

-            Size size=DefaultSize, long style=0, wxString name=wxPyGLCanvasNameStr, 
+            Size size=DefaultSize, long style=0, String name=wxPyGLCanvasNameStr, 

             int attribList=None, 
             wxPalette palette=wxNullPalette) -> GLCanvas
         """
             int attribList=None, 
             wxPalette palette=wxNullPalette) -> GLCanvas
         """


@@ -100,7 +100,7 @@ class GLCanvas(core.Window):
         return _glcanvas.GLCanvas_SetCurrent(*args, **kwargs)
 
     def SetColour(*args, **kwargs):
         return _glcanvas.GLCanvas_SetCurrent(*args, **kwargs)
 
     def SetColour(*args, **kwargs):

-        """SetColour(wxString colour)"""
+        """SetColour(String colour)"""

         return _glcanvas.GLCanvas_SetColour(*args, **kwargs)
 
     def SwapBuffers(*args, **kwargs):
         return _glcanvas.GLCanvas_SetColour(*args, **kwargs)
 
     def SwapBuffers(*args, **kwargs):


@@ -123,7 +123,7 @@ def wxGLCanvasWithContext(*args, **kwargs):
     """
     wxGLCanvasWithContext(Window parent, GLContext shared=None, int id=-1, Point pos=DefaultPosition, 
         Size size=DefaultSize, 
     """
     wxGLCanvasWithContext(Window parent, GLContext shared=None, int id=-1, Point pos=DefaultPosition, 
         Size size=DefaultSize, 

-        long style=0, wxString name=wxPyGLCanvasNameStr, 
+        long style=0, String name=wxPyGLCanvasNameStr, 

         int attribList=None, wxPalette palette=wxNullPalette) -> GLCanvas
     """
     val = _glcanvas.new_wxGLCanvasWithContext(*args, **kwargs)
         int attribList=None, wxPalette palette=wxNullPalette) -> GLCanvas
     """
     val = _glcanvas.new_wxGLCanvasWithContext(*args, **kwargs)

diff --git a/wxPython/contrib/ogl/gtk/ogl.py b/wxPython/contrib/ogl/gtk/ogl.py
index 9c2d5d21297e9f28980e962c67408ff36c4252c1..f01d3b94007dc037e1a9de66e75d2ed5b64e31c2 100644 (file)
--- a/wxPython/contrib/ogl/gtk/ogl.py
+++ b/wxPython/contrib/ogl/gtk/ogl.py
@@ -18,11 +18,11 @@ class ShapeRegion(core.Object):
         self.thisown = 1
         del newobj.thisown
     def SetText(*args, **kwargs):
         self.thisown = 1
         del newobj.thisown
     def SetText(*args, **kwargs):

-        """SetText(wxString s)"""
+        """SetText(String s)"""

         return _ogl.ShapeRegion_SetText(*args, **kwargs)
 
     def SetFont(*args, **kwargs):
         return _ogl.ShapeRegion_SetText(*args, **kwargs)
 
     def SetFont(*args, **kwargs):

-        """SetFont(wxFont f)"""
+        """SetFont(Font f)"""

         return _ogl.ShapeRegion_SetFont(*args, **kwargs)
 
     def SetMinSize(*args, **kwargs):
         return _ogl.ShapeRegion_SetFont(*args, **kwargs)
 
     def SetMinSize(*args, **kwargs):


@@ -46,19 +46,19 @@ class ShapeRegion(core.Object):
         return _ogl.ShapeRegion_SetFormatMode(*args, **kwargs)
 
     def SetName(*args, **kwargs):
         return _ogl.ShapeRegion_SetFormatMode(*args, **kwargs)
 
     def SetName(*args, **kwargs):

-        """SetName(wxString s)"""
+        """SetName(String s)"""

         return _ogl.ShapeRegion_SetName(*args, **kwargs)
 
     def SetColour(*args, **kwargs):
         return _ogl.ShapeRegion_SetName(*args, **kwargs)
 
     def SetColour(*args, **kwargs):

-        """SetColour(wxString col)"""
+        """SetColour(String col)"""

         return _ogl.ShapeRegion_SetColour(*args, **kwargs)
 
     def GetText(*args, **kwargs):
         return _ogl.ShapeRegion_SetColour(*args, **kwargs)
 
     def GetText(*args, **kwargs):

-        """GetText() -> wxString"""
+        """GetText() -> String"""

         return _ogl.ShapeRegion_GetText(*args, **kwargs)
 
     def GetFont(*args, **kwargs):
         return _ogl.ShapeRegion_GetText(*args, **kwargs)
 
     def GetFont(*args, **kwargs):

-        """GetFont() -> wxFont"""
+        """GetFont() -> Font"""

         return _ogl.ShapeRegion_GetFont(*args, **kwargs)
 
     def GetMinSize(*args, **kwargs):
         return _ogl.ShapeRegion_GetFont(*args, **kwargs)
 
     def GetMinSize(*args, **kwargs):


@@ -82,15 +82,15 @@ class ShapeRegion(core.Object):
         return _ogl.ShapeRegion_GetFormatMode(*args, **kwargs)
 
     def GetName(*args, **kwargs):
         return _ogl.ShapeRegion_GetFormatMode(*args, **kwargs)
 
     def GetName(*args, **kwargs):

-        """GetName() -> wxString"""
+        """GetName() -> String"""

         return _ogl.ShapeRegion_GetName(*args, **kwargs)
 
     def GetColour(*args, **kwargs):
         return _ogl.ShapeRegion_GetName(*args, **kwargs)
 
     def GetColour(*args, **kwargs):

-        """GetColour() -> wxString"""
+        """GetColour() -> String"""

         return _ogl.ShapeRegion_GetColour(*args, **kwargs)
 
     def GetActualColourObject(*args, **kwargs):
         return _ogl.ShapeRegion_GetColour(*args, **kwargs)
 
     def GetActualColourObject(*args, **kwargs):

-        """GetActualColourObject() -> wxColour"""
+        """GetActualColourObject() -> Colour"""

         return _ogl.ShapeRegion_GetActualColourObject(*args, **kwargs)
 
     def GetFormattedText(*args, **kwargs):
         return _ogl.ShapeRegion_GetActualColourObject(*args, **kwargs)
 
     def GetFormattedText(*args, **kwargs):


@@ -98,7 +98,7 @@ class ShapeRegion(core.Object):
         return _ogl.ShapeRegion_GetFormattedText(*args, **kwargs)
 
     def GetPenColour(*args, **kwargs):
         return _ogl.ShapeRegion_GetFormattedText(*args, **kwargs)
 
     def GetPenColour(*args, **kwargs):

-        """GetPenColour() -> wxString"""
+        """GetPenColour() -> String"""

         return _ogl.ShapeRegion_GetPenColour(*args, **kwargs)
 
     def GetPenStyle(*args, **kwargs):
         return _ogl.ShapeRegion_GetPenColour(*args, **kwargs)
 
     def GetPenStyle(*args, **kwargs):


@@ -110,7 +110,7 @@ class ShapeRegion(core.Object):
         return _ogl.ShapeRegion_SetPenStyle(*args, **kwargs)
 
     def SetPenColour(*args, **kwargs):
         return _ogl.ShapeRegion_SetPenStyle(*args, **kwargs)
 
     def SetPenColour(*args, **kwargs):

-        """SetPenColour(wxString col)"""
+        """SetPenColour(String col)"""

         return _ogl.ShapeRegion_SetPenColour(*args, **kwargs)
 
     def GetActualPen(*args, **kwargs):
         return _ogl.ShapeRegion_SetPenColour(*args, **kwargs)
 
     def GetActualPen(*args, **kwargs):


@@ -185,31 +185,31 @@ class PyShapeEvtHandler(core.Object):
         return _ogl.PyShapeEvtHandler_base_OnDelete(*args, **kwargs)
 
     def base_OnDraw(*args, **kwargs):
         return _ogl.PyShapeEvtHandler_base_OnDelete(*args, **kwargs)
 
     def base_OnDraw(*args, **kwargs):

-        """base_OnDraw(wxDC dc)"""
+        """base_OnDraw(DC dc)"""

         return _ogl.PyShapeEvtHandler_base_OnDraw(*args, **kwargs)
 
     def base_OnDrawContents(*args, **kwargs):
         return _ogl.PyShapeEvtHandler_base_OnDraw(*args, **kwargs)
 
     def base_OnDrawContents(*args, **kwargs):

-        """base_OnDrawContents(wxDC dc)"""
+        """base_OnDrawContents(DC dc)"""

         return _ogl.PyShapeEvtHandler_base_OnDrawContents(*args, **kwargs)
 
     def base_OnDrawBranches(*args, **kwargs):
         return _ogl.PyShapeEvtHandler_base_OnDrawContents(*args, **kwargs)
 
     def base_OnDrawBranches(*args, **kwargs):

-        """base_OnDrawBranches(wxDC dc, bool erase=False)"""
+        """base_OnDrawBranches(DC dc, bool erase=False)"""

         return _ogl.PyShapeEvtHandler_base_OnDrawBranches(*args, **kwargs)
 
     def base_OnMoveLinks(*args, **kwargs):
         return _ogl.PyShapeEvtHandler_base_OnDrawBranches(*args, **kwargs)
 
     def base_OnMoveLinks(*args, **kwargs):

-        """base_OnMoveLinks(wxDC dc)"""
+        """base_OnMoveLinks(DC dc)"""

         return _ogl.PyShapeEvtHandler_base_OnMoveLinks(*args, **kwargs)
 
     def base_OnErase(*args, **kwargs):
         return _ogl.PyShapeEvtHandler_base_OnMoveLinks(*args, **kwargs)
 
     def base_OnErase(*args, **kwargs):

-        """base_OnErase(wxDC dc)"""
+        """base_OnErase(DC dc)"""

         return _ogl.PyShapeEvtHandler_base_OnErase(*args, **kwargs)
 
     def base_OnEraseContents(*args, **kwargs):
         return _ogl.PyShapeEvtHandler_base_OnErase(*args, **kwargs)
 
     def base_OnEraseContents(*args, **kwargs):

-        """base_OnEraseContents(wxDC dc)"""
+        """base_OnEraseContents(DC dc)"""

         return _ogl.PyShapeEvtHandler_base_OnEraseContents(*args, **kwargs)
 
     def base_OnHighlight(*args, **kwargs):
         return _ogl.PyShapeEvtHandler_base_OnEraseContents(*args, **kwargs)
 
     def base_OnHighlight(*args, **kwargs):

-        """base_OnHighlight(wxDC dc)"""
+        """base_OnHighlight(DC dc)"""

         return _ogl.PyShapeEvtHandler_base_OnHighlight(*args, **kwargs)
 
     def base_OnLeftClick(*args, **kwargs):
         return _ogl.PyShapeEvtHandler_base_OnHighlight(*args, **kwargs)
 
     def base_OnLeftClick(*args, **kwargs):


@@ -230,14 +230,14 @@ class PyShapeEvtHandler(core.Object):
 
     def base_OnMovePre(*args, **kwargs):
         """
 
     def base_OnMovePre(*args, **kwargs):
         """

-        base_OnMovePre(wxDC dc, double x, double y, double old_x, double old_y, 
+        base_OnMovePre(DC dc, double x, double y, double old_x, double old_y, 

             bool display=True) -> bool
         """
         return _ogl.PyShapeEvtHandler_base_OnMovePre(*args, **kwargs)
 
     def base_OnMovePost(*args, **kwargs):
         """
             bool display=True) -> bool
         """
         return _ogl.PyShapeEvtHandler_base_OnMovePre(*args, **kwargs)
 
     def base_OnMovePost(*args, **kwargs):
         """

-        base_OnMovePost(wxDC dc, double x, double y, double old_x, double old_y, 
+        base_OnMovePost(DC dc, double x, double y, double old_x, double old_y, 

             bool display=True)
         """
         return _ogl.PyShapeEvtHandler_base_OnMovePost(*args, **kwargs)
             bool display=True)
         """
         return _ogl.PyShapeEvtHandler_base_OnMovePost(*args, **kwargs)


@@ -267,19 +267,19 @@ class PyShapeEvtHandler(core.Object):
         return _ogl.PyShapeEvtHandler_base_OnEndDragRight(*args, **kwargs)
 
     def base_OnDrawOutline(*args, **kwargs):
         return _ogl.PyShapeEvtHandler_base_OnEndDragRight(*args, **kwargs)
 
     def base_OnDrawOutline(*args, **kwargs):

-        """base_OnDrawOutline(wxDC dc, double x, double y, double w, double h)"""
+        """base_OnDrawOutline(DC dc, double x, double y, double w, double h)"""

         return _ogl.PyShapeEvtHandler_base_OnDrawOutline(*args, **kwargs)
 
     def base_OnDrawControlPoints(*args, **kwargs):
         return _ogl.PyShapeEvtHandler_base_OnDrawOutline(*args, **kwargs)
 
     def base_OnDrawControlPoints(*args, **kwargs):

-        """base_OnDrawControlPoints(wxDC dc)"""
+        """base_OnDrawControlPoints(DC dc)"""

         return _ogl.PyShapeEvtHandler_base_OnDrawControlPoints(*args, **kwargs)
 
     def base_OnEraseControlPoints(*args, **kwargs):
         return _ogl.PyShapeEvtHandler_base_OnDrawControlPoints(*args, **kwargs)
 
     def base_OnEraseControlPoints(*args, **kwargs):

-        """base_OnEraseControlPoints(wxDC dc)"""
+        """base_OnEraseControlPoints(DC dc)"""

         return _ogl.PyShapeEvtHandler_base_OnEraseControlPoints(*args, **kwargs)
 
     def base_OnMoveLink(*args, **kwargs):
         return _ogl.PyShapeEvtHandler_base_OnEraseControlPoints(*args, **kwargs)
 
     def base_OnMoveLink(*args, **kwargs):

-        """base_OnMoveLink(wxDC dc, bool moveControlPoints=True)"""
+        """base_OnMoveLink(DC dc, bool moveControlPoints=True)"""

         return _ogl.PyShapeEvtHandler_base_OnMoveLink(*args, **kwargs)
 
     def base_OnSizingDragLeft(*args, **kwargs):
         return _ogl.PyShapeEvtHandler_base_OnMoveLink(*args, **kwargs)
 
     def base_OnSizingDragLeft(*args, **kwargs):


@@ -418,7 +418,7 @@ class PyShape(PyShapeEvtHandler):
         return _ogl.PyShape_MakeControlPoints(*args, **kwargs)
 
     def DeleteControlPoints(*args, **kwargs):
         return _ogl.PyShape_MakeControlPoints(*args, **kwargs)
 
     def DeleteControlPoints(*args, **kwargs):

-        """DeleteControlPoints(wxDC dc=None)"""
+        """DeleteControlPoints(DC dc=None)"""

         return _ogl.PyShape_DeleteControlPoints(*args, **kwargs)
 
     def ResetControlPoints(*args, **kwargs):
         return _ogl.PyShape_DeleteControlPoints(*args, **kwargs)
 
     def ResetControlPoints(*args, **kwargs):


@@ -450,7 +450,7 @@ class PyShape(PyShapeEvtHandler):
         return _ogl.PyShape_CalculateSize(*args, **kwargs)
 
     def Select(*args, **kwargs):
         return _ogl.PyShape_CalculateSize(*args, **kwargs)
 
     def Select(*args, **kwargs):

-        """Select(bool select=True, wxDC dc=None)"""
+        """Select(bool select=True, DC dc=None)"""

         return _ogl.PyShape_Select(*args, **kwargs)
 
     def SetHighlight(*args, **kwargs):
         return _ogl.PyShape_Select(*args, **kwargs)
 
     def SetHighlight(*args, **kwargs):


@@ -586,19 +586,19 @@ class PyShape(PyShapeEvtHandler):
         return _ogl.PyShape_IsShown(*args, **kwargs)
 
     def Move(*args, **kwargs):
         return _ogl.PyShape_IsShown(*args, **kwargs)
 
     def Move(*args, **kwargs):

-        """Move(wxDC dc, double x1, double y1, bool display=True)"""
+        """Move(DC dc, double x1, double y1, bool display=True)"""

         return _ogl.PyShape_Move(*args, **kwargs)
 
     def Erase(*args, **kwargs):
         return _ogl.PyShape_Move(*args, **kwargs)
 
     def Erase(*args, **kwargs):

-        """Erase(wxDC dc)"""
+        """Erase(DC dc)"""

         return _ogl.PyShape_Erase(*args, **kwargs)
 
     def EraseContents(*args, **kwargs):
         return _ogl.PyShape_Erase(*args, **kwargs)
 
     def EraseContents(*args, **kwargs):

-        """EraseContents(wxDC dc)"""
+        """EraseContents(DC dc)"""

         return _ogl.PyShape_EraseContents(*args, **kwargs)
 
     def Draw(*args, **kwargs):
         return _ogl.PyShape_EraseContents(*args, **kwargs)
 
     def Draw(*args, **kwargs):

-        """Draw(wxDC dc)"""
+        """Draw(DC dc)"""

         return _ogl.PyShape_Draw(*args, **kwargs)
 
     def Flash(*args, **kwargs):
         return _ogl.PyShape_Draw(*args, **kwargs)
 
     def Flash(*args, **kwargs):


@@ -606,11 +606,11 @@ class PyShape(PyShapeEvtHandler):
         return _ogl.PyShape_Flash(*args, **kwargs)
 
     def MoveLinks(*args, **kwargs):
         return _ogl.PyShape_Flash(*args, **kwargs)
 
     def MoveLinks(*args, **kwargs):

-        """MoveLinks(wxDC dc)"""
+        """MoveLinks(DC dc)"""

         return _ogl.PyShape_MoveLinks(*args, **kwargs)
 
     def DrawContents(*args, **kwargs):
         return _ogl.PyShape_MoveLinks(*args, **kwargs)
 
     def DrawContents(*args, **kwargs):

-        """DrawContents(wxDC dc)"""
+        """DrawContents(DC dc)"""

         return _ogl.PyShape_DrawContents(*args, **kwargs)
 
     def SetSize(*args, **kwargs):
         return _ogl.PyShape_DrawContents(*args, **kwargs)
 
     def SetSize(*args, **kwargs):


@@ -645,7 +645,7 @@ class PyShape(PyShapeEvtHandler):
         return _ogl.PyShape_GetLinePosition(*args, **kwargs)
 
     def AddText(*args, **kwargs):
         return _ogl.PyShape_GetLinePosition(*args, **kwargs)
 
     def AddText(*args, **kwargs):

-        """AddText(wxString string)"""
+        """AddText(String string)"""

         return _ogl.PyShape_AddText(*args, **kwargs)
 
     def GetPen(*args, **kwargs):
         return _ogl.PyShape_AddText(*args, **kwargs)
 
     def GetPen(*args, **kwargs):


@@ -661,7 +661,7 @@ class PyShape(PyShapeEvtHandler):
         return _ogl.PyShape_SetDefaultRegionSize(*args, **kwargs)
 
     def FormatText(*args, **kwargs):
         return _ogl.PyShape_SetDefaultRegionSize(*args, **kwargs)
 
     def FormatText(*args, **kwargs):

-        """FormatText(wxDC dc, wxString s, int regionId=0)"""
+        """FormatText(DC dc, String s, int regionId=0)"""

         return _ogl.PyShape_FormatText(*args, **kwargs)
 
     def SetFormatMode(*args, **kwargs):
         return _ogl.PyShape_FormatText(*args, **kwargs)
 
     def SetFormatMode(*args, **kwargs):


@@ -673,19 +673,19 @@ class PyShape(PyShapeEvtHandler):
         return _ogl.PyShape_GetFormatMode(*args, **kwargs)
 
     def SetFont(*args, **kwargs):
         return _ogl.PyShape_GetFormatMode(*args, **kwargs)
 
     def SetFont(*args, **kwargs):

-        """SetFont(wxFont font, int regionId=0)"""
+        """SetFont(Font font, int regionId=0)"""

         return _ogl.PyShape_SetFont(*args, **kwargs)
 
     def GetFont(*args, **kwargs):
         return _ogl.PyShape_SetFont(*args, **kwargs)
 
     def GetFont(*args, **kwargs):

-        """GetFont(int regionId=0) -> wxFont"""
+        """GetFont(int regionId=0) -> Font"""

         return _ogl.PyShape_GetFont(*args, **kwargs)
 
     def SetTextColour(*args, **kwargs):
         return _ogl.PyShape_GetFont(*args, **kwargs)
 
     def SetTextColour(*args, **kwargs):

-        """SetTextColour(wxString colour, int regionId=0)"""
+        """SetTextColour(String colour, int regionId=0)"""

         return _ogl.PyShape_SetTextColour(*args, **kwargs)
 
     def GetTextColour(*args, **kwargs):
         return _ogl.PyShape_SetTextColour(*args, **kwargs)
 
     def GetTextColour(*args, **kwargs):

-        """GetTextColour(int regionId=0) -> wxString"""
+        """GetTextColour(int regionId=0) -> String"""

         return _ogl.PyShape_GetTextColour(*args, **kwargs)
 
     def GetNumberOfTextRegions(*args, **kwargs):
         return _ogl.PyShape_GetTextColour(*args, **kwargs)
 
     def GetNumberOfTextRegions(*args, **kwargs):


@@ -693,19 +693,19 @@ class PyShape(PyShapeEvtHandler):
         return _ogl.PyShape_GetNumberOfTextRegions(*args, **kwargs)
 
     def SetRegionName(*args, **kwargs):
         return _ogl.PyShape_GetNumberOfTextRegions(*args, **kwargs)
 
     def SetRegionName(*args, **kwargs):

-        """SetRegionName(wxString name, int regionId=0)"""
+        """SetRegionName(String name, int regionId=0)"""

         return _ogl.PyShape_SetRegionName(*args, **kwargs)
 
     def GetRegionName(*args, **kwargs):
         return _ogl.PyShape_SetRegionName(*args, **kwargs)
 
     def GetRegionName(*args, **kwargs):

-        """GetRegionName(int regionId) -> wxString"""
+        """GetRegionName(int regionId) -> String"""

         return _ogl.PyShape_GetRegionName(*args, **kwargs)
 
     def GetRegionId(*args, **kwargs):
         return _ogl.PyShape_GetRegionName(*args, **kwargs)
 
     def GetRegionId(*args, **kwargs):

-        """GetRegionId(wxString name) -> int"""
+        """GetRegionId(String name) -> int"""

         return _ogl.PyShape_GetRegionId(*args, **kwargs)
 
     def NameRegions(*args, **kwargs):
         return _ogl.PyShape_GetRegionId(*args, **kwargs)
 
     def NameRegions(*args, **kwargs):

-        """NameRegions(wxString parentName=wxPyEmptyString)"""
+        """NameRegions(String parentName=EmptyString)"""

         return _ogl.PyShape_NameRegions(*args, **kwargs)
 
     def GetRegions(*args, **kwargs):
         return _ogl.PyShape_NameRegions(*args, **kwargs)
 
     def GetRegions(*args, **kwargs):


@@ -725,7 +725,7 @@ class PyShape(PyShapeEvtHandler):
         return _ogl.PyShape_AssignNewIds(*args, **kwargs)
 
     def FindRegion(*args, **kwargs):
         return _ogl.PyShape_AssignNewIds(*args, **kwargs)
 
     def FindRegion(*args, **kwargs):

-        """FindRegion(wxString regionName, int OUTPUT) -> PyShape"""
+        """FindRegion(String regionName, int OUTPUT) -> PyShape"""

         return _ogl.PyShape_FindRegion(*args, **kwargs)
 
     def FindRegionNames(*args, **kwargs):
         return _ogl.PyShape_FindRegion(*args, **kwargs)
 
     def FindRegionNames(*args, **kwargs):


@@ -774,15 +774,15 @@ class PyShape(PyShapeEvtHandler):
         return _ogl.PyShape_AttachmentSortTest(*args, **kwargs)
 
     def EraseLinks(*args, **kwargs):
         return _ogl.PyShape_AttachmentSortTest(*args, **kwargs)
 
     def EraseLinks(*args, **kwargs):

-        """EraseLinks(wxDC dc, int attachment=-1, bool recurse=False)"""
+        """EraseLinks(DC dc, int attachment=-1, bool recurse=False)"""

         return _ogl.PyShape_EraseLinks(*args, **kwargs)
 
     def DrawLinks(*args, **kwargs):
         return _ogl.PyShape_EraseLinks(*args, **kwargs)
 
     def DrawLinks(*args, **kwargs):

-        """DrawLinks(wxDC dc, int attachment=-1, bool recurse=False)"""
+        """DrawLinks(DC dc, int attachment=-1, bool recurse=False)"""

         return _ogl.PyShape_DrawLinks(*args, **kwargs)
 
     def MoveLineToNewAttachment(*args, **kwargs):
         return _ogl.PyShape_DrawLinks(*args, **kwargs)
 
     def MoveLineToNewAttachment(*args, **kwargs):

-        """MoveLineToNewAttachment(wxDC dc, PyLineShape to_move, double x, double y) -> bool"""
+        """MoveLineToNewAttachment(DC dc, PyLineShape to_move, double x, double y) -> bool"""

         return _ogl.PyShape_MoveLineToNewAttachment(*args, **kwargs)
 
     def ApplyAttachmentOrdering(*args, **kwargs):
         return _ogl.PyShape_MoveLineToNewAttachment(*args, **kwargs)
 
     def ApplyAttachmentOrdering(*args, **kwargs):


@@ -881,7 +881,7 @@ class PyShape(PyShapeEvtHandler):
         return _ogl.PyShape_ClearAttachments(*args, **kwargs)
 
     def Recentre(*args, **kwargs):
         return _ogl.PyShape_ClearAttachments(*args, **kwargs)
 
     def Recentre(*args, **kwargs):

-        """Recentre(wxDC dc)"""
+        """Recentre(DC dc)"""

         return _ogl.PyShape_Recentre(*args, **kwargs)
 
     def ClearPointList(*args, **kwargs):
         return _ogl.PyShape_Recentre(*args, **kwargs)
 
     def ClearPointList(*args, **kwargs):


@@ -901,31 +901,31 @@ class PyShape(PyShapeEvtHandler):
         return _ogl.PyShape_base_OnDelete(*args, **kwargs)
 
     def base_OnDraw(*args, **kwargs):
         return _ogl.PyShape_base_OnDelete(*args, **kwargs)
 
     def base_OnDraw(*args, **kwargs):

-        """base_OnDraw(wxDC dc)"""
+        """base_OnDraw(DC dc)"""

         return _ogl.PyShape_base_OnDraw(*args, **kwargs)
 
     def base_OnDrawContents(*args, **kwargs):
         return _ogl.PyShape_base_OnDraw(*args, **kwargs)
 
     def base_OnDrawContents(*args, **kwargs):

-        """base_OnDrawContents(wxDC dc)"""
+        """base_OnDrawContents(DC dc)"""

         return _ogl.PyShape_base_OnDrawContents(*args, **kwargs)
 
     def base_OnDrawBranches(*args, **kwargs):
         return _ogl.PyShape_base_OnDrawContents(*args, **kwargs)
 
     def base_OnDrawBranches(*args, **kwargs):

-        """base_OnDrawBranches(wxDC dc, bool erase=False)"""
+        """base_OnDrawBranches(DC dc, bool erase=False)"""

         return _ogl.PyShape_base_OnDrawBranches(*args, **kwargs)
 
     def base_OnMoveLinks(*args, **kwargs):
         return _ogl.PyShape_base_OnDrawBranches(*args, **kwargs)
 
     def base_OnMoveLinks(*args, **kwargs):

-        """base_OnMoveLinks(wxDC dc)"""
+        """base_OnMoveLinks(DC dc)"""

         return _ogl.PyShape_base_OnMoveLinks(*args, **kwargs)
 
     def base_OnErase(*args, **kwargs):
         return _ogl.PyShape_base_OnMoveLinks(*args, **kwargs)
 
     def base_OnErase(*args, **kwargs):

-        """base_OnErase(wxDC dc)"""
+        """base_OnErase(DC dc)"""

         return _ogl.PyShape_base_OnErase(*args, **kwargs)
 
     def base_OnEraseContents(*args, **kwargs):
         return _ogl.PyShape_base_OnErase(*args, **kwargs)
 
     def base_OnEraseContents(*args, **kwargs):

-        """base_OnEraseContents(wxDC dc)"""
+        """base_OnEraseContents(DC dc)"""

         return _ogl.PyShape_base_OnEraseContents(*args, **kwargs)
 
     def base_OnHighlight(*args, **kwargs):
         return _ogl.PyShape_base_OnEraseContents(*args, **kwargs)
 
     def base_OnHighlight(*args, **kwargs):

-        """base_OnHighlight(wxDC dc)"""
+        """base_OnHighlight(DC dc)"""

         return _ogl.PyShape_base_OnHighlight(*args, **kwargs)
 
     def base_OnLeftClick(*args, **kwargs):
         return _ogl.PyShape_base_OnHighlight(*args, **kwargs)
 
     def base_OnLeftClick(*args, **kwargs):


@@ -946,14 +946,14 @@ class PyShape(PyShapeEvtHandler):
 
     def base_OnMovePre(*args, **kwargs):
         """
 
     def base_OnMovePre(*args, **kwargs):
         """

-        base_OnMovePre(wxDC dc, double x, double y, double old_x, double old_y, 
+        base_OnMovePre(DC dc, double x, double y, double old_x, double old_y, 

             bool display=True) -> bool
         """
         return _ogl.PyShape_base_OnMovePre(*args, **kwargs)
 
     def base_OnMovePost(*args, **kwargs):
         """
             bool display=True) -> bool
         """
         return _ogl.PyShape_base_OnMovePre(*args, **kwargs)
 
     def base_OnMovePost(*args, **kwargs):
         """

-        base_OnMovePost(wxDC dc, double x, double y, double old_x, double old_y, 
+        base_OnMovePost(DC dc, double x, double y, double old_x, double old_y, 

             bool display=True)
         """
         return _ogl.PyShape_base_OnMovePost(*args, **kwargs)
             bool display=True)
         """
         return _ogl.PyShape_base_OnMovePost(*args, **kwargs)


@@ -983,19 +983,19 @@ class PyShape(PyShapeEvtHandler):
         return _ogl.PyShape_base_OnEndDragRight(*args, **kwargs)
 
     def base_OnDrawOutline(*args, **kwargs):
         return _ogl.PyShape_base_OnEndDragRight(*args, **kwargs)
 
     def base_OnDrawOutline(*args, **kwargs):

-        """base_OnDrawOutline(wxDC dc, double x, double y, double w, double h)"""
+        """base_OnDrawOutline(DC dc, double x, double y, double w, double h)"""

         return _ogl.PyShape_base_OnDrawOutline(*args, **kwargs)
 
     def base_OnDrawControlPoints(*args, **kwargs):
         return _ogl.PyShape_base_OnDrawOutline(*args, **kwargs)
 
     def base_OnDrawControlPoints(*args, **kwargs):

-        """base_OnDrawControlPoints(wxDC dc)"""
+        """base_OnDrawControlPoints(DC dc)"""

         return _ogl.PyShape_base_OnDrawControlPoints(*args, **kwargs)
 
     def base_OnEraseControlPoints(*args, **kwargs):
         return _ogl.PyShape_base_OnDrawControlPoints(*args, **kwargs)
 
     def base_OnEraseControlPoints(*args, **kwargs):

-        """base_OnEraseControlPoints(wxDC dc)"""
+        """base_OnEraseControlPoints(DC dc)"""

         return _ogl.PyShape_base_OnEraseControlPoints(*args, **kwargs)
 
     def base_OnMoveLink(*args, **kwargs):
         return _ogl.PyShape_base_OnEraseControlPoints(*args, **kwargs)
 
     def base_OnMoveLink(*args, **kwargs):

-        """base_OnMoveLink(wxDC dc, bool moveControlPoints=True)"""
+        """base_OnMoveLink(DC dc, bool moveControlPoints=True)"""

         return _ogl.PyShape_base_OnMoveLink(*args, **kwargs)
 
     def base_OnSizingDragLeft(*args, **kwargs):
         return _ogl.PyShape_base_OnMoveLink(*args, **kwargs)
 
     def base_OnSizingDragLeft(*args, **kwargs):


@@ -1053,7 +1053,7 @@ class PseudoMetaFile(core.Object):
         except: pass
 
     def Draw(*args, **kwargs):
         except: pass
 
     def Draw(*args, **kwargs):

-        """Draw(wxDC dc, double xoffset, double yoffset)"""
+        """Draw(DC dc, double xoffset, double yoffset)"""

         return _ogl.PseudoMetaFile_Draw(*args, **kwargs)
 
     def Clear(*args, **kwargs):
         return _ogl.PseudoMetaFile_Draw(*args, **kwargs)
 
     def Clear(*args, **kwargs):


@@ -1081,7 +1081,7 @@ class PseudoMetaFile(core.Object):
         return _ogl.PseudoMetaFile_Rotate(*args, **kwargs)
 
     def LoadFromMetaFile(*args, **kwargs):
         return _ogl.PseudoMetaFile_Rotate(*args, **kwargs)
 
     def LoadFromMetaFile(*args, **kwargs):

-        """LoadFromMetaFile(wxString filename, double width, double height) -> bool"""
+        """LoadFromMetaFile(String filename, double width, double height) -> bool"""

         return _ogl.PseudoMetaFile_LoadFromMetaFile(*args, **kwargs)
 
     def GetBounds(*args, **kwargs):
         return _ogl.PseudoMetaFile_LoadFromMetaFile(*args, **kwargs)
 
     def GetBounds(*args, **kwargs):


@@ -1161,7 +1161,7 @@ class PseudoMetaFile(core.Object):
         return _ogl.PseudoMetaFile_DrawPoint(*args, **kwargs)
 
     def DrawText(*args, **kwargs):
         return _ogl.PseudoMetaFile_DrawPoint(*args, **kwargs)
 
     def DrawText(*args, **kwargs):

-        """DrawText(wxString text, Point pt)"""
+        """DrawText(String text, Point pt)"""

         return _ogl.PseudoMetaFile_DrawText(*args, **kwargs)
 
     def DrawLines(*args, **kwargs):
         return _ogl.PseudoMetaFile_DrawText(*args, **kwargs)
 
     def DrawLines(*args, **kwargs):


@@ -1193,15 +1193,15 @@ class PseudoMetaFile(core.Object):
         return _ogl.PseudoMetaFile_SetBrush(*args, **kwargs)
 
     def SetFont(*args, **kwargs):
         return _ogl.PseudoMetaFile_SetBrush(*args, **kwargs)
 
     def SetFont(*args, **kwargs):

-        """SetFont(wxFont font)"""
+        """SetFont(Font font)"""

         return _ogl.PseudoMetaFile_SetFont(*args, **kwargs)
 
     def SetTextColour(*args, **kwargs):
         return _ogl.PseudoMetaFile_SetFont(*args, **kwargs)
 
     def SetTextColour(*args, **kwargs):

-        """SetTextColour(wxColour colour)"""
+        """SetTextColour(Colour colour)"""

         return _ogl.PseudoMetaFile_SetTextColour(*args, **kwargs)
 
     def SetBackgroundColour(*args, **kwargs):
         return _ogl.PseudoMetaFile_SetTextColour(*args, **kwargs)
 
     def SetBackgroundColour(*args, **kwargs):

-        """SetBackgroundColour(wxColour colour)"""
+        """SetBackgroundColour(Colour colour)"""

         return _ogl.PseudoMetaFile_SetBackgroundColour(*args, **kwargs)
 
     def SetBackgroundMode(*args, **kwargs):
         return _ogl.PseudoMetaFile_SetBackgroundColour(*args, **kwargs)
 
     def SetBackgroundMode(*args, **kwargs):


@@ -1240,31 +1240,31 @@ class PyRectangleShape(PyShape):
         return _ogl.PyRectangleShape_base_OnDelete(*args, **kwargs)
 
     def base_OnDraw(*args, **kwargs):
         return _ogl.PyRectangleShape_base_OnDelete(*args, **kwargs)
 
     def base_OnDraw(*args, **kwargs):

-        """base_OnDraw(wxDC dc)"""
+        """base_OnDraw(DC dc)"""

         return _ogl.PyRectangleShape_base_OnDraw(*args, **kwargs)
 
     def base_OnDrawContents(*args, **kwargs):
         return _ogl.PyRectangleShape_base_OnDraw(*args, **kwargs)
 
     def base_OnDrawContents(*args, **kwargs):

-        """base_OnDrawContents(wxDC dc)"""
+        """base_OnDrawContents(DC dc)"""

         return _ogl.PyRectangleShape_base_OnDrawContents(*args, **kwargs)
 
     def base_OnDrawBranches(*args, **kwargs):
         return _ogl.PyRectangleShape_base_OnDrawContents(*args, **kwargs)
 
     def base_OnDrawBranches(*args, **kwargs):

-        """base_OnDrawBranches(wxDC dc, bool erase=FALSE)"""
+        """base_OnDrawBranches(DC dc, bool erase=FALSE)"""

         return _ogl.PyRectangleShape_base_OnDrawBranches(*args, **kwargs)
 
     def base_OnMoveLinks(*args, **kwargs):
         return _ogl.PyRectangleShape_base_OnDrawBranches(*args, **kwargs)
 
     def base_OnMoveLinks(*args, **kwargs):

-        """base_OnMoveLinks(wxDC dc)"""
+        """base_OnMoveLinks(DC dc)"""

         return _ogl.PyRectangleShape_base_OnMoveLinks(*args, **kwargs)
 
     def base_OnErase(*args, **kwargs):
         return _ogl.PyRectangleShape_base_OnMoveLinks(*args, **kwargs)
 
     def base_OnErase(*args, **kwargs):

-        """base_OnErase(wxDC dc)"""
+        """base_OnErase(DC dc)"""

         return _ogl.PyRectangleShape_base_OnErase(*args, **kwargs)
 
     def base_OnEraseContents(*args, **kwargs):
         return _ogl.PyRectangleShape_base_OnErase(*args, **kwargs)
 
     def base_OnEraseContents(*args, **kwargs):

-        """base_OnEraseContents(wxDC dc)"""
+        """base_OnEraseContents(DC dc)"""

         return _ogl.PyRectangleShape_base_OnEraseContents(*args, **kwargs)
 
     def base_OnHighlight(*args, **kwargs):
         return _ogl.PyRectangleShape_base_OnEraseContents(*args, **kwargs)
 
     def base_OnHighlight(*args, **kwargs):

-        """base_OnHighlight(wxDC dc)"""
+        """base_OnHighlight(DC dc)"""

         return _ogl.PyRectangleShape_base_OnHighlight(*args, **kwargs)
 
     def base_OnLeftClick(*args, **kwargs):
         return _ogl.PyRectangleShape_base_OnHighlight(*args, **kwargs)
 
     def base_OnLeftClick(*args, **kwargs):


@@ -1285,14 +1285,14 @@ class PyRectangleShape(PyShape):
 
     def base_OnMovePre(*args, **kwargs):
         """
 
     def base_OnMovePre(*args, **kwargs):
         """

-        base_OnMovePre(wxDC dc, double x, double y, double old_x, double old_y, 
+        base_OnMovePre(DC dc, double x, double y, double old_x, double old_y, 

             bool display=True) -> bool
         """
         return _ogl.PyRectangleShape_base_OnMovePre(*args, **kwargs)
 
     def base_OnMovePost(*args, **kwargs):
         """
             bool display=True) -> bool
         """
         return _ogl.PyRectangleShape_base_OnMovePre(*args, **kwargs)
 
     def base_OnMovePost(*args, **kwargs):
         """

-        base_OnMovePost(wxDC dc, double x, double y, double old_x, double old_y, 
+        base_OnMovePost(DC dc, double x, double y, double old_x, double old_y, 

             bool display=True)
         """
         return _ogl.PyRectangleShape_base_OnMovePost(*args, **kwargs)
             bool display=True)
         """
         return _ogl.PyRectangleShape_base_OnMovePost(*args, **kwargs)


@@ -1322,19 +1322,19 @@ class PyRectangleShape(PyShape):
         return _ogl.PyRectangleShape_base_OnEndDragRight(*args, **kwargs)
 
     def base_OnDrawOutline(*args, **kwargs):
         return _ogl.PyRectangleShape_base_OnEndDragRight(*args, **kwargs)
 
     def base_OnDrawOutline(*args, **kwargs):

-        """base_OnDrawOutline(wxDC dc, double x, double y, double w, double h)"""
+        """base_OnDrawOutline(DC dc, double x, double y, double w, double h)"""

         return _ogl.PyRectangleShape_base_OnDrawOutline(*args, **kwargs)
 
     def base_OnDrawControlPoints(*args, **kwargs):
         return _ogl.PyRectangleShape_base_OnDrawOutline(*args, **kwargs)
 
     def base_OnDrawControlPoints(*args, **kwargs):

-        """base_OnDrawControlPoints(wxDC dc)"""
+        """base_OnDrawControlPoints(DC dc)"""

         return _ogl.PyRectangleShape_base_OnDrawControlPoints(*args, **kwargs)
 
     def base_OnEraseControlPoints(*args, **kwargs):
         return _ogl.PyRectangleShape_base_OnDrawControlPoints(*args, **kwargs)
 
     def base_OnEraseControlPoints(*args, **kwargs):

-        """base_OnEraseControlPoints(wxDC dc)"""
+        """base_OnEraseControlPoints(DC dc)"""

         return _ogl.PyRectangleShape_base_OnEraseControlPoints(*args, **kwargs)
 
     def base_OnMoveLink(*args, **kwargs):
         return _ogl.PyRectangleShape_base_OnEraseControlPoints(*args, **kwargs)
 
     def base_OnMoveLink(*args, **kwargs):

-        """base_OnMoveLink(wxDC dc, bool moveControlPoints=True)"""
+        """base_OnMoveLink(DC dc, bool moveControlPoints=True)"""

         return _ogl.PyRectangleShape_base_OnMoveLink(*args, **kwargs)
 
     def base_OnSizingDragLeft(*args, **kwargs):
         return _ogl.PyRectangleShape_base_OnMoveLink(*args, **kwargs)
 
     def base_OnSizingDragLeft(*args, **kwargs):


@@ -1402,31 +1402,31 @@ class PyControlPoint(PyRectangleShape):
         return _ogl.PyControlPoint_base_OnDelete(*args, **kwargs)
 
     def base_OnDraw(*args, **kwargs):
         return _ogl.PyControlPoint_base_OnDelete(*args, **kwargs)
 
     def base_OnDraw(*args, **kwargs):

-        """base_OnDraw(wxDC dc)"""
+        """base_OnDraw(DC dc)"""

         return _ogl.PyControlPoint_base_OnDraw(*args, **kwargs)
 
     def base_OnDrawContents(*args, **kwargs):
         return _ogl.PyControlPoint_base_OnDraw(*args, **kwargs)
 
     def base_OnDrawContents(*args, **kwargs):

-        """base_OnDrawContents(wxDC dc)"""
+        """base_OnDrawContents(DC dc)"""

         return _ogl.PyControlPoint_base_OnDrawContents(*args, **kwargs)
 
     def base_OnDrawBranches(*args, **kwargs):
         return _ogl.PyControlPoint_base_OnDrawContents(*args, **kwargs)
 
     def base_OnDrawBranches(*args, **kwargs):

-        """base_OnDrawBranches(wxDC dc, bool erase=FALSE)"""
+        """base_OnDrawBranches(DC dc, bool erase=FALSE)"""

         return _ogl.PyControlPoint_base_OnDrawBranches(*args, **kwargs)
 
     def base_OnMoveLinks(*args, **kwargs):
         return _ogl.PyControlPoint_base_OnDrawBranches(*args, **kwargs)
 
     def base_OnMoveLinks(*args, **kwargs):

-        """base_OnMoveLinks(wxDC dc)"""
+        """base_OnMoveLinks(DC dc)"""

         return _ogl.PyControlPoint_base_OnMoveLinks(*args, **kwargs)
 
     def base_OnErase(*args, **kwargs):
         return _ogl.PyControlPoint_base_OnMoveLinks(*args, **kwargs)
 
     def base_OnErase(*args, **kwargs):

-        """base_OnErase(wxDC dc)"""
+        """base_OnErase(DC dc)"""

         return _ogl.PyControlPoint_base_OnErase(*args, **kwargs)
 
     def base_OnEraseContents(*args, **kwargs):
         return _ogl.PyControlPoint_base_OnErase(*args, **kwargs)
 
     def base_OnEraseContents(*args, **kwargs):

-        """base_OnEraseContents(wxDC dc)"""
+        """base_OnEraseContents(DC dc)"""

         return _ogl.PyControlPoint_base_OnEraseContents(*args, **kwargs)
 
     def base_OnHighlight(*args, **kwargs):
         return _ogl.PyControlPoint_base_OnEraseContents(*args, **kwargs)
 
     def base_OnHighlight(*args, **kwargs):

-        """base_OnHighlight(wxDC dc)"""
+        """base_OnHighlight(DC dc)"""

         return _ogl.PyControlPoint_base_OnHighlight(*args, **kwargs)
 
     def base_OnLeftClick(*args, **kwargs):
         return _ogl.PyControlPoint_base_OnHighlight(*args, **kwargs)
 
     def base_OnLeftClick(*args, **kwargs):


@@ -1447,14 +1447,14 @@ class PyControlPoint(PyRectangleShape):
 
     def base_OnMovePre(*args, **kwargs):
         """
 
     def base_OnMovePre(*args, **kwargs):
         """

-        base_OnMovePre(wxDC dc, double x, double y, double old_x, double old_y, 
+        base_OnMovePre(DC dc, double x, double y, double old_x, double old_y, 

             bool display=True) -> bool
         """
         return _ogl.PyControlPoint_base_OnMovePre(*args, **kwargs)
 
     def base_OnMovePost(*args, **kwargs):
         """
             bool display=True) -> bool
         """
         return _ogl.PyControlPoint_base_OnMovePre(*args, **kwargs)
 
     def base_OnMovePost(*args, **kwargs):
         """

-        base_OnMovePost(wxDC dc, double x, double y, double old_x, double old_y, 
+        base_OnMovePost(DC dc, double x, double y, double old_x, double old_y, 

             bool display=True)
         """
         return _ogl.PyControlPoint_base_OnMovePost(*args, **kwargs)
             bool display=True)
         """
         return _ogl.PyControlPoint_base_OnMovePost(*args, **kwargs)


@@ -1484,19 +1484,19 @@ class PyControlPoint(PyRectangleShape):
         return _ogl.PyControlPoint_base_OnEndDragRight(*args, **kwargs)
 
     def base_OnDrawOutline(*args, **kwargs):
         return _ogl.PyControlPoint_base_OnEndDragRight(*args, **kwargs)
 
     def base_OnDrawOutline(*args, **kwargs):

-        """base_OnDrawOutline(wxDC dc, double x, double y, double w, double h)"""
+        """base_OnDrawOutline(DC dc, double x, double y, double w, double h)"""

         return _ogl.PyControlPoint_base_OnDrawOutline(*args, **kwargs)
 
     def base_OnDrawControlPoints(*args, **kwargs):
         return _ogl.PyControlPoint_base_OnDrawOutline(*args, **kwargs)
 
     def base_OnDrawControlPoints(*args, **kwargs):

-        """base_OnDrawControlPoints(wxDC dc)"""
+        """base_OnDrawControlPoints(DC dc)"""

         return _ogl.PyControlPoint_base_OnDrawControlPoints(*args, **kwargs)
 
     def base_OnEraseControlPoints(*args, **kwargs):
         return _ogl.PyControlPoint_base_OnDrawControlPoints(*args, **kwargs)
 
     def base_OnEraseControlPoints(*args, **kwargs):

-        """base_OnEraseControlPoints(wxDC dc)"""
+        """base_OnEraseControlPoints(DC dc)"""

         return _ogl.PyControlPoint_base_OnEraseControlPoints(*args, **kwargs)
 
     def base_OnMoveLink(*args, **kwargs):
         return _ogl.PyControlPoint_base_OnEraseControlPoints(*args, **kwargs)
 
     def base_OnMoveLink(*args, **kwargs):

-        """base_OnMoveLink(wxDC dc, bool moveControlPoints=True)"""
+        """base_OnMoveLink(DC dc, bool moveControlPoints=True)"""

         return _ogl.PyControlPoint_base_OnMoveLink(*args, **kwargs)
 
     def base_OnSizingDragLeft(*args, **kwargs):
         return _ogl.PyControlPoint_base_OnMoveLink(*args, **kwargs)
 
     def base_OnSizingDragLeft(*args, **kwargs):


@@ -1552,19 +1552,19 @@ class PyBitmapShape(PyRectangleShape):
         return _ogl.PyBitmapShape__setCallbackInfo(*args, **kwargs)
 
     def GetBitmap(*args, **kwargs):
         return _ogl.PyBitmapShape__setCallbackInfo(*args, **kwargs)
 
     def GetBitmap(*args, **kwargs):

-        """GetBitmap() -> wxBitmap"""
+        """GetBitmap() -> Bitmap"""

         return _ogl.PyBitmapShape_GetBitmap(*args, **kwargs)
 
     def GetFilename(*args, **kwargs):
         return _ogl.PyBitmapShape_GetBitmap(*args, **kwargs)
 
     def GetFilename(*args, **kwargs):

-        """GetFilename() -> wxString"""
+        """GetFilename() -> String"""

         return _ogl.PyBitmapShape_GetFilename(*args, **kwargs)
 
     def SetBitmap(*args, **kwargs):
         return _ogl.PyBitmapShape_GetFilename(*args, **kwargs)
 
     def SetBitmap(*args, **kwargs):

-        """SetBitmap(wxBitmap bitmap)"""
+        """SetBitmap(Bitmap bitmap)"""

         return _ogl.PyBitmapShape_SetBitmap(*args, **kwargs)
 
     def SetFilename(*args, **kwargs):
         return _ogl.PyBitmapShape_SetBitmap(*args, **kwargs)
 
     def SetFilename(*args, **kwargs):

-        """SetFilename(wxString filename)"""
+        """SetFilename(String filename)"""

         return _ogl.PyBitmapShape_SetFilename(*args, **kwargs)
 
     def base_OnDelete(*args, **kwargs):
         return _ogl.PyBitmapShape_SetFilename(*args, **kwargs)
 
     def base_OnDelete(*args, **kwargs):


@@ -1572,31 +1572,31 @@ class PyBitmapShape(PyRectangleShape):
         return _ogl.PyBitmapShape_base_OnDelete(*args, **kwargs)
 
     def base_OnDraw(*args, **kwargs):
         return _ogl.PyBitmapShape_base_OnDelete(*args, **kwargs)
 
     def base_OnDraw(*args, **kwargs):

-        """base_OnDraw(wxDC dc)"""
+        """base_OnDraw(DC dc)"""

         return _ogl.PyBitmapShape_base_OnDraw(*args, **kwargs)
 
     def base_OnDrawContents(*args, **kwargs):
         return _ogl.PyBitmapShape_base_OnDraw(*args, **kwargs)
 
     def base_OnDrawContents(*args, **kwargs):

-        """base_OnDrawContents(wxDC dc)"""
+        """base_OnDrawContents(DC dc)"""

         return _ogl.PyBitmapShape_base_OnDrawContents(*args, **kwargs)
 
     def base_OnDrawBranches(*args, **kwargs):
         return _ogl.PyBitmapShape_base_OnDrawContents(*args, **kwargs)
 
     def base_OnDrawBranches(*args, **kwargs):

-        """base_OnDrawBranches(wxDC dc, bool erase=FALSE)"""
+        """base_OnDrawBranches(DC dc, bool erase=FALSE)"""

         return _ogl.PyBitmapShape_base_OnDrawBranches(*args, **kwargs)
 
     def base_OnMoveLinks(*args, **kwargs):
         return _ogl.PyBitmapShape_base_OnDrawBranches(*args, **kwargs)
 
     def base_OnMoveLinks(*args, **kwargs):

-        """base_OnMoveLinks(wxDC dc)"""
+        """base_OnMoveLinks(DC dc)"""

         return _ogl.PyBitmapShape_base_OnMoveLinks(*args, **kwargs)
 
     def base_OnErase(*args, **kwargs):
         return _ogl.PyBitmapShape_base_OnMoveLinks(*args, **kwargs)
 
     def base_OnErase(*args, **kwargs):

-        """base_OnErase(wxDC dc)"""
+        """base_OnErase(DC dc)"""

         return _ogl.PyBitmapShape_base_OnErase(*args, **kwargs)
 
     def base_OnEraseContents(*args, **kwargs):
         return _ogl.PyBitmapShape_base_OnErase(*args, **kwargs)
 
     def base_OnEraseContents(*args, **kwargs):

-        """base_OnEraseContents(wxDC dc)"""
+        """base_OnEraseContents(DC dc)"""

         return _ogl.PyBitmapShape_base_OnEraseContents(*args, **kwargs)
 
     def base_OnHighlight(*args, **kwargs):
         return _ogl.PyBitmapShape_base_OnEraseContents(*args, **kwargs)
 
     def base_OnHighlight(*args, **kwargs):

-        """base_OnHighlight(wxDC dc)"""
+        """base_OnHighlight(DC dc)"""

         return _ogl.PyBitmapShape_base_OnHighlight(*args, **kwargs)
 
     def base_OnLeftClick(*args, **kwargs):
         return _ogl.PyBitmapShape_base_OnHighlight(*args, **kwargs)
 
     def base_OnLeftClick(*args, **kwargs):


@@ -1617,14 +1617,14 @@ class PyBitmapShape(PyRectangleShape):
 
     def base_OnMovePre(*args, **kwargs):
         """
 
     def base_OnMovePre(*args, **kwargs):
         """

-        base_OnMovePre(wxDC dc, double x, double y, double old_x, double old_y, 
+        base_OnMovePre(DC dc, double x, double y, double old_x, double old_y, 

             bool display=True) -> bool
         """
         return _ogl.PyBitmapShape_base_OnMovePre(*args, **kwargs)
 
     def base_OnMovePost(*args, **kwargs):
         """
             bool display=True) -> bool
         """
         return _ogl.PyBitmapShape_base_OnMovePre(*args, **kwargs)
 
     def base_OnMovePost(*args, **kwargs):
         """

-        base_OnMovePost(wxDC dc, double x, double y, double old_x, double old_y, 
+        base_OnMovePost(DC dc, double x, double y, double old_x, double old_y, 

             bool display=True)
         """
         return _ogl.PyBitmapShape_base_OnMovePost(*args, **kwargs)
             bool display=True)
         """
         return _ogl.PyBitmapShape_base_OnMovePost(*args, **kwargs)


@@ -1654,19 +1654,19 @@ class PyBitmapShape(PyRectangleShape):
         return _ogl.PyBitmapShape_base_OnEndDragRight(*args, **kwargs)
 
     def base_OnDrawOutline(*args, **kwargs):
         return _ogl.PyBitmapShape_base_OnEndDragRight(*args, **kwargs)
 
     def base_OnDrawOutline(*args, **kwargs):

-        """base_OnDrawOutline(wxDC dc, double x, double y, double w, double h)"""
+        """base_OnDrawOutline(DC dc, double x, double y, double w, double h)"""

         return _ogl.PyBitmapShape_base_OnDrawOutline(*args, **kwargs)
 
     def base_OnDrawControlPoints(*args, **kwargs):
         return _ogl.PyBitmapShape_base_OnDrawOutline(*args, **kwargs)
 
     def base_OnDrawControlPoints(*args, **kwargs):

-        """base_OnDrawControlPoints(wxDC dc)"""
+        """base_OnDrawControlPoints(DC dc)"""

         return _ogl.PyBitmapShape_base_OnDrawControlPoints(*args, **kwargs)
 
     def base_OnEraseControlPoints(*args, **kwargs):
         return _ogl.PyBitmapShape_base_OnDrawControlPoints(*args, **kwargs)
 
     def base_OnEraseControlPoints(*args, **kwargs):

-        """base_OnEraseControlPoints(wxDC dc)"""
+        """base_OnEraseControlPoints(DC dc)"""

         return _ogl.PyBitmapShape_base_OnEraseControlPoints(*args, **kwargs)
 
     def base_OnMoveLink(*args, **kwargs):
         return _ogl.PyBitmapShape_base_OnEraseControlPoints(*args, **kwargs)
 
     def base_OnMoveLink(*args, **kwargs):

-        """base_OnMoveLink(wxDC dc, bool moveControlPoints=True)"""
+        """base_OnMoveLink(DC dc, bool moveControlPoints=True)"""

         return _ogl.PyBitmapShape_base_OnMoveLink(*args, **kwargs)
 
     def base_OnSizingDragLeft(*args, **kwargs):
         return _ogl.PyBitmapShape_base_OnMoveLink(*args, **kwargs)
 
     def base_OnSizingDragLeft(*args, **kwargs):


@@ -1770,7 +1770,7 @@ class PyDrawnShape(PyRectangleShape):
         return _ogl.PyDrawnShape_DrawSpline(*args, **kwargs)
 
     def DrawText(*args, **kwargs):
         return _ogl.PyDrawnShape_DrawSpline(*args, **kwargs)
 
     def DrawText(*args, **kwargs):

-        """DrawText(wxString text, Point point)"""
+        """DrawText(String text, Point point)"""

         return _ogl.PyDrawnShape_DrawText(*args, **kwargs)
 
     def GetAngle(*args, **kwargs):
         return _ogl.PyDrawnShape_DrawText(*args, **kwargs)
 
     def GetAngle(*args, **kwargs):


@@ -1786,7 +1786,7 @@ class PyDrawnShape(PyRectangleShape):
         return _ogl.PyDrawnShape_GetRotation(*args, **kwargs)
 
     def LoadFromMetaFile(*args, **kwargs):
         return _ogl.PyDrawnShape_GetRotation(*args, **kwargs)
 
     def LoadFromMetaFile(*args, **kwargs):

-        """LoadFromMetaFile(wxString filename) -> bool"""
+        """LoadFromMetaFile(String filename) -> bool"""

         return _ogl.PyDrawnShape_LoadFromMetaFile(*args, **kwargs)
 
     def Rotate(*args, **kwargs):
         return _ogl.PyDrawnShape_LoadFromMetaFile(*args, **kwargs)
 
     def Rotate(*args, **kwargs):


@@ -1798,7 +1798,7 @@ class PyDrawnShape(PyRectangleShape):
         return _ogl.PyDrawnShape_SetClippingRect(*args, **kwargs)
 
     def SetDrawnBackgroundColour(*args, **kwargs):
         return _ogl.PyDrawnShape_SetClippingRect(*args, **kwargs)
 
     def SetDrawnBackgroundColour(*args, **kwargs):

-        """SetDrawnBackgroundColour(wxColour colour)"""
+        """SetDrawnBackgroundColour(Colour colour)"""

         return _ogl.PyDrawnShape_SetDrawnBackgroundColour(*args, **kwargs)
 
     def SetDrawnBackgroundMode(*args, **kwargs):
         return _ogl.PyDrawnShape_SetDrawnBackgroundColour(*args, **kwargs)
 
     def SetDrawnBackgroundMode(*args, **kwargs):


@@ -1810,7 +1810,7 @@ class PyDrawnShape(PyRectangleShape):
         return _ogl.PyDrawnShape_SetDrawnBrush(*args, **kwargs)
 
     def SetDrawnFont(*args, **kwargs):
         return _ogl.PyDrawnShape_SetDrawnBrush(*args, **kwargs)
 
     def SetDrawnFont(*args, **kwargs):

-        """SetDrawnFont(wxFont font)"""
+        """SetDrawnFont(Font font)"""

         return _ogl.PyDrawnShape_SetDrawnFont(*args, **kwargs)
 
     def SetDrawnPen(*args, **kwargs):
         return _ogl.PyDrawnShape_SetDrawnFont(*args, **kwargs)
 
     def SetDrawnPen(*args, **kwargs):


@@ -1818,7 +1818,7 @@ class PyDrawnShape(PyRectangleShape):
         return _ogl.PyDrawnShape_SetDrawnPen(*args, **kwargs)
 
     def SetDrawnTextColour(*args, **kwargs):
         return _ogl.PyDrawnShape_SetDrawnPen(*args, **kwargs)
 
     def SetDrawnTextColour(*args, **kwargs):

-        """SetDrawnTextColour(wxColour colour)"""
+        """SetDrawnTextColour(Colour colour)"""

         return _ogl.PyDrawnShape_SetDrawnTextColour(*args, **kwargs)
 
     def Scale(*args, **kwargs):
         return _ogl.PyDrawnShape_SetDrawnTextColour(*args, **kwargs)
 
     def Scale(*args, **kwargs):


@@ -1838,31 +1838,31 @@ class PyDrawnShape(PyRectangleShape):
         return _ogl.PyDrawnShape_base_OnDelete(*args, **kwargs)
 
     def base_OnDraw(*args, **kwargs):
         return _ogl.PyDrawnShape_base_OnDelete(*args, **kwargs)
 
     def base_OnDraw(*args, **kwargs):

-        """base_OnDraw(wxDC dc)"""
+        """base_OnDraw(DC dc)"""

         return _ogl.PyDrawnShape_base_OnDraw(*args, **kwargs)
 
     def base_OnDrawContents(*args, **kwargs):
         return _ogl.PyDrawnShape_base_OnDraw(*args, **kwargs)
 
     def base_OnDrawContents(*args, **kwargs):

-        """base_OnDrawContents(wxDC dc)"""
+        """base_OnDrawContents(DC dc)"""

         return _ogl.PyDrawnShape_base_OnDrawContents(*args, **kwargs)
 
     def base_OnDrawBranches(*args, **kwargs):
         return _ogl.PyDrawnShape_base_OnDrawContents(*args, **kwargs)
 
     def base_OnDrawBranches(*args, **kwargs):

-        """base_OnDrawBranches(wxDC dc, bool erase=FALSE)"""
+        """base_OnDrawBranches(DC dc, bool erase=FALSE)"""

         return _ogl.PyDrawnShape_base_OnDrawBranches(*args, **kwargs)
 
     def base_OnMoveLinks(*args, **kwargs):
         return _ogl.PyDrawnShape_base_OnDrawBranches(*args, **kwargs)
 
     def base_OnMoveLinks(*args, **kwargs):

-        """base_OnMoveLinks(wxDC dc)"""
+        """base_OnMoveLinks(DC dc)"""

         return _ogl.PyDrawnShape_base_OnMoveLinks(*args, **kwargs)
 
     def base_OnErase(*args, **kwargs):
         return _ogl.PyDrawnShape_base_OnMoveLinks(*args, **kwargs)
 
     def base_OnErase(*args, **kwargs):

-        """base_OnErase(wxDC dc)"""
+        """base_OnErase(DC dc)"""

         return _ogl.PyDrawnShape_base_OnErase(*args, **kwargs)
 
     def base_OnEraseContents(*args, **kwargs):
         return _ogl.PyDrawnShape_base_OnErase(*args, **kwargs)
 
     def base_OnEraseContents(*args, **kwargs):

-        """base_OnEraseContents(wxDC dc)"""
+        """base_OnEraseContents(DC dc)"""

         return _ogl.PyDrawnShape_base_OnEraseContents(*args, **kwargs)
 
     def base_OnHighlight(*args, **kwargs):
         return _ogl.PyDrawnShape_base_OnEraseContents(*args, **kwargs)
 
     def base_OnHighlight(*args, **kwargs):

-        """base_OnHighlight(wxDC dc)"""
+        """base_OnHighlight(DC dc)"""

         return _ogl.PyDrawnShape_base_OnHighlight(*args, **kwargs)
 
     def base_OnLeftClick(*args, **kwargs):
         return _ogl.PyDrawnShape_base_OnHighlight(*args, **kwargs)
 
     def base_OnLeftClick(*args, **kwargs):


@@ -1883,14 +1883,14 @@ class PyDrawnShape(PyRectangleShape):
 
     def base_OnMovePre(*args, **kwargs):
         """
 
     def base_OnMovePre(*args, **kwargs):
         """

-        base_OnMovePre(wxDC dc, double x, double y, double old_x, double old_y, 
+        base_OnMovePre(DC dc, double x, double y, double old_x, double old_y, 

             bool display=True) -> bool
         """
         return _ogl.PyDrawnShape_base_OnMovePre(*args, **kwargs)
 
     def base_OnMovePost(*args, **kwargs):
         """
             bool display=True) -> bool
         """
         return _ogl.PyDrawnShape_base_OnMovePre(*args, **kwargs)
 
     def base_OnMovePost(*args, **kwargs):
         """

-        base_OnMovePost(wxDC dc, double x, double y, double old_x, double old_y, 
+        base_OnMovePost(DC dc, double x, double y, double old_x, double old_y, 

             bool display=True)
         """
         return _ogl.PyDrawnShape_base_OnMovePost(*args, **kwargs)
             bool display=True)
         """
         return _ogl.PyDrawnShape_base_OnMovePost(*args, **kwargs)


@@ -1920,19 +1920,19 @@ class PyDrawnShape(PyRectangleShape):
         return _ogl.PyDrawnShape_base_OnEndDragRight(*args, **kwargs)
 
     def base_OnDrawOutline(*args, **kwargs):
         return _ogl.PyDrawnShape_base_OnEndDragRight(*args, **kwargs)
 
     def base_OnDrawOutline(*args, **kwargs):

-        """base_OnDrawOutline(wxDC dc, double x, double y, double w, double h)"""
+        """base_OnDrawOutline(DC dc, double x, double y, double w, double h)"""

         return _ogl.PyDrawnShape_base_OnDrawOutline(*args, **kwargs)
 
     def base_OnDrawControlPoints(*args, **kwargs):
         return _ogl.PyDrawnShape_base_OnDrawOutline(*args, **kwargs)
 
     def base_OnDrawControlPoints(*args, **kwargs):

-        """base_OnDrawControlPoints(wxDC dc)"""
+        """base_OnDrawControlPoints(DC dc)"""

         return _ogl.PyDrawnShape_base_OnDrawControlPoints(*args, **kwargs)
 
     def base_OnEraseControlPoints(*args, **kwargs):
         return _ogl.PyDrawnShape_base_OnDrawControlPoints(*args, **kwargs)
 
     def base_OnEraseControlPoints(*args, **kwargs):

-        """base_OnEraseControlPoints(wxDC dc)"""
+        """base_OnEraseControlPoints(DC dc)"""

         return _ogl.PyDrawnShape_base_OnEraseControlPoints(*args, **kwargs)
 
     def base_OnMoveLink(*args, **kwargs):
         return _ogl.PyDrawnShape_base_OnEraseControlPoints(*args, **kwargs)
 
     def base_OnMoveLink(*args, **kwargs):

-        """base_OnMoveLink(wxDC dc, bool moveControlPoints=True)"""
+        """base_OnMoveLink(DC dc, bool moveControlPoints=True)"""

         return _ogl.PyDrawnShape_base_OnMoveLink(*args, **kwargs)
 
     def base_OnSizingDragLeft(*args, **kwargs):
         return _ogl.PyDrawnShape_base_OnMoveLink(*args, **kwargs)
 
     def base_OnSizingDragLeft(*args, **kwargs):


@@ -2077,31 +2077,31 @@ class PyCompositeShape(PyRectangleShape):
         return _ogl.PyCompositeShape_base_OnDelete(*args, **kwargs)
 
     def base_OnDraw(*args, **kwargs):
         return _ogl.PyCompositeShape_base_OnDelete(*args, **kwargs)
 
     def base_OnDraw(*args, **kwargs):

-        """base_OnDraw(wxDC dc)"""
+        """base_OnDraw(DC dc)"""

         return _ogl.PyCompositeShape_base_OnDraw(*args, **kwargs)
 
     def base_OnDrawContents(*args, **kwargs):
         return _ogl.PyCompositeShape_base_OnDraw(*args, **kwargs)
 
     def base_OnDrawContents(*args, **kwargs):

-        """base_OnDrawContents(wxDC dc)"""
+        """base_OnDrawContents(DC dc)"""

         return _ogl.PyCompositeShape_base_OnDrawContents(*args, **kwargs)
 
     def base_OnDrawBranches(*args, **kwargs):
         return _ogl.PyCompositeShape_base_OnDrawContents(*args, **kwargs)
 
     def base_OnDrawBranches(*args, **kwargs):

-        """base_OnDrawBranches(wxDC dc, bool erase=FALSE)"""
+        """base_OnDrawBranches(DC dc, bool erase=FALSE)"""

         return _ogl.PyCompositeShape_base_OnDrawBranches(*args, **kwargs)
 
     def base_OnMoveLinks(*args, **kwargs):
         return _ogl.PyCompositeShape_base_OnDrawBranches(*args, **kwargs)
 
     def base_OnMoveLinks(*args, **kwargs):

-        """base_OnMoveLinks(wxDC dc)"""
+        """base_OnMoveLinks(DC dc)"""

         return _ogl.PyCompositeShape_base_OnMoveLinks(*args, **kwargs)
 
     def base_OnErase(*args, **kwargs):
         return _ogl.PyCompositeShape_base_OnMoveLinks(*args, **kwargs)
 
     def base_OnErase(*args, **kwargs):

-        """base_OnErase(wxDC dc)"""
+        """base_OnErase(DC dc)"""

         return _ogl.PyCompositeShape_base_OnErase(*args, **kwargs)
 
     def base_OnEraseContents(*args, **kwargs):
         return _ogl.PyCompositeShape_base_OnErase(*args, **kwargs)
 
     def base_OnEraseContents(*args, **kwargs):

-        """base_OnEraseContents(wxDC dc)"""
+        """base_OnEraseContents(DC dc)"""

         return _ogl.PyCompositeShape_base_OnEraseContents(*args, **kwargs)
 
     def base_OnHighlight(*args, **kwargs):
         return _ogl.PyCompositeShape_base_OnEraseContents(*args, **kwargs)
 
     def base_OnHighlight(*args, **kwargs):

-        """base_OnHighlight(wxDC dc)"""
+        """base_OnHighlight(DC dc)"""

         return _ogl.PyCompositeShape_base_OnHighlight(*args, **kwargs)
 
     def base_OnLeftClick(*args, **kwargs):
         return _ogl.PyCompositeShape_base_OnHighlight(*args, **kwargs)
 
     def base_OnLeftClick(*args, **kwargs):


@@ -2122,14 +2122,14 @@ class PyCompositeShape(PyRectangleShape):
 
     def base_OnMovePre(*args, **kwargs):
         """
 
     def base_OnMovePre(*args, **kwargs):
         """

-        base_OnMovePre(wxDC dc, double x, double y, double old_x, double old_y, 
+        base_OnMovePre(DC dc, double x, double y, double old_x, double old_y, 

             bool display=True) -> bool
         """
         return _ogl.PyCompositeShape_base_OnMovePre(*args, **kwargs)
 
     def base_OnMovePost(*args, **kwargs):
         """
             bool display=True) -> bool
         """
         return _ogl.PyCompositeShape_base_OnMovePre(*args, **kwargs)
 
     def base_OnMovePost(*args, **kwargs):
         """

-        base_OnMovePost(wxDC dc, double x, double y, double old_x, double old_y, 
+        base_OnMovePost(DC dc, double x, double y, double old_x, double old_y, 

             bool display=True)
         """
         return _ogl.PyCompositeShape_base_OnMovePost(*args, **kwargs)
             bool display=True)
         """
         return _ogl.PyCompositeShape_base_OnMovePost(*args, **kwargs)


@@ -2159,19 +2159,19 @@ class PyCompositeShape(PyRectangleShape):
         return _ogl.PyCompositeShape_base_OnEndDragRight(*args, **kwargs)
 
     def base_OnDrawOutline(*args, **kwargs):
         return _ogl.PyCompositeShape_base_OnEndDragRight(*args, **kwargs)
 
     def base_OnDrawOutline(*args, **kwargs):

-        """base_OnDrawOutline(wxDC dc, double x, double y, double w, double h)"""
+        """base_OnDrawOutline(DC dc, double x, double y, double w, double h)"""

         return _ogl.PyCompositeShape_base_OnDrawOutline(*args, **kwargs)
 
     def base_OnDrawControlPoints(*args, **kwargs):
         return _ogl.PyCompositeShape_base_OnDrawOutline(*args, **kwargs)
 
     def base_OnDrawControlPoints(*args, **kwargs):

-        """base_OnDrawControlPoints(wxDC dc)"""
+        """base_OnDrawControlPoints(DC dc)"""

         return _ogl.PyCompositeShape_base_OnDrawControlPoints(*args, **kwargs)
 
     def base_OnEraseControlPoints(*args, **kwargs):
         return _ogl.PyCompositeShape_base_OnDrawControlPoints(*args, **kwargs)
 
     def base_OnEraseControlPoints(*args, **kwargs):

-        """base_OnEraseControlPoints(wxDC dc)"""
+        """base_OnEraseControlPoints(DC dc)"""

         return _ogl.PyCompositeShape_base_OnEraseControlPoints(*args, **kwargs)
 
     def base_OnMoveLink(*args, **kwargs):
         return _ogl.PyCompositeShape_base_OnEraseControlPoints(*args, **kwargs)
 
     def base_OnMoveLink(*args, **kwargs):

-        """base_OnMoveLink(wxDC dc, bool moveControlPoints=True)"""
+        """base_OnMoveLink(DC dc, bool moveControlPoints=True)"""

         return _ogl.PyCompositeShape_base_OnMoveLink(*args, **kwargs)
 
     def base_OnSizingDragLeft(*args, **kwargs):
         return _ogl.PyCompositeShape_base_OnMoveLink(*args, **kwargs)
 
     def base_OnSizingDragLeft(*args, **kwargs):


@@ -2239,31 +2239,31 @@ class PyDividedShape(PyRectangleShape):
         return _ogl.PyDividedShape_base_OnDelete(*args, **kwargs)
 
     def base_OnDraw(*args, **kwargs):
         return _ogl.PyDividedShape_base_OnDelete(*args, **kwargs)
 
     def base_OnDraw(*args, **kwargs):

-        """base_OnDraw(wxDC dc)"""
+        """base_OnDraw(DC dc)"""

         return _ogl.PyDividedShape_base_OnDraw(*args, **kwargs)
 
     def base_OnDrawContents(*args, **kwargs):
         return _ogl.PyDividedShape_base_OnDraw(*args, **kwargs)
 
     def base_OnDrawContents(*args, **kwargs):

-        """base_OnDrawContents(wxDC dc)"""
+        """base_OnDrawContents(DC dc)"""

         return _ogl.PyDividedShape_base_OnDrawContents(*args, **kwargs)
 
     def base_OnDrawBranches(*args, **kwargs):
         return _ogl.PyDividedShape_base_OnDrawContents(*args, **kwargs)
 
     def base_OnDrawBranches(*args, **kwargs):

-        """base_OnDrawBranches(wxDC dc, bool erase=FALSE)"""
+        """base_OnDrawBranches(DC dc, bool erase=FALSE)"""

         return _ogl.PyDividedShape_base_OnDrawBranches(*args, **kwargs)
 
     def base_OnMoveLinks(*args, **kwargs):
         return _ogl.PyDividedShape_base_OnDrawBranches(*args, **kwargs)
 
     def base_OnMoveLinks(*args, **kwargs):

-        """base_OnMoveLinks(wxDC dc)"""
+        """base_OnMoveLinks(DC dc)"""

         return _ogl.PyDividedShape_base_OnMoveLinks(*args, **kwargs)
 
     def base_OnErase(*args, **kwargs):
         return _ogl.PyDividedShape_base_OnMoveLinks(*args, **kwargs)
 
     def base_OnErase(*args, **kwargs):

-        """base_OnErase(wxDC dc)"""
+        """base_OnErase(DC dc)"""

         return _ogl.PyDividedShape_base_OnErase(*args, **kwargs)
 
     def base_OnEraseContents(*args, **kwargs):
         return _ogl.PyDividedShape_base_OnErase(*args, **kwargs)
 
     def base_OnEraseContents(*args, **kwargs):

-        """base_OnEraseContents(wxDC dc)"""
+        """base_OnEraseContents(DC dc)"""

         return _ogl.PyDividedShape_base_OnEraseContents(*args, **kwargs)
 
     def base_OnHighlight(*args, **kwargs):
         return _ogl.PyDividedShape_base_OnEraseContents(*args, **kwargs)
 
     def base_OnHighlight(*args, **kwargs):

-        """base_OnHighlight(wxDC dc)"""
+        """base_OnHighlight(DC dc)"""

         return _ogl.PyDividedShape_base_OnHighlight(*args, **kwargs)
 
     def base_OnLeftClick(*args, **kwargs):
         return _ogl.PyDividedShape_base_OnHighlight(*args, **kwargs)
 
     def base_OnLeftClick(*args, **kwargs):


@@ -2284,14 +2284,14 @@ class PyDividedShape(PyRectangleShape):
 
     def base_OnMovePre(*args, **kwargs):
         """
 
     def base_OnMovePre(*args, **kwargs):
         """

-        base_OnMovePre(wxDC dc, double x, double y, double old_x, double old_y, 
+        base_OnMovePre(DC dc, double x, double y, double old_x, double old_y, 

             bool display=True) -> bool
         """
         return _ogl.PyDividedShape_base_OnMovePre(*args, **kwargs)
 
     def base_OnMovePost(*args, **kwargs):
         """
             bool display=True) -> bool
         """
         return _ogl.PyDividedShape_base_OnMovePre(*args, **kwargs)
 
     def base_OnMovePost(*args, **kwargs):
         """

-        base_OnMovePost(wxDC dc, double x, double y, double old_x, double old_y, 
+        base_OnMovePost(DC dc, double x, double y, double old_x, double old_y, 

             bool display=True)
         """
         return _ogl.PyDividedShape_base_OnMovePost(*args, **kwargs)
             bool display=True)
         """
         return _ogl.PyDividedShape_base_OnMovePost(*args, **kwargs)


@@ -2321,19 +2321,19 @@ class PyDividedShape(PyRectangleShape):
         return _ogl.PyDividedShape_base_OnEndDragRight(*args, **kwargs)
 
     def base_OnDrawOutline(*args, **kwargs):
         return _ogl.PyDividedShape_base_OnEndDragRight(*args, **kwargs)
 
     def base_OnDrawOutline(*args, **kwargs):

-        """base_OnDrawOutline(wxDC dc, double x, double y, double w, double h)"""
+        """base_OnDrawOutline(DC dc, double x, double y, double w, double h)"""

         return _ogl.PyDividedShape_base_OnDrawOutline(*args, **kwargs)
 
     def base_OnDrawControlPoints(*args, **kwargs):
         return _ogl.PyDividedShape_base_OnDrawOutline(*args, **kwargs)
 
     def base_OnDrawControlPoints(*args, **kwargs):

-        """base_OnDrawControlPoints(wxDC dc)"""
+        """base_OnDrawControlPoints(DC dc)"""

         return _ogl.PyDividedShape_base_OnDrawControlPoints(*args, **kwargs)
 
     def base_OnEraseControlPoints(*args, **kwargs):
         return _ogl.PyDividedShape_base_OnDrawControlPoints(*args, **kwargs)
 
     def base_OnEraseControlPoints(*args, **kwargs):

-        """base_OnEraseControlPoints(wxDC dc)"""
+        """base_OnEraseControlPoints(DC dc)"""

         return _ogl.PyDividedShape_base_OnEraseControlPoints(*args, **kwargs)
 
     def base_OnMoveLink(*args, **kwargs):
         return _ogl.PyDividedShape_base_OnEraseControlPoints(*args, **kwargs)
 
     def base_OnMoveLink(*args, **kwargs):

-        """base_OnMoveLink(wxDC dc, bool moveControlPoints=True)"""
+        """base_OnMoveLink(DC dc, bool moveControlPoints=True)"""

         return _ogl.PyDividedShape_base_OnMoveLink(*args, **kwargs)
 
     def base_OnSizingDragLeft(*args, **kwargs):
         return _ogl.PyDividedShape_base_OnMoveLink(*args, **kwargs)
 
     def base_OnSizingDragLeft(*args, **kwargs):


@@ -2425,7 +2425,7 @@ class PyDivisionShape(PyCompositeShape):
         return _ogl.PyDivisionShape_GetLeftSide(*args, **kwargs)
 
     def GetLeftSideColour(*args, **kwargs):
         return _ogl.PyDivisionShape_GetLeftSide(*args, **kwargs)
 
     def GetLeftSideColour(*args, **kwargs):

-        """GetLeftSideColour() -> wxString"""
+        """GetLeftSideColour() -> String"""

         return _ogl.PyDivisionShape_GetLeftSideColour(*args, **kwargs)
 
     def GetLeftSidePen(*args, **kwargs):
         return _ogl.PyDivisionShape_GetLeftSideColour(*args, **kwargs)
 
     def GetLeftSidePen(*args, **kwargs):


@@ -2465,7 +2465,7 @@ class PyDivisionShape(PyCompositeShape):
         return _ogl.PyDivisionShape_SetLeftSide(*args, **kwargs)
 
     def SetLeftSideColour(*args, **kwargs):
         return _ogl.PyDivisionShape_SetLeftSide(*args, **kwargs)
 
     def SetLeftSideColour(*args, **kwargs):

-        """SetLeftSideColour(wxString colour)"""
+        """SetLeftSideColour(String colour)"""

         return _ogl.PyDivisionShape_SetLeftSideColour(*args, **kwargs)
 
     def SetLeftSidePen(*args, **kwargs):
         return _ogl.PyDivisionShape_SetLeftSideColour(*args, **kwargs)
 
     def SetLeftSidePen(*args, **kwargs):


@@ -2481,7 +2481,7 @@ class PyDivisionShape(PyCompositeShape):
         return _ogl.PyDivisionShape_SetTopSide(*args, **kwargs)
 
     def SetTopSideColour(*args, **kwargs):
         return _ogl.PyDivisionShape_SetTopSide(*args, **kwargs)
 
     def SetTopSideColour(*args, **kwargs):

-        """SetTopSideColour(wxString colour)"""
+        """SetTopSideColour(String colour)"""

         return _ogl.PyDivisionShape_SetTopSideColour(*args, **kwargs)
 
     def SetTopSidePen(*args, **kwargs):
         return _ogl.PyDivisionShape_SetTopSideColour(*args, **kwargs)
 
     def SetTopSidePen(*args, **kwargs):


@@ -2493,31 +2493,31 @@ class PyDivisionShape(PyCompositeShape):
         return _ogl.PyDivisionShape_base_OnDelete(*args, **kwargs)
 
     def base_OnDraw(*args, **kwargs):
         return _ogl.PyDivisionShape_base_OnDelete(*args, **kwargs)
 
     def base_OnDraw(*args, **kwargs):

-        """base_OnDraw(wxDC dc)"""
+        """base_OnDraw(DC dc)"""

         return _ogl.PyDivisionShape_base_OnDraw(*args, **kwargs)
 
     def base_OnDrawContents(*args, **kwargs):
         return _ogl.PyDivisionShape_base_OnDraw(*args, **kwargs)
 
     def base_OnDrawContents(*args, **kwargs):

-        """base_OnDrawContents(wxDC dc)"""
+        """base_OnDrawContents(DC dc)"""

         return _ogl.PyDivisionShape_base_OnDrawContents(*args, **kwargs)
 
     def base_OnDrawBranches(*args, **kwargs):
         return _ogl.PyDivisionShape_base_OnDrawContents(*args, **kwargs)
 
     def base_OnDrawBranches(*args, **kwargs):

-        """base_OnDrawBranches(wxDC dc, bool erase=FALSE)"""
+        """base_OnDrawBranches(DC dc, bool erase=FALSE)"""

         return _ogl.PyDivisionShape_base_OnDrawBranches(*args, **kwargs)
 
     def base_OnMoveLinks(*args, **kwargs):
         return _ogl.PyDivisionShape_base_OnDrawBranches(*args, **kwargs)
 
     def base_OnMoveLinks(*args, **kwargs):

-        """base_OnMoveLinks(wxDC dc)"""
+        """base_OnMoveLinks(DC dc)"""

         return _ogl.PyDivisionShape_base_OnMoveLinks(*args, **kwargs)
 
     def base_OnErase(*args, **kwargs):
         return _ogl.PyDivisionShape_base_OnMoveLinks(*args, **kwargs)
 
     def base_OnErase(*args, **kwargs):

-        """base_OnErase(wxDC dc)"""
+        """base_OnErase(DC dc)"""

         return _ogl.PyDivisionShape_base_OnErase(*args, **kwargs)
 
     def base_OnEraseContents(*args, **kwargs):
         return _ogl.PyDivisionShape_base_OnErase(*args, **kwargs)
 
     def base_OnEraseContents(*args, **kwargs):

-        """base_OnEraseContents(wxDC dc)"""
+        """base_OnEraseContents(DC dc)"""

         return _ogl.PyDivisionShape_base_OnEraseContents(*args, **kwargs)
 
     def base_OnHighlight(*args, **kwargs):
         return _ogl.PyDivisionShape_base_OnEraseContents(*args, **kwargs)
 
     def base_OnHighlight(*args, **kwargs):

-        """base_OnHighlight(wxDC dc)"""
+        """base_OnHighlight(DC dc)"""

         return _ogl.PyDivisionShape_base_OnHighlight(*args, **kwargs)
 
     def base_OnLeftClick(*args, **kwargs):
         return _ogl.PyDivisionShape_base_OnHighlight(*args, **kwargs)
 
     def base_OnLeftClick(*args, **kwargs):


@@ -2538,14 +2538,14 @@ class PyDivisionShape(PyCompositeShape):
 
     def base_OnMovePre(*args, **kwargs):
         """
 
     def base_OnMovePre(*args, **kwargs):
         """

-        base_OnMovePre(wxDC dc, double x, double y, double old_x, double old_y, 
+        base_OnMovePre(DC dc, double x, double y, double old_x, double old_y, 

             bool display=True) -> bool
         """
         return _ogl.PyDivisionShape_base_OnMovePre(*args, **kwargs)
 
     def base_OnMovePost(*args, **kwargs):
         """
             bool display=True) -> bool
         """
         return _ogl.PyDivisionShape_base_OnMovePre(*args, **kwargs)
 
     def base_OnMovePost(*args, **kwargs):
         """

-        base_OnMovePost(wxDC dc, double x, double y, double old_x, double old_y, 
+        base_OnMovePost(DC dc, double x, double y, double old_x, double old_y, 

             bool display=True)
         """
         return _ogl.PyDivisionShape_base_OnMovePost(*args, **kwargs)
             bool display=True)
         """
         return _ogl.PyDivisionShape_base_OnMovePost(*args, **kwargs)


@@ -2575,19 +2575,19 @@ class PyDivisionShape(PyCompositeShape):
         return _ogl.PyDivisionShape_base_OnEndDragRight(*args, **kwargs)
 
     def base_OnDrawOutline(*args, **kwargs):
         return _ogl.PyDivisionShape_base_OnEndDragRight(*args, **kwargs)
 
     def base_OnDrawOutline(*args, **kwargs):

-        """base_OnDrawOutline(wxDC dc, double x, double y, double w, double h)"""
+        """base_OnDrawOutline(DC dc, double x, double y, double w, double h)"""

         return _ogl.PyDivisionShape_base_OnDrawOutline(*args, **kwargs)
 
     def base_OnDrawControlPoints(*args, **kwargs):
         return _ogl.PyDivisionShape_base_OnDrawOutline(*args, **kwargs)
 
     def base_OnDrawControlPoints(*args, **kwargs):

-        """base_OnDrawControlPoints(wxDC dc)"""
+        """base_OnDrawControlPoints(DC dc)"""

         return _ogl.PyDivisionShape_base_OnDrawControlPoints(*args, **kwargs)
 
     def base_OnEraseControlPoints(*args, **kwargs):
         return _ogl.PyDivisionShape_base_OnDrawControlPoints(*args, **kwargs)
 
     def base_OnEraseControlPoints(*args, **kwargs):

-        """base_OnEraseControlPoints(wxDC dc)"""
+        """base_OnEraseControlPoints(DC dc)"""

         return _ogl.PyDivisionShape_base_OnEraseControlPoints(*args, **kwargs)
 
     def base_OnMoveLink(*args, **kwargs):
         return _ogl.PyDivisionShape_base_OnEraseControlPoints(*args, **kwargs)
 
     def base_OnMoveLink(*args, **kwargs):

-        """base_OnMoveLink(wxDC dc, bool moveControlPoints=True)"""
+        """base_OnMoveLink(DC dc, bool moveControlPoints=True)"""

         return _ogl.PyDivisionShape_base_OnMoveLink(*args, **kwargs)
 
     def base_OnSizingDragLeft(*args, **kwargs):
         return _ogl.PyDivisionShape_base_OnMoveLink(*args, **kwargs)
 
     def base_OnSizingDragLeft(*args, **kwargs):


@@ -2643,31 +2643,31 @@ class PyEllipseShape(PyShape):
         return _ogl.PyEllipseShape__setCallbackInfo(*args, **kwargs)
 
     def base_OnDraw(*args, **kwargs):
         return _ogl.PyEllipseShape__setCallbackInfo(*args, **kwargs)
 
     def base_OnDraw(*args, **kwargs):

-        """base_OnDraw(wxDC dc)"""
+        """base_OnDraw(DC dc)"""

         return _ogl.PyEllipseShape_base_OnDraw(*args, **kwargs)
 
     def base_OnDrawContents(*args, **kwargs):
         return _ogl.PyEllipseShape_base_OnDraw(*args, **kwargs)
 
     def base_OnDrawContents(*args, **kwargs):

-        """base_OnDrawContents(wxDC dc)"""
+        """base_OnDrawContents(DC dc)"""

         return _ogl.PyEllipseShape_base_OnDrawContents(*args, **kwargs)
 
     def base_OnDrawBranches(*args, **kwargs):
         return _ogl.PyEllipseShape_base_OnDrawContents(*args, **kwargs)
 
     def base_OnDrawBranches(*args, **kwargs):

-        """base_OnDrawBranches(wxDC dc, bool erase=FALSE)"""
+        """base_OnDrawBranches(DC dc, bool erase=FALSE)"""

         return _ogl.PyEllipseShape_base_OnDrawBranches(*args, **kwargs)
 
     def base_OnMoveLinks(*args, **kwargs):
         return _ogl.PyEllipseShape_base_OnDrawBranches(*args, **kwargs)
 
     def base_OnMoveLinks(*args, **kwargs):

-        """base_OnMoveLinks(wxDC dc)"""
+        """base_OnMoveLinks(DC dc)"""

         return _ogl.PyEllipseShape_base_OnMoveLinks(*args, **kwargs)
 
     def base_OnErase(*args, **kwargs):
         return _ogl.PyEllipseShape_base_OnMoveLinks(*args, **kwargs)
 
     def base_OnErase(*args, **kwargs):

-        """base_OnErase(wxDC dc)"""
+        """base_OnErase(DC dc)"""

         return _ogl.PyEllipseShape_base_OnErase(*args, **kwargs)
 
     def base_OnEraseContents(*args, **kwargs):
         return _ogl.PyEllipseShape_base_OnErase(*args, **kwargs)
 
     def base_OnEraseContents(*args, **kwargs):

-        """base_OnEraseContents(wxDC dc)"""
+        """base_OnEraseContents(DC dc)"""

         return _ogl.PyEllipseShape_base_OnEraseContents(*args, **kwargs)
 
     def base_OnHighlight(*args, **kwargs):
         return _ogl.PyEllipseShape_base_OnEraseContents(*args, **kwargs)
 
     def base_OnHighlight(*args, **kwargs):

-        """base_OnHighlight(wxDC dc)"""
+        """base_OnHighlight(DC dc)"""

         return _ogl.PyEllipseShape_base_OnHighlight(*args, **kwargs)
 
     def base_OnLeftClick(*args, **kwargs):
         return _ogl.PyEllipseShape_base_OnHighlight(*args, **kwargs)
 
     def base_OnLeftClick(*args, **kwargs):


@@ -2688,14 +2688,14 @@ class PyEllipseShape(PyShape):
 
     def base_OnMovePre(*args, **kwargs):
         """
 
     def base_OnMovePre(*args, **kwargs):
         """

-        base_OnMovePre(wxDC dc, double x, double y, double old_x, double old_y, 
+        base_OnMovePre(DC dc, double x, double y, double old_x, double old_y, 

             bool display=True) -> bool
         """
         return _ogl.PyEllipseShape_base_OnMovePre(*args, **kwargs)
 
     def base_OnMovePost(*args, **kwargs):
         """
             bool display=True) -> bool
         """
         return _ogl.PyEllipseShape_base_OnMovePre(*args, **kwargs)
 
     def base_OnMovePost(*args, **kwargs):
         """

-        base_OnMovePost(wxDC dc, double x, double y, double old_x, double old_y, 
+        base_OnMovePost(DC dc, double x, double y, double old_x, double old_y, 

             bool display=True)
         """
         return _ogl.PyEllipseShape_base_OnMovePost(*args, **kwargs)
             bool display=True)
         """
         return _ogl.PyEllipseShape_base_OnMovePost(*args, **kwargs)


@@ -2725,19 +2725,19 @@ class PyEllipseShape(PyShape):
         return _ogl.PyEllipseShape_base_OnEndDragRight(*args, **kwargs)
 
     def base_OnDrawOutline(*args, **kwargs):
         return _ogl.PyEllipseShape_base_OnEndDragRight(*args, **kwargs)
 
     def base_OnDrawOutline(*args, **kwargs):

-        """base_OnDrawOutline(wxDC dc, double x, double y, double w, double h)"""
+        """base_OnDrawOutline(DC dc, double x, double y, double w, double h)"""

         return _ogl.PyEllipseShape_base_OnDrawOutline(*args, **kwargs)
 
     def base_OnDrawControlPoints(*args, **kwargs):
         return _ogl.PyEllipseShape_base_OnDrawOutline(*args, **kwargs)
 
     def base_OnDrawControlPoints(*args, **kwargs):

-        """base_OnDrawControlPoints(wxDC dc)"""
+        """base_OnDrawControlPoints(DC dc)"""

         return _ogl.PyEllipseShape_base_OnDrawControlPoints(*args, **kwargs)
 
     def base_OnEraseControlPoints(*args, **kwargs):
         return _ogl.PyEllipseShape_base_OnDrawControlPoints(*args, **kwargs)
 
     def base_OnEraseControlPoints(*args, **kwargs):

-        """base_OnEraseControlPoints(wxDC dc)"""
+        """base_OnEraseControlPoints(DC dc)"""

         return _ogl.PyEllipseShape_base_OnEraseControlPoints(*args, **kwargs)
 
     def base_OnMoveLink(*args, **kwargs):
         return _ogl.PyEllipseShape_base_OnEraseControlPoints(*args, **kwargs)
 
     def base_OnMoveLink(*args, **kwargs):

-        """base_OnMoveLink(wxDC dc, bool moveControlPoints=True)"""
+        """base_OnMoveLink(DC dc, bool moveControlPoints=True)"""

         return _ogl.PyEllipseShape_base_OnMoveLink(*args, **kwargs)
 
     def base_OnSizingDragLeft(*args, **kwargs):
         return _ogl.PyEllipseShape_base_OnMoveLink(*args, **kwargs)
 
     def base_OnSizingDragLeft(*args, **kwargs):


@@ -2793,31 +2793,31 @@ class PyCircleShape(PyEllipseShape):
         return _ogl.PyCircleShape__setCallbackInfo(*args, **kwargs)
 
     def base_OnDraw(*args, **kwargs):
         return _ogl.PyCircleShape__setCallbackInfo(*args, **kwargs)
 
     def base_OnDraw(*args, **kwargs):

-        """base_OnDraw(wxDC dc)"""
+        """base_OnDraw(DC dc)"""

         return _ogl.PyCircleShape_base_OnDraw(*args, **kwargs)
 
     def base_OnDrawContents(*args, **kwargs):
         return _ogl.PyCircleShape_base_OnDraw(*args, **kwargs)
 
     def base_OnDrawContents(*args, **kwargs):

-        """base_OnDrawContents(wxDC dc)"""
+        """base_OnDrawContents(DC dc)"""

         return _ogl.PyCircleShape_base_OnDrawContents(*args, **kwargs)
 
     def base_OnDrawBranches(*args, **kwargs):
         return _ogl.PyCircleShape_base_OnDrawContents(*args, **kwargs)
 
     def base_OnDrawBranches(*args, **kwargs):

-        """base_OnDrawBranches(wxDC dc, bool erase=FALSE)"""
+        """base_OnDrawBranches(DC dc, bool erase=FALSE)"""

         return _ogl.PyCircleShape_base_OnDrawBranches(*args, **kwargs)
 
     def base_OnMoveLinks(*args, **kwargs):
         return _ogl.PyCircleShape_base_OnDrawBranches(*args, **kwargs)
 
     def base_OnMoveLinks(*args, **kwargs):

-        """base_OnMoveLinks(wxDC dc)"""
+        """base_OnMoveLinks(DC dc)"""

         return _ogl.PyCircleShape_base_OnMoveLinks(*args, **kwargs)
 
     def base_OnErase(*args, **kwargs):
         return _ogl.PyCircleShape_base_OnMoveLinks(*args, **kwargs)
 
     def base_OnErase(*args, **kwargs):

-        """base_OnErase(wxDC dc)"""
+        """base_OnErase(DC dc)"""

         return _ogl.PyCircleShape_base_OnErase(*args, **kwargs)
 
     def base_OnEraseContents(*args, **kwargs):
         return _ogl.PyCircleShape_base_OnErase(*args, **kwargs)
 
     def base_OnEraseContents(*args, **kwargs):

-        """base_OnEraseContents(wxDC dc)"""
+        """base_OnEraseContents(DC dc)"""

         return _ogl.PyCircleShape_base_OnEraseContents(*args, **kwargs)
 
     def base_OnHighlight(*args, **kwargs):
         return _ogl.PyCircleShape_base_OnEraseContents(*args, **kwargs)
 
     def base_OnHighlight(*args, **kwargs):

-        """base_OnHighlight(wxDC dc)"""
+        """base_OnHighlight(DC dc)"""

         return _ogl.PyCircleShape_base_OnHighlight(*args, **kwargs)
 
     def base_OnLeftClick(*args, **kwargs):
         return _ogl.PyCircleShape_base_OnHighlight(*args, **kwargs)
 
     def base_OnLeftClick(*args, **kwargs):


@@ -2838,14 +2838,14 @@ class PyCircleShape(PyEllipseShape):
 
     def base_OnMovePre(*args, **kwargs):
         """
 
     def base_OnMovePre(*args, **kwargs):
         """

-        base_OnMovePre(wxDC dc, double x, double y, double old_x, double old_y, 
+        base_OnMovePre(DC dc, double x, double y, double old_x, double old_y, 

             bool display=True) -> bool
         """
         return _ogl.PyCircleShape_base_OnMovePre(*args, **kwargs)
 
     def base_OnMovePost(*args, **kwargs):
         """
             bool display=True) -> bool
         """
         return _ogl.PyCircleShape_base_OnMovePre(*args, **kwargs)
 
     def base_OnMovePost(*args, **kwargs):
         """

-        base_OnMovePost(wxDC dc, double x, double y, double old_x, double old_y, 
+        base_OnMovePost(DC dc, double x, double y, double old_x, double old_y, 

             bool display=True)
         """
         return _ogl.PyCircleShape_base_OnMovePost(*args, **kwargs)
             bool display=True)
         """
         return _ogl.PyCircleShape_base_OnMovePost(*args, **kwargs)


@@ -2875,19 +2875,19 @@ class PyCircleShape(PyEllipseShape):
         return _ogl.PyCircleShape_base_OnEndDragRight(*args, **kwargs)
 
     def base_OnDrawOutline(*args, **kwargs):
         return _ogl.PyCircleShape_base_OnEndDragRight(*args, **kwargs)
 
     def base_OnDrawOutline(*args, **kwargs):

-        """base_OnDrawOutline(wxDC dc, double x, double y, double w, double h)"""
+        """base_OnDrawOutline(DC dc, double x, double y, double w, double h)"""

         return _ogl.PyCircleShape_base_OnDrawOutline(*args, **kwargs)
 
     def base_OnDrawControlPoints(*args, **kwargs):
         return _ogl.PyCircleShape_base_OnDrawOutline(*args, **kwargs)
 
     def base_OnDrawControlPoints(*args, **kwargs):

-        """base_OnDrawControlPoints(wxDC dc)"""
+        """base_OnDrawControlPoints(DC dc)"""

         return _ogl.PyCircleShape_base_OnDrawControlPoints(*args, **kwargs)
 
     def base_OnEraseControlPoints(*args, **kwargs):
         return _ogl.PyCircleShape_base_OnDrawControlPoints(*args, **kwargs)
 
     def base_OnEraseControlPoints(*args, **kwargs):

-        """base_OnEraseControlPoints(wxDC dc)"""
+        """base_OnEraseControlPoints(DC dc)"""

         return _ogl.PyCircleShape_base_OnEraseControlPoints(*args, **kwargs)
 
     def base_OnMoveLink(*args, **kwargs):
         return _ogl.PyCircleShape_base_OnEraseControlPoints(*args, **kwargs)
 
     def base_OnMoveLink(*args, **kwargs):

-        """base_OnMoveLink(wxDC dc, bool moveControlPoints=True)"""
+        """base_OnMoveLink(DC dc, bool moveControlPoints=True)"""

         return _ogl.PyCircleShape_base_OnMoveLink(*args, **kwargs)
 
     def base_OnSizingDragLeft(*args, **kwargs):
         return _ogl.PyCircleShape_base_OnMoveLink(*args, **kwargs)
 
     def base_OnSizingDragLeft(*args, **kwargs):


@@ -2933,7 +2933,7 @@ class ArrowHead(core.Object):
     def __init__(self, *args, **kwargs):
         """
         __init__(int type=0, int end=0, double size=0.0, double dist=0.0, 
     def __init__(self, *args, **kwargs):
         """
         __init__(int type=0, int end=0, double size=0.0, double dist=0.0, 

-            wxString name=wxPyEmptyString, PseudoMetaFile mf=None, 
+            String name=EmptyString, PseudoMetaFile mf=None, 

             long arrowId=-1) -> ArrowHead
         """
         newobj = _ogl.new_ArrowHead(*args, **kwargs)
             long arrowId=-1) -> ArrowHead
         """
         newobj = _ogl.new_ArrowHead(*args, **kwargs)


@@ -2975,7 +2975,7 @@ class ArrowHead(core.Object):
         return _ogl.ArrowHead_GetSize(*args, **kwargs)
 
     def GetName(*args, **kwargs):
         return _ogl.ArrowHead_GetSize(*args, **kwargs)
 
     def GetName(*args, **kwargs):

-        """GetName() -> wxString"""
+        """GetName() -> String"""

         return _ogl.ArrowHead_GetName(*args, **kwargs)
 
     def SetXOffset(*args, **kwargs):
         return _ogl.ArrowHead_GetName(*args, **kwargs)
 
     def SetXOffset(*args, **kwargs):


@@ -3036,7 +3036,7 @@ class PyLineShape(PyShape):
     def AddArrow(*args, **kwargs):
         """
         AddArrow(int type, int end=ARROW_POSITION_END, double arrowSize=10.0, 
     def AddArrow(*args, **kwargs):
         """
         AddArrow(int type, int end=ARROW_POSITION_END, double arrowSize=10.0, 

-            double xOffset=0.0, wxString name=wxPyEmptyString, 
+            double xOffset=0.0, String name=EmptyString, 

             PseudoMetaFile mf=None, long arrowId=-1)
         """
         return _ogl.PyLineShape_AddArrow(*args, **kwargs)
             PseudoMetaFile mf=None, long arrowId=-1)
         """
         return _ogl.PyLineShape_AddArrow(*args, **kwargs)


@@ -3046,7 +3046,7 @@ class PyLineShape(PyShape):
         return _ogl.PyLineShape_AddArrowOrdered(*args, **kwargs)
 
     def ClearArrow(*args, **kwargs):
         return _ogl.PyLineShape_AddArrowOrdered(*args, **kwargs)
 
     def ClearArrow(*args, **kwargs):

-        """ClearArrow(wxString name) -> bool"""
+        """ClearArrow(String name) -> bool"""

         return _ogl.PyLineShape_ClearArrow(*args, **kwargs)
 
     def ClearArrowsAtPosition(*args, **kwargs):
         return _ogl.PyLineShape_ClearArrow(*args, **kwargs)
 
     def ClearArrowsAtPosition(*args, **kwargs):


@@ -3054,7 +3054,7 @@ class PyLineShape(PyShape):
         return _ogl.PyLineShape_ClearArrowsAtPosition(*args, **kwargs)
 
     def DrawArrow(*args, **kwargs):
         return _ogl.PyLineShape_ClearArrowsAtPosition(*args, **kwargs)
 
     def DrawArrow(*args, **kwargs):

-        """DrawArrow(wxDC dc, ArrowHead arrow, double xOffset, bool proportionalOffset)"""
+        """DrawArrow(DC dc, ArrowHead arrow, double xOffset, bool proportionalOffset)"""

         return _ogl.PyLineShape_DrawArrow(*args, **kwargs)
 
     def DeleteArrowHeadId(*args, **kwargs):
         return _ogl.PyLineShape_DrawArrow(*args, **kwargs)
 
     def DeleteArrowHeadId(*args, **kwargs):


@@ -3062,7 +3062,7 @@ class PyLineShape(PyShape):
         return _ogl.PyLineShape_DeleteArrowHeadId(*args, **kwargs)
 
     def DeleteArrowHead(*args, **kwargs):
         return _ogl.PyLineShape_DeleteArrowHeadId(*args, **kwargs)
 
     def DeleteArrowHead(*args, **kwargs):

-        """DeleteArrowHead(int position, wxString name) -> bool"""
+        """DeleteArrowHead(int position, String name) -> bool"""

         return _ogl.PyLineShape_DeleteArrowHead(*args, **kwargs)
 
     def DeleteLineControlPoint(*args, **kwargs):
         return _ogl.PyLineShape_DeleteArrowHead(*args, **kwargs)
 
     def DeleteLineControlPoint(*args, **kwargs):


@@ -3070,15 +3070,15 @@ class PyLineShape(PyShape):
         return _ogl.PyLineShape_DeleteLineControlPoint(*args, **kwargs)
 
     def DrawArrows(*args, **kwargs):
         return _ogl.PyLineShape_DeleteLineControlPoint(*args, **kwargs)
 
     def DrawArrows(*args, **kwargs):

-        """DrawArrows(wxDC dc)"""
+        """DrawArrows(DC dc)"""

         return _ogl.PyLineShape_DrawArrows(*args, **kwargs)
 
     def DrawRegion(*args, **kwargs):
         return _ogl.PyLineShape_DrawArrows(*args, **kwargs)
 
     def DrawRegion(*args, **kwargs):

-        """DrawRegion(wxDC dc, ShapeRegion region, double x, double y)"""
+        """DrawRegion(DC dc, ShapeRegion region, double x, double y)"""

         return _ogl.PyLineShape_DrawRegion(*args, **kwargs)
 
     def EraseRegion(*args, **kwargs):
         return _ogl.PyLineShape_DrawRegion(*args, **kwargs)
 
     def EraseRegion(*args, **kwargs):

-        """EraseRegion(wxDC dc, ShapeRegion region, double x, double y)"""
+        """EraseRegion(DC dc, ShapeRegion region, double x, double y)"""

         return _ogl.PyLineShape_EraseRegion(*args, **kwargs)
 
     def FindArrowHeadId(*args, **kwargs):
         return _ogl.PyLineShape_EraseRegion(*args, **kwargs)
 
     def FindArrowHeadId(*args, **kwargs):


@@ -3086,7 +3086,7 @@ class PyLineShape(PyShape):
         return _ogl.PyLineShape_FindArrowHeadId(*args, **kwargs)
 
     def FindArrowHead(*args, **kwargs):
         return _ogl.PyLineShape_FindArrowHeadId(*args, **kwargs)
 
     def FindArrowHead(*args, **kwargs):

-        """FindArrowHead(int position, wxString name) -> ArrowHead"""
+        """FindArrowHead(int position, String name) -> ArrowHead"""

         return _ogl.PyLineShape_FindArrowHead(*args, **kwargs)
 
     def FindLineEndPoints(*args, **kwargs):
         return _ogl.PyLineShape_FindArrowHead(*args, **kwargs)
 
     def FindLineEndPoints(*args, **kwargs):


@@ -3138,7 +3138,7 @@ class PyLineShape(PyShape):
         return _ogl.PyLineShape_Initialise(*args, **kwargs)
 
     def InsertLineControlPoint(*args, **kwargs):
         return _ogl.PyLineShape_Initialise(*args, **kwargs)
 
     def InsertLineControlPoint(*args, **kwargs):

-        """InsertLineControlPoint(wxDC dc)"""
+        """InsertLineControlPoint(DC dc)"""

         return _ogl.PyLineShape_InsertLineControlPoint(*args, **kwargs)
 
     def IsEnd(*args, **kwargs):
         return _ogl.PyLineShape_InsertLineControlPoint(*args, **kwargs)
 
     def IsEnd(*args, **kwargs):


@@ -3190,7 +3190,7 @@ class PyLineShape(PyShape):
         return _ogl.PyLineShape_SetTo(*args, **kwargs)
 
     def Straighten(*args, **kwargs):
         return _ogl.PyLineShape_SetTo(*args, **kwargs)
 
     def Straighten(*args, **kwargs):

-        """Straighten(wxDC dc=None)"""
+        """Straighten(DC dc=None)"""

         return _ogl.PyLineShape_Straighten(*args, **kwargs)
 
     def Unlink(*args, **kwargs):
         return _ogl.PyLineShape_Straighten(*args, **kwargs)
 
     def Unlink(*args, **kwargs):


@@ -3198,31 +3198,31 @@ class PyLineShape(PyShape):
         return _ogl.PyLineShape_Unlink(*args, **kwargs)
 
     def base_OnDraw(*args, **kwargs):
         return _ogl.PyLineShape_Unlink(*args, **kwargs)
 
     def base_OnDraw(*args, **kwargs):

-        """base_OnDraw(wxDC dc)"""
+        """base_OnDraw(DC dc)"""

         return _ogl.PyLineShape_base_OnDraw(*args, **kwargs)
 
     def base_OnDrawContents(*args, **kwargs):
         return _ogl.PyLineShape_base_OnDraw(*args, **kwargs)
 
     def base_OnDrawContents(*args, **kwargs):

-        """base_OnDrawContents(wxDC dc)"""
+        """base_OnDrawContents(DC dc)"""

         return _ogl.PyLineShape_base_OnDrawContents(*args, **kwargs)
 
     def base_OnDrawBranches(*args, **kwargs):
         return _ogl.PyLineShape_base_OnDrawContents(*args, **kwargs)
 
     def base_OnDrawBranches(*args, **kwargs):

-        """base_OnDrawBranches(wxDC dc, bool erase=FALSE)"""
+        """base_OnDrawBranches(DC dc, bool erase=FALSE)"""

         return _ogl.PyLineShape_base_OnDrawBranches(*args, **kwargs)
 
     def base_OnMoveLinks(*args, **kwargs):
         return _ogl.PyLineShape_base_OnDrawBranches(*args, **kwargs)
 
     def base_OnMoveLinks(*args, **kwargs):

-        """base_OnMoveLinks(wxDC dc)"""
+        """base_OnMoveLinks(DC dc)"""

         return _ogl.PyLineShape_base_OnMoveLinks(*args, **kwargs)
 
     def base_OnErase(*args, **kwargs):
         return _ogl.PyLineShape_base_OnMoveLinks(*args, **kwargs)
 
     def base_OnErase(*args, **kwargs):

-        """base_OnErase(wxDC dc)"""
+        """base_OnErase(DC dc)"""

         return _ogl.PyLineShape_base_OnErase(*args, **kwargs)
 
     def base_OnEraseContents(*args, **kwargs):
         return _ogl.PyLineShape_base_OnErase(*args, **kwargs)
 
     def base_OnEraseContents(*args, **kwargs):

-        """base_OnEraseContents(wxDC dc)"""
+        """base_OnEraseContents(DC dc)"""

         return _ogl.PyLineShape_base_OnEraseContents(*args, **kwargs)
 
     def base_OnHighlight(*args, **kwargs):
         return _ogl.PyLineShape_base_OnEraseContents(*args, **kwargs)
 
     def base_OnHighlight(*args, **kwargs):

-        """base_OnHighlight(wxDC dc)"""
+        """base_OnHighlight(DC dc)"""

         return _ogl.PyLineShape_base_OnHighlight(*args, **kwargs)
 
     def base_OnLeftClick(*args, **kwargs):
         return _ogl.PyLineShape_base_OnHighlight(*args, **kwargs)
 
     def base_OnLeftClick(*args, **kwargs):


@@ -3243,14 +3243,14 @@ class PyLineShape(PyShape):
 
     def base_OnMovePre(*args, **kwargs):
         """
 
     def base_OnMovePre(*args, **kwargs):
         """

-        base_OnMovePre(wxDC dc, double x, double y, double old_x, double old_y, 
+        base_OnMovePre(DC dc, double x, double y, double old_x, double old_y, 

             bool display=True) -> bool
         """
         return _ogl.PyLineShape_base_OnMovePre(*args, **kwargs)
 
     def base_OnMovePost(*args, **kwargs):
         """
             bool display=True) -> bool
         """
         return _ogl.PyLineShape_base_OnMovePre(*args, **kwargs)
 
     def base_OnMovePost(*args, **kwargs):
         """

-        base_OnMovePost(wxDC dc, double x, double y, double old_x, double old_y, 
+        base_OnMovePost(DC dc, double x, double y, double old_x, double old_y, 

             bool display=True)
         """
         return _ogl.PyLineShape_base_OnMovePost(*args, **kwargs)
             bool display=True)
         """
         return _ogl.PyLineShape_base_OnMovePost(*args, **kwargs)


@@ -3280,19 +3280,19 @@ class PyLineShape(PyShape):
         return _ogl.PyLineShape_base_OnEndDragRight(*args, **kwargs)
 
     def base_OnDrawOutline(*args, **kwargs):
         return _ogl.PyLineShape_base_OnEndDragRight(*args, **kwargs)
 
     def base_OnDrawOutline(*args, **kwargs):

-        """base_OnDrawOutline(wxDC dc, double x, double y, double w, double h)"""
+        """base_OnDrawOutline(DC dc, double x, double y, double w, double h)"""

         return _ogl.PyLineShape_base_OnDrawOutline(*args, **kwargs)
 
     def base_OnDrawControlPoints(*args, **kwargs):
         return _ogl.PyLineShape_base_OnDrawOutline(*args, **kwargs)
 
     def base_OnDrawControlPoints(*args, **kwargs):

-        """base_OnDrawControlPoints(wxDC dc)"""
+        """base_OnDrawControlPoints(DC dc)"""

         return _ogl.PyLineShape_base_OnDrawControlPoints(*args, **kwargs)
 
     def base_OnEraseControlPoints(*args, **kwargs):
         return _ogl.PyLineShape_base_OnDrawControlPoints(*args, **kwargs)
 
     def base_OnEraseControlPoints(*args, **kwargs):

-        """base_OnEraseControlPoints(wxDC dc)"""
+        """base_OnEraseControlPoints(DC dc)"""

         return _ogl.PyLineShape_base_OnEraseControlPoints(*args, **kwargs)
 
     def base_OnMoveLink(*args, **kwargs):
         return _ogl.PyLineShape_base_OnEraseControlPoints(*args, **kwargs)
 
     def base_OnMoveLink(*args, **kwargs):

-        """base_OnMoveLink(wxDC dc, bool moveControlPoints=True)"""
+        """base_OnMoveLink(DC dc, bool moveControlPoints=True)"""

         return _ogl.PyLineShape_base_OnMoveLink(*args, **kwargs)
 
     def base_OnSizingDragLeft(*args, **kwargs):
         return _ogl.PyLineShape_base_OnMoveLink(*args, **kwargs)
 
     def base_OnSizingDragLeft(*args, **kwargs):


@@ -3372,31 +3372,31 @@ class PyPolygonShape(PyShape):
         return _ogl.PyPolygonShape_UpdateOriginalPoints(*args, **kwargs)
 
     def base_OnDraw(*args, **kwargs):
         return _ogl.PyPolygonShape_UpdateOriginalPoints(*args, **kwargs)
 
     def base_OnDraw(*args, **kwargs):

-        """base_OnDraw(wxDC dc)"""
+        """base_OnDraw(DC dc)"""

         return _ogl.PyPolygonShape_base_OnDraw(*args, **kwargs)
 
     def base_OnDrawContents(*args, **kwargs):
         return _ogl.PyPolygonShape_base_OnDraw(*args, **kwargs)
 
     def base_OnDrawContents(*args, **kwargs):

-        """base_OnDrawContents(wxDC dc)"""
+        """base_OnDrawContents(DC dc)"""

         return _ogl.PyPolygonShape_base_OnDrawContents(*args, **kwargs)
 
     def base_OnDrawBranches(*args, **kwargs):
         return _ogl.PyPolygonShape_base_OnDrawContents(*args, **kwargs)
 
     def base_OnDrawBranches(*args, **kwargs):

-        """base_OnDrawBranches(wxDC dc, bool erase=FALSE)"""
+        """base_OnDrawBranches(DC dc, bool erase=FALSE)"""

         return _ogl.PyPolygonShape_base_OnDrawBranches(*args, **kwargs)
 
     def base_OnMoveLinks(*args, **kwargs):
         return _ogl.PyPolygonShape_base_OnDrawBranches(*args, **kwargs)
 
     def base_OnMoveLinks(*args, **kwargs):

-        """base_OnMoveLinks(wxDC dc)"""
+        """base_OnMoveLinks(DC dc)"""

         return _ogl.PyPolygonShape_base_OnMoveLinks(*args, **kwargs)
 
     def base_OnErase(*args, **kwargs):
         return _ogl.PyPolygonShape_base_OnMoveLinks(*args, **kwargs)
 
     def base_OnErase(*args, **kwargs):

-        """base_OnErase(wxDC dc)"""
+        """base_OnErase(DC dc)"""

         return _ogl.PyPolygonShape_base_OnErase(*args, **kwargs)
 
     def base_OnEraseContents(*args, **kwargs):
         return _ogl.PyPolygonShape_base_OnErase(*args, **kwargs)
 
     def base_OnEraseContents(*args, **kwargs):

-        """base_OnEraseContents(wxDC dc)"""
+        """base_OnEraseContents(DC dc)"""

         return _ogl.PyPolygonShape_base_OnEraseContents(*args, **kwargs)
 
     def base_OnHighlight(*args, **kwargs):
         return _ogl.PyPolygonShape_base_OnEraseContents(*args, **kwargs)
 
     def base_OnHighlight(*args, **kwargs):

-        """base_OnHighlight(wxDC dc)"""
+        """base_OnHighlight(DC dc)"""

         return _ogl.PyPolygonShape_base_OnHighlight(*args, **kwargs)
 
     def base_OnLeftClick(*args, **kwargs):
         return _ogl.PyPolygonShape_base_OnHighlight(*args, **kwargs)
 
     def base_OnLeftClick(*args, **kwargs):


@@ -3417,14 +3417,14 @@ class PyPolygonShape(PyShape):
 
     def base_OnMovePre(*args, **kwargs):
         """
 
     def base_OnMovePre(*args, **kwargs):
         """

-        base_OnMovePre(wxDC dc, double x, double y, double old_x, double old_y, 
+        base_OnMovePre(DC dc, double x, double y, double old_x, double old_y, 

             bool display=True) -> bool
         """
         return _ogl.PyPolygonShape_base_OnMovePre(*args, **kwargs)
 
     def base_OnMovePost(*args, **kwargs):
         """
             bool display=True) -> bool
         """
         return _ogl.PyPolygonShape_base_OnMovePre(*args, **kwargs)
 
     def base_OnMovePost(*args, **kwargs):
         """

-        base_OnMovePost(wxDC dc, double x, double y, double old_x, double old_y, 
+        base_OnMovePost(DC dc, double x, double y, double old_x, double old_y, 

             bool display=True)
         """
         return _ogl.PyPolygonShape_base_OnMovePost(*args, **kwargs)
             bool display=True)
         """
         return _ogl.PyPolygonShape_base_OnMovePost(*args, **kwargs)


@@ -3454,19 +3454,19 @@ class PyPolygonShape(PyShape):
         return _ogl.PyPolygonShape_base_OnEndDragRight(*args, **kwargs)
 
     def base_OnDrawOutline(*args, **kwargs):
         return _ogl.PyPolygonShape_base_OnEndDragRight(*args, **kwargs)
 
     def base_OnDrawOutline(*args, **kwargs):

-        """base_OnDrawOutline(wxDC dc, double x, double y, double w, double h)"""
+        """base_OnDrawOutline(DC dc, double x, double y, double w, double h)"""

         return _ogl.PyPolygonShape_base_OnDrawOutline(*args, **kwargs)
 
     def base_OnDrawControlPoints(*args, **kwargs):
         return _ogl.PyPolygonShape_base_OnDrawOutline(*args, **kwargs)
 
     def base_OnDrawControlPoints(*args, **kwargs):

-        """base_OnDrawControlPoints(wxDC dc)"""
+        """base_OnDrawControlPoints(DC dc)"""

         return _ogl.PyPolygonShape_base_OnDrawControlPoints(*args, **kwargs)
 
     def base_OnEraseControlPoints(*args, **kwargs):
         return _ogl.PyPolygonShape_base_OnDrawControlPoints(*args, **kwargs)
 
     def base_OnEraseControlPoints(*args, **kwargs):

-        """base_OnEraseControlPoints(wxDC dc)"""
+        """base_OnEraseControlPoints(DC dc)"""

         return _ogl.PyPolygonShape_base_OnEraseControlPoints(*args, **kwargs)
 
     def base_OnMoveLink(*args, **kwargs):
         return _ogl.PyPolygonShape_base_OnEraseControlPoints(*args, **kwargs)
 
     def base_OnMoveLink(*args, **kwargs):

-        """base_OnMoveLink(wxDC dc, bool moveControlPoints=True)"""
+        """base_OnMoveLink(DC dc, bool moveControlPoints=True)"""

         return _ogl.PyPolygonShape_base_OnMoveLink(*args, **kwargs)
 
     def base_OnSizingDragLeft(*args, **kwargs):
         return _ogl.PyPolygonShape_base_OnMoveLink(*args, **kwargs)
 
     def base_OnSizingDragLeft(*args, **kwargs):


@@ -3526,31 +3526,31 @@ class PyTextShape(PyRectangleShape):
         return _ogl.PyTextShape_base_OnDelete(*args, **kwargs)
 
     def base_OnDraw(*args, **kwargs):
         return _ogl.PyTextShape_base_OnDelete(*args, **kwargs)
 
     def base_OnDraw(*args, **kwargs):

-        """base_OnDraw(wxDC dc)"""
+        """base_OnDraw(DC dc)"""

         return _ogl.PyTextShape_base_OnDraw(*args, **kwargs)
 
     def base_OnDrawContents(*args, **kwargs):
         return _ogl.PyTextShape_base_OnDraw(*args, **kwargs)
 
     def base_OnDrawContents(*args, **kwargs):

-        """base_OnDrawContents(wxDC dc)"""
+        """base_OnDrawContents(DC dc)"""

         return _ogl.PyTextShape_base_OnDrawContents(*args, **kwargs)
 
     def base_OnDrawBranches(*args, **kwargs):
         return _ogl.PyTextShape_base_OnDrawContents(*args, **kwargs)
 
     def base_OnDrawBranches(*args, **kwargs):

-        """base_OnDrawBranches(wxDC dc, bool erase=FALSE)"""
+        """base_OnDrawBranches(DC dc, bool erase=FALSE)"""

         return _ogl.PyTextShape_base_OnDrawBranches(*args, **kwargs)
 
     def base_OnMoveLinks(*args, **kwargs):
         return _ogl.PyTextShape_base_OnDrawBranches(*args, **kwargs)
 
     def base_OnMoveLinks(*args, **kwargs):

-        """base_OnMoveLinks(wxDC dc)"""
+        """base_OnMoveLinks(DC dc)"""

         return _ogl.PyTextShape_base_OnMoveLinks(*args, **kwargs)
 
     def base_OnErase(*args, **kwargs):
         return _ogl.PyTextShape_base_OnMoveLinks(*args, **kwargs)
 
     def base_OnErase(*args, **kwargs):

-        """base_OnErase(wxDC dc)"""
+        """base_OnErase(DC dc)"""

         return _ogl.PyTextShape_base_OnErase(*args, **kwargs)
 
     def base_OnEraseContents(*args, **kwargs):
         return _ogl.PyTextShape_base_OnErase(*args, **kwargs)
 
     def base_OnEraseContents(*args, **kwargs):

-        """base_OnEraseContents(wxDC dc)"""
+        """base_OnEraseContents(DC dc)"""

         return _ogl.PyTextShape_base_OnEraseContents(*args, **kwargs)
 
     def base_OnHighlight(*args, **kwargs):
         return _ogl.PyTextShape_base_OnEraseContents(*args, **kwargs)
 
     def base_OnHighlight(*args, **kwargs):

-        """base_OnHighlight(wxDC dc)"""
+        """base_OnHighlight(DC dc)"""

         return _ogl.PyTextShape_base_OnHighlight(*args, **kwargs)
 
     def base_OnLeftClick(*args, **kwargs):
         return _ogl.PyTextShape_base_OnHighlight(*args, **kwargs)
 
     def base_OnLeftClick(*args, **kwargs):


@@ -3571,14 +3571,14 @@ class PyTextShape(PyRectangleShape):
 
     def base_OnMovePre(*args, **kwargs):
         """
 
     def base_OnMovePre(*args, **kwargs):
         """

-        base_OnMovePre(wxDC dc, double x, double y, double old_x, double old_y, 
+        base_OnMovePre(DC dc, double x, double y, double old_x, double old_y, 

             bool display=True) -> bool
         """
         return _ogl.PyTextShape_base_OnMovePre(*args, **kwargs)
 
     def base_OnMovePost(*args, **kwargs):
         """
             bool display=True) -> bool
         """
         return _ogl.PyTextShape_base_OnMovePre(*args, **kwargs)
 
     def base_OnMovePost(*args, **kwargs):
         """

-        base_OnMovePost(wxDC dc, double x, double y, double old_x, double old_y, 
+        base_OnMovePost(DC dc, double x, double y, double old_x, double old_y, 

             bool display=True)
         """
         return _ogl.PyTextShape_base_OnMovePost(*args, **kwargs)
             bool display=True)
         """
         return _ogl.PyTextShape_base_OnMovePost(*args, **kwargs)


@@ -3608,19 +3608,19 @@ class PyTextShape(PyRectangleShape):
         return _ogl.PyTextShape_base_OnEndDragRight(*args, **kwargs)
 
     def base_OnDrawOutline(*args, **kwargs):
         return _ogl.PyTextShape_base_OnEndDragRight(*args, **kwargs)
 
     def base_OnDrawOutline(*args, **kwargs):

-        """base_OnDrawOutline(wxDC dc, double x, double y, double w, double h)"""
+        """base_OnDrawOutline(DC dc, double x, double y, double w, double h)"""

         return _ogl.PyTextShape_base_OnDrawOutline(*args, **kwargs)
 
     def base_OnDrawControlPoints(*args, **kwargs):
         return _ogl.PyTextShape_base_OnDrawOutline(*args, **kwargs)
 
     def base_OnDrawControlPoints(*args, **kwargs):

-        """base_OnDrawControlPoints(wxDC dc)"""
+        """base_OnDrawControlPoints(DC dc)"""

         return _ogl.PyTextShape_base_OnDrawControlPoints(*args, **kwargs)
 
     def base_OnEraseControlPoints(*args, **kwargs):
         return _ogl.PyTextShape_base_OnDrawControlPoints(*args, **kwargs)
 
     def base_OnEraseControlPoints(*args, **kwargs):

-        """base_OnEraseControlPoints(wxDC dc)"""
+        """base_OnEraseControlPoints(DC dc)"""

         return _ogl.PyTextShape_base_OnEraseControlPoints(*args, **kwargs)
 
     def base_OnMoveLink(*args, **kwargs):
         return _ogl.PyTextShape_base_OnEraseControlPoints(*args, **kwargs)
 
     def base_OnMoveLink(*args, **kwargs):

-        """base_OnMoveLink(wxDC dc, bool moveControlPoints=True)"""
+        """base_OnMoveLink(DC dc, bool moveControlPoints=True)"""

         return _ogl.PyTextShape_base_OnMoveLink(*args, **kwargs)
 
     def base_OnSizingDragLeft(*args, **kwargs):
         return _ogl.PyTextShape_base_OnMoveLink(*args, **kwargs)
 
     def base_OnSizingDragLeft(*args, **kwargs):


@@ -3674,7 +3674,7 @@ class Diagram(core.Object):
         return _ogl.Diagram_AddShape(*args, **kwargs)
 
     def Clear(*args, **kwargs):
         return _ogl.Diagram_AddShape(*args, **kwargs)
 
     def Clear(*args, **kwargs):

-        """Clear(wxDC dc)"""
+        """Clear(DC dc)"""

         return _ogl.Diagram_Clear(*args, **kwargs)
 
     def DeleteAllShapes(*args, **kwargs):
         return _ogl.Diagram_Clear(*args, **kwargs)
 
     def DeleteAllShapes(*args, **kwargs):


@@ -3682,7 +3682,7 @@ class Diagram(core.Object):
         return _ogl.Diagram_DeleteAllShapes(*args, **kwargs)
 
     def DrawOutline(*args, **kwargs):
         return _ogl.Diagram_DeleteAllShapes(*args, **kwargs)
 
     def DrawOutline(*args, **kwargs):

-        """DrawOutline(wxDC dc, double x1, double y1, double x2, double y2)"""
+        """DrawOutline(DC dc, double x1, double y1, double x2, double y2)"""

         return _ogl.Diagram_DrawOutline(*args, **kwargs)
 
     def FindShape(*args, **kwargs):
         return _ogl.Diagram_DrawOutline(*args, **kwargs)
 
     def FindShape(*args, **kwargs):


@@ -3722,11 +3722,11 @@ class Diagram(core.Object):
         return _ogl.Diagram_InsertShape(*args, **kwargs)
 
     def RecentreAll(*args, **kwargs):
         return _ogl.Diagram_InsertShape(*args, **kwargs)
 
     def RecentreAll(*args, **kwargs):

-        """RecentreAll(wxDC dc)"""
+        """RecentreAll(DC dc)"""

         return _ogl.Diagram_RecentreAll(*args, **kwargs)
 
     def Redraw(*args, **kwargs):
         return _ogl.Diagram_RecentreAll(*args, **kwargs)
 
     def Redraw(*args, **kwargs):

-        """Redraw(wxDC dc)"""
+        """Redraw(DC dc)"""

         return _ogl.Diagram_Redraw(*args, **kwargs)
 
     def RemoveAllShapes(*args, **kwargs):
         return _ogl.Diagram_Redraw(*args, **kwargs)
 
     def RemoveAllShapes(*args, **kwargs):


@@ -3780,7 +3780,7 @@ class PyShapeCanvas(windows.ScrolledWindow):
         """
         __init__(Window parent=None, int id=-1, Point pos=DefaultPosition, 
             Size size=DefaultSize, long style=BORDER, 
         """
         __init__(Window parent=None, int id=-1, Point pos=DefaultPosition, 
             Size size=DefaultSize, long style=BORDER, 

-            wxString name=wxPyShapeCanvasNameStr) -> PyShapeCanvas
+            String name=wxPyShapeCanvasNameStr) -> PyShapeCanvas

         """
         newobj = _ogl.new_PyShapeCanvas(*args, **kwargs)
         self.this = newobj.this
         """
         newobj = _ogl.new_PyShapeCanvas(*args, **kwargs)
         self.this = newobj.this


@@ -3854,7 +3854,7 @@ class PyShapeCanvas(windows.ScrolledWindow):
         return _ogl.PyShapeCanvas_base_OnRightClick(*args, **kwargs)
 
     def Redraw(*args, **kwargs):
         return _ogl.PyShapeCanvas_base_OnRightClick(*args, **kwargs)
 
     def Redraw(*args, **kwargs):

-        """Redraw(wxDC dc)"""
+        """Redraw(DC dc)"""

         return _ogl.PyShapeCanvas_Redraw(*args, **kwargs)
 
     def RemoveShape(*args, **kwargs):
         return _ogl.PyShapeCanvas_Redraw(*args, **kwargs)
 
     def RemoveShape(*args, **kwargs):

diff --git a/wxPython/contrib/stc/stc.py b/wxPython/contrib/stc/stc.py
index a1a5e14a47383b0ffcec5bbc5232857513cabb06..3fa573f26bc6b487b712705cdf5222ad3333abe0 100644 (file)
--- a/wxPython/contrib/stc/stc.py
+++ b/wxPython/contrib/stc/stc.py
@@ -783,7 +783,7 @@ class StyledTextCtrl(core.Control):
     def __init__(self, *args, **kwargs):
         """
         __init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
     def __init__(self, *args, **kwargs):
         """
         __init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 

-            long style=0, wxString name=wxPySTCNameStr) -> StyledTextCtrl
+            long style=0, String name=wxPySTCNameStr) -> StyledTextCtrl

         """
         newobj = _stc.new_StyledTextCtrl(*args, **kwargs)
         self.this = newobj.this
         """
         newobj = _stc.new_StyledTextCtrl(*args, **kwargs)
         self.this = newobj.this


@@ -794,12 +794,12 @@ class StyledTextCtrl(core.Control):
     def Create(*args, **kwargs):
         """
         Create(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
     def Create(*args, **kwargs):
         """
         Create(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 

-            long style=0, wxString name=wxSTCNameStr)
+            long style=0, String name=wxSTCNameStr)

         """
         return _stc.StyledTextCtrl_Create(*args, **kwargs)
 
     def AddText(*args, **kwargs):
         """
         return _stc.StyledTextCtrl_Create(*args, **kwargs)
 
     def AddText(*args, **kwargs):

-        """AddText(wxString text)"""
+        """AddText(String text)"""

         return _stc.StyledTextCtrl_AddText(*args, **kwargs)
 
     def AddStyledText(*args, **kwargs):
         return _stc.StyledTextCtrl_AddText(*args, **kwargs)
 
     def AddStyledText(*args, **kwargs):


@@ -807,7 +807,7 @@ class StyledTextCtrl(core.Control):
         return _stc.StyledTextCtrl_AddStyledText(*args, **kwargs)
 
     def InsertText(*args, **kwargs):
         return _stc.StyledTextCtrl_AddStyledText(*args, **kwargs)
 
     def InsertText(*args, **kwargs):

-        """InsertText(int pos, wxString text)"""
+        """InsertText(int pos, String text)"""

         return _stc.StyledTextCtrl_InsertText(*args, **kwargs)
 
     def ClearAll(*args, **kwargs):
         return _stc.StyledTextCtrl_InsertText(*args, **kwargs)
 
     def ClearAll(*args, **kwargs):


@@ -903,7 +903,7 @@ class StyledTextCtrl(core.Control):
         return _stc.StyledTextCtrl_SetAnchor(*args, **kwargs)
 
     def GetCurLine(*args, **kwargs):
         return _stc.StyledTextCtrl_SetAnchor(*args, **kwargs)
 
     def GetCurLine(*args, **kwargs):

-        """GetCurLine(int OUTPUT) -> wxString"""
+        """GetCurLine(int OUTPUT) -> String"""

         return _stc.StyledTextCtrl_GetCurLine(*args, **kwargs)
 
     def GetEndStyled(*args, **kwargs):
         return _stc.StyledTextCtrl_GetCurLine(*args, **kwargs)
 
     def GetEndStyled(*args, **kwargs):


@@ -952,17 +952,17 @@ class StyledTextCtrl(core.Control):
 
     def MarkerDefine(*args, **kwargs):
         """
 
     def MarkerDefine(*args, **kwargs):
         """

-        MarkerDefine(int markerNumber, int markerSymbol, wxColour foreground=wxNullColour, 
-            wxColour background=wxNullColour)
+        MarkerDefine(int markerNumber, int markerSymbol, Colour foreground=wxNullColour, 
+            Colour background=wxNullColour)

         """
         return _stc.StyledTextCtrl_MarkerDefine(*args, **kwargs)
 
     def MarkerSetForeground(*args, **kwargs):
         """
         return _stc.StyledTextCtrl_MarkerDefine(*args, **kwargs)
 
     def MarkerSetForeground(*args, **kwargs):

-        """MarkerSetForeground(int markerNumber, wxColour fore)"""
+        """MarkerSetForeground(int markerNumber, Colour fore)"""

         return _stc.StyledTextCtrl_MarkerSetForeground(*args, **kwargs)
 
     def MarkerSetBackground(*args, **kwargs):
         return _stc.StyledTextCtrl_MarkerSetForeground(*args, **kwargs)
 
     def MarkerSetBackground(*args, **kwargs):

-        """MarkerSetBackground(int markerNumber, wxColour back)"""
+        """MarkerSetBackground(int markerNumber, Colour back)"""

         return _stc.StyledTextCtrl_MarkerSetBackground(*args, **kwargs)
 
     def MarkerAdd(*args, **kwargs):
         return _stc.StyledTextCtrl_MarkerSetBackground(*args, **kwargs)
 
     def MarkerAdd(*args, **kwargs):


@@ -990,7 +990,7 @@ class StyledTextCtrl(core.Control):
         return _stc.StyledTextCtrl_MarkerPrevious(*args, **kwargs)
 
     def MarkerDefineBitmap(*args, **kwargs):
         return _stc.StyledTextCtrl_MarkerPrevious(*args, **kwargs)
 
     def MarkerDefineBitmap(*args, **kwargs):

-        """MarkerDefineBitmap(int markerNumber, wxBitmap bmp)"""
+        """MarkerDefineBitmap(int markerNumber, Bitmap bmp)"""

         return _stc.StyledTextCtrl_MarkerDefineBitmap(*args, **kwargs)
 
     def SetMarginType(*args, **kwargs):
         return _stc.StyledTextCtrl_MarkerDefineBitmap(*args, **kwargs)
 
     def SetMarginType(*args, **kwargs):


@@ -1030,11 +1030,11 @@ class StyledTextCtrl(core.Control):
         return _stc.StyledTextCtrl_StyleClearAll(*args, **kwargs)
 
     def StyleSetForeground(*args, **kwargs):
         return _stc.StyledTextCtrl_StyleClearAll(*args, **kwargs)
 
     def StyleSetForeground(*args, **kwargs):

-        """StyleSetForeground(int style, wxColour fore)"""
+        """StyleSetForeground(int style, Colour fore)"""

         return _stc.StyledTextCtrl_StyleSetForeground(*args, **kwargs)
 
     def StyleSetBackground(*args, **kwargs):
         return _stc.StyledTextCtrl_StyleSetForeground(*args, **kwargs)
 
     def StyleSetBackground(*args, **kwargs):

-        """StyleSetBackground(int style, wxColour back)"""
+        """StyleSetBackground(int style, Colour back)"""

         return _stc.StyledTextCtrl_StyleSetBackground(*args, **kwargs)
 
     def StyleSetBold(*args, **kwargs):
         return _stc.StyledTextCtrl_StyleSetBackground(*args, **kwargs)
 
     def StyleSetBold(*args, **kwargs):


@@ -1050,7 +1050,7 @@ class StyledTextCtrl(core.Control):
         return _stc.StyledTextCtrl_StyleSetSize(*args, **kwargs)
 
     def StyleSetFaceName(*args, **kwargs):
         return _stc.StyledTextCtrl_StyleSetSize(*args, **kwargs)
 
     def StyleSetFaceName(*args, **kwargs):

-        """StyleSetFaceName(int style, wxString fontName)"""
+        """StyleSetFaceName(int style, String fontName)"""

         return _stc.StyledTextCtrl_StyleSetFaceName(*args, **kwargs)
 
     def StyleSetEOLFilled(*args, **kwargs):
         return _stc.StyledTextCtrl_StyleSetFaceName(*args, **kwargs)
 
     def StyleSetEOLFilled(*args, **kwargs):


@@ -1078,15 +1078,15 @@ class StyledTextCtrl(core.Control):
         return _stc.StyledTextCtrl_StyleSetHotSpot(*args, **kwargs)
 
     def SetSelForeground(*args, **kwargs):
         return _stc.StyledTextCtrl_StyleSetHotSpot(*args, **kwargs)
 
     def SetSelForeground(*args, **kwargs):

-        """SetSelForeground(bool useSetting, wxColour fore)"""
+        """SetSelForeground(bool useSetting, Colour fore)"""

         return _stc.StyledTextCtrl_SetSelForeground(*args, **kwargs)
 
     def SetSelBackground(*args, **kwargs):
         return _stc.StyledTextCtrl_SetSelForeground(*args, **kwargs)
 
     def SetSelBackground(*args, **kwargs):

-        """SetSelBackground(bool useSetting, wxColour back)"""
+        """SetSelBackground(bool useSetting, Colour back)"""

         return _stc.StyledTextCtrl_SetSelBackground(*args, **kwargs)
 
     def SetCaretForeground(*args, **kwargs):
         return _stc.StyledTextCtrl_SetSelBackground(*args, **kwargs)
 
     def SetCaretForeground(*args, **kwargs):

-        """SetCaretForeground(wxColour fore)"""
+        """SetCaretForeground(Colour fore)"""

         return _stc.StyledTextCtrl_SetCaretForeground(*args, **kwargs)
 
     def CmdKeyAssign(*args, **kwargs):
         return _stc.StyledTextCtrl_SetCaretForeground(*args, **kwargs)
 
     def CmdKeyAssign(*args, **kwargs):


@@ -1118,7 +1118,7 @@ class StyledTextCtrl(core.Control):
         return _stc.StyledTextCtrl_SetCaretPeriod(*args, **kwargs)
 
     def SetWordChars(*args, **kwargs):
         return _stc.StyledTextCtrl_SetCaretPeriod(*args, **kwargs)
 
     def SetWordChars(*args, **kwargs):

-        """SetWordChars(wxString characters)"""
+        """SetWordChars(String characters)"""

         return _stc.StyledTextCtrl_SetWordChars(*args, **kwargs)
 
     def BeginUndoAction(*args, **kwargs):
         return _stc.StyledTextCtrl_SetWordChars(*args, **kwargs)
 
     def BeginUndoAction(*args, **kwargs):


@@ -1138,19 +1138,19 @@ class StyledTextCtrl(core.Control):
         return _stc.StyledTextCtrl_IndicatorGetStyle(*args, **kwargs)
 
     def IndicatorSetForeground(*args, **kwargs):
         return _stc.StyledTextCtrl_IndicatorGetStyle(*args, **kwargs)
 
     def IndicatorSetForeground(*args, **kwargs):

-        """IndicatorSetForeground(int indic, wxColour fore)"""
+        """IndicatorSetForeground(int indic, Colour fore)"""

         return _stc.StyledTextCtrl_IndicatorSetForeground(*args, **kwargs)
 
     def IndicatorGetForeground(*args, **kwargs):
         return _stc.StyledTextCtrl_IndicatorSetForeground(*args, **kwargs)
 
     def IndicatorGetForeground(*args, **kwargs):

-        """IndicatorGetForeground(int indic) -> wxColour"""
+        """IndicatorGetForeground(int indic) -> Colour"""

         return _stc.StyledTextCtrl_IndicatorGetForeground(*args, **kwargs)
 
     def SetWhitespaceForeground(*args, **kwargs):
         return _stc.StyledTextCtrl_IndicatorGetForeground(*args, **kwargs)
 
     def SetWhitespaceForeground(*args, **kwargs):

-        """SetWhitespaceForeground(bool useSetting, wxColour fore)"""
+        """SetWhitespaceForeground(bool useSetting, Colour fore)"""

         return _stc.StyledTextCtrl_SetWhitespaceForeground(*args, **kwargs)
 
     def SetWhitespaceBackground(*args, **kwargs):
         return _stc.StyledTextCtrl_SetWhitespaceForeground(*args, **kwargs)
 
     def SetWhitespaceBackground(*args, **kwargs):

-        """SetWhitespaceBackground(bool useSetting, wxColour back)"""
+        """SetWhitespaceBackground(bool useSetting, Colour back)"""

         return _stc.StyledTextCtrl_SetWhitespaceBackground(*args, **kwargs)
 
     def SetStyleBits(*args, **kwargs):
         return _stc.StyledTextCtrl_SetWhitespaceBackground(*args, **kwargs)
 
     def SetStyleBits(*args, **kwargs):


@@ -1182,11 +1182,11 @@ class StyledTextCtrl(core.Control):
         return _stc.StyledTextCtrl_SetCaretLineVisible(*args, **kwargs)
 
     def GetCaretLineBack(*args, **kwargs):
         return _stc.StyledTextCtrl_SetCaretLineVisible(*args, **kwargs)
 
     def GetCaretLineBack(*args, **kwargs):

-        """GetCaretLineBack() -> wxColour"""
+        """GetCaretLineBack() -> Colour"""

         return _stc.StyledTextCtrl_GetCaretLineBack(*args, **kwargs)
 
     def SetCaretLineBack(*args, **kwargs):
         return _stc.StyledTextCtrl_GetCaretLineBack(*args, **kwargs)
 
     def SetCaretLineBack(*args, **kwargs):

-        """SetCaretLineBack(wxColour back)"""
+        """SetCaretLineBack(Colour back)"""

         return _stc.StyledTextCtrl_SetCaretLineBack(*args, **kwargs)
 
     def StyleSetChangeable(*args, **kwargs):
         return _stc.StyledTextCtrl_SetCaretLineBack(*args, **kwargs)
 
     def StyleSetChangeable(*args, **kwargs):


@@ -1194,7 +1194,7 @@ class StyledTextCtrl(core.Control):
         return _stc.StyledTextCtrl_StyleSetChangeable(*args, **kwargs)
 
     def AutoCompShow(*args, **kwargs):
         return _stc.StyledTextCtrl_StyleSetChangeable(*args, **kwargs)
 
     def AutoCompShow(*args, **kwargs):

-        """AutoCompShow(int lenEntered, wxString itemList)"""
+        """AutoCompShow(int lenEntered, String itemList)"""

         return _stc.StyledTextCtrl_AutoCompShow(*args, **kwargs)
 
     def AutoCompCancel(*args, **kwargs):
         return _stc.StyledTextCtrl_AutoCompShow(*args, **kwargs)
 
     def AutoCompCancel(*args, **kwargs):


@@ -1214,7 +1214,7 @@ class StyledTextCtrl(core.Control):
         return _stc.StyledTextCtrl_AutoCompComplete(*args, **kwargs)
 
     def AutoCompStops(*args, **kwargs):
         return _stc.StyledTextCtrl_AutoCompComplete(*args, **kwargs)
 
     def AutoCompStops(*args, **kwargs):

-        """AutoCompStops(wxString characterSet)"""
+        """AutoCompStops(String characterSet)"""

         return _stc.StyledTextCtrl_AutoCompStops(*args, **kwargs)
 
     def AutoCompSetSeparator(*args, **kwargs):
         return _stc.StyledTextCtrl_AutoCompStops(*args, **kwargs)
 
     def AutoCompSetSeparator(*args, **kwargs):


@@ -1226,7 +1226,7 @@ class StyledTextCtrl(core.Control):
         return _stc.StyledTextCtrl_AutoCompGetSeparator(*args, **kwargs)
 
     def AutoCompSelect(*args, **kwargs):
         return _stc.StyledTextCtrl_AutoCompGetSeparator(*args, **kwargs)
 
     def AutoCompSelect(*args, **kwargs):

-        """AutoCompSelect(wxString text)"""
+        """AutoCompSelect(String text)"""

         return _stc.StyledTextCtrl_AutoCompSelect(*args, **kwargs)
 
     def AutoCompSetCancelAtStart(*args, **kwargs):
         return _stc.StyledTextCtrl_AutoCompSelect(*args, **kwargs)
 
     def AutoCompSetCancelAtStart(*args, **kwargs):


@@ -1238,7 +1238,7 @@ class StyledTextCtrl(core.Control):
         return _stc.StyledTextCtrl_AutoCompGetCancelAtStart(*args, **kwargs)
 
     def AutoCompSetFillUps(*args, **kwargs):
         return _stc.StyledTextCtrl_AutoCompGetCancelAtStart(*args, **kwargs)
 
     def AutoCompSetFillUps(*args, **kwargs):

-        """AutoCompSetFillUps(wxString characterSet)"""
+        """AutoCompSetFillUps(String characterSet)"""

         return _stc.StyledTextCtrl_AutoCompSetFillUps(*args, **kwargs)
 
     def AutoCompSetChooseSingle(*args, **kwargs):
         return _stc.StyledTextCtrl_AutoCompSetFillUps(*args, **kwargs)
 
     def AutoCompSetChooseSingle(*args, **kwargs):


@@ -1258,7 +1258,7 @@ class StyledTextCtrl(core.Control):
         return _stc.StyledTextCtrl_AutoCompGetIgnoreCase(*args, **kwargs)
 
     def UserListShow(*args, **kwargs):
         return _stc.StyledTextCtrl_AutoCompGetIgnoreCase(*args, **kwargs)
 
     def UserListShow(*args, **kwargs):

-        """UserListShow(int listType, wxString itemList)"""
+        """UserListShow(int listType, String itemList)"""

         return _stc.StyledTextCtrl_UserListShow(*args, **kwargs)
 
     def AutoCompSetAutoHide(*args, **kwargs):
         return _stc.StyledTextCtrl_UserListShow(*args, **kwargs)
 
     def AutoCompSetAutoHide(*args, **kwargs):


@@ -1278,7 +1278,7 @@ class StyledTextCtrl(core.Control):
         return _stc.StyledTextCtrl_AutoCompGetDropRestOfWord(*args, **kwargs)
 
     def RegisterImage(*args, **kwargs):
         return _stc.StyledTextCtrl_AutoCompGetDropRestOfWord(*args, **kwargs)
 
     def RegisterImage(*args, **kwargs):

-        """RegisterImage(int type, wxBitmap bmp)"""
+        """RegisterImage(int type, Bitmap bmp)"""

         return _stc.StyledTextCtrl_RegisterImage(*args, **kwargs)
 
     def ClearRegisteredImages(*args, **kwargs):
         return _stc.StyledTextCtrl_RegisterImage(*args, **kwargs)
 
     def ClearRegisteredImages(*args, **kwargs):


@@ -1358,7 +1358,7 @@ class StyledTextCtrl(core.Control):
         return _stc.StyledTextCtrl_GetCodePage(*args, **kwargs)
 
     def GetCaretForeground(*args, **kwargs):
         return _stc.StyledTextCtrl_GetCodePage(*args, **kwargs)
 
     def GetCaretForeground(*args, **kwargs):

-        """GetCaretForeground() -> wxColour"""
+        """GetCaretForeground() -> Colour"""

         return _stc.StyledTextCtrl_GetCaretForeground(*args, **kwargs)
 
     def GetReadOnly(*args, **kwargs):
         return _stc.StyledTextCtrl_GetCaretForeground(*args, **kwargs)
 
     def GetReadOnly(*args, **kwargs):


@@ -1402,12 +1402,12 @@ class StyledTextCtrl(core.Control):
         return _stc.StyledTextCtrl_GetPrintColourMode(*args, **kwargs)
 
     def FindText(*args, **kwargs):
         return _stc.StyledTextCtrl_GetPrintColourMode(*args, **kwargs)
 
     def FindText(*args, **kwargs):

-        """FindText(int minPos, int maxPos, wxString text, int flags=0) -> int"""
+        """FindText(int minPos, int maxPos, String text, int flags=0) -> int"""

         return _stc.StyledTextCtrl_FindText(*args, **kwargs)
 
     def FormatRange(*args, **kwargs):
         """
         return _stc.StyledTextCtrl_FindText(*args, **kwargs)
 
     def FormatRange(*args, **kwargs):
         """

-        FormatRange(bool doDraw, int startPos, int endPos, wxDC draw, wxDC target, 
+        FormatRange(bool doDraw, int startPos, int endPos, DC draw, DC target, 

             Rect renderRect, Rect pageRect) -> int
         """
         return _stc.StyledTextCtrl_FormatRange(*args, **kwargs)
             Rect renderRect, Rect pageRect) -> int
         """
         return _stc.StyledTextCtrl_FormatRange(*args, **kwargs)


@@ -1417,7 +1417,7 @@ class StyledTextCtrl(core.Control):
         return _stc.StyledTextCtrl_GetFirstVisibleLine(*args, **kwargs)
 
     def GetLine(*args, **kwargs):
         return _stc.StyledTextCtrl_GetFirstVisibleLine(*args, **kwargs)
 
     def GetLine(*args, **kwargs):

-        """GetLine(int line) -> wxString"""
+        """GetLine(int line) -> String"""

         return _stc.StyledTextCtrl_GetLine(*args, **kwargs)
 
     def GetLineCount(*args, **kwargs):
         return _stc.StyledTextCtrl_GetLine(*args, **kwargs)
 
     def GetLineCount(*args, **kwargs):


@@ -1449,11 +1449,11 @@ class StyledTextCtrl(core.Control):
         return _stc.StyledTextCtrl_SetSelection(*args, **kwargs)
 
     def GetSelectedText(*args, **kwargs):
         return _stc.StyledTextCtrl_SetSelection(*args, **kwargs)
 
     def GetSelectedText(*args, **kwargs):

-        """GetSelectedText() -> wxString"""
+        """GetSelectedText() -> String"""

         return _stc.StyledTextCtrl_GetSelectedText(*args, **kwargs)
 
     def GetTextRange(*args, **kwargs):
         return _stc.StyledTextCtrl_GetSelectedText(*args, **kwargs)
 
     def GetTextRange(*args, **kwargs):

-        """GetTextRange(int startPos, int endPos) -> wxString"""
+        """GetTextRange(int startPos, int endPos) -> String"""

         return _stc.StyledTextCtrl_GetTextRange(*args, **kwargs)
 
     def HideSelection(*args, **kwargs):
         return _stc.StyledTextCtrl_GetTextRange(*args, **kwargs)
 
     def HideSelection(*args, **kwargs):


@@ -1477,7 +1477,7 @@ class StyledTextCtrl(core.Control):
         return _stc.StyledTextCtrl_EnsureCaretVisible(*args, **kwargs)
 
     def ReplaceSelection(*args, **kwargs):
         return _stc.StyledTextCtrl_EnsureCaretVisible(*args, **kwargs)
 
     def ReplaceSelection(*args, **kwargs):

-        """ReplaceSelection(wxString text)"""
+        """ReplaceSelection(String text)"""

         return _stc.StyledTextCtrl_ReplaceSelection(*args, **kwargs)
 
     def SetReadOnly(*args, **kwargs):
         return _stc.StyledTextCtrl_ReplaceSelection(*args, **kwargs)
 
     def SetReadOnly(*args, **kwargs):


@@ -1517,11 +1517,11 @@ class StyledTextCtrl(core.Control):
         return _stc.StyledTextCtrl_Clear(*args, **kwargs)
 
     def SetText(*args, **kwargs):
         return _stc.StyledTextCtrl_Clear(*args, **kwargs)
 
     def SetText(*args, **kwargs):

-        """SetText(wxString text)"""
+        """SetText(String text)"""

         return _stc.StyledTextCtrl_SetText(*args, **kwargs)
 
     def GetText(*args, **kwargs):
         return _stc.StyledTextCtrl_SetText(*args, **kwargs)
 
     def GetText(*args, **kwargs):

-        """GetText() -> wxString"""
+        """GetText() -> String"""

         return _stc.StyledTextCtrl_GetText(*args, **kwargs)
 
     def GetTextLength(*args, **kwargs):
         return _stc.StyledTextCtrl_GetText(*args, **kwargs)
 
     def GetTextLength(*args, **kwargs):


@@ -1561,15 +1561,15 @@ class StyledTextCtrl(core.Control):
         return _stc.StyledTextCtrl_GetTargetEnd(*args, **kwargs)
 
     def ReplaceTarget(*args, **kwargs):
         return _stc.StyledTextCtrl_GetTargetEnd(*args, **kwargs)
 
     def ReplaceTarget(*args, **kwargs):

-        """ReplaceTarget(wxString text) -> int"""
+        """ReplaceTarget(String text) -> int"""

         return _stc.StyledTextCtrl_ReplaceTarget(*args, **kwargs)
 
     def ReplaceTargetRE(*args, **kwargs):
         return _stc.StyledTextCtrl_ReplaceTarget(*args, **kwargs)
 
     def ReplaceTargetRE(*args, **kwargs):

-        """ReplaceTargetRE(wxString text) -> int"""
+        """ReplaceTargetRE(String text) -> int"""

         return _stc.StyledTextCtrl_ReplaceTargetRE(*args, **kwargs)
 
     def SearchInTarget(*args, **kwargs):
         return _stc.StyledTextCtrl_ReplaceTargetRE(*args, **kwargs)
 
     def SearchInTarget(*args, **kwargs):

-        """SearchInTarget(wxString text) -> int"""
+        """SearchInTarget(String text) -> int"""

         return _stc.StyledTextCtrl_SearchInTarget(*args, **kwargs)
 
     def SetSearchFlags(*args, **kwargs):
         return _stc.StyledTextCtrl_SearchInTarget(*args, **kwargs)
 
     def SetSearchFlags(*args, **kwargs):


@@ -1581,7 +1581,7 @@ class StyledTextCtrl(core.Control):
         return _stc.StyledTextCtrl_GetSearchFlags(*args, **kwargs)
 
     def CallTipShow(*args, **kwargs):
         return _stc.StyledTextCtrl_GetSearchFlags(*args, **kwargs)
 
     def CallTipShow(*args, **kwargs):

-        """CallTipShow(int pos, wxString definition)"""
+        """CallTipShow(int pos, String definition)"""

         return _stc.StyledTextCtrl_CallTipShow(*args, **kwargs)
 
     def CallTipCancel(*args, **kwargs):
         return _stc.StyledTextCtrl_CallTipShow(*args, **kwargs)
 
     def CallTipCancel(*args, **kwargs):


@@ -1601,15 +1601,15 @@ class StyledTextCtrl(core.Control):
         return _stc.StyledTextCtrl_CallTipSetHighlight(*args, **kwargs)
 
     def CallTipSetBackground(*args, **kwargs):
         return _stc.StyledTextCtrl_CallTipSetHighlight(*args, **kwargs)
 
     def CallTipSetBackground(*args, **kwargs):

-        """CallTipSetBackground(wxColour back)"""
+        """CallTipSetBackground(Colour back)"""

         return _stc.StyledTextCtrl_CallTipSetBackground(*args, **kwargs)
 
     def CallTipSetForeground(*args, **kwargs):
         return _stc.StyledTextCtrl_CallTipSetBackground(*args, **kwargs)
 
     def CallTipSetForeground(*args, **kwargs):

-        """CallTipSetForeground(wxColour fore)"""
+        """CallTipSetForeground(Colour fore)"""

         return _stc.StyledTextCtrl_CallTipSetForeground(*args, **kwargs)
 
     def CallTipSetForegroundHighlight(*args, **kwargs):
         return _stc.StyledTextCtrl_CallTipSetForeground(*args, **kwargs)
 
     def CallTipSetForegroundHighlight(*args, **kwargs):

-        """CallTipSetForegroundHighlight(wxColour fore)"""
+        """CallTipSetForegroundHighlight(Colour fore)"""

         return _stc.StyledTextCtrl_CallTipSetForegroundHighlight(*args, **kwargs)
 
     def VisibleFromDocLine(*args, **kwargs):
         return _stc.StyledTextCtrl_CallTipSetForegroundHighlight(*args, **kwargs)
 
     def VisibleFromDocLine(*args, **kwargs):


@@ -1729,7 +1729,7 @@ class StyledTextCtrl(core.Control):
         return _stc.StyledTextCtrl_GetScrollWidth(*args, **kwargs)
 
     def TextWidth(*args, **kwargs):
         return _stc.StyledTextCtrl_GetScrollWidth(*args, **kwargs)
 
     def TextWidth(*args, **kwargs):

-        """TextWidth(int style, wxString text) -> int"""
+        """TextWidth(int style, String text) -> int"""

         return _stc.StyledTextCtrl_TextWidth(*args, **kwargs)
 
     def SetEndAtLastLine(*args, **kwargs):
         return _stc.StyledTextCtrl_TextWidth(*args, **kwargs)
 
     def SetEndAtLastLine(*args, **kwargs):


@@ -1753,7 +1753,7 @@ class StyledTextCtrl(core.Control):
         return _stc.StyledTextCtrl_GetUseVerticalScrollBar(*args, **kwargs)
 
     def AppendText(*args, **kwargs):
         return _stc.StyledTextCtrl_GetUseVerticalScrollBar(*args, **kwargs)
 
     def AppendText(*args, **kwargs):

-        """AppendText(int length, wxString text)"""
+        """AppendText(int length, String text)"""

         return _stc.StyledTextCtrl_AppendText(*args, **kwargs)
 
     def GetTwoPhaseDraw(*args, **kwargs):
         return _stc.StyledTextCtrl_AppendText(*args, **kwargs)
 
     def GetTwoPhaseDraw(*args, **kwargs):


@@ -1777,11 +1777,11 @@ class StyledTextCtrl(core.Control):
         return _stc.StyledTextCtrl_LinesSplit(*args, **kwargs)
 
     def SetFoldMarginColour(*args, **kwargs):
         return _stc.StyledTextCtrl_LinesSplit(*args, **kwargs)
 
     def SetFoldMarginColour(*args, **kwargs):

-        """SetFoldMarginColour(bool useSetting, wxColour back)"""
+        """SetFoldMarginColour(bool useSetting, Colour back)"""

         return _stc.StyledTextCtrl_SetFoldMarginColour(*args, **kwargs)
 
     def SetFoldMarginHiColour(*args, **kwargs):
         return _stc.StyledTextCtrl_SetFoldMarginColour(*args, **kwargs)
 
     def SetFoldMarginHiColour(*args, **kwargs):

-        """SetFoldMarginHiColour(bool useSetting, wxColour fore)"""
+        """SetFoldMarginHiColour(bool useSetting, Colour fore)"""

         return _stc.StyledTextCtrl_SetFoldMarginHiColour(*args, **kwargs)
 
     def LineDuplicate(*args, **kwargs):
         return _stc.StyledTextCtrl_SetFoldMarginHiColour(*args, **kwargs)
 
     def LineDuplicate(*args, **kwargs):


@@ -1865,11 +1865,11 @@ class StyledTextCtrl(core.Control):
         return _stc.StyledTextCtrl_SetEdgeMode(*args, **kwargs)
 
     def GetEdgeColour(*args, **kwargs):
         return _stc.StyledTextCtrl_SetEdgeMode(*args, **kwargs)
 
     def GetEdgeColour(*args, **kwargs):

-        """GetEdgeColour() -> wxColour"""
+        """GetEdgeColour() -> Colour"""

         return _stc.StyledTextCtrl_GetEdgeColour(*args, **kwargs)
 
     def SetEdgeColour(*args, **kwargs):
         return _stc.StyledTextCtrl_GetEdgeColour(*args, **kwargs)
 
     def SetEdgeColour(*args, **kwargs):

-        """SetEdgeColour(wxColour edgeColour)"""
+        """SetEdgeColour(Colour edgeColour)"""

         return _stc.StyledTextCtrl_SetEdgeColour(*args, **kwargs)
 
     def SearchAnchor(*args, **kwargs):
         return _stc.StyledTextCtrl_SetEdgeColour(*args, **kwargs)
 
     def SearchAnchor(*args, **kwargs):


@@ -1877,11 +1877,11 @@ class StyledTextCtrl(core.Control):
         return _stc.StyledTextCtrl_SearchAnchor(*args, **kwargs)
 
     def SearchNext(*args, **kwargs):
         return _stc.StyledTextCtrl_SearchAnchor(*args, **kwargs)
 
     def SearchNext(*args, **kwargs):

-        """SearchNext(int flags, wxString text) -> int"""
+        """SearchNext(int flags, String text) -> int"""

         return _stc.StyledTextCtrl_SearchNext(*args, **kwargs)
 
     def SearchPrev(*args, **kwargs):
         return _stc.StyledTextCtrl_SearchNext(*args, **kwargs)
 
     def SearchPrev(*args, **kwargs):

-        """SearchPrev(int flags, wxString text) -> int"""
+        """SearchPrev(int flags, String text) -> int"""

         return _stc.StyledTextCtrl_SearchPrev(*args, **kwargs)
 
     def LinesOnScreen(*args, **kwargs):
         return _stc.StyledTextCtrl_SearchPrev(*args, **kwargs)
 
     def LinesOnScreen(*args, **kwargs):


@@ -2017,11 +2017,11 @@ class StyledTextCtrl(core.Control):
         return _stc.StyledTextCtrl_GetPrintWrapMode(*args, **kwargs)
 
     def SetHotspotActiveForeground(*args, **kwargs):
         return _stc.StyledTextCtrl_GetPrintWrapMode(*args, **kwargs)
 
     def SetHotspotActiveForeground(*args, **kwargs):

-        """SetHotspotActiveForeground(bool useSetting, wxColour fore)"""
+        """SetHotspotActiveForeground(bool useSetting, Colour fore)"""

         return _stc.StyledTextCtrl_SetHotspotActiveForeground(*args, **kwargs)
 
     def SetHotspotActiveBackground(*args, **kwargs):
         return _stc.StyledTextCtrl_SetHotspotActiveForeground(*args, **kwargs)
 
     def SetHotspotActiveBackground(*args, **kwargs):

-        """SetHotspotActiveBackground(bool useSetting, wxColour back)"""
+        """SetHotspotActiveBackground(bool useSetting, Colour back)"""

         return _stc.StyledTextCtrl_SetHotspotActiveBackground(*args, **kwargs)
 
     def SetHotspotActiveUnderline(*args, **kwargs):
         return _stc.StyledTextCtrl_SetHotspotActiveBackground(*args, **kwargs)
 
     def SetHotspotActiveUnderline(*args, **kwargs):


@@ -2041,7 +2041,7 @@ class StyledTextCtrl(core.Control):
         return _stc.StyledTextCtrl_CopyRange(*args, **kwargs)
 
     def CopyText(*args, **kwargs):
         return _stc.StyledTextCtrl_CopyRange(*args, **kwargs)
 
     def CopyText(*args, **kwargs):

-        """CopyText(int length, wxString text)"""
+        """CopyText(int length, String text)"""

         return _stc.StyledTextCtrl_CopyText(*args, **kwargs)
 
     def StartRecord(*args, **kwargs):
         return _stc.StyledTextCtrl_CopyText(*args, **kwargs)
 
     def StartRecord(*args, **kwargs):


@@ -2065,15 +2065,15 @@ class StyledTextCtrl(core.Control):
         return _stc.StyledTextCtrl_Colourise(*args, **kwargs)
 
     def SetProperty(*args, **kwargs):
         return _stc.StyledTextCtrl_Colourise(*args, **kwargs)
 
     def SetProperty(*args, **kwargs):

-        """SetProperty(wxString key, wxString value)"""
+        """SetProperty(String key, String value)"""

         return _stc.StyledTextCtrl_SetProperty(*args, **kwargs)
 
     def SetKeyWords(*args, **kwargs):
         return _stc.StyledTextCtrl_SetProperty(*args, **kwargs)
 
     def SetKeyWords(*args, **kwargs):

-        """SetKeyWords(int keywordSet, wxString keyWords)"""
+        """SetKeyWords(int keywordSet, String keyWords)"""

         return _stc.StyledTextCtrl_SetKeyWords(*args, **kwargs)
 
     def SetLexerLanguage(*args, **kwargs):
         return _stc.StyledTextCtrl_SetKeyWords(*args, **kwargs)
 
     def SetLexerLanguage(*args, **kwargs):

-        """SetLexerLanguage(wxString language)"""
+        """SetLexerLanguage(String language)"""

         return _stc.StyledTextCtrl_SetLexerLanguage(*args, **kwargs)
 
     def GetCurrentLine(*args, **kwargs):
         return _stc.StyledTextCtrl_SetLexerLanguage(*args, **kwargs)
 
     def GetCurrentLine(*args, **kwargs):


@@ -2081,16 +2081,16 @@ class StyledTextCtrl(core.Control):
         return _stc.StyledTextCtrl_GetCurrentLine(*args, **kwargs)
 
     def StyleSetSpec(*args, **kwargs):
         return _stc.StyledTextCtrl_GetCurrentLine(*args, **kwargs)
 
     def StyleSetSpec(*args, **kwargs):

-        """StyleSetSpec(int styleNum, wxString spec)"""
+        """StyleSetSpec(int styleNum, String spec)"""

         return _stc.StyledTextCtrl_StyleSetSpec(*args, **kwargs)
 
     def StyleSetFont(*args, **kwargs):
         return _stc.StyledTextCtrl_StyleSetSpec(*args, **kwargs)
 
     def StyleSetFont(*args, **kwargs):

-        """StyleSetFont(int styleNum, wxFont font)"""
+        """StyleSetFont(int styleNum, Font font)"""

         return _stc.StyledTextCtrl_StyleSetFont(*args, **kwargs)
 
     def StyleSetFontAttr(*args, **kwargs):
         """
         return _stc.StyledTextCtrl_StyleSetFont(*args, **kwargs)
 
     def StyleSetFontAttr(*args, **kwargs):
         """

-        StyleSetFontAttr(int styleNum, int size, wxString faceName, bool bold, 
+        StyleSetFontAttr(int styleNum, int size, String faceName, bool bold, 

             bool italic, bool underline)
         """
         return _stc.StyledTextCtrl_StyleSetFontAttr(*args, **kwargs)
             bool italic, bool underline)
         """
         return _stc.StyledTextCtrl_StyleSetFontAttr(*args, **kwargs)


@@ -2140,11 +2140,11 @@ class StyledTextCtrl(core.Control):
         return _stc.StyledTextCtrl_SetLastKeydownProcessed(*args, **kwargs)
 
     def SaveFile(*args, **kwargs):
         return _stc.StyledTextCtrl_SetLastKeydownProcessed(*args, **kwargs)
 
     def SaveFile(*args, **kwargs):

-        """SaveFile(wxString filename) -> bool"""
+        """SaveFile(String filename) -> bool"""

         return _stc.StyledTextCtrl_SaveFile(*args, **kwargs)
 
     def LoadFile(*args, **kwargs):
         return _stc.StyledTextCtrl_SaveFile(*args, **kwargs)
 
     def LoadFile(*args, **kwargs):

-        """LoadFile(wxString filename) -> bool"""
+        """LoadFile(String filename) -> bool"""

         return _stc.StyledTextCtrl_LoadFile(*args, **kwargs)
 
     def DoDragOver(*args, **kwargs):
         return _stc.StyledTextCtrl_LoadFile(*args, **kwargs)
 
     def DoDragOver(*args, **kwargs):


@@ -2152,7 +2152,7 @@ class StyledTextCtrl(core.Control):
         return _stc.StyledTextCtrl_DoDragOver(*args, **kwargs)
 
     def DoDropText(*args, **kwargs):
         return _stc.StyledTextCtrl_DoDragOver(*args, **kwargs)
 
     def DoDropText(*args, **kwargs):

-        """DoDropText(long x, long y, wxString data) -> bool"""
+        """DoDropText(long x, long y, String data) -> bool"""

         return _stc.StyledTextCtrl_DoDropText(*args, **kwargs)
 
 
         return _stc.StyledTextCtrl_DoDropText(*args, **kwargs)
 
 


@@ -2201,7 +2201,7 @@ class StyledTextEvent(core.CommandEvent):
         return _stc.StyledTextEvent_SetModificationType(*args, **kwargs)
 
     def SetText(*args, **kwargs):
         return _stc.StyledTextEvent_SetModificationType(*args, **kwargs)
 
     def SetText(*args, **kwargs):

-        """SetText(wxString t)"""
+        """SetText(String t)"""

         return _stc.StyledTextEvent_SetText(*args, **kwargs)
 
     def SetLength(*args, **kwargs):
         return _stc.StyledTextEvent_SetText(*args, **kwargs)
 
     def SetLength(*args, **kwargs):


@@ -2253,7 +2253,7 @@ class StyledTextEvent(core.CommandEvent):
         return _stc.StyledTextEvent_SetY(*args, **kwargs)
 
     def SetDragText(*args, **kwargs):
         return _stc.StyledTextEvent_SetY(*args, **kwargs)
 
     def SetDragText(*args, **kwargs):

-        """SetDragText(wxString val)"""
+        """SetDragText(String val)"""

         return _stc.StyledTextEvent_SetDragText(*args, **kwargs)
 
     def SetDragAllowMove(*args, **kwargs):
         return _stc.StyledTextEvent_SetDragText(*args, **kwargs)
 
     def SetDragAllowMove(*args, **kwargs):


@@ -2281,7 +2281,7 @@ class StyledTextEvent(core.CommandEvent):
         return _stc.StyledTextEvent_GetModificationType(*args, **kwargs)
 
     def GetText(*args, **kwargs):
         return _stc.StyledTextEvent_GetModificationType(*args, **kwargs)
 
     def GetText(*args, **kwargs):

-        """GetText() -> wxString"""
+        """GetText() -> String"""

         return _stc.StyledTextEvent_GetText(*args, **kwargs)
 
     def GetLength(*args, **kwargs):
         return _stc.StyledTextEvent_GetText(*args, **kwargs)
 
     def GetLength(*args, **kwargs):


@@ -2333,7 +2333,7 @@ class StyledTextEvent(core.CommandEvent):
         return _stc.StyledTextEvent_GetY(*args, **kwargs)
 
     def GetDragText(*args, **kwargs):
         return _stc.StyledTextEvent_GetY(*args, **kwargs)
 
     def GetDragText(*args, **kwargs):

-        """GetDragText() -> wxString"""
+        """GetDragText() -> String"""

         return _stc.StyledTextEvent_GetDragText(*args, **kwargs)
 
     def GetDragAllowMove(*args, **kwargs):
         return _stc.StyledTextEvent_GetDragText(*args, **kwargs)
 
     def GetDragAllowMove(*args, **kwargs):

diff --git a/wxPython/contrib/xrc/xrc.py b/wxPython/contrib/xrc/xrc.py
index 038961c2fe20971349de51208c8cb5e28c063ced..99670dae823d4da1794cc3683debb3a943d2d0b3 100644 (file)
--- a/wxPython/contrib/xrc/xrc.py
+++ b/wxPython/contrib/xrc/xrc.py
@@ -17,7 +17,7 @@ class XmlResource(core.Object):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxXmlResource instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxXmlResource instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):

-        """__init__(wxString filemask, int flags=XRC_USE_LOCALE) -> XmlResource"""
+        """__init__(String filemask, int flags=XRC_USE_LOCALE) -> XmlResource"""

         newobj = _xrc.new_XmlResource(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         newobj = _xrc.new_XmlResource(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1


@@ -31,11 +31,11 @@ class XmlResource(core.Object):
         except: pass
 
     def Load(*args, **kwargs):
         except: pass
 
     def Load(*args, **kwargs):

-        """Load(wxString filemask) -> bool"""
+        """Load(String filemask) -> bool"""

         return _xrc.XmlResource_Load(*args, **kwargs)
 
     def LoadFromString(*args, **kwargs):
         return _xrc.XmlResource_Load(*args, **kwargs)
 
     def LoadFromString(*args, **kwargs):

-        """LoadFromString(wxString data) -> bool"""
+        """LoadFromString(String data) -> bool"""

         return _xrc.XmlResource_LoadFromString(*args, **kwargs)
 
     def InitAllHandlers(*args, **kwargs):
         return _xrc.XmlResource_LoadFromString(*args, **kwargs)
 
     def InitAllHandlers(*args, **kwargs):


@@ -60,67 +60,67 @@ class XmlResource(core.Object):
 
     AddSubclassFactory = staticmethod(AddSubclassFactory)
     def LoadMenu(*args, **kwargs):
 
     AddSubclassFactory = staticmethod(AddSubclassFactory)
     def LoadMenu(*args, **kwargs):

-        """LoadMenu(wxString name) -> Menu"""
+        """LoadMenu(String name) -> Menu"""

         return _xrc.XmlResource_LoadMenu(*args, **kwargs)
 
     def LoadMenuBar(*args, **kwargs):
         return _xrc.XmlResource_LoadMenu(*args, **kwargs)
 
     def LoadMenuBar(*args, **kwargs):

-        """LoadMenuBar(wxString name) -> MenuBar"""
+        """LoadMenuBar(String name) -> MenuBar"""

         return _xrc.XmlResource_LoadMenuBar(*args, **kwargs)
 
     def LoadMenuBarOnFrame(*args, **kwargs):
         return _xrc.XmlResource_LoadMenuBar(*args, **kwargs)
 
     def LoadMenuBarOnFrame(*args, **kwargs):

-        """LoadMenuBarOnFrame(Window parent, wxString name) -> MenuBar"""
+        """LoadMenuBarOnFrame(Window parent, String name) -> MenuBar"""

         return _xrc.XmlResource_LoadMenuBarOnFrame(*args, **kwargs)
 
     def LoadToolBar(*args, **kwargs):
         return _xrc.XmlResource_LoadMenuBarOnFrame(*args, **kwargs)
 
     def LoadToolBar(*args, **kwargs):

-        """LoadToolBar(Window parent, wxString name) -> wxToolBar"""
+        """LoadToolBar(Window parent, String name) -> wxToolBar"""

         return _xrc.XmlResource_LoadToolBar(*args, **kwargs)
 
     def LoadDialog(*args, **kwargs):
         return _xrc.XmlResource_LoadToolBar(*args, **kwargs)
 
     def LoadDialog(*args, **kwargs):

-        """LoadDialog(Window parent, wxString name) -> wxDialog"""
+        """LoadDialog(Window parent, String name) -> wxDialog"""

         return _xrc.XmlResource_LoadDialog(*args, **kwargs)
 
     def LoadOnDialog(*args, **kwargs):
         return _xrc.XmlResource_LoadDialog(*args, **kwargs)
 
     def LoadOnDialog(*args, **kwargs):

-        """LoadOnDialog(wxDialog dlg, Window parent, wxString name) -> bool"""
+        """LoadOnDialog(wxDialog dlg, Window parent, String name) -> bool"""

         return _xrc.XmlResource_LoadOnDialog(*args, **kwargs)
 
     def LoadPanel(*args, **kwargs):
         return _xrc.XmlResource_LoadOnDialog(*args, **kwargs)
 
     def LoadPanel(*args, **kwargs):

-        """LoadPanel(Window parent, wxString name) -> wxPanel"""
+        """LoadPanel(Window parent, String name) -> wxPanel"""

         return _xrc.XmlResource_LoadPanel(*args, **kwargs)
 
     def LoadOnPanel(*args, **kwargs):
         return _xrc.XmlResource_LoadPanel(*args, **kwargs)
 
     def LoadOnPanel(*args, **kwargs):

-        """LoadOnPanel(wxPanel panel, Window parent, wxString name) -> bool"""
+        """LoadOnPanel(wxPanel panel, Window parent, String name) -> bool"""

         return _xrc.XmlResource_LoadOnPanel(*args, **kwargs)
 
     def LoadFrame(*args, **kwargs):
         return _xrc.XmlResource_LoadOnPanel(*args, **kwargs)
 
     def LoadFrame(*args, **kwargs):

-        """LoadFrame(Window parent, wxString name) -> wxFrame"""
+        """LoadFrame(Window parent, String name) -> wxFrame"""

         return _xrc.XmlResource_LoadFrame(*args, **kwargs)
 
     def LoadOnFrame(*args, **kwargs):
         return _xrc.XmlResource_LoadFrame(*args, **kwargs)
 
     def LoadOnFrame(*args, **kwargs):

-        """LoadOnFrame(wxFrame frame, Window parent, wxString name) -> bool"""
+        """LoadOnFrame(wxFrame frame, Window parent, String name) -> bool"""

         return _xrc.XmlResource_LoadOnFrame(*args, **kwargs)
 
     def LoadObject(*args, **kwargs):
         return _xrc.XmlResource_LoadOnFrame(*args, **kwargs)
 
     def LoadObject(*args, **kwargs):

-        """LoadObject(Window parent, wxString name, wxString classname) -> Object"""
+        """LoadObject(Window parent, String name, String classname) -> Object"""

         return _xrc.XmlResource_LoadObject(*args, **kwargs)
 
     def LoadOnObject(*args, **kwargs):
         return _xrc.XmlResource_LoadObject(*args, **kwargs)
 
     def LoadOnObject(*args, **kwargs):

-        """LoadOnObject(Object instance, Window parent, wxString name, wxString classname) -> bool"""
+        """LoadOnObject(Object instance, Window parent, String name, String classname) -> bool"""

         return _xrc.XmlResource_LoadOnObject(*args, **kwargs)
 
     def LoadBitmap(*args, **kwargs):
         return _xrc.XmlResource_LoadOnObject(*args, **kwargs)
 
     def LoadBitmap(*args, **kwargs):

-        """LoadBitmap(wxString name) -> wxBitmap"""
+        """LoadBitmap(String name) -> Bitmap"""

         return _xrc.XmlResource_LoadBitmap(*args, **kwargs)
 
     def LoadIcon(*args, **kwargs):
         return _xrc.XmlResource_LoadBitmap(*args, **kwargs)
 
     def LoadIcon(*args, **kwargs):

-        """LoadIcon(wxString name) -> wxIcon"""
+        """LoadIcon(String name) -> wxIcon"""

         return _xrc.XmlResource_LoadIcon(*args, **kwargs)
 
     def AttachUnknownControl(*args, **kwargs):
         return _xrc.XmlResource_LoadIcon(*args, **kwargs)
 
     def AttachUnknownControl(*args, **kwargs):

-        """AttachUnknownControl(wxString name, Window control, Window parent=None) -> bool"""
+        """AttachUnknownControl(String name, Window control, Window parent=None) -> bool"""

         return _xrc.XmlResource_AttachUnknownControl(*args, **kwargs)
 
     def GetXRCID(*args, **kwargs):
         return _xrc.XmlResource_AttachUnknownControl(*args, **kwargs)
 
     def GetXRCID(*args, **kwargs):

-        """XmlResource.GetXRCID(wxString str_id) -> int"""
+        """XmlResource.GetXRCID(String str_id) -> int"""

         return _xrc.XmlResource_GetXRCID(*args, **kwargs)
 
     GetXRCID = staticmethod(GetXRCID)
         return _xrc.XmlResource_GetXRCID(*args, **kwargs)
 
     GetXRCID = staticmethod(GetXRCID)


@@ -170,7 +170,7 @@ def XmlResource_AddSubclassFactory(*args, **kwargs):
     return _xrc.XmlResource_AddSubclassFactory(*args, **kwargs)
 
 def XmlResource_GetXRCID(*args, **kwargs):
     return _xrc.XmlResource_AddSubclassFactory(*args, **kwargs)
 
 def XmlResource_GetXRCID(*args, **kwargs):

-    """XmlResource_GetXRCID(wxString str_id) -> int"""
+    """XmlResource_GetXRCID(String str_id) -> int"""

     return _xrc.XmlResource_GetXRCID(*args, **kwargs)
 
 def XmlResource_Get(*args, **kwargs):
     return _xrc.XmlResource_GetXRCID(*args, **kwargs)
 
 def XmlResource_Get(*args, **kwargs):


@@ -232,7 +232,7 @@ class XmlProperty(object):
         return "<%s.%s; proxy of C++ wxXmlProperty instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """
         return "<%s.%s; proxy of C++ wxXmlProperty instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """

-        __init__(wxString name=wxPyEmptyString, wxString value=wxPyEmptyString, 
+        __init__(String name=EmptyString, String value=EmptyString, 

             XmlProperty next=None) -> XmlProperty
         """
         newobj = _xrc.new_XmlProperty(*args, **kwargs)
             XmlProperty next=None) -> XmlProperty
         """
         newobj = _xrc.new_XmlProperty(*args, **kwargs)


@@ -240,11 +240,11 @@ class XmlProperty(object):
         self.thisown = 1
         del newobj.thisown
     def GetName(*args, **kwargs):
         self.thisown = 1
         del newobj.thisown
     def GetName(*args, **kwargs):

-        """GetName() -> wxString"""
+        """GetName() -> String"""

         return _xrc.XmlProperty_GetName(*args, **kwargs)
 
     def GetValue(*args, **kwargs):
         return _xrc.XmlProperty_GetName(*args, **kwargs)
 
     def GetValue(*args, **kwargs):

-        """GetValue() -> wxString"""
+        """GetValue() -> String"""

         return _xrc.XmlProperty_GetValue(*args, **kwargs)
 
     def GetNext(*args, **kwargs):
         return _xrc.XmlProperty_GetValue(*args, **kwargs)
 
     def GetNext(*args, **kwargs):


@@ -252,11 +252,11 @@ class XmlProperty(object):
         return _xrc.XmlProperty_GetNext(*args, **kwargs)
 
     def SetName(*args, **kwargs):
         return _xrc.XmlProperty_GetNext(*args, **kwargs)
 
     def SetName(*args, **kwargs):

-        """SetName(wxString name)"""
+        """SetName(String name)"""

         return _xrc.XmlProperty_SetName(*args, **kwargs)
 
     def SetValue(*args, **kwargs):
         return _xrc.XmlProperty_SetName(*args, **kwargs)
 
     def SetValue(*args, **kwargs):

-        """SetValue(wxString value)"""
+        """SetValue(String value)"""

         return _xrc.XmlProperty_SetValue(*args, **kwargs)
 
     def SetNext(*args, **kwargs):
         return _xrc.XmlProperty_SetValue(*args, **kwargs)
 
     def SetNext(*args, **kwargs):


@@ -276,9 +276,9 @@ class XmlNode(object):
         return "<%s.%s; proxy of C++ wxXmlNode instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """
         return "<%s.%s; proxy of C++ wxXmlNode instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """

-        __init__(XmlNode parent=None, wxXmlNodeType type=0, wxString name=wxPyEmptyString, 
-            wxString content=wxPyEmptyString, 
-            XmlProperty props=None, XmlNode next=None) -> XmlNode
+        __init__(XmlNode parent=None, int type=0, String name=EmptyString, 
+            String content=EmptyString, XmlProperty props=None, 
+            XmlNode next=None) -> XmlNode

         """
         newobj = _xrc.new_XmlNode(*args, **kwargs)
         self.this = newobj.this
         """
         newobj = _xrc.new_XmlNode(*args, **kwargs)
         self.this = newobj.this


@@ -307,23 +307,23 @@ class XmlNode(object):
         return _xrc.XmlNode_AddProperty(*args, **kwargs)
 
     def AddPropertyName(*args, **kwargs):
         return _xrc.XmlNode_AddProperty(*args, **kwargs)
 
     def AddPropertyName(*args, **kwargs):

-        """AddPropertyName(wxString name, wxString value)"""
+        """AddPropertyName(String name, String value)"""

         return _xrc.XmlNode_AddPropertyName(*args, **kwargs)
 
     def DeleteProperty(*args, **kwargs):
         return _xrc.XmlNode_AddPropertyName(*args, **kwargs)
 
     def DeleteProperty(*args, **kwargs):

-        """DeleteProperty(wxString name) -> bool"""
+        """DeleteProperty(String name) -> bool"""

         return _xrc.XmlNode_DeleteProperty(*args, **kwargs)
 
     def GetType(*args, **kwargs):
         return _xrc.XmlNode_DeleteProperty(*args, **kwargs)
 
     def GetType(*args, **kwargs):

-        """GetType() -> wxXmlNodeType"""
+        """GetType() -> int"""

         return _xrc.XmlNode_GetType(*args, **kwargs)
 
     def GetName(*args, **kwargs):
         return _xrc.XmlNode_GetType(*args, **kwargs)
 
     def GetName(*args, **kwargs):

-        """GetName() -> wxString"""
+        """GetName() -> String"""

         return _xrc.XmlNode_GetName(*args, **kwargs)
 
     def GetContent(*args, **kwargs):
         return _xrc.XmlNode_GetName(*args, **kwargs)
 
     def GetContent(*args, **kwargs):

-        """GetContent() -> wxString"""
+        """GetContent() -> String"""

         return _xrc.XmlNode_GetContent(*args, **kwargs)
 
     def GetParent(*args, **kwargs):
         return _xrc.XmlNode_GetContent(*args, **kwargs)
 
     def GetParent(*args, **kwargs):


@@ -343,23 +343,23 @@ class XmlNode(object):
         return _xrc.XmlNode_GetProperties(*args, **kwargs)
 
     def GetPropVal(*args, **kwargs):
         return _xrc.XmlNode_GetProperties(*args, **kwargs)
 
     def GetPropVal(*args, **kwargs):

-        """GetPropVal(wxString propName, wxString defaultVal) -> wxString"""
+        """GetPropVal(String propName, String defaultVal) -> String"""

         return _xrc.XmlNode_GetPropVal(*args, **kwargs)
 
     def HasProp(*args, **kwargs):
         return _xrc.XmlNode_GetPropVal(*args, **kwargs)
 
     def HasProp(*args, **kwargs):

-        """HasProp(wxString propName) -> bool"""
+        """HasProp(String propName) -> bool"""

         return _xrc.XmlNode_HasProp(*args, **kwargs)
 
     def SetType(*args, **kwargs):
         return _xrc.XmlNode_HasProp(*args, **kwargs)
 
     def SetType(*args, **kwargs):

-        """SetType(wxXmlNodeType type)"""
+        """SetType(int type)"""

         return _xrc.XmlNode_SetType(*args, **kwargs)
 
     def SetName(*args, **kwargs):
         return _xrc.XmlNode_SetType(*args, **kwargs)
 
     def SetName(*args, **kwargs):

-        """SetName(wxString name)"""
+        """SetName(String name)"""

         return _xrc.XmlNode_SetName(*args, **kwargs)
 
     def SetContent(*args, **kwargs):
         return _xrc.XmlNode_SetName(*args, **kwargs)
 
     def SetContent(*args, **kwargs):

-        """SetContent(wxString con)"""
+        """SetContent(String con)"""

         return _xrc.XmlNode_SetContent(*args, **kwargs)
 
     def SetParent(*args, **kwargs):
         return _xrc.XmlNode_SetContent(*args, **kwargs)
 
     def SetParent(*args, **kwargs):


@@ -387,7 +387,7 @@ class XmlNodePtr(XmlNode):
 _xrc.XmlNode_swigregister(XmlNodePtr)
 
 def XmlNodeEasy(*args, **kwargs):
 _xrc.XmlNode_swigregister(XmlNodePtr)
 
 def XmlNodeEasy(*args, **kwargs):

-    """XmlNodeEasy(wxXmlNodeType type, wxString name, wxString content=wxPyEmptyString) -> XmlNode"""
+    """XmlNodeEasy(int type, String name, String content=EmptyString) -> XmlNode"""

     val = _xrc.new_XmlNodeEasy(*args, **kwargs)
     val.thisown = 1
     return val
     val = _xrc.new_XmlNodeEasy(*args, **kwargs)
     val.thisown = 1
     return val


@@ -396,7 +396,7 @@ class XmlDocument(core.Object):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxXmlDocument instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxXmlDocument instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):

-        """__init__(wxString filename, wxString encoding=wxPyUTF8String) -> XmlDocument"""
+        """__init__(String filename, String encoding=wxPyUTF8String) -> XmlDocument"""

         newobj = _xrc.new_XmlDocument(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         newobj = _xrc.new_XmlDocument(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1


@@ -408,15 +408,15 @@ class XmlDocument(core.Object):
         except: pass
 
     def Load(*args, **kwargs):
         except: pass
 
     def Load(*args, **kwargs):

-        """Load(wxString filename, wxString encoding=wxPyUTF8String) -> bool"""
+        """Load(String filename, String encoding=wxPyUTF8String) -> bool"""

         return _xrc.XmlDocument_Load(*args, **kwargs)
 
     def LoadFromStream(*args, **kwargs):
         return _xrc.XmlDocument_Load(*args, **kwargs)
 
     def LoadFromStream(*args, **kwargs):

-        """LoadFromStream(wxInputStream stream, wxString encoding=wxPyUTF8String) -> bool"""
+        """LoadFromStream(InputStream stream, String encoding=wxPyUTF8String) -> bool"""

         return _xrc.XmlDocument_LoadFromStream(*args, **kwargs)
 
     def Save(*args, **kwargs):
         return _xrc.XmlDocument_LoadFromStream(*args, **kwargs)
 
     def Save(*args, **kwargs):

-        """Save(wxString filename) -> bool"""
+        """Save(String filename) -> bool"""

         return _xrc.XmlDocument_Save(*args, **kwargs)
 
     def SaveToStream(*args, **kwargs):
         return _xrc.XmlDocument_Save(*args, **kwargs)
 
     def SaveToStream(*args, **kwargs):


@@ -432,11 +432,11 @@ class XmlDocument(core.Object):
         return _xrc.XmlDocument_GetRoot(*args, **kwargs)
 
     def GetVersion(*args, **kwargs):
         return _xrc.XmlDocument_GetRoot(*args, **kwargs)
 
     def GetVersion(*args, **kwargs):

-        """GetVersion() -> wxString"""
+        """GetVersion() -> String"""

         return _xrc.XmlDocument_GetVersion(*args, **kwargs)
 
     def GetFileEncoding(*args, **kwargs):
         return _xrc.XmlDocument_GetVersion(*args, **kwargs)
 
     def GetFileEncoding(*args, **kwargs):

-        """GetFileEncoding() -> wxString"""
+        """GetFileEncoding() -> String"""

         return _xrc.XmlDocument_GetFileEncoding(*args, **kwargs)
 
     def SetRoot(*args, **kwargs):
         return _xrc.XmlDocument_GetFileEncoding(*args, **kwargs)
 
     def SetRoot(*args, **kwargs):


@@ -444,11 +444,11 @@ class XmlDocument(core.Object):
         return _xrc.XmlDocument_SetRoot(*args, **kwargs)
 
     def SetVersion(*args, **kwargs):
         return _xrc.XmlDocument_SetRoot(*args, **kwargs)
 
     def SetVersion(*args, **kwargs):

-        """SetVersion(wxString version)"""
+        """SetVersion(String version)"""

         return _xrc.XmlDocument_SetVersion(*args, **kwargs)
 
     def SetFileEncoding(*args, **kwargs):
         return _xrc.XmlDocument_SetVersion(*args, **kwargs)
 
     def SetFileEncoding(*args, **kwargs):

-        """SetFileEncoding(wxString encoding)"""
+        """SetFileEncoding(String encoding)"""

         return _xrc.XmlDocument_SetFileEncoding(*args, **kwargs)
 
 
         return _xrc.XmlDocument_SetFileEncoding(*args, **kwargs)
 
 


@@ -460,7 +460,7 @@ class XmlDocumentPtr(XmlDocument):
 _xrc.XmlDocument_swigregister(XmlDocumentPtr)
 
 def XmlDocumentFromStream(*args, **kwargs):
 _xrc.XmlDocument_swigregister(XmlDocumentPtr)
 
 def XmlDocumentFromStream(*args, **kwargs):

-    """XmlDocumentFromStream(wxInputStream stream, wxString encoding=wxPyUTF8String) -> XmlDocument"""
+    """XmlDocumentFromStream(InputStream stream, String encoding=wxPyUTF8String) -> XmlDocument"""

     val = _xrc.new_XmlDocumentFromStream(*args, **kwargs)
     val.thisown = 1
     return val
     val = _xrc.new_XmlDocumentFromStream(*args, **kwargs)
     val.thisown = 1
     return val


@@ -505,7 +505,7 @@ class XmlResourceHandler(core.Object):
         return _xrc.XmlResourceHandler_GetNode(*args, **kwargs)
 
     def GetClass(*args, **kwargs):
         return _xrc.XmlResourceHandler_GetNode(*args, **kwargs)
 
     def GetClass(*args, **kwargs):

-        """GetClass() -> wxString"""
+        """GetClass() -> String"""

         return _xrc.XmlResourceHandler_GetClass(*args, **kwargs)
 
     def GetParent(*args, **kwargs):
         return _xrc.XmlResourceHandler_GetClass(*args, **kwargs)
 
     def GetParent(*args, **kwargs):


@@ -525,27 +525,27 @@ class XmlResourceHandler(core.Object):
         return _xrc.XmlResourceHandler_GetInstanceAsWindow(*args, **kwargs)
 
     def IsOfClass(*args, **kwargs):
         return _xrc.XmlResourceHandler_GetInstanceAsWindow(*args, **kwargs)
 
     def IsOfClass(*args, **kwargs):

-        """IsOfClass(XmlNode node, wxString classname) -> bool"""
+        """IsOfClass(XmlNode node, String classname) -> bool"""

         return _xrc.XmlResourceHandler_IsOfClass(*args, **kwargs)
 
     def GetNodeContent(*args, **kwargs):
         return _xrc.XmlResourceHandler_IsOfClass(*args, **kwargs)
 
     def GetNodeContent(*args, **kwargs):

-        """GetNodeContent(XmlNode node) -> wxString"""
+        """GetNodeContent(XmlNode node) -> String"""

         return _xrc.XmlResourceHandler_GetNodeContent(*args, **kwargs)
 
     def HasParam(*args, **kwargs):
         return _xrc.XmlResourceHandler_GetNodeContent(*args, **kwargs)
 
     def HasParam(*args, **kwargs):

-        """HasParam(wxString param) -> bool"""
+        """HasParam(String param) -> bool"""

         return _xrc.XmlResourceHandler_HasParam(*args, **kwargs)
 
     def GetParamNode(*args, **kwargs):
         return _xrc.XmlResourceHandler_HasParam(*args, **kwargs)
 
     def GetParamNode(*args, **kwargs):

-        """GetParamNode(wxString param) -> XmlNode"""
+        """GetParamNode(String param) -> XmlNode"""

         return _xrc.XmlResourceHandler_GetParamNode(*args, **kwargs)
 
     def GetParamValue(*args, **kwargs):
         return _xrc.XmlResourceHandler_GetParamNode(*args, **kwargs)
 
     def GetParamValue(*args, **kwargs):

-        """GetParamValue(wxString param) -> wxString"""
+        """GetParamValue(String param) -> String"""

         return _xrc.XmlResourceHandler_GetParamValue(*args, **kwargs)
 
     def AddStyle(*args, **kwargs):
         return _xrc.XmlResourceHandler_GetParamValue(*args, **kwargs)
 
     def AddStyle(*args, **kwargs):

-        """AddStyle(wxString name, int value)"""
+        """AddStyle(String name, int value)"""

         return _xrc.XmlResourceHandler_AddStyle(*args, **kwargs)
 
     def AddWindowStyles(*args, **kwargs):
         return _xrc.XmlResourceHandler_AddStyle(*args, **kwargs)
 
     def AddWindowStyles(*args, **kwargs):


@@ -553,11 +553,11 @@ class XmlResourceHandler(core.Object):
         return _xrc.XmlResourceHandler_AddWindowStyles(*args, **kwargs)
 
     def GetStyle(*args, **kwargs):
         return _xrc.XmlResourceHandler_AddWindowStyles(*args, **kwargs)
 
     def GetStyle(*args, **kwargs):

-        """GetStyle(wxString param=wxPyStyleString, int defaults=0) -> int"""
+        """GetStyle(String param=wxPyStyleString, int defaults=0) -> int"""

         return _xrc.XmlResourceHandler_GetStyle(*args, **kwargs)
 
     def GetText(*args, **kwargs):
         return _xrc.XmlResourceHandler_GetStyle(*args, **kwargs)
 
     def GetText(*args, **kwargs):

-        """GetText(wxString param, bool translate=True) -> wxString"""
+        """GetText(String param, bool translate=True) -> String"""

         return _xrc.XmlResourceHandler_GetText(*args, **kwargs)
 
     def GetID(*args, **kwargs):
         return _xrc.XmlResourceHandler_GetText(*args, **kwargs)
 
     def GetID(*args, **kwargs):


@@ -565,49 +565,49 @@ class XmlResourceHandler(core.Object):
         return _xrc.XmlResourceHandler_GetID(*args, **kwargs)
 
     def GetName(*args, **kwargs):
         return _xrc.XmlResourceHandler_GetID(*args, **kwargs)
 
     def GetName(*args, **kwargs):

-        """GetName() -> wxString"""
+        """GetName() -> String"""

         return _xrc.XmlResourceHandler_GetName(*args, **kwargs)
 
     def GetBool(*args, **kwargs):
         return _xrc.XmlResourceHandler_GetName(*args, **kwargs)
 
     def GetBool(*args, **kwargs):

-        """GetBool(wxString param, bool defaultv=False) -> bool"""
+        """GetBool(String param, bool defaultv=False) -> bool"""

         return _xrc.XmlResourceHandler_GetBool(*args, **kwargs)
 
     def GetLong(*args, **kwargs):
         return _xrc.XmlResourceHandler_GetBool(*args, **kwargs)
 
     def GetLong(*args, **kwargs):

-        """GetLong(wxString param, long defaultv=0) -> long"""
+        """GetLong(String param, long defaultv=0) -> long"""

         return _xrc.XmlResourceHandler_GetLong(*args, **kwargs)
 
     def GetColour(*args, **kwargs):
         return _xrc.XmlResourceHandler_GetLong(*args, **kwargs)
 
     def GetColour(*args, **kwargs):

-        """GetColour(wxString param) -> wxColour"""
+        """GetColour(String param) -> Colour"""

         return _xrc.XmlResourceHandler_GetColour(*args, **kwargs)
 
     def GetSize(*args, **kwargs):
         return _xrc.XmlResourceHandler_GetColour(*args, **kwargs)
 
     def GetSize(*args, **kwargs):

-        """GetSize(wxString param=wxPySizeString) -> Size"""
+        """GetSize(String param=wxPySizeString) -> Size"""

         return _xrc.XmlResourceHandler_GetSize(*args, **kwargs)
 
     def GetPosition(*args, **kwargs):
         return _xrc.XmlResourceHandler_GetSize(*args, **kwargs)
 
     def GetPosition(*args, **kwargs):

-        """GetPosition(wxString param=wxPyPosString) -> Point"""
+        """GetPosition(String param=wxPyPosString) -> Point"""

         return _xrc.XmlResourceHandler_GetPosition(*args, **kwargs)
 
     def GetDimension(*args, **kwargs):
         return _xrc.XmlResourceHandler_GetPosition(*args, **kwargs)
 
     def GetDimension(*args, **kwargs):

-        """GetDimension(wxString param, int defaultv=0) -> int"""
+        """GetDimension(String param, int defaultv=0) -> int"""

         return _xrc.XmlResourceHandler_GetDimension(*args, **kwargs)
 
     def GetBitmap(*args, **kwargs):
         """
         return _xrc.XmlResourceHandler_GetDimension(*args, **kwargs)
 
     def GetBitmap(*args, **kwargs):
         """

-        GetBitmap(wxString param=wxPyBitmapString, wxArtClient defaultArtClient=wxART_OTHER, 
-            Size size=DefaultSize) -> wxBitmap
+        GetBitmap(String param=wxPyBitmapString, wxArtClient defaultArtClient=wxART_OTHER, 
+            Size size=DefaultSize) -> Bitmap

         """
         return _xrc.XmlResourceHandler_GetBitmap(*args, **kwargs)
 
     def GetIcon(*args, **kwargs):
         """
         """
         return _xrc.XmlResourceHandler_GetBitmap(*args, **kwargs)
 
     def GetIcon(*args, **kwargs):
         """

-        GetIcon(wxString param=wxPyIconString, wxArtClient defaultArtClient=wxART_OTHER, 
+        GetIcon(String param=wxPyIconString, wxArtClient defaultArtClient=wxART_OTHER, 

             Size size=DefaultSize) -> wxIcon
         """
         return _xrc.XmlResourceHandler_GetIcon(*args, **kwargs)
 
     def GetFont(*args, **kwargs):
             Size size=DefaultSize) -> wxIcon
         """
         return _xrc.XmlResourceHandler_GetIcon(*args, **kwargs)
 
     def GetFont(*args, **kwargs):

-        """GetFont(wxString param=wxPyFontString) -> wxFont"""
+        """GetFont(String param=wxPyFontString) -> Font"""

         return _xrc.XmlResourceHandler_GetFont(*args, **kwargs)
 
     def SetupWindow(*args, **kwargs):
         return _xrc.XmlResourceHandler_GetFont(*args, **kwargs)
 
     def SetupWindow(*args, **kwargs):

diff --git a/wxPython/src/gtk/calendar.py b/wxPython/src/gtk/calendar.py
index 6c2b37a0d31e2e2377f903313a14778d5317d001..f9b30828d71b21d50d28d363fdba8cb32e5a695c 100644 (file)
--- a/wxPython/src/gtk/calendar.py
+++ b/wxPython/src/gtk/calendar.py
@@ -27,32 +27,32 @@ class CalendarDateAttr(object):
         return "<%s.%s; proxy of C++ wxCalendarDateAttr instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """
         return "<%s.%s; proxy of C++ wxCalendarDateAttr instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """

-        __init__(wxColour colText, wxColour colBack=wxNullColour, wxColour colBorder=wxNullColour, 
-            wxFont font=wxNullFont, 
-            wxCalendarDateBorder border=CAL_BORDER_NONE) -> CalendarDateAttr
+        __init__(Colour colText, Colour colBack=wxNullColour, Colour colBorder=wxNullColour, 
+            Font font=wxNullFont, 
+            int border=CAL_BORDER_NONE) -> CalendarDateAttr

         """
         newobj = _calendar.new_CalendarDateAttr(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def SetTextColour(*args, **kwargs):
         """
         newobj = _calendar.new_CalendarDateAttr(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def SetTextColour(*args, **kwargs):

-        """SetTextColour(wxColour colText)"""
+        """SetTextColour(Colour colText)"""

         return _calendar.CalendarDateAttr_SetTextColour(*args, **kwargs)
 
     def SetBackgroundColour(*args, **kwargs):
         return _calendar.CalendarDateAttr_SetTextColour(*args, **kwargs)
 
     def SetBackgroundColour(*args, **kwargs):

-        """SetBackgroundColour(wxColour colBack)"""
+        """SetBackgroundColour(Colour colBack)"""

         return _calendar.CalendarDateAttr_SetBackgroundColour(*args, **kwargs)
 
     def SetBorderColour(*args, **kwargs):
         return _calendar.CalendarDateAttr_SetBackgroundColour(*args, **kwargs)
 
     def SetBorderColour(*args, **kwargs):

-        """SetBorderColour(wxColour col)"""
+        """SetBorderColour(Colour col)"""

         return _calendar.CalendarDateAttr_SetBorderColour(*args, **kwargs)
 
     def SetFont(*args, **kwargs):
         return _calendar.CalendarDateAttr_SetBorderColour(*args, **kwargs)
 
     def SetFont(*args, **kwargs):

-        """SetFont(wxFont font)"""
+        """SetFont(Font font)"""

         return _calendar.CalendarDateAttr_SetFont(*args, **kwargs)
 
     def SetBorder(*args, **kwargs):
         return _calendar.CalendarDateAttr_SetFont(*args, **kwargs)
 
     def SetBorder(*args, **kwargs):

-        """SetBorder(wxCalendarDateBorder border)"""
+        """SetBorder(int border)"""

         return _calendar.CalendarDateAttr_SetBorder(*args, **kwargs)
 
     def SetHoliday(*args, **kwargs):
         return _calendar.CalendarDateAttr_SetBorder(*args, **kwargs)
 
     def SetHoliday(*args, **kwargs):


@@ -84,23 +84,23 @@ class CalendarDateAttr(object):
         return _calendar.CalendarDateAttr_IsHoliday(*args, **kwargs)
 
     def GetTextColour(*args, **kwargs):
         return _calendar.CalendarDateAttr_IsHoliday(*args, **kwargs)
 
     def GetTextColour(*args, **kwargs):

-        """GetTextColour() -> wxColour"""
+        """GetTextColour() -> Colour"""

         return _calendar.CalendarDateAttr_GetTextColour(*args, **kwargs)
 
     def GetBackgroundColour(*args, **kwargs):
         return _calendar.CalendarDateAttr_GetTextColour(*args, **kwargs)
 
     def GetBackgroundColour(*args, **kwargs):

-        """GetBackgroundColour() -> wxColour"""
+        """GetBackgroundColour() -> Colour"""

         return _calendar.CalendarDateAttr_GetBackgroundColour(*args, **kwargs)
 
     def GetBorderColour(*args, **kwargs):
         return _calendar.CalendarDateAttr_GetBackgroundColour(*args, **kwargs)
 
     def GetBorderColour(*args, **kwargs):

-        """GetBorderColour() -> wxColour"""
+        """GetBorderColour() -> Colour"""

         return _calendar.CalendarDateAttr_GetBorderColour(*args, **kwargs)
 
     def GetFont(*args, **kwargs):
         return _calendar.CalendarDateAttr_GetBorderColour(*args, **kwargs)
 
     def GetFont(*args, **kwargs):

-        """GetFont() -> wxFont"""
+        """GetFont() -> Font"""

         return _calendar.CalendarDateAttr_GetFont(*args, **kwargs)
 
     def GetBorder(*args, **kwargs):
         return _calendar.CalendarDateAttr_GetFont(*args, **kwargs)
 
     def GetBorder(*args, **kwargs):

-        """GetBorder() -> wxCalendarDateBorder"""
+        """GetBorder() -> int"""

         return _calendar.CalendarDateAttr_GetBorder(*args, **kwargs)
 
 
         return _calendar.CalendarDateAttr_GetBorder(*args, **kwargs)
 
 


@@ -112,7 +112,7 @@ class CalendarDateAttrPtr(CalendarDateAttr):
 _calendar.CalendarDateAttr_swigregister(CalendarDateAttrPtr)
 
 def CalendarDateAttrBorder(*args, **kwargs):
 _calendar.CalendarDateAttr_swigregister(CalendarDateAttrPtr)
 
 def CalendarDateAttrBorder(*args, **kwargs):

-    """CalendarDateAttrBorder(wxCalendarDateBorder border, wxColour colBorder=wxNullColour) -> CalendarDateAttr"""
+    """CalendarDateAttrBorder(int border, Colour colBorder=wxNullColour) -> CalendarDateAttr"""

     val = _calendar.new_CalendarDateAttrBorder(*args, **kwargs)
     val.thisown = 1
     return val
     val = _calendar.new_CalendarDateAttrBorder(*args, **kwargs)
     val.thisown = 1
     return val


@@ -135,11 +135,11 @@ class CalendarEvent(core.CommandEvent):
         return _calendar.CalendarEvent_SetDate(*args, **kwargs)
 
     def SetWeekDay(*args, **kwargs):
         return _calendar.CalendarEvent_SetDate(*args, **kwargs)
 
     def SetWeekDay(*args, **kwargs):

-        """SetWeekDay(wxDateTime::WeekDay wd)"""
+        """SetWeekDay(int wd)"""

         return _calendar.CalendarEvent_SetWeekDay(*args, **kwargs)
 
     def GetWeekDay(*args, **kwargs):
         return _calendar.CalendarEvent_SetWeekDay(*args, **kwargs)
 
     def GetWeekDay(*args, **kwargs):

-        """GetWeekDay() -> wxDateTime::WeekDay"""
+        """GetWeekDay() -> int"""

         return _calendar.CalendarEvent_GetWeekDay(*args, **kwargs)
 
 
         return _calendar.CalendarEvent_GetWeekDay(*args, **kwargs)
 
 


@@ -171,7 +171,7 @@ class CalendarCtrl(core.Control):
         __init__(Window parent, int id, DateTime date=wxDefaultDateTime, 
             Point pos=DefaultPosition, Size size=DefaultSize, 
             long style=wxCAL_SHOW_HOLIDAYS|wxWANTS_CHARS, 
         __init__(Window parent, int id, DateTime date=wxDefaultDateTime, 
             Point pos=DefaultPosition, Size size=DefaultSize, 
             long style=wxCAL_SHOW_HOLIDAYS|wxWANTS_CHARS, 

-            wxString name=wxPyCalendarNameStr) -> CalendarCtrl
+            String name=wxPyCalendarNameStr) -> CalendarCtrl

         """
         newobj = _calendar.new_CalendarCtrl(*args, **kwargs)
         self.this = newobj.this
         """
         newobj = _calendar.new_CalendarCtrl(*args, **kwargs)
         self.this = newobj.this


@@ -184,7 +184,7 @@ class CalendarCtrl(core.Control):
         Create(Window parent, int id, DateTime date=wxDefaultDateTime, 
             Point pos=DefaultPosition, Size size=DefaultSize, 
             long style=wxCAL_SHOW_HOLIDAYS|wxWANTS_CHARS, 
         Create(Window parent, int id, DateTime date=wxDefaultDateTime, 
             Point pos=DefaultPosition, Size size=DefaultSize, 
             long style=wxCAL_SHOW_HOLIDAYS|wxWANTS_CHARS, 

-            wxString name=wxPyCalendarNameStr) -> bool
+            String name=wxPyCalendarNameStr) -> bool

         """
         return _calendar.CalendarCtrl_Create(*args, **kwargs)
 
         """
         return _calendar.CalendarCtrl_Create(*args, **kwargs)
 


@@ -229,39 +229,39 @@ class CalendarCtrl(core.Control):
         return _calendar.CalendarCtrl_EnableHolidayDisplay(*args, **kwargs)
 
     def SetHeaderColours(*args, **kwargs):
         return _calendar.CalendarCtrl_EnableHolidayDisplay(*args, **kwargs)
 
     def SetHeaderColours(*args, **kwargs):

-        """SetHeaderColours(wxColour colFg, wxColour colBg)"""
+        """SetHeaderColours(Colour colFg, Colour colBg)"""

         return _calendar.CalendarCtrl_SetHeaderColours(*args, **kwargs)
 
     def GetHeaderColourFg(*args, **kwargs):
         return _calendar.CalendarCtrl_SetHeaderColours(*args, **kwargs)
 
     def GetHeaderColourFg(*args, **kwargs):

-        """GetHeaderColourFg() -> wxColour"""
+        """GetHeaderColourFg() -> Colour"""

         return _calendar.CalendarCtrl_GetHeaderColourFg(*args, **kwargs)
 
     def GetHeaderColourBg(*args, **kwargs):
         return _calendar.CalendarCtrl_GetHeaderColourFg(*args, **kwargs)
 
     def GetHeaderColourBg(*args, **kwargs):

-        """GetHeaderColourBg() -> wxColour"""
+        """GetHeaderColourBg() -> Colour"""

         return _calendar.CalendarCtrl_GetHeaderColourBg(*args, **kwargs)
 
     def SetHighlightColours(*args, **kwargs):
         return _calendar.CalendarCtrl_GetHeaderColourBg(*args, **kwargs)
 
     def SetHighlightColours(*args, **kwargs):

-        """SetHighlightColours(wxColour colFg, wxColour colBg)"""
+        """SetHighlightColours(Colour colFg, Colour colBg)"""

         return _calendar.CalendarCtrl_SetHighlightColours(*args, **kwargs)
 
     def GetHighlightColourFg(*args, **kwargs):
         return _calendar.CalendarCtrl_SetHighlightColours(*args, **kwargs)
 
     def GetHighlightColourFg(*args, **kwargs):

-        """GetHighlightColourFg() -> wxColour"""
+        """GetHighlightColourFg() -> Colour"""

         return _calendar.CalendarCtrl_GetHighlightColourFg(*args, **kwargs)
 
     def GetHighlightColourBg(*args, **kwargs):
         return _calendar.CalendarCtrl_GetHighlightColourFg(*args, **kwargs)
 
     def GetHighlightColourBg(*args, **kwargs):

-        """GetHighlightColourBg() -> wxColour"""
+        """GetHighlightColourBg() -> Colour"""

         return _calendar.CalendarCtrl_GetHighlightColourBg(*args, **kwargs)
 
     def SetHolidayColours(*args, **kwargs):
         return _calendar.CalendarCtrl_GetHighlightColourBg(*args, **kwargs)
 
     def SetHolidayColours(*args, **kwargs):

-        """SetHolidayColours(wxColour colFg, wxColour colBg)"""
+        """SetHolidayColours(Colour colFg, Colour colBg)"""

         return _calendar.CalendarCtrl_SetHolidayColours(*args, **kwargs)
 
     def GetHolidayColourFg(*args, **kwargs):
         return _calendar.CalendarCtrl_SetHolidayColours(*args, **kwargs)
 
     def GetHolidayColourFg(*args, **kwargs):

-        """GetHolidayColourFg() -> wxColour"""
+        """GetHolidayColourFg() -> Colour"""

         return _calendar.CalendarCtrl_GetHolidayColourFg(*args, **kwargs)
 
     def GetHolidayColourBg(*args, **kwargs):
         return _calendar.CalendarCtrl_GetHolidayColourFg(*args, **kwargs)
 
     def GetHolidayColourBg(*args, **kwargs):

-        """GetHolidayColourBg() -> wxColour"""
+        """GetHolidayColourBg() -> Colour"""

         return _calendar.CalendarCtrl_GetHolidayColourBg(*args, **kwargs)
 
     def GetAttr(*args, **kwargs):
         return _calendar.CalendarCtrl_GetHolidayColourBg(*args, **kwargs)
 
     def GetAttr(*args, **kwargs):


@@ -281,7 +281,7 @@ class CalendarCtrl(core.Control):
         return _calendar.CalendarCtrl_ResetAttr(*args, **kwargs)
 
     def HitTest(*args, **kwargs):
         return _calendar.CalendarCtrl_ResetAttr(*args, **kwargs)
 
     def HitTest(*args, **kwargs):

-        """HitTest(Point pos, DateTime date=None, wxDateTime::WeekDay wd=None) -> wxCalendarHitTestResult"""
+        """HitTest(Point pos, DateTime date=None, int wd=None) -> int"""

         return _calendar.CalendarCtrl_HitTest(*args, **kwargs)
 
     def Enable(*args, **kwargs):
         return _calendar.CalendarCtrl_HitTest(*args, **kwargs)
 
     def Enable(*args, **kwargs):

diff --git a/wxPython/src/gtk/controls.py b/wxPython/src/gtk/controls.py
index a09305defd378b64da8f92094d48762d54a0c17d..22b6c099598bcc9e281a8a3cb6b51e76b2662451 100644 (file)
--- a/wxPython/src/gtk/controls.py
+++ b/wxPython/src/gtk/controls.py
@@ -23,10 +23,9 @@ class Button(core.Control):
         return "<%s.%s; proxy of C++ wxButton instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """
         return "<%s.%s; proxy of C++ wxButton instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """

-        __init__(Window parent, int id, wxString label, Point pos=DefaultPosition, 
+        __init__(Window parent, int id, String label, Point pos=DefaultPosition, 

             Size size=DefaultSize, long style=0, 
             Size size=DefaultSize, long style=0, 

-            Validator validator=DefaultValidator, 
-            wxString name=wxPyButtonNameStr) -> Button
+            Validator validator=DefaultValidator, String name=wxPyButtonNameStr) -> Button

 
         Create and show a button.
         """
 
         Create and show a button.
         """


@@ -38,10 +37,9 @@ class Button(core.Control):
 
     def Create(*args, **kwargs):
         """
 
     def Create(*args, **kwargs):
         """

-        Create(Window parent, int id, wxString label, Point pos=DefaultPosition, 
+        Create(Window parent, int id, String label, Point pos=DefaultPosition, 

             Size size=DefaultSize, long style=0, 
             Size size=DefaultSize, long style=0, 

-            Validator validator=DefaultValidator, 
-            wxString name=wxPyButtonNameStr) -> bool
+            Validator validator=DefaultValidator, String name=wxPyButtonNameStr) -> bool

 
         Acutally create the GUI Button for 2-phase creation.
         """
 
         Acutally create the GUI Button for 2-phase creation.
         """


@@ -88,10 +86,10 @@ class BitmapButton(Button):
         return "<%s.%s; proxy of C++ wxBitmapButton instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """
         return "<%s.%s; proxy of C++ wxBitmapButton instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """

-        __init__(Window parent, int id, wxBitmap bitmap, Point pos=DefaultPosition, 
+        __init__(Window parent, int id, Bitmap bitmap, Point pos=DefaultPosition, 

             Size size=DefaultSize, long style=BU_AUTODRAW, 
             Validator validator=DefaultValidator, 
             Size size=DefaultSize, long style=BU_AUTODRAW, 
             Validator validator=DefaultValidator, 

-            wxString name=wxPyButtonNameStr) -> BitmapButton
+            String name=wxPyButtonNameStr) -> BitmapButton

 
         Create and show a button.
         """
 
         Create and show a button.
         """


@@ -103,10 +101,10 @@ class BitmapButton(Button):
 
     def Create(*args, **kwargs):
         """
 
     def Create(*args, **kwargs):
         """

-        Create(Window parent, int id, wxBitmap bitmap, Point pos=DefaultPosition, 
+        Create(Window parent, int id, Bitmap bitmap, Point pos=DefaultPosition, 

             Size size=DefaultSize, long style=BU_AUTODRAW, 
             Validator validator=DefaultValidator, 
             Size size=DefaultSize, long style=BU_AUTODRAW, 
             Validator validator=DefaultValidator, 

-            wxString name=wxPyButtonNameStr) -> bool
+            String name=wxPyButtonNameStr) -> bool

 
         Acutally create the GUI BitmapButton for 2-phase creation.
         """
 
         Acutally create the GUI BitmapButton for 2-phase creation.
         """


@@ -114,7 +112,7 @@ class BitmapButton(Button):
 
     def GetBitmapLabel(*args, **kwargs):
         """
 
     def GetBitmapLabel(*args, **kwargs):
         """

-        GetBitmapLabel() -> wxBitmap
+        GetBitmapLabel() -> Bitmap

 
         Returns the label bitmap (the one passed to the constructor).
         """
 
         Returns the label bitmap (the one passed to the constructor).
         """


@@ -122,7 +120,7 @@ class BitmapButton(Button):
 
     def GetBitmapDisabled(*args, **kwargs):
         """
 
     def GetBitmapDisabled(*args, **kwargs):
         """

-        GetBitmapDisabled() -> wxBitmap
+        GetBitmapDisabled() -> Bitmap

 
         Returns the bitmap for the disabled state.
         """
 
         Returns the bitmap for the disabled state.
         """


@@ -130,7 +128,7 @@ class BitmapButton(Button):
 
     def GetBitmapFocus(*args, **kwargs):
         """
 
     def GetBitmapFocus(*args, **kwargs):
         """

-        GetBitmapFocus() -> wxBitmap
+        GetBitmapFocus() -> Bitmap

 
         Returns the bitmap for the focused state.
         """
 
         Returns the bitmap for the focused state.
         """


@@ -138,7 +136,7 @@ class BitmapButton(Button):
 
     def GetBitmapSelected(*args, **kwargs):
         """
 
     def GetBitmapSelected(*args, **kwargs):
         """

-        GetBitmapSelected() -> wxBitmap
+        GetBitmapSelected() -> Bitmap

 
         Returns the bitmap for the selected state.
         """
 
         Returns the bitmap for the selected state.
         """


@@ -146,7 +144,7 @@ class BitmapButton(Button):
 
     def SetBitmapDisabled(*args, **kwargs):
         """
 
     def SetBitmapDisabled(*args, **kwargs):
         """

-        SetBitmapDisabled(wxBitmap bitmap)
+        SetBitmapDisabled(Bitmap bitmap)

 
         Sets the bitmap for the disabled button appearance.
         """
 
         Sets the bitmap for the disabled button appearance.
         """


@@ -154,7 +152,7 @@ class BitmapButton(Button):
 
     def SetBitmapFocus(*args, **kwargs):
         """
 
     def SetBitmapFocus(*args, **kwargs):
         """

-        SetBitmapFocus(wxBitmap bitmap)
+        SetBitmapFocus(Bitmap bitmap)

 
         Sets the bitmap for the button appearance when it has the keyboard focus.
         """
 
         Sets the bitmap for the button appearance when it has the keyboard focus.
         """


@@ -162,7 +160,7 @@ class BitmapButton(Button):
 
     def SetBitmapSelected(*args, **kwargs):
         """
 
     def SetBitmapSelected(*args, **kwargs):
         """

-        SetBitmapSelected(wxBitmap bitmap)
+        SetBitmapSelected(Bitmap bitmap)

 
         Sets the bitmap for the selected (depressed) button appearance.
         """
 
         Sets the bitmap for the selected (depressed) button appearance.
         """


@@ -170,7 +168,7 @@ class BitmapButton(Button):
 
     def SetBitmapLabel(*args, **kwargs):
         """
 
     def SetBitmapLabel(*args, **kwargs):
         """

-        SetBitmapLabel(wxBitmap bitmap)
+        SetBitmapLabel(Bitmap bitmap)

 
         Sets the bitmap label for the button.  This is the bitmap used for the
         unselected state, and for all other states if no other bitmaps are provided.
 
         Sets the bitmap label for the button.  This is the bitmap used for the
         unselected state, and for all other states if no other bitmaps are provided.


@@ -220,10 +218,9 @@ class CheckBox(core.Control):
         return "<%s.%s; proxy of C++ wxCheckBox instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """
         return "<%s.%s; proxy of C++ wxCheckBox instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """

-        __init__(Window parent, int id, wxString label, Point pos=DefaultPosition, 
+        __init__(Window parent, int id, String label, Point pos=DefaultPosition, 

             Size size=DefaultSize, long style=0, 
             Size size=DefaultSize, long style=0, 

-            Validator validator=DefaultValidator, 
-            wxString name=wxPyCheckBoxNameStr) -> CheckBox
+            Validator validator=DefaultValidator, String name=wxPyCheckBoxNameStr) -> CheckBox

         """
         newobj = _controls.new_CheckBox(*args, **kwargs)
         self.this = newobj.this
         """
         newobj = _controls.new_CheckBox(*args, **kwargs)
         self.this = newobj.this


@@ -233,10 +230,9 @@ class CheckBox(core.Control):
 
     def Create(*args, **kwargs):
         """
 
     def Create(*args, **kwargs):
         """

-        Create(Window parent, int id, wxString label, Point pos=DefaultPosition, 
+        Create(Window parent, int id, String label, Point pos=DefaultPosition, 

             Size size=DefaultSize, long style=0, 
             Size size=DefaultSize, long style=0, 

-            Validator validator=DefaultValidator, 
-            wxString name=wxPyCheckBoxNameStr) -> bool
+            Validator validator=DefaultValidator, String name=wxPyCheckBoxNameStr) -> bool

         """
         return _controls.CheckBox_Create(*args, **kwargs)
 
         """
         return _controls.CheckBox_Create(*args, **kwargs)
 


@@ -253,11 +249,11 @@ class CheckBox(core.Control):
         return _controls.CheckBox_SetValue(*args, **kwargs)
 
     def Get3StateValue(*args, **kwargs):
         return _controls.CheckBox_SetValue(*args, **kwargs)
 
     def Get3StateValue(*args, **kwargs):

-        """Get3StateValue() -> wxCheckBoxState"""
+        """Get3StateValue() -> int"""

         return _controls.CheckBox_Get3StateValue(*args, **kwargs)
 
     def Set3StateValue(*args, **kwargs):
         return _controls.CheckBox_Get3StateValue(*args, **kwargs)
 
     def Set3StateValue(*args, **kwargs):

-        """Set3StateValue(wxCheckBoxState state)"""
+        """Set3StateValue(int state)"""

         return _controls.CheckBox_Set3StateValue(*args, **kwargs)
 
     def Is3State(*args, **kwargs):
         return _controls.CheckBox_Set3StateValue(*args, **kwargs)
 
     def Is3State(*args, **kwargs):


@@ -290,9 +286,9 @@ class Choice(core.ControlWithItems):
     def __init__(self, *args, **kwargs):
         """
         __init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
     def __init__(self, *args, **kwargs):
         """
         __init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 

-            int choices=0, wxString choices_array=None, 
+            int choices=0, String choices_array=None, 

             long style=0, Validator validator=DefaultValidator, 
             long style=0, Validator validator=DefaultValidator, 

-            wxString name=wxPyChoiceNameStr) -> Choice
+            String name=wxPyChoiceNameStr) -> Choice

         """
         newobj = _controls.new_Choice(*args, **kwargs)
         self.this = newobj.this
         """
         newobj = _controls.new_Choice(*args, **kwargs)
         self.this = newobj.this


@@ -303,9 +299,9 @@ class Choice(core.ControlWithItems):
     def Create(*args, **kwargs):
         """
         Create(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
     def Create(*args, **kwargs):
         """
         Create(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 

-            int choices=0, wxString choices_array=None, 
+            int choices=0, String choices_array=None, 

             long style=0, Validator validator=DefaultValidator, 
             long style=0, Validator validator=DefaultValidator, 

-            wxString name=wxPyChoiceNameStr) -> bool
+            String name=wxPyChoiceNameStr) -> bool

         """
         return _controls.Choice_Create(*args, **kwargs)
 
         """
         return _controls.Choice_Create(*args, **kwargs)
 


@@ -322,11 +318,11 @@ class Choice(core.ControlWithItems):
         return _controls.Choice_SetSelection(*args, **kwargs)
 
     def SetStringSelection(*args, **kwargs):
         return _controls.Choice_SetSelection(*args, **kwargs)
 
     def SetStringSelection(*args, **kwargs):

-        """SetStringSelection(wxString string)"""
+        """SetStringSelection(String string)"""

         return _controls.Choice_SetStringSelection(*args, **kwargs)
 
     def SetString(*args, **kwargs):
         return _controls.Choice_SetStringSelection(*args, **kwargs)
 
     def SetString(*args, **kwargs):

-        """SetString(int n, wxString s)"""
+        """SetString(int n, String s)"""

         return _controls.Choice_SetString(*args, **kwargs)
 
 
         return _controls.Choice_SetString(*args, **kwargs)
 
 


@@ -350,11 +346,11 @@ class ComboBox(core.Control,core.ItemContainer):
         return "<%s.%s; proxy of C++ wxComboBox instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """
         return "<%s.%s; proxy of C++ wxComboBox instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """

-        __init__(Window parent, int id, wxString value=wxPyEmptyString, 
-            Point pos=DefaultPosition, Size size=DefaultSize, 
-            int choices=0, wxString choices_array=None, 
+        __init__(Window parent, int id, String value=EmptyString, Point pos=DefaultPosition, 
+            Size size=DefaultSize, 
+            int choices=0, String choices_array=None, 

             long style=0, Validator validator=DefaultValidator, 
             long style=0, Validator validator=DefaultValidator, 

-            wxString name=wxPyComboBoxNameStr) -> ComboBox
+            String name=wxPyComboBoxNameStr) -> ComboBox

         """
         newobj = _controls.new_ComboBox(*args, **kwargs)
         self.this = newobj.this
         """
         newobj = _controls.new_ComboBox(*args, **kwargs)
         self.this = newobj.this


@@ -364,20 +360,20 @@ class ComboBox(core.Control,core.ItemContainer):
 
     def Create(*args, **kwargs):
         """
 
     def Create(*args, **kwargs):
         """

-        Create(Window parent, int id, wxString value=wxPyEmptyString, 
-            Point pos=DefaultPosition, Size size=DefaultSize, 
-            int choices=0, wxString choices_array=None, 
+        Create(Window parent, int id, String value=EmptyString, Point pos=DefaultPosition, 
+            Size size=DefaultSize, 
+            int choices=0, String choices_array=None, 

             long style=0, Validator validator=DefaultValidator, 
             long style=0, Validator validator=DefaultValidator, 

-            wxString name=wxPyComboBoxNameStr) -> bool
+            String name=wxPyComboBoxNameStr) -> bool

         """
         return _controls.ComboBox_Create(*args, **kwargs)
 
     def GetValue(*args, **kwargs):
         """
         return _controls.ComboBox_Create(*args, **kwargs)
 
     def GetValue(*args, **kwargs):

-        """GetValue() -> wxString"""
+        """GetValue() -> String"""

         return _controls.ComboBox_GetValue(*args, **kwargs)
 
     def SetValue(*args, **kwargs):
         return _controls.ComboBox_GetValue(*args, **kwargs)
 
     def SetValue(*args, **kwargs):

-        """SetValue(wxString value)"""
+        """SetValue(String value)"""

         return _controls.ComboBox_SetValue(*args, **kwargs)
 
     def Copy(*args, **kwargs):
         return _controls.ComboBox_SetValue(*args, **kwargs)
 
     def Copy(*args, **kwargs):


@@ -405,7 +401,7 @@ class ComboBox(core.Control,core.ItemContainer):
         return _controls.ComboBox_GetLastPosition(*args, **kwargs)
 
     def Replace(*args, **kwargs):
         return _controls.ComboBox_GetLastPosition(*args, **kwargs)
 
     def Replace(*args, **kwargs):

-        """Replace(long from, long to, wxString value)"""
+        """Replace(long from, long to, String value)"""

         return _controls.ComboBox_Replace(*args, **kwargs)
 
     def SetSelection(*args, **kwargs):
         return _controls.ComboBox_Replace(*args, **kwargs)
 
     def SetSelection(*args, **kwargs):


@@ -456,7 +452,7 @@ class Gauge(core.Control):
         __init__(Window parent, int id, int range, Point pos=DefaultPosition, 
             Size size=DefaultSize, long style=GA_HORIZONTAL, 
             Validator validator=DefaultValidator, 
         __init__(Window parent, int id, int range, Point pos=DefaultPosition, 
             Size size=DefaultSize, long style=GA_HORIZONTAL, 
             Validator validator=DefaultValidator, 

-            wxString name=wxPyGaugeNameStr) -> Gauge
+            String name=wxPyGaugeNameStr) -> Gauge

         """
         newobj = _controls.new_Gauge(*args, **kwargs)
         self.this = newobj.this
         """
         newobj = _controls.new_Gauge(*args, **kwargs)
         self.this = newobj.this


@@ -469,7 +465,7 @@ class Gauge(core.Control):
         Create(Window parent, int id, int range, Point pos=DefaultPosition, 
             Size size=DefaultSize, long style=GA_HORIZONTAL, 
             Validator validator=DefaultValidator, 
         Create(Window parent, int id, int range, Point pos=DefaultPosition, 
             Size size=DefaultSize, long style=GA_HORIZONTAL, 
             Validator validator=DefaultValidator, 

-            wxString name=wxPyGaugeNameStr) -> bool
+            String name=wxPyGaugeNameStr) -> bool

         """
         return _controls.Gauge_Create(*args, **kwargs)
 
         """
         return _controls.Gauge_Create(*args, **kwargs)
 


@@ -530,9 +526,9 @@ class StaticBox(core.Control):
         return "<%s.%s; proxy of C++ wxStaticBox instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """
         return "<%s.%s; proxy of C++ wxStaticBox instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """

-        __init__(Window parent, int id, wxString label, Point pos=DefaultPosition, 
+        __init__(Window parent, int id, String label, Point pos=DefaultPosition, 

             Size size=DefaultSize, long style=0, 
             Size size=DefaultSize, long style=0, 

-            wxString name=wxPyStaticBoxNameStr) -> StaticBox
+            String name=wxPyStaticBoxNameStr) -> StaticBox

         """
         newobj = _controls.new_StaticBox(*args, **kwargs)
         self.this = newobj.this
         """
         newobj = _controls.new_StaticBox(*args, **kwargs)
         self.this = newobj.this


@@ -542,9 +538,9 @@ class StaticBox(core.Control):
 
     def Create(*args, **kwargs):
         """
 
     def Create(*args, **kwargs):
         """

-        Create(Window parent, int id, wxString label, Point pos=DefaultPosition, 
+        Create(Window parent, int id, String label, Point pos=DefaultPosition, 

             Size size=DefaultSize, long style=0, 
             Size size=DefaultSize, long style=0, 

-            wxString name=wxPyStaticBoxNameStr) -> bool
+            String name=wxPyStaticBoxNameStr) -> bool

         """
         return _controls.StaticBox_Create(*args, **kwargs)
 
         """
         return _controls.StaticBox_Create(*args, **kwargs)
 


@@ -571,7 +567,7 @@ class StaticLine(core.Control):
         """
         __init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
             long style=LI_HORIZONTAL, 
         """
         __init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
             long style=LI_HORIZONTAL, 

-            wxString name=wxPyStaticTextNameStr) -> StaticLine
+            String name=wxPyStaticTextNameStr) -> StaticLine

         """
         newobj = _controls.new_StaticLine(*args, **kwargs)
         self.this = newobj.this
         """
         newobj = _controls.new_StaticLine(*args, **kwargs)
         self.this = newobj.this


@@ -583,7 +579,7 @@ class StaticLine(core.Control):
         """
         Create(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
             long style=LI_HORIZONTAL, 
         """
         Create(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
             long style=LI_HORIZONTAL, 

-            wxString name=wxPyStaticTextNameStr) -> bool
+            String name=wxPyStaticTextNameStr) -> bool

         """
         return _controls.StaticLine_Create(*args, **kwargs)
 
         """
         return _controls.StaticLine_Create(*args, **kwargs)
 


@@ -621,9 +617,9 @@ class StaticText(core.Control):
         return "<%s.%s; proxy of C++ wxStaticText instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """
         return "<%s.%s; proxy of C++ wxStaticText instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """

-        __init__(Window parent, int id, wxString label, Point pos=DefaultPosition, 
+        __init__(Window parent, int id, String label, Point pos=DefaultPosition, 

             Size size=DefaultSize, long style=0, 
             Size size=DefaultSize, long style=0, 

-            wxString name=wxPyStaticTextNameStr) -> StaticText
+            String name=wxPyStaticTextNameStr) -> StaticText

         """
         newobj = _controls.new_StaticText(*args, **kwargs)
         self.this = newobj.this
         """
         newobj = _controls.new_StaticText(*args, **kwargs)
         self.this = newobj.this


@@ -633,9 +629,9 @@ class StaticText(core.Control):
 
     def Create(*args, **kwargs):
         """
 
     def Create(*args, **kwargs):
         """

-        Create(Window parent, int id, wxString label, Point pos=DefaultPosition, 
+        Create(Window parent, int id, String label, Point pos=DefaultPosition, 

             Size size=DefaultSize, long style=0, 
             Size size=DefaultSize, long style=0, 

-            wxString name=wxPyStaticTextNameStr) -> bool
+            String name=wxPyStaticTextNameStr) -> bool

         """
         return _controls.StaticText_Create(*args, **kwargs)
 
         """
         return _controls.StaticText_Create(*args, **kwargs)
 


@@ -660,9 +656,9 @@ class StaticBitmap(core.Control):
         return "<%s.%s; proxy of C++ wxStaticBitmap instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """
         return "<%s.%s; proxy of C++ wxStaticBitmap instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """

-        __init__(Window parent, int id, wxBitmap bitmap, Point pos=DefaultPosition, 
+        __init__(Window parent, int id, Bitmap bitmap, Point pos=DefaultPosition, 

             Size size=DefaultSize, long style=0, 
             Size size=DefaultSize, long style=0, 

-            wxString name=wxPyStaticBitmapNameStr) -> StaticBitmap
+            String name=wxPyStaticBitmapNameStr) -> StaticBitmap

         """
         newobj = _controls.new_StaticBitmap(*args, **kwargs)
         self.this = newobj.this
         """
         newobj = _controls.new_StaticBitmap(*args, **kwargs)
         self.this = newobj.this


@@ -670,18 +666,18 @@ class StaticBitmap(core.Control):
         del newobj.thisown
     def Create(*args, **kwargs):
         """
         del newobj.thisown
     def Create(*args, **kwargs):
         """

-        Create(Window parent, int id, wxBitmap bitmap, Point pos=DefaultPosition, 
+        Create(Window parent, int id, Bitmap bitmap, Point pos=DefaultPosition, 

             Size size=DefaultSize, long style=0, 
             Size size=DefaultSize, long style=0, 

-            wxString name=wxPyStaticBitmapNameStr) -> bool
+            String name=wxPyStaticBitmapNameStr) -> bool

         """
         return _controls.StaticBitmap_Create(*args, **kwargs)
 
     def GetBitmap(*args, **kwargs):
         """
         return _controls.StaticBitmap_Create(*args, **kwargs)
 
     def GetBitmap(*args, **kwargs):

-        """GetBitmap() -> wxBitmap"""
+        """GetBitmap() -> Bitmap"""

         return _controls.StaticBitmap_GetBitmap(*args, **kwargs)
 
     def SetBitmap(*args, **kwargs):
         return _controls.StaticBitmap_GetBitmap(*args, **kwargs)
 
     def SetBitmap(*args, **kwargs):

-        """SetBitmap(wxBitmap bitmap)"""
+        """SetBitmap(Bitmap bitmap)"""

         return _controls.StaticBitmap_SetBitmap(*args, **kwargs)
 
     def SetIcon(*args, **kwargs):
         return _controls.StaticBitmap_SetBitmap(*args, **kwargs)
 
     def SetIcon(*args, **kwargs):


@@ -710,9 +706,9 @@ class ListBox(core.ControlWithItems):
     def __init__(self, *args, **kwargs):
         """
         __init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
     def __init__(self, *args, **kwargs):
         """
         __init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 

-            int choices=0, wxString choices_array=None, 
+            int choices=0, String choices_array=None, 

             long style=0, Validator validator=DefaultValidator, 
             long style=0, Validator validator=DefaultValidator, 

-            wxString name=wxPyListBoxNameStr) -> ListBox
+            String name=wxPyListBoxNameStr) -> ListBox

         """
         newobj = _controls.new_ListBox(*args, **kwargs)
         self.this = newobj.this
         """
         newobj = _controls.new_ListBox(*args, **kwargs)
         self.this = newobj.this


@@ -723,14 +719,14 @@ class ListBox(core.ControlWithItems):
     def Create(*args, **kwargs):
         """
         Create(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
     def Create(*args, **kwargs):
         """
         Create(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 

-            int choices=0, wxString choices_array=None, 
+            int choices=0, String choices_array=None, 

             long style=0, Validator validator=DefaultValidator, 
             long style=0, Validator validator=DefaultValidator, 

-            wxString name=wxPyListBoxNameStr) -> bool
+            String name=wxPyListBoxNameStr) -> bool

         """
         return _controls.ListBox_Create(*args, **kwargs)
 
     def Insert(*args, **kwargs):
         """
         return _controls.ListBox_Create(*args, **kwargs)
 
     def Insert(*args, **kwargs):

-        """Insert(wxString item, int pos, PyObject clientData=None)"""
+        """Insert(String item, int pos, PyObject clientData=None)"""

         return _controls.ListBox_Insert(*args, **kwargs)
 
     def InsertItems(*args, **kwargs):
         return _controls.ListBox_Insert(*args, **kwargs)
 
     def InsertItems(*args, **kwargs):


@@ -762,7 +758,7 @@ class ListBox(core.ControlWithItems):
         return _controls.ListBox_DeselectAll(*args, **kwargs)
 
     def SetStringSelection(*args, **kwargs):
         return _controls.ListBox_DeselectAll(*args, **kwargs)
 
     def SetStringSelection(*args, **kwargs):

-        """SetStringSelection(wxString s, bool select=True) -> bool"""
+        """SetStringSelection(String s, bool select=True) -> bool"""

         return _controls.ListBox_SetStringSelection(*args, **kwargs)
 
     def GetSelections(*args, **kwargs):
         return _controls.ListBox_SetStringSelection(*args, **kwargs)
 
     def GetSelections(*args, **kwargs):


@@ -774,7 +770,7 @@ class ListBox(core.ControlWithItems):
         return _controls.ListBox_SetFirstItem(*args, **kwargs)
 
     def SetFirstItemStr(*args, **kwargs):
         return _controls.ListBox_SetFirstItem(*args, **kwargs)
 
     def SetFirstItemStr(*args, **kwargs):

-        """SetFirstItemStr(wxString s)"""
+        """SetFirstItemStr(String s)"""

         return _controls.ListBox_SetFirstItemStr(*args, **kwargs)
 
     def EnsureVisible(*args, **kwargs):
         return _controls.ListBox_SetFirstItemStr(*args, **kwargs)
 
     def EnsureVisible(*args, **kwargs):


@@ -782,7 +778,7 @@ class ListBox(core.ControlWithItems):
         return _controls.ListBox_EnsureVisible(*args, **kwargs)
 
     def AppendAndEnsureVisible(*args, **kwargs):
         return _controls.ListBox_EnsureVisible(*args, **kwargs)
 
     def AppendAndEnsureVisible(*args, **kwargs):

-        """AppendAndEnsureVisible(wxString s)"""
+        """AppendAndEnsureVisible(String s)"""

         return _controls.ListBox_AppendAndEnsureVisible(*args, **kwargs)
 
     def IsSorted(*args, **kwargs):
         return _controls.ListBox_AppendAndEnsureVisible(*args, **kwargs)
 
     def IsSorted(*args, **kwargs):


@@ -811,9 +807,9 @@ class CheckListBox(ListBox):
     def __init__(self, *args, **kwargs):
         """
         __init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
     def __init__(self, *args, **kwargs):
         """
         __init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 

-            int choices=0, wxString choices_array=None, 
+            int choices=0, String choices_array=None, 

             long style=0, Validator validator=DefaultValidator, 
             long style=0, Validator validator=DefaultValidator, 

-            wxString name=wxPyListBoxNameStr) -> CheckListBox
+            String name=wxPyListBoxNameStr) -> CheckListBox

         """
         newobj = _controls.new_CheckListBox(*args, **kwargs)
         self.this = newobj.this
         """
         newobj = _controls.new_CheckListBox(*args, **kwargs)
         self.this = newobj.this


@@ -822,9 +818,9 @@ class CheckListBox(ListBox):
     def Create(*args, **kwargs):
         """
         Create(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
     def Create(*args, **kwargs):
         """
         Create(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 

-            int choices=0, wxString choices_array=None, 
+            int choices=0, String choices_array=None, 

             long style=0, Validator validator=DefaultValidator, 
             long style=0, Validator validator=DefaultValidator, 

-            wxString name=wxPyListBoxNameStr) -> bool
+            String name=wxPyListBoxNameStr) -> bool

         """
         return _controls.CheckListBox_Create(*args, **kwargs)
 
         """
         return _controls.CheckListBox_Create(*args, **kwargs)
 


@@ -906,8 +902,8 @@ class TextAttr(object):
     def __init__(self, *args):
         """
         __init__() -> TextAttr
     def __init__(self, *args):
         """
         __init__() -> TextAttr

-        __init__(wxColour colText, wxColour colBack=wxNullColour, wxFont font=wxNullFont, 
-            wxTextAttrAlignment alignment=TEXT_ALIGNMENT_DEFAULT) -> TextAttr
+        __init__(Colour colText, Colour colBack=wxNullColour, Font font=wxNullFont, 
+            int alignment=TEXT_ALIGNMENT_DEFAULT) -> TextAttr

         """
         newobj = _controls.new_TextAttr(*args)
         self.this = newobj.this
         """
         newobj = _controls.new_TextAttr(*args)
         self.this = newobj.this


@@ -918,19 +914,19 @@ class TextAttr(object):
         return _controls.TextAttr_Init(*args, **kwargs)
 
     def SetTextColour(*args, **kwargs):
         return _controls.TextAttr_Init(*args, **kwargs)
 
     def SetTextColour(*args, **kwargs):

-        """SetTextColour(wxColour colText)"""
+        """SetTextColour(Colour colText)"""

         return _controls.TextAttr_SetTextColour(*args, **kwargs)
 
     def SetBackgroundColour(*args, **kwargs):
         return _controls.TextAttr_SetTextColour(*args, **kwargs)
 
     def SetBackgroundColour(*args, **kwargs):

-        """SetBackgroundColour(wxColour colBack)"""
+        """SetBackgroundColour(Colour colBack)"""

         return _controls.TextAttr_SetBackgroundColour(*args, **kwargs)
 
     def SetFont(*args, **kwargs):
         return _controls.TextAttr_SetBackgroundColour(*args, **kwargs)
 
     def SetFont(*args, **kwargs):

-        """SetFont(wxFont font, long flags=TEXT_ATTR_FONT)"""
+        """SetFont(Font font, long flags=TEXT_ATTR_FONT)"""

         return _controls.TextAttr_SetFont(*args, **kwargs)
 
     def SetAlignment(*args, **kwargs):
         return _controls.TextAttr_SetFont(*args, **kwargs)
 
     def SetAlignment(*args, **kwargs):

-        """SetAlignment(wxTextAttrAlignment alignment)"""
+        """SetAlignment(int alignment)"""

         return _controls.TextAttr_SetAlignment(*args, **kwargs)
 
     def SetTabs(*args, **kwargs):
         return _controls.TextAttr_SetAlignment(*args, **kwargs)
 
     def SetTabs(*args, **kwargs):


@@ -982,19 +978,19 @@ class TextAttr(object):
         return _controls.TextAttr_HasFlag(*args, **kwargs)
 
     def GetTextColour(*args, **kwargs):
         return _controls.TextAttr_HasFlag(*args, **kwargs)
 
     def GetTextColour(*args, **kwargs):

-        """GetTextColour() -> wxColour"""
+        """GetTextColour() -> Colour"""

         return _controls.TextAttr_GetTextColour(*args, **kwargs)
 
     def GetBackgroundColour(*args, **kwargs):
         return _controls.TextAttr_GetTextColour(*args, **kwargs)
 
     def GetBackgroundColour(*args, **kwargs):

-        """GetBackgroundColour() -> wxColour"""
+        """GetBackgroundColour() -> Colour"""

         return _controls.TextAttr_GetBackgroundColour(*args, **kwargs)
 
     def GetFont(*args, **kwargs):
         return _controls.TextAttr_GetBackgroundColour(*args, **kwargs)
 
     def GetFont(*args, **kwargs):

-        """GetFont() -> wxFont"""
+        """GetFont() -> Font"""

         return _controls.TextAttr_GetFont(*args, **kwargs)
 
     def GetAlignment(*args, **kwargs):
         return _controls.TextAttr_GetFont(*args, **kwargs)
 
     def GetAlignment(*args, **kwargs):

-        """GetAlignment() -> wxTextAttrAlignment"""
+        """GetAlignment() -> int"""

         return _controls.TextAttr_GetAlignment(*args, **kwargs)
 
     def GetTabs(*args, **kwargs):
         return _controls.TextAttr_GetAlignment(*args, **kwargs)
 
     def GetTabs(*args, **kwargs):


@@ -1039,10 +1035,10 @@ class TextCtrl(core.Control):
         return "<%s.%s; proxy of C++ wxTextCtrl instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """
         return "<%s.%s; proxy of C++ wxTextCtrl instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """

-        __init__(Window parent, int id, wxString value=wxPyEmptyString, 
-            Point pos=DefaultPosition, Size size=DefaultSize, 
+        __init__(Window parent, int id, String value=EmptyString, Point pos=DefaultPosition, 
+            Size size=DefaultSize, 

             long style=0, Validator validator=DefaultValidator, 
             long style=0, Validator validator=DefaultValidator, 

-            wxString name=wxPyTextCtrlNameStr) -> TextCtrl
+            String name=wxPyTextCtrlNameStr) -> TextCtrl

         """
         newobj = _controls.new_TextCtrl(*args, **kwargs)
         self.this = newobj.this
         """
         newobj = _controls.new_TextCtrl(*args, **kwargs)
         self.this = newobj.this


@@ -1052,23 +1048,23 @@ class TextCtrl(core.Control):
 
     def Create(*args, **kwargs):
         """
 
     def Create(*args, **kwargs):
         """

-        Create(Window parent, int id, wxString value=wxPyEmptyString, 
-            Point pos=DefaultPosition, Size size=DefaultSize, 
+        Create(Window parent, int id, String value=EmptyString, Point pos=DefaultPosition, 
+            Size size=DefaultSize, 

             long style=0, Validator validator=DefaultValidator, 
             long style=0, Validator validator=DefaultValidator, 

-            wxString name=wxPyTextCtrlNameStr) -> bool
+            String name=wxPyTextCtrlNameStr) -> bool

         """
         return _controls.TextCtrl_Create(*args, **kwargs)
 
     def GetValue(*args, **kwargs):
         """
         return _controls.TextCtrl_Create(*args, **kwargs)
 
     def GetValue(*args, **kwargs):

-        """GetValue() -> wxString"""
+        """GetValue() -> String"""

         return _controls.TextCtrl_GetValue(*args, **kwargs)
 
     def SetValue(*args, **kwargs):
         return _controls.TextCtrl_GetValue(*args, **kwargs)
 
     def SetValue(*args, **kwargs):

-        """SetValue(wxString value)"""
+        """SetValue(String value)"""

         return _controls.TextCtrl_SetValue(*args, **kwargs)
 
     def GetRange(*args, **kwargs):
         return _controls.TextCtrl_SetValue(*args, **kwargs)
 
     def GetRange(*args, **kwargs):

-        """GetRange(long from, long to) -> wxString"""
+        """GetRange(long from, long to) -> String"""

         return _controls.TextCtrl_GetRange(*args, **kwargs)
 
     def GetLineLength(*args, **kwargs):
         return _controls.TextCtrl_GetRange(*args, **kwargs)
 
     def GetLineLength(*args, **kwargs):


@@ -1076,7 +1072,7 @@ class TextCtrl(core.Control):
         return _controls.TextCtrl_GetLineLength(*args, **kwargs)
 
     def GetLineText(*args, **kwargs):
         return _controls.TextCtrl_GetLineLength(*args, **kwargs)
 
     def GetLineText(*args, **kwargs):

-        """GetLineText(long lineNo) -> wxString"""
+        """GetLineText(long lineNo) -> String"""

         return _controls.TextCtrl_GetLineText(*args, **kwargs)
 
     def GetNumberOfLines(*args, **kwargs):
         return _controls.TextCtrl_GetLineText(*args, **kwargs)
 
     def GetNumberOfLines(*args, **kwargs):


@@ -1108,7 +1104,7 @@ class TextCtrl(core.Control):
         return _controls.TextCtrl_GetSelection(*args, **kwargs)
 
     def GetStringSelection(*args, **kwargs):
         return _controls.TextCtrl_GetSelection(*args, **kwargs)
 
     def GetStringSelection(*args, **kwargs):

-        """GetStringSelection() -> wxString"""
+        """GetStringSelection() -> String"""

         return _controls.TextCtrl_GetStringSelection(*args, **kwargs)
 
     def Clear(*args, **kwargs):
         return _controls.TextCtrl_GetStringSelection(*args, **kwargs)
 
     def Clear(*args, **kwargs):


@@ -1116,7 +1112,7 @@ class TextCtrl(core.Control):
         return _controls.TextCtrl_Clear(*args, **kwargs)
 
     def Replace(*args, **kwargs):
         return _controls.TextCtrl_Clear(*args, **kwargs)
 
     def Replace(*args, **kwargs):

-        """Replace(long from, long to, wxString value)"""
+        """Replace(long from, long to, String value)"""

         return _controls.TextCtrl_Replace(*args, **kwargs)
 
     def Remove(*args, **kwargs):
         return _controls.TextCtrl_Replace(*args, **kwargs)
 
     def Remove(*args, **kwargs):


@@ -1124,11 +1120,11 @@ class TextCtrl(core.Control):
         return _controls.TextCtrl_Remove(*args, **kwargs)
 
     def LoadFile(*args, **kwargs):
         return _controls.TextCtrl_Remove(*args, **kwargs)
 
     def LoadFile(*args, **kwargs):

-        """LoadFile(wxString file) -> bool"""
+        """LoadFile(String file) -> bool"""

         return _controls.TextCtrl_LoadFile(*args, **kwargs)
 
     def SaveFile(*args, **kwargs):
         return _controls.TextCtrl_LoadFile(*args, **kwargs)
 
     def SaveFile(*args, **kwargs):

-        """SaveFile(wxString file=wxPyEmptyString) -> bool"""
+        """SaveFile(String file=EmptyString) -> bool"""

         return _controls.TextCtrl_SaveFile(*args, **kwargs)
 
     def MarkDirty(*args, **kwargs):
         return _controls.TextCtrl_SaveFile(*args, **kwargs)
 
     def MarkDirty(*args, **kwargs):


@@ -1144,11 +1140,11 @@ class TextCtrl(core.Control):
         return _controls.TextCtrl_SetMaxLength(*args, **kwargs)
 
     def WriteText(*args, **kwargs):
         return _controls.TextCtrl_SetMaxLength(*args, **kwargs)
 
     def WriteText(*args, **kwargs):

-        """WriteText(wxString text)"""
+        """WriteText(String text)"""

         return _controls.TextCtrl_WriteText(*args, **kwargs)
 
     def AppendText(*args, **kwargs):
         return _controls.TextCtrl_WriteText(*args, **kwargs)
 
     def AppendText(*args, **kwargs):

-        """AppendText(wxString text)"""
+        """AppendText(String text)"""

         return _controls.TextCtrl_AppendText(*args, **kwargs)
 
     def EmulateKeyPress(*args, **kwargs):
         return _controls.TextCtrl_AppendText(*args, **kwargs)
 
     def EmulateKeyPress(*args, **kwargs):


@@ -1252,11 +1248,11 @@ class TextCtrl(core.Control):
         return _controls.TextCtrl_SetEditable(*args, **kwargs)
 
     def write(*args, **kwargs):
         return _controls.TextCtrl_SetEditable(*args, **kwargs)
 
     def write(*args, **kwargs):

-        """write(wxString text)"""
+        """write(String text)"""

         return _controls.TextCtrl_write(*args, **kwargs)
 
     def GetString(*args, **kwargs):
         return _controls.TextCtrl_write(*args, **kwargs)
 
     def GetString(*args, **kwargs):

-        """GetString(long from, long to) -> wxString"""
+        """GetString(long from, long to) -> String"""

         return _controls.TextCtrl_GetString(*args, **kwargs)
 
 
         return _controls.TextCtrl_GetString(*args, **kwargs)
 
 


@@ -1320,7 +1316,7 @@ class ScrollBar(core.Control):
         """
         __init__(Window parent, int id=-1, Point pos=DefaultPosition, 
             Size size=DefaultSize, long style=SB_HORIZONTAL, 
         """
         __init__(Window parent, int id=-1, Point pos=DefaultPosition, 
             Size size=DefaultSize, long style=SB_HORIZONTAL, 

-            Validator validator=DefaultValidator, wxString name=wxPyScrollBarNameStr) -> ScrollBar
+            Validator validator=DefaultValidator, String name=wxPyScrollBarNameStr) -> ScrollBar

         """
         newobj = _controls.new_ScrollBar(*args, **kwargs)
         self.this = newobj.this
         """
         newobj = _controls.new_ScrollBar(*args, **kwargs)
         self.this = newobj.this


@@ -1332,7 +1328,7 @@ class ScrollBar(core.Control):
         """
         Create(Window parent, int id=-1, Point pos=DefaultPosition, 
             Size size=DefaultSize, long style=SB_HORIZONTAL, 
         """
         Create(Window parent, int id=-1, Point pos=DefaultPosition, 
             Size size=DefaultSize, long style=SB_HORIZONTAL, 

-            Validator validator=DefaultValidator, wxString name=wxPyScrollBarNameStr) -> bool
+            Validator validator=DefaultValidator, String name=wxPyScrollBarNameStr) -> bool

         """
         return _controls.ScrollBar_Create(*args, **kwargs)
 
         """
         return _controls.ScrollBar_Create(*args, **kwargs)
 


@@ -1395,7 +1391,7 @@ class SpinButton(core.Control):
         """
         __init__(Window parent, int id=-1, Point pos=DefaultPosition, 
             Size size=DefaultSize, long style=SP_HORIZONTAL, 
         """
         __init__(Window parent, int id=-1, Point pos=DefaultPosition, 
             Size size=DefaultSize, long style=SP_HORIZONTAL, 

-            wxString name=wxPySPIN_BUTTON_NAME) -> SpinButton
+            String name=wxPySPIN_BUTTON_NAME) -> SpinButton

         """
         newobj = _controls.new_SpinButton(*args, **kwargs)
         self.this = newobj.this
         """
         newobj = _controls.new_SpinButton(*args, **kwargs)
         self.this = newobj.this


@@ -1407,7 +1403,7 @@ class SpinButton(core.Control):
         """
         Create(Window parent, int id=-1, Point pos=DefaultPosition, 
             Size size=DefaultSize, long style=SP_HORIZONTAL, 
         """
         Create(Window parent, int id=-1, Point pos=DefaultPosition, 
             Size size=DefaultSize, long style=SP_HORIZONTAL, 

-            wxString name=wxPySPIN_BUTTON_NAME) -> bool
+            String name=wxPySPIN_BUTTON_NAME) -> bool

         """
         return _controls.SpinButton_Create(*args, **kwargs)
 
         """
         return _controls.SpinButton_Create(*args, **kwargs)
 


@@ -1462,10 +1458,10 @@ class SpinCtrl(core.Control):
         return "<%s.%s; proxy of C++ wxSpinCtrl instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """
         return "<%s.%s; proxy of C++ wxSpinCtrl instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """

-        __init__(Window parent, int id=-1, wxString value=wxPyEmptyString, 
+        __init__(Window parent, int id=-1, String value=EmptyString, 

             Point pos=DefaultPosition, Size size=DefaultSize, 
             Point pos=DefaultPosition, Size size=DefaultSize, 

-            long style=SP_ARROW_KEYS, int min=0, 
-            int max=100, int initial=0, wxString name=wxPySpinCtrlNameStr) -> SpinCtrl
+            long style=SP_ARROW_KEYS, int min=0, int max=100, 
+            int initial=0, String name=wxPySpinCtrlNameStr) -> SpinCtrl

         """
         newobj = _controls.new_SpinCtrl(*args, **kwargs)
         self.this = newobj.this
         """
         newobj = _controls.new_SpinCtrl(*args, **kwargs)
         self.this = newobj.this


@@ -1475,10 +1471,10 @@ class SpinCtrl(core.Control):
 
     def Create(*args, **kwargs):
         """
 
     def Create(*args, **kwargs):
         """

-        Create(Window parent, int id=-1, wxString value=wxPyEmptyString, 
+        Create(Window parent, int id=-1, String value=EmptyString, 

             Point pos=DefaultPosition, Size size=DefaultSize, 
             Point pos=DefaultPosition, Size size=DefaultSize, 

-            long style=SP_ARROW_KEYS, int min=0, 
-            int max=100, int initial=0, wxString name=wxPySpinCtrlNameStr) -> bool
+            long style=SP_ARROW_KEYS, int min=0, int max=100, 
+            int initial=0, String name=wxPySpinCtrlNameStr) -> bool

         """
         return _controls.SpinCtrl_Create(*args, **kwargs)
 
         """
         return _controls.SpinCtrl_Create(*args, **kwargs)
 


@@ -1491,7 +1487,7 @@ class SpinCtrl(core.Control):
         return _controls.SpinCtrl_SetValue(*args, **kwargs)
 
     def SetValueString(*args, **kwargs):
         return _controls.SpinCtrl_SetValue(*args, **kwargs)
 
     def SetValueString(*args, **kwargs):

-        """SetValueString(wxString text)"""
+        """SetValueString(String text)"""

         return _controls.SpinCtrl_SetValueString(*args, **kwargs)
 
     def SetRange(*args, **kwargs):
         return _controls.SpinCtrl_SetValueString(*args, **kwargs)
 
     def SetRange(*args, **kwargs):


@@ -1534,11 +1530,11 @@ class RadioBox(core.Control):
         return "<%s.%s; proxy of C++ wxRadioBox instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """
         return "<%s.%s; proxy of C++ wxRadioBox instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """

-        __init__(Window parent, int id, wxString label, Point point=DefaultPosition, 
+        __init__(Window parent, int id, String label, Point point=DefaultPosition, 

             Size size=DefaultSize, int choices=0, 
             Size size=DefaultSize, int choices=0, 

-            wxString choices_array=None, int majorDimension=0, 
+            String choices_array=None, int majorDimension=0, 

             long style=RA_HORIZONTAL, Validator validator=DefaultValidator, 
             long style=RA_HORIZONTAL, Validator validator=DefaultValidator, 

-            wxString name=wxPyRadioBoxNameStr) -> RadioBox
+            String name=wxPyRadioBoxNameStr) -> RadioBox

         """
         newobj = _controls.new_RadioBox(*args, **kwargs)
         self.this = newobj.this
         """
         newobj = _controls.new_RadioBox(*args, **kwargs)
         self.this = newobj.this


@@ -1548,11 +1544,11 @@ class RadioBox(core.Control):
 
     def Create(*args, **kwargs):
         """
 
     def Create(*args, **kwargs):
         """

-        Create(Window parent, int id, wxString label, Point point=DefaultPosition, 
+        Create(Window parent, int id, String label, Point point=DefaultPosition, 

             Size size=DefaultSize, int choices=0, 
             Size size=DefaultSize, int choices=0, 

-            wxString choices_array=None, int majorDimension=0, 
+            String choices_array=None, int majorDimension=0, 

             long style=RA_HORIZONTAL, Validator validator=DefaultValidator, 
             long style=RA_HORIZONTAL, Validator validator=DefaultValidator, 

-            wxString name=wxPyRadioBoxNameStr) -> bool
+            String name=wxPyRadioBoxNameStr) -> bool

         """
         return _controls.RadioBox_Create(*args, **kwargs)
 
         """
         return _controls.RadioBox_Create(*args, **kwargs)
 


@@ -1565,11 +1561,11 @@ class RadioBox(core.Control):
         return _controls.RadioBox_GetSelection(*args, **kwargs)
 
     def GetStringSelection(*args, **kwargs):
         return _controls.RadioBox_GetSelection(*args, **kwargs)
 
     def GetStringSelection(*args, **kwargs):

-        """GetStringSelection() -> wxString"""
+        """GetStringSelection() -> String"""

         return _controls.RadioBox_GetStringSelection(*args, **kwargs)
 
     def SetStringSelection(*args, **kwargs):
         return _controls.RadioBox_GetStringSelection(*args, **kwargs)
 
     def SetStringSelection(*args, **kwargs):

-        """SetStringSelection(wxString s) -> bool"""
+        """SetStringSelection(String s) -> bool"""

         return _controls.RadioBox_SetStringSelection(*args, **kwargs)
 
     def GetCount(*args, **kwargs):
         return _controls.RadioBox_SetStringSelection(*args, **kwargs)
 
     def GetCount(*args, **kwargs):


@@ -1577,15 +1573,15 @@ class RadioBox(core.Control):
         return _controls.RadioBox_GetCount(*args, **kwargs)
 
     def FindString(*args, **kwargs):
         return _controls.RadioBox_GetCount(*args, **kwargs)
 
     def FindString(*args, **kwargs):

-        """FindString(wxString s) -> int"""
+        """FindString(String s) -> int"""

         return _controls.RadioBox_FindString(*args, **kwargs)
 
     def GetString(*args, **kwargs):
         return _controls.RadioBox_FindString(*args, **kwargs)
 
     def GetString(*args, **kwargs):

-        """GetString(int n) -> wxString"""
+        """GetString(int n) -> String"""

         return _controls.RadioBox_GetString(*args, **kwargs)
 
     def SetString(*args, **kwargs):
         return _controls.RadioBox_GetString(*args, **kwargs)
 
     def SetString(*args, **kwargs):

-        """SetString(int n, wxString label)"""
+        """SetString(int n, String label)"""

         return _controls.RadioBox_SetString(*args, **kwargs)
 
     GetItemLabel = GetString 
         return _controls.RadioBox_SetString(*args, **kwargs)
 
     GetItemLabel = GetString 


@@ -1607,7 +1603,7 @@ class RadioBox(core.Control):
         return _controls.RadioBox_GetRowCount(*args, **kwargs)
 
     def GetNextItem(*args, **kwargs):
         return _controls.RadioBox_GetRowCount(*args, **kwargs)
 
     def GetNextItem(*args, **kwargs):

-        """GetNextItem(int item, wxDirection dir, long style) -> int"""
+        """GetNextItem(int item, int dir, long style) -> int"""

         return _controls.RadioBox_GetNextItem(*args, **kwargs)
 
 
         return _controls.RadioBox_GetNextItem(*args, **kwargs)
 
 


@@ -1631,10 +1627,9 @@ class RadioButton(core.Control):
         return "<%s.%s; proxy of C++ wxRadioButton instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """
         return "<%s.%s; proxy of C++ wxRadioButton instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """

-        __init__(Window parent, int id, wxString label, Point pos=DefaultPosition, 
+        __init__(Window parent, int id, String label, Point pos=DefaultPosition, 

             Size size=DefaultSize, long style=0, 
             Size size=DefaultSize, long style=0, 

-            Validator validator=DefaultValidator, 
-            wxString name=wxPyRadioButtonNameStr) -> RadioButton
+            Validator validator=DefaultValidator, String name=wxPyRadioButtonNameStr) -> RadioButton

         """
         newobj = _controls.new_RadioButton(*args, **kwargs)
         self.this = newobj.this
         """
         newobj = _controls.new_RadioButton(*args, **kwargs)
         self.this = newobj.this


@@ -1644,10 +1639,9 @@ class RadioButton(core.Control):
 
     def Create(*args, **kwargs):
         """
 
     def Create(*args, **kwargs):
         """

-        Create(Window parent, int id, wxString label, Point pos=DefaultPosition, 
+        Create(Window parent, int id, String label, Point pos=DefaultPosition, 

             Size size=DefaultSize, long style=0, 
             Size size=DefaultSize, long style=0, 

-            Validator validator=DefaultValidator, 
-            wxString name=wxPyRadioButtonNameStr) -> bool
+            Validator validator=DefaultValidator, String name=wxPyRadioButtonNameStr) -> bool

         """
         return _controls.RadioButton_Create(*args, **kwargs)
 
         """
         return _controls.RadioButton_Create(*args, **kwargs)
 


@@ -1683,7 +1677,7 @@ class Slider(core.Control):
         __init__(Window parent, int id, int value, int minValue, int maxValue, 
             Point point=DefaultPosition, Size size=DefaultSize, 
             long style=SL_HORIZONTAL, Validator validator=DefaultValidator, 
         __init__(Window parent, int id, int value, int minValue, int maxValue, 
             Point point=DefaultPosition, Size size=DefaultSize, 
             long style=SL_HORIZONTAL, Validator validator=DefaultValidator, 

-            wxString name=wxPySliderNameStr) -> Slider
+            String name=wxPySliderNameStr) -> Slider

         """
         newobj = _controls.new_Slider(*args, **kwargs)
         self.this = newobj.this
         """
         newobj = _controls.new_Slider(*args, **kwargs)
         self.this = newobj.this


@@ -1696,7 +1690,7 @@ class Slider(core.Control):
         Create(Window parent, int id, int value, int minValue, int maxValue, 
             Point point=DefaultPosition, Size size=DefaultSize, 
             long style=SL_HORIZONTAL, Validator validator=DefaultValidator, 
         Create(Window parent, int id, int value, int minValue, int maxValue, 
             Point point=DefaultPosition, Size size=DefaultSize, 
             long style=SL_HORIZONTAL, Validator validator=DefaultValidator, 

-            wxString name=wxPySliderNameStr) -> bool
+            String name=wxPySliderNameStr) -> bool

         """
         return _controls.Slider_Create(*args, **kwargs)
 
         """
         return _controls.Slider_Create(*args, **kwargs)
 


@@ -1808,10 +1802,9 @@ class ToggleButton(core.Control):
         return "<%s.%s; proxy of C++ wxToggleButton instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """
         return "<%s.%s; proxy of C++ wxToggleButton instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """

-        __init__(Window parent, int id, wxString label, Point pos=DefaultPosition, 
+        __init__(Window parent, int id, String label, Point pos=DefaultPosition, 

             Size size=DefaultSize, long style=0, 
             Size size=DefaultSize, long style=0, 

-            Validator validator=DefaultValidator, 
-            wxString name=wxPyToggleButtonNameStr) -> ToggleButton
+            Validator validator=DefaultValidator, String name=wxPyToggleButtonNameStr) -> ToggleButton

         """
         newobj = _controls.new_ToggleButton(*args, **kwargs)
         self.this = newobj.this
         """
         newobj = _controls.new_ToggleButton(*args, **kwargs)
         self.this = newobj.this


@@ -1821,10 +1814,9 @@ class ToggleButton(core.Control):
 
     def Create(*args, **kwargs):
         """
 
     def Create(*args, **kwargs):
         """

-        Create(Window parent, int id, wxString label, Point pos=DefaultPosition, 
+        Create(Window parent, int id, String label, Point pos=DefaultPosition, 

             Size size=DefaultSize, long style=0, 
             Size size=DefaultSize, long style=0, 

-            Validator validator=DefaultValidator, 
-            wxString name=wxPyToggleButtonNameStr) -> bool
+            Validator validator=DefaultValidator, String name=wxPyToggleButtonNameStr) -> bool

         """
         return _controls.ToggleButton_Create(*args, **kwargs)
 
         """
         return _controls.ToggleButton_Create(*args, **kwargs)
 


@@ -1837,7 +1829,7 @@ class ToggleButton(core.Control):
         return _controls.ToggleButton_GetValue(*args, **kwargs)
 
     def SetLabel(*args, **kwargs):
         return _controls.ToggleButton_GetValue(*args, **kwargs)
 
     def SetLabel(*args, **kwargs):

-        """SetLabel(wxString label)"""
+        """SetLabel(String label)"""

         return _controls.ToggleButton_SetLabel(*args, **kwargs)
 
 
         return _controls.ToggleButton_SetLabel(*args, **kwargs)
 
 


@@ -1873,11 +1865,11 @@ class BookCtrl(core.Control):
         return _controls.BookCtrl_GetSelection(*args, **kwargs)
 
     def SetPageText(*args, **kwargs):
         return _controls.BookCtrl_GetSelection(*args, **kwargs)
 
     def SetPageText(*args, **kwargs):

-        """SetPageText(size_t n, wxString strText) -> bool"""
+        """SetPageText(size_t n, String strText) -> bool"""

         return _controls.BookCtrl_SetPageText(*args, **kwargs)
 
     def GetPageText(*args, **kwargs):
         return _controls.BookCtrl_SetPageText(*args, **kwargs)
 
     def GetPageText(*args, **kwargs):

-        """GetPageText(size_t n) -> wxString"""
+        """GetPageText(size_t n) -> String"""

         return _controls.BookCtrl_GetPageText(*args, **kwargs)
 
     def SetImageList(*args, **kwargs):
         return _controls.BookCtrl_GetPageText(*args, **kwargs)
 
     def SetImageList(*args, **kwargs):


@@ -1923,12 +1915,12 @@ class BookCtrl(core.Control):
         return _controls.BookCtrl_DeleteAllPages(*args, **kwargs)
 
     def AddPage(*args, **kwargs):
         return _controls.BookCtrl_DeleteAllPages(*args, **kwargs)
 
     def AddPage(*args, **kwargs):

-        """AddPage(Window page, wxString text, bool select=False, int imageId=-1) -> bool"""
+        """AddPage(Window page, String text, bool select=False, int imageId=-1) -> bool"""

         return _controls.BookCtrl_AddPage(*args, **kwargs)
 
     def InsertPage(*args, **kwargs):
         """
         return _controls.BookCtrl_AddPage(*args, **kwargs)
 
     def InsertPage(*args, **kwargs):
         """

-        InsertPage(size_t n, Window page, wxString text, bool select=False, 
+        InsertPage(size_t n, Window page, String text, bool select=False, 

             int imageId=-1) -> bool
         """
         return _controls.BookCtrl_InsertPage(*args, **kwargs)
             int imageId=-1) -> bool
         """
         return _controls.BookCtrl_InsertPage(*args, **kwargs)


@@ -2003,7 +1995,7 @@ class Notebook(BookCtrl):
     def __init__(self, *args, **kwargs):
         """
         __init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
     def __init__(self, *args, **kwargs):
         """
         __init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 

-            long style=0, wxString name=wxPyNOTEBOOK_NAME) -> Notebook
+            long style=0, String name=wxPyNOTEBOOK_NAME) -> Notebook

         """
         newobj = _controls.new_Notebook(*args, **kwargs)
         self.this = newobj.this
         """
         newobj = _controls.new_Notebook(*args, **kwargs)
         self.this = newobj.this


@@ -2014,7 +2006,7 @@ class Notebook(BookCtrl):
     def Create(*args, **kwargs):
         """
         Create(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
     def Create(*args, **kwargs):
         """
         Create(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 

-            long style=0, wxString name=wxPyNOTEBOOK_NAME) -> bool
+            long style=0, String name=wxPyNOTEBOOK_NAME) -> bool

         """
         return _controls.Notebook_Create(*args, **kwargs)
 
         """
         return _controls.Notebook_Create(*args, **kwargs)
 


@@ -2126,7 +2118,7 @@ class Listbook(BookCtrl):
     def __init__(self, *args, **kwargs):
         """
         __init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
     def __init__(self, *args, **kwargs):
         """
         __init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 

-            long style=0, wxString name=wxPyEmptyString) -> Listbook
+            long style=0, String name=EmptyString) -> Listbook

         """
         newobj = _controls.new_Listbook(*args, **kwargs)
         self.this = newobj.this
         """
         newobj = _controls.new_Listbook(*args, **kwargs)
         self.this = newobj.this


@@ -2137,7 +2129,7 @@ class Listbook(BookCtrl):
     def Create(*args, **kwargs):
         """
         Create(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
     def Create(*args, **kwargs):
         """
         Create(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 

-            long style=0, wxString name=wxPyEmptyString) -> bool
+            long style=0, String name=EmptyString) -> bool

         """
         return _controls.Listbook_Create(*args, **kwargs)
 
         """
         return _controls.Listbook_Create(*args, **kwargs)
 


@@ -2297,7 +2289,7 @@ class ToolBarToolBase(core.Object):
         return _controls.ToolBarToolBase_GetStyle(*args, **kwargs)
 
     def GetKind(*args, **kwargs):
         return _controls.ToolBarToolBase_GetStyle(*args, **kwargs)
 
     def GetKind(*args, **kwargs):

-        """GetKind() -> wxItemKind"""
+        """GetKind() -> int"""

         return _controls.ToolBarToolBase_GetKind(*args, **kwargs)
 
     def IsEnabled(*args, **kwargs):
         return _controls.ToolBarToolBase_GetKind(*args, **kwargs)
 
     def IsEnabled(*args, **kwargs):


@@ -2313,27 +2305,27 @@ class ToolBarToolBase(core.Object):
         return _controls.ToolBarToolBase_CanBeToggled(*args, **kwargs)
 
     def GetNormalBitmap(*args, **kwargs):
         return _controls.ToolBarToolBase_CanBeToggled(*args, **kwargs)
 
     def GetNormalBitmap(*args, **kwargs):

-        """GetNormalBitmap() -> wxBitmap"""
+        """GetNormalBitmap() -> Bitmap"""

         return _controls.ToolBarToolBase_GetNormalBitmap(*args, **kwargs)
 
     def GetDisabledBitmap(*args, **kwargs):
         return _controls.ToolBarToolBase_GetNormalBitmap(*args, **kwargs)
 
     def GetDisabledBitmap(*args, **kwargs):

-        """GetDisabledBitmap() -> wxBitmap"""
+        """GetDisabledBitmap() -> Bitmap"""

         return _controls.ToolBarToolBase_GetDisabledBitmap(*args, **kwargs)
 
     def GetBitmap(*args, **kwargs):
         return _controls.ToolBarToolBase_GetDisabledBitmap(*args, **kwargs)
 
     def GetBitmap(*args, **kwargs):

-        """GetBitmap() -> wxBitmap"""
+        """GetBitmap() -> Bitmap"""

         return _controls.ToolBarToolBase_GetBitmap(*args, **kwargs)
 
     def GetLabel(*args, **kwargs):
         return _controls.ToolBarToolBase_GetBitmap(*args, **kwargs)
 
     def GetLabel(*args, **kwargs):

-        """GetLabel() -> wxString"""
+        """GetLabel() -> String"""

         return _controls.ToolBarToolBase_GetLabel(*args, **kwargs)
 
     def GetShortHelp(*args, **kwargs):
         return _controls.ToolBarToolBase_GetLabel(*args, **kwargs)
 
     def GetShortHelp(*args, **kwargs):

-        """GetShortHelp() -> wxString"""
+        """GetShortHelp() -> String"""

         return _controls.ToolBarToolBase_GetShortHelp(*args, **kwargs)
 
     def GetLongHelp(*args, **kwargs):
         return _controls.ToolBarToolBase_GetShortHelp(*args, **kwargs)
 
     def GetLongHelp(*args, **kwargs):

-        """GetLongHelp() -> wxString"""
+        """GetLongHelp() -> String"""

         return _controls.ToolBarToolBase_GetLongHelp(*args, **kwargs)
 
     def Enable(*args, **kwargs):
         return _controls.ToolBarToolBase_GetLongHelp(*args, **kwargs)
 
     def Enable(*args, **kwargs):


@@ -2349,23 +2341,23 @@ class ToolBarToolBase(core.Object):
         return _controls.ToolBarToolBase_SetToggle(*args, **kwargs)
 
     def SetShortHelp(*args, **kwargs):
         return _controls.ToolBarToolBase_SetToggle(*args, **kwargs)
 
     def SetShortHelp(*args, **kwargs):

-        """SetShortHelp(wxString help) -> bool"""
+        """SetShortHelp(String help) -> bool"""

         return _controls.ToolBarToolBase_SetShortHelp(*args, **kwargs)
 
     def SetLongHelp(*args, **kwargs):
         return _controls.ToolBarToolBase_SetShortHelp(*args, **kwargs)
 
     def SetLongHelp(*args, **kwargs):

-        """SetLongHelp(wxString help) -> bool"""
+        """SetLongHelp(String help) -> bool"""

         return _controls.ToolBarToolBase_SetLongHelp(*args, **kwargs)
 
     def SetNormalBitmap(*args, **kwargs):
         return _controls.ToolBarToolBase_SetLongHelp(*args, **kwargs)
 
     def SetNormalBitmap(*args, **kwargs):

-        """SetNormalBitmap(wxBitmap bmp)"""
+        """SetNormalBitmap(Bitmap bmp)"""

         return _controls.ToolBarToolBase_SetNormalBitmap(*args, **kwargs)
 
     def SetDisabledBitmap(*args, **kwargs):
         return _controls.ToolBarToolBase_SetNormalBitmap(*args, **kwargs)
 
     def SetDisabledBitmap(*args, **kwargs):

-        """SetDisabledBitmap(wxBitmap bmp)"""
+        """SetDisabledBitmap(Bitmap bmp)"""

         return _controls.ToolBarToolBase_SetDisabledBitmap(*args, **kwargs)
 
     def SetLabel(*args, **kwargs):
         return _controls.ToolBarToolBase_SetDisabledBitmap(*args, **kwargs)
 
     def SetLabel(*args, **kwargs):

-        """SetLabel(wxString label)"""
+        """SetLabel(String label)"""

         return _controls.ToolBarToolBase_SetLabel(*args, **kwargs)
 
     def Detach(*args, **kwargs):
         return _controls.ToolBarToolBase_SetLabel(*args, **kwargs)
 
     def Detach(*args, **kwargs):


@@ -2403,19 +2395,18 @@ class ToolBarBase(core.Control):
         return "<%s.%s; proxy of C++ wxToolBarBase instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def DoAddTool(*args, **kwargs):
         """
         return "<%s.%s; proxy of C++ wxToolBarBase instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def DoAddTool(*args, **kwargs):
         """

-        DoAddTool(int id, wxString label, wxBitmap bitmap, wxBitmap bmpDisabled=wxNullBitmap, 
-            wxItemKind kind=ITEM_NORMAL, 
-            wxString shortHelp=wxPyEmptyString, 
-            wxString longHelp=wxPyEmptyString, PyObject clientData=None) -> ToolBarToolBase
+        DoAddTool(int id, String label, Bitmap bitmap, Bitmap bmpDisabled=wxNullBitmap, 
+            int kind=ITEM_NORMAL, String shortHelp=EmptyString, 
+            String longHelp=EmptyString, 
+            PyObject clientData=None) -> ToolBarToolBase

         """
         return _controls.ToolBarBase_DoAddTool(*args, **kwargs)
 
     def DoInsertTool(*args, **kwargs):
         """
         """
         return _controls.ToolBarBase_DoAddTool(*args, **kwargs)
 
     def DoInsertTool(*args, **kwargs):
         """

-        DoInsertTool(size_t pos, int id, wxString label, wxBitmap bitmap, 
-            wxBitmap bmpDisabled=wxNullBitmap, wxItemKind kind=ITEM_NORMAL, 
-            wxString shortHelp=wxPyEmptyString, 
-            wxString longHelp=wxPyEmptyString, 
+        DoInsertTool(size_t pos, int id, String label, Bitmap bitmap, Bitmap bmpDisabled=wxNullBitmap, 
+            int kind=ITEM_NORMAL, 
+            String shortHelp=EmptyString, String longHelp=EmptyString, 

             PyObject clientData=None) -> ToolBarToolBase
         """
         return _controls.ToolBarBase_DoInsertTool(*args, **kwargs)
             PyObject clientData=None) -> ToolBarToolBase
         """
         return _controls.ToolBarBase_DoInsertTool(*args, **kwargs)


@@ -2624,19 +2615,19 @@ class ToolBarBase(core.Control):
         return _controls.ToolBarBase_GetToolEnabled(*args, **kwargs)
 
     def SetToolShortHelp(*args, **kwargs):
         return _controls.ToolBarBase_GetToolEnabled(*args, **kwargs)
 
     def SetToolShortHelp(*args, **kwargs):

-        """SetToolShortHelp(int id, wxString helpString)"""
+        """SetToolShortHelp(int id, String helpString)"""

         return _controls.ToolBarBase_SetToolShortHelp(*args, **kwargs)
 
     def GetToolShortHelp(*args, **kwargs):
         return _controls.ToolBarBase_SetToolShortHelp(*args, **kwargs)
 
     def GetToolShortHelp(*args, **kwargs):

-        """GetToolShortHelp(int id) -> wxString"""
+        """GetToolShortHelp(int id) -> String"""

         return _controls.ToolBarBase_GetToolShortHelp(*args, **kwargs)
 
     def SetToolLongHelp(*args, **kwargs):
         return _controls.ToolBarBase_GetToolShortHelp(*args, **kwargs)
 
     def SetToolLongHelp(*args, **kwargs):

-        """SetToolLongHelp(int id, wxString helpString)"""
+        """SetToolLongHelp(int id, String helpString)"""

         return _controls.ToolBarBase_SetToolLongHelp(*args, **kwargs)
 
     def GetToolLongHelp(*args, **kwargs):
         return _controls.ToolBarBase_SetToolLongHelp(*args, **kwargs)
 
     def GetToolLongHelp(*args, **kwargs):

-        """GetToolLongHelp(int id) -> wxString"""
+        """GetToolLongHelp(int id) -> String"""

         return _controls.ToolBarBase_GetToolLongHelp(*args, **kwargs)
 
     def SetMarginsXY(*args, **kwargs):
         return _controls.ToolBarBase_GetToolLongHelp(*args, **kwargs)
 
     def SetMarginsXY(*args, **kwargs):


@@ -2726,7 +2717,7 @@ class ToolBar(ToolBarBase):
         """
         __init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
             long style=wxNO_BORDER|wxTB_HORIZONTAL, 
         """
         __init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
             long style=wxNO_BORDER|wxTB_HORIZONTAL, 

-            wxString name=wxPyToolBarNameStr) -> ToolBar
+            String name=wxPyToolBarNameStr) -> ToolBar

         """
         newobj = _controls.new_ToolBar(*args, **kwargs)
         self.this = newobj.this
         """
         newobj = _controls.new_ToolBar(*args, **kwargs)
         self.this = newobj.this


@@ -2738,7 +2729,7 @@ class ToolBar(ToolBarBase):
         """
         Create(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
             long style=wxNO_BORDER|wxTB_HORIZONTAL, 
         """
         Create(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
             long style=wxNO_BORDER|wxTB_HORIZONTAL, 

-            wxString name=wxPyToolBarNameStr) -> bool
+            String name=wxPyToolBarNameStr) -> bool

         """
         return _controls.ToolBar_Create(*args, **kwargs)
 
         """
         return _controls.ToolBar_Create(*args, **kwargs)
 


@@ -2837,23 +2828,23 @@ class ListItemAttr(object):
         return "<%s.%s; proxy of C++ wxListItemAttr instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """
         return "<%s.%s; proxy of C++ wxListItemAttr instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """

-        __init__(wxColour colText=wxNullColour, wxColour colBack=wxNullColour, 
-            wxFont font=wxNullFont) -> ListItemAttr
+        __init__(Colour colText=wxNullColour, Colour colBack=wxNullColour, 
+            Font font=wxNullFont) -> ListItemAttr

         """
         newobj = _controls.new_ListItemAttr(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def SetTextColour(*args, **kwargs):
         """
         newobj = _controls.new_ListItemAttr(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def SetTextColour(*args, **kwargs):

-        """SetTextColour(wxColour colText)"""
+        """SetTextColour(Colour colText)"""

         return _controls.ListItemAttr_SetTextColour(*args, **kwargs)
 
     def SetBackgroundColour(*args, **kwargs):
         return _controls.ListItemAttr_SetTextColour(*args, **kwargs)
 
     def SetBackgroundColour(*args, **kwargs):

-        """SetBackgroundColour(wxColour colBack)"""
+        """SetBackgroundColour(Colour colBack)"""

         return _controls.ListItemAttr_SetBackgroundColour(*args, **kwargs)
 
     def SetFont(*args, **kwargs):
         return _controls.ListItemAttr_SetBackgroundColour(*args, **kwargs)
 
     def SetFont(*args, **kwargs):

-        """SetFont(wxFont font)"""
+        """SetFont(Font font)"""

         return _controls.ListItemAttr_SetFont(*args, **kwargs)
 
     def HasTextColour(*args, **kwargs):
         return _controls.ListItemAttr_SetFont(*args, **kwargs)
 
     def HasTextColour(*args, **kwargs):


@@ -2869,15 +2860,15 @@ class ListItemAttr(object):
         return _controls.ListItemAttr_HasFont(*args, **kwargs)
 
     def GetTextColour(*args, **kwargs):
         return _controls.ListItemAttr_HasFont(*args, **kwargs)
 
     def GetTextColour(*args, **kwargs):

-        """GetTextColour() -> wxColour"""
+        """GetTextColour() -> Colour"""

         return _controls.ListItemAttr_GetTextColour(*args, **kwargs)
 
     def GetBackgroundColour(*args, **kwargs):
         return _controls.ListItemAttr_GetTextColour(*args, **kwargs)
 
     def GetBackgroundColour(*args, **kwargs):

-        """GetBackgroundColour() -> wxColour"""
+        """GetBackgroundColour() -> Colour"""

         return _controls.ListItemAttr_GetBackgroundColour(*args, **kwargs)
 
     def GetFont(*args, **kwargs):
         return _controls.ListItemAttr_GetBackgroundColour(*args, **kwargs)
 
     def GetFont(*args, **kwargs):

-        """GetFont() -> wxFont"""
+        """GetFont() -> Font"""

         return _controls.ListItemAttr_GetFont(*args, **kwargs)
 
     def Destroy(*args, **kwargs):
         return _controls.ListItemAttr_GetFont(*args, **kwargs)
 
     def Destroy(*args, **kwargs):


@@ -2938,7 +2929,7 @@ class ListItem(core.Object):
         return _controls.ListItem_SetStateMask(*args, **kwargs)
 
     def SetText(*args, **kwargs):
         return _controls.ListItem_SetStateMask(*args, **kwargs)
 
     def SetText(*args, **kwargs):

-        """SetText(wxString text)"""
+        """SetText(String text)"""

         return _controls.ListItem_SetText(*args, **kwargs)
 
     def SetImage(*args, **kwargs):
         return _controls.ListItem_SetText(*args, **kwargs)
 
     def SetImage(*args, **kwargs):


@@ -2954,19 +2945,19 @@ class ListItem(core.Object):
         return _controls.ListItem_SetWidth(*args, **kwargs)
 
     def SetAlign(*args, **kwargs):
         return _controls.ListItem_SetWidth(*args, **kwargs)
 
     def SetAlign(*args, **kwargs):

-        """SetAlign(wxListColumnFormat align)"""
+        """SetAlign(int align)"""

         return _controls.ListItem_SetAlign(*args, **kwargs)
 
     def SetTextColour(*args, **kwargs):
         return _controls.ListItem_SetAlign(*args, **kwargs)
 
     def SetTextColour(*args, **kwargs):

-        """SetTextColour(wxColour colText)"""
+        """SetTextColour(Colour colText)"""

         return _controls.ListItem_SetTextColour(*args, **kwargs)
 
     def SetBackgroundColour(*args, **kwargs):
         return _controls.ListItem_SetTextColour(*args, **kwargs)
 
     def SetBackgroundColour(*args, **kwargs):

-        """SetBackgroundColour(wxColour colBack)"""
+        """SetBackgroundColour(Colour colBack)"""

         return _controls.ListItem_SetBackgroundColour(*args, **kwargs)
 
     def SetFont(*args, **kwargs):
         return _controls.ListItem_SetBackgroundColour(*args, **kwargs)
 
     def SetFont(*args, **kwargs):

-        """SetFont(wxFont font)"""
+        """SetFont(Font font)"""

         return _controls.ListItem_SetFont(*args, **kwargs)
 
     def GetMask(*args, **kwargs):
         return _controls.ListItem_SetFont(*args, **kwargs)
 
     def GetMask(*args, **kwargs):


@@ -2986,7 +2977,7 @@ class ListItem(core.Object):
         return _controls.ListItem_GetState(*args, **kwargs)
 
     def GetText(*args, **kwargs):
         return _controls.ListItem_GetState(*args, **kwargs)
 
     def GetText(*args, **kwargs):

-        """GetText() -> wxString"""
+        """GetText() -> String"""

         return _controls.ListItem_GetText(*args, **kwargs)
 
     def GetImage(*args, **kwargs):
         return _controls.ListItem_GetText(*args, **kwargs)
 
     def GetImage(*args, **kwargs):


@@ -3002,7 +2993,7 @@ class ListItem(core.Object):
         return _controls.ListItem_GetWidth(*args, **kwargs)
 
     def GetAlign(*args, **kwargs):
         return _controls.ListItem_GetWidth(*args, **kwargs)
 
     def GetAlign(*args, **kwargs):

-        """GetAlign() -> wxListColumnFormat"""
+        """GetAlign() -> int"""

         return _controls.ListItem_GetAlign(*args, **kwargs)
 
     def GetAttributes(*args, **kwargs):
         return _controls.ListItem_GetAlign(*args, **kwargs)
 
     def GetAttributes(*args, **kwargs):


@@ -3014,15 +3005,15 @@ class ListItem(core.Object):
         return _controls.ListItem_HasAttributes(*args, **kwargs)
 
     def GetTextColour(*args, **kwargs):
         return _controls.ListItem_HasAttributes(*args, **kwargs)
 
     def GetTextColour(*args, **kwargs):

-        """GetTextColour() -> wxColour"""
+        """GetTextColour() -> Colour"""

         return _controls.ListItem_GetTextColour(*args, **kwargs)
 
     def GetBackgroundColour(*args, **kwargs):
         return _controls.ListItem_GetTextColour(*args, **kwargs)
 
     def GetBackgroundColour(*args, **kwargs):

-        """GetBackgroundColour() -> wxColour"""
+        """GetBackgroundColour() -> Colour"""

         return _controls.ListItem_GetBackgroundColour(*args, **kwargs)
 
     def GetFont(*args, **kwargs):
         return _controls.ListItem_GetBackgroundColour(*args, **kwargs)
 
     def GetFont(*args, **kwargs):

-        """GetFont() -> wxFont"""
+        """GetFont() -> Font"""

         return _controls.ListItem_GetFont(*args, **kwargs)
 
     m_mask = property(_controls.ListItem_m_mask_get, _controls.ListItem_m_mask_set)
         return _controls.ListItem_GetFont(*args, **kwargs)
 
     m_mask = property(_controls.ListItem_m_mask_get, _controls.ListItem_m_mask_set)


@@ -3079,11 +3070,11 @@ class ListEvent(core.NotifyEvent):
 
     GetPosition = GetPoint 
     def GetLabel(*args, **kwargs):
 
     GetPosition = GetPoint 
     def GetLabel(*args, **kwargs):

-        """GetLabel() -> wxString"""
+        """GetLabel() -> String"""

         return _controls.ListEvent_GetLabel(*args, **kwargs)
 
     def GetText(*args, **kwargs):
         return _controls.ListEvent_GetLabel(*args, **kwargs)
 
     def GetText(*args, **kwargs):

-        """GetText() -> wxString"""
+        """GetText() -> String"""

         return _controls.ListEvent_GetText(*args, **kwargs)
 
     def GetImage(*args, **kwargs):
         return _controls.ListEvent_GetText(*args, **kwargs)
 
     def GetImage(*args, **kwargs):


@@ -3180,7 +3171,7 @@ class ListCtrl(core.Control):
         """
         __init__(Window parent, int id=-1, Point pos=DefaultPosition, 
             Size size=DefaultSize, long style=LC_ICON, 
         """
         __init__(Window parent, int id=-1, Point pos=DefaultPosition, 
             Size size=DefaultSize, long style=LC_ICON, 

-            Validator validator=DefaultValidator, wxString name=wxPyListCtrlNameStr) -> ListCtrl
+            Validator validator=DefaultValidator, String name=wxPyListCtrlNameStr) -> ListCtrl

         """
         newobj = _controls.new_ListCtrl(*args, **kwargs)
         self.this = newobj.this
         """
         newobj = _controls.new_ListCtrl(*args, **kwargs)
         self.this = newobj.this


@@ -3192,7 +3183,7 @@ class ListCtrl(core.Control):
         """
         Create(Window parent, int id=-1, Point pos=DefaultPosition, 
             Size size=DefaultSize, long style=LC_ICON, 
         """
         Create(Window parent, int id=-1, Point pos=DefaultPosition, 
             Size size=DefaultSize, long style=LC_ICON, 

-            Validator validator=DefaultValidator, wxString name=wxPyListCtrlNameStr) -> bool
+            Validator validator=DefaultValidator, String name=wxPyListCtrlNameStr) -> bool

         """
         return _controls.ListCtrl_Create(*args, **kwargs)
 
         """
         return _controls.ListCtrl_Create(*args, **kwargs)
 


@@ -3201,11 +3192,11 @@ class ListCtrl(core.Control):
         return _controls.ListCtrl__setCallbackInfo(*args, **kwargs)
 
     def SetForegroundColour(*args, **kwargs):
         return _controls.ListCtrl__setCallbackInfo(*args, **kwargs)
 
     def SetForegroundColour(*args, **kwargs):

-        """SetForegroundColour(wxColour col) -> bool"""
+        """SetForegroundColour(Colour col) -> bool"""

         return _controls.ListCtrl_SetForegroundColour(*args, **kwargs)
 
     def SetBackgroundColour(*args, **kwargs):
         return _controls.ListCtrl_SetForegroundColour(*args, **kwargs)
 
     def SetBackgroundColour(*args, **kwargs):

-        """SetBackgroundColour(wxColour col) -> bool"""
+        """SetBackgroundColour(Colour col) -> bool"""

         return _controls.ListCtrl_SetBackgroundColour(*args, **kwargs)
 
     def GetColumn(*args, **kwargs):
         return _controls.ListCtrl_SetBackgroundColour(*args, **kwargs)
 
     def GetColumn(*args, **kwargs):


@@ -3245,7 +3236,7 @@ class ListCtrl(core.Control):
         return _controls.ListCtrl_SetItem(*args, **kwargs)
 
     def SetStringItem(*args, **kwargs):
         return _controls.ListCtrl_SetItem(*args, **kwargs)
 
     def SetStringItem(*args, **kwargs):

-        """SetStringItem(long index, int col, wxString label, int imageId=-1) -> long"""
+        """SetStringItem(long index, int col, String label, int imageId=-1) -> long"""

         return _controls.ListCtrl_SetStringItem(*args, **kwargs)
 
     def GetItemState(*args, **kwargs):
         return _controls.ListCtrl_SetStringItem(*args, **kwargs)
 
     def GetItemState(*args, **kwargs):


@@ -3261,11 +3252,11 @@ class ListCtrl(core.Control):
         return _controls.ListCtrl_SetItemImage(*args, **kwargs)
 
     def GetItemText(*args, **kwargs):
         return _controls.ListCtrl_SetItemImage(*args, **kwargs)
 
     def GetItemText(*args, **kwargs):

-        """GetItemText(long item) -> wxString"""
+        """GetItemText(long item) -> String"""

         return _controls.ListCtrl_GetItemText(*args, **kwargs)
 
     def SetItemText(*args, **kwargs):
         return _controls.ListCtrl_GetItemText(*args, **kwargs)
 
     def SetItemText(*args, **kwargs):

-        """SetItemText(long item, wxString str)"""
+        """SetItemText(long item, String str)"""

         return _controls.ListCtrl_SetItemText(*args, **kwargs)
 
     def GetItemData(*args, **kwargs):
         return _controls.ListCtrl_SetItemText(*args, **kwargs)
 
     def GetItemData(*args, **kwargs):


@@ -3309,11 +3300,11 @@ class ListCtrl(core.Control):
         return _controls.ListCtrl_GetSelectedItemCount(*args, **kwargs)
 
     def GetTextColour(*args, **kwargs):
         return _controls.ListCtrl_GetSelectedItemCount(*args, **kwargs)
 
     def GetTextColour(*args, **kwargs):

-        """GetTextColour() -> wxColour"""
+        """GetTextColour() -> Colour"""

         return _controls.ListCtrl_GetTextColour(*args, **kwargs)
 
     def SetTextColour(*args, **kwargs):
         return _controls.ListCtrl_GetTextColour(*args, **kwargs)
 
     def SetTextColour(*args, **kwargs):

-        """SetTextColour(wxColour col)"""
+        """SetTextColour(Colour col)"""

         return _controls.ListCtrl_SetTextColour(*args, **kwargs)
 
     def GetTopItem(*args, **kwargs):
         return _controls.ListCtrl_SetTextColour(*args, **kwargs)
 
     def GetTopItem(*args, **kwargs):


@@ -3391,7 +3382,7 @@ class ListCtrl(core.Control):
         return _controls.ListCtrl_EnsureVisible(*args, **kwargs)
 
     def FindItem(*args, **kwargs):
         return _controls.ListCtrl_EnsureVisible(*args, **kwargs)
 
     def FindItem(*args, **kwargs):

-        """FindItem(long start, wxString str, bool partial=False) -> long"""
+        """FindItem(long start, String str, bool partial=False) -> long"""

         return _controls.ListCtrl_FindItem(*args, **kwargs)
 
     def FindItemData(*args, **kwargs):
         return _controls.ListCtrl_FindItem(*args, **kwargs)
 
     def FindItemData(*args, **kwargs):


@@ -3416,7 +3407,7 @@ class ListCtrl(core.Control):
         return _controls.ListCtrl_InsertItem(*args, **kwargs)
 
     def InsertStringItem(*args, **kwargs):
         return _controls.ListCtrl_InsertItem(*args, **kwargs)
 
     def InsertStringItem(*args, **kwargs):

-        """InsertStringItem(long index, wxString label) -> long"""
+        """InsertStringItem(long index, String label) -> long"""

         return _controls.ListCtrl_InsertStringItem(*args, **kwargs)
 
     def InsertImageItem(*args, **kwargs):
         return _controls.ListCtrl_InsertStringItem(*args, **kwargs)
 
     def InsertImageItem(*args, **kwargs):


@@ -3424,7 +3415,7 @@ class ListCtrl(core.Control):
         return _controls.ListCtrl_InsertImageItem(*args, **kwargs)
 
     def InsertImageStringItem(*args, **kwargs):
         return _controls.ListCtrl_InsertImageItem(*args, **kwargs)
 
     def InsertImageStringItem(*args, **kwargs):

-        """InsertImageStringItem(long index, wxString label, int imageIndex) -> long"""
+        """InsertImageStringItem(long index, String label, int imageIndex) -> long"""

         return _controls.ListCtrl_InsertImageStringItem(*args, **kwargs)
 
     def InsertColumnInfo(*args, **kwargs):
         return _controls.ListCtrl_InsertImageStringItem(*args, **kwargs)
 
     def InsertColumnInfo(*args, **kwargs):


@@ -3433,7 +3424,7 @@ class ListCtrl(core.Control):
 
     def InsertColumn(*args, **kwargs):
         """
 
     def InsertColumn(*args, **kwargs):
         """

-        InsertColumn(long col, wxString heading, int format=LIST_FORMAT_LEFT, 
+        InsertColumn(long col, String heading, int format=LIST_FORMAT_LEFT, 

             int width=-1) -> long
         """
         return _controls.ListCtrl_InsertColumn(*args, **kwargs)
             int width=-1) -> long
         """
         return _controls.ListCtrl_InsertColumn(*args, **kwargs)


@@ -3447,19 +3438,19 @@ class ListCtrl(core.Control):
         return _controls.ListCtrl_ScrollList(*args, **kwargs)
 
     def SetItemTextColour(*args, **kwargs):
         return _controls.ListCtrl_ScrollList(*args, **kwargs)
 
     def SetItemTextColour(*args, **kwargs):

-        """SetItemTextColour(long item, wxColour col)"""
+        """SetItemTextColour(long item, Colour col)"""

         return _controls.ListCtrl_SetItemTextColour(*args, **kwargs)
 
     def GetItemTextColour(*args, **kwargs):
         return _controls.ListCtrl_SetItemTextColour(*args, **kwargs)
 
     def GetItemTextColour(*args, **kwargs):

-        """GetItemTextColour(long item) -> wxColour"""
+        """GetItemTextColour(long item) -> Colour"""

         return _controls.ListCtrl_GetItemTextColour(*args, **kwargs)
 
     def SetItemBackgroundColour(*args, **kwargs):
         return _controls.ListCtrl_GetItemTextColour(*args, **kwargs)
 
     def SetItemBackgroundColour(*args, **kwargs):

-        """SetItemBackgroundColour(long item, wxColour col)"""
+        """SetItemBackgroundColour(long item, Colour col)"""

         return _controls.ListCtrl_SetItemBackgroundColour(*args, **kwargs)
 
     def GetItemBackgroundColour(*args, **kwargs):
         return _controls.ListCtrl_SetItemBackgroundColour(*args, **kwargs)
 
     def GetItemBackgroundColour(*args, **kwargs):

-        """GetItemBackgroundColour(long item) -> wxColour"""
+        """GetItemBackgroundColour(long item) -> Colour"""

         return _controls.ListCtrl_GetItemBackgroundColour(*args, **kwargs)
 
     #
         return _controls.ListCtrl_GetItemBackgroundColour(*args, **kwargs)
 
     #


@@ -3552,7 +3543,7 @@ class ListView(ListCtrl):
         """
         __init__(Window parent, int id=-1, Point pos=DefaultPosition, 
             Size size=DefaultSize, long style=LC_REPORT, 
         """
         __init__(Window parent, int id=-1, Point pos=DefaultPosition, 
             Size size=DefaultSize, long style=LC_REPORT, 

-            Validator validator=DefaultValidator, wxString name=wxPyListCtrlNameStr) -> ListView
+            Validator validator=DefaultValidator, String name=wxPyListCtrlNameStr) -> ListView

         """
         newobj = _controls.new_ListView(*args, **kwargs)
         self.this = newobj.this
         """
         newobj = _controls.new_ListView(*args, **kwargs)
         self.this = newobj.this


@@ -3564,7 +3555,7 @@ class ListView(ListCtrl):
         """
         Create(Window parent, int id=-1, Point pos=DefaultPosition, 
             Size size=DefaultSize, long style=LC_REPORT, 
         """
         Create(Window parent, int id=-1, Point pos=DefaultPosition, 
             Size size=DefaultSize, long style=LC_REPORT, 

-            Validator validator=DefaultValidator, wxString name=wxPyListCtrlNameStr) -> bool
+            Validator validator=DefaultValidator, String name=wxPyListCtrlNameStr) -> bool

         """
         return _controls.ListView_Create(*args, **kwargs)
 
         """
         return _controls.ListView_Create(*args, **kwargs)
 


@@ -3817,11 +3808,11 @@ class TreeEvent(core.NotifyEvent):
         return _controls.TreeEvent_SetKeyEvent(*args, **kwargs)
 
     def GetLabel(*args, **kwargs):
         return _controls.TreeEvent_SetKeyEvent(*args, **kwargs)
 
     def GetLabel(*args, **kwargs):

-        """GetLabel() -> wxString"""
+        """GetLabel() -> String"""

         return _controls.TreeEvent_GetLabel(*args, **kwargs)
 
     def SetLabel(*args, **kwargs):
         return _controls.TreeEvent_GetLabel(*args, **kwargs)
 
     def SetLabel(*args, **kwargs):

-        """SetLabel(wxString label)"""
+        """SetLabel(String label)"""

         return _controls.TreeEvent_SetLabel(*args, **kwargs)
 
     def IsEditCancelled(*args, **kwargs):
         return _controls.TreeEvent_SetLabel(*args, **kwargs)
 
     def IsEditCancelled(*args, **kwargs):


@@ -3833,7 +3824,7 @@ class TreeEvent(core.NotifyEvent):
         return _controls.TreeEvent_SetEditCanceled(*args, **kwargs)
 
     def SetToolTip(*args, **kwargs):
         return _controls.TreeEvent_SetEditCanceled(*args, **kwargs)
 
     def SetToolTip(*args, **kwargs):

-        """SetToolTip(wxString toolTip)"""
+        """SetToolTip(String toolTip)"""

         return _controls.TreeEvent_SetToolTip(*args, **kwargs)
 
 
         return _controls.TreeEvent_SetToolTip(*args, **kwargs)
 
 


@@ -3854,7 +3845,7 @@ class TreeCtrl(core.Control):
         __init__(Window parent, int id=-1, Point pos=DefaultPosition, 
             Size size=DefaultSize, long style=TR_DEFAULT_STYLE, 
             Validator validator=DefaultValidator, 
         __init__(Window parent, int id=-1, Point pos=DefaultPosition, 
             Size size=DefaultSize, long style=TR_DEFAULT_STYLE, 
             Validator validator=DefaultValidator, 

-            wxString name=wxPy_TreeCtrlNameStr) -> TreeCtrl
+            String name=wxPy_TreeCtrlNameStr) -> TreeCtrl

         """
         newobj = _controls.new_TreeCtrl(*args, **kwargs)
         self.this = newobj.this
         """
         newobj = _controls.new_TreeCtrl(*args, **kwargs)
         self.this = newobj.this


@@ -3867,7 +3858,7 @@ class TreeCtrl(core.Control):
         Create(Window parent, int id=-1, Point pos=DefaultPosition, 
             Size size=DefaultSize, long style=TR_DEFAULT_STYLE, 
             Validator validator=DefaultValidator, 
         Create(Window parent, int id=-1, Point pos=DefaultPosition, 
             Size size=DefaultSize, long style=TR_DEFAULT_STYLE, 
             Validator validator=DefaultValidator, 

-            wxString name=wxPy_TreeCtrlNameStr) -> bool
+            String name=wxPy_TreeCtrlNameStr) -> bool

         """
         return _controls.TreeCtrl_Create(*args, **kwargs)
 
         """
         return _controls.TreeCtrl_Create(*args, **kwargs)
 


@@ -3924,11 +3915,11 @@ class TreeCtrl(core.Control):
         return val
 
     def GetItemText(*args, **kwargs):
         return val
 
     def GetItemText(*args, **kwargs):

-        """GetItemText(TreeItemId item) -> wxString"""
+        """GetItemText(TreeItemId item) -> String"""

         return _controls.TreeCtrl_GetItemText(*args, **kwargs)
 
     def GetItemImage(*args, **kwargs):
         return _controls.TreeCtrl_GetItemText(*args, **kwargs)
 
     def GetItemImage(*args, **kwargs):

-        """GetItemImage(TreeItemId item, wxTreeItemIcon which=TreeItemIcon_Normal) -> int"""
+        """GetItemImage(TreeItemId item, int which=TreeItemIcon_Normal) -> int"""

         return _controls.TreeCtrl_GetItemImage(*args, **kwargs)
 
     def GetItemData(*args, **kwargs):
         return _controls.TreeCtrl_GetItemImage(*args, **kwargs)
 
     def GetItemData(*args, **kwargs):


@@ -3941,23 +3932,23 @@ class TreeCtrl(core.Control):
 
     GetPyData = GetItemPyData 
     def GetItemTextColour(*args, **kwargs):
 
     GetPyData = GetItemPyData 
     def GetItemTextColour(*args, **kwargs):

-        """GetItemTextColour(TreeItemId item) -> wxColour"""
+        """GetItemTextColour(TreeItemId item) -> Colour"""

         return _controls.TreeCtrl_GetItemTextColour(*args, **kwargs)
 
     def GetItemBackgroundColour(*args, **kwargs):
         return _controls.TreeCtrl_GetItemTextColour(*args, **kwargs)
 
     def GetItemBackgroundColour(*args, **kwargs):

-        """GetItemBackgroundColour(TreeItemId item) -> wxColour"""
+        """GetItemBackgroundColour(TreeItemId item) -> Colour"""

         return _controls.TreeCtrl_GetItemBackgroundColour(*args, **kwargs)
 
     def GetItemFont(*args, **kwargs):
         return _controls.TreeCtrl_GetItemBackgroundColour(*args, **kwargs)
 
     def GetItemFont(*args, **kwargs):

-        """GetItemFont(TreeItemId item) -> wxFont"""
+        """GetItemFont(TreeItemId item) -> Font"""

         return _controls.TreeCtrl_GetItemFont(*args, **kwargs)
 
     def SetItemText(*args, **kwargs):
         return _controls.TreeCtrl_GetItemFont(*args, **kwargs)
 
     def SetItemText(*args, **kwargs):

-        """SetItemText(TreeItemId item, wxString text)"""
+        """SetItemText(TreeItemId item, String text)"""

         return _controls.TreeCtrl_SetItemText(*args, **kwargs)
 
     def SetItemImage(*args, **kwargs):
         return _controls.TreeCtrl_SetItemText(*args, **kwargs)
 
     def SetItemImage(*args, **kwargs):

-        """SetItemImage(TreeItemId item, int image, wxTreeItemIcon which=TreeItemIcon_Normal)"""
+        """SetItemImage(TreeItemId item, int image, int which=TreeItemIcon_Normal)"""

         return _controls.TreeCtrl_SetItemImage(*args, **kwargs)
 
     def SetItemData(*args, **kwargs):
         return _controls.TreeCtrl_SetItemImage(*args, **kwargs)
 
     def SetItemData(*args, **kwargs):


@@ -3978,15 +3969,15 @@ class TreeCtrl(core.Control):
         return _controls.TreeCtrl_SetItemBold(*args, **kwargs)
 
     def SetItemTextColour(*args, **kwargs):
         return _controls.TreeCtrl_SetItemBold(*args, **kwargs)
 
     def SetItemTextColour(*args, **kwargs):

-        """SetItemTextColour(TreeItemId item, wxColour col)"""
+        """SetItemTextColour(TreeItemId item, Colour col)"""

         return _controls.TreeCtrl_SetItemTextColour(*args, **kwargs)
 
     def SetItemBackgroundColour(*args, **kwargs):
         return _controls.TreeCtrl_SetItemTextColour(*args, **kwargs)
 
     def SetItemBackgroundColour(*args, **kwargs):

-        """SetItemBackgroundColour(TreeItemId item, wxColour col)"""
+        """SetItemBackgroundColour(TreeItemId item, Colour col)"""

         return _controls.TreeCtrl_SetItemBackgroundColour(*args, **kwargs)
 
     def SetItemFont(*args, **kwargs):
         return _controls.TreeCtrl_SetItemBackgroundColour(*args, **kwargs)
 
     def SetItemFont(*args, **kwargs):

-        """SetItemFont(TreeItemId item, wxFont font)"""
+        """SetItemFont(TreeItemId item, Font font)"""

         return _controls.TreeCtrl_SetItemFont(*args, **kwargs)
 
     def IsVisible(*args, **kwargs):
         return _controls.TreeCtrl_SetItemFont(*args, **kwargs)
 
     def IsVisible(*args, **kwargs):


@@ -4062,36 +4053,33 @@ class TreeCtrl(core.Control):
         return _controls.TreeCtrl_GetPrevVisible(*args, **kwargs)
 
     def AddRoot(*args, **kwargs):
         return _controls.TreeCtrl_GetPrevVisible(*args, **kwargs)
 
     def AddRoot(*args, **kwargs):

-        """
-        AddRoot(wxString text, int image=-1, int selectedImage=-1, 
-            TreeItemData data=None) -> TreeItemId
-        """
+        """AddRoot(String text, int image=-1, int selectedImage=-1, TreeItemData data=None) -> TreeItemId"""

         return _controls.TreeCtrl_AddRoot(*args, **kwargs)
 
     def PrependItem(*args, **kwargs):
         """
         return _controls.TreeCtrl_AddRoot(*args, **kwargs)
 
     def PrependItem(*args, **kwargs):
         """

-        PrependItem(TreeItemId parent, wxString text, int image=-1, int selectedImage=-1, 
+        PrependItem(TreeItemId parent, String text, int image=-1, int selectedImage=-1, 

             TreeItemData data=None) -> TreeItemId
         """
         return _controls.TreeCtrl_PrependItem(*args, **kwargs)
 
     def InsertItem(*args, **kwargs):
         """
             TreeItemData data=None) -> TreeItemId
         """
         return _controls.TreeCtrl_PrependItem(*args, **kwargs)
 
     def InsertItem(*args, **kwargs):
         """

-        InsertItem(TreeItemId parent, TreeItemId idPrevious, wxString text, 
+        InsertItem(TreeItemId parent, TreeItemId idPrevious, String text, 

             int image=-1, int selectedImage=-1, TreeItemData data=None) -> TreeItemId
         """
         return _controls.TreeCtrl_InsertItem(*args, **kwargs)
 
     def InsertItemBefore(*args, **kwargs):
         """
             int image=-1, int selectedImage=-1, TreeItemData data=None) -> TreeItemId
         """
         return _controls.TreeCtrl_InsertItem(*args, **kwargs)
 
     def InsertItemBefore(*args, **kwargs):
         """

-        InsertItemBefore(TreeItemId parent, size_t index, wxString text, int image=-1, 
+        InsertItemBefore(TreeItemId parent, size_t index, String text, int image=-1, 

             int selectedImage=-1, TreeItemData data=None) -> TreeItemId
         """
         return _controls.TreeCtrl_InsertItemBefore(*args, **kwargs)
 
     def AppendItem(*args, **kwargs):
         """
             int selectedImage=-1, TreeItemData data=None) -> TreeItemId
         """
         return _controls.TreeCtrl_InsertItemBefore(*args, **kwargs)
 
     def AppendItem(*args, **kwargs):
         """

-        AppendItem(TreeItemId parent, wxString text, int image=-1, int selectedImage=-1, 
+        AppendItem(TreeItemId parent, String text, int image=-1, int selectedImage=-1, 

             TreeItemData data=None) -> TreeItemId
         """
         return _controls.TreeCtrl_AppendItem(*args, **kwargs)
             TreeItemData data=None) -> TreeItemId
         """
         return _controls.TreeCtrl_AppendItem(*args, **kwargs)


@@ -4198,11 +4186,11 @@ class GenericDirCtrl(core.Control):
         return "<%s.%s; proxy of C++ wxGenericDirCtrl instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """
         return "<%s.%s; proxy of C++ wxGenericDirCtrl instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """

-        __init__(Window parent, int id=-1, wxString dir=wxPyDirDialogDefaultFolderStr, 
-            Point pos=DefaultPosition, 
-            Size size=DefaultSize, long style=wxDIRCTRL_3D_INTERNAL|wxSUNKEN_BORDER, 
-            wxString filter=wxPyEmptyString, 
-            int defaultFilter=0, wxString name=wxPy_TreeCtrlNameStr) -> GenericDirCtrl
+        __init__(Window parent, int id=-1, String dir=wxPyDirDialogDefaultFolderStr, 
+            Point pos=DefaultPosition, Size size=DefaultSize, 
+            long style=wxDIRCTRL_3D_INTERNAL|wxSUNKEN_BORDER, 
+            String filter=EmptyString, 
+            int defaultFilter=0, String name=wxPy_TreeCtrlNameStr) -> GenericDirCtrl

         """
         newobj = _controls.new_GenericDirCtrl(*args, **kwargs)
         self.this = newobj.this
         """
         newobj = _controls.new_GenericDirCtrl(*args, **kwargs)
         self.this = newobj.this


@@ -4212,36 +4200,36 @@ class GenericDirCtrl(core.Control):
 
     def Create(*args, **kwargs):
         """
 
     def Create(*args, **kwargs):
         """

-        Create(Window parent, int id=-1, wxString dir=wxPyDirDialogDefaultFolderStr, 
-            Point pos=DefaultPosition, 
-            Size size=DefaultSize, long style=wxDIRCTRL_3D_INTERNAL|wxSUNKEN_BORDER, 
-            wxString filter=wxPyEmptyString, 
-            int defaultFilter=0, wxString name=wxPy_TreeCtrlNameStr) -> bool
+        Create(Window parent, int id=-1, String dir=wxPyDirDialogDefaultFolderStr, 
+            Point pos=DefaultPosition, Size size=DefaultSize, 
+            long style=wxDIRCTRL_3D_INTERNAL|wxSUNKEN_BORDER, 
+            String filter=EmptyString, 
+            int defaultFilter=0, String name=wxPy_TreeCtrlNameStr) -> bool

         """
         return _controls.GenericDirCtrl_Create(*args, **kwargs)
 
     def ExpandPath(*args, **kwargs):
         """
         return _controls.GenericDirCtrl_Create(*args, **kwargs)
 
     def ExpandPath(*args, **kwargs):

-        """ExpandPath(wxString path) -> bool"""
+        """ExpandPath(String path) -> bool"""

         return _controls.GenericDirCtrl_ExpandPath(*args, **kwargs)
 
     def GetDefaultPath(*args, **kwargs):
         return _controls.GenericDirCtrl_ExpandPath(*args, **kwargs)
 
     def GetDefaultPath(*args, **kwargs):

-        """GetDefaultPath() -> wxString"""
+        """GetDefaultPath() -> String"""

         return _controls.GenericDirCtrl_GetDefaultPath(*args, **kwargs)
 
     def SetDefaultPath(*args, **kwargs):
         return _controls.GenericDirCtrl_GetDefaultPath(*args, **kwargs)
 
     def SetDefaultPath(*args, **kwargs):

-        """SetDefaultPath(wxString path)"""
+        """SetDefaultPath(String path)"""

         return _controls.GenericDirCtrl_SetDefaultPath(*args, **kwargs)
 
     def GetPath(*args, **kwargs):
         return _controls.GenericDirCtrl_SetDefaultPath(*args, **kwargs)
 
     def GetPath(*args, **kwargs):

-        """GetPath() -> wxString"""
+        """GetPath() -> String"""

         return _controls.GenericDirCtrl_GetPath(*args, **kwargs)
 
     def GetFilePath(*args, **kwargs):
         return _controls.GenericDirCtrl_GetPath(*args, **kwargs)
 
     def GetFilePath(*args, **kwargs):

-        """GetFilePath() -> wxString"""
+        """GetFilePath() -> String"""

         return _controls.GenericDirCtrl_GetFilePath(*args, **kwargs)
 
     def SetPath(*args, **kwargs):
         return _controls.GenericDirCtrl_GetFilePath(*args, **kwargs)
 
     def SetPath(*args, **kwargs):

-        """SetPath(wxString path)"""
+        """SetPath(String path)"""

         return _controls.GenericDirCtrl_SetPath(*args, **kwargs)
 
     def ShowHidden(*args, **kwargs):
         return _controls.GenericDirCtrl_SetPath(*args, **kwargs)
 
     def ShowHidden(*args, **kwargs):


@@ -4253,11 +4241,11 @@ class GenericDirCtrl(core.Control):
         return _controls.GenericDirCtrl_GetShowHidden(*args, **kwargs)
 
     def GetFilter(*args, **kwargs):
         return _controls.GenericDirCtrl_GetShowHidden(*args, **kwargs)
 
     def GetFilter(*args, **kwargs):

-        """GetFilter() -> wxString"""
+        """GetFilter() -> String"""

         return _controls.GenericDirCtrl_GetFilter(*args, **kwargs)
 
     def SetFilter(*args, **kwargs):
         return _controls.GenericDirCtrl_GetFilter(*args, **kwargs)
 
     def SetFilter(*args, **kwargs):

-        """SetFilter(wxString filter)"""
+        """SetFilter(String filter)"""

         return _controls.GenericDirCtrl_SetFilter(*args, **kwargs)
 
     def GetFilterIndex(*args, **kwargs):
         return _controls.GenericDirCtrl_SetFilter(*args, **kwargs)
 
     def GetFilterIndex(*args, **kwargs):


@@ -4335,7 +4323,7 @@ class DirFilterListCtrl(Choice):
         return _controls.DirFilterListCtrl_Create(*args, **kwargs)
 
     def FillFilterList(*args, **kwargs):
         return _controls.DirFilterListCtrl_Create(*args, **kwargs)
 
     def FillFilterList(*args, **kwargs):

-        """FillFilterList(wxString filter, int defaultFilter)"""
+        """FillFilterList(String filter, int defaultFilter)"""

         return _controls.DirFilterListCtrl_FillFilterList(*args, **kwargs)
 
 
         return _controls.DirFilterListCtrl_FillFilterList(*args, **kwargs)
 
 


@@ -4361,7 +4349,7 @@ class PyControl(core.Control):
         """
         __init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
             long style=0, Validator validator=DefaultValidator, 
         """
         __init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
             long style=0, Validator validator=DefaultValidator, 

-            wxString name=wxPyControlNameStr) -> PyControl
+            String name=wxPyControlNameStr) -> PyControl

         """
         newobj = _controls.new_PyControl(*args, **kwargs)
         self.this = newobj.this
         """
         newobj = _controls.new_PyControl(*args, **kwargs)
         self.this = newobj.this


@@ -4482,19 +4470,19 @@ class HelpEvent(core.CommandEvent):
         return _controls.HelpEvent_SetPosition(*args, **kwargs)
 
     def GetLink(*args, **kwargs):
         return _controls.HelpEvent_SetPosition(*args, **kwargs)
 
     def GetLink(*args, **kwargs):

-        """GetLink() -> wxString"""
+        """GetLink() -> String"""

         return _controls.HelpEvent_GetLink(*args, **kwargs)
 
     def SetLink(*args, **kwargs):
         return _controls.HelpEvent_GetLink(*args, **kwargs)
 
     def SetLink(*args, **kwargs):

-        """SetLink(wxString link)"""
+        """SetLink(String link)"""

         return _controls.HelpEvent_SetLink(*args, **kwargs)
 
     def GetTarget(*args, **kwargs):
         return _controls.HelpEvent_SetLink(*args, **kwargs)
 
     def GetTarget(*args, **kwargs):

-        """GetTarget() -> wxString"""
+        """GetTarget() -> String"""

         return _controls.HelpEvent_GetTarget(*args, **kwargs)
 
     def SetTarget(*args, **kwargs):
         return _controls.HelpEvent_GetTarget(*args, **kwargs)
 
     def SetTarget(*args, **kwargs):

-        """SetTarget(wxString target)"""
+        """SetTarget(String target)"""

         return _controls.HelpEvent_SetTarget(*args, **kwargs)
 
 
         return _controls.HelpEvent_SetTarget(*args, **kwargs)
 
 


@@ -4573,7 +4561,7 @@ class HelpProvider(object):
 
     Get = staticmethod(Get)
     def GetHelp(*args, **kwargs):
 
     Get = staticmethod(Get)
     def GetHelp(*args, **kwargs):

-        """GetHelp(Window window) -> wxString"""
+        """GetHelp(Window window) -> String"""

         return _controls.HelpProvider_GetHelp(*args, **kwargs)
 
     def ShowHelp(*args, **kwargs):
         return _controls.HelpProvider_GetHelp(*args, **kwargs)
 
     def ShowHelp(*args, **kwargs):


@@ -4581,11 +4569,11 @@ class HelpProvider(object):
         return _controls.HelpProvider_ShowHelp(*args, **kwargs)
 
     def AddHelp(*args, **kwargs):
         return _controls.HelpProvider_ShowHelp(*args, **kwargs)
 
     def AddHelp(*args, **kwargs):

-        """AddHelp(Window window, wxString text)"""
+        """AddHelp(Window window, String text)"""

         return _controls.HelpProvider_AddHelp(*args, **kwargs)
 
     def AddHelpById(*args, **kwargs):
         return _controls.HelpProvider_AddHelp(*args, **kwargs)
 
     def AddHelpById(*args, **kwargs):

-        """AddHelpById(int id, wxString text)"""
+        """AddHelpById(int id, String text)"""

         return _controls.HelpProvider_AddHelpById(*args, **kwargs)
 
     def Destroy(*args, **kwargs):
         return _controls.HelpProvider_AddHelpById(*args, **kwargs)
 
     def Destroy(*args, **kwargs):


@@ -4631,7 +4619,7 @@ class DragImage(core.Object):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxGenericDragImage instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxGenericDragImage instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):

-        """__init__(wxBitmap image, wxCursor cursor=wxNullCursor) -> DragImage"""
+        """__init__(Bitmap image, Cursor cursor=wxNullCursor) -> DragImage"""

         newobj = _controls.new_DragImage(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         newobj = _controls.new_DragImage(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1


@@ -4643,7 +4631,7 @@ class DragImage(core.Object):
         except: pass
 
     def SetBackingBitmap(*args, **kwargs):
         except: pass
 
     def SetBackingBitmap(*args, **kwargs):

-        """SetBackingBitmap(wxBitmap bitmap)"""
+        """SetBackingBitmap(Bitmap bitmap)"""

         return _controls.DragImage_SetBackingBitmap(*args, **kwargs)
 
     def BeginDrag(*args, **kwargs):
         return _controls.DragImage_SetBackingBitmap(*args, **kwargs)
 
     def BeginDrag(*args, **kwargs):


@@ -4678,14 +4666,11 @@ class DragImage(core.Object):
         return _controls.DragImage_GetImageRect(*args, **kwargs)
 
     def DoDrawImage(*args, **kwargs):
         return _controls.DragImage_GetImageRect(*args, **kwargs)
 
     def DoDrawImage(*args, **kwargs):

-        """DoDrawImage(wxDC dc, Point pos) -> bool"""
+        """DoDrawImage(DC dc, Point pos) -> bool"""

         return _controls.DragImage_DoDrawImage(*args, **kwargs)
 
     def UpdateBackingFromWindow(*args, **kwargs):
         return _controls.DragImage_DoDrawImage(*args, **kwargs)
 
     def UpdateBackingFromWindow(*args, **kwargs):

-        """
-        UpdateBackingFromWindow(wxDC windowDC, wxMemoryDC destDC, Rect sourceRect, 
-            Rect destRect) -> bool
-        """
+        """UpdateBackingFromWindow(DC windowDC, wxMemoryDC destDC, Rect sourceRect, Rect destRect) -> bool"""

         return _controls.DragImage_UpdateBackingFromWindow(*args, **kwargs)
 
     def RedrawImage(*args, **kwargs):
         return _controls.DragImage_UpdateBackingFromWindow(*args, **kwargs)
 
     def RedrawImage(*args, **kwargs):


@@ -4701,13 +4686,13 @@ class DragImagePtr(DragImage):
 _controls.DragImage_swigregister(DragImagePtr)
 
 def DragIcon(*args, **kwargs):
 _controls.DragImage_swigregister(DragImagePtr)
 
 def DragIcon(*args, **kwargs):

-    """DragIcon(wxIcon image, wxCursor cursor=wxNullCursor) -> DragImage"""
+    """DragIcon(wxIcon image, Cursor cursor=wxNullCursor) -> DragImage"""

     val = _controls.new_DragIcon(*args, **kwargs)
     val.thisown = 1
     return val
 
 def DragString(*args, **kwargs):
     val = _controls.new_DragIcon(*args, **kwargs)
     val.thisown = 1
     return val
 
 def DragString(*args, **kwargs):

-    """DragString(wxString str, wxCursor cursor=wxNullCursor) -> DragImage"""
+    """DragString(String str, Cursor cursor=wxNullCursor) -> DragImage"""

     val = _controls.new_DragString(*args, **kwargs)
     val.thisown = 1
     return val
     val = _controls.new_DragString(*args, **kwargs)
     val.thisown = 1
     return val

diff --git a/wxPython/src/gtk/controls_wrap.cpp b/wxPython/src/gtk/controls_wrap.cpp
index 8090dbfb4be0ced27940f79d2ee9dffcc46b0b0e..41600029c62222847e49596011e6718826efcc3e 100644 (file)
--- a/wxPython/src/gtk/controls_wrap.cpp
+++ b/wxPython/src/gtk/controls_wrap.cpp
@@ -16425,7 +16425,7 @@ static PyObject *_wrap_ListItem_m_stateMask_get(PyObject *self, PyObject *args,
 static PyObject *_wrap_ListItem_m_text_set(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListItem *arg1 = (wxListItem *) 0 ;
 static PyObject *_wrap_ListItem_m_text_set(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListItem *arg1 = (wxListItem *) 0 ;

-    wxString arg2 ;
+    wxString *arg2 = (wxString *) 0 ;

     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {


@@ -16434,13 +16434,8 @@ static PyObject *_wrap_ListItem_m_text_set(PyObject *self, PyObject *args, PyObj
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListItem_m_text_set",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListItem_m_text_set",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;

-    {
-        wxString* sptr = wxString_in_helper(obj1);
-        if (sptr == NULL) SWIG_fail;
-        arg2 = *sptr;
-        delete sptr;
-    }
-    if (arg1) (arg1)->m_text = arg2;
+    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxString,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if (arg1) (arg1)->m_text = *arg2;

     
     Py_INCREF(Py_None); resultobj = Py_None;
     return resultobj;
     
     Py_INCREF(Py_None); resultobj = Py_None;
     return resultobj;


@@ -16452,7 +16447,7 @@ static PyObject *_wrap_ListItem_m_text_set(PyObject *self, PyObject *args, PyObj
 static PyObject *_wrap_ListItem_m_text_get(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListItem *arg1 = (wxListItem *) 0 ;
 static PyObject *_wrap_ListItem_m_text_get(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListItem *arg1 = (wxListItem *) 0 ;

-    wxString result;
+    wxString *result;

     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 


@@ -16460,13 +16455,13 @@ static PyObject *_wrap_ListItem_m_text_get(PyObject *self, PyObject *args, PyObj
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ListItem_m_text_get",kwnames,&obj0)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ListItem_m_text_get",kwnames,&obj0)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;

-    result =  ((arg1)->m_text);
+    result = (wxString *)& ((arg1)->m_text);

     
     {
 #if wxUSE_UNICODE
     
     {
 #if wxUSE_UNICODE

-        resultobj = PyUnicode_FromWideChar((&result)->c_str(), (&result)->Len());
+        resultobj = PyUnicode_FromWideChar(result->c_str(), result->Len());

 #else
 #else

-        resultobj = PyString_FromStringAndSize((&result)->c_str(), (&result)->Len());
+        resultobj = PyString_FromStringAndSize(result->c_str(), result->Len());

 #endif
     }
     return resultobj;
 #endif
     }
     return resultobj;

diff --git a/wxPython/src/gtk/core.py b/wxPython/src/gtk/core.py
index f9281ca384a6e7158284c58c37f6129c291ce699..6d8462e4a417fffd8600c2441027843493a21463 100644 (file)
--- a/wxPython/src/gtk/core.py
+++ b/wxPython/src/gtk/core.py
@@ -562,7 +562,7 @@ class Object(object):
         return "<%s.%s; proxy of C++ wxObject instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def GetClassName(*args, **kwargs):
         """
         return "<%s.%s; proxy of C++ wxObject instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def GetClassName(*args, **kwargs):
         """

-        GetClassName() -> wxString
+        GetClassName() -> String

 
         Returns the class name of the C++ object using wxRTTI.
         """
 
         Returns the class name of the C++ object using wxRTTI.
         """


@@ -587,41 +587,30 @@ _wxPySetDictionary = _core._wxPySetDictionary
 
 _wxPyFixStockObjects = _core._wxPyFixStockObjects
 
 
 _wxPyFixStockObjects = _core._wxPyFixStockObjects
 

+cvar = _core.cvar
+EmptyString = cvar.EmptyString

 
 #---------------------------------------------------------------------------
 
 BITMAP_TYPE_INVALID = _core.BITMAP_TYPE_INVALID
 BITMAP_TYPE_BMP = _core.BITMAP_TYPE_BMP
 
 #---------------------------------------------------------------------------
 
 BITMAP_TYPE_INVALID = _core.BITMAP_TYPE_INVALID
 BITMAP_TYPE_BMP = _core.BITMAP_TYPE_BMP

-BITMAP_TYPE_BMP_RESOURCE = _core.BITMAP_TYPE_BMP_RESOURCE
-BITMAP_TYPE_RESOURCE = _core.BITMAP_TYPE_RESOURCE

 BITMAP_TYPE_ICO = _core.BITMAP_TYPE_ICO
 BITMAP_TYPE_ICO = _core.BITMAP_TYPE_ICO

-BITMAP_TYPE_ICO_RESOURCE = _core.BITMAP_TYPE_ICO_RESOURCE

 BITMAP_TYPE_CUR = _core.BITMAP_TYPE_CUR
 BITMAP_TYPE_CUR = _core.BITMAP_TYPE_CUR

-BITMAP_TYPE_CUR_RESOURCE = _core.BITMAP_TYPE_CUR_RESOURCE

 BITMAP_TYPE_XBM = _core.BITMAP_TYPE_XBM
 BITMAP_TYPE_XBM_DATA = _core.BITMAP_TYPE_XBM_DATA
 BITMAP_TYPE_XPM = _core.BITMAP_TYPE_XPM
 BITMAP_TYPE_XPM_DATA = _core.BITMAP_TYPE_XPM_DATA
 BITMAP_TYPE_TIF = _core.BITMAP_TYPE_TIF
 BITMAP_TYPE_XBM = _core.BITMAP_TYPE_XBM
 BITMAP_TYPE_XBM_DATA = _core.BITMAP_TYPE_XBM_DATA
 BITMAP_TYPE_XPM = _core.BITMAP_TYPE_XPM
 BITMAP_TYPE_XPM_DATA = _core.BITMAP_TYPE_XPM_DATA
 BITMAP_TYPE_TIF = _core.BITMAP_TYPE_TIF

-BITMAP_TYPE_TIF_RESOURCE = _core.BITMAP_TYPE_TIF_RESOURCE

 BITMAP_TYPE_GIF = _core.BITMAP_TYPE_GIF
 BITMAP_TYPE_GIF = _core.BITMAP_TYPE_GIF

-BITMAP_TYPE_GIF_RESOURCE = _core.BITMAP_TYPE_GIF_RESOURCE

 BITMAP_TYPE_PNG = _core.BITMAP_TYPE_PNG
 BITMAP_TYPE_PNG = _core.BITMAP_TYPE_PNG

-BITMAP_TYPE_PNG_RESOURCE = _core.BITMAP_TYPE_PNG_RESOURCE

 BITMAP_TYPE_JPEG = _core.BITMAP_TYPE_JPEG
 BITMAP_TYPE_JPEG = _core.BITMAP_TYPE_JPEG

-BITMAP_TYPE_JPEG_RESOURCE = _core.BITMAP_TYPE_JPEG_RESOURCE

 BITMAP_TYPE_PNM = _core.BITMAP_TYPE_PNM
 BITMAP_TYPE_PNM = _core.BITMAP_TYPE_PNM

-BITMAP_TYPE_PNM_RESOURCE = _core.BITMAP_TYPE_PNM_RESOURCE

 BITMAP_TYPE_PCX = _core.BITMAP_TYPE_PCX
 BITMAP_TYPE_PCX = _core.BITMAP_TYPE_PCX

-BITMAP_TYPE_PCX_RESOURCE = _core.BITMAP_TYPE_PCX_RESOURCE

 BITMAP_TYPE_PICT = _core.BITMAP_TYPE_PICT
 BITMAP_TYPE_PICT = _core.BITMAP_TYPE_PICT

-BITMAP_TYPE_PICT_RESOURCE = _core.BITMAP_TYPE_PICT_RESOURCE

 BITMAP_TYPE_ICON = _core.BITMAP_TYPE_ICON
 BITMAP_TYPE_ICON = _core.BITMAP_TYPE_ICON

-BITMAP_TYPE_ICON_RESOURCE = _core.BITMAP_TYPE_ICON_RESOURCE

 BITMAP_TYPE_ANI = _core.BITMAP_TYPE_ANI
 BITMAP_TYPE_IFF = _core.BITMAP_TYPE_IFF
 BITMAP_TYPE_MACCURSOR = _core.BITMAP_TYPE_MACCURSOR
 BITMAP_TYPE_ANI = _core.BITMAP_TYPE_ANI
 BITMAP_TYPE_IFF = _core.BITMAP_TYPE_IFF
 BITMAP_TYPE_MACCURSOR = _core.BITMAP_TYPE_MACCURSOR

-BITMAP_TYPE_MACCURSOR_RESOURCE = _core.BITMAP_TYPE_MACCURSOR_RESOURCE

 BITMAP_TYPE_ANY = _core.BITMAP_TYPE_ANY
 CURSOR_NONE = _core.CURSOR_NONE
 CURSOR_ARROW = _core.CURSOR_ARROW
 BITMAP_TYPE_ANY = _core.BITMAP_TYPE_ANY
 CURSOR_NONE = _core.CURSOR_NONE
 CURSOR_ARROW = _core.CURSOR_ARROW


@@ -1540,7 +1529,7 @@ class InputStream(object):
         return _core.InputStream_Ungetch(*args, **kwargs)
 
     def SeekI(*args, **kwargs):
         return _core.InputStream_Ungetch(*args, **kwargs)
 
     def SeekI(*args, **kwargs):

-        """SeekI(long pos, wxSeekMode mode=FromStart) -> long"""
+        """SeekI(long pos, int mode=FromStart) -> long"""

         return _core.InputStream_SeekI(*args, **kwargs)
 
     def TellI(*args, **kwargs):
         return _core.InputStream_SeekI(*args, **kwargs)
 
     def TellI(*args, **kwargs):


@@ -1554,7 +1543,6 @@ class InputStreamPtr(InputStream):
         if not hasattr(self,"thisown"): self.thisown = 0
         self.__class__ = InputStream
 _core.InputStream_swigregister(InputStreamPtr)
         if not hasattr(self,"thisown"): self.thisown = 0
         self.__class__ = InputStream
 _core.InputStream_swigregister(InputStreamPtr)

-cvar = _core.cvar

 DefaultPosition = cvar.DefaultPosition
 DefaultSize = cvar.DefaultSize
 
 DefaultPosition = cvar.DefaultPosition
 DefaultSize = cvar.DefaultSize
 


@@ -1581,8 +1569,8 @@ class FSFile(Object):
         return "<%s.%s; proxy of C++ wxFSFile instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """
         return "<%s.%s; proxy of C++ wxFSFile instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """

-        __init__(wxInputStream stream, wxString loc, wxString mimetype, 
-            wxString anchor, wxDateTime modif) -> FSFile
+        __init__(InputStream stream, String loc, String mimetype, String anchor, 
+            DateTime modif) -> FSFile

         """
         newobj = _core.new_FSFile(*args, **kwargs)
         self.this = newobj.this
         """
         newobj = _core.new_FSFile(*args, **kwargs)
         self.this = newobj.this


@@ -1595,23 +1583,23 @@ class FSFile(Object):
         except: pass
 
     def GetStream(*args, **kwargs):
         except: pass
 
     def GetStream(*args, **kwargs):

-        """GetStream() -> wxInputStream"""
+        """GetStream() -> InputStream"""

         return _core.FSFile_GetStream(*args, **kwargs)
 
     def GetMimeType(*args, **kwargs):
         return _core.FSFile_GetStream(*args, **kwargs)
 
     def GetMimeType(*args, **kwargs):

-        """GetMimeType() -> wxString"""
+        """GetMimeType() -> String"""

         return _core.FSFile_GetMimeType(*args, **kwargs)
 
     def GetLocation(*args, **kwargs):
         return _core.FSFile_GetMimeType(*args, **kwargs)
 
     def GetLocation(*args, **kwargs):

-        """GetLocation() -> wxString"""
+        """GetLocation() -> String"""

         return _core.FSFile_GetLocation(*args, **kwargs)
 
     def GetAnchor(*args, **kwargs):
         return _core.FSFile_GetLocation(*args, **kwargs)
 
     def GetAnchor(*args, **kwargs):

-        """GetAnchor() -> wxString"""
+        """GetAnchor() -> String"""

         return _core.FSFile_GetAnchor(*args, **kwargs)
 
     def GetModificationTime(*args, **kwargs):
         return _core.FSFile_GetAnchor(*args, **kwargs)
 
     def GetModificationTime(*args, **kwargs):

-        """GetModificationTime() -> wxDateTime"""
+        """GetModificationTime() -> DateTime"""

         return _core.FSFile_GetModificationTime(*args, **kwargs)
 
 
         return _core.FSFile_GetModificationTime(*args, **kwargs)
 
 


@@ -1650,39 +1638,39 @@ class FileSystemHandler(CPPFileSystemHandler):
         return _core.FileSystemHandler__setCallbackInfo(*args, **kwargs)
 
     def CanOpen(*args, **kwargs):
         return _core.FileSystemHandler__setCallbackInfo(*args, **kwargs)
 
     def CanOpen(*args, **kwargs):

-        """CanOpen(wxString location) -> bool"""
+        """CanOpen(String location) -> bool"""

         return _core.FileSystemHandler_CanOpen(*args, **kwargs)
 
     def OpenFile(*args, **kwargs):
         return _core.FileSystemHandler_CanOpen(*args, **kwargs)
 
     def OpenFile(*args, **kwargs):

-        """OpenFile(FileSystem fs, wxString location) -> FSFile"""
+        """OpenFile(FileSystem fs, String location) -> FSFile"""

         return _core.FileSystemHandler_OpenFile(*args, **kwargs)
 
     def FindFirst(*args, **kwargs):
         return _core.FileSystemHandler_OpenFile(*args, **kwargs)
 
     def FindFirst(*args, **kwargs):

-        """FindFirst(wxString spec, int flags=0) -> wxString"""
+        """FindFirst(String spec, int flags=0) -> String"""

         return _core.FileSystemHandler_FindFirst(*args, **kwargs)
 
     def FindNext(*args, **kwargs):
         return _core.FileSystemHandler_FindFirst(*args, **kwargs)
 
     def FindNext(*args, **kwargs):

-        """FindNext() -> wxString"""
+        """FindNext() -> String"""

         return _core.FileSystemHandler_FindNext(*args, **kwargs)
 
     def GetProtocol(*args, **kwargs):
         return _core.FileSystemHandler_FindNext(*args, **kwargs)
 
     def GetProtocol(*args, **kwargs):

-        """GetProtocol(wxString location) -> wxString"""
+        """GetProtocol(String location) -> String"""

         return _core.FileSystemHandler_GetProtocol(*args, **kwargs)
 
     def GetLeftLocation(*args, **kwargs):
         return _core.FileSystemHandler_GetProtocol(*args, **kwargs)
 
     def GetLeftLocation(*args, **kwargs):

-        """GetLeftLocation(wxString location) -> wxString"""
+        """GetLeftLocation(String location) -> String"""

         return _core.FileSystemHandler_GetLeftLocation(*args, **kwargs)
 
     def GetAnchor(*args, **kwargs):
         return _core.FileSystemHandler_GetLeftLocation(*args, **kwargs)
 
     def GetAnchor(*args, **kwargs):

-        """GetAnchor(wxString location) -> wxString"""
+        """GetAnchor(String location) -> String"""

         return _core.FileSystemHandler_GetAnchor(*args, **kwargs)
 
     def GetRightLocation(*args, **kwargs):
         return _core.FileSystemHandler_GetAnchor(*args, **kwargs)
 
     def GetRightLocation(*args, **kwargs):

-        """GetRightLocation(wxString location) -> wxString"""
+        """GetRightLocation(String location) -> String"""

         return _core.FileSystemHandler_GetRightLocation(*args, **kwargs)
 
     def GetMimeTypeFromExt(*args, **kwargs):
         return _core.FileSystemHandler_GetRightLocation(*args, **kwargs)
 
     def GetMimeTypeFromExt(*args, **kwargs):

-        """GetMimeTypeFromExt(wxString location) -> wxString"""
+        """GetMimeTypeFromExt(String location) -> String"""

         return _core.FileSystemHandler_GetMimeTypeFromExt(*args, **kwargs)
 
 
         return _core.FileSystemHandler_GetMimeTypeFromExt(*args, **kwargs)
 
 


@@ -1709,23 +1697,23 @@ class FileSystem(Object):
         except: pass
 
     def ChangePathTo(*args, **kwargs):
         except: pass
 
     def ChangePathTo(*args, **kwargs):

-        """ChangePathTo(wxString location, bool is_dir=False)"""
+        """ChangePathTo(String location, bool is_dir=False)"""

         return _core.FileSystem_ChangePathTo(*args, **kwargs)
 
     def GetPath(*args, **kwargs):
         return _core.FileSystem_ChangePathTo(*args, **kwargs)
 
     def GetPath(*args, **kwargs):

-        """GetPath() -> wxString"""
+        """GetPath() -> String"""

         return _core.FileSystem_GetPath(*args, **kwargs)
 
     def OpenFile(*args, **kwargs):
         return _core.FileSystem_GetPath(*args, **kwargs)
 
     def OpenFile(*args, **kwargs):

-        """OpenFile(wxString location) -> FSFile"""
+        """OpenFile(String location) -> FSFile"""

         return _core.FileSystem_OpenFile(*args, **kwargs)
 
     def FindFirst(*args, **kwargs):
         return _core.FileSystem_OpenFile(*args, **kwargs)
 
     def FindFirst(*args, **kwargs):

-        """FindFirst(wxString spec, int flags=0) -> wxString"""
+        """FindFirst(String spec, int flags=0) -> String"""

         return _core.FileSystem_FindFirst(*args, **kwargs)
 
     def FindNext(*args, **kwargs):
         return _core.FileSystem_FindFirst(*args, **kwargs)
 
     def FindNext(*args, **kwargs):

-        """FindNext() -> wxString"""
+        """FindNext() -> String"""

         return _core.FileSystem_FindNext(*args, **kwargs)
 
     def AddHandler(*args, **kwargs):
         return _core.FileSystem_FindNext(*args, **kwargs)
 
     def AddHandler(*args, **kwargs):


@@ -1739,7 +1727,7 @@ class FileSystem(Object):
 
     CleanUpHandlers = staticmethod(CleanUpHandlers)
     def FileNameToURL(*args, **kwargs):
 
     CleanUpHandlers = staticmethod(CleanUpHandlers)
     def FileNameToURL(*args, **kwargs):

-        """FileSystem.FileNameToURL(wxString filename) -> wxString"""
+        """FileSystem.FileNameToURL(String filename) -> String"""

         return _core.FileSystem_FileNameToURL(*args, **kwargs)
 
     FileNameToURL = staticmethod(FileNameToURL)
         return _core.FileSystem_FileNameToURL(*args, **kwargs)
 
     FileNameToURL = staticmethod(FileNameToURL)


@@ -1760,12 +1748,12 @@ def FileSystem_CleanUpHandlers(*args, **kwargs):
     return _core.FileSystem_CleanUpHandlers(*args, **kwargs)
 
 def FileSystem_FileNameToURL(*args, **kwargs):
     return _core.FileSystem_CleanUpHandlers(*args, **kwargs)
 
 def FileSystem_FileNameToURL(*args, **kwargs):

-    """FileSystem_FileNameToURL(wxString filename) -> wxString"""
+    """FileSystem_FileNameToURL(String filename) -> String"""

     return _core.FileSystem_FileNameToURL(*args, **kwargs)
 
 
 def FileSystem_URLToFileName(*args, **kwargs):
     return _core.FileSystem_FileNameToURL(*args, **kwargs)
 
 
 def FileSystem_URLToFileName(*args, **kwargs):

-    """FileSystem_URLToFileName(wxString url) -> wxString"""
+    """FileSystem_URLToFileName(String url) -> String"""

     return _core.FileSystem_URLToFileName(*args, **kwargs)
 class InternetFSHandler(CPPFileSystemHandler):
     def __repr__(self):
     return _core.FileSystem_URLToFileName(*args, **kwargs)
 class InternetFSHandler(CPPFileSystemHandler):
     def __repr__(self):


@@ -1777,11 +1765,11 @@ class InternetFSHandler(CPPFileSystemHandler):
         self.thisown = 1
         del newobj.thisown
     def CanOpen(*args, **kwargs):
         self.thisown = 1
         del newobj.thisown
     def CanOpen(*args, **kwargs):

-        """CanOpen(wxString location) -> bool"""
+        """CanOpen(String location) -> bool"""

         return _core.InternetFSHandler_CanOpen(*args, **kwargs)
 
     def OpenFile(*args, **kwargs):
         return _core.InternetFSHandler_CanOpen(*args, **kwargs)
 
     def OpenFile(*args, **kwargs):

-        """OpenFile(FileSystem fs, wxString location) -> FSFile"""
+        """OpenFile(FileSystem fs, String location) -> FSFile"""

         return _core.InternetFSHandler_OpenFile(*args, **kwargs)
 
 
         return _core.InternetFSHandler_OpenFile(*args, **kwargs)
 
 


@@ -1802,19 +1790,19 @@ class ZipFSHandler(CPPFileSystemHandler):
         self.thisown = 1
         del newobj.thisown
     def CanOpen(*args, **kwargs):
         self.thisown = 1
         del newobj.thisown
     def CanOpen(*args, **kwargs):

-        """CanOpen(wxString location) -> bool"""
+        """CanOpen(String location) -> bool"""

         return _core.ZipFSHandler_CanOpen(*args, **kwargs)
 
     def OpenFile(*args, **kwargs):
         return _core.ZipFSHandler_CanOpen(*args, **kwargs)
 
     def OpenFile(*args, **kwargs):

-        """OpenFile(FileSystem fs, wxString location) -> FSFile"""
+        """OpenFile(FileSystem fs, String location) -> FSFile"""

         return _core.ZipFSHandler_OpenFile(*args, **kwargs)
 
     def FindFirst(*args, **kwargs):
         return _core.ZipFSHandler_OpenFile(*args, **kwargs)
 
     def FindFirst(*args, **kwargs):

-        """FindFirst(wxString spec, int flags=0) -> wxString"""
+        """FindFirst(String spec, int flags=0) -> String"""

         return _core.ZipFSHandler_FindFirst(*args, **kwargs)
 
     def FindNext(*args, **kwargs):
         return _core.ZipFSHandler_FindFirst(*args, **kwargs)
 
     def FindNext(*args, **kwargs):

-        """FindNext() -> wxString"""
+        """FindNext() -> String"""

         return _core.ZipFSHandler_FindNext(*args, **kwargs)
 
 
         return _core.ZipFSHandler_FindNext(*args, **kwargs)
 
 


@@ -1827,15 +1815,15 @@ _core.ZipFSHandler_swigregister(ZipFSHandlerPtr)
 
 
 def __wxMemoryFSHandler_AddFile_wxImage(*args, **kwargs):
 
 
 def __wxMemoryFSHandler_AddFile_wxImage(*args, **kwargs):

-    """__wxMemoryFSHandler_AddFile_wxImage(wxString filename, Image image, long type)"""
+    """__wxMemoryFSHandler_AddFile_wxImage(String filename, Image image, long type)"""

     return _core.__wxMemoryFSHandler_AddFile_wxImage(*args, **kwargs)
 
 def __wxMemoryFSHandler_AddFile_wxBitmap(*args, **kwargs):
     return _core.__wxMemoryFSHandler_AddFile_wxImage(*args, **kwargs)
 
 def __wxMemoryFSHandler_AddFile_wxBitmap(*args, **kwargs):

-    """__wxMemoryFSHandler_AddFile_wxBitmap(wxString filename, wxBitmap bitmap, long type)"""
+    """__wxMemoryFSHandler_AddFile_wxBitmap(String filename, Bitmap bitmap, long type)"""

     return _core.__wxMemoryFSHandler_AddFile_wxBitmap(*args, **kwargs)
 
 def __wxMemoryFSHandler_AddFile_Data(*args, **kwargs):
     return _core.__wxMemoryFSHandler_AddFile_wxBitmap(*args, **kwargs)
 
 def __wxMemoryFSHandler_AddFile_Data(*args, **kwargs):

-    """__wxMemoryFSHandler_AddFile_Data(wxString filename, PyObject data)"""
+    """__wxMemoryFSHandler_AddFile_Data(String filename, PyObject data)"""

     return _core.__wxMemoryFSHandler_AddFile_Data(*args, **kwargs)
 def MemoryFSHandler_AddFile(filename, a, b=''):
     if isinstance(a, wx.Image):
     return _core.__wxMemoryFSHandler_AddFile_Data(*args, **kwargs)
 def MemoryFSHandler_AddFile(filename, a, b=''):
     if isinstance(a, wx.Image):


@@ -1856,25 +1844,25 @@ class MemoryFSHandler(CPPFileSystemHandler):
         self.thisown = 1
         del newobj.thisown
     def RemoveFile(*args, **kwargs):
         self.thisown = 1
         del newobj.thisown
     def RemoveFile(*args, **kwargs):

-        """MemoryFSHandler.RemoveFile(wxString filename)"""
+        """MemoryFSHandler.RemoveFile(String filename)"""

         return _core.MemoryFSHandler_RemoveFile(*args, **kwargs)
 
     RemoveFile = staticmethod(RemoveFile)
     AddFile = staticmethod(MemoryFSHandler_AddFile) 
     def CanOpen(*args, **kwargs):
         return _core.MemoryFSHandler_RemoveFile(*args, **kwargs)
 
     RemoveFile = staticmethod(RemoveFile)
     AddFile = staticmethod(MemoryFSHandler_AddFile) 
     def CanOpen(*args, **kwargs):

-        """CanOpen(wxString location) -> bool"""
+        """CanOpen(String location) -> bool"""

         return _core.MemoryFSHandler_CanOpen(*args, **kwargs)
 
     def OpenFile(*args, **kwargs):
         return _core.MemoryFSHandler_CanOpen(*args, **kwargs)
 
     def OpenFile(*args, **kwargs):

-        """OpenFile(FileSystem fs, wxString location) -> FSFile"""
+        """OpenFile(FileSystem fs, String location) -> FSFile"""

         return _core.MemoryFSHandler_OpenFile(*args, **kwargs)
 
     def FindFirst(*args, **kwargs):
         return _core.MemoryFSHandler_OpenFile(*args, **kwargs)
 
     def FindFirst(*args, **kwargs):

-        """FindFirst(wxString spec, int flags=0) -> wxString"""
+        """FindFirst(String spec, int flags=0) -> String"""

         return _core.MemoryFSHandler_FindFirst(*args, **kwargs)
 
     def FindNext(*args, **kwargs):
         return _core.MemoryFSHandler_FindFirst(*args, **kwargs)
 
     def FindNext(*args, **kwargs):

-        """FindNext() -> wxString"""
+        """FindNext() -> String"""

         return _core.MemoryFSHandler_FindNext(*args, **kwargs)
 
 
         return _core.MemoryFSHandler_FindNext(*args, **kwargs)
 
 


@@ -1886,7 +1874,7 @@ class MemoryFSHandlerPtr(MemoryFSHandler):
 _core.MemoryFSHandler_swigregister(MemoryFSHandlerPtr)
 
 def MemoryFSHandler_RemoveFile(*args, **kwargs):
 _core.MemoryFSHandler_swigregister(MemoryFSHandlerPtr)
 
 def MemoryFSHandler_RemoveFile(*args, **kwargs):

-    """MemoryFSHandler_RemoveFile(wxString filename)"""
+    """MemoryFSHandler_RemoveFile(String filename)"""

     return _core.MemoryFSHandler_RemoveFile(*args, **kwargs)
 
 #---------------------------------------------------------------------------
     return _core.MemoryFSHandler_RemoveFile(*args, **kwargs)
 
 #---------------------------------------------------------------------------


@@ -1896,11 +1884,11 @@ class ImageHandler(Object):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxImageHandler instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def GetName(*args, **kwargs):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxImageHandler instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def GetName(*args, **kwargs):

-        """GetName() -> wxString"""
+        """GetName() -> String"""

         return _core.ImageHandler_GetName(*args, **kwargs)
 
     def GetExtension(*args, **kwargs):
         return _core.ImageHandler_GetName(*args, **kwargs)
 
     def GetExtension(*args, **kwargs):

-        """GetExtension() -> wxString"""
+        """GetExtension() -> String"""

         return _core.ImageHandler_GetExtension(*args, **kwargs)
 
     def GetType(*args, **kwargs):
         return _core.ImageHandler_GetExtension(*args, **kwargs)
 
     def GetType(*args, **kwargs):


@@ -1908,19 +1896,19 @@ class ImageHandler(Object):
         return _core.ImageHandler_GetType(*args, **kwargs)
 
     def GetMimeType(*args, **kwargs):
         return _core.ImageHandler_GetType(*args, **kwargs)
 
     def GetMimeType(*args, **kwargs):

-        """GetMimeType() -> wxString"""
+        """GetMimeType() -> String"""

         return _core.ImageHandler_GetMimeType(*args, **kwargs)
 
     def CanRead(*args, **kwargs):
         return _core.ImageHandler_GetMimeType(*args, **kwargs)
 
     def CanRead(*args, **kwargs):

-        """CanRead(wxString name) -> bool"""
+        """CanRead(String name) -> bool"""

         return _core.ImageHandler_CanRead(*args, **kwargs)
 
     def SetName(*args, **kwargs):
         return _core.ImageHandler_CanRead(*args, **kwargs)
 
     def SetName(*args, **kwargs):

-        """SetName(wxString name)"""
+        """SetName(String name)"""

         return _core.ImageHandler_SetName(*args, **kwargs)
 
     def SetExtension(*args, **kwargs):
         return _core.ImageHandler_SetName(*args, **kwargs)
 
     def SetExtension(*args, **kwargs):

-        """SetExtension(wxString extension)"""
+        """SetExtension(String extension)"""

         return _core.ImageHandler_SetExtension(*args, **kwargs)
 
     def SetType(*args, **kwargs):
         return _core.ImageHandler_SetExtension(*args, **kwargs)
 
     def SetType(*args, **kwargs):


@@ -1928,7 +1916,7 @@ class ImageHandler(Object):
         return _core.ImageHandler_SetType(*args, **kwargs)
 
     def SetMimeType(*args, **kwargs):
         return _core.ImageHandler_SetType(*args, **kwargs)
 
     def SetMimeType(*args, **kwargs):

-        """SetMimeType(wxString mimetype)"""
+        """SetMimeType(String mimetype)"""

         return _core.ImageHandler_SetMimeType(*args, **kwargs)
 
 
         return _core.ImageHandler_SetMimeType(*args, **kwargs)
 
 


@@ -1987,7 +1975,7 @@ class Image(Object):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxImage instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxImage instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):

-        """__init__(wxString name, long type=BITMAP_TYPE_ANY, int index=-1) -> Image"""
+        """__init__(String name, long type=BITMAP_TYPE_ANY, int index=-1) -> Image"""

         newobj = _core.new_Image(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         newobj = _core.new_Image(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1


@@ -2065,42 +2053,42 @@ class Image(Object):
         return _core.Image_SetMaskFromImage(*args, **kwargs)
 
     def CanRead(*args, **kwargs):
         return _core.Image_SetMaskFromImage(*args, **kwargs)
 
     def CanRead(*args, **kwargs):

-        """Image.CanRead(wxString name) -> bool"""
+        """Image.CanRead(String name) -> bool"""

         return _core.Image_CanRead(*args, **kwargs)
 
     CanRead = staticmethod(CanRead)
     def GetImageCount(*args, **kwargs):
         return _core.Image_CanRead(*args, **kwargs)
 
     CanRead = staticmethod(CanRead)
     def GetImageCount(*args, **kwargs):

-        """Image.GetImageCount(wxString name, long type=BITMAP_TYPE_ANY) -> int"""
+        """Image.GetImageCount(String name, long type=BITMAP_TYPE_ANY) -> int"""

         return _core.Image_GetImageCount(*args, **kwargs)
 
     GetImageCount = staticmethod(GetImageCount)
     def LoadFile(*args, **kwargs):
         return _core.Image_GetImageCount(*args, **kwargs)
 
     GetImageCount = staticmethod(GetImageCount)
     def LoadFile(*args, **kwargs):

-        """LoadFile(wxString name, long type=BITMAP_TYPE_ANY, int index=-1) -> bool"""
+        """LoadFile(String name, long type=BITMAP_TYPE_ANY, int index=-1) -> bool"""

         return _core.Image_LoadFile(*args, **kwargs)
 
     def LoadMimeFile(*args, **kwargs):
         return _core.Image_LoadFile(*args, **kwargs)
 
     def LoadMimeFile(*args, **kwargs):

-        """LoadMimeFile(wxString name, wxString mimetype, int index=-1) -> bool"""
+        """LoadMimeFile(String name, String mimetype, int index=-1) -> bool"""

         return _core.Image_LoadMimeFile(*args, **kwargs)
 
     def SaveFile(*args, **kwargs):
         return _core.Image_LoadMimeFile(*args, **kwargs)
 
     def SaveFile(*args, **kwargs):

-        """SaveFile(wxString name, int type) -> bool"""
+        """SaveFile(String name, int type) -> bool"""

         return _core.Image_SaveFile(*args, **kwargs)
 
     def SaveMimeFile(*args, **kwargs):
         return _core.Image_SaveFile(*args, **kwargs)
 
     def SaveMimeFile(*args, **kwargs):

-        """SaveMimeFile(wxString name, wxString mimetype) -> bool"""
+        """SaveMimeFile(String name, String mimetype) -> bool"""

         return _core.Image_SaveMimeFile(*args, **kwargs)
 
     def CanReadStream(*args, **kwargs):
         return _core.Image_SaveMimeFile(*args, **kwargs)
 
     def CanReadStream(*args, **kwargs):

-        """Image.CanReadStream(wxInputStream stream) -> bool"""
+        """Image.CanReadStream(InputStream stream) -> bool"""

         return _core.Image_CanReadStream(*args, **kwargs)
 
     CanReadStream = staticmethod(CanReadStream)
     def LoadStream(*args, **kwargs):
         return _core.Image_CanReadStream(*args, **kwargs)
 
     CanReadStream = staticmethod(CanReadStream)
     def LoadStream(*args, **kwargs):

-        """LoadStream(wxInputStream stream, long type=BITMAP_TYPE_ANY, int index=-1) -> bool"""
+        """LoadStream(InputStream stream, long type=BITMAP_TYPE_ANY, int index=-1) -> bool"""

         return _core.Image_LoadStream(*args, **kwargs)
 
     def LoadMimeStream(*args, **kwargs):
         return _core.Image_LoadStream(*args, **kwargs)
 
     def LoadMimeStream(*args, **kwargs):

-        """LoadMimeStream(wxInputStream stream, wxString mimetype, int index=-1) -> bool"""
+        """LoadMimeStream(InputStream stream, String mimetype, int index=-1) -> bool"""

         return _core.Image_LoadMimeStream(*args, **kwargs)
 
     def Ok(*args, **kwargs):
         return _core.Image_LoadMimeStream(*args, **kwargs)
 
     def Ok(*args, **kwargs):


@@ -2210,23 +2198,23 @@ class Image(Object):
         return _core.Image_ConvertToMono(*args, **kwargs)
 
     def SetOption(*args, **kwargs):
         return _core.Image_ConvertToMono(*args, **kwargs)
 
     def SetOption(*args, **kwargs):

-        """SetOption(wxString name, wxString value)"""
+        """SetOption(String name, String value)"""

         return _core.Image_SetOption(*args, **kwargs)
 
     def SetOptionInt(*args, **kwargs):
         return _core.Image_SetOption(*args, **kwargs)
 
     def SetOptionInt(*args, **kwargs):

-        """SetOptionInt(wxString name, int value)"""
+        """SetOptionInt(String name, int value)"""

         return _core.Image_SetOptionInt(*args, **kwargs)
 
     def GetOption(*args, **kwargs):
         return _core.Image_SetOptionInt(*args, **kwargs)
 
     def GetOption(*args, **kwargs):

-        """GetOption(wxString name) -> wxString"""
+        """GetOption(String name) -> String"""

         return _core.Image_GetOption(*args, **kwargs)
 
     def GetOptionInt(*args, **kwargs):
         return _core.Image_GetOption(*args, **kwargs)
 
     def GetOptionInt(*args, **kwargs):

-        """GetOptionInt(wxString name) -> int"""
+        """GetOptionInt(String name) -> int"""

         return _core.Image_GetOptionInt(*args, **kwargs)
 
     def HasOption(*args, **kwargs):
         return _core.Image_GetOptionInt(*args, **kwargs)
 
     def HasOption(*args, **kwargs):

-        """HasOption(wxString name) -> bool"""
+        """HasOption(String name) -> bool"""

         return _core.Image_HasOption(*args, **kwargs)
 
     def CountColours(*args, **kwargs):
         return _core.Image_HasOption(*args, **kwargs)
 
     def CountColours(*args, **kwargs):


@@ -2248,21 +2236,21 @@ class Image(Object):
 
     InsertHandler = staticmethod(InsertHandler)
     def RemoveHandler(*args, **kwargs):
 
     InsertHandler = staticmethod(InsertHandler)
     def RemoveHandler(*args, **kwargs):

-        """Image.RemoveHandler(wxString name) -> bool"""
+        """Image.RemoveHandler(String name) -> bool"""

         return _core.Image_RemoveHandler(*args, **kwargs)
 
     RemoveHandler = staticmethod(RemoveHandler)
     def GetImageExtWildcard(*args, **kwargs):
         return _core.Image_RemoveHandler(*args, **kwargs)
 
     RemoveHandler = staticmethod(RemoveHandler)
     def GetImageExtWildcard(*args, **kwargs):

-        """Image.GetImageExtWildcard() -> wxString"""
+        """Image.GetImageExtWildcard() -> String"""

         return _core.Image_GetImageExtWildcard(*args, **kwargs)
 
     GetImageExtWildcard = staticmethod(GetImageExtWildcard)
     def ConvertToBitmap(*args, **kwargs):
         return _core.Image_GetImageExtWildcard(*args, **kwargs)
 
     GetImageExtWildcard = staticmethod(GetImageExtWildcard)
     def ConvertToBitmap(*args, **kwargs):

-        """ConvertToBitmap() -> wxBitmap"""
+        """ConvertToBitmap() -> Bitmap"""

         return _core.Image_ConvertToBitmap(*args, **kwargs)
 
     def ConvertToMonoBitmap(*args, **kwargs):
         return _core.Image_ConvertToBitmap(*args, **kwargs)
 
     def ConvertToMonoBitmap(*args, **kwargs):

-        """ConvertToMonoBitmap(unsigned char red, unsigned char green, unsigned char blue) -> wxBitmap"""
+        """ConvertToMonoBitmap(unsigned char red, unsigned char green, unsigned char blue) -> Bitmap"""

         return _core.Image_ConvertToMonoBitmap(*args, **kwargs)
 
     def __nonzero__(self): return self.Ok() 
         return _core.Image_ConvertToMonoBitmap(*args, **kwargs)
 
     def __nonzero__(self): return self.Ok() 


@@ -2275,19 +2263,19 @@ class ImagePtr(Image):
 _core.Image_swigregister(ImagePtr)
 
 def ImageFromMime(*args, **kwargs):
 _core.Image_swigregister(ImagePtr)
 
 def ImageFromMime(*args, **kwargs):

-    """ImageFromMime(wxString name, wxString mimetype, int index=-1) -> Image"""
+    """ImageFromMime(String name, String mimetype, int index=-1) -> Image"""

     val = _core.new_ImageFromMime(*args, **kwargs)
     val.thisown = 1
     return val
 
 def ImageFromStream(*args, **kwargs):
     val = _core.new_ImageFromMime(*args, **kwargs)
     val.thisown = 1
     return val
 
 def ImageFromStream(*args, **kwargs):

-    """ImageFromStream(wxInputStream stream, long type=BITMAP_TYPE_ANY, int index=-1) -> Image"""
+    """ImageFromStream(InputStream stream, long type=BITMAP_TYPE_ANY, int index=-1) -> Image"""

     val = _core.new_ImageFromStream(*args, **kwargs)
     val.thisown = 1
     return val
 
 def ImageFromStreamMime(*args, **kwargs):
     val = _core.new_ImageFromStream(*args, **kwargs)
     val.thisown = 1
     return val
 
 def ImageFromStreamMime(*args, **kwargs):

-    """ImageFromStreamMime(wxInputStream stream, wxString mimetype, int index=-1) -> Image"""
+    """ImageFromStreamMime(InputStream stream, String mimetype, int index=-1) -> Image"""

     val = _core.new_ImageFromStreamMime(*args, **kwargs)
     val.thisown = 1
     return val
     val = _core.new_ImageFromStreamMime(*args, **kwargs)
     val.thisown = 1
     return val


@@ -2299,7 +2287,7 @@ def EmptyImage(*args, **kwargs):
     return val
 
 def ImageFromBitmap(*args, **kwargs):
     return val
 
 def ImageFromBitmap(*args, **kwargs):

-    """ImageFromBitmap(wxBitmap bitmap) -> Image"""
+    """ImageFromBitmap(Bitmap bitmap) -> Image"""

     val = _core.new_ImageFromBitmap(*args, **kwargs)
     val.thisown = 1
     return val
     val = _core.new_ImageFromBitmap(*args, **kwargs)
     val.thisown = 1
     return val


@@ -2311,15 +2299,15 @@ def ImageFromData(*args, **kwargs):
     return val
 
 def Image_CanRead(*args, **kwargs):
     return val
 
 def Image_CanRead(*args, **kwargs):

-    """Image_CanRead(wxString name) -> bool"""
+    """Image_CanRead(String name) -> bool"""

     return _core.Image_CanRead(*args, **kwargs)
 
 def Image_GetImageCount(*args, **kwargs):
     return _core.Image_CanRead(*args, **kwargs)
 
 def Image_GetImageCount(*args, **kwargs):

-    """Image_GetImageCount(wxString name, long type=BITMAP_TYPE_ANY) -> int"""
+    """Image_GetImageCount(String name, long type=BITMAP_TYPE_ANY) -> int"""

     return _core.Image_GetImageCount(*args, **kwargs)
 
 def Image_CanReadStream(*args, **kwargs):
     return _core.Image_GetImageCount(*args, **kwargs)
 
 def Image_CanReadStream(*args, **kwargs):

-    """Image_CanReadStream(wxInputStream stream) -> bool"""
+    """Image_CanReadStream(InputStream stream) -> bool"""

     return _core.Image_CanReadStream(*args, **kwargs)
 
 def Image_AddHandler(*args, **kwargs):
     return _core.Image_CanReadStream(*args, **kwargs)
 
 def Image_AddHandler(*args, **kwargs):


@@ -2331,11 +2319,11 @@ def Image_InsertHandler(*args, **kwargs):
     return _core.Image_InsertHandler(*args, **kwargs)
 
 def Image_RemoveHandler(*args, **kwargs):
     return _core.Image_InsertHandler(*args, **kwargs)
 
 def Image_RemoveHandler(*args, **kwargs):

-    """Image_RemoveHandler(wxString name) -> bool"""
+    """Image_RemoveHandler(String name) -> bool"""

     return _core.Image_RemoveHandler(*args, **kwargs)
 
 def Image_GetImageExtWildcard(*args, **kwargs):
     return _core.Image_RemoveHandler(*args, **kwargs)
 
 def Image_GetImageExtWildcard(*args, **kwargs):

-    """Image_GetImageExtWildcard() -> wxString"""
+    """Image_GetImageExtWildcard() -> String"""

     return _core.Image_GetImageExtWildcard(*args, **kwargs)
 
 
     return _core.Image_GetImageExtWildcard(*args, **kwargs)
 
 


@@ -3144,11 +3132,11 @@ class CommandEvent(Event):
         return _core.CommandEvent_GetSelection(*args, **kwargs)
 
     def SetString(*args, **kwargs):
         return _core.CommandEvent_GetSelection(*args, **kwargs)
 
     def SetString(*args, **kwargs):

-        """SetString(wxString s)"""
+        """SetString(String s)"""

         return _core.CommandEvent_SetString(*args, **kwargs)
 
     def GetString(*args, **kwargs):
         return _core.CommandEvent_SetString(*args, **kwargs)
 
     def GetString(*args, **kwargs):

-        """GetString() -> wxString"""
+        """GetString() -> String"""

         return _core.CommandEvent_GetString(*args, **kwargs)
 
     def IsChecked(*args, **kwargs):
         return _core.CommandEvent_GetString(*args, **kwargs)
 
     def IsChecked(*args, **kwargs):


@@ -3433,7 +3421,7 @@ class MouseEvent(Event):
         return _core.MouseEvent_GetPositionTuple(*args, **kwargs)
 
     def GetLogicalPosition(*args, **kwargs):
         return _core.MouseEvent_GetPositionTuple(*args, **kwargs)
 
     def GetLogicalPosition(*args, **kwargs):

-        """GetLogicalPosition(wxDC dc) -> Point"""
+        """GetLogicalPosition(DC dc) -> Point"""

         return _core.MouseEvent_GetLogicalPosition(*args, **kwargs)
 
     def GetX(*args, **kwargs):
         return _core.MouseEvent_GetLogicalPosition(*args, **kwargs)
 
     def GetX(*args, **kwargs):


@@ -3500,11 +3488,11 @@ class SetCursorEvent(Event):
         return _core.SetCursorEvent_GetY(*args, **kwargs)
 
     def SetCursor(*args, **kwargs):
         return _core.SetCursorEvent_GetY(*args, **kwargs)
 
     def SetCursor(*args, **kwargs):

-        """SetCursor(wxCursor cursor)"""
+        """SetCursor(Cursor cursor)"""

         return _core.SetCursorEvent_SetCursor(*args, **kwargs)
 
     def GetCursor(*args, **kwargs):
         return _core.SetCursorEvent_SetCursor(*args, **kwargs)
 
     def GetCursor(*args, **kwargs):

-        """GetCursor() -> wxCursor"""
+        """GetCursor() -> Cursor"""

         return _core.SetCursorEvent_GetCursor(*args, **kwargs)
 
     def HasCursor(*args, **kwargs):
         return _core.SetCursorEvent_GetCursor(*args, **kwargs)
 
     def HasCursor(*args, **kwargs):


@@ -3725,13 +3713,13 @@ class EraseEvent(Event):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxEraseEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxEraseEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):

-        """__init__(int Id=0, wxDC dc=(wxDC *) NULL) -> EraseEvent"""
+        """__init__(int Id=0, DC dc=(wxDC *) NULL) -> EraseEvent"""

         newobj = _core.new_EraseEvent(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def GetDC(*args, **kwargs):
         newobj = _core.new_EraseEvent(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def GetDC(*args, **kwargs):

-        """GetDC() -> wxDC"""
+        """GetDC() -> DC"""

         return _core.EraseEvent_GetDC(*args, **kwargs)
 
 
         return _core.EraseEvent_GetDC(*args, **kwargs)
 
 


@@ -4025,7 +4013,7 @@ class UpdateUIEvent(CommandEvent):
         return _core.UpdateUIEvent_GetEnabled(*args, **kwargs)
 
     def GetText(*args, **kwargs):
         return _core.UpdateUIEvent_GetEnabled(*args, **kwargs)
 
     def GetText(*args, **kwargs):

-        """GetText() -> wxString"""
+        """GetText() -> String"""

         return _core.UpdateUIEvent_GetText(*args, **kwargs)
 
     def GetSetText(*args, **kwargs):
         return _core.UpdateUIEvent_GetText(*args, **kwargs)
 
     def GetSetText(*args, **kwargs):


@@ -4049,7 +4037,7 @@ class UpdateUIEvent(CommandEvent):
         return _core.UpdateUIEvent_Enable(*args, **kwargs)
 
     def SetText(*args, **kwargs):
         return _core.UpdateUIEvent_Enable(*args, **kwargs)
 
     def SetText(*args, **kwargs):

-        """SetText(wxString text)"""
+        """SetText(String text)"""

         return _core.UpdateUIEvent_SetText(*args, **kwargs)
 
     def SetUpdateInterval(*args, **kwargs):
         return _core.UpdateUIEvent_SetText(*args, **kwargs)
 
     def SetUpdateInterval(*args, **kwargs):


@@ -4073,12 +4061,12 @@ class UpdateUIEvent(CommandEvent):
 
     ResetUpdateTime = staticmethod(ResetUpdateTime)
     def SetMode(*args, **kwargs):
 
     ResetUpdateTime = staticmethod(ResetUpdateTime)
     def SetMode(*args, **kwargs):

-        """UpdateUIEvent.SetMode(wxUpdateUIMode mode)"""
+        """UpdateUIEvent.SetMode(int mode)"""

         return _core.UpdateUIEvent_SetMode(*args, **kwargs)
 
     SetMode = staticmethod(SetMode)
     def GetMode(*args, **kwargs):
         return _core.UpdateUIEvent_SetMode(*args, **kwargs)
 
     SetMode = staticmethod(SetMode)
     def GetMode(*args, **kwargs):

-        """UpdateUIEvent.GetMode() -> wxUpdateUIMode"""
+        """UpdateUIEvent.GetMode() -> int"""

         return _core.UpdateUIEvent_GetMode(*args, **kwargs)
 
     GetMode = staticmethod(GetMode)
         return _core.UpdateUIEvent_GetMode(*args, **kwargs)
 
     GetMode = staticmethod(GetMode)


@@ -4107,11 +4095,11 @@ def UpdateUIEvent_ResetUpdateTime(*args, **kwargs):
     return _core.UpdateUIEvent_ResetUpdateTime(*args, **kwargs)
 
 def UpdateUIEvent_SetMode(*args, **kwargs):
     return _core.UpdateUIEvent_ResetUpdateTime(*args, **kwargs)
 
 def UpdateUIEvent_SetMode(*args, **kwargs):

-    """UpdateUIEvent_SetMode(wxUpdateUIMode mode)"""
+    """UpdateUIEvent_SetMode(int mode)"""

     return _core.UpdateUIEvent_SetMode(*args, **kwargs)
 
 def UpdateUIEvent_GetMode(*args, **kwargs):
     return _core.UpdateUIEvent_SetMode(*args, **kwargs)
 
 def UpdateUIEvent_GetMode(*args, **kwargs):

-    """UpdateUIEvent_GetMode() -> wxUpdateUIMode"""
+    """UpdateUIEvent_GetMode() -> int"""

     return _core.UpdateUIEvent_GetMode(*args, **kwargs)
 
 #---------------------------------------------------------------------------
     return _core.UpdateUIEvent_GetMode(*args, **kwargs)
 
 #---------------------------------------------------------------------------


@@ -4365,12 +4353,12 @@ class IdleEvent(Event):
         return _core.IdleEvent_MoreRequested(*args, **kwargs)
 
     def SetMode(*args, **kwargs):
         return _core.IdleEvent_MoreRequested(*args, **kwargs)
 
     def SetMode(*args, **kwargs):

-        """IdleEvent.SetMode(wxIdleMode mode)"""
+        """IdleEvent.SetMode(int mode)"""

         return _core.IdleEvent_SetMode(*args, **kwargs)
 
     SetMode = staticmethod(SetMode)
     def GetMode(*args, **kwargs):
         return _core.IdleEvent_SetMode(*args, **kwargs)
 
     SetMode = staticmethod(SetMode)
     def GetMode(*args, **kwargs):

-        """IdleEvent.GetMode() -> wxIdleMode"""
+        """IdleEvent.GetMode() -> int"""

         return _core.IdleEvent_GetMode(*args, **kwargs)
 
     GetMode = staticmethod(GetMode)
         return _core.IdleEvent_GetMode(*args, **kwargs)
 
     GetMode = staticmethod(GetMode)


@@ -4388,11 +4376,11 @@ class IdleEventPtr(IdleEvent):
 _core.IdleEvent_swigregister(IdleEventPtr)
 
 def IdleEvent_SetMode(*args, **kwargs):
 _core.IdleEvent_swigregister(IdleEventPtr)
 
 def IdleEvent_SetMode(*args, **kwargs):

-    """IdleEvent_SetMode(wxIdleMode mode)"""
+    """IdleEvent_SetMode(int mode)"""

     return _core.IdleEvent_SetMode(*args, **kwargs)
 
 def IdleEvent_GetMode(*args, **kwargs):
     return _core.IdleEvent_SetMode(*args, **kwargs)
 
 def IdleEvent_GetMode(*args, **kwargs):

-    """IdleEvent_GetMode() -> wxIdleMode"""
+    """IdleEvent_GetMode() -> int"""

     return _core.IdleEvent_GetMode(*args, **kwargs)
 
 def IdleEvent_CanSend(*args, **kwargs):
     return _core.IdleEvent_GetMode(*args, **kwargs)
 
 def IdleEvent_CanSend(*args, **kwargs):


@@ -4499,7 +4487,7 @@ class PyApp(EvtHandler):
 
     def GetAppName(*args, **kwargs):
         """
 
     def GetAppName(*args, **kwargs):
         """

-        GetAppName() -> wxString
+        GetAppName() -> String

 
         Get the application name.
         """
 
         Get the application name.
         """


@@ -4507,16 +4495,16 @@ class PyApp(EvtHandler):
 
     def SetAppName(*args, **kwargs):
         """
 
     def SetAppName(*args, **kwargs):
         """

-        SetAppName(wxString name)
+        SetAppName(String name)

 
         Set the application name. This value may be used automatically
 
         Set the application name. This value may be used automatically

-        by wxConfig and such.
+        by wx.Config and such.

         """
         return _core.PyApp_SetAppName(*args, **kwargs)
 
     def GetClassName(*args, **kwargs):
         """
         """
         return _core.PyApp_SetAppName(*args, **kwargs)
 
     def GetClassName(*args, **kwargs):
         """

-        GetClassName() -> wxString
+        GetClassName() -> String

 
         Get the application's class name.
         """
 
         Get the application's class name.
         """


@@ -4524,7 +4512,7 @@ class PyApp(EvtHandler):
 
     def SetClassName(*args, **kwargs):
         """
 
     def SetClassName(*args, **kwargs):
         """

-        SetClassName(wxString name)
+        SetClassName(String name)

 
         Set the application's class name. This value may be used for X-resources if
         applicable for the platform
 
         Set the application's class name. This value may be used for X-resources if
         applicable for the platform


@@ -4533,7 +4521,7 @@ class PyApp(EvtHandler):
 
     def GetVendorName(*args, **kwargs):
         """
 
     def GetVendorName(*args, **kwargs):
         """

-        GetVendorName() -> wxString
+        GetVendorName() -> String

 
         Get the application's vendor name.
         """
 
         Get the application's vendor name.
         """


@@ -4541,10 +4529,10 @@ class PyApp(EvtHandler):
 
     def SetVendorName(*args, **kwargs):
         """
 
     def SetVendorName(*args, **kwargs):
         """

-        SetVendorName(wxString name)
+        SetVendorName(String name)

 
         Set the application's vendor name. This value may be used automatically
 
         Set the application's vendor name. This value may be used automatically

-        by wxConfig and such.
+        by wx.Config and such.

         """
         return _core.PyApp_SetVendorName(*args, **kwargs)
 
         """
         return _core.PyApp_SetVendorName(*args, **kwargs)
 


@@ -4555,7 +4543,7 @@ class PyApp(EvtHandler):
         Create the app traits object to which we delegate for everything which either
         should be configurable by the user (then he can change the default behaviour
         simply by overriding CreateTraits() and returning his own traits object) or
         Create the app traits object to which we delegate for everything which either
         should be configurable by the user (then he can change the default behaviour
         simply by overriding CreateTraits() and returning his own traits object) or

-        which is GUI/console dependent as then wxAppTraits allows us to abstract the
+        which is GUI/console dependent as then wx.AppTraits allows us to abstract the

         differences behind the common facade
         """
         return _core.PyApp_GetTraits(*args, **kwargs)
         differences behind the common facade
         """
         return _core.PyApp_GetTraits(*args, **kwargs)


@@ -4564,7 +4552,7 @@ class PyApp(EvtHandler):
         """
         ProcessPendingEvents()
 
         """
         ProcessPendingEvents()
 

-        Process all events in the wxPendingEvents list -- it is necessary to call this
+        Process all events in the Pending Events list -- it is necessary to call this

         function to process posted events. This happens during each event loop
         iteration.
         """
         function to process posted events. This happens during each event loop
         iteration.
         """


@@ -4734,10 +4722,10 @@ class PyApp(EvtHandler):
         Set the OnAssert behaviour for debug and hybrid builds.  The following flags
         may be or'd together:
 
         Set the OnAssert behaviour for debug and hybrid builds.  The following flags
         may be or'd together:
 

-         wxPYAPP_ASSERT_SUPPRESS         Don't do anything
-         wxPYAPP_ASSERT_EXCEPTION        Turn it into a Python exception if possible (default)
-         wxPYAPP_ASSERT_DIALOG           Display a message dialog
-         wxPYAPP_ASSERT_LOG              Write the assertion info to the wxLog
+         wx.PYAPP_ASSERT_SUPPRESS         Don't do anything
+         wx.PYAPP_ASSERT_EXCEPTION        Turn it into a Python exception if possible (default)
+         wx.PYAPP_ASSERT_DIALOG           Display a message dialog
+         wx.PYAPP_ASSERT_LOG              Write the assertion info to the wx.Log

 
         """
         return _core.PyApp_SetAssertMode(*args, **kwargs)
 
         """
         return _core.PyApp_SetAssertMode(*args, **kwargs)


@@ -4771,7 +4759,7 @@ class PyApp(EvtHandler):
 
     GetMacExitMenuItemId = staticmethod(GetMacExitMenuItemId)
     def GetMacHelpMenuTitleName(*args, **kwargs):
 
     GetMacExitMenuItemId = staticmethod(GetMacExitMenuItemId)
     def GetMacHelpMenuTitleName(*args, **kwargs):

-        """PyApp.GetMacHelpMenuTitleName() -> wxString"""
+        """PyApp.GetMacHelpMenuTitleName() -> String"""

         return _core.PyApp_GetMacHelpMenuTitleName(*args, **kwargs)
 
     GetMacHelpMenuTitleName = staticmethod(GetMacHelpMenuTitleName)
         return _core.PyApp_GetMacHelpMenuTitleName(*args, **kwargs)
 
     GetMacHelpMenuTitleName = staticmethod(GetMacHelpMenuTitleName)


@@ -4796,7 +4784,7 @@ class PyApp(EvtHandler):
 
     SetMacExitMenuItemId = staticmethod(SetMacExitMenuItemId)
     def SetMacHelpMenuTitleName(*args, **kwargs):
 
     SetMacExitMenuItemId = staticmethod(SetMacExitMenuItemId)
     def SetMacHelpMenuTitleName(*args, **kwargs):

-        """PyApp.SetMacHelpMenuTitleName(wxString val)"""
+        """PyApp.SetMacHelpMenuTitleName(String val)"""

         return _core.PyApp_SetMacHelpMenuTitleName(*args, **kwargs)
 
     SetMacHelpMenuTitleName = staticmethod(SetMacHelpMenuTitleName)
         return _core.PyApp_SetMacHelpMenuTitleName(*args, **kwargs)
 
     SetMacHelpMenuTitleName = staticmethod(SetMacHelpMenuTitleName)


@@ -4843,7 +4831,7 @@ def PyApp_GetMacExitMenuItemId(*args, **kwargs):
     return _core.PyApp_GetMacExitMenuItemId(*args, **kwargs)
 
 def PyApp_GetMacHelpMenuTitleName(*args, **kwargs):
     return _core.PyApp_GetMacExitMenuItemId(*args, **kwargs)
 
 def PyApp_GetMacHelpMenuTitleName(*args, **kwargs):

-    """PyApp_GetMacHelpMenuTitleName() -> wxString"""
+    """PyApp_GetMacHelpMenuTitleName() -> String"""

     return _core.PyApp_GetMacHelpMenuTitleName(*args, **kwargs)
 
 def PyApp_SetMacSupportPCMenuShortcuts(*args, **kwargs):
     return _core.PyApp_GetMacHelpMenuTitleName(*args, **kwargs)
 
 def PyApp_SetMacSupportPCMenuShortcuts(*args, **kwargs):


@@ -4863,7 +4851,7 @@ def PyApp_SetMacExitMenuItemId(*args, **kwargs):
     return _core.PyApp_SetMacExitMenuItemId(*args, **kwargs)
 
 def PyApp_SetMacHelpMenuTitleName(*args, **kwargs):
     return _core.PyApp_SetMacExitMenuItemId(*args, **kwargs)
 
 def PyApp_SetMacHelpMenuTitleName(*args, **kwargs):

-    """PyApp_SetMacHelpMenuTitleName(wxString val)"""
+    """PyApp_SetMacHelpMenuTitleName(String val)"""

     return _core.PyApp_SetMacHelpMenuTitleName(*args, **kwargs)
 
 def PyApp_GetComCtl32Version(*args, **kwargs):
     return _core.PyApp_SetMacHelpMenuTitleName(*args, **kwargs)
 
 def PyApp_GetComCtl32Version(*args, **kwargs):


@@ -4943,7 +4931,7 @@ def GetApp(*args, **kwargs):
     """
     GetApp() -> PyApp
 
     """
     GetApp() -> PyApp
 

-    Return a reference to the current wxApp object.
+    Return a reference to the current wx.App object.

     """
     return _core.GetApp(*args, **kwargs)
 #----------------------------------------------------------------------
     """
     return _core.GetApp(*args, **kwargs)
 #----------------------------------------------------------------------


@@ -4968,8 +4956,8 @@ class PyOnDemandOutputWindow:
     def CreateOutputWindow(self, st):
         self.frame = wx.Frame(self.parent, -1, self.title,
                               style=wx.DEFAULT_FRAME_STYLE | wx.NO_FULL_REPAINT_ON_RESIZE)
     def CreateOutputWindow(self, st):
         self.frame = wx.Frame(self.parent, -1, self.title,
                               style=wx.DEFAULT_FRAME_STYLE | wx.NO_FULL_REPAINT_ON_RESIZE)

-        self.text  = wxTextCtrl(self.frame, -1, "",
-                                style = wx.TE_MULTILINE | wx.TE_READONLY)
+        self.text  = wx.TextCtrl(self.frame, -1, "",
+                                 style = wx.TE_MULTILINE | wx.TE_READONLY)

         self.frame.SetSize((450, 300))
         self.frame.Show(True)
         EVT_CLOSE(self.frame, self.OnCloseWindow)
         self.frame.SetSize((450, 300))
         self.frame.Show(True)
         EVT_CLOSE(self.frame, self.OnCloseWindow)


@@ -5127,7 +5115,7 @@ class PyWidgetTester(wx.App):
         wx.App.__init__(self, 0)
 
     def OnInit(self):
         wx.App.__init__(self, 0)
 
     def OnInit(self):

-        self.frame = wxFrame(None, -1, "Widget Tester", pos=(0,0), size=self.size)
+        self.frame = wx.Frame(None, -1, "Widget Tester", pos=(0,0), size=self.size)

         self.SetTopWindow(self.frame)
         return True
 
         self.SetTopWindow(self.frame)
         return True
 


@@ -5242,7 +5230,7 @@ _core.AcceleratorTable_swigregister(AcceleratorTablePtr)
 
 
 def GetAccelFromString(*args, **kwargs):
 
 
 def GetAccelFromString(*args, **kwargs):

-    """GetAccelFromString(wxString label) -> AcceleratorEntry"""
+    """GetAccelFromString(String label) -> AcceleratorEntry"""

     return _core.GetAccelFromString(*args, **kwargs)
 #---------------------------------------------------------------------------
 
     return _core.GetAccelFromString(*args, **kwargs)
 #---------------------------------------------------------------------------
 


@@ -5252,7 +5240,7 @@ class Window(EvtHandler):
     def __init__(self, *args, **kwargs):
         """
         __init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
     def __init__(self, *args, **kwargs):
         """
         __init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 

-            long style=0, wxString name=PanelNameStr) -> Window
+            long style=0, String name=PanelNameStr) -> Window

         """
         newobj = _core.new_Window(*args, **kwargs)
         self.this = newobj.this
         """
         newobj = _core.new_Window(*args, **kwargs)
         self.this = newobj.this


@@ -5263,7 +5251,7 @@ class Window(EvtHandler):
     def Create(*args, **kwargs):
         """
         Create(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
     def Create(*args, **kwargs):
         """
         Create(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 

-            long style=0, wxString name=PanelNameStr) -> bool
+            long style=0, String name=PanelNameStr) -> bool

         """
         return _core.Window_Create(*args, **kwargs)
 
         """
         return _core.Window_Create(*args, **kwargs)
 


@@ -5288,27 +5276,27 @@ class Window(EvtHandler):
         return _core.Window_IsBeingDeleted(*args, **kwargs)
 
     def SetTitle(*args, **kwargs):
         return _core.Window_IsBeingDeleted(*args, **kwargs)
 
     def SetTitle(*args, **kwargs):

-        """SetTitle(wxString title)"""
+        """SetTitle(String title)"""

         return _core.Window_SetTitle(*args, **kwargs)
 
     def GetTitle(*args, **kwargs):
         return _core.Window_SetTitle(*args, **kwargs)
 
     def GetTitle(*args, **kwargs):

-        """GetTitle() -> wxString"""
+        """GetTitle() -> String"""

         return _core.Window_GetTitle(*args, **kwargs)
 
     def SetLabel(*args, **kwargs):
         return _core.Window_GetTitle(*args, **kwargs)
 
     def SetLabel(*args, **kwargs):

-        """SetLabel(wxString label)"""
+        """SetLabel(String label)"""

         return _core.Window_SetLabel(*args, **kwargs)
 
     def GetLabel(*args, **kwargs):
         return _core.Window_SetLabel(*args, **kwargs)
 
     def GetLabel(*args, **kwargs):

-        """GetLabel() -> wxString"""
+        """GetLabel() -> String"""

         return _core.Window_GetLabel(*args, **kwargs)
 
     def SetName(*args, **kwargs):
         return _core.Window_GetLabel(*args, **kwargs)
 
     def SetName(*args, **kwargs):

-        """SetName(wxString name)"""
+        """SetName(String name)"""

         return _core.Window_SetName(*args, **kwargs)
 
     def GetName(*args, **kwargs):
         return _core.Window_SetName(*args, **kwargs)
 
     def GetName(*args, **kwargs):

-        """GetName() -> wxString"""
+        """GetName() -> String"""

         return _core.Window_GetName(*args, **kwargs)
 
     def SetId(*args, **kwargs):
         return _core.Window_GetName(*args, **kwargs)
 
     def SetId(*args, **kwargs):


@@ -5697,7 +5685,7 @@ class Window(EvtHandler):
         return _core.Window_FindWindowById(*args, **kwargs)
 
     def FindWindowByName(*args, **kwargs):
         return _core.Window_FindWindowById(*args, **kwargs)
 
     def FindWindowByName(*args, **kwargs):

-        """FindWindowByName(wxString name) -> Window"""
+        """FindWindowByName(String name) -> Window"""

         return _core.Window_FindWindowByName(*args, **kwargs)
 
     def GetEventHandler(*args, **kwargs):
         return _core.Window_FindWindowByName(*args, **kwargs)
 
     def GetEventHandler(*args, **kwargs):


@@ -5814,11 +5802,11 @@ class Window(EvtHandler):
         return _core.Window_Thaw(*args, **kwargs)
 
     def PrepareDC(*args, **kwargs):
         return _core.Window_Thaw(*args, **kwargs)
 
     def PrepareDC(*args, **kwargs):

-        """PrepareDC(wxDC dc)"""
+        """PrepareDC(DC dc)"""

         return _core.Window_PrepareDC(*args, **kwargs)
 
     def GetUpdateRegion(*args, **kwargs):
         return _core.Window_PrepareDC(*args, **kwargs)
 
     def GetUpdateRegion(*args, **kwargs):

-        """GetUpdateRegion() -> wxRegion"""
+        """GetUpdateRegion() -> Region"""

         return _core.Window_GetUpdateRegion(*args, **kwargs)
 
     def GetUpdateClientRect(*args, **kwargs):
         return _core.Window_GetUpdateRegion(*args, **kwargs)
 
     def GetUpdateClientRect(*args, **kwargs):


@@ -5838,43 +5826,43 @@ class Window(EvtHandler):
         return _core.Window_isExposedRect(*args, **kwargs)
 
     def SetBackgroundColour(*args, **kwargs):
         return _core.Window_isExposedRect(*args, **kwargs)
 
     def SetBackgroundColour(*args, **kwargs):

-        """SetBackgroundColour(wxColour colour) -> bool"""
+        """SetBackgroundColour(Colour colour) -> bool"""

         return _core.Window_SetBackgroundColour(*args, **kwargs)
 
     def SetForegroundColour(*args, **kwargs):
         return _core.Window_SetBackgroundColour(*args, **kwargs)
 
     def SetForegroundColour(*args, **kwargs):

-        """SetForegroundColour(wxColour colour) -> bool"""
+        """SetForegroundColour(Colour colour) -> bool"""

         return _core.Window_SetForegroundColour(*args, **kwargs)
 
     def GetBackgroundColour(*args, **kwargs):
         return _core.Window_SetForegroundColour(*args, **kwargs)
 
     def GetBackgroundColour(*args, **kwargs):

-        """GetBackgroundColour() -> wxColour"""
+        """GetBackgroundColour() -> Colour"""

         return _core.Window_GetBackgroundColour(*args, **kwargs)
 
     def GetForegroundColour(*args, **kwargs):
         return _core.Window_GetBackgroundColour(*args, **kwargs)
 
     def GetForegroundColour(*args, **kwargs):

-        """GetForegroundColour() -> wxColour"""
+        """GetForegroundColour() -> Colour"""

         return _core.Window_GetForegroundColour(*args, **kwargs)
 
     def SetCursor(*args, **kwargs):
         return _core.Window_GetForegroundColour(*args, **kwargs)
 
     def SetCursor(*args, **kwargs):

-        """SetCursor(wxCursor cursor) -> bool"""
+        """SetCursor(Cursor cursor) -> bool"""

         return _core.Window_SetCursor(*args, **kwargs)
 
     def GetCursor(*args, **kwargs):
         return _core.Window_SetCursor(*args, **kwargs)
 
     def GetCursor(*args, **kwargs):

-        """GetCursor() -> wxCursor"""
+        """GetCursor() -> Cursor"""

         return _core.Window_GetCursor(*args, **kwargs)
 
     def SetFont(*args, **kwargs):
         return _core.Window_GetCursor(*args, **kwargs)
 
     def SetFont(*args, **kwargs):

-        """SetFont(wxFont font) -> bool"""
+        """SetFont(Font font) -> bool"""

         return _core.Window_SetFont(*args, **kwargs)
 
     def GetFont(*args, **kwargs):
         return _core.Window_SetFont(*args, **kwargs)
 
     def GetFont(*args, **kwargs):

-        """GetFont() -> wxFont"""
+        """GetFont() -> Font"""

         return _core.Window_GetFont(*args, **kwargs)
 
     def SetCaret(*args, **kwargs):
         return _core.Window_GetFont(*args, **kwargs)
 
     def SetCaret(*args, **kwargs):

-        """SetCaret(wxCaret caret)"""
+        """SetCaret(Caret caret)"""

         return _core.Window_SetCaret(*args, **kwargs)
 
     def GetCaret(*args, **kwargs):
         return _core.Window_SetCaret(*args, **kwargs)
 
     def GetCaret(*args, **kwargs):

-        """GetCaret() -> wxCaret"""
+        """GetCaret() -> Caret"""

         return _core.Window_GetCaret(*args, **kwargs)
 
     def GetCharHeight(*args, **kwargs):
         return _core.Window_GetCaret(*args, **kwargs)
 
     def GetCharHeight(*args, **kwargs):


@@ -5887,7 +5875,7 @@ class Window(EvtHandler):
 
     def GetTextExtent(*args, **kwargs):
         """
 
     def GetTextExtent(*args, **kwargs):
         """

-        GetTextExtent(wxString string) -> (width, height)
+        GetTextExtent(String string) -> (width, height)

 
         Get the width and height of the text using the current font.
         """
 
         Get the width and height of the text using the current font.
         """


@@ -5895,7 +5883,7 @@ class Window(EvtHandler):
 
     def GetFullTextExtent(*args, **kwargs):
         """
 
     def GetFullTextExtent(*args, **kwargs):
         """

-        GetFullTextExtent(wxString string, Font font=None) ->
+        GetFullTextExtent(String string, Font font=None) ->

            (width, height, descent, externalLeading)
 
         Get the width, height, decent and leading of the text using the current or specified font.
            (width, height, descent, externalLeading)
 
         Get the width, height, decent and leading of the text using the current or specified font.


@@ -5919,19 +5907,19 @@ class Window(EvtHandler):
         return _core.Window_ScreenToClient(*args, **kwargs)
 
     def HitTestXY(*args, **kwargs):
         return _core.Window_ScreenToClient(*args, **kwargs)
 
     def HitTestXY(*args, **kwargs):

-        """HitTestXY(int x, int y) -> wxHitTest"""
+        """HitTestXY(int x, int y) -> int"""

         return _core.Window_HitTestXY(*args, **kwargs)
 
     def HitTest(*args, **kwargs):
         return _core.Window_HitTestXY(*args, **kwargs)
 
     def HitTest(*args, **kwargs):

-        """HitTest(Point pt) -> wxHitTest"""
+        """HitTest(Point pt) -> int"""

         return _core.Window_HitTest(*args, **kwargs)
 
     def GetBorderFlags(*args, **kwargs):
         return _core.Window_HitTest(*args, **kwargs)
 
     def GetBorderFlags(*args, **kwargs):

-        """GetBorderFlags(long flags) -> wxBorder"""
+        """GetBorderFlags(long flags) -> int"""

         return _core.Window_GetBorderFlags(*args, **kwargs)
 
     def GetBorder(*args, **kwargs):
         return _core.Window_GetBorderFlags(*args, **kwargs)
 
     def GetBorder(*args, **kwargs):

-        """GetBorder() -> wxBorder"""
+        """GetBorder() -> int"""

         return _core.Window_GetBorder(*args, **kwargs)
 
     def UpdateWindowUI(*args, **kwargs):
         return _core.Window_GetBorder(*args, **kwargs)
 
     def UpdateWindowUI(*args, **kwargs):


@@ -6003,37 +5991,37 @@ class Window(EvtHandler):
         return _core.Window_PageDown(*args, **kwargs)
 
     def SetHelpText(*args, **kwargs):
         return _core.Window_PageDown(*args, **kwargs)
 
     def SetHelpText(*args, **kwargs):

-        """SetHelpText(wxString text)"""
+        """SetHelpText(String text)"""

         return _core.Window_SetHelpText(*args, **kwargs)
 
     def SetHelpTextForId(*args, **kwargs):
         return _core.Window_SetHelpText(*args, **kwargs)
 
     def SetHelpTextForId(*args, **kwargs):

-        """SetHelpTextForId(wxString text)"""
+        """SetHelpTextForId(String text)"""

         return _core.Window_SetHelpTextForId(*args, **kwargs)
 
     def GetHelpText(*args, **kwargs):
         return _core.Window_SetHelpTextForId(*args, **kwargs)
 
     def GetHelpText(*args, **kwargs):

-        """GetHelpText() -> wxString"""
+        """GetHelpText() -> String"""

         return _core.Window_GetHelpText(*args, **kwargs)
 
     def SetToolTipString(*args, **kwargs):
         return _core.Window_GetHelpText(*args, **kwargs)
 
     def SetToolTipString(*args, **kwargs):

-        """SetToolTipString(wxString tip)"""
+        """SetToolTipString(String tip)"""

         return _core.Window_SetToolTipString(*args, **kwargs)
 
     def SetToolTip(*args, **kwargs):
         return _core.Window_SetToolTipString(*args, **kwargs)
 
     def SetToolTip(*args, **kwargs):

-        """SetToolTip(wxToolTip tip)"""
+        """SetToolTip(ToolTip tip)"""

         return _core.Window_SetToolTip(*args, **kwargs)
 
     def GetToolTip(*args, **kwargs):
         return _core.Window_SetToolTip(*args, **kwargs)
 
     def GetToolTip(*args, **kwargs):

-        """GetToolTip() -> wxToolTip"""
+        """GetToolTip() -> ToolTip"""

         return _core.Window_GetToolTip(*args, **kwargs)
 
     def SetDropTarget(*args, **kwargs):
         return _core.Window_GetToolTip(*args, **kwargs)
 
     def SetDropTarget(*args, **kwargs):

-        """SetDropTarget(wxPyDropTarget dropTarget)"""
+        """SetDropTarget(PyDropTarget dropTarget)"""

         val = _core.Window_SetDropTarget(*args, **kwargs)
         args[1].thisown = 0
         return val
 
     def GetDropTarget(*args, **kwargs):
         val = _core.Window_SetDropTarget(*args, **kwargs)
         args[1].thisown = 0
         return val
 
     def GetDropTarget(*args, **kwargs):

-        """GetDropTarget() -> wxPyDropTarget"""
+        """GetDropTarget() -> PyDropTarget"""

         return _core.Window_GetDropTarget(*args, **kwargs)
 
     def SetConstraints(*args, **kwargs):
         return _core.Window_GetDropTarget(*args, **kwargs)
 
     def SetConstraints(*args, **kwargs):


@@ -6141,11 +6129,11 @@ def FindWindowById(*args, **kwargs):
     return _core.FindWindowById(*args, **kwargs)
 
 def FindWindowByName(*args, **kwargs):
     return _core.FindWindowById(*args, **kwargs)
 
 def FindWindowByName(*args, **kwargs):

-    """FindWindowByName(wxString name, Window parent=None) -> Window"""
+    """FindWindowByName(String name, Window parent=None) -> Window"""

     return _core.FindWindowByName(*args, **kwargs)
 
 def FindWindowByLabel(*args, **kwargs):
     return _core.FindWindowByName(*args, **kwargs)
 
 def FindWindowByLabel(*args, **kwargs):

-    """FindWindowByLabel(wxString label, Window parent=None) -> Window"""
+    """FindWindowByLabel(String label, Window parent=None) -> Window"""

     return _core.FindWindowByLabel(*args, **kwargs)
 
 def Window_FromHWND(*args, **kwargs):
     return _core.FindWindowByLabel(*args, **kwargs)
 
 def Window_FromHWND(*args, **kwargs):


@@ -6245,7 +6233,7 @@ class Menu(EvtHandler):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxMenu instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxMenu instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):

-        """__init__(wxString title=wxPyEmptyString, long style=0) -> Menu"""
+        """__init__(String title=EmptyString, long style=0) -> Menu"""

         newobj = _core.new_Menu(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         newobj = _core.new_Menu(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1


@@ -6253,10 +6241,7 @@ class Menu(EvtHandler):
         self._setOORInfo(self)
 
     def Append(*args, **kwargs):
         self._setOORInfo(self)
 
     def Append(*args, **kwargs):

-        """
-        Append(int id, wxString text, wxString help=wxPyEmptyString, 
-            wxItemKind kind=ITEM_NORMAL)
-        """
+        """Append(int id, String text, String help=EmptyString, int kind=ITEM_NORMAL)"""

         return _core.Menu_Append(*args, **kwargs)
 
     def AppendSeparator(*args, **kwargs):
         return _core.Menu_Append(*args, **kwargs)
 
     def AppendSeparator(*args, **kwargs):


@@ -6264,15 +6249,15 @@ class Menu(EvtHandler):
         return _core.Menu_AppendSeparator(*args, **kwargs)
 
     def AppendCheckItem(*args, **kwargs):
         return _core.Menu_AppendSeparator(*args, **kwargs)
 
     def AppendCheckItem(*args, **kwargs):

-        """AppendCheckItem(int id, wxString text, wxString help=wxPyEmptyString)"""
+        """AppendCheckItem(int id, String text, String help=EmptyString)"""

         return _core.Menu_AppendCheckItem(*args, **kwargs)
 
     def AppendRadioItem(*args, **kwargs):
         return _core.Menu_AppendCheckItem(*args, **kwargs)
 
     def AppendRadioItem(*args, **kwargs):

-        """AppendRadioItem(int id, wxString text, wxString help=wxPyEmptyString)"""
+        """AppendRadioItem(int id, String text, String help=EmptyString)"""

         return _core.Menu_AppendRadioItem(*args, **kwargs)
 
     def AppendMenu(*args, **kwargs):
         return _core.Menu_AppendRadioItem(*args, **kwargs)
 
     def AppendMenu(*args, **kwargs):

-        """AppendMenu(int id, wxString text, Menu submenu, wxString help=wxPyEmptyString)"""
+        """AppendMenu(int id, String text, Menu submenu, String help=EmptyString)"""

         return _core.Menu_AppendMenu(*args, **kwargs)
 
     def AppendItem(*args, **kwargs):
         return _core.Menu_AppendMenu(*args, **kwargs)
 
     def AppendItem(*args, **kwargs):


@@ -6289,8 +6274,8 @@ class Menu(EvtHandler):
 
     def Insert(*args, **kwargs):
         """
 
     def Insert(*args, **kwargs):
         """

-        Insert(size_t pos, int id, wxString text, wxString help=wxPyEmptyString, 
-            wxItemKind kind=ITEM_NORMAL)
+        Insert(size_t pos, int id, String text, String help=EmptyString, 
+            int kind=ITEM_NORMAL)

         """
         return _core.Menu_Insert(*args, **kwargs)
 
         """
         return _core.Menu_Insert(*args, **kwargs)
 


@@ -6299,15 +6284,15 @@ class Menu(EvtHandler):
         return _core.Menu_InsertSeparator(*args, **kwargs)
 
     def InsertCheckItem(*args, **kwargs):
         return _core.Menu_InsertSeparator(*args, **kwargs)
 
     def InsertCheckItem(*args, **kwargs):

-        """InsertCheckItem(size_t pos, int id, wxString text, wxString help=wxPyEmptyString)"""
+        """InsertCheckItem(size_t pos, int id, String text, String help=EmptyString)"""

         return _core.Menu_InsertCheckItem(*args, **kwargs)
 
     def InsertRadioItem(*args, **kwargs):
         return _core.Menu_InsertCheckItem(*args, **kwargs)
 
     def InsertRadioItem(*args, **kwargs):

-        """InsertRadioItem(size_t pos, int id, wxString text, wxString help=wxPyEmptyString)"""
+        """InsertRadioItem(size_t pos, int id, String text, String help=EmptyString)"""

         return _core.Menu_InsertRadioItem(*args, **kwargs)
 
     def InsertMenu(*args, **kwargs):
         return _core.Menu_InsertRadioItem(*args, **kwargs)
 
     def InsertMenu(*args, **kwargs):

-        """InsertMenu(size_t pos, int id, wxString text, Menu submenu, wxString help=wxPyEmptyString)"""
+        """InsertMenu(size_t pos, int id, String text, Menu submenu, String help=EmptyString)"""

         return _core.Menu_InsertMenu(*args, **kwargs)
 
     def PrependItem(*args, **kwargs):
         return _core.Menu_InsertMenu(*args, **kwargs)
 
     def PrependItem(*args, **kwargs):


@@ -6315,10 +6300,7 @@ class Menu(EvtHandler):
         return _core.Menu_PrependItem(*args, **kwargs)
 
     def Prepend(*args, **kwargs):
         return _core.Menu_PrependItem(*args, **kwargs)
 
     def Prepend(*args, **kwargs):

-        """
-        Prepend(int id, wxString text, wxString help=wxPyEmptyString, 
-            wxItemKind kind=ITEM_NORMAL)
-        """
+        """Prepend(int id, String text, String help=EmptyString, int kind=ITEM_NORMAL)"""

         return _core.Menu_Prepend(*args, **kwargs)
 
     def PrependSeparator(*args, **kwargs):
         return _core.Menu_Prepend(*args, **kwargs)
 
     def PrependSeparator(*args, **kwargs):


@@ -6326,15 +6308,15 @@ class Menu(EvtHandler):
         return _core.Menu_PrependSeparator(*args, **kwargs)
 
     def PrependCheckItem(*args, **kwargs):
         return _core.Menu_PrependSeparator(*args, **kwargs)
 
     def PrependCheckItem(*args, **kwargs):

-        """PrependCheckItem(int id, wxString text, wxString help=wxPyEmptyString)"""
+        """PrependCheckItem(int id, String text, String help=EmptyString)"""

         return _core.Menu_PrependCheckItem(*args, **kwargs)
 
     def PrependRadioItem(*args, **kwargs):
         return _core.Menu_PrependCheckItem(*args, **kwargs)
 
     def PrependRadioItem(*args, **kwargs):

-        """PrependRadioItem(int id, wxString text, wxString help=wxPyEmptyString)"""
+        """PrependRadioItem(int id, String text, String help=EmptyString)"""

         return _core.Menu_PrependRadioItem(*args, **kwargs)
 
     def PrependMenu(*args, **kwargs):
         return _core.Menu_PrependRadioItem(*args, **kwargs)
 
     def PrependMenu(*args, **kwargs):

-        """PrependMenu(int id, wxString text, Menu submenu, wxString help=wxPyEmptyString)"""
+        """PrependMenu(int id, String text, Menu submenu, String help=EmptyString)"""

         return _core.Menu_PrependMenu(*args, **kwargs)
 
     def Remove(*args, **kwargs):
         return _core.Menu_PrependMenu(*args, **kwargs)
 
     def Remove(*args, **kwargs):


@@ -6386,7 +6368,7 @@ class Menu(EvtHandler):
         return _core.Menu_GetMenuItems(*args, **kwargs)
 
     def FindItem(*args, **kwargs):
         return _core.Menu_GetMenuItems(*args, **kwargs)
 
     def FindItem(*args, **kwargs):

-        """FindItem(wxString item) -> int"""
+        """FindItem(String item) -> int"""

         return _core.Menu_FindItem(*args, **kwargs)
 
     def FindItemById(*args, **kwargs):
         return _core.Menu_FindItem(*args, **kwargs)
 
     def FindItemById(*args, **kwargs):


@@ -6414,27 +6396,27 @@ class Menu(EvtHandler):
         return _core.Menu_IsChecked(*args, **kwargs)
 
     def SetLabel(*args, **kwargs):
         return _core.Menu_IsChecked(*args, **kwargs)
 
     def SetLabel(*args, **kwargs):

-        """SetLabel(int id, wxString label)"""
+        """SetLabel(int id, String label)"""

         return _core.Menu_SetLabel(*args, **kwargs)
 
     def GetLabel(*args, **kwargs):
         return _core.Menu_SetLabel(*args, **kwargs)
 
     def GetLabel(*args, **kwargs):

-        """GetLabel(int id) -> wxString"""
+        """GetLabel(int id) -> String"""

         return _core.Menu_GetLabel(*args, **kwargs)
 
     def SetHelpString(*args, **kwargs):
         return _core.Menu_GetLabel(*args, **kwargs)
 
     def SetHelpString(*args, **kwargs):

-        """SetHelpString(int id, wxString helpString)"""
+        """SetHelpString(int id, String helpString)"""

         return _core.Menu_SetHelpString(*args, **kwargs)
 
     def GetHelpString(*args, **kwargs):
         return _core.Menu_SetHelpString(*args, **kwargs)
 
     def GetHelpString(*args, **kwargs):

-        """GetHelpString(int id) -> wxString"""
+        """GetHelpString(int id) -> String"""

         return _core.Menu_GetHelpString(*args, **kwargs)
 
     def SetTitle(*args, **kwargs):
         return _core.Menu_GetHelpString(*args, **kwargs)
 
     def SetTitle(*args, **kwargs):

-        """SetTitle(wxString title)"""
+        """SetTitle(String title)"""

         return _core.Menu_SetTitle(*args, **kwargs)
 
     def GetTitle(*args, **kwargs):
         return _core.Menu_SetTitle(*args, **kwargs)
 
     def GetTitle(*args, **kwargs):

-        """GetTitle() -> wxString"""
+        """GetTitle() -> String"""

         return _core.Menu_GetTitle(*args, **kwargs)
 
     def SetEventHandler(*args, **kwargs):
         return _core.Menu_GetTitle(*args, **kwargs)
 
     def SetEventHandler(*args, **kwargs):


@@ -6508,11 +6490,11 @@ class MenuBar(Window):
         self._setOORInfo(self)
 
     def Append(*args, **kwargs):
         self._setOORInfo(self)
 
     def Append(*args, **kwargs):

-        """Append(Menu menu, wxString title) -> bool"""
+        """Append(Menu menu, String title) -> bool"""

         return _core.MenuBar_Append(*args, **kwargs)
 
     def Insert(*args, **kwargs):
         return _core.MenuBar_Append(*args, **kwargs)
 
     def Insert(*args, **kwargs):

-        """Insert(size_t pos, Menu menu, wxString title) -> bool"""
+        """Insert(size_t pos, Menu menu, String title) -> bool"""

         return _core.MenuBar_Insert(*args, **kwargs)
 
     def GetMenuCount(*args, **kwargs):
         return _core.MenuBar_Insert(*args, **kwargs)
 
     def GetMenuCount(*args, **kwargs):


@@ -6524,7 +6506,7 @@ class MenuBar(Window):
         return _core.MenuBar_GetMenu(*args, **kwargs)
 
     def Replace(*args, **kwargs):
         return _core.MenuBar_GetMenu(*args, **kwargs)
 
     def Replace(*args, **kwargs):

-        """Replace(size_t pos, Menu menu, wxString title) -> Menu"""
+        """Replace(size_t pos, Menu menu, String title) -> Menu"""

         return _core.MenuBar_Replace(*args, **kwargs)
 
     def Remove(*args, **kwargs):
         return _core.MenuBar_Replace(*args, **kwargs)
 
     def Remove(*args, **kwargs):


@@ -6540,15 +6522,15 @@ class MenuBar(Window):
         return _core.MenuBar_IsEnabledTop(*args, **kwargs)
 
     def SetLabelTop(*args, **kwargs):
         return _core.MenuBar_IsEnabledTop(*args, **kwargs)
 
     def SetLabelTop(*args, **kwargs):

-        """SetLabelTop(size_t pos, wxString label)"""
+        """SetLabelTop(size_t pos, String label)"""

         return _core.MenuBar_SetLabelTop(*args, **kwargs)
 
     def GetLabelTop(*args, **kwargs):
         return _core.MenuBar_SetLabelTop(*args, **kwargs)
 
     def GetLabelTop(*args, **kwargs):

-        """GetLabelTop(size_t pos) -> wxString"""
+        """GetLabelTop(size_t pos) -> String"""

         return _core.MenuBar_GetLabelTop(*args, **kwargs)
 
     def FindMenuItem(*args, **kwargs):
         return _core.MenuBar_GetLabelTop(*args, **kwargs)
 
     def FindMenuItem(*args, **kwargs):

-        """FindMenuItem(wxString menu, wxString item) -> int"""
+        """FindMenuItem(String menu, String item) -> int"""

         return _core.MenuBar_FindMenuItem(*args, **kwargs)
 
     def FindItemById(*args, **kwargs):
         return _core.MenuBar_FindMenuItem(*args, **kwargs)
 
     def FindItemById(*args, **kwargs):


@@ -6556,7 +6538,7 @@ class MenuBar(Window):
         return _core.MenuBar_FindItemById(*args, **kwargs)
 
     def FindMenu(*args, **kwargs):
         return _core.MenuBar_FindItemById(*args, **kwargs)
 
     def FindMenu(*args, **kwargs):

-        """FindMenu(wxString title) -> int"""
+        """FindMenu(String title) -> int"""

         return _core.MenuBar_FindMenu(*args, **kwargs)
 
     def Enable(*args, **kwargs):
         return _core.MenuBar_FindMenu(*args, **kwargs)
 
     def Enable(*args, **kwargs):


@@ -6576,19 +6558,19 @@ class MenuBar(Window):
         return _core.MenuBar_IsEnabled(*args, **kwargs)
 
     def SetLabel(*args, **kwargs):
         return _core.MenuBar_IsEnabled(*args, **kwargs)
 
     def SetLabel(*args, **kwargs):

-        """SetLabel(int id, wxString label)"""
+        """SetLabel(int id, String label)"""

         return _core.MenuBar_SetLabel(*args, **kwargs)
 
     def GetLabel(*args, **kwargs):
         return _core.MenuBar_SetLabel(*args, **kwargs)
 
     def GetLabel(*args, **kwargs):

-        """GetLabel(int id) -> wxString"""
+        """GetLabel(int id) -> String"""

         return _core.MenuBar_GetLabel(*args, **kwargs)
 
     def SetHelpString(*args, **kwargs):
         return _core.MenuBar_GetLabel(*args, **kwargs)
 
     def SetHelpString(*args, **kwargs):

-        """SetHelpString(int id, wxString helpString)"""
+        """SetHelpString(int id, String helpString)"""

         return _core.MenuBar_SetHelpString(*args, **kwargs)
 
     def GetHelpString(*args, **kwargs):
         return _core.MenuBar_SetHelpString(*args, **kwargs)
 
     def GetHelpString(*args, **kwargs):

-        """GetHelpString(int id) -> wxString"""
+        """GetHelpString(int id) -> String"""

         return _core.MenuBar_GetHelpString(*args, **kwargs)
 
     def GetFrame(*args, **kwargs):
         return _core.MenuBar_GetHelpString(*args, **kwargs)
 
     def GetFrame(*args, **kwargs):


@@ -6622,9 +6604,9 @@ class MenuItem(Object):
         return "<%s.%s; proxy of C++ wxMenuItem instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """
         return "<%s.%s; proxy of C++ wxMenuItem instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """

-        __init__(Menu parentMenu=None, int id=ID_SEPARATOR, wxString text=wxPyEmptyString, 
-            wxString help=wxPyEmptyString, 
-            wxItemKind kind=ITEM_NORMAL, Menu subMenu=None) -> MenuItem
+        __init__(Menu parentMenu=None, int id=ID_SEPARATOR, String text=EmptyString, 
+            String help=EmptyString, int kind=ITEM_NORMAL, 
+            Menu subMenu=None) -> MenuItem

         """
         newobj = _core.new_MenuItem(*args, **kwargs)
         self.this = newobj.this
         """
         newobj = _core.new_MenuItem(*args, **kwargs)
         self.this = newobj.this


@@ -6651,24 +6633,24 @@ class MenuItem(Object):
         return _core.MenuItem_IsSeparator(*args, **kwargs)
 
     def SetText(*args, **kwargs):
         return _core.MenuItem_IsSeparator(*args, **kwargs)
 
     def SetText(*args, **kwargs):

-        """SetText(wxString str)"""
+        """SetText(String str)"""

         return _core.MenuItem_SetText(*args, **kwargs)
 
     def GetLabel(*args, **kwargs):
         return _core.MenuItem_SetText(*args, **kwargs)
 
     def GetLabel(*args, **kwargs):

-        """GetLabel() -> wxString"""
+        """GetLabel() -> String"""

         return _core.MenuItem_GetLabel(*args, **kwargs)
 
     def GetText(*args, **kwargs):
         return _core.MenuItem_GetLabel(*args, **kwargs)
 
     def GetText(*args, **kwargs):

-        """GetText() -> wxString"""
+        """GetText() -> String"""

         return _core.MenuItem_GetText(*args, **kwargs)
 
     def GetLabelFromText(*args, **kwargs):
         return _core.MenuItem_GetText(*args, **kwargs)
 
     def GetLabelFromText(*args, **kwargs):

-        """MenuItem.GetLabelFromText(wxString text) -> wxString"""
+        """MenuItem.GetLabelFromText(String text) -> String"""

         return _core.MenuItem_GetLabelFromText(*args, **kwargs)
 
     GetLabelFromText = staticmethod(GetLabelFromText)
     def GetKind(*args, **kwargs):
         return _core.MenuItem_GetLabelFromText(*args, **kwargs)
 
     GetLabelFromText = staticmethod(GetLabelFromText)
     def GetKind(*args, **kwargs):

-        """GetKind() -> wxItemKind"""
+        """GetKind() -> int"""

         return _core.MenuItem_GetKind(*args, **kwargs)
 
     def SetCheckable(*args, **kwargs):
         return _core.MenuItem_GetKind(*args, **kwargs)
 
     def SetCheckable(*args, **kwargs):


@@ -6712,11 +6694,11 @@ class MenuItem(Object):
         return _core.MenuItem_Toggle(*args, **kwargs)
 
     def SetHelp(*args, **kwargs):
         return _core.MenuItem_Toggle(*args, **kwargs)
 
     def SetHelp(*args, **kwargs):

-        """SetHelp(wxString str)"""
+        """SetHelp(String str)"""

         return _core.MenuItem_SetHelp(*args, **kwargs)
 
     def GetHelp(*args, **kwargs):
         return _core.MenuItem_SetHelp(*args, **kwargs)
 
     def GetHelp(*args, **kwargs):

-        """GetHelp() -> wxString"""
+        """GetHelp() -> String"""

         return _core.MenuItem_GetHelp(*args, **kwargs)
 
     def GetAccel(*args, **kwargs):
         return _core.MenuItem_GetHelp(*args, **kwargs)
 
     def GetAccel(*args, **kwargs):


@@ -6733,11 +6715,11 @@ class MenuItem(Object):
 
     GetDefaultMarginWidth = staticmethod(GetDefaultMarginWidth)
     def SetBitmap(*args, **kwargs):
 
     GetDefaultMarginWidth = staticmethod(GetDefaultMarginWidth)
     def SetBitmap(*args, **kwargs):

-        """SetBitmap(wxBitmap bitmap)"""
+        """SetBitmap(Bitmap bitmap)"""

         return _core.MenuItem_SetBitmap(*args, **kwargs)
 
     def GetBitmap(*args, **kwargs):
         return _core.MenuItem_SetBitmap(*args, **kwargs)
 
     def GetBitmap(*args, **kwargs):

-        """GetBitmap() -> wxBitmap"""
+        """GetBitmap() -> Bitmap"""

         return _core.MenuItem_GetBitmap(*args, **kwargs)
 
 
         return _core.MenuItem_GetBitmap(*args, **kwargs)
 
 


@@ -6749,7 +6731,7 @@ class MenuItemPtr(MenuItem):
 _core.MenuItem_swigregister(MenuItemPtr)
 
 def MenuItem_GetLabelFromText(*args, **kwargs):
 _core.MenuItem_swigregister(MenuItemPtr)
 
 def MenuItem_GetLabelFromText(*args, **kwargs):

-    """MenuItem_GetLabelFromText(wxString text) -> wxString"""
+    """MenuItem_GetLabelFromText(String text) -> String"""

     return _core.MenuItem_GetLabelFromText(*args, **kwargs)
 
 def MenuItem_GetDefaultMarginWidth(*args, **kwargs):
     return _core.MenuItem_GetLabelFromText(*args, **kwargs)
 
 def MenuItem_GetDefaultMarginWidth(*args, **kwargs):


@@ -6765,7 +6747,7 @@ class Control(Window):
         """
         __init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
             long style=0, Validator validator=DefaultValidator, 
         """
         __init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
             long style=0, Validator validator=DefaultValidator, 

-            wxString name=wxPyControlNameStr) -> Control
+            String name=wxPyControlNameStr) -> Control

         """
         newobj = _core.new_Control(*args, **kwargs)
         self.this = newobj.this
         """
         newobj = _core.new_Control(*args, **kwargs)
         self.this = newobj.this


@@ -6777,7 +6759,7 @@ class Control(Window):
         """
         Create(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
             long style=0, Validator validator=DefaultValidator, 
         """
         Create(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
             long style=0, Validator validator=DefaultValidator, 

-            wxString name=wxPyControlNameStr) -> bool
+            String name=wxPyControlNameStr) -> bool

         """
         return _core.Control_Create(*args, **kwargs)
 
         """
         return _core.Control_Create(*args, **kwargs)
 


@@ -6786,11 +6768,11 @@ class Control(Window):
         return _core.Control_Command(*args, **kwargs)
 
     def GetLabel(*args, **kwargs):
         return _core.Control_Command(*args, **kwargs)
 
     def GetLabel(*args, **kwargs):

-        """GetLabel() -> wxString"""
+        """GetLabel() -> String"""

         return _core.Control_GetLabel(*args, **kwargs)
 
     def SetLabel(*args, **kwargs):
         return _core.Control_GetLabel(*args, **kwargs)
 
     def SetLabel(*args, **kwargs):

-        """SetLabel(wxString label)"""
+        """SetLabel(String label)"""

         return _core.Control_SetLabel(*args, **kwargs)
 
 
         return _core.Control_SetLabel(*args, **kwargs)
 
 


@@ -6814,7 +6796,7 @@ class ItemContainer(object):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxItemContainer instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def Append(*args, **kwargs):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxItemContainer instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def Append(*args, **kwargs):

-        """Append(wxString item, PyObject clientData=None) -> int"""
+        """Append(String item, PyObject clientData=None) -> int"""

         return _core.ItemContainer_Append(*args, **kwargs)
 
     def AppendItems(*args, **kwargs):
         return _core.ItemContainer_Append(*args, **kwargs)
 
     def AppendItems(*args, **kwargs):


@@ -6822,7 +6804,7 @@ class ItemContainer(object):
         return _core.ItemContainer_AppendItems(*args, **kwargs)
 
     def Insert(*args, **kwargs):
         return _core.ItemContainer_AppendItems(*args, **kwargs)
 
     def Insert(*args, **kwargs):

-        """Insert(wxString item, int pos, PyObject clientData=None) -> int"""
+        """Insert(String item, int pos, PyObject clientData=None) -> int"""

         return _core.ItemContainer_Insert(*args, **kwargs)
 
     def Clear(*args, **kwargs):
         return _core.ItemContainer_Insert(*args, **kwargs)
 
     def Clear(*args, **kwargs):


@@ -6842,7 +6824,7 @@ class ItemContainer(object):
         return _core.ItemContainer_IsEmpty(*args, **kwargs)
 
     def GetString(*args, **kwargs):
         return _core.ItemContainer_IsEmpty(*args, **kwargs)
 
     def GetString(*args, **kwargs):

-        """GetString(int n) -> wxString"""
+        """GetString(int n) -> String"""

         return _core.ItemContainer_GetString(*args, **kwargs)
 
     def GetStrings(*args, **kwargs):
         return _core.ItemContainer_GetString(*args, **kwargs)
 
     def GetStrings(*args, **kwargs):


@@ -6850,11 +6832,11 @@ class ItemContainer(object):
         return _core.ItemContainer_GetStrings(*args, **kwargs)
 
     def SetString(*args, **kwargs):
         return _core.ItemContainer_GetStrings(*args, **kwargs)
 
     def SetString(*args, **kwargs):

-        """SetString(int n, wxString s)"""
+        """SetString(int n, String s)"""

         return _core.ItemContainer_SetString(*args, **kwargs)
 
     def FindString(*args, **kwargs):
         return _core.ItemContainer_SetString(*args, **kwargs)
 
     def FindString(*args, **kwargs):

-        """FindString(wxString s) -> int"""
+        """FindString(String s) -> int"""

         return _core.ItemContainer_FindString(*args, **kwargs)
 
     def Select(*args, **kwargs):
         return _core.ItemContainer_FindString(*args, **kwargs)
 
     def Select(*args, **kwargs):


@@ -6866,7 +6848,7 @@ class ItemContainer(object):
         return _core.ItemContainer_GetSelection(*args, **kwargs)
 
     def GetStringSelection(*args, **kwargs):
         return _core.ItemContainer_GetSelection(*args, **kwargs)
 
     def GetStringSelection(*args, **kwargs):

-        """GetStringSelection() -> wxString"""
+        """GetStringSelection() -> String"""

         return _core.ItemContainer_GetStringSelection(*args, **kwargs)
 
     def GetClientData(*args, **kwargs):
         return _core.ItemContainer_GetStringSelection(*args, **kwargs)
 
     def GetClientData(*args, **kwargs):


@@ -7427,11 +7409,11 @@ class FlexGridSizer(GridSizer):
         return _core.FlexGridSizer_GetFlexibleDirection(*args, **kwargs)
 
     def SetNonFlexibleGrowMode(*args, **kwargs):
         return _core.FlexGridSizer_GetFlexibleDirection(*args, **kwargs)
 
     def SetNonFlexibleGrowMode(*args, **kwargs):

-        """SetNonFlexibleGrowMode(wxFlexSizerGrowMode mode)"""
+        """SetNonFlexibleGrowMode(int mode)"""

         return _core.FlexGridSizer_SetNonFlexibleGrowMode(*args, **kwargs)
 
     def GetNonFlexibleGrowMode(*args, **kwargs):
         return _core.FlexGridSizer_SetNonFlexibleGrowMode(*args, **kwargs)
 
     def GetNonFlexibleGrowMode(*args, **kwargs):

-        """GetNonFlexibleGrowMode() -> wxFlexSizerGrowMode"""
+        """GetNonFlexibleGrowMode() -> int"""

         return _core.FlexGridSizer_GetNonFlexibleGrowMode(*args, **kwargs)
 
     def GetRowHeights(*args, **kwargs):
         return _core.FlexGridSizer_GetNonFlexibleGrowMode(*args, **kwargs)
 
     def GetRowHeights(*args, **kwargs):


@@ -7794,10 +7776,7 @@ class IndividualLayoutConstraint(Object):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxIndividualLayoutConstraint instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def Set(*args, **kwargs):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxIndividualLayoutConstraint instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def Set(*args, **kwargs):

-        """
-        Set(wxRelationship rel, Window otherW, wxEdge otherE, int val=0, 
-            int marg=wxLAYOUT_DEFAULT_MARGIN)
-        """
+        """Set(int rel, Window otherW, int otherE, int val=0, int marg=wxLAYOUT_DEFAULT_MARGIN)"""

         return _core.IndividualLayoutConstraint_Set(*args, **kwargs)
 
     def LeftOf(*args, **kwargs):
         return _core.IndividualLayoutConstraint_Set(*args, **kwargs)
 
     def LeftOf(*args, **kwargs):


@@ -7817,11 +7796,11 @@ class IndividualLayoutConstraint(Object):
         return _core.IndividualLayoutConstraint_Below(*args, **kwargs)
 
     def SameAs(*args, **kwargs):
         return _core.IndividualLayoutConstraint_Below(*args, **kwargs)
 
     def SameAs(*args, **kwargs):

-        """SameAs(Window otherW, wxEdge edge, int marg=0)"""
+        """SameAs(Window otherW, int edge, int marg=0)"""

         return _core.IndividualLayoutConstraint_SameAs(*args, **kwargs)
 
     def PercentOf(*args, **kwargs):
         return _core.IndividualLayoutConstraint_SameAs(*args, **kwargs)
 
     def PercentOf(*args, **kwargs):

-        """PercentOf(Window otherW, wxEdge wh, int per)"""
+        """PercentOf(Window otherW, int wh, int per)"""

         return _core.IndividualLayoutConstraint_PercentOf(*args, **kwargs)
 
     def Absolute(*args, **kwargs):
         return _core.IndividualLayoutConstraint_PercentOf(*args, **kwargs)
 
     def Absolute(*args, **kwargs):


@@ -7841,11 +7820,11 @@ class IndividualLayoutConstraint(Object):
         return _core.IndividualLayoutConstraint_GetOtherWindow(*args, **kwargs)
 
     def GetMyEdge(*args, **kwargs):
         return _core.IndividualLayoutConstraint_GetOtherWindow(*args, **kwargs)
 
     def GetMyEdge(*args, **kwargs):

-        """GetMyEdge() -> wxEdge"""
+        """GetMyEdge() -> int"""

         return _core.IndividualLayoutConstraint_GetMyEdge(*args, **kwargs)
 
     def SetEdge(*args, **kwargs):
         return _core.IndividualLayoutConstraint_GetMyEdge(*args, **kwargs)
 
     def SetEdge(*args, **kwargs):

-        """SetEdge(wxEdge which)"""
+        """SetEdge(int which)"""

         return _core.IndividualLayoutConstraint_SetEdge(*args, **kwargs)
 
     def SetValue(*args, **kwargs):
         return _core.IndividualLayoutConstraint_SetEdge(*args, **kwargs)
 
     def SetValue(*args, **kwargs):


@@ -7881,11 +7860,11 @@ class IndividualLayoutConstraint(Object):
         return _core.IndividualLayoutConstraint_SetDone(*args, **kwargs)
 
     def GetRelationship(*args, **kwargs):
         return _core.IndividualLayoutConstraint_SetDone(*args, **kwargs)
 
     def GetRelationship(*args, **kwargs):

-        """GetRelationship() -> wxRelationship"""
+        """GetRelationship() -> int"""

         return _core.IndividualLayoutConstraint_GetRelationship(*args, **kwargs)
 
     def SetRelationship(*args, **kwargs):
         return _core.IndividualLayoutConstraint_GetRelationship(*args, **kwargs)
 
     def SetRelationship(*args, **kwargs):

-        """SetRelationship(wxRelationship r)"""
+        """SetRelationship(int r)"""

         return _core.IndividualLayoutConstraint_SetRelationship(*args, **kwargs)
 
     def ResetIfWin(*args, **kwargs):
         return _core.IndividualLayoutConstraint_SetRelationship(*args, **kwargs)
 
     def ResetIfWin(*args, **kwargs):


@@ -7897,7 +7876,7 @@ class IndividualLayoutConstraint(Object):
         return _core.IndividualLayoutConstraint_SatisfyConstraint(*args, **kwargs)
 
     def GetEdge(*args, **kwargs):
         return _core.IndividualLayoutConstraint_SatisfyConstraint(*args, **kwargs)
 
     def GetEdge(*args, **kwargs):

-        """GetEdge(wxEdge which, Window thisWin, Window other) -> int"""
+        """GetEdge(int which, Window thisWin, Window other) -> int"""

         return _core.IndividualLayoutConstraint_GetEdge(*args, **kwargs)
 
 
         return _core.IndividualLayoutConstraint_GetEdge(*args, **kwargs)
 
 

diff --git a/wxPython/src/gtk/core_wrap.cpp b/wxPython/src/gtk/core_wrap.cpp
index cebf4c762047398660e350f725186ed0b5166896..4c0da785ced3073eb2a6c4a8aec91dbdd9a41c07 100644 (file)
--- a/wxPython/src/gtk/core_wrap.cpp
+++ b/wxPython/src/gtk/core_wrap.cpp
@@ -537,10 +537,6 @@ static wxPyCoreAPI API = {
 #endif
 
 
 #endif
 
 

-    DECLARE_DEF_STRING(EmptyString);
-//    DECLARE_DEF_STRING(PanelNameStr);
-
-

 #if ! wxUSE_HOTKEY
 enum wxHotkeyModifier
 {
 #if ! wxUSE_HOTKEY
 enum wxHotkeyModifier
 {


@@ -553,6 +549,7 @@ enum wxHotkeyModifier
 #define wxEVT_HOTKEY 9999
 #endif
 
 #define wxEVT_HOTKEY 9999
 #endif
 

+ static const wxString wxPyEmptyString(wxEmptyString); 

 wxString wxObject_GetClassName(wxObject *self){
             return self->GetClassInfo()->GetClassName();
         }
 wxString wxObject_GetClassName(wxObject *self){
             return self->GetClassInfo()->GetClassName();
         }


@@ -1315,6 +1312,26 @@ bool wxGridBagSizer_Add(wxGridBagSizer *self,PyObject *item,wxGBPosition const &
 #ifdef __cplusplus
 extern "C" {
 #endif
 #ifdef __cplusplus
 extern "C" {
 #endif

+static int _wrap_EmptyString_set(PyObject *_val) {
+    PyErr_SetString(PyExc_TypeError,"Variable EmptyString is read-only.");
+    return 1;
+}
+
+
+static PyObject *_wrap_EmptyString_get() {
+    PyObject *pyobj;
+    
+    {
+#if wxUSE_UNICODE
+        pyobj = PyUnicode_FromWideChar((&wxPyEmptyString)->c_str(), (&wxPyEmptyString)->Len());
+#else
+        pyobj = PyString_FromStringAndSize((&wxPyEmptyString)->c_str(), (&wxPyEmptyString)->Len());
+#endif
+    }
+    return pyobj;
+}
+
+

 static PyObject *_wrap_Object_GetClassName(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxObject *arg1 = (wxObject *) 0 ;
 static PyObject *_wrap_Object_GetClassName(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxObject *arg1 = (wxObject *) 0 ;


@@ -37947,36 +37964,23 @@ static swig_const_info swig_const_table[] = {
 { SWIG_PY_INT,     (char *)"UPDATE_UI_FROMIDLE", (long) wxUPDATE_UI_FROMIDLE, 0, 0, 0},
 { SWIG_PY_INT,     (char *)"BITMAP_TYPE_INVALID", (long) wxBITMAP_TYPE_INVALID, 0, 0, 0},
 { SWIG_PY_INT,     (char *)"BITMAP_TYPE_BMP", (long) wxBITMAP_TYPE_BMP, 0, 0, 0},
 { SWIG_PY_INT,     (char *)"UPDATE_UI_FROMIDLE", (long) wxUPDATE_UI_FROMIDLE, 0, 0, 0},
 { SWIG_PY_INT,     (char *)"BITMAP_TYPE_INVALID", (long) wxBITMAP_TYPE_INVALID, 0, 0, 0},
 { SWIG_PY_INT,     (char *)"BITMAP_TYPE_BMP", (long) wxBITMAP_TYPE_BMP, 0, 0, 0},

-{ SWIG_PY_INT,     (char *)"BITMAP_TYPE_BMP_RESOURCE", (long) wxBITMAP_TYPE_BMP_RESOURCE, 0, 0, 0},
-{ SWIG_PY_INT,     (char *)"BITMAP_TYPE_RESOURCE", (long) wxBITMAP_TYPE_RESOURCE, 0, 0, 0},

 { SWIG_PY_INT,     (char *)"BITMAP_TYPE_ICO", (long) wxBITMAP_TYPE_ICO, 0, 0, 0},
 { SWIG_PY_INT,     (char *)"BITMAP_TYPE_ICO", (long) wxBITMAP_TYPE_ICO, 0, 0, 0},

-{ SWIG_PY_INT,     (char *)"BITMAP_TYPE_ICO_RESOURCE", (long) wxBITMAP_TYPE_ICO_RESOURCE, 0, 0, 0},

 { SWIG_PY_INT,     (char *)"BITMAP_TYPE_CUR", (long) wxBITMAP_TYPE_CUR, 0, 0, 0},
 { SWIG_PY_INT,     (char *)"BITMAP_TYPE_CUR", (long) wxBITMAP_TYPE_CUR, 0, 0, 0},

-{ SWIG_PY_INT,     (char *)"BITMAP_TYPE_CUR_RESOURCE", (long) wxBITMAP_TYPE_CUR_RESOURCE, 0, 0, 0},

 { SWIG_PY_INT,     (char *)"BITMAP_TYPE_XBM", (long) wxBITMAP_TYPE_XBM, 0, 0, 0},
 { SWIG_PY_INT,     (char *)"BITMAP_TYPE_XBM_DATA", (long) wxBITMAP_TYPE_XBM_DATA, 0, 0, 0},
 { SWIG_PY_INT,     (char *)"BITMAP_TYPE_XPM", (long) wxBITMAP_TYPE_XPM, 0, 0, 0},
 { SWIG_PY_INT,     (char *)"BITMAP_TYPE_XPM_DATA", (long) wxBITMAP_TYPE_XPM_DATA, 0, 0, 0},
 { SWIG_PY_INT,     (char *)"BITMAP_TYPE_TIF", (long) wxBITMAP_TYPE_TIF, 0, 0, 0},
 { SWIG_PY_INT,     (char *)"BITMAP_TYPE_XBM", (long) wxBITMAP_TYPE_XBM, 0, 0, 0},
 { SWIG_PY_INT,     (char *)"BITMAP_TYPE_XBM_DATA", (long) wxBITMAP_TYPE_XBM_DATA, 0, 0, 0},
 { SWIG_PY_INT,     (char *)"BITMAP_TYPE_XPM", (long) wxBITMAP_TYPE_XPM, 0, 0, 0},
 { SWIG_PY_INT,     (char *)"BITMAP_TYPE_XPM_DATA", (long) wxBITMAP_TYPE_XPM_DATA, 0, 0, 0},
 { SWIG_PY_INT,     (char *)"BITMAP_TYPE_TIF", (long) wxBITMAP_TYPE_TIF, 0, 0, 0},

-{ SWIG_PY_INT,     (char *)"BITMAP_TYPE_TIF_RESOURCE", (long) wxBITMAP_TYPE_TIF_RESOURCE, 0, 0, 0},

 { SWIG_PY_INT,     (char *)"BITMAP_TYPE_GIF", (long) wxBITMAP_TYPE_GIF, 0, 0, 0},
 { SWIG_PY_INT,     (char *)"BITMAP_TYPE_GIF", (long) wxBITMAP_TYPE_GIF, 0, 0, 0},

-{ SWIG_PY_INT,     (char *)"BITMAP_TYPE_GIF_RESOURCE", (long) wxBITMAP_TYPE_GIF_RESOURCE, 0, 0, 0},

 { SWIG_PY_INT,     (char *)"BITMAP_TYPE_PNG", (long) wxBITMAP_TYPE_PNG, 0, 0, 0},
 { SWIG_PY_INT,     (char *)"BITMAP_TYPE_PNG", (long) wxBITMAP_TYPE_PNG, 0, 0, 0},

-{ SWIG_PY_INT,     (char *)"BITMAP_TYPE_PNG_RESOURCE", (long) wxBITMAP_TYPE_PNG_RESOURCE, 0, 0, 0},

 { SWIG_PY_INT,     (char *)"BITMAP_TYPE_JPEG", (long) wxBITMAP_TYPE_JPEG, 0, 0, 0},
 { SWIG_PY_INT,     (char *)"BITMAP_TYPE_JPEG", (long) wxBITMAP_TYPE_JPEG, 0, 0, 0},

-{ SWIG_PY_INT,     (char *)"BITMAP_TYPE_JPEG_RESOURCE", (long) wxBITMAP_TYPE_JPEG_RESOURCE, 0, 0, 0},

 { SWIG_PY_INT,     (char *)"BITMAP_TYPE_PNM", (long) wxBITMAP_TYPE_PNM, 0, 0, 0},
 { SWIG_PY_INT,     (char *)"BITMAP_TYPE_PNM", (long) wxBITMAP_TYPE_PNM, 0, 0, 0},

-{ SWIG_PY_INT,     (char *)"BITMAP_TYPE_PNM_RESOURCE", (long) wxBITMAP_TYPE_PNM_RESOURCE, 0, 0, 0},

 { SWIG_PY_INT,     (char *)"BITMAP_TYPE_PCX", (long) wxBITMAP_TYPE_PCX, 0, 0, 0},
 { SWIG_PY_INT,     (char *)"BITMAP_TYPE_PCX", (long) wxBITMAP_TYPE_PCX, 0, 0, 0},

-{ SWIG_PY_INT,     (char *)"BITMAP_TYPE_PCX_RESOURCE", (long) wxBITMAP_TYPE_PCX_RESOURCE, 0, 0, 0},

 { SWIG_PY_INT,     (char *)"BITMAP_TYPE_PICT", (long) wxBITMAP_TYPE_PICT, 0, 0, 0},
 { SWIG_PY_INT,     (char *)"BITMAP_TYPE_PICT", (long) wxBITMAP_TYPE_PICT, 0, 0, 0},

-{ SWIG_PY_INT,     (char *)"BITMAP_TYPE_PICT_RESOURCE", (long) wxBITMAP_TYPE_PICT_RESOURCE, 0, 0, 0},

 { SWIG_PY_INT,     (char *)"BITMAP_TYPE_ICON", (long) wxBITMAP_TYPE_ICON, 0, 0, 0},
 { SWIG_PY_INT,     (char *)"BITMAP_TYPE_ICON", (long) wxBITMAP_TYPE_ICON, 0, 0, 0},

-{ SWIG_PY_INT,     (char *)"BITMAP_TYPE_ICON_RESOURCE", (long) wxBITMAP_TYPE_ICON_RESOURCE, 0, 0, 0},

 { SWIG_PY_INT,     (char *)"BITMAP_TYPE_ANI", (long) wxBITMAP_TYPE_ANI, 0, 0, 0},
 { SWIG_PY_INT,     (char *)"BITMAP_TYPE_IFF", (long) wxBITMAP_TYPE_IFF, 0, 0, 0},
 { SWIG_PY_INT,     (char *)"BITMAP_TYPE_MACCURSOR", (long) wxBITMAP_TYPE_MACCURSOR, 0, 0, 0},
 { SWIG_PY_INT,     (char *)"BITMAP_TYPE_ANI", (long) wxBITMAP_TYPE_ANI, 0, 0, 0},
 { SWIG_PY_INT,     (char *)"BITMAP_TYPE_IFF", (long) wxBITMAP_TYPE_IFF, 0, 0, 0},
 { SWIG_PY_INT,     (char *)"BITMAP_TYPE_MACCURSOR", (long) wxBITMAP_TYPE_MACCURSOR, 0, 0, 0},

-{ SWIG_PY_INT,     (char *)"BITMAP_TYPE_MACCURSOR_RESOURCE", (long) wxBITMAP_TYPE_MACCURSOR_RESOURCE, 0, 0, 0},

 { SWIG_PY_INT,     (char *)"BITMAP_TYPE_ANY", (long) wxBITMAP_TYPE_ANY, 0, 0, 0},
 { SWIG_PY_INT,     (char *)"CURSOR_NONE", (long) wxCURSOR_NONE, 0, 0, 0},
 { SWIG_PY_INT,     (char *)"CURSOR_ARROW", (long) wxCURSOR_ARROW, 0, 0, 0},
 { SWIG_PY_INT,     (char *)"BITMAP_TYPE_ANY", (long) wxBITMAP_TYPE_ANY, 0, 0, 0},
 { SWIG_PY_INT,     (char *)"CURSOR_NONE", (long) wxCURSOR_NONE, 0, 0, 0},
 { SWIG_PY_INT,     (char *)"CURSOR_ARROW", (long) wxCURSOR_ARROW, 0, 0, 0},


@@ -38212,6 +38216,7 @@ SWIGEXPORT(void) SWIG_init(void) {
 #endif
     
     PyDict_SetItemString(d,(char*)"cvar", SWIG_globals);
 #endif
     
     PyDict_SetItemString(d,(char*)"cvar", SWIG_globals);

+    SWIG_addvarlink(SWIG_globals,(char*)"EmptyString",_wrap_EmptyString_get, _wrap_EmptyString_set);

     SWIG_addvarlink(SWIG_globals,(char*)"DefaultPosition",_wrap_DefaultPosition_get, _wrap_DefaultPosition_set);
     SWIG_addvarlink(SWIG_globals,(char*)"DefaultSize",_wrap_DefaultSize_get, _wrap_DefaultSize_set);
     
     SWIG_addvarlink(SWIG_globals,(char*)"DefaultPosition",_wrap_DefaultPosition_get, _wrap_DefaultPosition_set);
     SWIG_addvarlink(SWIG_globals,(char*)"DefaultSize",_wrap_DefaultSize_get, _wrap_DefaultSize_set);
     

diff --git a/wxPython/src/gtk/gdi.py b/wxPython/src/gtk/gdi.py
index 812c149998e4adbdf9b3fe72d6e9fe353fe98cee..031d471fd69fd8b80c90c8198fcbe483a857021f 100644 (file)
--- a/wxPython/src/gtk/gdi.py
+++ b/wxPython/src/gtk/gdi.py
@@ -92,7 +92,7 @@ class Colour(core.Object):
         return _gdi.Colour___ne__(*args, **kwargs)
 
     def InitFromName(*args, **kwargs):
         return _gdi.Colour___ne__(*args, **kwargs)
 
     def InitFromName(*args, **kwargs):

-        """InitFromName(wxString colourName)"""
+        """InitFromName(String colourName)"""

         return _gdi.Colour_InitFromName(*args, **kwargs)
 
     def Get(*args, **kwargs):
         return _gdi.Colour_InitFromName(*args, **kwargs)
 
     def Get(*args, **kwargs):


@@ -116,7 +116,7 @@ class ColourPtr(Colour):
 _gdi.Colour_swigregister(ColourPtr)
 
 def NamedColour(*args, **kwargs):
 _gdi.Colour_swigregister(ColourPtr)
 
 def NamedColour(*args, **kwargs):

-    """NamedColour(wxString colorName) -> Colour"""
+    """NamedColour(String colorName) -> Colour"""

     val = _gdi.new_NamedColour(*args, **kwargs)
     val.thisown = 1
     return val
     val = _gdi.new_NamedColour(*args, **kwargs)
     val.thisown = 1
     return val


@@ -343,7 +343,7 @@ class Bitmap(GDIObject):
         return "<%s.%s; proxy of C++ wxBitmap instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """
         return "<%s.%s; proxy of C++ wxBitmap instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """

-        __init__(wxString name, wxBitmapType type=BITMAP_TYPE_ANY) -> Bitmap
+        __init__(String name, int type=BITMAP_TYPE_ANY) -> Bitmap

 
         Loads a bitmap from a file.
         """
 
         Loads a bitmap from a file.
         """


@@ -432,7 +432,7 @@ class Bitmap(GDIObject):
 
     def SaveFile(*args, **kwargs):
         """
 
     def SaveFile(*args, **kwargs):
         """

-        SaveFile(wxString name, wxBitmapType type, Palette palette=(wxPalette *) NULL) -> bool
+        SaveFile(String name, int type, Palette palette=(wxPalette *) NULL) -> bool

 
         Saves a bitmap in the named file.
         """
 
         Saves a bitmap in the named file.
         """


@@ -440,7 +440,7 @@ class Bitmap(GDIObject):
 
     def LoadFile(*args, **kwargs):
         """
 
     def LoadFile(*args, **kwargs):
         """

-        LoadFile(wxString name, wxBitmapType type) -> bool
+        LoadFile(String name, int type) -> bool

 
         Loads a bitmap from a file
         """
 
         Loads a bitmap from a file
         """


@@ -583,7 +583,7 @@ class Icon(GDIObject):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxIcon instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxIcon instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):

-        """__init__(wxString name, long flags, int desiredWidth=-1, int desiredHeight=-1) -> Icon"""
+        """__init__(String name, long flags, int desiredWidth=-1, int desiredHeight=-1) -> Icon"""

         newobj = _gdi.new_Icon(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         newobj = _gdi.new_Icon(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1


@@ -595,7 +595,7 @@ class Icon(GDIObject):
         except: pass
 
     def LoadFile(*args, **kwargs):
         except: pass
 
     def LoadFile(*args, **kwargs):

-        """LoadFile(wxString name, long flags) -> bool"""
+        """LoadFile(String name, long flags) -> bool"""

         return _gdi.Icon_LoadFile(*args, **kwargs)
 
     def Ok(*args, **kwargs):
         return _gdi.Icon_LoadFile(*args, **kwargs)
 
     def Ok(*args, **kwargs):


@@ -667,7 +667,7 @@ class IconLocation(object):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxIconLocation instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxIconLocation instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):

-        """__init__(wxString filename=&wxPyEmptyString, int num=0) -> IconLocation"""
+        """__init__(String filename=&wxPyEmptyString, int num=0) -> IconLocation"""

         newobj = _gdi.new_IconLocation(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         newobj = _gdi.new_IconLocation(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1


@@ -684,11 +684,11 @@ class IconLocation(object):
 
     def __nonzero__(self): return self.Ok() 
     def SetFileName(*args, **kwargs):
 
     def __nonzero__(self): return self.Ok() 
     def SetFileName(*args, **kwargs):

-        """SetFileName(wxString filename)"""
+        """SetFileName(String filename)"""

         return _gdi.IconLocation_SetFileName(*args, **kwargs)
 
     def GetFileName(*args, **kwargs):
         return _gdi.IconLocation_SetFileName(*args, **kwargs)
 
     def GetFileName(*args, **kwargs):

-        """GetFileName() -> wxString"""
+        """GetFileName() -> String"""

         return _gdi.IconLocation_GetFileName(*args, **kwargs)
 
     def SetIndex(*args, **kwargs):
         return _gdi.IconLocation_GetFileName(*args, **kwargs)
 
     def SetIndex(*args, **kwargs):


@@ -727,7 +727,7 @@ class IconBundle(object):
         return _gdi.IconBundle_AddIcon(*args, **kwargs)
 
     def AddIconFromFile(*args, **kwargs):
         return _gdi.IconBundle_AddIcon(*args, **kwargs)
 
     def AddIconFromFile(*args, **kwargs):

-        """AddIconFromFile(wxString file, long type)"""
+        """AddIconFromFile(String file, long type)"""

         return _gdi.IconBundle_AddIconFromFile(*args, **kwargs)
 
     def GetIcon(*args, **kwargs):
         return _gdi.IconBundle_AddIconFromFile(*args, **kwargs)
 
     def GetIcon(*args, **kwargs):


@@ -743,7 +743,7 @@ class IconBundlePtr(IconBundle):
 _gdi.IconBundle_swigregister(IconBundlePtr)
 
 def IconBundleFromFile(*args, **kwargs):
 _gdi.IconBundle_swigregister(IconBundlePtr)
 
 def IconBundleFromFile(*args, **kwargs):

-    """IconBundleFromFile(wxString file, long type) -> IconBundle"""
+    """IconBundleFromFile(String file, long type) -> IconBundle"""

     val = _gdi.new_IconBundleFromFile(*args, **kwargs)
     val.thisown = 1
     return val
     val = _gdi.new_IconBundleFromFile(*args, **kwargs)
     val.thisown = 1
     return val


@@ -758,7 +758,7 @@ class Cursor(GDIObject):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxCursor instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxCursor instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):

-        """__init__(wxString cursorName, long flags, int hotSpotX=0, int hotSpotY=0) -> Cursor"""
+        """__init__(String cursorName, long flags, int hotSpotX=0, int hotSpotY=0) -> Cursor"""

         newobj = _gdi.new_Cursor(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         newobj = _gdi.new_Cursor(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1


@@ -832,19 +832,19 @@ class Region(GDIObject):
         return _gdi.Region_Offset(*args, **kwargs)
 
     def Contains(*args, **kwargs):
         return _gdi.Region_Offset(*args, **kwargs)
 
     def Contains(*args, **kwargs):

-        """Contains(int x, int y) -> wxRegionContain"""
+        """Contains(int x, int y) -> int"""

         return _gdi.Region_Contains(*args, **kwargs)
 
     def ContainsPoint(*args, **kwargs):
         return _gdi.Region_Contains(*args, **kwargs)
 
     def ContainsPoint(*args, **kwargs):

-        """ContainsPoint(Point pt) -> wxRegionContain"""
+        """ContainsPoint(Point pt) -> int"""

         return _gdi.Region_ContainsPoint(*args, **kwargs)
 
     def ContainsRect(*args, **kwargs):
         return _gdi.Region_ContainsPoint(*args, **kwargs)
 
     def ContainsRect(*args, **kwargs):

-        """ContainsRect(Rect rect) -> wxRegionContain"""
+        """ContainsRect(Rect rect) -> int"""

         return _gdi.Region_ContainsRect(*args, **kwargs)
 
     def ContainsRectDim(*args, **kwargs):
         return _gdi.Region_ContainsRect(*args, **kwargs)
 
     def ContainsRectDim(*args, **kwargs):

-        """ContainsRectDim(int x, int y, int w, int h) -> wxRegionContain"""
+        """ContainsRectDim(int x, int y, int w, int h) -> int"""

         return _gdi.Region_ContainsRectDim(*args, **kwargs)
 
     def GetBox(*args, **kwargs):
         return _gdi.Region_ContainsRectDim(*args, **kwargs)
 
     def GetBox(*args, **kwargs):


@@ -1111,11 +1111,11 @@ class NativeFontInfo(object):
         return _gdi.NativeFontInfo_GetPointSize(*args, **kwargs)
 
     def GetStyle(*args, **kwargs):
         return _gdi.NativeFontInfo_GetPointSize(*args, **kwargs)
 
     def GetStyle(*args, **kwargs):

-        """GetStyle() -> wxFontStyle"""
+        """GetStyle() -> int"""

         return _gdi.NativeFontInfo_GetStyle(*args, **kwargs)
 
     def GetWeight(*args, **kwargs):
         return _gdi.NativeFontInfo_GetStyle(*args, **kwargs)
 
     def GetWeight(*args, **kwargs):

-        """GetWeight() -> wxFontWeight"""
+        """GetWeight() -> int"""

         return _gdi.NativeFontInfo_GetWeight(*args, **kwargs)
 
     def GetUnderlined(*args, **kwargs):
         return _gdi.NativeFontInfo_GetWeight(*args, **kwargs)
 
     def GetUnderlined(*args, **kwargs):


@@ -1123,15 +1123,15 @@ class NativeFontInfo(object):
         return _gdi.NativeFontInfo_GetUnderlined(*args, **kwargs)
 
     def GetFaceName(*args, **kwargs):
         return _gdi.NativeFontInfo_GetUnderlined(*args, **kwargs)
 
     def GetFaceName(*args, **kwargs):

-        """GetFaceName() -> wxString"""
+        """GetFaceName() -> String"""

         return _gdi.NativeFontInfo_GetFaceName(*args, **kwargs)
 
     def GetFamily(*args, **kwargs):
         return _gdi.NativeFontInfo_GetFaceName(*args, **kwargs)
 
     def GetFamily(*args, **kwargs):

-        """GetFamily() -> wxFontFamily"""
+        """GetFamily() -> int"""

         return _gdi.NativeFontInfo_GetFamily(*args, **kwargs)
 
     def GetEncoding(*args, **kwargs):
         return _gdi.NativeFontInfo_GetFamily(*args, **kwargs)
 
     def GetEncoding(*args, **kwargs):

-        """GetEncoding() -> wxFontEncoding"""
+        """GetEncoding() -> int"""

         return _gdi.NativeFontInfo_GetEncoding(*args, **kwargs)
 
     def SetPointSize(*args, **kwargs):
         return _gdi.NativeFontInfo_GetEncoding(*args, **kwargs)
 
     def SetPointSize(*args, **kwargs):


@@ -1139,11 +1139,11 @@ class NativeFontInfo(object):
         return _gdi.NativeFontInfo_SetPointSize(*args, **kwargs)
 
     def SetStyle(*args, **kwargs):
         return _gdi.NativeFontInfo_SetPointSize(*args, **kwargs)
 
     def SetStyle(*args, **kwargs):

-        """SetStyle(wxFontStyle style)"""
+        """SetStyle(int style)"""

         return _gdi.NativeFontInfo_SetStyle(*args, **kwargs)
 
     def SetWeight(*args, **kwargs):
         return _gdi.NativeFontInfo_SetStyle(*args, **kwargs)
 
     def SetWeight(*args, **kwargs):

-        """SetWeight(wxFontWeight weight)"""
+        """SetWeight(int weight)"""

         return _gdi.NativeFontInfo_SetWeight(*args, **kwargs)
 
     def SetUnderlined(*args, **kwargs):
         return _gdi.NativeFontInfo_SetWeight(*args, **kwargs)
 
     def SetUnderlined(*args, **kwargs):


@@ -1151,35 +1151,35 @@ class NativeFontInfo(object):
         return _gdi.NativeFontInfo_SetUnderlined(*args, **kwargs)
 
     def SetFaceName(*args, **kwargs):
         return _gdi.NativeFontInfo_SetUnderlined(*args, **kwargs)
 
     def SetFaceName(*args, **kwargs):

-        """SetFaceName(wxString facename)"""
+        """SetFaceName(String facename)"""

         return _gdi.NativeFontInfo_SetFaceName(*args, **kwargs)
 
     def SetFamily(*args, **kwargs):
         return _gdi.NativeFontInfo_SetFaceName(*args, **kwargs)
 
     def SetFamily(*args, **kwargs):

-        """SetFamily(wxFontFamily family)"""
+        """SetFamily(int family)"""

         return _gdi.NativeFontInfo_SetFamily(*args, **kwargs)
 
     def SetEncoding(*args, **kwargs):
         return _gdi.NativeFontInfo_SetFamily(*args, **kwargs)
 
     def SetEncoding(*args, **kwargs):

-        """SetEncoding(wxFontEncoding encoding)"""
+        """SetEncoding(int encoding)"""

         return _gdi.NativeFontInfo_SetEncoding(*args, **kwargs)
 
     def FromString(*args, **kwargs):
         return _gdi.NativeFontInfo_SetEncoding(*args, **kwargs)
 
     def FromString(*args, **kwargs):

-        """FromString(wxString s) -> bool"""
+        """FromString(String s) -> bool"""

         return _gdi.NativeFontInfo_FromString(*args, **kwargs)
 
     def ToString(*args, **kwargs):
         return _gdi.NativeFontInfo_FromString(*args, **kwargs)
 
     def ToString(*args, **kwargs):

-        """ToString() -> wxString"""
+        """ToString() -> String"""

         return _gdi.NativeFontInfo_ToString(*args, **kwargs)
 
     def __str__(*args, **kwargs):
         return _gdi.NativeFontInfo_ToString(*args, **kwargs)
 
     def __str__(*args, **kwargs):

-        """__str__() -> wxString"""
+        """__str__() -> String"""

         return _gdi.NativeFontInfo___str__(*args, **kwargs)
 
     def FromUserString(*args, **kwargs):
         return _gdi.NativeFontInfo___str__(*args, **kwargs)
 
     def FromUserString(*args, **kwargs):

-        """FromUserString(wxString s) -> bool"""
+        """FromUserString(String s) -> bool"""

         return _gdi.NativeFontInfo_FromUserString(*args, **kwargs)
 
     def ToUserString(*args, **kwargs):
         return _gdi.NativeFontInfo_FromUserString(*args, **kwargs)
 
     def ToUserString(*args, **kwargs):

-        """ToUserString() -> wxString"""
+        """ToUserString() -> String"""

         return _gdi.NativeFontInfo_ToUserString(*args, **kwargs)
 
 
         return _gdi.NativeFontInfo_ToUserString(*args, **kwargs)
 
 


@@ -1208,11 +1208,11 @@ class NativeEncodingInfo(object):
         except: pass
 
     def FromString(*args, **kwargs):
         except: pass
 
     def FromString(*args, **kwargs):

-        """FromString(wxString s) -> bool"""
+        """FromString(String s) -> bool"""

         return _gdi.NativeEncodingInfo_FromString(*args, **kwargs)
 
     def ToString(*args, **kwargs):
         return _gdi.NativeEncodingInfo_FromString(*args, **kwargs)
 
     def ToString(*args, **kwargs):

-        """ToString() -> wxString"""
+        """ToString() -> String"""

         return _gdi.NativeEncodingInfo_ToString(*args, **kwargs)
 
 
         return _gdi.NativeEncodingInfo_ToString(*args, **kwargs)
 
 


@@ -1225,7 +1225,7 @@ _gdi.NativeEncodingInfo_swigregister(NativeEncodingInfoPtr)
 
 
 def GetNativeFontEncoding(*args, **kwargs):
 
 
 def GetNativeFontEncoding(*args, **kwargs):

-    """GetNativeFontEncoding(wxFontEncoding encoding) -> NativeEncodingInfo"""
+    """GetNativeFontEncoding(int encoding) -> NativeEncodingInfo"""

     return _gdi.GetNativeFontEncoding(*args, **kwargs)
 
 def TestFontEncoding(*args, **kwargs):
     return _gdi.GetNativeFontEncoding(*args, **kwargs)
 
 def TestFontEncoding(*args, **kwargs):


@@ -1259,7 +1259,7 @@ class FontMapper(object):
 
     Set = staticmethod(Set)
     def CharsetToEncoding(*args, **kwargs):
 
     Set = staticmethod(Set)
     def CharsetToEncoding(*args, **kwargs):

-        """CharsetToEncoding(wxString charset, bool interactive=True) -> wxFontEncoding"""
+        """CharsetToEncoding(String charset, bool interactive=True) -> int"""

         return _gdi.FontMapper_CharsetToEncoding(*args, **kwargs)
 
     def GetSupportedEncodingsCount(*args, **kwargs):
         return _gdi.FontMapper_CharsetToEncoding(*args, **kwargs)
 
     def GetSupportedEncodingsCount(*args, **kwargs):


@@ -1268,17 +1268,17 @@ class FontMapper(object):
 
     GetSupportedEncodingsCount = staticmethod(GetSupportedEncodingsCount)
     def GetEncoding(*args, **kwargs):
 
     GetSupportedEncodingsCount = staticmethod(GetSupportedEncodingsCount)
     def GetEncoding(*args, **kwargs):

-        """FontMapper.GetEncoding(size_t n) -> wxFontEncoding"""
+        """FontMapper.GetEncoding(size_t n) -> int"""

         return _gdi.FontMapper_GetEncoding(*args, **kwargs)
 
     GetEncoding = staticmethod(GetEncoding)
     def GetEncodingName(*args, **kwargs):
         return _gdi.FontMapper_GetEncoding(*args, **kwargs)
 
     GetEncoding = staticmethod(GetEncoding)
     def GetEncodingName(*args, **kwargs):

-        """FontMapper.GetEncodingName(wxFontEncoding encoding) -> wxString"""
+        """FontMapper.GetEncodingName(int encoding) -> String"""

         return _gdi.FontMapper_GetEncodingName(*args, **kwargs)
 
     GetEncodingName = staticmethod(GetEncodingName)
     def GetEncodingDescription(*args, **kwargs):
         return _gdi.FontMapper_GetEncodingName(*args, **kwargs)
 
     GetEncodingName = staticmethod(GetEncodingName)
     def GetEncodingDescription(*args, **kwargs):

-        """FontMapper.GetEncodingDescription(wxFontEncoding encoding) -> wxString"""
+        """FontMapper.GetEncodingDescription(int encoding) -> String"""

         return _gdi.FontMapper_GetEncodingDescription(*args, **kwargs)
 
     GetEncodingDescription = staticmethod(GetEncodingDescription)
         return _gdi.FontMapper_GetEncodingDescription(*args, **kwargs)
 
     GetEncodingDescription = staticmethod(GetEncodingDescription)


@@ -1287,23 +1287,20 @@ class FontMapper(object):
         return _gdi.FontMapper_SetConfig(*args, **kwargs)
 
     def SetConfigPath(*args, **kwargs):
         return _gdi.FontMapper_SetConfig(*args, **kwargs)
 
     def SetConfigPath(*args, **kwargs):

-        """SetConfigPath(wxString prefix)"""
+        """SetConfigPath(String prefix)"""

         return _gdi.FontMapper_SetConfigPath(*args, **kwargs)
 
     def GetDefaultConfigPath(*args, **kwargs):
         return _gdi.FontMapper_SetConfigPath(*args, **kwargs)
 
     def GetDefaultConfigPath(*args, **kwargs):

-        """FontMapper.GetDefaultConfigPath() -> wxString"""
+        """FontMapper.GetDefaultConfigPath() -> String"""

         return _gdi.FontMapper_GetDefaultConfigPath(*args, **kwargs)
 
     GetDefaultConfigPath = staticmethod(GetDefaultConfigPath)
     def GetAltForEncoding(*args, **kwargs):
         return _gdi.FontMapper_GetDefaultConfigPath(*args, **kwargs)
 
     GetDefaultConfigPath = staticmethod(GetDefaultConfigPath)
     def GetAltForEncoding(*args, **kwargs):

-        """
-        GetAltForEncoding(wxFontEncoding encoding, wxString facename=wxPyEmptyString, 
-            bool interactive=True) -> PyObject
-        """
+        """GetAltForEncoding(int encoding, String facename=EmptyString, bool interactive=True) -> PyObject"""

         return _gdi.FontMapper_GetAltForEncoding(*args, **kwargs)
 
     def IsEncodingAvailable(*args, **kwargs):
         return _gdi.FontMapper_GetAltForEncoding(*args, **kwargs)
 
     def IsEncodingAvailable(*args, **kwargs):

-        """IsEncodingAvailable(wxFontEncoding encoding, wxString facename=wxPyEmptyString) -> bool"""
+        """IsEncodingAvailable(int encoding, String facename=EmptyString) -> bool"""

         return _gdi.FontMapper_IsEncodingAvailable(*args, **kwargs)
 
     def SetDialogParent(*args, **kwargs):
         return _gdi.FontMapper_IsEncodingAvailable(*args, **kwargs)
 
     def SetDialogParent(*args, **kwargs):


@@ -1311,7 +1308,7 @@ class FontMapper(object):
         return _gdi.FontMapper_SetDialogParent(*args, **kwargs)
 
     def SetDialogTitle(*args, **kwargs):
         return _gdi.FontMapper_SetDialogParent(*args, **kwargs)
 
     def SetDialogTitle(*args, **kwargs):

-        """SetDialogTitle(wxString title)"""
+        """SetDialogTitle(String title)"""

         return _gdi.FontMapper_SetDialogTitle(*args, **kwargs)
 
 
         return _gdi.FontMapper_SetDialogTitle(*args, **kwargs)
 
 


@@ -1335,19 +1332,19 @@ def FontMapper_GetSupportedEncodingsCount(*args, **kwargs):
     return _gdi.FontMapper_GetSupportedEncodingsCount(*args, **kwargs)
 
 def FontMapper_GetEncoding(*args, **kwargs):
     return _gdi.FontMapper_GetSupportedEncodingsCount(*args, **kwargs)
 
 def FontMapper_GetEncoding(*args, **kwargs):

-    """FontMapper_GetEncoding(size_t n) -> wxFontEncoding"""
+    """FontMapper_GetEncoding(size_t n) -> int"""

     return _gdi.FontMapper_GetEncoding(*args, **kwargs)
 
 def FontMapper_GetEncodingName(*args, **kwargs):
     return _gdi.FontMapper_GetEncoding(*args, **kwargs)
 
 def FontMapper_GetEncodingName(*args, **kwargs):

-    """FontMapper_GetEncodingName(wxFontEncoding encoding) -> wxString"""
+    """FontMapper_GetEncodingName(int encoding) -> String"""

     return _gdi.FontMapper_GetEncodingName(*args, **kwargs)
 
 def FontMapper_GetEncodingDescription(*args, **kwargs):
     return _gdi.FontMapper_GetEncodingName(*args, **kwargs)
 
 def FontMapper_GetEncodingDescription(*args, **kwargs):

-    """FontMapper_GetEncodingDescription(wxFontEncoding encoding) -> wxString"""
+    """FontMapper_GetEncodingDescription(int encoding) -> String"""

     return _gdi.FontMapper_GetEncodingDescription(*args, **kwargs)
 
 def FontMapper_GetDefaultConfigPath(*args, **kwargs):
     return _gdi.FontMapper_GetEncodingDescription(*args, **kwargs)
 
 def FontMapper_GetDefaultConfigPath(*args, **kwargs):

-    """FontMapper_GetDefaultConfigPath() -> wxString"""
+    """FontMapper_GetDefaultConfigPath() -> String"""

     return _gdi.FontMapper_GetDefaultConfigPath(*args, **kwargs)
 
 #---------------------------------------------------------------------------
     return _gdi.FontMapper_GetDefaultConfigPath(*args, **kwargs)
 
 #---------------------------------------------------------------------------


@@ -1358,8 +1355,8 @@ class Font(GDIObject):
     def __init__(self, *args, **kwargs):
         """
         __init__(int pointSize, int family, int style, int weight, bool underline=False, 
     def __init__(self, *args, **kwargs):
         """
         __init__(int pointSize, int family, int style, int weight, bool underline=False, 

-            wxString face=wxPyEmptyString, 
-            wxFontEncoding encoding=FONTENCODING_DEFAULT) -> Font
+            String face=EmptyString, 
+            int encoding=FONTENCODING_DEFAULT) -> Font

         """
         newobj = _gdi.new_Font(*args, **kwargs)
         self.this = newobj.this
         """
         newobj = _gdi.new_Font(*args, **kwargs)
         self.this = newobj.this


@@ -1405,11 +1402,11 @@ class Font(GDIObject):
         return _gdi.Font_GetUnderlined(*args, **kwargs)
 
     def GetFaceName(*args, **kwargs):
         return _gdi.Font_GetUnderlined(*args, **kwargs)
 
     def GetFaceName(*args, **kwargs):

-        """GetFaceName() -> wxString"""
+        """GetFaceName() -> String"""

         return _gdi.Font_GetFaceName(*args, **kwargs)
 
     def GetEncoding(*args, **kwargs):
         return _gdi.Font_GetFaceName(*args, **kwargs)
 
     def GetEncoding(*args, **kwargs):

-        """GetEncoding() -> wxFontEncoding"""
+        """GetEncoding() -> int"""

         return _gdi.Font_GetEncoding(*args, **kwargs)
 
     def GetNativeFontInfo(*args, **kwargs):
         return _gdi.Font_GetEncoding(*args, **kwargs)
 
     def GetNativeFontInfo(*args, **kwargs):


@@ -1421,11 +1418,11 @@ class Font(GDIObject):
         return _gdi.Font_IsFixedWidth(*args, **kwargs)
 
     def GetNativeFontInfoDesc(*args, **kwargs):
         return _gdi.Font_IsFixedWidth(*args, **kwargs)
 
     def GetNativeFontInfoDesc(*args, **kwargs):

-        """GetNativeFontInfoDesc() -> wxString"""
+        """GetNativeFontInfoDesc() -> String"""

         return _gdi.Font_GetNativeFontInfoDesc(*args, **kwargs)
 
     def GetNativeFontInfoUserDesc(*args, **kwargs):
         return _gdi.Font_GetNativeFontInfoDesc(*args, **kwargs)
 
     def GetNativeFontInfoUserDesc(*args, **kwargs):

-        """GetNativeFontInfoUserDesc() -> wxString"""
+        """GetNativeFontInfoUserDesc() -> String"""

         return _gdi.Font_GetNativeFontInfoUserDesc(*args, **kwargs)
 
     def SetPointSize(*args, **kwargs):
         return _gdi.Font_GetNativeFontInfoUserDesc(*args, **kwargs)
 
     def SetPointSize(*args, **kwargs):


@@ -1445,7 +1442,7 @@ class Font(GDIObject):
         return _gdi.Font_SetWeight(*args, **kwargs)
 
     def SetFaceName(*args, **kwargs):
         return _gdi.Font_SetWeight(*args, **kwargs)
 
     def SetFaceName(*args, **kwargs):

-        """SetFaceName(wxString faceName)"""
+        """SetFaceName(String faceName)"""

         return _gdi.Font_SetFaceName(*args, **kwargs)
 
     def SetUnderlined(*args, **kwargs):
         return _gdi.Font_SetFaceName(*args, **kwargs)
 
     def SetUnderlined(*args, **kwargs):


@@ -1453,7 +1450,7 @@ class Font(GDIObject):
         return _gdi.Font_SetUnderlined(*args, **kwargs)
 
     def SetEncoding(*args, **kwargs):
         return _gdi.Font_SetUnderlined(*args, **kwargs)
 
     def SetEncoding(*args, **kwargs):

-        """SetEncoding(wxFontEncoding encoding)"""
+        """SetEncoding(int encoding)"""

         return _gdi.Font_SetEncoding(*args, **kwargs)
 
     def SetNativeFontInfo(*args, **kwargs):
         return _gdi.Font_SetEncoding(*args, **kwargs)
 
     def SetNativeFontInfo(*args, **kwargs):


@@ -1461,23 +1458,23 @@ class Font(GDIObject):
         return _gdi.Font_SetNativeFontInfo(*args, **kwargs)
 
     def SetNativeFontInfoFromString(*args, **kwargs):
         return _gdi.Font_SetNativeFontInfo(*args, **kwargs)
 
     def SetNativeFontInfoFromString(*args, **kwargs):

-        """SetNativeFontInfoFromString(wxString info)"""
+        """SetNativeFontInfoFromString(String info)"""

         return _gdi.Font_SetNativeFontInfoFromString(*args, **kwargs)
 
     def SetNativeFontInfoUserDesc(*args, **kwargs):
         return _gdi.Font_SetNativeFontInfoFromString(*args, **kwargs)
 
     def SetNativeFontInfoUserDesc(*args, **kwargs):

-        """SetNativeFontInfoUserDesc(wxString info)"""
+        """SetNativeFontInfoUserDesc(String info)"""

         return _gdi.Font_SetNativeFontInfoUserDesc(*args, **kwargs)
 
     def GetFamilyString(*args, **kwargs):
         return _gdi.Font_SetNativeFontInfoUserDesc(*args, **kwargs)
 
     def GetFamilyString(*args, **kwargs):

-        """GetFamilyString() -> wxString"""
+        """GetFamilyString() -> String"""

         return _gdi.Font_GetFamilyString(*args, **kwargs)
 
     def GetStyleString(*args, **kwargs):
         return _gdi.Font_GetFamilyString(*args, **kwargs)
 
     def GetStyleString(*args, **kwargs):

-        """GetStyleString() -> wxString"""
+        """GetStyleString() -> String"""

         return _gdi.Font_GetStyleString(*args, **kwargs)
 
     def GetWeightString(*args, **kwargs):
         return _gdi.Font_GetStyleString(*args, **kwargs)
 
     def GetWeightString(*args, **kwargs):

-        """GetWeightString() -> wxString"""
+        """GetWeightString() -> String"""

         return _gdi.Font_GetWeightString(*args, **kwargs)
 
     def SetNoAntiAliasing(*args, **kwargs):
         return _gdi.Font_GetWeightString(*args, **kwargs)
 
     def SetNoAntiAliasing(*args, **kwargs):


@@ -1489,12 +1486,12 @@ class Font(GDIObject):
         return _gdi.Font_GetNoAntiAliasing(*args, **kwargs)
 
     def GetDefaultEncoding(*args, **kwargs):
         return _gdi.Font_GetNoAntiAliasing(*args, **kwargs)
 
     def GetDefaultEncoding(*args, **kwargs):

-        """Font.GetDefaultEncoding() -> wxFontEncoding"""
+        """Font.GetDefaultEncoding() -> int"""

         return _gdi.Font_GetDefaultEncoding(*args, **kwargs)
 
     GetDefaultEncoding = staticmethod(GetDefaultEncoding)
     def SetDefaultEncoding(*args, **kwargs):
         return _gdi.Font_GetDefaultEncoding(*args, **kwargs)
 
     GetDefaultEncoding = staticmethod(GetDefaultEncoding)
     def SetDefaultEncoding(*args, **kwargs):

-        """Font.SetDefaultEncoding(wxFontEncoding encoding)"""
+        """Font.SetDefaultEncoding(int encoding)"""

         return _gdi.Font_SetDefaultEncoding(*args, **kwargs)
 
     SetDefaultEncoding = staticmethod(SetDefaultEncoding)
         return _gdi.Font_SetDefaultEncoding(*args, **kwargs)
 
     SetDefaultEncoding = staticmethod(SetDefaultEncoding)


@@ -1513,26 +1510,26 @@ def FontFromNativeInfo(*args, **kwargs):
     return val
 
 def FontFromNativeInfoString(*args, **kwargs):
     return val
 
 def FontFromNativeInfoString(*args, **kwargs):

-    """FontFromNativeInfoString(wxString info) -> Font"""
+    """FontFromNativeInfoString(String info) -> Font"""

     val = _gdi.new_FontFromNativeInfoString(*args, **kwargs)
     val.thisown = 1
     return val
 
 def Font2(*args, **kwargs):
     """
     val = _gdi.new_FontFromNativeInfoString(*args, **kwargs)
     val.thisown = 1
     return val
 
 def Font2(*args, **kwargs):
     """

-    Font2(int pointSize, wxFontFamily family, int flags=FONTFLAG_DEFAULT, 
-        wxString face=wxPyEmptyString, wxFontEncoding encoding=FONTENCODING_DEFAULT) -> Font
+    Font2(int pointSize, int family, int flags=FONTFLAG_DEFAULT, 
+        String face=EmptyString, int encoding=FONTENCODING_DEFAULT) -> Font

     """
     val = _gdi.new_Font2(*args, **kwargs)
     val.thisown = 1
     return val
 
 def Font_GetDefaultEncoding(*args, **kwargs):
     """
     val = _gdi.new_Font2(*args, **kwargs)
     val.thisown = 1
     return val
 
 def Font_GetDefaultEncoding(*args, **kwargs):

-    """Font_GetDefaultEncoding() -> wxFontEncoding"""
+    """Font_GetDefaultEncoding() -> int"""

     return _gdi.Font_GetDefaultEncoding(*args, **kwargs)
 
 def Font_SetDefaultEncoding(*args, **kwargs):
     return _gdi.Font_GetDefaultEncoding(*args, **kwargs)
 
 def Font_SetDefaultEncoding(*args, **kwargs):

-    """Font_SetDefaultEncoding(wxFontEncoding encoding)"""
+    """Font_SetDefaultEncoding(int encoding)"""

     return _gdi.Font_SetDefaultEncoding(*args, **kwargs)
 
 #---------------------------------------------------------------------------
     return _gdi.Font_SetDefaultEncoding(*args, **kwargs)
 
 #---------------------------------------------------------------------------


@@ -1559,11 +1556,11 @@ class FontEnumerator(object):
         return _gdi.FontEnumerator__setCallbackInfo(*args, **kwargs)
 
     def EnumerateFacenames(*args, **kwargs):
         return _gdi.FontEnumerator__setCallbackInfo(*args, **kwargs)
 
     def EnumerateFacenames(*args, **kwargs):

-        """EnumerateFacenames(wxFontEncoding encoding=FONTENCODING_SYSTEM, bool fixedWidthOnly=False) -> bool"""
+        """EnumerateFacenames(int encoding=FONTENCODING_SYSTEM, bool fixedWidthOnly=False) -> bool"""

         return _gdi.FontEnumerator_EnumerateFacenames(*args, **kwargs)
 
     def EnumerateEncodings(*args, **kwargs):
         return _gdi.FontEnumerator_EnumerateFacenames(*args, **kwargs)
 
     def EnumerateEncodings(*args, **kwargs):

-        """EnumerateEncodings(wxString facename=wxPyEmptyString) -> bool"""
+        """EnumerateEncodings(String facename=EmptyString) -> bool"""

         return _gdi.FontEnumerator_EnumerateEncodings(*args, **kwargs)
 
     def GetEncodings(*args, **kwargs):
         return _gdi.FontEnumerator_EnumerateEncodings(*args, **kwargs)
 
     def GetEncodings(*args, **kwargs):


@@ -1855,8 +1852,8 @@ class Locale(object):
 
     def Init1(*args, **kwargs):
         """
 
     def Init1(*args, **kwargs):
         """

-        Init1(wxString szName, wxString szShort=wxPyEmptyString, 
-            wxString szLocale=wxPyEmptyString, bool bLoadDefault=True, 
+        Init1(String szName, String szShort=EmptyString, String szLocale=EmptyString, 
+            bool bLoadDefault=True, 

             bool bConvertEncoding=False) -> bool
         """
         return _gdi.Locale_Init1(*args, **kwargs)
             bool bConvertEncoding=False) -> bool
         """
         return _gdi.Locale_Init1(*args, **kwargs)


@@ -1878,12 +1875,12 @@ class Locale(object):
 
     GetSystemLanguage = staticmethod(GetSystemLanguage)
     def GetSystemEncoding(*args, **kwargs):
 
     GetSystemLanguage = staticmethod(GetSystemLanguage)
     def GetSystemEncoding(*args, **kwargs):

-        """Locale.GetSystemEncoding() -> wxFontEncoding"""
+        """Locale.GetSystemEncoding() -> int"""

         return _gdi.Locale_GetSystemEncoding(*args, **kwargs)
 
     GetSystemEncoding = staticmethod(GetSystemEncoding)
     def GetSystemEncodingName(*args, **kwargs):
         return _gdi.Locale_GetSystemEncoding(*args, **kwargs)
 
     GetSystemEncoding = staticmethod(GetSystemEncoding)
     def GetSystemEncodingName(*args, **kwargs):

-        """Locale.GetSystemEncodingName() -> wxString"""
+        """Locale.GetSystemEncodingName() -> String"""

         return _gdi.Locale_GetSystemEncodingName(*args, **kwargs)
 
     GetSystemEncodingName = staticmethod(GetSystemEncodingName)
         return _gdi.Locale_GetSystemEncodingName(*args, **kwargs)
 
     GetSystemEncodingName = staticmethod(GetSystemEncodingName)


@@ -1893,7 +1890,7 @@ class Locale(object):
 
     def __nonzero__(self): return self.IsOk() 
     def GetLocale(*args, **kwargs):
 
     def __nonzero__(self): return self.IsOk() 
     def GetLocale(*args, **kwargs):

-        """GetLocale() -> wxString"""
+        """GetLocale() -> String"""

         return _gdi.Locale_GetLocale(*args, **kwargs)
 
     def GetLanguage(*args, **kwargs):
         return _gdi.Locale_GetLocale(*args, **kwargs)
 
     def GetLanguage(*args, **kwargs):


@@ -1901,24 +1898,24 @@ class Locale(object):
         return _gdi.Locale_GetLanguage(*args, **kwargs)
 
     def GetSysName(*args, **kwargs):
         return _gdi.Locale_GetLanguage(*args, **kwargs)
 
     def GetSysName(*args, **kwargs):

-        """GetSysName() -> wxString"""
+        """GetSysName() -> String"""

         return _gdi.Locale_GetSysName(*args, **kwargs)
 
     def GetCanonicalName(*args, **kwargs):
         return _gdi.Locale_GetSysName(*args, **kwargs)
 
     def GetCanonicalName(*args, **kwargs):

-        """GetCanonicalName() -> wxString"""
+        """GetCanonicalName() -> String"""

         return _gdi.Locale_GetCanonicalName(*args, **kwargs)
 
     def AddCatalogLookupPathPrefix(*args, **kwargs):
         return _gdi.Locale_GetCanonicalName(*args, **kwargs)
 
     def AddCatalogLookupPathPrefix(*args, **kwargs):

-        """Locale.AddCatalogLookupPathPrefix(wxString prefix)"""
+        """Locale.AddCatalogLookupPathPrefix(String prefix)"""

         return _gdi.Locale_AddCatalogLookupPathPrefix(*args, **kwargs)
 
     AddCatalogLookupPathPrefix = staticmethod(AddCatalogLookupPathPrefix)
     def AddCatalog(*args, **kwargs):
         return _gdi.Locale_AddCatalogLookupPathPrefix(*args, **kwargs)
 
     AddCatalogLookupPathPrefix = staticmethod(AddCatalogLookupPathPrefix)
     def AddCatalog(*args, **kwargs):

-        """AddCatalog(wxString szDomain) -> bool"""
+        """AddCatalog(String szDomain) -> bool"""

         return _gdi.Locale_AddCatalog(*args, **kwargs)
 
     def IsLoaded(*args, **kwargs):
         return _gdi.Locale_AddCatalog(*args, **kwargs)
 
     def IsLoaded(*args, **kwargs):

-        """IsLoaded(wxString szDomain) -> bool"""
+        """IsLoaded(String szDomain) -> bool"""

         return _gdi.Locale_IsLoaded(*args, **kwargs)
 
     def GetLanguageInfo(*args, **kwargs):
         return _gdi.Locale_IsLoaded(*args, **kwargs)
 
     def GetLanguageInfo(*args, **kwargs):


@@ -1927,12 +1924,12 @@ class Locale(object):
 
     GetLanguageInfo = staticmethod(GetLanguageInfo)
     def GetLanguageName(*args, **kwargs):
 
     GetLanguageInfo = staticmethod(GetLanguageInfo)
     def GetLanguageName(*args, **kwargs):

-        """Locale.GetLanguageName(int lang) -> wxString"""
+        """Locale.GetLanguageName(int lang) -> String"""

         return _gdi.Locale_GetLanguageName(*args, **kwargs)
 
     GetLanguageName = staticmethod(GetLanguageName)
     def FindLanguageInfo(*args, **kwargs):
         return _gdi.Locale_GetLanguageName(*args, **kwargs)
 
     GetLanguageName = staticmethod(GetLanguageName)
     def FindLanguageInfo(*args, **kwargs):

-        """Locale.FindLanguageInfo(wxString locale) -> LanguageInfo"""
+        """Locale.FindLanguageInfo(String locale) -> LanguageInfo"""

         return _gdi.Locale_FindLanguageInfo(*args, **kwargs)
 
     FindLanguageInfo = staticmethod(FindLanguageInfo)
         return _gdi.Locale_FindLanguageInfo(*args, **kwargs)
 
     FindLanguageInfo = staticmethod(FindLanguageInfo)


@@ -1942,11 +1939,11 @@ class Locale(object):
 
     AddLanguage = staticmethod(AddLanguage)
     def GetString(*args, **kwargs):
 
     AddLanguage = staticmethod(AddLanguage)
     def GetString(*args, **kwargs):

-        """GetString(wxString szOrigString, wxString szDomain=wxPyEmptyString) -> wxString"""
+        """GetString(String szOrigString, String szDomain=EmptyString) -> String"""

         return _gdi.Locale_GetString(*args, **kwargs)
 
     def GetName(*args, **kwargs):
         return _gdi.Locale_GetString(*args, **kwargs)
 
     def GetName(*args, **kwargs):

-        """GetName() -> wxString"""
+        """GetName() -> String"""

         return _gdi.Locale_GetName(*args, **kwargs)
 
 
         return _gdi.Locale_GetName(*args, **kwargs)
 
 


@@ -1962,15 +1959,15 @@ def Locale_GetSystemLanguage(*args, **kwargs):
     return _gdi.Locale_GetSystemLanguage(*args, **kwargs)
 
 def Locale_GetSystemEncoding(*args, **kwargs):
     return _gdi.Locale_GetSystemLanguage(*args, **kwargs)
 
 def Locale_GetSystemEncoding(*args, **kwargs):

-    """Locale_GetSystemEncoding() -> wxFontEncoding"""
+    """Locale_GetSystemEncoding() -> int"""

     return _gdi.Locale_GetSystemEncoding(*args, **kwargs)
 
 def Locale_GetSystemEncodingName(*args, **kwargs):
     return _gdi.Locale_GetSystemEncoding(*args, **kwargs)
 
 def Locale_GetSystemEncodingName(*args, **kwargs):

-    """Locale_GetSystemEncodingName() -> wxString"""
+    """Locale_GetSystemEncodingName() -> String"""

     return _gdi.Locale_GetSystemEncodingName(*args, **kwargs)
 
 def Locale_AddCatalogLookupPathPrefix(*args, **kwargs):
     return _gdi.Locale_GetSystemEncodingName(*args, **kwargs)
 
 def Locale_AddCatalogLookupPathPrefix(*args, **kwargs):

-    """Locale_AddCatalogLookupPathPrefix(wxString prefix)"""
+    """Locale_AddCatalogLookupPathPrefix(String prefix)"""

     return _gdi.Locale_AddCatalogLookupPathPrefix(*args, **kwargs)
 
 def Locale_GetLanguageInfo(*args, **kwargs):
     return _gdi.Locale_AddCatalogLookupPathPrefix(*args, **kwargs)
 
 def Locale_GetLanguageInfo(*args, **kwargs):


@@ -1978,11 +1975,11 @@ def Locale_GetLanguageInfo(*args, **kwargs):
     return _gdi.Locale_GetLanguageInfo(*args, **kwargs)
 
 def Locale_GetLanguageName(*args, **kwargs):
     return _gdi.Locale_GetLanguageInfo(*args, **kwargs)
 
 def Locale_GetLanguageName(*args, **kwargs):

-    """Locale_GetLanguageName(int lang) -> wxString"""
+    """Locale_GetLanguageName(int lang) -> String"""

     return _gdi.Locale_GetLanguageName(*args, **kwargs)
 
 def Locale_FindLanguageInfo(*args, **kwargs):
     return _gdi.Locale_GetLanguageName(*args, **kwargs)
 
 def Locale_FindLanguageInfo(*args, **kwargs):

-    """Locale_FindLanguageInfo(wxString locale) -> LanguageInfo"""
+    """Locale_FindLanguageInfo(String locale) -> LanguageInfo"""

     return _gdi.Locale_FindLanguageInfo(*args, **kwargs)
 
 def Locale_AddLanguage(*args, **kwargs):
     return _gdi.Locale_FindLanguageInfo(*args, **kwargs)
 
 def Locale_AddLanguage(*args, **kwargs):


@@ -2018,28 +2015,25 @@ class EncodingConverter(core.Object):
         except: pass
 
     def Init(*args, **kwargs):
         except: pass
 
     def Init(*args, **kwargs):

-        """
-        Init(wxFontEncoding input_enc, wxFontEncoding output_enc, 
-            int method=CONVERT_STRICT) -> bool
-        """
+        """Init(int input_enc, int output_enc, int method=CONVERT_STRICT) -> bool"""

         return _gdi.EncodingConverter_Init(*args, **kwargs)
 
     def Convert(*args, **kwargs):
         return _gdi.EncodingConverter_Init(*args, **kwargs)
 
     def Convert(*args, **kwargs):

-        """Convert(wxString input) -> wxString"""
+        """Convert(String input) -> String"""

         return _gdi.EncodingConverter_Convert(*args, **kwargs)
 
     def GetPlatformEquivalents(*args, **kwargs):
         return _gdi.EncodingConverter_Convert(*args, **kwargs)
 
     def GetPlatformEquivalents(*args, **kwargs):

-        """EncodingConverter.GetPlatformEquivalents(wxFontEncoding enc, int platform=PLATFORM_CURRENT) -> wxFontEncodingArray"""
+        """EncodingConverter.GetPlatformEquivalents(int enc, int platform=PLATFORM_CURRENT) -> wxFontEncodingArray"""

         return _gdi.EncodingConverter_GetPlatformEquivalents(*args, **kwargs)
 
     GetPlatformEquivalents = staticmethod(GetPlatformEquivalents)
     def GetAllEquivalents(*args, **kwargs):
         return _gdi.EncodingConverter_GetPlatformEquivalents(*args, **kwargs)
 
     GetPlatformEquivalents = staticmethod(GetPlatformEquivalents)
     def GetAllEquivalents(*args, **kwargs):

-        """EncodingConverter.GetAllEquivalents(wxFontEncoding enc) -> wxFontEncodingArray"""
+        """EncodingConverter.GetAllEquivalents(int enc) -> wxFontEncodingArray"""

         return _gdi.EncodingConverter_GetAllEquivalents(*args, **kwargs)
 
     GetAllEquivalents = staticmethod(GetAllEquivalents)
     def CanConvert(*args, **kwargs):
         return _gdi.EncodingConverter_GetAllEquivalents(*args, **kwargs)
 
     GetAllEquivalents = staticmethod(GetAllEquivalents)
     def CanConvert(*args, **kwargs):

-        """EncodingConverter.CanConvert(wxFontEncoding encIn, wxFontEncoding encOut) -> bool"""
+        """EncodingConverter.CanConvert(int encIn, int encOut) -> bool"""

         return _gdi.EncodingConverter_CanConvert(*args, **kwargs)
 
     CanConvert = staticmethod(CanConvert)
         return _gdi.EncodingConverter_CanConvert(*args, **kwargs)
 
     CanConvert = staticmethod(CanConvert)


@@ -2054,21 +2048,21 @@ _gdi.EncodingConverter_swigregister(EncodingConverterPtr)
 
 def GetTranslation(*args):
     """
 
 def GetTranslation(*args):
     """

-    GetTranslation(wxString sz) -> wxString
-    GetTranslation(wxString sz1, wxString sz2, size_t n) -> wxString
+    GetTranslation(String sz) -> String
+    GetTranslation(String sz1, String sz2, size_t n) -> String

     """
     return _gdi.GetTranslation(*args)
 
 def EncodingConverter_GetPlatformEquivalents(*args, **kwargs):
     """
     return _gdi.GetTranslation(*args)
 
 def EncodingConverter_GetPlatformEquivalents(*args, **kwargs):

-    """EncodingConverter_GetPlatformEquivalents(wxFontEncoding enc, int platform=PLATFORM_CURRENT) -> wxFontEncodingArray"""
+    """EncodingConverter_GetPlatformEquivalents(int enc, int platform=PLATFORM_CURRENT) -> wxFontEncodingArray"""

     return _gdi.EncodingConverter_GetPlatformEquivalents(*args, **kwargs)
 
 def EncodingConverter_GetAllEquivalents(*args, **kwargs):
     return _gdi.EncodingConverter_GetPlatformEquivalents(*args, **kwargs)
 
 def EncodingConverter_GetAllEquivalents(*args, **kwargs):

-    """EncodingConverter_GetAllEquivalents(wxFontEncoding enc) -> wxFontEncodingArray"""
+    """EncodingConverter_GetAllEquivalents(int enc) -> wxFontEncodingArray"""

     return _gdi.EncodingConverter_GetAllEquivalents(*args, **kwargs)
 
 def EncodingConverter_CanConvert(*args, **kwargs):
     return _gdi.EncodingConverter_GetAllEquivalents(*args, **kwargs)
 
 def EncodingConverter_CanConvert(*args, **kwargs):

-    """EncodingConverter_CanConvert(wxFontEncoding encIn, wxFontEncoding encOut) -> bool"""
+    """EncodingConverter_CanConvert(int encIn, int encOut) -> bool"""

     return _gdi.EncodingConverter_CanConvert(*args, **kwargs)
 
 #----------------------------------------------------------------------------
     return _gdi.EncodingConverter_CanConvert(*args, **kwargs)
 
 #----------------------------------------------------------------------------


@@ -2236,19 +2230,19 @@ class DC(core.Object):
         return _gdi.DC_DrawBitmap(*args, **kwargs)
 
     def DrawTextXY(*args, **kwargs):
         return _gdi.DC_DrawBitmap(*args, **kwargs)
 
     def DrawTextXY(*args, **kwargs):

-        """DrawTextXY(wxString text, int x, int y)"""
+        """DrawTextXY(String text, int x, int y)"""

         return _gdi.DC_DrawTextXY(*args, **kwargs)
 
     def DrawText(*args, **kwargs):
         return _gdi.DC_DrawTextXY(*args, **kwargs)
 
     def DrawText(*args, **kwargs):

-        """DrawText(wxString text, Point pt)"""
+        """DrawText(String text, Point pt)"""

         return _gdi.DC_DrawText(*args, **kwargs)
 
     def DrawRotatedTextXY(*args, **kwargs):
         return _gdi.DC_DrawText(*args, **kwargs)
 
     def DrawRotatedTextXY(*args, **kwargs):

-        """DrawRotatedTextXY(wxString text, int x, int y, double angle)"""
+        """DrawRotatedTextXY(String text, int x, int y, double angle)"""

         return _gdi.DC_DrawRotatedTextXY(*args, **kwargs)
 
     def DrawRotatedText(*args, **kwargs):
         return _gdi.DC_DrawRotatedTextXY(*args, **kwargs)
 
     def DrawRotatedText(*args, **kwargs):

-        """DrawRotatedText(wxString text, Point pt, double angle)"""
+        """DrawRotatedText(String text, Point pt, double angle)"""

         return _gdi.DC_DrawRotatedText(*args, **kwargs)
 
     def BlitXY(*args, **kwargs):
         return _gdi.DC_DrawRotatedText(*args, **kwargs)
 
     def BlitXY(*args, **kwargs):


@@ -2279,14 +2273,14 @@ class DC(core.Object):
 
     def DrawLabel(*args, **kwargs):
         """
 
     def DrawLabel(*args, **kwargs):
         """

-        DrawLabel(wxString text, Rect rect, int alignment=wxALIGN_LEFT|wxALIGN_TOP, 
+        DrawLabel(String text, Rect rect, int alignment=wxALIGN_LEFT|wxALIGN_TOP, 

             int indexAccel=-1)
         """
         return _gdi.DC_DrawLabel(*args, **kwargs)
 
     def DrawImageLabel(*args, **kwargs):
         """
             int indexAccel=-1)
         """
         return _gdi.DC_DrawLabel(*args, **kwargs)
 
     def DrawImageLabel(*args, **kwargs):
         """

-        DrawImageLabel(wxString text, Bitmap image, Rect rect, int alignment=wxALIGN_LEFT|wxALIGN_TOP, 
+        DrawImageLabel(String text, Bitmap image, Rect rect, int alignment=wxALIGN_LEFT|wxALIGN_TOP, 

             int indexAccel=-1) -> Rect
         """
         return _gdi.DC_DrawImageLabel(*args, **kwargs)
             int indexAccel=-1) -> Rect
         """
         return _gdi.DC_DrawImageLabel(*args, **kwargs)


@@ -2300,7 +2294,7 @@ class DC(core.Object):
         return _gdi.DC_Clear(*args, **kwargs)
 
     def StartDoc(*args, **kwargs):
         return _gdi.DC_Clear(*args, **kwargs)
 
     def StartDoc(*args, **kwargs):

-        """StartDoc(wxString message) -> bool"""
+        """StartDoc(String message) -> bool"""

         return _gdi.DC_StartDoc(*args, **kwargs)
 
     def EndDoc(*args, **kwargs):
         return _gdi.DC_StartDoc(*args, **kwargs)
 
     def EndDoc(*args, **kwargs):


@@ -2984,7 +2978,7 @@ class MetaFile(core.Object):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxMetaFile instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxMetaFile instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):

-        """__init__(wxString filename=wxPyEmptyString) -> MetaFile"""
+        """__init__(String filename=EmptyString) -> MetaFile"""

         newobj = _gdi.new_MetaFile(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         newobj = _gdi.new_MetaFile(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1


@@ -3002,8 +2996,8 @@ class MetaFileDC(DC):
         return "<%s.%s; proxy of C++ wxMetaFileDC instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """
         return "<%s.%s; proxy of C++ wxMetaFileDC instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """

-        __init__(wxString filename=wxPyEmptyString, int width=0, int height=0, 
-            wxString description=wxPyEmptyString) -> MetaFileDC
+        __init__(String filename=EmptyString, int width=0, int height=0, 
+            String description=EmptyString) -> MetaFileDC

         """
         newobj = _gdi.new_MetaFileDC(*args, **kwargs)
         self.this = newobj.this
         """
         newobj = _gdi.new_MetaFileDC(*args, **kwargs)
         self.this = newobj.this


@@ -3179,20 +3173,20 @@ class ColourDatabase(core.Object):
         except: pass
 
     def Find(*args, **kwargs):
         except: pass
 
     def Find(*args, **kwargs):

-        """Find(wxString name) -> Colour"""
+        """Find(String name) -> Colour"""

         return _gdi.ColourDatabase_Find(*args, **kwargs)
 
     def FindName(*args, **kwargs):
         return _gdi.ColourDatabase_Find(*args, **kwargs)
 
     def FindName(*args, **kwargs):

-        """FindName(Colour colour) -> wxString"""
+        """FindName(Colour colour) -> String"""

         return _gdi.ColourDatabase_FindName(*args, **kwargs)
 
     FindColour = Find 
     def AddColour(*args, **kwargs):
         return _gdi.ColourDatabase_FindName(*args, **kwargs)
 
     FindColour = Find 
     def AddColour(*args, **kwargs):

-        """AddColour(wxString name, Colour colour)"""
+        """AddColour(String name, Colour colour)"""

         return _gdi.ColourDatabase_AddColour(*args, **kwargs)
 
     def Append(*args, **kwargs):
         return _gdi.ColourDatabase_AddColour(*args, **kwargs)
 
     def Append(*args, **kwargs):

-        """Append(wxString name, int red, int green, int blue)"""
+        """Append(String name, int red, int green, int blue)"""

         return _gdi.ColourDatabase_Append(*args, **kwargs)
 
 
         return _gdi.ColourDatabase_Append(*args, **kwargs)
 
 


@@ -3214,8 +3208,8 @@ class FontList(core.Object):
     def FindOrCreateFont(*args, **kwargs):
         """
         FindOrCreateFont(int point_size, int family, int style, int weight, 
     def FindOrCreateFont(*args, **kwargs):
         """
         FindOrCreateFont(int point_size, int family, int style, int weight, 

-            bool underline=False, wxString facename=wxPyEmptyString, 
-            wxFontEncoding encoding=FONTENCODING_DEFAULT) -> Font
+            bool underline=False, String facename=EmptyString, 
+            int encoding=FONTENCODING_DEFAULT) -> Font

         """
         return _gdi.FontList_FindOrCreateFont(*args, **kwargs)
 
         """
         return _gdi.FontList_FindOrCreateFont(*args, **kwargs)
 

diff --git a/wxPython/src/gtk/gdi_wrap.cpp b/wxPython/src/gtk/gdi_wrap.cpp
index b0372a48b5a946156038c1c3cccf7493da7ffad2..fc55ff675e87e319d9f0e18f86bd6b65f2965c97 100644 (file)
--- a/wxPython/src/gtk/gdi_wrap.cpp
+++ b/wxPython/src/gtk/gdi_wrap.cpp
@@ -5649,7 +5649,7 @@ static PyObject * NativeFontInfo_swigregister(PyObject *self, PyObject *args) {
 static PyObject *_wrap_NativeEncodingInfo_facename_set(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxNativeEncodingInfo *arg1 = (wxNativeEncodingInfo *) 0 ;
 static PyObject *_wrap_NativeEncodingInfo_facename_set(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxNativeEncodingInfo *arg1 = (wxNativeEncodingInfo *) 0 ;

-    wxString arg2 ;
+    wxString *arg2 = (wxString *) 0 ;

     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {


@@ -5658,13 +5658,8 @@ static PyObject *_wrap_NativeEncodingInfo_facename_set(PyObject *self, PyObject
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:NativeEncodingInfo_facename_set",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxNativeEncodingInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:NativeEncodingInfo_facename_set",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxNativeEncodingInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;

-    {
-        wxString* sptr = wxString_in_helper(obj1);
-        if (sptr == NULL) SWIG_fail;
-        arg2 = *sptr;
-        delete sptr;
-    }
-    if (arg1) (arg1)->facename = arg2;
+    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxString,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if (arg1) (arg1)->facename = *arg2;

     
     Py_INCREF(Py_None); resultobj = Py_None;
     return resultobj;
     
     Py_INCREF(Py_None); resultobj = Py_None;
     return resultobj;


@@ -5676,7 +5671,7 @@ static PyObject *_wrap_NativeEncodingInfo_facename_set(PyObject *self, PyObject
 static PyObject *_wrap_NativeEncodingInfo_facename_get(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxNativeEncodingInfo *arg1 = (wxNativeEncodingInfo *) 0 ;
 static PyObject *_wrap_NativeEncodingInfo_facename_get(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxNativeEncodingInfo *arg1 = (wxNativeEncodingInfo *) 0 ;

-    wxString result;
+    wxString *result;

     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 


@@ -5684,13 +5679,13 @@ static PyObject *_wrap_NativeEncodingInfo_facename_get(PyObject *self, PyObject
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:NativeEncodingInfo_facename_get",kwnames,&obj0)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxNativeEncodingInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:NativeEncodingInfo_facename_get",kwnames,&obj0)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxNativeEncodingInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;

-    result =  ((arg1)->facename);
+    result = (wxString *)& ((arg1)->facename);

     
     {
 #if wxUSE_UNICODE
     
     {
 #if wxUSE_UNICODE

-        resultobj = PyUnicode_FromWideChar((&result)->c_str(), (&result)->Len());
+        resultobj = PyUnicode_FromWideChar(result->c_str(), result->Len());

 #else
 #else

-        resultobj = PyString_FromStringAndSize((&result)->c_str(), (&result)->Len());
+        resultobj = PyString_FromStringAndSize(result->c_str(), result->Len());

 #endif
     }
     return resultobj;
 #endif
     }
     return resultobj;


@@ -7751,7 +7746,7 @@ static PyObject *_wrap_LanguageInfo_Language_get(PyObject *self, PyObject *args,
 static PyObject *_wrap_LanguageInfo_CanonicalName_set(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxLanguageInfo *arg1 = (wxLanguageInfo *) 0 ;
 static PyObject *_wrap_LanguageInfo_CanonicalName_set(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxLanguageInfo *arg1 = (wxLanguageInfo *) 0 ;

-    wxString arg2 ;
+    wxString *arg2 = (wxString *) 0 ;

     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {


@@ -7760,13 +7755,8 @@ static PyObject *_wrap_LanguageInfo_CanonicalName_set(PyObject *self, PyObject *
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:LanguageInfo_CanonicalName_set",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxLanguageInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:LanguageInfo_CanonicalName_set",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxLanguageInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;

-    {
-        wxString* sptr = wxString_in_helper(obj1);
-        if (sptr == NULL) SWIG_fail;
-        arg2 = *sptr;
-        delete sptr;
-    }
-    if (arg1) (arg1)->CanonicalName = arg2;
+    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxString,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if (arg1) (arg1)->CanonicalName = *arg2;

     
     Py_INCREF(Py_None); resultobj = Py_None;
     return resultobj;
     
     Py_INCREF(Py_None); resultobj = Py_None;
     return resultobj;


@@ -7778,7 +7768,7 @@ static PyObject *_wrap_LanguageInfo_CanonicalName_set(PyObject *self, PyObject *
 static PyObject *_wrap_LanguageInfo_CanonicalName_get(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxLanguageInfo *arg1 = (wxLanguageInfo *) 0 ;
 static PyObject *_wrap_LanguageInfo_CanonicalName_get(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxLanguageInfo *arg1 = (wxLanguageInfo *) 0 ;

-    wxString result;
+    wxString *result;

     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 


@@ -7786,13 +7776,13 @@ static PyObject *_wrap_LanguageInfo_CanonicalName_get(PyObject *self, PyObject *
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:LanguageInfo_CanonicalName_get",kwnames,&obj0)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxLanguageInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:LanguageInfo_CanonicalName_get",kwnames,&obj0)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxLanguageInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;

-    result =  ((arg1)->CanonicalName);
+    result = (wxString *)& ((arg1)->CanonicalName);

     
     {
 #if wxUSE_UNICODE
     
     {
 #if wxUSE_UNICODE

-        resultobj = PyUnicode_FromWideChar((&result)->c_str(), (&result)->Len());
+        resultobj = PyUnicode_FromWideChar(result->c_str(), result->Len());

 #else
 #else

-        resultobj = PyString_FromStringAndSize((&result)->c_str(), (&result)->Len());
+        resultobj = PyString_FromStringAndSize(result->c_str(), result->Len());

 #endif
     }
     return resultobj;
 #endif
     }
     return resultobj;


@@ -7804,7 +7794,7 @@ static PyObject *_wrap_LanguageInfo_CanonicalName_get(PyObject *self, PyObject *
 static PyObject *_wrap_LanguageInfo_Description_set(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxLanguageInfo *arg1 = (wxLanguageInfo *) 0 ;
 static PyObject *_wrap_LanguageInfo_Description_set(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxLanguageInfo *arg1 = (wxLanguageInfo *) 0 ;

-    wxString arg2 ;
+    wxString *arg2 = (wxString *) 0 ;

     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {


@@ -7813,13 +7803,8 @@ static PyObject *_wrap_LanguageInfo_Description_set(PyObject *self, PyObject *ar
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:LanguageInfo_Description_set",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxLanguageInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:LanguageInfo_Description_set",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxLanguageInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;

-    {
-        wxString* sptr = wxString_in_helper(obj1);
-        if (sptr == NULL) SWIG_fail;
-        arg2 = *sptr;
-        delete sptr;
-    }
-    if (arg1) (arg1)->Description = arg2;
+    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxString,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if (arg1) (arg1)->Description = *arg2;

     
     Py_INCREF(Py_None); resultobj = Py_None;
     return resultobj;
     
     Py_INCREF(Py_None); resultobj = Py_None;
     return resultobj;


@@ -7831,7 +7816,7 @@ static PyObject *_wrap_LanguageInfo_Description_set(PyObject *self, PyObject *ar
 static PyObject *_wrap_LanguageInfo_Description_get(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxLanguageInfo *arg1 = (wxLanguageInfo *) 0 ;
 static PyObject *_wrap_LanguageInfo_Description_get(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxLanguageInfo *arg1 = (wxLanguageInfo *) 0 ;

-    wxString result;
+    wxString *result;

     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 


@@ -7839,13 +7824,13 @@ static PyObject *_wrap_LanguageInfo_Description_get(PyObject *self, PyObject *ar
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:LanguageInfo_Description_get",kwnames,&obj0)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxLanguageInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:LanguageInfo_Description_get",kwnames,&obj0)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxLanguageInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;

-    result =  ((arg1)->Description);
+    result = (wxString *)& ((arg1)->Description);

     
     {
 #if wxUSE_UNICODE
     
     {
 #if wxUSE_UNICODE

-        resultobj = PyUnicode_FromWideChar((&result)->c_str(), (&result)->Len());
+        resultobj = PyUnicode_FromWideChar(result->c_str(), result->Len());

 #else
 #else

-        resultobj = PyString_FromStringAndSize((&result)->c_str(), (&result)->Len());
+        resultobj = PyString_FromStringAndSize(result->c_str(), result->Len());

 #endif
     }
     return resultobj;
 #endif
     }
     return resultobj;

diff --git a/wxPython/src/gtk/grid.py b/wxPython/src/gtk/grid.py
index 5874da0dbc0857c33bdb31bf8d726b3dc3ab19c0..7658820a81dcca9c9287829b9284bb3951af333e 100644 (file)
--- a/wxPython/src/gtk/grid.py
+++ b/wxPython/src/gtk/grid.py
@@ -24,7 +24,7 @@ class GridCellRenderer(object):
         return _grid.GridCellRenderer__setOORInfo(*args, **kwargs)
 
     def SetParameters(*args, **kwargs):
         return _grid.GridCellRenderer__setOORInfo(*args, **kwargs)
 
     def SetParameters(*args, **kwargs):

-        """SetParameters(wxString params)"""
+        """SetParameters(String params)"""

         return _grid.GridCellRenderer_SetParameters(*args, **kwargs)
 
     def IncRef(*args, **kwargs):
         return _grid.GridCellRenderer_SetParameters(*args, **kwargs)
 
     def IncRef(*args, **kwargs):


@@ -37,13 +37,13 @@ class GridCellRenderer(object):
 
     def Draw(*args, **kwargs):
         """
 
     def Draw(*args, **kwargs):
         """

-        Draw(Grid grid, GridCellAttr attr, wxDC dc, Rect rect, int row, 
+        Draw(Grid grid, GridCellAttr attr, DC dc, Rect rect, int row, 

             int col, bool isSelected)
         """
         return _grid.GridCellRenderer_Draw(*args, **kwargs)
 
     def GetBestSize(*args, **kwargs):
             int col, bool isSelected)
         """
         return _grid.GridCellRenderer_Draw(*args, **kwargs)
 
     def GetBestSize(*args, **kwargs):

-        """GetBestSize(Grid grid, GridCellAttr attr, wxDC dc, int row, int col) -> Size"""
+        """GetBestSize(Grid grid, GridCellAttr attr, DC dc, int row, int col) -> Size"""

         return _grid.GridCellRenderer_GetBestSize(*args, **kwargs)
 
     def Clone(*args, **kwargs):
         return _grid.GridCellRenderer_GetBestSize(*args, **kwargs)
 
     def Clone(*args, **kwargs):


@@ -77,7 +77,7 @@ class PyGridCellRenderer(GridCellRenderer):
         return _grid.PyGridCellRenderer__setCallbackInfo(*args, **kwargs)
 
     def base_SetParameters(*args, **kwargs):
         return _grid.PyGridCellRenderer__setCallbackInfo(*args, **kwargs)
 
     def base_SetParameters(*args, **kwargs):

-        """base_SetParameters(wxString params)"""
+        """base_SetParameters(String params)"""

         return _grid.PyGridCellRenderer_base_SetParameters(*args, **kwargs)
 
 
         return _grid.PyGridCellRenderer_base_SetParameters(*args, **kwargs)
 
 


@@ -184,7 +184,7 @@ class GridCellDateTimeRenderer(GridCellStringRenderer):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxGridCellDateTimeRenderer instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxGridCellDateTimeRenderer instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):

-        """__init__(wxString outformat=wxPyDateTimeFormatStr, wxString informat=wxPyDateTimeFormatStr) -> GridCellDateTimeRenderer"""
+        """__init__(String outformat=wxPyDateTimeFormatStr, String informat=wxPyDateTimeFormatStr) -> GridCellDateTimeRenderer"""

         newobj = _grid.new_GridCellDateTimeRenderer(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         newobj = _grid.new_GridCellDateTimeRenderer(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1


@@ -203,7 +203,7 @@ class GridCellEnumRenderer(GridCellStringRenderer):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxGridCellEnumRenderer instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxGridCellEnumRenderer instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):

-        """__init__(wxString choices=wxPyEmptyString) -> GridCellEnumRenderer"""
+        """__init__(String choices=EmptyString) -> GridCellEnumRenderer"""

         newobj = _grid.new_GridCellEnumRenderer(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         newobj = _grid.new_GridCellEnumRenderer(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1


@@ -266,7 +266,7 @@ class GridCellEditor(object):
         return _grid.GridCellEditor_SetCellAttr(*args, **kwargs)
 
     def SetParameters(*args, **kwargs):
         return _grid.GridCellEditor_SetCellAttr(*args, **kwargs)
 
     def SetParameters(*args, **kwargs):

-        """SetParameters(wxString params)"""
+        """SetParameters(String params)"""

         return _grid.GridCellEditor_SetParameters(*args, **kwargs)
 
     def IncRef(*args, **kwargs):
         return _grid.GridCellEditor_SetParameters(*args, **kwargs)
 
     def IncRef(*args, **kwargs):


@@ -385,7 +385,7 @@ class PyGridCellEditor(GridCellEditor):
         return _grid.PyGridCellEditor_base_Destroy(*args, **kwargs)
 
     def base_SetParameters(*args, **kwargs):
         return _grid.PyGridCellEditor_base_Destroy(*args, **kwargs)
 
     def base_SetParameters(*args, **kwargs):

-        """base_SetParameters(wxString params)"""
+        """base_SetParameters(String params)"""

         return _grid.PyGridCellEditor_base_SetParameters(*args, **kwargs)
 
 
         return _grid.PyGridCellEditor_base_SetParameters(*args, **kwargs)
 
 


@@ -408,7 +408,7 @@ class GridCellTextEditor(GridCellEditor):
         self._setOORInfo(self)
 
     def GetValue(*args, **kwargs):
         self._setOORInfo(self)
 
     def GetValue(*args, **kwargs):

-        """GetValue() -> wxString"""
+        """GetValue() -> String"""

         return _grid.GridCellTextEditor_GetValue(*args, **kwargs)
 
 
         return _grid.GridCellTextEditor_GetValue(*args, **kwargs)
 
 


@@ -431,7 +431,7 @@ class GridCellNumberEditor(GridCellTextEditor):
         self._setOORInfo(self)
 
     def GetValue(*args, **kwargs):
         self._setOORInfo(self)
 
     def GetValue(*args, **kwargs):

-        """GetValue() -> wxString"""
+        """GetValue() -> String"""

         return _grid.GridCellNumberEditor_GetValue(*args, **kwargs)
 
 
         return _grid.GridCellNumberEditor_GetValue(*args, **kwargs)
 
 


@@ -454,7 +454,7 @@ class GridCellFloatEditor(GridCellTextEditor):
         self._setOORInfo(self)
 
     def GetValue(*args, **kwargs):
         self._setOORInfo(self)
 
     def GetValue(*args, **kwargs):

-        """GetValue() -> wxString"""
+        """GetValue() -> String"""

         return _grid.GridCellFloatEditor_GetValue(*args, **kwargs)
 
 
         return _grid.GridCellFloatEditor_GetValue(*args, **kwargs)
 
 


@@ -477,7 +477,7 @@ class GridCellBoolEditor(GridCellEditor):
         self._setOORInfo(self)
 
     def GetValue(*args, **kwargs):
         self._setOORInfo(self)
 
     def GetValue(*args, **kwargs):

-        """GetValue() -> wxString"""
+        """GetValue() -> String"""

         return _grid.GridCellBoolEditor_GetValue(*args, **kwargs)
 
 
         return _grid.GridCellBoolEditor_GetValue(*args, **kwargs)
 
 


@@ -492,7 +492,7 @@ class GridCellChoiceEditor(GridCellEditor):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxGridCellChoiceEditor instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxGridCellChoiceEditor instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):

-        """__init__(int choices=0, wxString choices_array=None, bool allowOthers=False) -> GridCellChoiceEditor"""
+        """__init__(int choices=0, String choices_array=None, bool allowOthers=False) -> GridCellChoiceEditor"""

         newobj = _grid.new_GridCellChoiceEditor(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         newobj = _grid.new_GridCellChoiceEditor(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1


@@ -500,7 +500,7 @@ class GridCellChoiceEditor(GridCellEditor):
         self._setOORInfo(self)
 
     def GetValue(*args, **kwargs):
         self._setOORInfo(self)
 
     def GetValue(*args, **kwargs):

-        """GetValue() -> wxString"""
+        """GetValue() -> String"""

         return _grid.GridCellChoiceEditor_GetValue(*args, **kwargs)
 
 
         return _grid.GridCellChoiceEditor_GetValue(*args, **kwargs)
 
 


@@ -515,7 +515,7 @@ class GridCellEnumEditor(GridCellChoiceEditor):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxGridCellEnumEditor instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxGridCellEnumEditor instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):

-        """__init__(wxString choices=wxPyEmptyString) -> GridCellEnumEditor"""
+        """__init__(String choices=EmptyString) -> GridCellEnumEditor"""

         newobj = _grid.new_GridCellEnumEditor(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         newobj = _grid.new_GridCellEnumEditor(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1


@@ -523,7 +523,7 @@ class GridCellEnumEditor(GridCellChoiceEditor):
         self._setOORInfo(self)
 
     def GetValue(*args, **kwargs):
         self._setOORInfo(self)
 
     def GetValue(*args, **kwargs):

-        """GetValue() -> wxString"""
+        """GetValue() -> String"""

         return _grid.GridCellEnumEditor_GetValue(*args, **kwargs)
 
 
         return _grid.GridCellEnumEditor_GetValue(*args, **kwargs)
 
 


@@ -546,7 +546,7 @@ class GridCellAutoWrapStringEditor(GridCellTextEditor):
         self._setOORInfo(self)
 
     def GetValue(*args, **kwargs):
         self._setOORInfo(self)
 
     def GetValue(*args, **kwargs):

-        """GetValue() -> wxString"""
+        """GetValue() -> String"""

         return _grid.GridCellAutoWrapStringEditor_GetValue(*args, **kwargs)
 
 
         return _grid.GridCellAutoWrapStringEditor_GetValue(*args, **kwargs)
 
 


@@ -595,15 +595,15 @@ class GridCellAttr(object):
         return _grid.GridCellAttr_DecRef(*args, **kwargs)
 
     def SetTextColour(*args, **kwargs):
         return _grid.GridCellAttr_DecRef(*args, **kwargs)
 
     def SetTextColour(*args, **kwargs):

-        """SetTextColour(wxColour colText)"""
+        """SetTextColour(Colour colText)"""

         return _grid.GridCellAttr_SetTextColour(*args, **kwargs)
 
     def SetBackgroundColour(*args, **kwargs):
         return _grid.GridCellAttr_SetTextColour(*args, **kwargs)
 
     def SetBackgroundColour(*args, **kwargs):

-        """SetBackgroundColour(wxColour colBack)"""
+        """SetBackgroundColour(Colour colBack)"""

         return _grid.GridCellAttr_SetBackgroundColour(*args, **kwargs)
 
     def SetFont(*args, **kwargs):
         return _grid.GridCellAttr_SetBackgroundColour(*args, **kwargs)
 
     def SetFont(*args, **kwargs):

-        """SetFont(wxFont font)"""
+        """SetFont(Font font)"""

         return _grid.GridCellAttr_SetFont(*args, **kwargs)
 
     def SetAlignment(*args, **kwargs):
         return _grid.GridCellAttr_SetFont(*args, **kwargs)
 
     def SetAlignment(*args, **kwargs):


@@ -631,7 +631,7 @@ class GridCellAttr(object):
         return _grid.GridCellAttr_SetEditor(*args, **kwargs)
 
     def SetKind(*args, **kwargs):
         return _grid.GridCellAttr_SetEditor(*args, **kwargs)
 
     def SetKind(*args, **kwargs):

-        """SetKind(wxGridCellAttr::wxAttrKind kind)"""
+        """SetKind(int kind)"""

         return _grid.GridCellAttr_SetKind(*args, **kwargs)
 
     def HasTextColour(*args, **kwargs):
         return _grid.GridCellAttr_SetKind(*args, **kwargs)
 
     def HasTextColour(*args, **kwargs):


@@ -667,15 +667,15 @@ class GridCellAttr(object):
         return _grid.GridCellAttr_HasOverflowMode(*args, **kwargs)
 
     def GetTextColour(*args, **kwargs):
         return _grid.GridCellAttr_HasOverflowMode(*args, **kwargs)
 
     def GetTextColour(*args, **kwargs):

-        """GetTextColour() -> wxColour"""
+        """GetTextColour() -> Colour"""

         return _grid.GridCellAttr_GetTextColour(*args, **kwargs)
 
     def GetBackgroundColour(*args, **kwargs):
         return _grid.GridCellAttr_GetTextColour(*args, **kwargs)
 
     def GetBackgroundColour(*args, **kwargs):

-        """GetBackgroundColour() -> wxColour"""
+        """GetBackgroundColour() -> Colour"""

         return _grid.GridCellAttr_GetBackgroundColour(*args, **kwargs)
 
     def GetFont(*args, **kwargs):
         return _grid.GridCellAttr_GetBackgroundColour(*args, **kwargs)
 
     def GetFont(*args, **kwargs):

-        """GetFont() -> wxFont"""
+        """GetFont() -> Font"""

         return _grid.GridCellAttr_GetFont(*args, **kwargs)
 
     def GetAlignment(*args, **kwargs):
         return _grid.GridCellAttr_GetFont(*args, **kwargs)
 
     def GetAlignment(*args, **kwargs):


@@ -730,7 +730,7 @@ class GridCellAttrProvider(object):
         return _grid.GridCellAttrProvider__setOORInfo(*args, **kwargs)
 
     def GetAttr(*args, **kwargs):
         return _grid.GridCellAttrProvider__setOORInfo(*args, **kwargs)
 
     def GetAttr(*args, **kwargs):

-        """GetAttr(int row, int col, wxGridCellAttr::wxAttrKind kind) -> GridCellAttr"""
+        """GetAttr(int row, int col, int kind) -> GridCellAttr"""

         return _grid.GridCellAttrProvider_GetAttr(*args, **kwargs)
 
     def SetAttr(*args, **kwargs):
         return _grid.GridCellAttrProvider_GetAttr(*args, **kwargs)
 
     def SetAttr(*args, **kwargs):


@@ -777,7 +777,7 @@ class PyGridCellAttrProvider(GridCellAttrProvider):
         return _grid.PyGridCellAttrProvider__setCallbackInfo(*args, **kwargs)
 
     def base_GetAttr(*args, **kwargs):
         return _grid.PyGridCellAttrProvider__setCallbackInfo(*args, **kwargs)
 
     def base_GetAttr(*args, **kwargs):

-        """base_GetAttr(int row, int col, wxGridCellAttr::wxAttrKind kind) -> GridCellAttr"""
+        """base_GetAttr(int row, int col, int kind) -> GridCellAttr"""

         return _grid.PyGridCellAttrProvider_base_GetAttr(*args, **kwargs)
 
     def base_SetAttr(*args, **kwargs):
         return _grid.PyGridCellAttrProvider_base_GetAttr(*args, **kwargs)
 
     def base_SetAttr(*args, **kwargs):


@@ -837,23 +837,23 @@ class GridTableBase(core.Object):
         return _grid.GridTableBase_IsEmptyCell(*args, **kwargs)
 
     def GetValue(*args, **kwargs):
         return _grid.GridTableBase_IsEmptyCell(*args, **kwargs)
 
     def GetValue(*args, **kwargs):

-        """GetValue(int row, int col) -> wxString"""
+        """GetValue(int row, int col) -> String"""

         return _grid.GridTableBase_GetValue(*args, **kwargs)
 
     def SetValue(*args, **kwargs):
         return _grid.GridTableBase_GetValue(*args, **kwargs)
 
     def SetValue(*args, **kwargs):

-        """SetValue(int row, int col, wxString value)"""
+        """SetValue(int row, int col, String value)"""

         return _grid.GridTableBase_SetValue(*args, **kwargs)
 
     def GetTypeName(*args, **kwargs):
         return _grid.GridTableBase_SetValue(*args, **kwargs)
 
     def GetTypeName(*args, **kwargs):

-        """GetTypeName(int row, int col) -> wxString"""
+        """GetTypeName(int row, int col) -> String"""

         return _grid.GridTableBase_GetTypeName(*args, **kwargs)
 
     def CanGetValueAs(*args, **kwargs):
         return _grid.GridTableBase_GetTypeName(*args, **kwargs)
 
     def CanGetValueAs(*args, **kwargs):

-        """CanGetValueAs(int row, int col, wxString typeName) -> bool"""
+        """CanGetValueAs(int row, int col, String typeName) -> bool"""

         return _grid.GridTableBase_CanGetValueAs(*args, **kwargs)
 
     def CanSetValueAs(*args, **kwargs):
         return _grid.GridTableBase_CanGetValueAs(*args, **kwargs)
 
     def CanSetValueAs(*args, **kwargs):

-        """CanSetValueAs(int row, int col, wxString typeName) -> bool"""
+        """CanSetValueAs(int row, int col, String typeName) -> bool"""

         return _grid.GridTableBase_CanSetValueAs(*args, **kwargs)
 
     def GetValueAsLong(*args, **kwargs):
         return _grid.GridTableBase_CanSetValueAs(*args, **kwargs)
 
     def GetValueAsLong(*args, **kwargs):


@@ -909,19 +909,19 @@ class GridTableBase(core.Object):
         return _grid.GridTableBase_DeleteCols(*args, **kwargs)
 
     def GetRowLabelValue(*args, **kwargs):
         return _grid.GridTableBase_DeleteCols(*args, **kwargs)
 
     def GetRowLabelValue(*args, **kwargs):

-        """GetRowLabelValue(int row) -> wxString"""
+        """GetRowLabelValue(int row) -> String"""

         return _grid.GridTableBase_GetRowLabelValue(*args, **kwargs)
 
     def GetColLabelValue(*args, **kwargs):
         return _grid.GridTableBase_GetRowLabelValue(*args, **kwargs)
 
     def GetColLabelValue(*args, **kwargs):

-        """GetColLabelValue(int col) -> wxString"""
+        """GetColLabelValue(int col) -> String"""

         return _grid.GridTableBase_GetColLabelValue(*args, **kwargs)
 
     def SetRowLabelValue(*args, **kwargs):
         return _grid.GridTableBase_GetColLabelValue(*args, **kwargs)
 
     def SetRowLabelValue(*args, **kwargs):

-        """SetRowLabelValue(int row, wxString value)"""
+        """SetRowLabelValue(int row, String value)"""

         return _grid.GridTableBase_SetRowLabelValue(*args, **kwargs)
 
     def SetColLabelValue(*args, **kwargs):
         return _grid.GridTableBase_SetRowLabelValue(*args, **kwargs)
 
     def SetColLabelValue(*args, **kwargs):

-        """SetColLabelValue(int col, wxString value)"""
+        """SetColLabelValue(int col, String value)"""

         return _grid.GridTableBase_SetColLabelValue(*args, **kwargs)
 
     def CanHaveAttributes(*args, **kwargs):
         return _grid.GridTableBase_SetColLabelValue(*args, **kwargs)
 
     def CanHaveAttributes(*args, **kwargs):


@@ -929,7 +929,7 @@ class GridTableBase(core.Object):
         return _grid.GridTableBase_CanHaveAttributes(*args, **kwargs)
 
     def GetAttr(*args, **kwargs):
         return _grid.GridTableBase_CanHaveAttributes(*args, **kwargs)
 
     def GetAttr(*args, **kwargs):

-        """GetAttr(int row, int col, wxGridCellAttr::wxAttrKind kind) -> GridCellAttr"""
+        """GetAttr(int row, int col, int kind) -> GridCellAttr"""

         return _grid.GridTableBase_GetAttr(*args, **kwargs)
 
     def SetAttr(*args, **kwargs):
         return _grid.GridTableBase_GetAttr(*args, **kwargs)
 
     def SetAttr(*args, **kwargs):


@@ -976,15 +976,15 @@ class PyGridTableBase(GridTableBase):
         return _grid.PyGridTableBase_Destroy(*args, **kwargs)
 
     def base_GetTypeName(*args, **kwargs):
         return _grid.PyGridTableBase_Destroy(*args, **kwargs)
 
     def base_GetTypeName(*args, **kwargs):

-        """base_GetTypeName(int row, int col) -> wxString"""
+        """base_GetTypeName(int row, int col) -> String"""

         return _grid.PyGridTableBase_base_GetTypeName(*args, **kwargs)
 
     def base_CanGetValueAs(*args, **kwargs):
         return _grid.PyGridTableBase_base_GetTypeName(*args, **kwargs)
 
     def base_CanGetValueAs(*args, **kwargs):

-        """base_CanGetValueAs(int row, int col, wxString typeName) -> bool"""
+        """base_CanGetValueAs(int row, int col, String typeName) -> bool"""

         return _grid.PyGridTableBase_base_CanGetValueAs(*args, **kwargs)
 
     def base_CanSetValueAs(*args, **kwargs):
         return _grid.PyGridTableBase_base_CanGetValueAs(*args, **kwargs)
 
     def base_CanSetValueAs(*args, **kwargs):

-        """base_CanSetValueAs(int row, int col, wxString typeName) -> bool"""
+        """base_CanSetValueAs(int row, int col, String typeName) -> bool"""

         return _grid.PyGridTableBase_base_CanSetValueAs(*args, **kwargs)
 
     def base_Clear(*args, **kwargs):
         return _grid.PyGridTableBase_base_CanSetValueAs(*args, **kwargs)
 
     def base_Clear(*args, **kwargs):


@@ -1016,19 +1016,19 @@ class PyGridTableBase(GridTableBase):
         return _grid.PyGridTableBase_base_DeleteCols(*args, **kwargs)
 
     def base_GetRowLabelValue(*args, **kwargs):
         return _grid.PyGridTableBase_base_DeleteCols(*args, **kwargs)
 
     def base_GetRowLabelValue(*args, **kwargs):

-        """base_GetRowLabelValue(int row) -> wxString"""
+        """base_GetRowLabelValue(int row) -> String"""

         return _grid.PyGridTableBase_base_GetRowLabelValue(*args, **kwargs)
 
     def base_GetColLabelValue(*args, **kwargs):
         return _grid.PyGridTableBase_base_GetRowLabelValue(*args, **kwargs)
 
     def base_GetColLabelValue(*args, **kwargs):

-        """base_GetColLabelValue(int col) -> wxString"""
+        """base_GetColLabelValue(int col) -> String"""

         return _grid.PyGridTableBase_base_GetColLabelValue(*args, **kwargs)
 
     def base_SetRowLabelValue(*args, **kwargs):
         return _grid.PyGridTableBase_base_GetColLabelValue(*args, **kwargs)
 
     def base_SetRowLabelValue(*args, **kwargs):

-        """base_SetRowLabelValue(int row, wxString value)"""
+        """base_SetRowLabelValue(int row, String value)"""

         return _grid.PyGridTableBase_base_SetRowLabelValue(*args, **kwargs)
 
     def base_SetColLabelValue(*args, **kwargs):
         return _grid.PyGridTableBase_base_SetRowLabelValue(*args, **kwargs)
 
     def base_SetColLabelValue(*args, **kwargs):

-        """base_SetColLabelValue(int col, wxString value)"""
+        """base_SetColLabelValue(int col, String value)"""

         return _grid.PyGridTableBase_base_SetColLabelValue(*args, **kwargs)
 
     def base_CanHaveAttributes(*args, **kwargs):
         return _grid.PyGridTableBase_base_SetColLabelValue(*args, **kwargs)
 
     def base_CanHaveAttributes(*args, **kwargs):


@@ -1036,7 +1036,7 @@ class PyGridTableBase(GridTableBase):
         return _grid.PyGridTableBase_base_CanHaveAttributes(*args, **kwargs)
 
     def base_GetAttr(*args, **kwargs):
         return _grid.PyGridTableBase_base_CanHaveAttributes(*args, **kwargs)
 
     def base_GetAttr(*args, **kwargs):

-        """base_GetAttr(int row, int col, wxGridCellAttr::wxAttrKind kind) -> GridCellAttr"""
+        """base_GetAttr(int row, int col, int kind) -> GridCellAttr"""

         return _grid.PyGridTableBase_base_GetAttr(*args, **kwargs)
 
     def base_SetAttr(*args, **kwargs):
         return _grid.PyGridTableBase_base_GetAttr(*args, **kwargs)
 
     def base_SetAttr(*args, **kwargs):


@@ -1212,7 +1212,7 @@ class Grid(windows.ScrolledWindow):
         """
         __init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
             long style=WANTS_CHARS, 
         """
         __init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
             long style=WANTS_CHARS, 

-            wxString name=PanelNameStr) -> Grid
+            String name=PanelNameStr) -> Grid

         """
         newobj = _grid.new_Grid(*args, **kwargs)
         self.this = newobj.this
         """
         newobj = _grid.new_Grid(*args, **kwargs)
         self.this = newobj.this


@@ -1284,12 +1284,12 @@ class Grid(windows.ScrolledWindow):
         return _grid.Grid_DeleteCols(*args, **kwargs)
 
     def DrawCellHighlight(*args, **kwargs):
         return _grid.Grid_DeleteCols(*args, **kwargs)
 
     def DrawCellHighlight(*args, **kwargs):

-        """DrawCellHighlight(wxDC dc, GridCellAttr attr)"""
+        """DrawCellHighlight(DC dc, GridCellAttr attr)"""

         return _grid.Grid_DrawCellHighlight(*args, **kwargs)
 
     def DrawTextRectangle(*args, **kwargs):
         """
         return _grid.Grid_DrawCellHighlight(*args, **kwargs)
 
     def DrawTextRectangle(*args, **kwargs):
         """

-        DrawTextRectangle(wxDC dc, wxString ??, Rect ??, int horizontalAlignment=LEFT, 
+        DrawTextRectangle(DC dc, String ??, Rect ??, int horizontalAlignment=LEFT, 

             int verticalAlignment=TOP, int textOrientation=HORIZONTAL)
         """
         return _grid.Grid_DrawTextRectangle(*args, **kwargs)
             int verticalAlignment=TOP, int textOrientation=HORIZONTAL)
         """
         return _grid.Grid_DrawTextRectangle(*args, **kwargs)


@@ -1463,15 +1463,15 @@ class Grid(windows.ScrolledWindow):
         return _grid.Grid_GetColLabelSize(*args, **kwargs)
 
     def GetLabelBackgroundColour(*args, **kwargs):
         return _grid.Grid_GetColLabelSize(*args, **kwargs)
 
     def GetLabelBackgroundColour(*args, **kwargs):

-        """GetLabelBackgroundColour() -> wxColour"""
+        """GetLabelBackgroundColour() -> Colour"""

         return _grid.Grid_GetLabelBackgroundColour(*args, **kwargs)
 
     def GetLabelTextColour(*args, **kwargs):
         return _grid.Grid_GetLabelBackgroundColour(*args, **kwargs)
 
     def GetLabelTextColour(*args, **kwargs):

-        """GetLabelTextColour() -> wxColour"""
+        """GetLabelTextColour() -> Colour"""

         return _grid.Grid_GetLabelTextColour(*args, **kwargs)
 
     def GetLabelFont(*args, **kwargs):
         return _grid.Grid_GetLabelTextColour(*args, **kwargs)
 
     def GetLabelFont(*args, **kwargs):

-        """GetLabelFont() -> wxFont"""
+        """GetLabelFont() -> Font"""

         return _grid.Grid_GetLabelFont(*args, **kwargs)
 
     def GetRowLabelAlignment(*args, **kwargs):
         return _grid.Grid_GetLabelFont(*args, **kwargs)
 
     def GetRowLabelAlignment(*args, **kwargs):


@@ -1487,19 +1487,19 @@ class Grid(windows.ScrolledWindow):
         return _grid.Grid_GetColLabelTextOrientation(*args, **kwargs)
 
     def GetRowLabelValue(*args, **kwargs):
         return _grid.Grid_GetColLabelTextOrientation(*args, **kwargs)
 
     def GetRowLabelValue(*args, **kwargs):

-        """GetRowLabelValue(int row) -> wxString"""
+        """GetRowLabelValue(int row) -> String"""

         return _grid.Grid_GetRowLabelValue(*args, **kwargs)
 
     def GetColLabelValue(*args, **kwargs):
         return _grid.Grid_GetRowLabelValue(*args, **kwargs)
 
     def GetColLabelValue(*args, **kwargs):

-        """GetColLabelValue(int col) -> wxString"""
+        """GetColLabelValue(int col) -> String"""

         return _grid.Grid_GetColLabelValue(*args, **kwargs)
 
     def GetGridLineColour(*args, **kwargs):
         return _grid.Grid_GetColLabelValue(*args, **kwargs)
 
     def GetGridLineColour(*args, **kwargs):

-        """GetGridLineColour() -> wxColour"""
+        """GetGridLineColour() -> Colour"""

         return _grid.Grid_GetGridLineColour(*args, **kwargs)
 
     def GetCellHighlightColour(*args, **kwargs):
         return _grid.Grid_GetGridLineColour(*args, **kwargs)
 
     def GetCellHighlightColour(*args, **kwargs):

-        """GetCellHighlightColour() -> wxColour"""
+        """GetCellHighlightColour() -> Colour"""

         return _grid.Grid_GetCellHighlightColour(*args, **kwargs)
 
     def GetCellHighlightPenWidth(*args, **kwargs):
         return _grid.Grid_GetCellHighlightColour(*args, **kwargs)
 
     def GetCellHighlightPenWidth(*args, **kwargs):


@@ -1519,15 +1519,15 @@ class Grid(windows.ScrolledWindow):
         return _grid.Grid_SetColLabelSize(*args, **kwargs)
 
     def SetLabelBackgroundColour(*args, **kwargs):
         return _grid.Grid_SetColLabelSize(*args, **kwargs)
 
     def SetLabelBackgroundColour(*args, **kwargs):

-        """SetLabelBackgroundColour(wxColour ??)"""
+        """SetLabelBackgroundColour(Colour ??)"""

         return _grid.Grid_SetLabelBackgroundColour(*args, **kwargs)
 
     def SetLabelTextColour(*args, **kwargs):
         return _grid.Grid_SetLabelBackgroundColour(*args, **kwargs)
 
     def SetLabelTextColour(*args, **kwargs):

-        """SetLabelTextColour(wxColour ??)"""
+        """SetLabelTextColour(Colour ??)"""

         return _grid.Grid_SetLabelTextColour(*args, **kwargs)
 
     def SetLabelFont(*args, **kwargs):
         return _grid.Grid_SetLabelTextColour(*args, **kwargs)
 
     def SetLabelFont(*args, **kwargs):

-        """SetLabelFont(wxFont ??)"""
+        """SetLabelFont(Font ??)"""

         return _grid.Grid_SetLabelFont(*args, **kwargs)
 
     def SetRowLabelAlignment(*args, **kwargs):
         return _grid.Grid_SetLabelFont(*args, **kwargs)
 
     def SetRowLabelAlignment(*args, **kwargs):


@@ -1543,19 +1543,19 @@ class Grid(windows.ScrolledWindow):
         return _grid.Grid_SetColLabelTextOrientation(*args, **kwargs)
 
     def SetRowLabelValue(*args, **kwargs):
         return _grid.Grid_SetColLabelTextOrientation(*args, **kwargs)
 
     def SetRowLabelValue(*args, **kwargs):

-        """SetRowLabelValue(int row, wxString ??)"""
+        """SetRowLabelValue(int row, String ??)"""

         return _grid.Grid_SetRowLabelValue(*args, **kwargs)
 
     def SetColLabelValue(*args, **kwargs):
         return _grid.Grid_SetRowLabelValue(*args, **kwargs)
 
     def SetColLabelValue(*args, **kwargs):

-        """SetColLabelValue(int col, wxString ??)"""
+        """SetColLabelValue(int col, String ??)"""

         return _grid.Grid_SetColLabelValue(*args, **kwargs)
 
     def SetGridLineColour(*args, **kwargs):
         return _grid.Grid_SetColLabelValue(*args, **kwargs)
 
     def SetGridLineColour(*args, **kwargs):

-        """SetGridLineColour(wxColour ??)"""
+        """SetGridLineColour(Colour ??)"""

         return _grid.Grid_SetGridLineColour(*args, **kwargs)
 
     def SetCellHighlightColour(*args, **kwargs):
         return _grid.Grid_SetGridLineColour(*args, **kwargs)
 
     def SetCellHighlightColour(*args, **kwargs):

-        """SetCellHighlightColour(wxColour ??)"""
+        """SetCellHighlightColour(Colour ??)"""

         return _grid.Grid_SetCellHighlightColour(*args, **kwargs)
 
     def SetCellHighlightPenWidth(*args, **kwargs):
         return _grid.Grid_SetCellHighlightColour(*args, **kwargs)
 
     def SetCellHighlightPenWidth(*args, **kwargs):


@@ -1627,7 +1627,7 @@ class Grid(windows.ScrolledWindow):
         return _grid.Grid_SetColFormatFloat(*args, **kwargs)
 
     def SetColFormatCustom(*args, **kwargs):
         return _grid.Grid_SetColFormatFloat(*args, **kwargs)
 
     def SetColFormatCustom(*args, **kwargs):

-        """SetColFormatCustom(int col, wxString typeName)"""
+        """SetColFormatCustom(int col, String typeName)"""

         return _grid.Grid_SetColFormatCustom(*args, **kwargs)
 
     def EnableGridLines(*args, **kwargs):
         return _grid.Grid_SetColFormatCustom(*args, **kwargs)
 
     def EnableGridLines(*args, **kwargs):


@@ -1655,27 +1655,27 @@ class Grid(windows.ScrolledWindow):
         return _grid.Grid_GetColSize(*args, **kwargs)
 
     def GetDefaultCellBackgroundColour(*args, **kwargs):
         return _grid.Grid_GetColSize(*args, **kwargs)
 
     def GetDefaultCellBackgroundColour(*args, **kwargs):

-        """GetDefaultCellBackgroundColour() -> wxColour"""
+        """GetDefaultCellBackgroundColour() -> Colour"""

         return _grid.Grid_GetDefaultCellBackgroundColour(*args, **kwargs)
 
     def GetCellBackgroundColour(*args, **kwargs):
         return _grid.Grid_GetDefaultCellBackgroundColour(*args, **kwargs)
 
     def GetCellBackgroundColour(*args, **kwargs):

-        """GetCellBackgroundColour(int row, int col) -> wxColour"""
+        """GetCellBackgroundColour(int row, int col) -> Colour"""

         return _grid.Grid_GetCellBackgroundColour(*args, **kwargs)
 
     def GetDefaultCellTextColour(*args, **kwargs):
         return _grid.Grid_GetCellBackgroundColour(*args, **kwargs)
 
     def GetDefaultCellTextColour(*args, **kwargs):

-        """GetDefaultCellTextColour() -> wxColour"""
+        """GetDefaultCellTextColour() -> Colour"""

         return _grid.Grid_GetDefaultCellTextColour(*args, **kwargs)
 
     def GetCellTextColour(*args, **kwargs):
         return _grid.Grid_GetDefaultCellTextColour(*args, **kwargs)
 
     def GetCellTextColour(*args, **kwargs):

-        """GetCellTextColour(int row, int col) -> wxColour"""
+        """GetCellTextColour(int row, int col) -> Colour"""

         return _grid.Grid_GetCellTextColour(*args, **kwargs)
 
     def GetDefaultCellFont(*args, **kwargs):
         return _grid.Grid_GetCellTextColour(*args, **kwargs)
 
     def GetDefaultCellFont(*args, **kwargs):

-        """GetDefaultCellFont() -> wxFont"""
+        """GetDefaultCellFont() -> Font"""

         return _grid.Grid_GetDefaultCellFont(*args, **kwargs)
 
     def GetCellFont(*args, **kwargs):
         return _grid.Grid_GetDefaultCellFont(*args, **kwargs)
 
     def GetCellFont(*args, **kwargs):

-        """GetCellFont(int row, int col) -> wxFont"""
+        """GetCellFont(int row, int col) -> Font"""

         return _grid.Grid_GetCellFont(*args, **kwargs)
 
     def GetDefaultCellAlignment(*args, **kwargs):
         return _grid.Grid_GetCellFont(*args, **kwargs)
 
     def GetDefaultCellAlignment(*args, **kwargs):


@@ -1767,27 +1767,27 @@ class Grid(windows.ScrolledWindow):
         return _grid.Grid_GetRowMinimalAcceptableHeight(*args, **kwargs)
 
     def SetDefaultCellBackgroundColour(*args, **kwargs):
         return _grid.Grid_GetRowMinimalAcceptableHeight(*args, **kwargs)
 
     def SetDefaultCellBackgroundColour(*args, **kwargs):

-        """SetDefaultCellBackgroundColour(wxColour ??)"""
+        """SetDefaultCellBackgroundColour(Colour ??)"""

         return _grid.Grid_SetDefaultCellBackgroundColour(*args, **kwargs)
 
     def SetCellBackgroundColour(*args, **kwargs):
         return _grid.Grid_SetDefaultCellBackgroundColour(*args, **kwargs)
 
     def SetCellBackgroundColour(*args, **kwargs):

-        """SetCellBackgroundColour(int row, int col, wxColour ??)"""
+        """SetCellBackgroundColour(int row, int col, Colour ??)"""

         return _grid.Grid_SetCellBackgroundColour(*args, **kwargs)
 
     def SetDefaultCellTextColour(*args, **kwargs):
         return _grid.Grid_SetCellBackgroundColour(*args, **kwargs)
 
     def SetDefaultCellTextColour(*args, **kwargs):

-        """SetDefaultCellTextColour(wxColour ??)"""
+        """SetDefaultCellTextColour(Colour ??)"""

         return _grid.Grid_SetDefaultCellTextColour(*args, **kwargs)
 
     def SetCellTextColour(*args, **kwargs):
         return _grid.Grid_SetDefaultCellTextColour(*args, **kwargs)
 
     def SetCellTextColour(*args, **kwargs):

-        """SetCellTextColour(int row, int col, wxColour ??)"""
+        """SetCellTextColour(int row, int col, Colour ??)"""

         return _grid.Grid_SetCellTextColour(*args, **kwargs)
 
     def SetDefaultCellFont(*args, **kwargs):
         return _grid.Grid_SetCellTextColour(*args, **kwargs)
 
     def SetDefaultCellFont(*args, **kwargs):

-        """SetDefaultCellFont(wxFont ??)"""
+        """SetDefaultCellFont(Font ??)"""

         return _grid.Grid_SetDefaultCellFont(*args, **kwargs)
 
     def SetCellFont(*args, **kwargs):
         return _grid.Grid_SetDefaultCellFont(*args, **kwargs)
 
     def SetCellFont(*args, **kwargs):

-        """SetCellFont(int row, int col, wxFont ??)"""
+        """SetCellFont(int row, int col, Font ??)"""

         return _grid.Grid_SetCellFont(*args, **kwargs)
 
     def SetDefaultCellAlignment(*args, **kwargs):
         return _grid.Grid_SetCellFont(*args, **kwargs)
 
     def SetDefaultCellAlignment(*args, **kwargs):


@@ -1843,11 +1843,11 @@ class Grid(windows.ScrolledWindow):
         return _grid.Grid_GetCellEditor(*args, **kwargs)
 
     def GetCellValue(*args, **kwargs):
         return _grid.Grid_GetCellEditor(*args, **kwargs)
 
     def GetCellValue(*args, **kwargs):

-        """GetCellValue(int row, int col) -> wxString"""
+        """GetCellValue(int row, int col) -> String"""

         return _grid.Grid_GetCellValue(*args, **kwargs)
 
     def SetCellValue(*args, **kwargs):
         return _grid.Grid_GetCellValue(*args, **kwargs)
 
     def SetCellValue(*args, **kwargs):

-        """SetCellValue(int row, int col, wxString s)"""
+        """SetCellValue(int row, int col, String s)"""

         return _grid.Grid_SetCellValue(*args, **kwargs)
 
     def IsReadOnly(*args, **kwargs):
         return _grid.Grid_SetCellValue(*args, **kwargs)
 
     def IsReadOnly(*args, **kwargs):


@@ -1926,23 +1926,23 @@ class Grid(windows.ScrolledWindow):
         return _grid.Grid_BlockToDeviceRect(*args, **kwargs)
 
     def GetSelectionBackground(*args, **kwargs):
         return _grid.Grid_BlockToDeviceRect(*args, **kwargs)
 
     def GetSelectionBackground(*args, **kwargs):

-        """GetSelectionBackground() -> wxColour"""
+        """GetSelectionBackground() -> Colour"""

         return _grid.Grid_GetSelectionBackground(*args, **kwargs)
 
     def GetSelectionForeground(*args, **kwargs):
         return _grid.Grid_GetSelectionBackground(*args, **kwargs)
 
     def GetSelectionForeground(*args, **kwargs):

-        """GetSelectionForeground() -> wxColour"""
+        """GetSelectionForeground() -> Colour"""

         return _grid.Grid_GetSelectionForeground(*args, **kwargs)
 
     def SetSelectionBackground(*args, **kwargs):
         return _grid.Grid_GetSelectionForeground(*args, **kwargs)
 
     def SetSelectionBackground(*args, **kwargs):

-        """SetSelectionBackground(wxColour c)"""
+        """SetSelectionBackground(Colour c)"""

         return _grid.Grid_SetSelectionBackground(*args, **kwargs)
 
     def SetSelectionForeground(*args, **kwargs):
         return _grid.Grid_SetSelectionBackground(*args, **kwargs)
 
     def SetSelectionForeground(*args, **kwargs):

-        """SetSelectionForeground(wxColour c)"""
+        """SetSelectionForeground(Colour c)"""

         return _grid.Grid_SetSelectionForeground(*args, **kwargs)
 
     def RegisterDataType(*args, **kwargs):
         return _grid.Grid_SetSelectionForeground(*args, **kwargs)
 
     def RegisterDataType(*args, **kwargs):

-        """RegisterDataType(wxString typeName, GridCellRenderer renderer, GridCellEditor editor)"""
+        """RegisterDataType(String typeName, GridCellRenderer renderer, GridCellEditor editor)"""

         return _grid.Grid_RegisterDataType(*args, **kwargs)
 
     def GetDefaultEditorForCell(*args, **kwargs):
         return _grid.Grid_RegisterDataType(*args, **kwargs)
 
     def GetDefaultEditorForCell(*args, **kwargs):


@@ -1954,11 +1954,11 @@ class Grid(windows.ScrolledWindow):
         return _grid.Grid_GetDefaultRendererForCell(*args, **kwargs)
 
     def GetDefaultEditorForType(*args, **kwargs):
         return _grid.Grid_GetDefaultRendererForCell(*args, **kwargs)
 
     def GetDefaultEditorForType(*args, **kwargs):

-        """GetDefaultEditorForType(wxString typeName) -> GridCellEditor"""
+        """GetDefaultEditorForType(String typeName) -> GridCellEditor"""

         return _grid.Grid_GetDefaultEditorForType(*args, **kwargs)
 
     def GetDefaultRendererForType(*args, **kwargs):
         return _grid.Grid_GetDefaultEditorForType(*args, **kwargs)
 
     def GetDefaultRendererForType(*args, **kwargs):

-        """GetDefaultRendererForType(wxString typeName) -> GridCellRenderer"""
+        """GetDefaultRendererForType(String typeName) -> GridCellRenderer"""

         return _grid.Grid_GetDefaultRendererForType(*args, **kwargs)
 
     def SetMargins(*args, **kwargs):
         return _grid.Grid_GetDefaultRendererForType(*args, **kwargs)
 
     def SetMargins(*args, **kwargs):

diff --git a/wxPython/src/gtk/html.py b/wxPython/src/gtk/html.py
index 8bc9e844302f08685e752bd00002899390e823de..b84f54ac5a842059cee210ea64d53ad015ea2432 100644 (file)
--- a/wxPython/src/gtk/html.py
+++ b/wxPython/src/gtk/html.py
@@ -48,17 +48,17 @@ class HtmlLinkInfo(core.Object):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxHtmlLinkInfo instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxHtmlLinkInfo instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):

-        """__init__(wxString href, wxString target=wxPyEmptyString) -> HtmlLinkInfo"""
+        """__init__(String href, String target=EmptyString) -> HtmlLinkInfo"""

         newobj = _html.new_HtmlLinkInfo(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def GetHref(*args, **kwargs):
         newobj = _html.new_HtmlLinkInfo(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def GetHref(*args, **kwargs):

-        """GetHref() -> wxString"""
+        """GetHref() -> String"""

         return _html.HtmlLinkInfo_GetHref(*args, **kwargs)
 
     def GetTarget(*args, **kwargs):
         return _html.HtmlLinkInfo_GetHref(*args, **kwargs)
 
     def GetTarget(*args, **kwargs):

-        """GetTarget() -> wxString"""
+        """GetTarget() -> String"""

         return _html.HtmlLinkInfo_GetTarget(*args, **kwargs)
 
     def GetEvent(*args, **kwargs):
         return _html.HtmlLinkInfo_GetTarget(*args, **kwargs)
 
     def GetEvent(*args, **kwargs):


@@ -90,19 +90,19 @@ class HtmlTag(core.Object):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxHtmlTag instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def GetName(*args, **kwargs):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxHtmlTag instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def GetName(*args, **kwargs):

-        """GetName() -> wxString"""
+        """GetName() -> String"""

         return _html.HtmlTag_GetName(*args, **kwargs)
 
     def HasParam(*args, **kwargs):
         return _html.HtmlTag_GetName(*args, **kwargs)
 
     def HasParam(*args, **kwargs):

-        """HasParam(wxString par) -> bool"""
+        """HasParam(String par) -> bool"""

         return _html.HtmlTag_HasParam(*args, **kwargs)
 
     def GetParam(*args, **kwargs):
         return _html.HtmlTag_HasParam(*args, **kwargs)
 
     def GetParam(*args, **kwargs):

-        """GetParam(wxString par, int with_commas=False) -> wxString"""
+        """GetParam(String par, int with_commas=False) -> String"""

         return _html.HtmlTag_GetParam(*args, **kwargs)
 
     def GetAllParams(*args, **kwargs):
         return _html.HtmlTag_GetParam(*args, **kwargs)
 
     def GetAllParams(*args, **kwargs):

-        """GetAllParams() -> wxString"""
+        """GetAllParams() -> String"""

         return _html.HtmlTag_GetAllParams(*args, **kwargs)
 
     def HasEnding(*args, **kwargs):
         return _html.HtmlTag_GetAllParams(*args, **kwargs)
 
     def HasEnding(*args, **kwargs):


@@ -142,11 +142,11 @@ class HtmlParser(core.Object):
         return _html.HtmlParser_GetFS(*args, **kwargs)
 
     def Parse(*args, **kwargs):
         return _html.HtmlParser_GetFS(*args, **kwargs)
 
     def Parse(*args, **kwargs):

-        """Parse(wxString source) -> Object"""
+        """Parse(String source) -> Object"""

         return _html.HtmlParser_Parse(*args, **kwargs)
 
     def InitParser(*args, **kwargs):
         return _html.HtmlParser_Parse(*args, **kwargs)
 
     def InitParser(*args, **kwargs):

-        """InitParser(wxString source)"""
+        """InitParser(String source)"""

         return _html.HtmlParser_InitParser(*args, **kwargs)
 
     def DoneParser(*args, **kwargs):
         return _html.HtmlParser_InitParser(*args, **kwargs)
 
     def DoneParser(*args, **kwargs):


@@ -166,11 +166,11 @@ class HtmlParser(core.Object):
         return _html.HtmlParser_AddTagHandler(*args, **kwargs)
 
     def GetSource(*args, **kwargs):
         return _html.HtmlParser_AddTagHandler(*args, **kwargs)
 
     def GetSource(*args, **kwargs):

-        """GetSource() -> wxString"""
+        """GetSource() -> String"""

         return _html.HtmlParser_GetSource(*args, **kwargs)
 
     def PushTagHandler(*args, **kwargs):
         return _html.HtmlParser_GetSource(*args, **kwargs)
 
     def PushTagHandler(*args, **kwargs):

-        """PushTagHandler(wxHtmlTagHandler handler, wxString tags)"""
+        """PushTagHandler(wxHtmlTagHandler handler, String tags)"""

         return _html.HtmlParser_PushTagHandler(*args, **kwargs)
 
     def PopTagHandler(*args, **kwargs):
         return _html.HtmlParser_PushTagHandler(*args, **kwargs)
 
     def PopTagHandler(*args, **kwargs):


@@ -195,11 +195,11 @@ class HtmlWinParser(HtmlParser):
         self.thisown = 1
         del newobj.thisown
     def SetDC(*args, **kwargs):
         self.thisown = 1
         del newobj.thisown
     def SetDC(*args, **kwargs):

-        """SetDC(wxDC dc)"""
+        """SetDC(DC dc)"""

         return _html.HtmlWinParser_SetDC(*args, **kwargs)
 
     def GetDC(*args, **kwargs):
         return _html.HtmlWinParser_SetDC(*args, **kwargs)
 
     def GetDC(*args, **kwargs):

-        """GetDC() -> wxDC"""
+        """GetDC() -> DC"""

         return _html.HtmlWinParser_GetDC(*args, **kwargs)
 
     def GetCharHeight(*args, **kwargs):
         return _html.HtmlWinParser_GetDC(*args, **kwargs)
 
     def GetCharHeight(*args, **kwargs):


@@ -215,7 +215,7 @@ class HtmlWinParser(HtmlParser):
         return _html.HtmlWinParser_GetWindow(*args, **kwargs)
 
     def SetFonts(*args, **kwargs):
         return _html.HtmlWinParser_GetWindow(*args, **kwargs)
 
     def SetFonts(*args, **kwargs):

-        """SetFonts(wxString normal_face, wxString fixed_face, PyObject sizes=None)"""
+        """SetFonts(String normal_face, String fixed_face, PyObject sizes=None)"""

         return _html.HtmlWinParser_SetFonts(*args, **kwargs)
 
     def GetContainer(*args, **kwargs):
         return _html.HtmlWinParser_SetFonts(*args, **kwargs)
 
     def GetContainer(*args, **kwargs):


@@ -283,27 +283,27 @@ class HtmlWinParser(HtmlParser):
         return _html.HtmlWinParser_SetAlign(*args, **kwargs)
 
     def GetLinkColor(*args, **kwargs):
         return _html.HtmlWinParser_SetAlign(*args, **kwargs)
 
     def GetLinkColor(*args, **kwargs):

-        """GetLinkColor() -> wxColour"""
+        """GetLinkColor() -> Colour"""

         return _html.HtmlWinParser_GetLinkColor(*args, **kwargs)
 
     def SetLinkColor(*args, **kwargs):
         return _html.HtmlWinParser_GetLinkColor(*args, **kwargs)
 
     def SetLinkColor(*args, **kwargs):

-        """SetLinkColor(wxColour clr)"""
+        """SetLinkColor(Colour clr)"""

         return _html.HtmlWinParser_SetLinkColor(*args, **kwargs)
 
     def GetActualColor(*args, **kwargs):
         return _html.HtmlWinParser_SetLinkColor(*args, **kwargs)
 
     def GetActualColor(*args, **kwargs):

-        """GetActualColor() -> wxColour"""
+        """GetActualColor() -> Colour"""

         return _html.HtmlWinParser_GetActualColor(*args, **kwargs)
 
     def SetActualColor(*args, **kwargs):
         return _html.HtmlWinParser_GetActualColor(*args, **kwargs)
 
     def SetActualColor(*args, **kwargs):

-        """SetActualColor(wxColour clr)"""
+        """SetActualColor(Colour clr)"""

         return _html.HtmlWinParser_SetActualColor(*args, **kwargs)
 
     def SetLink(*args, **kwargs):
         return _html.HtmlWinParser_SetActualColor(*args, **kwargs)
 
     def SetLink(*args, **kwargs):

-        """SetLink(wxString link)"""
+        """SetLink(String link)"""

         return _html.HtmlWinParser_SetLink(*args, **kwargs)
 
     def CreateCurrentFont(*args, **kwargs):
         return _html.HtmlWinParser_SetLink(*args, **kwargs)
 
     def CreateCurrentFont(*args, **kwargs):

-        """CreateCurrentFont() -> wxFont"""
+        """CreateCurrentFont() -> Font"""

         return _html.HtmlWinParser_CreateCurrentFont(*args, **kwargs)
 
     def GetLink(*args, **kwargs):
         return _html.HtmlWinParser_CreateCurrentFont(*args, **kwargs)
 
     def GetLink(*args, **kwargs):


@@ -484,27 +484,27 @@ class HtmlRenderingState(object):
         except: pass
 
     def SetSelectionState(*args, **kwargs):
         except: pass
 
     def SetSelectionState(*args, **kwargs):

-        """SetSelectionState(wxHtmlSelectionState s)"""
+        """SetSelectionState(int s)"""

         return _html.HtmlRenderingState_SetSelectionState(*args, **kwargs)
 
     def GetSelectionState(*args, **kwargs):
         return _html.HtmlRenderingState_SetSelectionState(*args, **kwargs)
 
     def GetSelectionState(*args, **kwargs):

-        """GetSelectionState() -> wxHtmlSelectionState"""
+        """GetSelectionState() -> int"""

         return _html.HtmlRenderingState_GetSelectionState(*args, **kwargs)
 
     def SetFgColour(*args, **kwargs):
         return _html.HtmlRenderingState_GetSelectionState(*args, **kwargs)
 
     def SetFgColour(*args, **kwargs):

-        """SetFgColour(wxColour c)"""
+        """SetFgColour(Colour c)"""

         return _html.HtmlRenderingState_SetFgColour(*args, **kwargs)
 
     def GetFgColour(*args, **kwargs):
         return _html.HtmlRenderingState_SetFgColour(*args, **kwargs)
 
     def GetFgColour(*args, **kwargs):

-        """GetFgColour() -> wxColour"""
+        """GetFgColour() -> Colour"""

         return _html.HtmlRenderingState_GetFgColour(*args, **kwargs)
 
     def SetBgColour(*args, **kwargs):
         return _html.HtmlRenderingState_GetFgColour(*args, **kwargs)
 
     def SetBgColour(*args, **kwargs):

-        """SetBgColour(wxColour c)"""
+        """SetBgColour(Colour c)"""

         return _html.HtmlRenderingState_SetBgColour(*args, **kwargs)
 
     def GetBgColour(*args, **kwargs):
         return _html.HtmlRenderingState_SetBgColour(*args, **kwargs)
 
     def GetBgColour(*args, **kwargs):

-        """GetBgColour() -> wxColour"""
+        """GetBgColour() -> Colour"""

         return _html.HtmlRenderingState_GetBgColour(*args, **kwargs)
 
 
         return _html.HtmlRenderingState_GetBgColour(*args, **kwargs)
 
 


@@ -520,11 +520,11 @@ class HtmlRenderingStyle(object):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxHtmlRenderingStyle instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def GetSelectedTextColour(*args, **kwargs):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxHtmlRenderingStyle instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def GetSelectedTextColour(*args, **kwargs):

-        """GetSelectedTextColour(wxColour clr) -> wxColour"""
+        """GetSelectedTextColour(Colour clr) -> Colour"""

         return _html.HtmlRenderingStyle_GetSelectedTextColour(*args, **kwargs)
 
     def GetSelectedTextBgColour(*args, **kwargs):
         return _html.HtmlRenderingStyle_GetSelectedTextColour(*args, **kwargs)
 
     def GetSelectedTextBgColour(*args, **kwargs):

-        """GetSelectedTextBgColour(wxColour clr) -> wxColour"""
+        """GetSelectedTextBgColour(Colour clr) -> Colour"""

         return _html.HtmlRenderingStyle_GetSelectedTextBgColour(*args, **kwargs)
 
 
         return _html.HtmlRenderingStyle_GetSelectedTextBgColour(*args, **kwargs)
 
 


@@ -540,11 +540,11 @@ class DefaultHtmlRenderingStyle(HtmlRenderingStyle):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxDefaultHtmlRenderingStyle instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def GetSelectedTextColour(*args, **kwargs):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxDefaultHtmlRenderingStyle instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def GetSelectedTextColour(*args, **kwargs):

-        """GetSelectedTextColour(wxColour clr) -> wxColour"""
+        """GetSelectedTextColour(Colour clr) -> Colour"""

         return _html.DefaultHtmlRenderingStyle_GetSelectedTextColour(*args, **kwargs)
 
     def GetSelectedTextBgColour(*args, **kwargs):
         return _html.DefaultHtmlRenderingStyle_GetSelectedTextColour(*args, **kwargs)
 
     def GetSelectedTextBgColour(*args, **kwargs):

-        """GetSelectedTextBgColour(wxColour clr) -> wxColour"""
+        """GetSelectedTextBgColour(Colour clr) -> Colour"""

         return _html.DefaultHtmlRenderingStyle_GetSelectedTextBgColour(*args, **kwargs)
 
 
         return _html.DefaultHtmlRenderingStyle_GetSelectedTextBgColour(*args, **kwargs)
 
 


@@ -649,7 +649,7 @@ class HtmlCell(core.Object):
         return _html.HtmlCell_GetFirstChild(*args, **kwargs)
 
     def GetCursor(*args, **kwargs):
         return _html.HtmlCell_GetFirstChild(*args, **kwargs)
 
     def GetCursor(*args, **kwargs):

-        """GetCursor() -> wxCursor"""
+        """GetCursor() -> Cursor"""

         return _html.HtmlCell_GetCursor(*args, **kwargs)
 
     def IsFormattingCell(*args, **kwargs):
         return _html.HtmlCell_GetCursor(*args, **kwargs)
 
     def IsFormattingCell(*args, **kwargs):


@@ -677,11 +677,11 @@ class HtmlCell(core.Object):
         return _html.HtmlCell_Layout(*args, **kwargs)
 
     def Draw(*args, **kwargs):
         return _html.HtmlCell_Layout(*args, **kwargs)
 
     def Draw(*args, **kwargs):

-        """Draw(wxDC dc, int x, int y, int view_y1, int view_y2, HtmlRenderingInfo info)"""
+        """Draw(DC dc, int x, int y, int view_y1, int view_y2, HtmlRenderingInfo info)"""

         return _html.HtmlCell_Draw(*args, **kwargs)
 
     def DrawInvisible(*args, **kwargs):
         return _html.HtmlCell_Draw(*args, **kwargs)
 
     def DrawInvisible(*args, **kwargs):

-        """DrawInvisible(wxDC dc, int x, int y, HtmlRenderingInfo info)"""
+        """DrawInvisible(DC dc, int x, int y, HtmlRenderingInfo info)"""

         return _html.HtmlCell_DrawInvisible(*args, **kwargs)
 
     def Find(*args, **kwargs):
         return _html.HtmlCell_DrawInvisible(*args, **kwargs)
 
     def Find(*args, **kwargs):


@@ -729,7 +729,7 @@ class HtmlCell(core.Object):
         return _html.HtmlCell_IsBefore(*args, **kwargs)
 
     def ConvertToText(*args, **kwargs):
         return _html.HtmlCell_IsBefore(*args, **kwargs)
 
     def ConvertToText(*args, **kwargs):

-        """ConvertToText(HtmlSelection sel) -> wxString"""
+        """ConvertToText(HtmlSelection sel) -> String"""

         return _html.HtmlCell_ConvertToText(*args, **kwargs)
 
 
         return _html.HtmlCell_ConvertToText(*args, **kwargs)
 
 


@@ -744,7 +744,7 @@ class HtmlWordCell(HtmlCell):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxHtmlWordCell instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxHtmlWordCell instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):

-        """__init__(wxString word, wxDC dc) -> HtmlWordCell"""
+        """__init__(String word, DC dc) -> HtmlWordCell"""

         newobj = _html.new_HtmlWordCell(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         newobj = _html.new_HtmlWordCell(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1


@@ -815,15 +815,15 @@ class HtmlContainerCell(HtmlCell):
         return _html.HtmlContainerCell_SetMinHeight(*args, **kwargs)
 
     def SetBackgroundColour(*args, **kwargs):
         return _html.HtmlContainerCell_SetMinHeight(*args, **kwargs)
 
     def SetBackgroundColour(*args, **kwargs):

-        """SetBackgroundColour(wxColour clr)"""
+        """SetBackgroundColour(Colour clr)"""

         return _html.HtmlContainerCell_SetBackgroundColour(*args, **kwargs)
 
     def GetBackgroundColour(*args, **kwargs):
         return _html.HtmlContainerCell_SetBackgroundColour(*args, **kwargs)
 
     def GetBackgroundColour(*args, **kwargs):

-        """GetBackgroundColour() -> wxColour"""
+        """GetBackgroundColour() -> Colour"""

         return _html.HtmlContainerCell_GetBackgroundColour(*args, **kwargs)
 
     def SetBorder(*args, **kwargs):
         return _html.HtmlContainerCell_GetBackgroundColour(*args, **kwargs)
 
     def SetBorder(*args, **kwargs):

-        """SetBorder(wxColour clr1, wxColour clr2)"""
+        """SetBorder(Colour clr1, Colour clr2)"""

         return _html.HtmlContainerCell_SetBorder(*args, **kwargs)
 
     def GetFirstChild(*args, **kwargs):
         return _html.HtmlContainerCell_SetBorder(*args, **kwargs)
 
     def GetFirstChild(*args, **kwargs):


@@ -842,7 +842,7 @@ class HtmlColourCell(HtmlCell):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxHtmlColourCell instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxHtmlColourCell instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):

-        """__init__(wxColour clr, int flags=HTML_CLR_FOREGROUND) -> HtmlColourCell"""
+        """__init__(Colour clr, int flags=HTML_CLR_FOREGROUND) -> HtmlColourCell"""

         newobj = _html.new_HtmlColourCell(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         newobj = _html.new_HtmlColourCell(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1


@@ -859,7 +859,7 @@ class HtmlFontCell(HtmlCell):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxHtmlFontCell instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxHtmlFontCell instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):

-        """__init__(wxFont font) -> HtmlFontCell"""
+        """__init__(Font font) -> HtmlFontCell"""

         newobj = _html.new_HtmlFontCell(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         newobj = _html.new_HtmlFontCell(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1


@@ -923,7 +923,7 @@ class HtmlWindow(windows.ScrolledWindow):
         """
         __init__(Window parent, int id=-1, Point pos=DefaultPosition, 
             Size size=DefaultSize, int style=HW_DEFAULT_STYLE, 
         """
         __init__(Window parent, int id=-1, Point pos=DefaultPosition, 
             Size size=DefaultSize, int style=HW_DEFAULT_STYLE, 

-            wxString name=wxPyHtmlWindowNameStr) -> HtmlWindow
+            String name=wxPyHtmlWindowNameStr) -> HtmlWindow

         """
         newobj = _html.new_HtmlWindow(*args, **kwargs)
         self.this = newobj.this
         """
         newobj = _html.new_HtmlWindow(*args, **kwargs)
         self.this = newobj.this


@@ -935,7 +935,7 @@ class HtmlWindow(windows.ScrolledWindow):
         """
         Create(Window parent, int id=-1, Point pos=DefaultPosition, 
             Size size=DefaultSize, int style=HW_SCROLLBAR_AUTO, 
         """
         Create(Window parent, int id=-1, Point pos=DefaultPosition, 
             Size size=DefaultSize, int style=HW_SCROLLBAR_AUTO, 

-            wxString name=wxPyHtmlWindowNameStr) -> bool
+            String name=wxPyHtmlWindowNameStr) -> bool

         """
         return _html.HtmlWindow_Create(*args, **kwargs)
 
         """
         return _html.HtmlWindow_Create(*args, **kwargs)
 


@@ -944,35 +944,35 @@ class HtmlWindow(windows.ScrolledWindow):
         return _html.HtmlWindow__setCallbackInfo(*args, **kwargs)
 
     def SetPage(*args, **kwargs):
         return _html.HtmlWindow__setCallbackInfo(*args, **kwargs)
 
     def SetPage(*args, **kwargs):

-        """SetPage(wxString source) -> bool"""
+        """SetPage(String source) -> bool"""

         return _html.HtmlWindow_SetPage(*args, **kwargs)
 
     def LoadPage(*args, **kwargs):
         return _html.HtmlWindow_SetPage(*args, **kwargs)
 
     def LoadPage(*args, **kwargs):

-        """LoadPage(wxString location) -> bool"""
+        """LoadPage(String location) -> bool"""

         return _html.HtmlWindow_LoadPage(*args, **kwargs)
 
     def LoadFile(*args, **kwargs):
         return _html.HtmlWindow_LoadPage(*args, **kwargs)
 
     def LoadFile(*args, **kwargs):

-        """LoadFile(wxString filename) -> bool"""
+        """LoadFile(String filename) -> bool"""

         return _html.HtmlWindow_LoadFile(*args, **kwargs)
 
     def AppendToPage(*args, **kwargs):
         return _html.HtmlWindow_LoadFile(*args, **kwargs)
 
     def AppendToPage(*args, **kwargs):

-        """AppendToPage(wxString source) -> bool"""
+        """AppendToPage(String source) -> bool"""

         return _html.HtmlWindow_AppendToPage(*args, **kwargs)
 
     def GetOpenedPage(*args, **kwargs):
         return _html.HtmlWindow_AppendToPage(*args, **kwargs)
 
     def GetOpenedPage(*args, **kwargs):

-        """GetOpenedPage() -> wxString"""
+        """GetOpenedPage() -> String"""

         return _html.HtmlWindow_GetOpenedPage(*args, **kwargs)
 
     def GetOpenedAnchor(*args, **kwargs):
         return _html.HtmlWindow_GetOpenedPage(*args, **kwargs)
 
     def GetOpenedAnchor(*args, **kwargs):

-        """GetOpenedAnchor() -> wxString"""
+        """GetOpenedAnchor() -> String"""

         return _html.HtmlWindow_GetOpenedAnchor(*args, **kwargs)
 
     def GetOpenedPageTitle(*args, **kwargs):
         return _html.HtmlWindow_GetOpenedAnchor(*args, **kwargs)
 
     def GetOpenedPageTitle(*args, **kwargs):

-        """GetOpenedPageTitle() -> wxString"""
+        """GetOpenedPageTitle() -> String"""

         return _html.HtmlWindow_GetOpenedPageTitle(*args, **kwargs)
 
     def SetRelatedFrame(*args, **kwargs):
         return _html.HtmlWindow_GetOpenedPageTitle(*args, **kwargs)
 
     def SetRelatedFrame(*args, **kwargs):

-        """SetRelatedFrame(Frame frame, wxString format)"""
+        """SetRelatedFrame(Frame frame, String format)"""

         return _html.HtmlWindow_SetRelatedFrame(*args, **kwargs)
 
     def GetRelatedFrame(*args, **kwargs):
         return _html.HtmlWindow_SetRelatedFrame(*args, **kwargs)
 
     def GetRelatedFrame(*args, **kwargs):


@@ -984,11 +984,11 @@ class HtmlWindow(windows.ScrolledWindow):
         return _html.HtmlWindow_SetRelatedStatusBar(*args, **kwargs)
 
     def SetFonts(*args, **kwargs):
         return _html.HtmlWindow_SetRelatedStatusBar(*args, **kwargs)
 
     def SetFonts(*args, **kwargs):

-        """SetFonts(wxString normal_face, wxString fixed_face, PyObject sizes=None)"""
+        """SetFonts(String normal_face, String fixed_face, PyObject sizes=None)"""

         return _html.HtmlWindow_SetFonts(*args, **kwargs)
 
     def SetTitle(*args, **kwargs):
         return _html.HtmlWindow_SetFonts(*args, **kwargs)
 
     def SetTitle(*args, **kwargs):

-        """SetTitle(wxString title)"""
+        """SetTitle(String title)"""

         return _html.HtmlWindow_SetTitle(*args, **kwargs)
 
     def SetBorders(*args, **kwargs):
         return _html.HtmlWindow_SetTitle(*args, **kwargs)
 
     def SetBorders(*args, **kwargs):


@@ -996,11 +996,11 @@ class HtmlWindow(windows.ScrolledWindow):
         return _html.HtmlWindow_SetBorders(*args, **kwargs)
 
     def ReadCustomization(*args, **kwargs):
         return _html.HtmlWindow_SetBorders(*args, **kwargs)
 
     def ReadCustomization(*args, **kwargs):

-        """ReadCustomization(wxConfigBase cfg, wxString path=wxPyEmptyString)"""
+        """ReadCustomization(wxConfigBase cfg, String path=EmptyString)"""

         return _html.HtmlWindow_ReadCustomization(*args, **kwargs)
 
     def WriteCustomization(*args, **kwargs):
         return _html.HtmlWindow_ReadCustomization(*args, **kwargs)
 
     def WriteCustomization(*args, **kwargs):

-        """WriteCustomization(wxConfigBase cfg, wxString path=wxPyEmptyString)"""
+        """WriteCustomization(wxConfigBase cfg, String path=EmptyString)"""

         return _html.HtmlWindow_WriteCustomization(*args, **kwargs)
 
     def HistoryBack(*args, **kwargs):
         return _html.HtmlWindow_WriteCustomization(*args, **kwargs)
 
     def HistoryBack(*args, **kwargs):


@@ -1032,11 +1032,11 @@ class HtmlWindow(windows.ScrolledWindow):
         return _html.HtmlWindow_GetParser(*args, **kwargs)
 
     def ScrollToAnchor(*args, **kwargs):
         return _html.HtmlWindow_GetParser(*args, **kwargs)
 
     def ScrollToAnchor(*args, **kwargs):

-        """ScrollToAnchor(wxString anchor) -> bool"""
+        """ScrollToAnchor(String anchor) -> bool"""

         return _html.HtmlWindow_ScrollToAnchor(*args, **kwargs)
 
     def HasAnchor(*args, **kwargs):
         return _html.HtmlWindow_ScrollToAnchor(*args, **kwargs)
 
     def HasAnchor(*args, **kwargs):

-        """HasAnchor(wxString anchor) -> bool"""
+        """HasAnchor(String anchor) -> bool"""

         return _html.HtmlWindow_HasAnchor(*args, **kwargs)
 
     def AddFilter(*args, **kwargs):
         return _html.HtmlWindow_HasAnchor(*args, **kwargs)
 
     def AddFilter(*args, **kwargs):


@@ -1049,7 +1049,7 @@ class HtmlWindow(windows.ScrolledWindow):
         return _html.HtmlWindow_base_OnLinkClicked(*args, **kwargs)
 
     def base_OnSetTitle(*args, **kwargs):
         return _html.HtmlWindow_base_OnLinkClicked(*args, **kwargs)
 
     def base_OnSetTitle(*args, **kwargs):

-        """base_OnSetTitle(wxString title)"""
+        """base_OnSetTitle(String title)"""

         return _html.HtmlWindow_base_OnSetTitle(*args, **kwargs)
 
     def base_OnCellMouseHover(*args, **kwargs):
         return _html.HtmlWindow_base_OnSetTitle(*args, **kwargs)
 
     def base_OnCellMouseHover(*args, **kwargs):


@@ -1096,7 +1096,7 @@ class HtmlDCRenderer(core.Object):
         except: pass
 
     def SetDC(*args, **kwargs):
         except: pass
 
     def SetDC(*args, **kwargs):

-        """SetDC(wxDC dc, int maxwidth)"""
+        """SetDC(DC dc, int maxwidth)"""

         return _html.HtmlDCRenderer_SetDC(*args, **kwargs)
 
     def SetSize(*args, **kwargs):
         return _html.HtmlDCRenderer_SetDC(*args, **kwargs)
 
     def SetSize(*args, **kwargs):


@@ -1104,11 +1104,11 @@ class HtmlDCRenderer(core.Object):
         return _html.HtmlDCRenderer_SetSize(*args, **kwargs)
 
     def SetHtmlText(*args, **kwargs):
         return _html.HtmlDCRenderer_SetSize(*args, **kwargs)
 
     def SetHtmlText(*args, **kwargs):

-        """SetHtmlText(wxString html, wxString basepath=wxPyEmptyString, bool isdir=True)"""
+        """SetHtmlText(String html, String basepath=EmptyString, bool isdir=True)"""

         return _html.HtmlDCRenderer_SetHtmlText(*args, **kwargs)
 
     def SetFonts(*args, **kwargs):
         return _html.HtmlDCRenderer_SetHtmlText(*args, **kwargs)
 
     def SetFonts(*args, **kwargs):

-        """SetFonts(wxString normal_face, wxString fixed_face, PyObject sizes=None)"""
+        """SetFonts(String normal_face, String fixed_face, PyObject sizes=None)"""

         return _html.HtmlDCRenderer_SetFonts(*args, **kwargs)
 
     def Render(*args, **kwargs):
         return _html.HtmlDCRenderer_SetFonts(*args, **kwargs)
 
     def Render(*args, **kwargs):


@@ -1137,29 +1137,29 @@ class HtmlPrintout(windows.Printout):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxHtmlPrintout instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxHtmlPrintout instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):

-        """__init__(wxString title=wxPyHtmlPrintoutTitleStr) -> HtmlPrintout"""
+        """__init__(String title=wxPyHtmlPrintoutTitleStr) -> HtmlPrintout"""

         newobj = _html.new_HtmlPrintout(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def SetHtmlText(*args, **kwargs):
         newobj = _html.new_HtmlPrintout(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def SetHtmlText(*args, **kwargs):

-        """SetHtmlText(wxString html, wxString basepath=wxPyEmptyString, bool isdir=True)"""
+        """SetHtmlText(String html, String basepath=EmptyString, bool isdir=True)"""

         return _html.HtmlPrintout_SetHtmlText(*args, **kwargs)
 
     def SetHtmlFile(*args, **kwargs):
         return _html.HtmlPrintout_SetHtmlText(*args, **kwargs)
 
     def SetHtmlFile(*args, **kwargs):

-        """SetHtmlFile(wxString htmlfile)"""
+        """SetHtmlFile(String htmlfile)"""

         return _html.HtmlPrintout_SetHtmlFile(*args, **kwargs)
 
     def SetHeader(*args, **kwargs):
         return _html.HtmlPrintout_SetHtmlFile(*args, **kwargs)
 
     def SetHeader(*args, **kwargs):

-        """SetHeader(wxString header, int pg=PAGE_ALL)"""
+        """SetHeader(String header, int pg=PAGE_ALL)"""

         return _html.HtmlPrintout_SetHeader(*args, **kwargs)
 
     def SetFooter(*args, **kwargs):
         return _html.HtmlPrintout_SetHeader(*args, **kwargs)
 
     def SetFooter(*args, **kwargs):

-        """SetFooter(wxString footer, int pg=PAGE_ALL)"""
+        """SetFooter(String footer, int pg=PAGE_ALL)"""

         return _html.HtmlPrintout_SetFooter(*args, **kwargs)
 
     def SetFonts(*args, **kwargs):
         return _html.HtmlPrintout_SetFooter(*args, **kwargs)
 
     def SetFonts(*args, **kwargs):

-        """SetFonts(wxString normal_face, wxString fixed_face, PyObject sizes=None)"""
+        """SetFonts(String normal_face, String fixed_face, PyObject sizes=None)"""

         return _html.HtmlPrintout_SetFonts(*args, **kwargs)
 
     def SetMargins(*args, **kwargs):
         return _html.HtmlPrintout_SetFonts(*args, **kwargs)
 
     def SetMargins(*args, **kwargs):


@@ -1199,7 +1199,7 @@ class HtmlEasyPrinting(core.Object):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxHtmlEasyPrinting instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxHtmlEasyPrinting instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):

-        """__init__(wxString name=wxPyHtmlPrintingTitleStr, Window parentWindow=None) -> HtmlEasyPrinting"""
+        """__init__(String name=wxPyHtmlPrintingTitleStr, Window parentWindow=None) -> HtmlEasyPrinting"""

         newobj = _html.new_HtmlEasyPrinting(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         newobj = _html.new_HtmlEasyPrinting(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1


@@ -1211,19 +1211,19 @@ class HtmlEasyPrinting(core.Object):
         except: pass
 
     def PreviewFile(*args, **kwargs):
         except: pass
 
     def PreviewFile(*args, **kwargs):

-        """PreviewFile(wxString htmlfile)"""
+        """PreviewFile(String htmlfile)"""

         return _html.HtmlEasyPrinting_PreviewFile(*args, **kwargs)
 
     def PreviewText(*args, **kwargs):
         return _html.HtmlEasyPrinting_PreviewFile(*args, **kwargs)
 
     def PreviewText(*args, **kwargs):

-        """PreviewText(wxString htmltext, wxString basepath=wxPyEmptyString)"""
+        """PreviewText(String htmltext, String basepath=EmptyString)"""

         return _html.HtmlEasyPrinting_PreviewText(*args, **kwargs)
 
     def PrintFile(*args, **kwargs):
         return _html.HtmlEasyPrinting_PreviewText(*args, **kwargs)
 
     def PrintFile(*args, **kwargs):

-        """PrintFile(wxString htmlfile)"""
+        """PrintFile(String htmlfile)"""

         return _html.HtmlEasyPrinting_PrintFile(*args, **kwargs)
 
     def PrintText(*args, **kwargs):
         return _html.HtmlEasyPrinting_PrintFile(*args, **kwargs)
 
     def PrintText(*args, **kwargs):

-        """PrintText(wxString htmltext, wxString basepath=wxPyEmptyString)"""
+        """PrintText(String htmltext, String basepath=EmptyString)"""

         return _html.HtmlEasyPrinting_PrintText(*args, **kwargs)
 
     def PrinterSetup(*args, **kwargs):
         return _html.HtmlEasyPrinting_PrintText(*args, **kwargs)
 
     def PrinterSetup(*args, **kwargs):


@@ -1235,15 +1235,15 @@ class HtmlEasyPrinting(core.Object):
         return _html.HtmlEasyPrinting_PageSetup(*args, **kwargs)
 
     def SetHeader(*args, **kwargs):
         return _html.HtmlEasyPrinting_PageSetup(*args, **kwargs)
 
     def SetHeader(*args, **kwargs):

-        """SetHeader(wxString header, int pg=PAGE_ALL)"""
+        """SetHeader(String header, int pg=PAGE_ALL)"""

         return _html.HtmlEasyPrinting_SetHeader(*args, **kwargs)
 
     def SetFooter(*args, **kwargs):
         return _html.HtmlEasyPrinting_SetHeader(*args, **kwargs)
 
     def SetFooter(*args, **kwargs):

-        """SetFooter(wxString footer, int pg=PAGE_ALL)"""
+        """SetFooter(String footer, int pg=PAGE_ALL)"""

         return _html.HtmlEasyPrinting_SetFooter(*args, **kwargs)
 
     def SetFonts(*args, **kwargs):
         return _html.HtmlEasyPrinting_SetFooter(*args, **kwargs)
 
     def SetFonts(*args, **kwargs):

-        """SetFonts(wxString normal_face, wxString fixed_face, PyObject sizes=None)"""
+        """SetFonts(String normal_face, String fixed_face, PyObject sizes=None)"""

         return _html.HtmlEasyPrinting_SetFonts(*args, **kwargs)
 
     def GetPrintData(*args, **kwargs):
         return _html.HtmlEasyPrinting_SetFonts(*args, **kwargs)
 
     def GetPrintData(*args, **kwargs):


@@ -1268,28 +1268,25 @@ class HtmlBookRecord(object):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxHtmlBookRecord instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxHtmlBookRecord instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):

-        """
-        __init__(wxString bookfile, wxString basepath, wxString title, 
-            wxString start) -> HtmlBookRecord
-        """
+        """__init__(String bookfile, String basepath, String title, String start) -> HtmlBookRecord"""

         newobj = _html.new_HtmlBookRecord(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def GetBookFile(*args, **kwargs):
         newobj = _html.new_HtmlBookRecord(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def GetBookFile(*args, **kwargs):

-        """GetBookFile() -> wxString"""
+        """GetBookFile() -> String"""

         return _html.HtmlBookRecord_GetBookFile(*args, **kwargs)
 
     def GetTitle(*args, **kwargs):
         return _html.HtmlBookRecord_GetBookFile(*args, **kwargs)
 
     def GetTitle(*args, **kwargs):

-        """GetTitle() -> wxString"""
+        """GetTitle() -> String"""

         return _html.HtmlBookRecord_GetTitle(*args, **kwargs)
 
     def GetStart(*args, **kwargs):
         return _html.HtmlBookRecord_GetTitle(*args, **kwargs)
 
     def GetStart(*args, **kwargs):

-        """GetStart() -> wxString"""
+        """GetStart() -> String"""

         return _html.HtmlBookRecord_GetStart(*args, **kwargs)
 
     def GetBasePath(*args, **kwargs):
         return _html.HtmlBookRecord_GetStart(*args, **kwargs)
 
     def GetBasePath(*args, **kwargs):

-        """GetBasePath() -> wxString"""
+        """GetBasePath() -> String"""

         return _html.HtmlBookRecord_GetBasePath(*args, **kwargs)
 
     def SetContentsRange(*args, **kwargs):
         return _html.HtmlBookRecord_GetBasePath(*args, **kwargs)
 
     def SetContentsRange(*args, **kwargs):


@@ -1305,19 +1302,19 @@ class HtmlBookRecord(object):
         return _html.HtmlBookRecord_GetContentsEnd(*args, **kwargs)
 
     def SetTitle(*args, **kwargs):
         return _html.HtmlBookRecord_GetContentsEnd(*args, **kwargs)
 
     def SetTitle(*args, **kwargs):

-        """SetTitle(wxString title)"""
+        """SetTitle(String title)"""

         return _html.HtmlBookRecord_SetTitle(*args, **kwargs)
 
     def SetBasePath(*args, **kwargs):
         return _html.HtmlBookRecord_SetTitle(*args, **kwargs)
 
     def SetBasePath(*args, **kwargs):

-        """SetBasePath(wxString path)"""
+        """SetBasePath(String path)"""

         return _html.HtmlBookRecord_SetBasePath(*args, **kwargs)
 
     def SetStart(*args, **kwargs):
         return _html.HtmlBookRecord_SetBasePath(*args, **kwargs)
 
     def SetStart(*args, **kwargs):

-        """SetStart(wxString start)"""
+        """SetStart(String start)"""

         return _html.HtmlBookRecord_SetStart(*args, **kwargs)
 
     def GetFullPath(*args, **kwargs):
         return _html.HtmlBookRecord_SetStart(*args, **kwargs)
 
     def GetFullPath(*args, **kwargs):

-        """GetFullPath(wxString page) -> wxString"""
+        """GetFullPath(String page) -> String"""

         return _html.HtmlBookRecord_GetFullPath(*args, **kwargs)
 
 
         return _html.HtmlBookRecord_GetFullPath(*args, **kwargs)
 
 


@@ -1341,11 +1338,11 @@ class HtmlContentsItem(object):
         return _html.HtmlContentsItem_GetID(*args, **kwargs)
 
     def GetName(*args, **kwargs):
         return _html.HtmlContentsItem_GetID(*args, **kwargs)
 
     def GetName(*args, **kwargs):

-        """GetName() -> wxString"""
+        """GetName() -> String"""

         return _html.HtmlContentsItem_GetName(*args, **kwargs)
 
     def GetPage(*args, **kwargs):
         return _html.HtmlContentsItem_GetName(*args, **kwargs)
 
     def GetPage(*args, **kwargs):

-        """GetPage() -> wxString"""
+        """GetPage() -> String"""

         return _html.HtmlContentsItem_GetPage(*args, **kwargs)
 
     def GetBook(*args, **kwargs):
         return _html.HtmlContentsItem_GetPage(*args, **kwargs)
 
     def GetBook(*args, **kwargs):


@@ -1381,7 +1378,7 @@ class HtmlSearchStatus(object):
         return _html.HtmlSearchStatus_GetMaxIndex(*args, **kwargs)
 
     def GetName(*args, **kwargs):
         return _html.HtmlSearchStatus_GetMaxIndex(*args, **kwargs)
 
     def GetName(*args, **kwargs):

-        """GetName() -> wxString"""
+        """GetName() -> String"""

         return _html.HtmlSearchStatus_GetName(*args, **kwargs)
 
     def GetContentsItem(*args, **kwargs):
         return _html.HtmlSearchStatus_GetName(*args, **kwargs)
 
     def GetContentsItem(*args, **kwargs):


@@ -1412,19 +1409,19 @@ class HtmlHelpData(object):
         except: pass
 
     def SetTempDir(*args, **kwargs):
         except: pass
 
     def SetTempDir(*args, **kwargs):

-        """SetTempDir(wxString path)"""
+        """SetTempDir(String path)"""

         return _html.HtmlHelpData_SetTempDir(*args, **kwargs)
 
     def AddBook(*args, **kwargs):
         return _html.HtmlHelpData_SetTempDir(*args, **kwargs)
 
     def AddBook(*args, **kwargs):

-        """AddBook(wxString book) -> bool"""
+        """AddBook(String book) -> bool"""

         return _html.HtmlHelpData_AddBook(*args, **kwargs)
 
     def FindPageByName(*args, **kwargs):
         return _html.HtmlHelpData_AddBook(*args, **kwargs)
 
     def FindPageByName(*args, **kwargs):

-        """FindPageByName(wxString page) -> wxString"""
+        """FindPageByName(String page) -> String"""

         return _html.HtmlHelpData_FindPageByName(*args, **kwargs)
 
     def FindPageById(*args, **kwargs):
         return _html.HtmlHelpData_FindPageByName(*args, **kwargs)
 
     def FindPageById(*args, **kwargs):

-        """FindPageById(int id) -> wxString"""
+        """FindPageById(int id) -> String"""

         return _html.HtmlHelpData_FindPageById(*args, **kwargs)
 
     def GetBookRecArray(*args, **kwargs):
         return _html.HtmlHelpData_FindPageById(*args, **kwargs)
 
     def GetBookRecArray(*args, **kwargs):


@@ -1460,8 +1457,8 @@ class HtmlHelpFrame(windows.Frame):
         return "<%s.%s; proxy of C++ wxHtmlHelpFrame instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """
         return "<%s.%s; proxy of C++ wxHtmlHelpFrame instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """

-        __init__(Window parent, int ??, wxString title=wxPyEmptyString, 
-            int style=HF_DEFAULTSTYLE, HtmlHelpData data=None) -> HtmlHelpFrame
+        __init__(Window parent, int ??, String title=EmptyString, int style=HF_DEFAULTSTYLE, 
+            HtmlHelpData data=None) -> HtmlHelpFrame

         """
         newobj = _html.new_HtmlHelpFrame(*args, **kwargs)
         self.this = newobj.this
         """
         newobj = _html.new_HtmlHelpFrame(*args, **kwargs)
         self.this = newobj.this


@@ -1474,11 +1471,11 @@ class HtmlHelpFrame(windows.Frame):
         return _html.HtmlHelpFrame_GetData(*args, **kwargs)
 
     def SetTitleFormat(*args, **kwargs):
         return _html.HtmlHelpFrame_GetData(*args, **kwargs)
 
     def SetTitleFormat(*args, **kwargs):

-        """SetTitleFormat(wxString format)"""
+        """SetTitleFormat(String format)"""

         return _html.HtmlHelpFrame_SetTitleFormat(*args, **kwargs)
 
     def Display(*args, **kwargs):
         return _html.HtmlHelpFrame_SetTitleFormat(*args, **kwargs)
 
     def Display(*args, **kwargs):

-        """Display(wxString x)"""
+        """Display(String x)"""

         return _html.HtmlHelpFrame_Display(*args, **kwargs)
 
     def DisplayID(*args, **kwargs):
         return _html.HtmlHelpFrame_Display(*args, **kwargs)
 
     def DisplayID(*args, **kwargs):


@@ -1494,19 +1491,19 @@ class HtmlHelpFrame(windows.Frame):
         return _html.HtmlHelpFrame_DisplayIndex(*args, **kwargs)
 
     def KeywordSearch(*args, **kwargs):
         return _html.HtmlHelpFrame_DisplayIndex(*args, **kwargs)
 
     def KeywordSearch(*args, **kwargs):

-        """KeywordSearch(wxString keyword) -> bool"""
+        """KeywordSearch(String keyword) -> bool"""

         return _html.HtmlHelpFrame_KeywordSearch(*args, **kwargs)
 
     def UseConfig(*args, **kwargs):
         return _html.HtmlHelpFrame_KeywordSearch(*args, **kwargs)
 
     def UseConfig(*args, **kwargs):

-        """UseConfig(wxConfigBase config, wxString rootpath=wxPyEmptyString)"""
+        """UseConfig(wxConfigBase config, String rootpath=EmptyString)"""

         return _html.HtmlHelpFrame_UseConfig(*args, **kwargs)
 
     def ReadCustomization(*args, **kwargs):
         return _html.HtmlHelpFrame_UseConfig(*args, **kwargs)
 
     def ReadCustomization(*args, **kwargs):

-        """ReadCustomization(wxConfigBase cfg, wxString path=wxPyEmptyString)"""
+        """ReadCustomization(wxConfigBase cfg, String path=EmptyString)"""

         return _html.HtmlHelpFrame_ReadCustomization(*args, **kwargs)
 
     def WriteCustomization(*args, **kwargs):
         return _html.HtmlHelpFrame_ReadCustomization(*args, **kwargs)
 
     def WriteCustomization(*args, **kwargs):

-        """WriteCustomization(wxConfigBase cfg, wxString path=wxPyEmptyString)"""
+        """WriteCustomization(wxConfigBase cfg, String path=EmptyString)"""

         return _html.HtmlHelpFrame_WriteCustomization(*args, **kwargs)
 
 
         return _html.HtmlHelpFrame_WriteCustomization(*args, **kwargs)
 
 


@@ -1544,19 +1541,19 @@ class HtmlHelpController(core.EvtHandler):
         except: pass
 
     def SetTitleFormat(*args, **kwargs):
         except: pass
 
     def SetTitleFormat(*args, **kwargs):

-        """SetTitleFormat(wxString format)"""
+        """SetTitleFormat(String format)"""

         return _html.HtmlHelpController_SetTitleFormat(*args, **kwargs)
 
     def SetTempDir(*args, **kwargs):
         return _html.HtmlHelpController_SetTitleFormat(*args, **kwargs)
 
     def SetTempDir(*args, **kwargs):

-        """SetTempDir(wxString path)"""
+        """SetTempDir(String path)"""

         return _html.HtmlHelpController_SetTempDir(*args, **kwargs)
 
     def AddBook(*args, **kwargs):
         return _html.HtmlHelpController_SetTempDir(*args, **kwargs)
 
     def AddBook(*args, **kwargs):

-        """AddBook(wxString book, int show_wait_msg=False) -> bool"""
+        """AddBook(String book, int show_wait_msg=False) -> bool"""

         return _html.HtmlHelpController_AddBook(*args, **kwargs)
 
     def Display(*args, **kwargs):
         return _html.HtmlHelpController_AddBook(*args, **kwargs)
 
     def Display(*args, **kwargs):

-        """Display(wxString x)"""
+        """Display(String x)"""

         return _html.HtmlHelpController_Display(*args, **kwargs)
 
     def DisplayID(*args, **kwargs):
         return _html.HtmlHelpController_Display(*args, **kwargs)
 
     def DisplayID(*args, **kwargs):


@@ -1572,19 +1569,19 @@ class HtmlHelpController(core.EvtHandler):
         return _html.HtmlHelpController_DisplayIndex(*args, **kwargs)
 
     def KeywordSearch(*args, **kwargs):
         return _html.HtmlHelpController_DisplayIndex(*args, **kwargs)
 
     def KeywordSearch(*args, **kwargs):

-        """KeywordSearch(wxString keyword) -> bool"""
+        """KeywordSearch(String keyword) -> bool"""

         return _html.HtmlHelpController_KeywordSearch(*args, **kwargs)
 
     def UseConfig(*args, **kwargs):
         return _html.HtmlHelpController_KeywordSearch(*args, **kwargs)
 
     def UseConfig(*args, **kwargs):

-        """UseConfig(wxConfigBase config, wxString rootpath=wxPyEmptyString)"""
+        """UseConfig(wxConfigBase config, String rootpath=EmptyString)"""

         return _html.HtmlHelpController_UseConfig(*args, **kwargs)
 
     def ReadCustomization(*args, **kwargs):
         return _html.HtmlHelpController_UseConfig(*args, **kwargs)
 
     def ReadCustomization(*args, **kwargs):

-        """ReadCustomization(wxConfigBase cfg, wxString path=wxPyEmptyString)"""
+        """ReadCustomization(wxConfigBase cfg, String path=EmptyString)"""

         return _html.HtmlHelpController_ReadCustomization(*args, **kwargs)
 
     def WriteCustomization(*args, **kwargs):
         return _html.HtmlHelpController_ReadCustomization(*args, **kwargs)
 
     def WriteCustomization(*args, **kwargs):

-        """WriteCustomization(wxConfigBase cfg, wxString path=wxPyEmptyString)"""
+        """WriteCustomization(wxConfigBase cfg, String path=EmptyString)"""

         return _html.HtmlHelpController_WriteCustomization(*args, **kwargs)
 
     def GetFrame(*args, **kwargs):
         return _html.HtmlHelpController_WriteCustomization(*args, **kwargs)
 
     def GetFrame(*args, **kwargs):

diff --git a/wxPython/src/gtk/misc.py b/wxPython/src/gtk/misc.py
index f8cd53fa66de949ad1f1cf575411df3162e52b16..2dc11f976523e3e4db5b2297df2eeb0de2716e57 100644 (file)
--- a/wxPython/src/gtk/misc.py
+++ b/wxPython/src/gtk/misc.py
@@ -103,32 +103,32 @@ class SystemSettings(object):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxSystemSettings instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def GetColour(*args, **kwargs):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxSystemSettings instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def GetColour(*args, **kwargs):

-        """SystemSettings.GetColour(wxSystemColour index) -> wxColour"""
+        """SystemSettings.GetColour(int index) -> Colour"""

         return _misc.SystemSettings_GetColour(*args, **kwargs)
 
     GetColour = staticmethod(GetColour)
     def GetFont(*args, **kwargs):
         return _misc.SystemSettings_GetColour(*args, **kwargs)
 
     GetColour = staticmethod(GetColour)
     def GetFont(*args, **kwargs):

-        """SystemSettings.GetFont(wxSystemFont index) -> wxFont"""
+        """SystemSettings.GetFont(int index) -> Font"""

         return _misc.SystemSettings_GetFont(*args, **kwargs)
 
     GetFont = staticmethod(GetFont)
     def GetMetric(*args, **kwargs):
         return _misc.SystemSettings_GetFont(*args, **kwargs)
 
     GetFont = staticmethod(GetFont)
     def GetMetric(*args, **kwargs):

-        """SystemSettings.GetMetric(wxSystemMetric index) -> int"""
+        """SystemSettings.GetMetric(int index) -> int"""

         return _misc.SystemSettings_GetMetric(*args, **kwargs)
 
     GetMetric = staticmethod(GetMetric)
     def HasFeature(*args, **kwargs):
         return _misc.SystemSettings_GetMetric(*args, **kwargs)
 
     GetMetric = staticmethod(GetMetric)
     def HasFeature(*args, **kwargs):

-        """SystemSettings.HasFeature(wxSystemFeature index) -> bool"""
+        """SystemSettings.HasFeature(int index) -> bool"""

         return _misc.SystemSettings_HasFeature(*args, **kwargs)
 
     HasFeature = staticmethod(HasFeature)
     def GetScreenType(*args, **kwargs):
         return _misc.SystemSettings_HasFeature(*args, **kwargs)
 
     HasFeature = staticmethod(HasFeature)
     def GetScreenType(*args, **kwargs):

-        """SystemSettings.GetScreenType() -> wxSystemScreenType"""
+        """SystemSettings.GetScreenType() -> int"""

         return _misc.SystemSettings_GetScreenType(*args, **kwargs)
 
     GetScreenType = staticmethod(GetScreenType)
     def SetScreenType(*args, **kwargs):
         return _misc.SystemSettings_GetScreenType(*args, **kwargs)
 
     GetScreenType = staticmethod(GetScreenType)
     def SetScreenType(*args, **kwargs):

-        """SystemSettings.SetScreenType(wxSystemScreenType screen)"""
+        """SystemSettings.SetScreenType(int screen)"""

         return _misc.SystemSettings_SetScreenType(*args, **kwargs)
 
     SetScreenType = staticmethod(SetScreenType)
         return _misc.SystemSettings_SetScreenType(*args, **kwargs)
 
     SetScreenType = staticmethod(SetScreenType)


@@ -141,27 +141,27 @@ class SystemSettingsPtr(SystemSettings):
 _misc.SystemSettings_swigregister(SystemSettingsPtr)
 
 def SystemSettings_GetColour(*args, **kwargs):
 _misc.SystemSettings_swigregister(SystemSettingsPtr)
 
 def SystemSettings_GetColour(*args, **kwargs):

-    """SystemSettings_GetColour(wxSystemColour index) -> wxColour"""
+    """SystemSettings_GetColour(int index) -> Colour"""

     return _misc.SystemSettings_GetColour(*args, **kwargs)
 
 def SystemSettings_GetFont(*args, **kwargs):
     return _misc.SystemSettings_GetColour(*args, **kwargs)
 
 def SystemSettings_GetFont(*args, **kwargs):

-    """SystemSettings_GetFont(wxSystemFont index) -> wxFont"""
+    """SystemSettings_GetFont(int index) -> Font"""

     return _misc.SystemSettings_GetFont(*args, **kwargs)
 
 def SystemSettings_GetMetric(*args, **kwargs):
     return _misc.SystemSettings_GetFont(*args, **kwargs)
 
 def SystemSettings_GetMetric(*args, **kwargs):

-    """SystemSettings_GetMetric(wxSystemMetric index) -> int"""
+    """SystemSettings_GetMetric(int index) -> int"""

     return _misc.SystemSettings_GetMetric(*args, **kwargs)
 
 def SystemSettings_HasFeature(*args, **kwargs):
     return _misc.SystemSettings_GetMetric(*args, **kwargs)
 
 def SystemSettings_HasFeature(*args, **kwargs):

-    """SystemSettings_HasFeature(wxSystemFeature index) -> bool"""
+    """SystemSettings_HasFeature(int index) -> bool"""

     return _misc.SystemSettings_HasFeature(*args, **kwargs)
 
 def SystemSettings_GetScreenType(*args, **kwargs):
     return _misc.SystemSettings_HasFeature(*args, **kwargs)
 
 def SystemSettings_GetScreenType(*args, **kwargs):

-    """SystemSettings_GetScreenType() -> wxSystemScreenType"""
+    """SystemSettings_GetScreenType() -> int"""

     return _misc.SystemSettings_GetScreenType(*args, **kwargs)
 
 def SystemSettings_SetScreenType(*args, **kwargs):
     return _misc.SystemSettings_GetScreenType(*args, **kwargs)
 
 def SystemSettings_SetScreenType(*args, **kwargs):

-    """SystemSettings_SetScreenType(wxSystemScreenType screen)"""
+    """SystemSettings_SetScreenType(int screen)"""

     return _misc.SystemSettings_SetScreenType(*args, **kwargs)
 
 # backwards compatibility aliasses
     return _misc.SystemSettings_SetScreenType(*args, **kwargs)
 
 # backwards compatibility aliasses


@@ -179,27 +179,27 @@ class SystemOptions(core.Object):
         self.thisown = 1
         del newobj.thisown
     def SetOption(*args, **kwargs):
         self.thisown = 1
         del newobj.thisown
     def SetOption(*args, **kwargs):

-        """SystemOptions.SetOption(wxString name, wxString value)"""
+        """SystemOptions.SetOption(String name, String value)"""

         return _misc.SystemOptions_SetOption(*args, **kwargs)
 
     SetOption = staticmethod(SetOption)
     def SetOptionInt(*args, **kwargs):
         return _misc.SystemOptions_SetOption(*args, **kwargs)
 
     SetOption = staticmethod(SetOption)
     def SetOptionInt(*args, **kwargs):

-        """SystemOptions.SetOptionInt(wxString name, int value)"""
+        """SystemOptions.SetOptionInt(String name, int value)"""

         return _misc.SystemOptions_SetOptionInt(*args, **kwargs)
 
     SetOptionInt = staticmethod(SetOptionInt)
     def GetOption(*args, **kwargs):
         return _misc.SystemOptions_SetOptionInt(*args, **kwargs)
 
     SetOptionInt = staticmethod(SetOptionInt)
     def GetOption(*args, **kwargs):

-        """SystemOptions.GetOption(wxString name) -> wxString"""
+        """SystemOptions.GetOption(String name) -> String"""

         return _misc.SystemOptions_GetOption(*args, **kwargs)
 
     GetOption = staticmethod(GetOption)
     def GetOptionInt(*args, **kwargs):
         return _misc.SystemOptions_GetOption(*args, **kwargs)
 
     GetOption = staticmethod(GetOption)
     def GetOptionInt(*args, **kwargs):

-        """SystemOptions.GetOptionInt(wxString name) -> int"""
+        """SystemOptions.GetOptionInt(String name) -> int"""

         return _misc.SystemOptions_GetOptionInt(*args, **kwargs)
 
     GetOptionInt = staticmethod(GetOptionInt)
     def HasOption(*args, **kwargs):
         return _misc.SystemOptions_GetOptionInt(*args, **kwargs)
 
     GetOptionInt = staticmethod(GetOptionInt)
     def HasOption(*args, **kwargs):

-        """SystemOptions.HasOption(wxString name) -> bool"""
+        """SystemOptions.HasOption(String name) -> bool"""

         return _misc.SystemOptions_HasOption(*args, **kwargs)
 
     HasOption = staticmethod(HasOption)
         return _misc.SystemOptions_HasOption(*args, **kwargs)
 
     HasOption = staticmethod(HasOption)


@@ -212,23 +212,23 @@ class SystemOptionsPtr(SystemOptions):
 _misc.SystemOptions_swigregister(SystemOptionsPtr)
 
 def SystemOptions_SetOption(*args, **kwargs):
 _misc.SystemOptions_swigregister(SystemOptionsPtr)
 
 def SystemOptions_SetOption(*args, **kwargs):

-    """SystemOptions_SetOption(wxString name, wxString value)"""
+    """SystemOptions_SetOption(String name, String value)"""

     return _misc.SystemOptions_SetOption(*args, **kwargs)
 
 def SystemOptions_SetOptionInt(*args, **kwargs):
     return _misc.SystemOptions_SetOption(*args, **kwargs)
 
 def SystemOptions_SetOptionInt(*args, **kwargs):

-    """SystemOptions_SetOptionInt(wxString name, int value)"""
+    """SystemOptions_SetOptionInt(String name, int value)"""

     return _misc.SystemOptions_SetOptionInt(*args, **kwargs)
 
 def SystemOptions_GetOption(*args, **kwargs):
     return _misc.SystemOptions_SetOptionInt(*args, **kwargs)
 
 def SystemOptions_GetOption(*args, **kwargs):

-    """SystemOptions_GetOption(wxString name) -> wxString"""
+    """SystemOptions_GetOption(String name) -> String"""

     return _misc.SystemOptions_GetOption(*args, **kwargs)
 
 def SystemOptions_GetOptionInt(*args, **kwargs):
     return _misc.SystemOptions_GetOption(*args, **kwargs)
 
 def SystemOptions_GetOptionInt(*args, **kwargs):

-    """SystemOptions_GetOptionInt(wxString name) -> int"""
+    """SystemOptions_GetOptionInt(String name) -> int"""

     return _misc.SystemOptions_GetOptionInt(*args, **kwargs)
 
 def SystemOptions_HasOption(*args, **kwargs):
     return _misc.SystemOptions_GetOptionInt(*args, **kwargs)
 
 def SystemOptions_HasOption(*args, **kwargs):

-    """SystemOptions_HasOption(wxString name) -> bool"""
+    """SystemOptions_HasOption(String name) -> bool"""

     return _misc.SystemOptions_HasOption(*args, **kwargs)
 
 #---------------------------------------------------------------------------
     return _misc.SystemOptions_HasOption(*args, **kwargs)
 
 #---------------------------------------------------------------------------


@@ -267,11 +267,11 @@ def IsBusy(*args, **kwargs):
     return _misc.IsBusy(*args, **kwargs)
 
 def Now(*args, **kwargs):
     return _misc.IsBusy(*args, **kwargs)
 
 def Now(*args, **kwargs):

-    """Now() -> wxString"""
+    """Now() -> String"""

     return _misc.Now(*args, **kwargs)
 
 def Shell(*args, **kwargs):
     return _misc.Now(*args, **kwargs)
 
 def Shell(*args, **kwargs):

-    """Shell(wxString command=wxPyEmptyString) -> bool"""
+    """Shell(String command=EmptyString) -> bool"""

     return _misc.Shell(*args, **kwargs)
 
 def StartTimer(*args, **kwargs):
     return _misc.Shell(*args, **kwargs)
 
 def StartTimer(*args, **kwargs):


@@ -283,7 +283,7 @@ def GetOsVersion(*args, **kwargs):
     return _misc.GetOsVersion(*args, **kwargs)
 
 def GetOsDescription(*args, **kwargs):
     return _misc.GetOsVersion(*args, **kwargs)
 
 def GetOsDescription(*args, **kwargs):

-    """GetOsDescription() -> wxString"""
+    """GetOsDescription() -> String"""

     return _misc.GetOsDescription(*args, **kwargs)
 
 def GetFreeMemory(*args, **kwargs):
     return _misc.GetOsDescription(*args, **kwargs)
 
 def GetFreeMemory(*args, **kwargs):


@@ -293,7 +293,7 @@ SHUTDOWN_POWEROFF = _misc.SHUTDOWN_POWEROFF
 SHUTDOWN_REBOOT = _misc.SHUTDOWN_REBOOT
 
 def Shutdown(*args, **kwargs):
 SHUTDOWN_REBOOT = _misc.SHUTDOWN_REBOOT
 
 def Shutdown(*args, **kwargs):

-    """Shutdown(wxShutdownFlags wFlags) -> bool"""
+    """Shutdown(int wFlags) -> bool"""

     return _misc.Shutdown(*args, **kwargs)
 
 def Sleep(*args, **kwargs):
     return _misc.Shutdown(*args, **kwargs)
 
 def Sleep(*args, **kwargs):


@@ -309,35 +309,35 @@ def EnableTopLevelWindows(*args, **kwargs):
     return _misc.EnableTopLevelWindows(*args, **kwargs)
 
 def StripMenuCodes(*args, **kwargs):
     return _misc.EnableTopLevelWindows(*args, **kwargs)
 
 def StripMenuCodes(*args, **kwargs):

-    """StripMenuCodes(wxString in) -> wxString"""
+    """StripMenuCodes(String in) -> String"""

     return _misc.StripMenuCodes(*args, **kwargs)
 
 def GetEmailAddress(*args, **kwargs):
     return _misc.StripMenuCodes(*args, **kwargs)
 
 def GetEmailAddress(*args, **kwargs):

-    """GetEmailAddress() -> wxString"""
+    """GetEmailAddress() -> String"""

     return _misc.GetEmailAddress(*args, **kwargs)
 
 def GetHostName(*args, **kwargs):
     return _misc.GetEmailAddress(*args, **kwargs)
 
 def GetHostName(*args, **kwargs):

-    """GetHostName() -> wxString"""
+    """GetHostName() -> String"""

     return _misc.GetHostName(*args, **kwargs)
 
 def GetFullHostName(*args, **kwargs):
     return _misc.GetHostName(*args, **kwargs)
 
 def GetFullHostName(*args, **kwargs):

-    """GetFullHostName() -> wxString"""
+    """GetFullHostName() -> String"""

     return _misc.GetFullHostName(*args, **kwargs)
 
 def GetUserId(*args, **kwargs):
     return _misc.GetFullHostName(*args, **kwargs)
 
 def GetUserId(*args, **kwargs):

-    """GetUserId() -> wxString"""
+    """GetUserId() -> String"""

     return _misc.GetUserId(*args, **kwargs)
 
 def GetUserName(*args, **kwargs):
     return _misc.GetUserId(*args, **kwargs)
 
 def GetUserName(*args, **kwargs):

-    """GetUserName() -> wxString"""
+    """GetUserName() -> String"""

     return _misc.GetUserName(*args, **kwargs)
 
 def GetHomeDir(*args, **kwargs):
     return _misc.GetUserName(*args, **kwargs)
 
 def GetHomeDir(*args, **kwargs):

-    """GetHomeDir() -> wxString"""
+    """GetHomeDir() -> String"""

     return _misc.GetHomeDir(*args, **kwargs)
 
 def GetUserHome(*args, **kwargs):
     return _misc.GetHomeDir(*args, **kwargs)
 
 def GetUserHome(*args, **kwargs):

-    """GetUserHome(wxString user=wxPyEmptyString) -> wxString"""
+    """GetUserHome(String user=EmptyString) -> String"""

     return _misc.GetUserHome(*args, **kwargs)
 
 def GetProcessId(*args, **kwargs):
     return _misc.GetUserHome(*args, **kwargs)
 
 def GetProcessId(*args, **kwargs):


@@ -350,82 +350,80 @@ def Trap(*args, **kwargs):
 
 def FileSelector(*args, **kwargs):
     """
 
 def FileSelector(*args, **kwargs):
     """

-    FileSelector(wxString message=wxPyFileSelectorPromptStr, wxString default_path=wxPyEmptyString, 
-        wxString default_filename=wxPyEmptyString, 
-        wxString default_extension=wxPyEmptyString, 
-        wxString wildcard=wxPyFileSelectorDefaultWildcardStr, 
-        int flags=0, 
-        Window parent=None, int x=-1, int y=-1) -> wxString
+    FileSelector(String message=wxPyFileSelectorPromptStr, String default_path=EmptyString, 
+        String default_filename=EmptyString, 
+        String default_extension=EmptyString, 
+        String wildcard=wxPyFileSelectorDefaultWildcardStr, 
+        int flags=0, Window parent=None, 
+        int x=-1, int y=-1) -> String

     """
     return _misc.FileSelector(*args, **kwargs)
 
 def LoadFileSelector(*args, **kwargs):
     """
     """
     return _misc.FileSelector(*args, **kwargs)
 
 def LoadFileSelector(*args, **kwargs):
     """

-    LoadFileSelector(wxString what, wxString extension, wxString default_name=wxPyEmptyString, 
-        Window parent=None) -> wxString
+    LoadFileSelector(String what, String extension, String default_name=EmptyString, 
+        Window parent=None) -> String

     """
     return _misc.LoadFileSelector(*args, **kwargs)
 
 def SaveFileSelector(*args, **kwargs):
     """
     """
     return _misc.LoadFileSelector(*args, **kwargs)
 
 def SaveFileSelector(*args, **kwargs):
     """

-    SaveFileSelector(wxString what, wxString extension, wxString default_name=wxPyEmptyString, 
-        Window parent=None) -> wxString
+    SaveFileSelector(String what, String extension, String default_name=EmptyString, 
+        Window parent=None) -> String

     """
     return _misc.SaveFileSelector(*args, **kwargs)
 
 def DirSelector(*args, **kwargs):
     """
     """
     return _misc.SaveFileSelector(*args, **kwargs)
 
 def DirSelector(*args, **kwargs):
     """

-    DirSelector(wxString message=wxPyDirSelectorPromptStr, wxString defaultPath=wxPyEmptyString, 
+    DirSelector(String message=wxPyDirSelectorPromptStr, String defaultPath=EmptyString, 

         long style=DD_DEFAULT_STYLE, 
         long style=DD_DEFAULT_STYLE, 

-        Point pos=DefaultPosition, Window parent=None) -> wxString
+        Point pos=DefaultPosition, Window parent=None) -> String

     """
     return _misc.DirSelector(*args, **kwargs)
 
 def GetTextFromUser(*args, **kwargs):
     """
     """
     return _misc.DirSelector(*args, **kwargs)
 
 def GetTextFromUser(*args, **kwargs):
     """

-    GetTextFromUser(wxString message, wxString caption=wxPyEmptyString, 
-        wxString default_value=wxPyEmptyString, Window parent=None, 
-        int x=-1, int y=-1, bool centre=True) -> wxString
+    GetTextFromUser(String message, String caption=EmptyString, String default_value=EmptyString, 
+        Window parent=None, 
+        int x=-1, int y=-1, bool centre=True) -> String

     """
     return _misc.GetTextFromUser(*args, **kwargs)
 
 def GetPasswordFromUser(*args, **kwargs):
     """
     """
     return _misc.GetTextFromUser(*args, **kwargs)
 
 def GetPasswordFromUser(*args, **kwargs):
     """

-    GetPasswordFromUser(wxString message, wxString caption=wxPyEmptyString, 
-        wxString default_value=wxPyEmptyString, Window parent=None) -> wxString
+    GetPasswordFromUser(String message, String caption=EmptyString, String default_value=EmptyString, 
+        Window parent=None) -> String

     """
     return _misc.GetPasswordFromUser(*args, **kwargs)
 
 def GetSingleChoice(*args, **kwargs):
     """
     """
     return _misc.GetPasswordFromUser(*args, **kwargs)
 
 def GetSingleChoice(*args, **kwargs):
     """

-    GetSingleChoice(wxString message, wxString caption, int choices, wxString choices_array, 
+    GetSingleChoice(String message, String caption, int choices, String choices_array, 

         Window parent=None, int x=-1, 
         Window parent=None, int x=-1, 

-        int y=-1, bool centre=True, int width=150, 
-        int height=200) -> wxString
+        int y=-1, bool centre=True, int width=150, int height=200) -> String

     """
     return _misc.GetSingleChoice(*args, **kwargs)
 
 def GetSingleChoiceIndex(*args, **kwargs):
     """
     """
     return _misc.GetSingleChoice(*args, **kwargs)
 
 def GetSingleChoiceIndex(*args, **kwargs):
     """

-    GetSingleChoiceIndex(wxString message, wxString caption, int choices, wxString choices_array, 
+    GetSingleChoiceIndex(String message, String caption, int choices, String choices_array, 

         Window parent=None, int x=-1, 
         Window parent=None, int x=-1, 

-        int y=-1, bool centre=True, int width=150, 
-        int height=200) -> int
+        int y=-1, bool centre=True, int width=150, int height=200) -> int

     """
     return _misc.GetSingleChoiceIndex(*args, **kwargs)
 
 def MessageBox(*args, **kwargs):
     """
     """
     return _misc.GetSingleChoiceIndex(*args, **kwargs)
 
 def MessageBox(*args, **kwargs):
     """

-    MessageBox(wxString message, wxString caption=wxPyEmptyString, 
-        int style=wxOK|wxCENTRE, Window parent=None, 
-        int x=-1, int y=-1) -> int
+    MessageBox(String message, String caption=EmptyString, int style=wxOK|wxCENTRE, 
+        Window parent=None, int x=-1, 
+        int y=-1) -> int

     """
     return _misc.MessageBox(*args, **kwargs)
 
 def GetNumberFromUser(*args, **kwargs):
     """
     """
     return _misc.MessageBox(*args, **kwargs)
 
 def GetNumberFromUser(*args, **kwargs):
     """

-    GetNumberFromUser(wxString message, wxString prompt, wxString caption, 
-        long value, long min=0, long max=100, Window parent=None, 
+    GetNumberFromUser(String message, String prompt, String caption, long value, 
+        long min=0, long max=100, Window parent=None, 

         Point pos=DefaultPosition) -> long
     """
     return _misc.GetNumberFromUser(*args, **kwargs)
         Point pos=DefaultPosition) -> long
     """
     return _misc.GetNumberFromUser(*args, **kwargs)


@@ -467,11 +465,11 @@ def GetClientDisplayRect(*args, **kwargs):
     return _misc.GetClientDisplayRect(*args, **kwargs)
 
 def SetCursor(*args, **kwargs):
     return _misc.GetClientDisplayRect(*args, **kwargs)
 
 def SetCursor(*args, **kwargs):

-    """SetCursor(wxCursor cursor)"""
+    """SetCursor(Cursor cursor)"""

     return _misc.SetCursor(*args, **kwargs)
 
 def BeginBusyCursor(*args, **kwargs):
     return _misc.SetCursor(*args, **kwargs)
 
 def BeginBusyCursor(*args, **kwargs):

-    """BeginBusyCursor(wxCursor cursor=wxHOURGLASS_CURSOR)"""
+    """BeginBusyCursor(Cursor cursor=wxHOURGLASS_CURSOR)"""

     return _misc.BeginBusyCursor(*args, **kwargs)
 
 def GetActiveWindow(*args, **kwargs):
     return _misc.BeginBusyCursor(*args, **kwargs)
 
 def GetActiveWindow(*args, **kwargs):


@@ -534,17 +532,17 @@ class ToolTip(core.Object):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxToolTip instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxToolTip instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):

-        """__init__(wxString tip) -> ToolTip"""
+        """__init__(String tip) -> ToolTip"""

         newobj = _misc.new_ToolTip(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def SetTip(*args, **kwargs):
         newobj = _misc.new_ToolTip(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def SetTip(*args, **kwargs):

-        """SetTip(wxString tip)"""
+        """SetTip(String tip)"""

         return _misc.ToolTip_SetTip(*args, **kwargs)
 
     def GetTip(*args, **kwargs):
         return _misc.ToolTip_SetTip(*args, **kwargs)
 
     def GetTip(*args, **kwargs):

-        """GetTip() -> wxString"""
+        """GetTip() -> String"""

         return _misc.ToolTip_GetTip(*args, **kwargs)
 
     def GetWindow(*args, **kwargs):
         return _misc.ToolTip_GetTip(*args, **kwargs)
 
     def GetWindow(*args, **kwargs):


@@ -665,7 +663,7 @@ class BusyCursor(object):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxBusyCursor instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxBusyCursor instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):

-        """__init__(wxCursor cursor=wxHOURGLASS_CURSOR) -> BusyCursor"""
+        """__init__(Cursor cursor=wxHOURGLASS_CURSOR) -> BusyCursor"""

         newobj = _misc.new_BusyCursor(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         newobj = _misc.new_BusyCursor(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1


@@ -711,7 +709,7 @@ class BusyInfo(core.Object):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxBusyInfo instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxBusyInfo instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):

-        """__init__(wxString message) -> BusyInfo"""
+        """__init__(String message) -> BusyInfo"""

         newobj = _misc.new_BusyInfo(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         newobj = _misc.new_BusyInfo(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1


@@ -779,7 +777,7 @@ class FileHistory(core.Object):
         except: pass
 
     def AddFileToHistory(*args, **kwargs):
         except: pass
 
     def AddFileToHistory(*args, **kwargs):

-        """AddFileToHistory(wxString file)"""
+        """AddFileToHistory(String file)"""

         return _misc.FileHistory_AddFileToHistory(*args, **kwargs)
 
     def RemoveFileFromHistory(*args, **kwargs):
         return _misc.FileHistory_AddFileToHistory(*args, **kwargs)
 
     def RemoveFileFromHistory(*args, **kwargs):


@@ -815,7 +813,7 @@ class FileHistory(core.Object):
         return _misc.FileHistory_AddFilesToThisMenu(*args, **kwargs)
 
     def GetHistoryFile(*args, **kwargs):
         return _misc.FileHistory_AddFilesToThisMenu(*args, **kwargs)
 
     def GetHistoryFile(*args, **kwargs):

-        """GetHistoryFile(int i) -> wxString"""
+        """GetHistoryFile(int i) -> String"""

         return _misc.FileHistory_GetHistoryFile(*args, **kwargs)
 
     def GetCount(*args, **kwargs):
         return _misc.FileHistory_GetHistoryFile(*args, **kwargs)
 
     def GetCount(*args, **kwargs):


@@ -834,7 +832,7 @@ class SingleInstanceChecker(object):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxSingleInstanceChecker instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxSingleInstanceChecker instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):

-        """__init__(wxString name, wxString path=wxPyEmptyString) -> SingleInstanceChecker"""
+        """__init__(String name, String path=EmptyString) -> SingleInstanceChecker"""

         newobj = _misc.new_SingleInstanceChecker(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         newobj = _misc.new_SingleInstanceChecker(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1


@@ -846,7 +844,7 @@ class SingleInstanceChecker(object):
         except: pass
 
     def Create(*args, **kwargs):
         except: pass
 
     def Create(*args, **kwargs):

-        """Create(wxString name, wxString path=wxPyEmptyString) -> bool"""
+        """Create(String name, String path=EmptyString) -> bool"""

         return _misc.SingleInstanceChecker_Create(*args, **kwargs)
 
     def IsAnotherRunning(*args, **kwargs):
         return _misc.SingleInstanceChecker_Create(*args, **kwargs)
 
     def IsAnotherRunning(*args, **kwargs):


@@ -869,7 +867,7 @@ def PreSingleInstanceChecker(*args, **kwargs):
 
 
 def DrawWindowOnDC(*args, **kwargs):
 
 
 def DrawWindowOnDC(*args, **kwargs):

-    """DrawWindowOnDC(Window window, wxDC dc, int method)"""
+    """DrawWindowOnDC(Window window, DC dc, int method)"""

     return _misc.DrawWindowOnDC(*args, **kwargs)
 #---------------------------------------------------------------------------
 
     return _misc.DrawWindowOnDC(*args, **kwargs)
 #---------------------------------------------------------------------------
 


@@ -884,7 +882,7 @@ class TipProvider(object):
         except: pass
 
     def GetTip(*args, **kwargs):
         except: pass
 
     def GetTip(*args, **kwargs):

-        """GetTip() -> wxString"""
+        """GetTip() -> String"""

         return _misc.TipProvider_GetTip(*args, **kwargs)
 
     def GetCurrentTip(*args, **kwargs):
         return _misc.TipProvider_GetTip(*args, **kwargs)
 
     def GetCurrentTip(*args, **kwargs):


@@ -892,7 +890,7 @@ class TipProvider(object):
         return _misc.TipProvider_GetCurrentTip(*args, **kwargs)
 
     def PreprocessTip(*args, **kwargs):
         return _misc.TipProvider_GetCurrentTip(*args, **kwargs)
 
     def PreprocessTip(*args, **kwargs):

-        """PreprocessTip(wxString tip) -> wxString"""
+        """PreprocessTip(String tip) -> String"""

         return _misc.TipProvider_PreprocessTip(*args, **kwargs)
 
 
         return _misc.TipProvider_PreprocessTip(*args, **kwargs)
 
 


@@ -930,7 +928,7 @@ def ShowTip(*args, **kwargs):
     return _misc.ShowTip(*args, **kwargs)
 
 def CreateFileTipProvider(*args, **kwargs):
     return _misc.ShowTip(*args, **kwargs)
 
 def CreateFileTipProvider(*args, **kwargs):

-    """CreateFileTipProvider(wxString filename, size_t currentTip) -> TipProvider"""
+    """CreateFileTipProvider(String filename, size_t currentTip) -> TipProvider"""

     return _misc.CreateFileTipProvider(*args, **kwargs)
 #---------------------------------------------------------------------------
 
     return _misc.CreateFileTipProvider(*args, **kwargs)
 #---------------------------------------------------------------------------
 


@@ -1156,12 +1154,12 @@ class Log(object):
 
     SetTraceMask = staticmethod(SetTraceMask)
     def AddTraceMask(*args, **kwargs):
 
     SetTraceMask = staticmethod(SetTraceMask)
     def AddTraceMask(*args, **kwargs):

-        """Log.AddTraceMask(wxString str)"""
+        """Log.AddTraceMask(String str)"""

         return _misc.Log_AddTraceMask(*args, **kwargs)
 
     AddTraceMask = staticmethod(AddTraceMask)
     def RemoveTraceMask(*args, **kwargs):
         return _misc.Log_AddTraceMask(*args, **kwargs)
 
     AddTraceMask = staticmethod(AddTraceMask)
     def RemoveTraceMask(*args, **kwargs):

-        """Log.RemoveTraceMask(wxString str)"""
+        """Log.RemoveTraceMask(String str)"""

         return _misc.Log_RemoveTraceMask(*args, **kwargs)
 
     RemoveTraceMask = staticmethod(RemoveTraceMask)
         return _misc.Log_RemoveTraceMask(*args, **kwargs)
 
     RemoveTraceMask = staticmethod(RemoveTraceMask)


@@ -1206,7 +1204,7 @@ class Log(object):
 
     GetTimestamp = staticmethod(GetTimestamp)
     def TimeStamp(*args, **kwargs):
 
     GetTimestamp = staticmethod(GetTimestamp)
     def TimeStamp(*args, **kwargs):

-        """Log.TimeStamp() -> wxString"""
+        """Log.TimeStamp() -> String"""

         return _misc.Log_TimeStamp(*args, **kwargs)
 
     TimeStamp = staticmethod(TimeStamp)
         return _misc.Log_TimeStamp(*args, **kwargs)
 
     TimeStamp = staticmethod(TimeStamp)


@@ -1271,11 +1269,11 @@ def Log_SetTraceMask(*args, **kwargs):
     return _misc.Log_SetTraceMask(*args, **kwargs)
 
 def Log_AddTraceMask(*args, **kwargs):
     return _misc.Log_SetTraceMask(*args, **kwargs)
 
 def Log_AddTraceMask(*args, **kwargs):

-    """Log_AddTraceMask(wxString str)"""
+    """Log_AddTraceMask(String str)"""

     return _misc.Log_AddTraceMask(*args, **kwargs)
 
 def Log_RemoveTraceMask(*args, **kwargs):
     return _misc.Log_AddTraceMask(*args, **kwargs)
 
 def Log_RemoveTraceMask(*args, **kwargs):

-    """Log_RemoveTraceMask(wxString str)"""
+    """Log_RemoveTraceMask(String str)"""

     return _misc.Log_RemoveTraceMask(*args, **kwargs)
 
 def Log_ClearTraceMasks(*args, **kwargs):
     return _misc.Log_RemoveTraceMask(*args, **kwargs)
 
 def Log_ClearTraceMasks(*args, **kwargs):


@@ -1311,7 +1309,7 @@ def Log_GetTimestamp(*args, **kwargs):
     return _misc.Log_GetTimestamp(*args, **kwargs)
 
 def Log_TimeStamp(*args, **kwargs):
     return _misc.Log_GetTimestamp(*args, **kwargs)
 
 def Log_TimeStamp(*args, **kwargs):

-    """Log_TimeStamp() -> wxString"""
+    """Log_TimeStamp() -> String"""

     return _misc.Log_TimeStamp(*args, **kwargs)
 
 class LogStderr(Log):
     return _misc.Log_TimeStamp(*args, **kwargs)
 
 class LogStderr(Log):


@@ -1369,10 +1367,7 @@ class LogWindow(Log):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxLogWindow instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxLogWindow instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):

-        """
-        __init__(wxFrame pParent, wxString szTitle, bool bShow=True, 
-            bool bPassToOld=True) -> LogWindow
-        """
+        """__init__(wxFrame pParent, String szTitle, bool bShow=True, bool bPassToOld=True) -> LogWindow"""

         newobj = _misc.new_LogWindow(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         newobj = _misc.new_LogWindow(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1


@@ -1444,55 +1439,55 @@ def SysErrorCode(*args, **kwargs):
     return _misc.SysErrorCode(*args, **kwargs)
 
 def SysErrorMsg(*args, **kwargs):
     return _misc.SysErrorCode(*args, **kwargs)
 
 def SysErrorMsg(*args, **kwargs):

-    """SysErrorMsg(unsigned long nErrCode=0) -> wxString"""
+    """SysErrorMsg(unsigned long nErrCode=0) -> String"""

     return _misc.SysErrorMsg(*args, **kwargs)
 
 def LogFatalError(*args, **kwargs):
     return _misc.SysErrorMsg(*args, **kwargs)
 
 def LogFatalError(*args, **kwargs):

-    """LogFatalError(wxString msg)"""
+    """LogFatalError(String msg)"""

     return _misc.LogFatalError(*args, **kwargs)
 
 def LogError(*args, **kwargs):
     return _misc.LogFatalError(*args, **kwargs)
 
 def LogError(*args, **kwargs):

-    """LogError(wxString msg)"""
+    """LogError(String msg)"""

     return _misc.LogError(*args, **kwargs)
 
 def LogWarning(*args, **kwargs):
     return _misc.LogError(*args, **kwargs)
 
 def LogWarning(*args, **kwargs):

-    """LogWarning(wxString msg)"""
+    """LogWarning(String msg)"""

     return _misc.LogWarning(*args, **kwargs)
 
 def LogMessage(*args, **kwargs):
     return _misc.LogWarning(*args, **kwargs)
 
 def LogMessage(*args, **kwargs):

-    """LogMessage(wxString msg)"""
+    """LogMessage(String msg)"""

     return _misc.LogMessage(*args, **kwargs)
 
 def LogInfo(*args, **kwargs):
     return _misc.LogMessage(*args, **kwargs)
 
 def LogInfo(*args, **kwargs):

-    """LogInfo(wxString msg)"""
+    """LogInfo(String msg)"""

     return _misc.LogInfo(*args, **kwargs)
 
 def LogDebug(*args, **kwargs):
     return _misc.LogInfo(*args, **kwargs)
 
 def LogDebug(*args, **kwargs):

-    """LogDebug(wxString msg)"""
+    """LogDebug(String msg)"""

     return _misc.LogDebug(*args, **kwargs)
 
 def LogVerbose(*args, **kwargs):
     return _misc.LogDebug(*args, **kwargs)
 
 def LogVerbose(*args, **kwargs):

-    """LogVerbose(wxString msg)"""
+    """LogVerbose(String msg)"""

     return _misc.LogVerbose(*args, **kwargs)
 
 def LogStatus(*args, **kwargs):
     return _misc.LogVerbose(*args, **kwargs)
 
 def LogStatus(*args, **kwargs):

-    """LogStatus(wxString msg)"""
+    """LogStatus(String msg)"""

     return _misc.LogStatus(*args, **kwargs)
 
 def LogStatusFrame(*args, **kwargs):
     return _misc.LogStatus(*args, **kwargs)
 
 def LogStatusFrame(*args, **kwargs):

-    """LogStatusFrame(wxFrame pFrame, wxString msg)"""
+    """LogStatusFrame(wxFrame pFrame, String msg)"""

     return _misc.LogStatusFrame(*args, **kwargs)
 
 def LogSysError(*args, **kwargs):
     return _misc.LogStatusFrame(*args, **kwargs)
 
 def LogSysError(*args, **kwargs):

-    """LogSysError(wxString msg)"""
+    """LogSysError(String msg)"""

     return _misc.LogSysError(*args, **kwargs)
 
 def LogGeneric(*args, **kwargs):
     return _misc.LogSysError(*args, **kwargs)
 
 def LogGeneric(*args, **kwargs):

-    """LogGeneric(unsigned long level, wxString msg)"""
+    """LogGeneric(unsigned long level, String msg)"""

     return _misc.LogGeneric(*args, **kwargs)
 
 def SafeShowMessage(*args, **kwargs):
     return _misc.LogGeneric(*args, **kwargs)
 
 def SafeShowMessage(*args, **kwargs):

-    """SafeShowMessage(wxString title, wxString text)"""
+    """SafeShowMessage(String title, String text)"""

     return _misc.SafeShowMessage(*args, **kwargs)
 class LogNull(object):
     def __repr__(self):
     return _misc.SafeShowMessage(*args, **kwargs)
 class LogNull(object):
     def __repr__(self):


@@ -1519,8 +1514,8 @@ _misc.LogNull_swigregister(LogNullPtr)
 
 def LogTrace(*args):
     """
 
 def LogTrace(*args):
     """

-    LogTrace(unsigned long mask, wxString msg)
-    LogTrace(wxString mask, wxString msg)
+    LogTrace(unsigned long mask, String msg)
+    LogTrace(String mask, String msg)

     """
     return _misc.LogTrace(*args)
 
     """
     return _misc.LogTrace(*args)
 


@@ -1577,7 +1572,7 @@ class Process(core.EvtHandler):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxPyProcess instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def Kill(*args, **kwargs):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxPyProcess instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def Kill(*args, **kwargs):

-        """Process.Kill(int pid, wxSignal sig=SIGTERM) -> wxKillError"""
+        """Process.Kill(int pid, int sig=SIGTERM) -> int"""

         return _misc.Process_Kill(*args, **kwargs)
 
     Kill = staticmethod(Kill)
         return _misc.Process_Kill(*args, **kwargs)
 
     Kill = staticmethod(Kill)


@@ -1587,7 +1582,7 @@ class Process(core.EvtHandler):
 
     Exists = staticmethod(Exists)
     def Open(*args, **kwargs):
 
     Exists = staticmethod(Exists)
     def Open(*args, **kwargs):

-        """Process.Open(wxString cmd, int flags=EXEC_ASYNC) -> Process"""
+        """Process.Open(String cmd, int flags=EXEC_ASYNC) -> Process"""

         return _misc.Process_Open(*args, **kwargs)
 
     Open = staticmethod(Open)
         return _misc.Process_Open(*args, **kwargs)
 
     Open = staticmethod(Open)


@@ -1620,11 +1615,11 @@ class Process(core.EvtHandler):
         return _misc.Process_Detach(*args, **kwargs)
 
     def GetInputStream(*args, **kwargs):
         return _misc.Process_Detach(*args, **kwargs)
 
     def GetInputStream(*args, **kwargs):

-        """GetInputStream() -> wxInputStream"""
+        """GetInputStream() -> InputStream"""

         return _misc.Process_GetInputStream(*args, **kwargs)
 
     def GetErrorStream(*args, **kwargs):
         return _misc.Process_GetInputStream(*args, **kwargs)
 
     def GetErrorStream(*args, **kwargs):

-        """GetErrorStream() -> wxInputStream"""
+        """GetErrorStream() -> InputStream"""

         return _misc.Process_GetErrorStream(*args, **kwargs)
 
     def GetOutputStream(*args, **kwargs):
         return _misc.Process_GetErrorStream(*args, **kwargs)
 
     def GetOutputStream(*args, **kwargs):


@@ -1656,7 +1651,7 @@ class ProcessPtr(Process):
 _misc.Process_swigregister(ProcessPtr)
 
 def Process_Kill(*args, **kwargs):
 _misc.Process_swigregister(ProcessPtr)
 
 def Process_Kill(*args, **kwargs):

-    """Process_Kill(int pid, wxSignal sig=SIGTERM) -> wxKillError"""
+    """Process_Kill(int pid, int sig=SIGTERM) -> int"""

     return _misc.Process_Kill(*args, **kwargs)
 
 def Process_Exists(*args, **kwargs):
     return _misc.Process_Kill(*args, **kwargs)
 
 def Process_Exists(*args, **kwargs):


@@ -1664,7 +1659,7 @@ def Process_Exists(*args, **kwargs):
     return _misc.Process_Exists(*args, **kwargs)
 
 def Process_Open(*args, **kwargs):
     return _misc.Process_Exists(*args, **kwargs)
 
 def Process_Open(*args, **kwargs):

-    """Process_Open(wxString cmd, int flags=EXEC_ASYNC) -> Process"""
+    """Process_Open(String cmd, int flags=EXEC_ASYNC) -> Process"""

     return _misc.Process_Open(*args, **kwargs)
 
 class ProcessEvent(core.Event):
     return _misc.Process_Open(*args, **kwargs)
 
 class ProcessEvent(core.Event):


@@ -1703,7 +1698,7 @@ EXEC_NOHIDE = _misc.EXEC_NOHIDE
 EXEC_MAKE_GROUP_LEADER = _misc.EXEC_MAKE_GROUP_LEADER
 
 def Execute(*args, **kwargs):
 EXEC_MAKE_GROUP_LEADER = _misc.EXEC_MAKE_GROUP_LEADER
 
 def Execute(*args, **kwargs):

-    """Execute(wxString command, int flags=EXEC_ASYNC, Process process=None) -> long"""
+    """Execute(String command, int flags=EXEC_ASYNC, Process process=None) -> long"""

     return _misc.Execute(*args, **kwargs)
 #---------------------------------------------------------------------------
 
     return _misc.Execute(*args, **kwargs)
 #---------------------------------------------------------------------------
 


@@ -1786,7 +1781,7 @@ class Joystick(object):
         return _misc.Joystick_GetProductId(*args, **kwargs)
 
     def GetProductName(*args, **kwargs):
         return _misc.Joystick_GetProductId(*args, **kwargs)
 
     def GetProductName(*args, **kwargs):

-        """GetProductName() -> wxString"""
+        """GetProductName() -> String"""

         return _misc.Joystick_GetProductName(*args, **kwargs)
 
     def GetXMin(*args, **kwargs):
         return _misc.Joystick_GetProductName(*args, **kwargs)
 
     def GetXMin(*args, **kwargs):


@@ -2017,7 +2012,7 @@ class Wave(object):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxWave instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxWave instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):

-        """__init__(wxString fileName, bool isResource=False) -> Wave"""
+        """__init__(String fileName, bool isResource=False) -> Wave"""

         newobj = _misc.new_Wave(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         newobj = _misc.new_Wave(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1


@@ -2046,7 +2041,7 @@ class WavePtr(Wave):
 _misc.Wave_swigregister(WavePtr)
 
 def WaveData(*args, **kwargs):
 _misc.Wave_swigregister(WavePtr)
 
 def WaveData(*args, **kwargs):

-    """WaveData(wxString data) -> Wave"""
+    """WaveData(String data) -> Wave"""

     val = _misc.new_WaveData(*args, **kwargs)
     val.thisown = 1
     return val
     val = _misc.new_WaveData(*args, **kwargs)
     val.thisown = 1
     return val


@@ -2062,10 +2057,7 @@ class FileTypeInfo(object):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxFileTypeInfo instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxFileTypeInfo instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):

-        """
-        __init__(wxString mimeType, wxString openCmd, wxString printCmd, 
-            wxString desc) -> FileTypeInfo
-        """
+        """__init__(String mimeType, String openCmd, String printCmd, String desc) -> FileTypeInfo"""

         newobj = _misc.new_FileTypeInfo(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         newobj = _misc.new_FileTypeInfo(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1


@@ -2075,31 +2067,31 @@ class FileTypeInfo(object):
         return _misc.FileTypeInfo_IsValid(*args, **kwargs)
 
     def SetIcon(*args, **kwargs):
         return _misc.FileTypeInfo_IsValid(*args, **kwargs)
 
     def SetIcon(*args, **kwargs):

-        """SetIcon(wxString iconFile, int iconIndex=0)"""
+        """SetIcon(String iconFile, int iconIndex=0)"""

         return _misc.FileTypeInfo_SetIcon(*args, **kwargs)
 
     def SetShortDesc(*args, **kwargs):
         return _misc.FileTypeInfo_SetIcon(*args, **kwargs)
 
     def SetShortDesc(*args, **kwargs):

-        """SetShortDesc(wxString shortDesc)"""
+        """SetShortDesc(String shortDesc)"""

         return _misc.FileTypeInfo_SetShortDesc(*args, **kwargs)
 
     def GetMimeType(*args, **kwargs):
         return _misc.FileTypeInfo_SetShortDesc(*args, **kwargs)
 
     def GetMimeType(*args, **kwargs):

-        """GetMimeType() -> wxString"""
+        """GetMimeType() -> String"""

         return _misc.FileTypeInfo_GetMimeType(*args, **kwargs)
 
     def GetOpenCommand(*args, **kwargs):
         return _misc.FileTypeInfo_GetMimeType(*args, **kwargs)
 
     def GetOpenCommand(*args, **kwargs):

-        """GetOpenCommand() -> wxString"""
+        """GetOpenCommand() -> String"""

         return _misc.FileTypeInfo_GetOpenCommand(*args, **kwargs)
 
     def GetPrintCommand(*args, **kwargs):
         return _misc.FileTypeInfo_GetOpenCommand(*args, **kwargs)
 
     def GetPrintCommand(*args, **kwargs):

-        """GetPrintCommand() -> wxString"""
+        """GetPrintCommand() -> String"""

         return _misc.FileTypeInfo_GetPrintCommand(*args, **kwargs)
 
     def GetShortDesc(*args, **kwargs):
         return _misc.FileTypeInfo_GetPrintCommand(*args, **kwargs)
 
     def GetShortDesc(*args, **kwargs):

-        """GetShortDesc() -> wxString"""
+        """GetShortDesc() -> String"""

         return _misc.FileTypeInfo_GetShortDesc(*args, **kwargs)
 
     def GetDescription(*args, **kwargs):
         return _misc.FileTypeInfo_GetShortDesc(*args, **kwargs)
 
     def GetDescription(*args, **kwargs):

-        """GetDescription() -> wxString"""
+        """GetDescription() -> String"""

         return _misc.FileTypeInfo_GetDescription(*args, **kwargs)
 
     def GetExtensions(*args, **kwargs):
         return _misc.FileTypeInfo_GetDescription(*args, **kwargs)
 
     def GetExtensions(*args, **kwargs):


@@ -2111,7 +2103,7 @@ class FileTypeInfo(object):
         return _misc.FileTypeInfo_GetExtensionsCount(*args, **kwargs)
 
     def GetIconFile(*args, **kwargs):
         return _misc.FileTypeInfo_GetExtensionsCount(*args, **kwargs)
 
     def GetIconFile(*args, **kwargs):

-        """GetIconFile() -> wxString"""
+        """GetIconFile() -> String"""

         return _misc.FileTypeInfo_GetIconFile(*args, **kwargs)
 
     def GetIconIndex(*args, **kwargs):
         return _misc.FileTypeInfo_GetIconFile(*args, **kwargs)
 
     def GetIconIndex(*args, **kwargs):


@@ -2178,23 +2170,23 @@ class FileType(object):
         return _misc.FileType_GetDescription(*args, **kwargs)
 
     def GetOpenCommand(*args, **kwargs):
         return _misc.FileType_GetDescription(*args, **kwargs)
 
     def GetOpenCommand(*args, **kwargs):

-        """GetOpenCommand(wxString filename, wxString mimetype=wxPyEmptyString) -> PyObject"""
+        """GetOpenCommand(String filename, String mimetype=EmptyString) -> PyObject"""

         return _misc.FileType_GetOpenCommand(*args, **kwargs)
 
     def GetPrintCommand(*args, **kwargs):
         return _misc.FileType_GetOpenCommand(*args, **kwargs)
 
     def GetPrintCommand(*args, **kwargs):

-        """GetPrintCommand(wxString filename, wxString mimetype=wxPyEmptyString) -> PyObject"""
+        """GetPrintCommand(String filename, String mimetype=EmptyString) -> PyObject"""

         return _misc.FileType_GetPrintCommand(*args, **kwargs)
 
     def GetAllCommands(*args, **kwargs):
         return _misc.FileType_GetPrintCommand(*args, **kwargs)
 
     def GetAllCommands(*args, **kwargs):

-        """GetAllCommands(wxString filename, wxString mimetype=wxPyEmptyString) -> PyObject"""
+        """GetAllCommands(String filename, String mimetype=EmptyString) -> PyObject"""

         return _misc.FileType_GetAllCommands(*args, **kwargs)
 
     def SetCommand(*args, **kwargs):
         return _misc.FileType_GetAllCommands(*args, **kwargs)
 
     def SetCommand(*args, **kwargs):

-        """SetCommand(wxString cmd, wxString verb, bool overwriteprompt=True) -> bool"""
+        """SetCommand(String cmd, String verb, bool overwriteprompt=True) -> bool"""

         return _misc.FileType_SetCommand(*args, **kwargs)
 
     def SetDefaultIcon(*args, **kwargs):
         return _misc.FileType_SetCommand(*args, **kwargs)
 
     def SetDefaultIcon(*args, **kwargs):

-        """SetDefaultIcon(wxString cmd=wxPyEmptyString, int index=0) -> bool"""
+        """SetDefaultIcon(String cmd=EmptyString, int index=0) -> bool"""

         return _misc.FileType_SetDefaultIcon(*args, **kwargs)
 
     def Unassociate(*args, **kwargs):
         return _misc.FileType_SetDefaultIcon(*args, **kwargs)
 
     def Unassociate(*args, **kwargs):


@@ -2202,7 +2194,7 @@ class FileType(object):
         return _misc.FileType_Unassociate(*args, **kwargs)
 
     def ExpandCommand(*args, **kwargs):
         return _misc.FileType_Unassociate(*args, **kwargs)
 
     def ExpandCommand(*args, **kwargs):

-        """FileType.ExpandCommand(wxString command, wxString filename, wxString mimetype=wxPyEmptyString) -> wxString"""
+        """FileType.ExpandCommand(String command, String filename, String mimetype=EmptyString) -> String"""

         return _misc.FileType_ExpandCommand(*args, **kwargs)
 
     ExpandCommand = staticmethod(ExpandCommand)
         return _misc.FileType_ExpandCommand(*args, **kwargs)
 
     ExpandCommand = staticmethod(ExpandCommand)


@@ -2215,14 +2207,14 @@ class FileTypePtr(FileType):
 _misc.FileType_swigregister(FileTypePtr)
 
 def FileType_ExpandCommand(*args, **kwargs):
 _misc.FileType_swigregister(FileTypePtr)
 
 def FileType_ExpandCommand(*args, **kwargs):

-    """FileType_ExpandCommand(wxString command, wxString filename, wxString mimetype=wxPyEmptyString) -> wxString"""
+    """FileType_ExpandCommand(String command, String filename, String mimetype=EmptyString) -> String"""

     return _misc.FileType_ExpandCommand(*args, **kwargs)
 
 class MimeTypesManager(object):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxMimeTypesManager instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def IsOfType(*args, **kwargs):
     return _misc.FileType_ExpandCommand(*args, **kwargs)
 
 class MimeTypesManager(object):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxMimeTypesManager instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def IsOfType(*args, **kwargs):

-        """MimeTypesManager.IsOfType(wxString mimeType, wxString wildcard) -> bool"""
+        """MimeTypesManager.IsOfType(String mimeType, String wildcard) -> bool"""

         return _misc.MimeTypesManager_IsOfType(*args, **kwargs)
 
     IsOfType = staticmethod(IsOfType)
         return _misc.MimeTypesManager_IsOfType(*args, **kwargs)
 
     IsOfType = staticmethod(IsOfType)


@@ -2233,7 +2225,7 @@ class MimeTypesManager(object):
         self.thisown = 1
         del newobj.thisown
     def Initialize(*args, **kwargs):
         self.thisown = 1
         del newobj.thisown
     def Initialize(*args, **kwargs):

-        """Initialize(int mailcapStyle=MAILCAP_ALL, wxString extraDir=wxPyEmptyString)"""
+        """Initialize(int mailcapStyle=MAILCAP_ALL, String extraDir=EmptyString)"""

         return _misc.MimeTypesManager_Initialize(*args, **kwargs)
 
     def ClearData(*args, **kwargs):
         return _misc.MimeTypesManager_Initialize(*args, **kwargs)
 
     def ClearData(*args, **kwargs):


@@ -2241,19 +2233,19 @@ class MimeTypesManager(object):
         return _misc.MimeTypesManager_ClearData(*args, **kwargs)
 
     def GetFileTypeFromExtension(*args, **kwargs):
         return _misc.MimeTypesManager_ClearData(*args, **kwargs)
 
     def GetFileTypeFromExtension(*args, **kwargs):

-        """GetFileTypeFromExtension(wxString ext) -> FileType"""
+        """GetFileTypeFromExtension(String ext) -> FileType"""

         return _misc.MimeTypesManager_GetFileTypeFromExtension(*args, **kwargs)
 
     def GetFileTypeFromMimeType(*args, **kwargs):
         return _misc.MimeTypesManager_GetFileTypeFromExtension(*args, **kwargs)
 
     def GetFileTypeFromMimeType(*args, **kwargs):

-        """GetFileTypeFromMimeType(wxString mimeType) -> FileType"""
+        """GetFileTypeFromMimeType(String mimeType) -> FileType"""

         return _misc.MimeTypesManager_GetFileTypeFromMimeType(*args, **kwargs)
 
     def ReadMailcap(*args, **kwargs):
         return _misc.MimeTypesManager_GetFileTypeFromMimeType(*args, **kwargs)
 
     def ReadMailcap(*args, **kwargs):

-        """ReadMailcap(wxString filename, bool fallback=False) -> bool"""
+        """ReadMailcap(String filename, bool fallback=False) -> bool"""

         return _misc.MimeTypesManager_ReadMailcap(*args, **kwargs)
 
     def ReadMimeTypes(*args, **kwargs):
         return _misc.MimeTypesManager_ReadMailcap(*args, **kwargs)
 
     def ReadMimeTypes(*args, **kwargs):

-        """ReadMimeTypes(wxString filename) -> bool"""
+        """ReadMimeTypes(String filename) -> bool"""

         return _misc.MimeTypesManager_ReadMimeTypes(*args, **kwargs)
 
     def EnumAllFileTypes(*args, **kwargs):
         return _misc.MimeTypesManager_ReadMimeTypes(*args, **kwargs)
 
     def EnumAllFileTypes(*args, **kwargs):


@@ -2289,7 +2281,7 @@ cvar = _misc.cvar
 TheMimeTypesManager = cvar.TheMimeTypesManager
 
 def MimeTypesManager_IsOfType(*args, **kwargs):
 TheMimeTypesManager = cvar.TheMimeTypesManager
 
 def MimeTypesManager_IsOfType(*args, **kwargs):

-    """MimeTypesManager_IsOfType(wxString mimeType, wxString wildcard) -> bool"""
+    """MimeTypesManager_IsOfType(String mimeType, String wildcard) -> bool"""

     return _misc.MimeTypesManager_IsOfType(*args, **kwargs)
 
 #---------------------------------------------------------------------------
     return _misc.MimeTypesManager_IsOfType(*args, **kwargs)
 
 #---------------------------------------------------------------------------


@@ -2339,7 +2331,7 @@ class ArtProvider(object):
     RemoveProvider = staticmethod(RemoveProvider)
     def GetBitmap(*args, **kwargs):
         """
     RemoveProvider = staticmethod(RemoveProvider)
     def GetBitmap(*args, **kwargs):
         """

-        ArtProvider.GetBitmap(wxString id, wxString client=ART_OTHER, Size size=DefaultSize) -> wxBitmap
+        ArtProvider.GetBitmap(String id, String client=ART_OTHER, Size size=DefaultSize) -> Bitmap

 
         Query the providers for bitmap with given ID and return it. Return
         wx.NullBitmap if no provider provides it.
 
         Query the providers for bitmap with given ID and return it. Return
         wx.NullBitmap if no provider provides it.


@@ -2349,7 +2341,7 @@ class ArtProvider(object):
     GetBitmap = staticmethod(GetBitmap)
     def GetIcon(*args, **kwargs):
         """
     GetBitmap = staticmethod(GetBitmap)
     def GetIcon(*args, **kwargs):
         """

-        ArtProvider.GetIcon(wxString id, wxString client=ART_OTHER, Size size=DefaultSize) -> wxIcon
+        ArtProvider.GetIcon(String id, String client=ART_OTHER, Size size=DefaultSize) -> wxIcon

 
         Query the providers for icon with given ID and return it. Return
         wx.NullIcon if no provider provides it.
 
         Query the providers for icon with given ID and return it. Return
         wx.NullIcon if no provider provides it.


@@ -2434,7 +2426,7 @@ def ArtProvider_RemoveProvider(*args, **kwargs):
 
 def ArtProvider_GetBitmap(*args, **kwargs):
     """
 
 def ArtProvider_GetBitmap(*args, **kwargs):
     """

-    ArtProvider_GetBitmap(wxString id, wxString client=ART_OTHER, Size size=DefaultSize) -> wxBitmap
+    ArtProvider_GetBitmap(String id, String client=ART_OTHER, Size size=DefaultSize) -> Bitmap

 
     Query the providers for bitmap with given ID and return it. Return
     wx.NullBitmap if no provider provides it.
 
     Query the providers for bitmap with given ID and return it. Return
     wx.NullBitmap if no provider provides it.


@@ -2443,7 +2435,7 @@ def ArtProvider_GetBitmap(*args, **kwargs):
 
 def ArtProvider_GetIcon(*args, **kwargs):
     """
 
 def ArtProvider_GetIcon(*args, **kwargs):
     """

-    ArtProvider_GetIcon(wxString id, wxString client=ART_OTHER, Size size=DefaultSize) -> wxIcon
+    ArtProvider_GetIcon(String id, String client=ART_OTHER, Size size=DefaultSize) -> wxIcon

 
     Query the providers for icon with given ID and return it. Return
     wx.NullIcon if no provider provides it.
 
     Query the providers for icon with given ID and return it. Return
     wx.NullIcon if no provider provides it.


@@ -2492,11 +2484,11 @@ class ConfigBase(object):
 
     DontCreateOnDemand = staticmethod(DontCreateOnDemand)
     def SetPath(*args, **kwargs):
 
     DontCreateOnDemand = staticmethod(DontCreateOnDemand)
     def SetPath(*args, **kwargs):

-        """SetPath(wxString strPath)"""
+        """SetPath(String strPath)"""

         return _misc.ConfigBase_SetPath(*args, **kwargs)
 
     def GetPath(*args, **kwargs):
         return _misc.ConfigBase_SetPath(*args, **kwargs)
 
     def GetPath(*args, **kwargs):

-        """GetPath() -> wxString"""
+        """GetPath() -> String"""

         return _misc.ConfigBase_GetPath(*args, **kwargs)
 
     def GetFirstGroup(*args, **kwargs):
         return _misc.ConfigBase_GetPath(*args, **kwargs)
 
     def GetFirstGroup(*args, **kwargs):


@@ -2524,51 +2516,51 @@ class ConfigBase(object):
         return _misc.ConfigBase_GetNumberOfGroups(*args, **kwargs)
 
     def HasGroup(*args, **kwargs):
         return _misc.ConfigBase_GetNumberOfGroups(*args, **kwargs)
 
     def HasGroup(*args, **kwargs):

-        """HasGroup(wxString strName) -> bool"""
+        """HasGroup(String strName) -> bool"""

         return _misc.ConfigBase_HasGroup(*args, **kwargs)
 
     def HasEntry(*args, **kwargs):
         return _misc.ConfigBase_HasGroup(*args, **kwargs)
 
     def HasEntry(*args, **kwargs):

-        """HasEntry(wxString strName) -> bool"""
+        """HasEntry(String strName) -> bool"""

         return _misc.ConfigBase_HasEntry(*args, **kwargs)
 
     def Exists(*args, **kwargs):
         return _misc.ConfigBase_HasEntry(*args, **kwargs)
 
     def Exists(*args, **kwargs):

-        """Exists(wxString strName) -> bool"""
+        """Exists(String strName) -> bool"""

         return _misc.ConfigBase_Exists(*args, **kwargs)
 
     def GetEntryType(*args, **kwargs):
         return _misc.ConfigBase_Exists(*args, **kwargs)
 
     def GetEntryType(*args, **kwargs):

-        """GetEntryType(wxString name) -> wxConfigBase::EntryType"""
+        """GetEntryType(String name) -> int"""

         return _misc.ConfigBase_GetEntryType(*args, **kwargs)
 
     def Read(*args, **kwargs):
         return _misc.ConfigBase_GetEntryType(*args, **kwargs)
 
     def Read(*args, **kwargs):

-        """Read(wxString key, wxString defaultVal=wxPyEmptyString) -> wxString"""
+        """Read(String key, String defaultVal=EmptyString) -> String"""

         return _misc.ConfigBase_Read(*args, **kwargs)
 
     def ReadInt(*args, **kwargs):
         return _misc.ConfigBase_Read(*args, **kwargs)
 
     def ReadInt(*args, **kwargs):

-        """ReadInt(wxString key, long defaultVal=0) -> long"""
+        """ReadInt(String key, long defaultVal=0) -> long"""

         return _misc.ConfigBase_ReadInt(*args, **kwargs)
 
     def ReadFloat(*args, **kwargs):
         return _misc.ConfigBase_ReadInt(*args, **kwargs)
 
     def ReadFloat(*args, **kwargs):

-        """ReadFloat(wxString key, double defaultVal=0.0) -> double"""
+        """ReadFloat(String key, double defaultVal=0.0) -> double"""

         return _misc.ConfigBase_ReadFloat(*args, **kwargs)
 
     def ReadBool(*args, **kwargs):
         return _misc.ConfigBase_ReadFloat(*args, **kwargs)
 
     def ReadBool(*args, **kwargs):

-        """ReadBool(wxString key, bool defaultVal=False) -> bool"""
+        """ReadBool(String key, bool defaultVal=False) -> bool"""

         return _misc.ConfigBase_ReadBool(*args, **kwargs)
 
     def Write(*args, **kwargs):
         return _misc.ConfigBase_ReadBool(*args, **kwargs)
 
     def Write(*args, **kwargs):

-        """Write(wxString key, wxString value) -> bool"""
+        """Write(String key, String value) -> bool"""

         return _misc.ConfigBase_Write(*args, **kwargs)
 
     def WriteInt(*args, **kwargs):
         return _misc.ConfigBase_Write(*args, **kwargs)
 
     def WriteInt(*args, **kwargs):

-        """WriteInt(wxString key, long value) -> bool"""
+        """WriteInt(String key, long value) -> bool"""

         return _misc.ConfigBase_WriteInt(*args, **kwargs)
 
     def WriteFloat(*args, **kwargs):
         return _misc.ConfigBase_WriteInt(*args, **kwargs)
 
     def WriteFloat(*args, **kwargs):

-        """WriteFloat(wxString key, double value) -> bool"""
+        """WriteFloat(String key, double value) -> bool"""

         return _misc.ConfigBase_WriteFloat(*args, **kwargs)
 
     def WriteBool(*args, **kwargs):
         return _misc.ConfigBase_WriteFloat(*args, **kwargs)
 
     def WriteBool(*args, **kwargs):

-        """WriteBool(wxString key, bool value) -> bool"""
+        """WriteBool(String key, bool value) -> bool"""

         return _misc.ConfigBase_WriteBool(*args, **kwargs)
 
     def Flush(*args, **kwargs):
         return _misc.ConfigBase_WriteBool(*args, **kwargs)
 
     def Flush(*args, **kwargs):


@@ -2576,19 +2568,19 @@ class ConfigBase(object):
         return _misc.ConfigBase_Flush(*args, **kwargs)
 
     def RenameEntry(*args, **kwargs):
         return _misc.ConfigBase_Flush(*args, **kwargs)
 
     def RenameEntry(*args, **kwargs):

-        """RenameEntry(wxString oldName, wxString newName) -> bool"""
+        """RenameEntry(String oldName, String newName) -> bool"""

         return _misc.ConfigBase_RenameEntry(*args, **kwargs)
 
     def RenameGroup(*args, **kwargs):
         return _misc.ConfigBase_RenameEntry(*args, **kwargs)
 
     def RenameGroup(*args, **kwargs):

-        """RenameGroup(wxString oldName, wxString newName) -> bool"""
+        """RenameGroup(String oldName, String newName) -> bool"""

         return _misc.ConfigBase_RenameGroup(*args, **kwargs)
 
     def DeleteEntry(*args, **kwargs):
         return _misc.ConfigBase_RenameGroup(*args, **kwargs)
 
     def DeleteEntry(*args, **kwargs):

-        """DeleteEntry(wxString key, bool bDeleteGroupIfEmpty=True) -> bool"""
+        """DeleteEntry(String key, bool bDeleteGroupIfEmpty=True) -> bool"""

         return _misc.ConfigBase_DeleteEntry(*args, **kwargs)
 
     def DeleteGroup(*args, **kwargs):
         return _misc.ConfigBase_DeleteEntry(*args, **kwargs)
 
     def DeleteGroup(*args, **kwargs):

-        """DeleteGroup(wxString key) -> bool"""
+        """DeleteGroup(String key) -> bool"""

         return _misc.ConfigBase_DeleteGroup(*args, **kwargs)
 
     def DeleteAll(*args, **kwargs):
         return _misc.ConfigBase_DeleteGroup(*args, **kwargs)
 
     def DeleteAll(*args, **kwargs):


@@ -2612,23 +2604,23 @@ class ConfigBase(object):
         return _misc.ConfigBase_IsRecordingDefaults(*args, **kwargs)
 
     def ExpandEnvVars(*args, **kwargs):
         return _misc.ConfigBase_IsRecordingDefaults(*args, **kwargs)
 
     def ExpandEnvVars(*args, **kwargs):

-        """ExpandEnvVars(wxString str) -> wxString"""
+        """ExpandEnvVars(String str) -> String"""

         return _misc.ConfigBase_ExpandEnvVars(*args, **kwargs)
 
     def GetAppName(*args, **kwargs):
         return _misc.ConfigBase_ExpandEnvVars(*args, **kwargs)
 
     def GetAppName(*args, **kwargs):

-        """GetAppName() -> wxString"""
+        """GetAppName() -> String"""

         return _misc.ConfigBase_GetAppName(*args, **kwargs)
 
     def GetVendorName(*args, **kwargs):
         return _misc.ConfigBase_GetAppName(*args, **kwargs)
 
     def GetVendorName(*args, **kwargs):

-        """GetVendorName() -> wxString"""
+        """GetVendorName() -> String"""

         return _misc.ConfigBase_GetVendorName(*args, **kwargs)
 
     def SetAppName(*args, **kwargs):
         return _misc.ConfigBase_GetVendorName(*args, **kwargs)
 
     def SetAppName(*args, **kwargs):

-        """SetAppName(wxString appName)"""
+        """SetAppName(String appName)"""

         return _misc.ConfigBase_SetAppName(*args, **kwargs)
 
     def SetVendorName(*args, **kwargs):
         return _misc.ConfigBase_SetAppName(*args, **kwargs)
 
     def SetVendorName(*args, **kwargs):

-        """SetVendorName(wxString vendorName)"""
+        """SetVendorName(String vendorName)"""

         return _misc.ConfigBase_SetVendorName(*args, **kwargs)
 
     def SetStyle(*args, **kwargs):
         return _misc.ConfigBase_SetVendorName(*args, **kwargs)
 
     def SetStyle(*args, **kwargs):


@@ -2667,7 +2659,7 @@ class ConfigPathChanger(object):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxConfigPathChanger instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxConfigPathChanger instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):

-        """__init__(ConfigBase pContainer, wxString strEntry) -> ConfigPathChanger"""
+        """__init__(ConfigBase pContainer, String strEntry) -> ConfigPathChanger"""

         newobj = _misc.new_ConfigPathChanger(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         newobj = _misc.new_ConfigPathChanger(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1


@@ -2679,7 +2671,7 @@ class ConfigPathChanger(object):
         except: pass
 
     def Name(*args, **kwargs):
         except: pass
 
     def Name(*args, **kwargs):

-        """Name() -> wxString"""
+        """Name() -> String"""

         return _misc.ConfigPathChanger_Name(*args, **kwargs)
 
 
         return _misc.ConfigPathChanger_Name(*args, **kwargs)
 
 


@@ -2695,9 +2687,8 @@ class Config(ConfigBase):
         return "<%s.%s; proxy of C++ wxConfig instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """
         return "<%s.%s; proxy of C++ wxConfig instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """

-        __init__(wxString appName=wxPyEmptyString, wxString vendorName=wxPyEmptyString, 
-            wxString localFilename=wxPyEmptyString, 
-            wxString globalFilename=wxPyEmptyString, 
+        __init__(String appName=EmptyString, String vendorName=EmptyString, 
+            String localFilename=EmptyString, String globalFilename=EmptyString, 

             long style=0) -> Config
         """
         newobj = _misc.new_Config(*args, **kwargs)
             long style=0) -> Config
         """
         newobj = _misc.new_Config(*args, **kwargs)


@@ -2723,9 +2714,8 @@ class FileConfig(ConfigBase):
         return "<%s.%s; proxy of C++ wxFileConfig instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """
         return "<%s.%s; proxy of C++ wxFileConfig instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """

-        __init__(wxString appName=wxPyEmptyString, wxString vendorName=wxPyEmptyString, 
-            wxString localFilename=wxPyEmptyString, 
-            wxString globalFilename=wxPyEmptyString, 
+        __init__(String appName=EmptyString, String vendorName=EmptyString, 
+            String localFilename=EmptyString, String globalFilename=EmptyString, 

             long style=0) -> FileConfig
         """
         newobj = _misc.new_FileConfig(*args, **kwargs)
             long style=0) -> FileConfig
         """
         newobj = _misc.new_FileConfig(*args, **kwargs)


@@ -2748,7 +2738,7 @@ _misc.FileConfig_swigregister(FileConfigPtr)
 
 
 def ExpandEnvVars(*args, **kwargs):
 
 
 def ExpandEnvVars(*args, **kwargs):

-    """ExpandEnvVars(wxString sz) -> wxString"""
+    """ExpandEnvVars(String sz) -> String"""

     return _misc.ExpandEnvVars(*args, **kwargs)
 #---------------------------------------------------------------------------
 
     return _misc.ExpandEnvVars(*args, **kwargs)
 #---------------------------------------------------------------------------
 


@@ -2911,22 +2901,22 @@ class DateTime(object):
     Monday_First = _misc.DateTime_Monday_First
     Sunday_First = _misc.DateTime_Sunday_First
     def SetCountry(*args, **kwargs):
     Monday_First = _misc.DateTime_Monday_First
     Sunday_First = _misc.DateTime_Sunday_First
     def SetCountry(*args, **kwargs):

-        """DateTime.SetCountry(wxDateTime::Country country)"""
+        """DateTime.SetCountry(int country)"""

         return _misc.DateTime_SetCountry(*args, **kwargs)
 
     SetCountry = staticmethod(SetCountry)
     def GetCountry(*args, **kwargs):
         return _misc.DateTime_SetCountry(*args, **kwargs)
 
     SetCountry = staticmethod(SetCountry)
     def GetCountry(*args, **kwargs):

-        """DateTime.GetCountry() -> wxDateTime::Country"""
+        """DateTime.GetCountry() -> int"""

         return _misc.DateTime_GetCountry(*args, **kwargs)
 
     GetCountry = staticmethod(GetCountry)
     def IsWestEuropeanCountry(*args, **kwargs):
         return _misc.DateTime_GetCountry(*args, **kwargs)
 
     GetCountry = staticmethod(GetCountry)
     def IsWestEuropeanCountry(*args, **kwargs):

-        """DateTime.IsWestEuropeanCountry(wxDateTime::Country country=Country_Default) -> bool"""
+        """DateTime.IsWestEuropeanCountry(int country=Country_Default) -> bool"""

         return _misc.DateTime_IsWestEuropeanCountry(*args, **kwargs)
 
     IsWestEuropeanCountry = staticmethod(IsWestEuropeanCountry)
     def GetCurrentYear(*args, **kwargs):
         return _misc.DateTime_IsWestEuropeanCountry(*args, **kwargs)
 
     IsWestEuropeanCountry = staticmethod(IsWestEuropeanCountry)
     def GetCurrentYear(*args, **kwargs):

-        """DateTime.GetCurrentYear(wxDateTime::Calendar cal=Gregorian) -> int"""
+        """DateTime.GetCurrentYear(int cal=Gregorian) -> int"""

         return _misc.DateTime_GetCurrentYear(*args, **kwargs)
 
     GetCurrentYear = staticmethod(GetCurrentYear)
         return _misc.DateTime_GetCurrentYear(*args, **kwargs)
 
     GetCurrentYear = staticmethod(GetCurrentYear)


@@ -2936,12 +2926,12 @@ class DateTime(object):
 
     ConvertYearToBC = staticmethod(ConvertYearToBC)
     def GetCurrentMonth(*args, **kwargs):
 
     ConvertYearToBC = staticmethod(ConvertYearToBC)
     def GetCurrentMonth(*args, **kwargs):

-        """DateTime.GetCurrentMonth(wxDateTime::Calendar cal=Gregorian) -> wxDateTime::Month"""
+        """DateTime.GetCurrentMonth(int cal=Gregorian) -> int"""

         return _misc.DateTime_GetCurrentMonth(*args, **kwargs)
 
     GetCurrentMonth = staticmethod(GetCurrentMonth)
     def IsLeapYear(*args, **kwargs):
         return _misc.DateTime_GetCurrentMonth(*args, **kwargs)
 
     GetCurrentMonth = staticmethod(GetCurrentMonth)
     def IsLeapYear(*args, **kwargs):

-        """DateTime.IsLeapYear(int year=Inv_Year, wxDateTime::Calendar cal=Gregorian) -> bool"""
+        """DateTime.IsLeapYear(int year=Inv_Year, int cal=Gregorian) -> bool"""

         return _misc.DateTime_IsLeapYear(*args, **kwargs)
 
     IsLeapYear = staticmethod(IsLeapYear)
         return _misc.DateTime_IsLeapYear(*args, **kwargs)
 
     IsLeapYear = staticmethod(IsLeapYear)


@@ -2951,22 +2941,22 @@ class DateTime(object):
 
     GetCentury = staticmethod(GetCentury)
     def GetNumberOfDaysinYear(*args, **kwargs):
 
     GetCentury = staticmethod(GetCentury)
     def GetNumberOfDaysinYear(*args, **kwargs):

-        """DateTime.GetNumberOfDaysinYear(int year, wxDateTime::Calendar cal=Gregorian) -> int"""
+        """DateTime.GetNumberOfDaysinYear(int year, int cal=Gregorian) -> int"""

         return _misc.DateTime_GetNumberOfDaysinYear(*args, **kwargs)
 
     GetNumberOfDaysinYear = staticmethod(GetNumberOfDaysinYear)
     def GetNumberOfDaysInMonth(*args, **kwargs):
         return _misc.DateTime_GetNumberOfDaysinYear(*args, **kwargs)
 
     GetNumberOfDaysinYear = staticmethod(GetNumberOfDaysinYear)
     def GetNumberOfDaysInMonth(*args, **kwargs):

-        """DateTime.GetNumberOfDaysInMonth(wxDateTime::Month month, int year=Inv_Year, wxDateTime::Calendar cal=Gregorian) -> int"""
+        """DateTime.GetNumberOfDaysInMonth(int month, int year=Inv_Year, int cal=Gregorian) -> int"""

         return _misc.DateTime_GetNumberOfDaysInMonth(*args, **kwargs)
 
     GetNumberOfDaysInMonth = staticmethod(GetNumberOfDaysInMonth)
     def GetMonthName(*args, **kwargs):
         return _misc.DateTime_GetNumberOfDaysInMonth(*args, **kwargs)
 
     GetNumberOfDaysInMonth = staticmethod(GetNumberOfDaysInMonth)
     def GetMonthName(*args, **kwargs):

-        """DateTime.GetMonthName(wxDateTime::Month month, wxDateTime::NameFlags flags=Name_Full) -> wxString"""
+        """DateTime.GetMonthName(int month, int flags=Name_Full) -> String"""

         return _misc.DateTime_GetMonthName(*args, **kwargs)
 
     GetMonthName = staticmethod(GetMonthName)
     def GetWeekDayName(*args, **kwargs):
         return _misc.DateTime_GetMonthName(*args, **kwargs)
 
     GetMonthName = staticmethod(GetMonthName)
     def GetWeekDayName(*args, **kwargs):

-        """DateTime.GetWeekDayName(wxDateTime::WeekDay weekday, wxDateTime::NameFlags flags=Name_Full) -> wxString"""
+        """DateTime.GetWeekDayName(int weekday, int flags=Name_Full) -> String"""

         return _misc.DateTime_GetWeekDayName(*args, **kwargs)
 
     GetWeekDayName = staticmethod(GetWeekDayName)
         return _misc.DateTime_GetWeekDayName(*args, **kwargs)
 
     GetWeekDayName = staticmethod(GetWeekDayName)


@@ -2980,17 +2970,17 @@ class DateTime(object):
 
     GetAmPmStrings = staticmethod(GetAmPmStrings)
     def IsDSTApplicable(*args, **kwargs):
 
     GetAmPmStrings = staticmethod(GetAmPmStrings)
     def IsDSTApplicable(*args, **kwargs):

-        """DateTime.IsDSTApplicable(int year=Inv_Year, wxDateTime::Country country=Country_Default) -> bool"""
+        """DateTime.IsDSTApplicable(int year=Inv_Year, int country=Country_Default) -> bool"""

         return _misc.DateTime_IsDSTApplicable(*args, **kwargs)
 
     IsDSTApplicable = staticmethod(IsDSTApplicable)
     def GetBeginDST(*args, **kwargs):
         return _misc.DateTime_IsDSTApplicable(*args, **kwargs)
 
     IsDSTApplicable = staticmethod(IsDSTApplicable)
     def GetBeginDST(*args, **kwargs):

-        """DateTime.GetBeginDST(int year=Inv_Year, wxDateTime::Country country=Country_Default) -> DateTime"""
+        """DateTime.GetBeginDST(int year=Inv_Year, int country=Country_Default) -> DateTime"""

         return _misc.DateTime_GetBeginDST(*args, **kwargs)
 
     GetBeginDST = staticmethod(GetBeginDST)
     def GetEndDST(*args, **kwargs):
         return _misc.DateTime_GetBeginDST(*args, **kwargs)
 
     GetBeginDST = staticmethod(GetBeginDST)
     def GetEndDST(*args, **kwargs):

-        """DateTime.GetEndDST(int year=Inv_Year, wxDateTime::Country country=Country_Default) -> DateTime"""
+        """DateTime.GetEndDST(int year=Inv_Year, int country=Country_Default) -> DateTime"""

         return _misc.DateTime_GetEndDST(*args, **kwargs)
 
     GetEndDST = staticmethod(GetEndDST)
         return _misc.DateTime_GetEndDST(*args, **kwargs)
 
     GetEndDST = staticmethod(GetEndDST)


@@ -3039,9 +3029,8 @@ class DateTime(object):
 
     def Set(*args, **kwargs):
         """
 
     def Set(*args, **kwargs):
         """

-        Set(int day, wxDateTime::Month month=Inv_Month, int year=Inv_Year, 
-            int hour=0, int minute=0, int second=0, 
-            int millisec=0) -> DateTime
+        Set(int day, int month=Inv_Month, int year=Inv_Year, int hour=0, 
+            int minute=0, int second=0, int millisec=0) -> DateTime

         """
         return _misc.DateTime_Set(*args, **kwargs)
 
         """
         return _misc.DateTime_Set(*args, **kwargs)
 


@@ -3054,7 +3043,7 @@ class DateTime(object):
         return _misc.DateTime_SetYear(*args, **kwargs)
 
     def SetMonth(*args, **kwargs):
         return _misc.DateTime_SetYear(*args, **kwargs)
 
     def SetMonth(*args, **kwargs):

-        """SetMonth(wxDateTime::Month month) -> DateTime"""
+        """SetMonth(int month) -> DateTime"""

         return _misc.DateTime_SetMonth(*args, **kwargs)
 
     def SetDay(*args, **kwargs):
         return _misc.DateTime_SetMonth(*args, **kwargs)
 
     def SetDay(*args, **kwargs):


@@ -3078,64 +3067,55 @@ class DateTime(object):
         return _misc.DateTime_SetMillisecond(*args, **kwargs)
 
     def SetToWeekDayInSameWeek(*args, **kwargs):
         return _misc.DateTime_SetMillisecond(*args, **kwargs)
 
     def SetToWeekDayInSameWeek(*args, **kwargs):

-        """SetToWeekDayInSameWeek(wxDateTime::WeekDay weekday, wxDateTime::WeekFlags flags=Monday_First) -> DateTime"""
+        """SetToWeekDayInSameWeek(int weekday, int flags=Monday_First) -> DateTime"""

         return _misc.DateTime_SetToWeekDayInSameWeek(*args, **kwargs)
 
     def GetWeekDayInSameWeek(*args, **kwargs):
         return _misc.DateTime_SetToWeekDayInSameWeek(*args, **kwargs)
 
     def GetWeekDayInSameWeek(*args, **kwargs):

-        """GetWeekDayInSameWeek(wxDateTime::WeekDay weekday, wxDateTime::WeekFlags flags=Monday_First) -> DateTime"""
+        """GetWeekDayInSameWeek(int weekday, int flags=Monday_First) -> DateTime"""

         return _misc.DateTime_GetWeekDayInSameWeek(*args, **kwargs)
 
     def SetToNextWeekDay(*args, **kwargs):
         return _misc.DateTime_GetWeekDayInSameWeek(*args, **kwargs)
 
     def SetToNextWeekDay(*args, **kwargs):

-        """SetToNextWeekDay(wxDateTime::WeekDay weekday) -> DateTime"""
+        """SetToNextWeekDay(int weekday) -> DateTime"""

         return _misc.DateTime_SetToNextWeekDay(*args, **kwargs)
 
     def GetNextWeekDay(*args, **kwargs):
         return _misc.DateTime_SetToNextWeekDay(*args, **kwargs)
 
     def GetNextWeekDay(*args, **kwargs):

-        """GetNextWeekDay(wxDateTime::WeekDay weekday) -> DateTime"""
+        """GetNextWeekDay(int weekday) -> DateTime"""

         return _misc.DateTime_GetNextWeekDay(*args, **kwargs)
 
     def SetToPrevWeekDay(*args, **kwargs):
         return _misc.DateTime_GetNextWeekDay(*args, **kwargs)
 
     def SetToPrevWeekDay(*args, **kwargs):

-        """SetToPrevWeekDay(wxDateTime::WeekDay weekday) -> DateTime"""
+        """SetToPrevWeekDay(int weekday) -> DateTime"""

         return _misc.DateTime_SetToPrevWeekDay(*args, **kwargs)
 
     def GetPrevWeekDay(*args, **kwargs):
         return _misc.DateTime_SetToPrevWeekDay(*args, **kwargs)
 
     def GetPrevWeekDay(*args, **kwargs):

-        """GetPrevWeekDay(wxDateTime::WeekDay weekday) -> DateTime"""
+        """GetPrevWeekDay(int weekday) -> DateTime"""

         return _misc.DateTime_GetPrevWeekDay(*args, **kwargs)
 
     def SetToWeekDay(*args, **kwargs):
         return _misc.DateTime_GetPrevWeekDay(*args, **kwargs)
 
     def SetToWeekDay(*args, **kwargs):

-        """
-        SetToWeekDay(wxDateTime::WeekDay weekday, int n=1, wxDateTime::Month month=Inv_Month, 
-            int year=Inv_Year) -> bool
-        """
+        """SetToWeekDay(int weekday, int n=1, int month=Inv_Month, int year=Inv_Year) -> bool"""

         return _misc.DateTime_SetToWeekDay(*args, **kwargs)
 
     def SetToLastWeekDay(*args, **kwargs):
         return _misc.DateTime_SetToWeekDay(*args, **kwargs)
 
     def SetToLastWeekDay(*args, **kwargs):

-        """
-        SetToLastWeekDay(wxDateTime::WeekDay weekday, wxDateTime::Month month=Inv_Month, 
-            int year=Inv_Year) -> bool
-        """
+        """SetToLastWeekDay(int weekday, int month=Inv_Month, int year=Inv_Year) -> bool"""

         return _misc.DateTime_SetToLastWeekDay(*args, **kwargs)
 
     def GetLastWeekDay(*args, **kwargs):
         return _misc.DateTime_SetToLastWeekDay(*args, **kwargs)
 
     def GetLastWeekDay(*args, **kwargs):

-        """
-        GetLastWeekDay(wxDateTime::WeekDay weekday, wxDateTime::Month month=Inv_Month, 
-            int year=Inv_Year) -> DateTime
-        """
+        """GetLastWeekDay(int weekday, int month=Inv_Month, int year=Inv_Year) -> DateTime"""

         return _misc.DateTime_GetLastWeekDay(*args, **kwargs)
 
     def SetToTheWeek(*args, **kwargs):
         return _misc.DateTime_GetLastWeekDay(*args, **kwargs)
 
     def SetToTheWeek(*args, **kwargs):

-        """SetToTheWeek(int numWeek, wxDateTime::WeekDay weekday=Mon, wxDateTime::WeekFlags flags=Monday_First) -> bool"""
+        """SetToTheWeek(int numWeek, int weekday=Mon, int flags=Monday_First) -> bool"""

         return _misc.DateTime_SetToTheWeek(*args, **kwargs)
 
     def GetWeek(*args, **kwargs):
         return _misc.DateTime_SetToTheWeek(*args, **kwargs)
 
     def GetWeek(*args, **kwargs):

-        """GetWeek(int numWeek, wxDateTime::WeekDay weekday=Mon, wxDateTime::WeekFlags flags=Monday_First) -> DateTime"""
+        """GetWeek(int numWeek, int weekday=Mon, int flags=Monday_First) -> DateTime"""

         return _misc.DateTime_GetWeek(*args, **kwargs)
 
     def SetToLastMonthDay(*args, **kwargs):
         return _misc.DateTime_GetWeek(*args, **kwargs)
 
     def SetToLastMonthDay(*args, **kwargs):

-        """SetToLastMonthDay(wxDateTime::Month month=Inv_Month, int year=Inv_Year) -> DateTime"""
+        """SetToLastMonthDay(int month=Inv_Month, int year=Inv_Year) -> DateTime"""

         return _misc.DateTime_SetToLastMonthDay(*args, **kwargs)
 
     def GetLastMonthDay(*args, **kwargs):
         return _misc.DateTime_SetToLastMonthDay(*args, **kwargs)
 
     def GetLastMonthDay(*args, **kwargs):

-        """GetLastMonthDay(wxDateTime::Month month=Inv_Month, int year=Inv_Year) -> DateTime"""
+        """GetLastMonthDay(int month=Inv_Month, int year=Inv_Year) -> DateTime"""

         return _misc.DateTime_GetLastMonthDay(*args, **kwargs)
 
     def SetToYearDay(*args, **kwargs):
         return _misc.DateTime_GetLastMonthDay(*args, **kwargs)
 
     def SetToYearDay(*args, **kwargs):


@@ -3183,7 +3163,7 @@ class DateTime(object):
         return _misc.DateTime_MakeGMT(*args, **kwargs)
 
     def IsDST(*args, **kwargs):
         return _misc.DateTime_MakeGMT(*args, **kwargs)
 
     def IsDST(*args, **kwargs):

-        """IsDST(wxDateTime::Country country=Country_Default) -> int"""
+        """IsDST(int country=Country_Default) -> int"""

         return _misc.DateTime_IsDST(*args, **kwargs)
 
     def IsValid(*args, **kwargs):
         return _misc.DateTime_IsDST(*args, **kwargs)
 
     def IsValid(*args, **kwargs):


@@ -3199,7 +3179,7 @@ class DateTime(object):
         return _misc.DateTime_GetYear(*args, **kwargs)
 
     def GetMonth(*args, **kwargs):
         return _misc.DateTime_GetYear(*args, **kwargs)
 
     def GetMonth(*args, **kwargs):

-        """GetMonth(wxDateTime::TimeZone tz=LOCAL_TZ) -> wxDateTime::Month"""
+        """GetMonth(wxDateTime::TimeZone tz=LOCAL_TZ) -> int"""

         return _misc.DateTime_GetMonth(*args, **kwargs)
 
     def GetDay(*args, **kwargs):
         return _misc.DateTime_GetMonth(*args, **kwargs)
 
     def GetDay(*args, **kwargs):


@@ -3207,7 +3187,7 @@ class DateTime(object):
         return _misc.DateTime_GetDay(*args, **kwargs)
 
     def GetWeekDay(*args, **kwargs):
         return _misc.DateTime_GetDay(*args, **kwargs)
 
     def GetWeekDay(*args, **kwargs):

-        """GetWeekDay(wxDateTime::TimeZone tz=LOCAL_TZ) -> wxDateTime::WeekDay"""
+        """GetWeekDay(wxDateTime::TimeZone tz=LOCAL_TZ) -> int"""

         return _misc.DateTime_GetWeekDay(*args, **kwargs)
 
     def GetHour(*args, **kwargs):
         return _misc.DateTime_GetWeekDay(*args, **kwargs)
 
     def GetHour(*args, **kwargs):


@@ -3231,15 +3211,15 @@ class DateTime(object):
         return _misc.DateTime_GetDayOfYear(*args, **kwargs)
 
     def GetWeekOfYear(*args, **kwargs):
         return _misc.DateTime_GetDayOfYear(*args, **kwargs)
 
     def GetWeekOfYear(*args, **kwargs):

-        """GetWeekOfYear(wxDateTime::WeekFlags flags=Monday_First, wxDateTime::TimeZone tz=LOCAL_TZ) -> int"""
+        """GetWeekOfYear(int flags=Monday_First, wxDateTime::TimeZone tz=LOCAL_TZ) -> int"""

         return _misc.DateTime_GetWeekOfYear(*args, **kwargs)
 
     def GetWeekOfMonth(*args, **kwargs):
         return _misc.DateTime_GetWeekOfYear(*args, **kwargs)
 
     def GetWeekOfMonth(*args, **kwargs):

-        """GetWeekOfMonth(wxDateTime::WeekFlags flags=Monday_First, wxDateTime::TimeZone tz=LOCAL_TZ) -> int"""
+        """GetWeekOfMonth(int flags=Monday_First, wxDateTime::TimeZone tz=LOCAL_TZ) -> int"""

         return _misc.DateTime_GetWeekOfMonth(*args, **kwargs)
 
     def IsWorkDay(*args, **kwargs):
         return _misc.DateTime_GetWeekOfMonth(*args, **kwargs)
 
     def IsWorkDay(*args, **kwargs):

-        """IsWorkDay(wxDateTime::Country country=Country_Default) -> bool"""
+        """IsWorkDay(int country=Country_Default) -> bool"""

         return _misc.DateTime_IsWorkDay(*args, **kwargs)
 
     def IsEqualTo(*args, **kwargs):
         return _misc.DateTime_IsWorkDay(*args, **kwargs)
 
     def IsEqualTo(*args, **kwargs):


@@ -3348,43 +3328,43 @@ class DateTime(object):
         return _misc.DateTime___ne__(*args)
 
     def ParseRfc822Date(*args, **kwargs):
         return _misc.DateTime___ne__(*args)
 
     def ParseRfc822Date(*args, **kwargs):

-        """ParseRfc822Date(wxString date) -> int"""
+        """ParseRfc822Date(String date) -> int"""

         return _misc.DateTime_ParseRfc822Date(*args, **kwargs)
 
     def ParseFormat(*args, **kwargs):
         return _misc.DateTime_ParseRfc822Date(*args, **kwargs)
 
     def ParseFormat(*args, **kwargs):

-        """ParseFormat(wxString date, wxString format=wxPyDateFormatStr, DateTime dateDef=wxDefaultDateTime) -> int"""
+        """ParseFormat(String date, String format=wxPyDateFormatStr, DateTime dateDef=wxDefaultDateTime) -> int"""

         return _misc.DateTime_ParseFormat(*args, **kwargs)
 
     def ParseDateTime(*args, **kwargs):
         return _misc.DateTime_ParseFormat(*args, **kwargs)
 
     def ParseDateTime(*args, **kwargs):

-        """ParseDateTime(wxString datetime) -> int"""
+        """ParseDateTime(String datetime) -> int"""

         return _misc.DateTime_ParseDateTime(*args, **kwargs)
 
     def ParseDate(*args, **kwargs):
         return _misc.DateTime_ParseDateTime(*args, **kwargs)
 
     def ParseDate(*args, **kwargs):

-        """ParseDate(wxString date) -> int"""
+        """ParseDate(String date) -> int"""

         return _misc.DateTime_ParseDate(*args, **kwargs)
 
     def ParseTime(*args, **kwargs):
         return _misc.DateTime_ParseDate(*args, **kwargs)
 
     def ParseTime(*args, **kwargs):

-        """ParseTime(wxString time) -> int"""
+        """ParseTime(String time) -> int"""

         return _misc.DateTime_ParseTime(*args, **kwargs)
 
     def Format(*args, **kwargs):
         return _misc.DateTime_ParseTime(*args, **kwargs)
 
     def Format(*args, **kwargs):

-        """Format(wxString format=wxPyDateFormatStr, wxDateTime::TimeZone tz=LOCAL_TZ) -> wxString"""
+        """Format(String format=wxPyDateFormatStr, wxDateTime::TimeZone tz=LOCAL_TZ) -> String"""

         return _misc.DateTime_Format(*args, **kwargs)
 
     def FormatDate(*args, **kwargs):
         return _misc.DateTime_Format(*args, **kwargs)
 
     def FormatDate(*args, **kwargs):

-        """FormatDate() -> wxString"""
+        """FormatDate() -> String"""

         return _misc.DateTime_FormatDate(*args, **kwargs)
 
     def FormatTime(*args, **kwargs):
         return _misc.DateTime_FormatDate(*args, **kwargs)
 
     def FormatTime(*args, **kwargs):

-        """FormatTime() -> wxString"""
+        """FormatTime() -> String"""

         return _misc.DateTime_FormatTime(*args, **kwargs)
 
     def FormatISODate(*args, **kwargs):
         return _misc.DateTime_FormatTime(*args, **kwargs)
 
     def FormatISODate(*args, **kwargs):

-        """FormatISODate() -> wxString"""
+        """FormatISODate() -> String"""

         return _misc.DateTime_FormatISODate(*args, **kwargs)
 
     def FormatISOTime(*args, **kwargs):
         return _misc.DateTime_FormatISODate(*args, **kwargs)
 
     def FormatISOTime(*args, **kwargs):

-        """FormatISOTime() -> wxString"""
+        """FormatISOTime() -> String"""

         return _misc.DateTime_FormatISOTime(*args, **kwargs)
 
     def __repr__(self):
         return _misc.DateTime_FormatISOTime(*args, **kwargs)
 
     def __repr__(self):


@@ -3401,19 +3381,19 @@ class DateTimePtr(DateTime):
 _misc.DateTime_swigregister(DateTimePtr)
 
 def DateTime_SetCountry(*args, **kwargs):
 _misc.DateTime_swigregister(DateTimePtr)
 
 def DateTime_SetCountry(*args, **kwargs):

-    """DateTime_SetCountry(wxDateTime::Country country)"""
+    """DateTime_SetCountry(int country)"""

     return _misc.DateTime_SetCountry(*args, **kwargs)
 
 def DateTime_GetCountry(*args, **kwargs):
     return _misc.DateTime_SetCountry(*args, **kwargs)
 
 def DateTime_GetCountry(*args, **kwargs):

-    """DateTime_GetCountry() -> wxDateTime::Country"""
+    """DateTime_GetCountry() -> int"""

     return _misc.DateTime_GetCountry(*args, **kwargs)
 
 def DateTime_IsWestEuropeanCountry(*args, **kwargs):
     return _misc.DateTime_GetCountry(*args, **kwargs)
 
 def DateTime_IsWestEuropeanCountry(*args, **kwargs):

-    """DateTime_IsWestEuropeanCountry(wxDateTime::Country country=Country_Default) -> bool"""
+    """DateTime_IsWestEuropeanCountry(int country=Country_Default) -> bool"""

     return _misc.DateTime_IsWestEuropeanCountry(*args, **kwargs)
 
 def DateTime_GetCurrentYear(*args, **kwargs):
     return _misc.DateTime_IsWestEuropeanCountry(*args, **kwargs)
 
 def DateTime_GetCurrentYear(*args, **kwargs):

-    """DateTime_GetCurrentYear(wxDateTime::Calendar cal=Gregorian) -> int"""
+    """DateTime_GetCurrentYear(int cal=Gregorian) -> int"""

     return _misc.DateTime_GetCurrentYear(*args, **kwargs)
 
 def DateTime_ConvertYearToBC(*args, **kwargs):
     return _misc.DateTime_GetCurrentYear(*args, **kwargs)
 
 def DateTime_ConvertYearToBC(*args, **kwargs):


@@ -3421,11 +3401,11 @@ def DateTime_ConvertYearToBC(*args, **kwargs):
     return _misc.DateTime_ConvertYearToBC(*args, **kwargs)
 
 def DateTime_GetCurrentMonth(*args, **kwargs):
     return _misc.DateTime_ConvertYearToBC(*args, **kwargs)
 
 def DateTime_GetCurrentMonth(*args, **kwargs):

-    """DateTime_GetCurrentMonth(wxDateTime::Calendar cal=Gregorian) -> wxDateTime::Month"""
+    """DateTime_GetCurrentMonth(int cal=Gregorian) -> int"""

     return _misc.DateTime_GetCurrentMonth(*args, **kwargs)
 
 def DateTime_IsLeapYear(*args, **kwargs):
     return _misc.DateTime_GetCurrentMonth(*args, **kwargs)
 
 def DateTime_IsLeapYear(*args, **kwargs):

-    """DateTime_IsLeapYear(int year=Inv_Year, wxDateTime::Calendar cal=Gregorian) -> bool"""
+    """DateTime_IsLeapYear(int year=Inv_Year, int cal=Gregorian) -> bool"""

     return _misc.DateTime_IsLeapYear(*args, **kwargs)
 
 def DateTime_GetCentury(*args, **kwargs):
     return _misc.DateTime_IsLeapYear(*args, **kwargs)
 
 def DateTime_GetCentury(*args, **kwargs):


@@ -3433,19 +3413,19 @@ def DateTime_GetCentury(*args, **kwargs):
     return _misc.DateTime_GetCentury(*args, **kwargs)
 
 def DateTime_GetNumberOfDaysinYear(*args, **kwargs):
     return _misc.DateTime_GetCentury(*args, **kwargs)
 
 def DateTime_GetNumberOfDaysinYear(*args, **kwargs):

-    """DateTime_GetNumberOfDaysinYear(int year, wxDateTime::Calendar cal=Gregorian) -> int"""
+    """DateTime_GetNumberOfDaysinYear(int year, int cal=Gregorian) -> int"""

     return _misc.DateTime_GetNumberOfDaysinYear(*args, **kwargs)
 
 def DateTime_GetNumberOfDaysInMonth(*args, **kwargs):
     return _misc.DateTime_GetNumberOfDaysinYear(*args, **kwargs)
 
 def DateTime_GetNumberOfDaysInMonth(*args, **kwargs):

-    """DateTime_GetNumberOfDaysInMonth(wxDateTime::Month month, int year=Inv_Year, wxDateTime::Calendar cal=Gregorian) -> int"""
+    """DateTime_GetNumberOfDaysInMonth(int month, int year=Inv_Year, int cal=Gregorian) -> int"""

     return _misc.DateTime_GetNumberOfDaysInMonth(*args, **kwargs)
 
 def DateTime_GetMonthName(*args, **kwargs):
     return _misc.DateTime_GetNumberOfDaysInMonth(*args, **kwargs)
 
 def DateTime_GetMonthName(*args, **kwargs):

-    """DateTime_GetMonthName(wxDateTime::Month month, wxDateTime::NameFlags flags=Name_Full) -> wxString"""
+    """DateTime_GetMonthName(int month, int flags=Name_Full) -> String"""

     return _misc.DateTime_GetMonthName(*args, **kwargs)
 
 def DateTime_GetWeekDayName(*args, **kwargs):
     return _misc.DateTime_GetMonthName(*args, **kwargs)
 
 def DateTime_GetWeekDayName(*args, **kwargs):

-    """DateTime_GetWeekDayName(wxDateTime::WeekDay weekday, wxDateTime::NameFlags flags=Name_Full) -> wxString"""
+    """DateTime_GetWeekDayName(int weekday, int flags=Name_Full) -> String"""

     return _misc.DateTime_GetWeekDayName(*args, **kwargs)
 
 def DateTime_GetAmPmStrings(*args, **kwargs):
     return _misc.DateTime_GetWeekDayName(*args, **kwargs)
 
 def DateTime_GetAmPmStrings(*args, **kwargs):


@@ -3457,15 +3437,15 @@ def DateTime_GetAmPmStrings(*args, **kwargs):
     return _misc.DateTime_GetAmPmStrings(*args, **kwargs)
 
 def DateTime_IsDSTApplicable(*args, **kwargs):
     return _misc.DateTime_GetAmPmStrings(*args, **kwargs)
 
 def DateTime_IsDSTApplicable(*args, **kwargs):

-    """DateTime_IsDSTApplicable(int year=Inv_Year, wxDateTime::Country country=Country_Default) -> bool"""
+    """DateTime_IsDSTApplicable(int year=Inv_Year, int country=Country_Default) -> bool"""

     return _misc.DateTime_IsDSTApplicable(*args, **kwargs)
 
 def DateTime_GetBeginDST(*args, **kwargs):
     return _misc.DateTime_IsDSTApplicable(*args, **kwargs)
 
 def DateTime_GetBeginDST(*args, **kwargs):

-    """DateTime_GetBeginDST(int year=Inv_Year, wxDateTime::Country country=Country_Default) -> DateTime"""
+    """DateTime_GetBeginDST(int year=Inv_Year, int country=Country_Default) -> DateTime"""

     return _misc.DateTime_GetBeginDST(*args, **kwargs)
 
 def DateTime_GetEndDST(*args, **kwargs):
     return _misc.DateTime_GetBeginDST(*args, **kwargs)
 
 def DateTime_GetEndDST(*args, **kwargs):

-    """DateTime_GetEndDST(int year=Inv_Year, wxDateTime::Country country=Country_Default) -> DateTime"""
+    """DateTime_GetEndDST(int year=Inv_Year, int country=Country_Default) -> DateTime"""

     return _misc.DateTime_GetEndDST(*args, **kwargs)
 
 def DateTime_Now(*args, **kwargs):
     return _misc.DateTime_GetEndDST(*args, **kwargs)
 
 def DateTime_Now(*args, **kwargs):


@@ -3500,9 +3480,8 @@ def DateTimeFromHMS(*args, **kwargs):
 
 def DateTimeFromDMY(*args, **kwargs):
     """
 
 def DateTimeFromDMY(*args, **kwargs):
     """

-    DateTimeFromDMY(int day, wxDateTime::Month month=Inv_Month, int year=Inv_Year, 
-        int hour=0, int minute=0, int second=0, 
-        int millisec=0) -> DateTime
+    DateTimeFromDMY(int day, int month=Inv_Month, int year=Inv_Year, int hour=0, 
+        int minute=0, int second=0, int millisec=0) -> DateTime

     """
     val = _misc.new_DateTimeFromDMY(*args, **kwargs)
     val.thisown = 1
     """
     val = _misc.new_DateTimeFromDMY(*args, **kwargs)
     val.thisown = 1


@@ -3698,7 +3677,7 @@ class TimeSpan(object):
         return _misc.TimeSpan_GetMilliseconds(*args, **kwargs)
 
     def Format(*args, **kwargs):
         return _misc.TimeSpan_GetMilliseconds(*args, **kwargs)
 
     def Format(*args, **kwargs):

-        """Format(wxString format=wxPyTimeSpanFormatStr) -> wxString"""
+        """Format(String format=wxPyTimeSpanFormatStr) -> String"""

         return _misc.TimeSpan_Format(*args, **kwargs)
 
     def __repr__(self):
         return _misc.TimeSpan_Format(*args, **kwargs)
 
     def __repr__(self):


@@ -3983,7 +3962,7 @@ class DataFormat(object):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxDataFormat instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxDataFormat instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):

-        """__init__(wxDataFormatId type) -> DataFormat"""
+        """__init__(int type) -> DataFormat"""

         newobj = _misc.new_DataFormat(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         newobj = _misc.new_DataFormat(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1


@@ -3996,32 +3975,32 @@ class DataFormat(object):
 
     def __eq__(*args):
         """
 
     def __eq__(*args):
         """

-        __eq__(wxDataFormatId format) -> bool
+        __eq__(int format) -> bool

         __eq__(DataFormat format) -> bool
         """
         return _misc.DataFormat___eq__(*args)
 
     def __ne__(*args):
         """
         __eq__(DataFormat format) -> bool
         """
         return _misc.DataFormat___eq__(*args)
 
     def __ne__(*args):
         """

-        __ne__(wxDataFormatId format) -> bool
+        __ne__(int format) -> bool

         __ne__(DataFormat format) -> bool
         """
         return _misc.DataFormat___ne__(*args)
 
     def SetType(*args, **kwargs):
         __ne__(DataFormat format) -> bool
         """
         return _misc.DataFormat___ne__(*args)
 
     def SetType(*args, **kwargs):

-        """SetType(wxDataFormatId format)"""
+        """SetType(int format)"""

         return _misc.DataFormat_SetType(*args, **kwargs)
 
     def GetType(*args, **kwargs):
         return _misc.DataFormat_SetType(*args, **kwargs)
 
     def GetType(*args, **kwargs):

-        """GetType() -> wxDataFormatId"""
+        """GetType() -> int"""

         return _misc.DataFormat_GetType(*args, **kwargs)
 
     def GetId(*args, **kwargs):
         return _misc.DataFormat_GetType(*args, **kwargs)
 
     def GetId(*args, **kwargs):

-        """GetId() -> wxString"""
+        """GetId() -> String"""

         return _misc.DataFormat_GetId(*args, **kwargs)
 
     def SetId(*args, **kwargs):
         return _misc.DataFormat_GetId(*args, **kwargs)
 
     def SetId(*args, **kwargs):

-        """SetId(wxString format)"""
+        """SetId(String format)"""

         return _misc.DataFormat_SetId(*args, **kwargs)
 
 
         return _misc.DataFormat_SetId(*args, **kwargs)
 
 


@@ -4033,7 +4012,7 @@ class DataFormatPtr(DataFormat):
 _misc.DataFormat_swigregister(DataFormatPtr)
 
 def CustomDataFormat(*args, **kwargs):
 _misc.DataFormat_swigregister(DataFormatPtr)
 
 def CustomDataFormat(*args, **kwargs):

-    """CustomDataFormat(wxString format) -> DataFormat"""
+    """CustomDataFormat(String format) -> DataFormat"""

     val = _misc.new_CustomDataFormat(*args, **kwargs)
     val.thisown = 1
     return val
     val = _misc.new_CustomDataFormat(*args, **kwargs)
     val.thisown = 1
     return val


@@ -4052,15 +4031,15 @@ class DataObject(object):
         except: pass
 
     def GetPreferredFormat(*args, **kwargs):
         except: pass
 
     def GetPreferredFormat(*args, **kwargs):

-        """GetPreferredFormat(wxDataObject::Direction dir=Get) -> DataFormat"""
+        """GetPreferredFormat(int dir=Get) -> DataFormat"""

         return _misc.DataObject_GetPreferredFormat(*args, **kwargs)
 
     def GetFormatCount(*args, **kwargs):
         return _misc.DataObject_GetPreferredFormat(*args, **kwargs)
 
     def GetFormatCount(*args, **kwargs):

-        """GetFormatCount(wxDataObject::Direction dir=Get) -> size_t"""
+        """GetFormatCount(int dir=Get) -> size_t"""

         return _misc.DataObject_GetFormatCount(*args, **kwargs)
 
     def IsSupported(*args, **kwargs):
         return _misc.DataObject_GetFormatCount(*args, **kwargs)
 
     def IsSupported(*args, **kwargs):

-        """IsSupported(DataFormat format, wxDataObject::Direction dir=Get) -> bool"""
+        """IsSupported(DataFormat format, int dir=Get) -> bool"""

         return _misc.DataObject_IsSupported(*args, **kwargs)
 
     def GetDataSize(*args, **kwargs):
         return _misc.DataObject_IsSupported(*args, **kwargs)
 
     def GetDataSize(*args, **kwargs):


@@ -4068,7 +4047,7 @@ class DataObject(object):
         return _misc.DataObject_GetDataSize(*args, **kwargs)
 
     def GetAllFormats(*args, **kwargs):
         return _misc.DataObject_GetDataSize(*args, **kwargs)
 
     def GetAllFormats(*args, **kwargs):

-        """GetAllFormats(DataFormat formats, wxDataObject::Direction dir=Get)"""
+        """GetAllFormats(DataFormat formats, int dir=Get)"""

         return _misc.DataObject_GetAllFormats(*args, **kwargs)
 
     def GetDataHere(*args, **kwargs):
         return _misc.DataObject_GetAllFormats(*args, **kwargs)
 
     def GetDataHere(*args, **kwargs):


@@ -4163,7 +4142,7 @@ class TextDataObject(DataObjectSimple):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxTextDataObject instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxTextDataObject instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):

-        """__init__(wxString text=wxPyEmptyString) -> TextDataObject"""
+        """__init__(String text=EmptyString) -> TextDataObject"""

         newobj = _misc.new_TextDataObject(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         newobj = _misc.new_TextDataObject(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1


@@ -4173,11 +4152,11 @@ class TextDataObject(DataObjectSimple):
         return _misc.TextDataObject_GetTextLength(*args, **kwargs)
 
     def GetText(*args, **kwargs):
         return _misc.TextDataObject_GetTextLength(*args, **kwargs)
 
     def GetText(*args, **kwargs):

-        """GetText() -> wxString"""
+        """GetText() -> String"""

         return _misc.TextDataObject_GetText(*args, **kwargs)
 
     def SetText(*args, **kwargs):
         return _misc.TextDataObject_GetText(*args, **kwargs)
 
     def SetText(*args, **kwargs):

-        """SetText(wxString text)"""
+        """SetText(String text)"""

         return _misc.TextDataObject_SetText(*args, **kwargs)
 
 
         return _misc.TextDataObject_SetText(*args, **kwargs)
 
 


@@ -4192,7 +4171,7 @@ class PyTextDataObject(TextDataObject):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxPyTextDataObject instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxPyTextDataObject instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):

-        """__init__(wxString text=wxPyEmptyString) -> PyTextDataObject"""
+        """__init__(String text=EmptyString) -> PyTextDataObject"""

         newobj = _misc.new_PyTextDataObject(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         newobj = _misc.new_PyTextDataObject(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1


@@ -4215,17 +4194,17 @@ class BitmapDataObject(DataObjectSimple):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxBitmapDataObject instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxBitmapDataObject instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):

-        """__init__(wxBitmap bitmap=wxNullBitmap) -> BitmapDataObject"""
+        """__init__(Bitmap bitmap=wxNullBitmap) -> BitmapDataObject"""

         newobj = _misc.new_BitmapDataObject(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def GetBitmap(*args, **kwargs):
         newobj = _misc.new_BitmapDataObject(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def GetBitmap(*args, **kwargs):

-        """GetBitmap() -> wxBitmap"""
+        """GetBitmap() -> Bitmap"""

         return _misc.BitmapDataObject_GetBitmap(*args, **kwargs)
 
     def SetBitmap(*args, **kwargs):
         return _misc.BitmapDataObject_GetBitmap(*args, **kwargs)
 
     def SetBitmap(*args, **kwargs):

-        """SetBitmap(wxBitmap bitmap)"""
+        """SetBitmap(Bitmap bitmap)"""

         return _misc.BitmapDataObject_SetBitmap(*args, **kwargs)
 
 
         return _misc.BitmapDataObject_SetBitmap(*args, **kwargs)
 
 


@@ -4240,7 +4219,7 @@ class PyBitmapDataObject(BitmapDataObject):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxPyBitmapDataObject instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxPyBitmapDataObject instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):

-        """__init__(wxBitmap bitmap=wxNullBitmap) -> PyBitmapDataObject"""
+        """__init__(Bitmap bitmap=wxNullBitmap) -> PyBitmapDataObject"""

         newobj = _misc.new_PyBitmapDataObject(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         newobj = _misc.new_PyBitmapDataObject(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1


@@ -4323,11 +4302,11 @@ class URLDataObject(DataObjectComposite):
         self.thisown = 1
         del newobj.thisown
     def GetURL(*args, **kwargs):
         self.thisown = 1
         del newobj.thisown
     def GetURL(*args, **kwargs):

-        """GetURL() -> wxString"""
+        """GetURL() -> String"""

         return _misc.URLDataObject_GetURL(*args, **kwargs)
 
     def SetURL(*args, **kwargs):
         return _misc.URLDataObject_GetURL(*args, **kwargs)
 
     def SetURL(*args, **kwargs):

-        """SetURL(wxString url)"""
+        """SetURL(String url)"""

         return _misc.URLDataObject_SetURL(*args, **kwargs)
 
 
         return _misc.URLDataObject_SetURL(*args, **kwargs)
 
 


@@ -4368,7 +4347,7 @@ DragLink = _misc.DragLink
 DragCancel = _misc.DragCancel
 
 def IsDragResultOk(*args, **kwargs):
 DragCancel = _misc.DragCancel
 
 def IsDragResultOk(*args, **kwargs):

-    """IsDragResultOk(wxDragResult res) -> bool"""
+    """IsDragResultOk(int res) -> bool"""

     return _misc.IsDragResultOk(*args, **kwargs)
 class DropSource(object):
     def __repr__(self):
     return _misc.IsDragResultOk(*args, **kwargs)
 class DropSource(object):
     def __repr__(self):


@@ -4401,15 +4380,15 @@ class DropSource(object):
         return _misc.DropSource_GetDataObject(*args, **kwargs)
 
     def SetCursor(*args, **kwargs):
         return _misc.DropSource_GetDataObject(*args, **kwargs)
 
     def SetCursor(*args, **kwargs):

-        """SetCursor(wxDragResult res, wxCursor cursor)"""
+        """SetCursor(int res, Cursor cursor)"""

         return _misc.DropSource_SetCursor(*args, **kwargs)
 
     def DoDragDrop(*args, **kwargs):
         return _misc.DropSource_SetCursor(*args, **kwargs)
 
     def DoDragDrop(*args, **kwargs):

-        """DoDragDrop(int flags=Drag_CopyOnly) -> wxDragResult"""
+        """DoDragDrop(int flags=Drag_CopyOnly) -> int"""

         return _misc.DropSource_DoDragDrop(*args, **kwargs)
 
     def base_GiveFeedback(*args, **kwargs):
         return _misc.DropSource_DoDragDrop(*args, **kwargs)
 
     def base_GiveFeedback(*args, **kwargs):

-        """base_GiveFeedback(wxDragResult effect) -> bool"""
+        """base_GiveFeedback(int effect) -> bool"""

         return _misc.DropSource_base_GiveFeedback(*args, **kwargs)
 
 
         return _misc.DropSource_base_GiveFeedback(*args, **kwargs)
 
 


@@ -4424,8 +4403,8 @@ class DropTarget(object):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxPyDropTarget instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxPyDropTarget instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):

-        """__init__(DataObject dataObject=None) -> DropTarget"""
-        newobj = _misc.new_DropTarget(*args, **kwargs)
+        """PyDropTarget(DataObject dataObject=None) -> DropTarget"""
+        newobj = _misc.new_PyDropTarget(*args, **kwargs)

         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown


@@ -4453,11 +4432,11 @@ class DropTarget(object):
         return val
 
     def base_OnEnter(*args, **kwargs):
         return val
 
     def base_OnEnter(*args, **kwargs):

-        """base_OnEnter(int x, int y, wxDragResult def) -> wxDragResult"""
+        """base_OnEnter(int x, int y, int def) -> int"""

         return _misc.DropTarget_base_OnEnter(*args, **kwargs)
 
     def base_OnDragOver(*args, **kwargs):
         return _misc.DropTarget_base_OnEnter(*args, **kwargs)
 
     def base_OnDragOver(*args, **kwargs):

-        """base_OnDragOver(int x, int y, wxDragResult def) -> wxDragResult"""
+        """base_OnDragOver(int x, int y, int def) -> int"""

         return _misc.DropTarget_base_OnDragOver(*args, **kwargs)
 
     def base_OnLeave(*args, **kwargs):
         return _misc.DropTarget_base_OnDragOver(*args, **kwargs)
 
     def base_OnLeave(*args, **kwargs):


@@ -4497,11 +4476,11 @@ class TextDropTarget(DropTarget):
         return _misc.TextDropTarget__setCallbackInfo(*args, **kwargs)
 
     def base_OnEnter(*args, **kwargs):
         return _misc.TextDropTarget__setCallbackInfo(*args, **kwargs)
 
     def base_OnEnter(*args, **kwargs):

-        """base_OnEnter(int x, int y, wxDragResult def) -> wxDragResult"""
+        """base_OnEnter(int x, int y, int def) -> int"""

         return _misc.TextDropTarget_base_OnEnter(*args, **kwargs)
 
     def base_OnDragOver(*args, **kwargs):
         return _misc.TextDropTarget_base_OnEnter(*args, **kwargs)
 
     def base_OnDragOver(*args, **kwargs):

-        """base_OnDragOver(int x, int y, wxDragResult def) -> wxDragResult"""
+        """base_OnDragOver(int x, int y, int def) -> int"""

         return _misc.TextDropTarget_base_OnDragOver(*args, **kwargs)
 
     def base_OnLeave(*args, **kwargs):
         return _misc.TextDropTarget_base_OnDragOver(*args, **kwargs)
 
     def base_OnLeave(*args, **kwargs):


@@ -4513,7 +4492,7 @@ class TextDropTarget(DropTarget):
         return _misc.TextDropTarget_base_OnDrop(*args, **kwargs)
 
     def base_OnData(*args, **kwargs):
         return _misc.TextDropTarget_base_OnDrop(*args, **kwargs)
 
     def base_OnData(*args, **kwargs):

-        """base_OnData(int x, int y, wxDragResult def) -> wxDragResult"""
+        """base_OnData(int x, int y, int def) -> int"""

         return _misc.TextDropTarget_base_OnData(*args, **kwargs)
 
 
         return _misc.TextDropTarget_base_OnData(*args, **kwargs)
 
 


@@ -4540,11 +4519,11 @@ class FileDropTarget(DropTarget):
         return _misc.FileDropTarget__setCallbackInfo(*args, **kwargs)
 
     def base_OnEnter(*args, **kwargs):
         return _misc.FileDropTarget__setCallbackInfo(*args, **kwargs)
 
     def base_OnEnter(*args, **kwargs):

-        """base_OnEnter(int x, int y, wxDragResult def) -> wxDragResult"""
+        """base_OnEnter(int x, int y, int def) -> int"""

         return _misc.FileDropTarget_base_OnEnter(*args, **kwargs)
 
     def base_OnDragOver(*args, **kwargs):
         return _misc.FileDropTarget_base_OnEnter(*args, **kwargs)
 
     def base_OnDragOver(*args, **kwargs):

-        """base_OnDragOver(int x, int y, wxDragResult def) -> wxDragResult"""
+        """base_OnDragOver(int x, int y, int def) -> int"""

         return _misc.FileDropTarget_base_OnDragOver(*args, **kwargs)
 
     def base_OnLeave(*args, **kwargs):
         return _misc.FileDropTarget_base_OnDragOver(*args, **kwargs)
 
     def base_OnLeave(*args, **kwargs):


@@ -4556,7 +4535,7 @@ class FileDropTarget(DropTarget):
         return _misc.FileDropTarget_base_OnDrop(*args, **kwargs)
 
     def base_OnData(*args, **kwargs):
         return _misc.FileDropTarget_base_OnDrop(*args, **kwargs)
 
     def base_OnData(*args, **kwargs):

-        """base_OnData(int x, int y, wxDragResult def) -> wxDragResult"""
+        """base_OnData(int x, int y, int def) -> int"""

         return _misc.FileDropTarget_base_OnData(*args, **kwargs)
 
 
         return _misc.FileDropTarget_base_OnData(*args, **kwargs)
 
 

diff --git a/wxPython/src/gtk/misc_wrap.cpp b/wxPython/src/gtk/misc_wrap.cpp
index 5201c5ab8ca5c86d7e0334448abf9baa4f54e86a..76811cd2077337d4e2dbff3c3b852b4176b93352 100644 (file)
--- a/wxPython/src/gtk/misc_wrap.cpp
+++ b/wxPython/src/gtk/misc_wrap.cpp
@@ -23352,7 +23352,7 @@ static PyObject * DropSource_swigregister(PyObject *self, PyObject *args) {
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }

-static PyObject *_wrap_new_DropTarget(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PyDropTarget(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject *resultobj;
     wxDataObject *arg1 = (wxDataObject *) NULL ;
     wxPyDropTarget *result;
     PyObject *resultobj;
     wxDataObject *arg1 = (wxDataObject *) NULL ;
     wxPyDropTarget *result;


@@ -23361,7 +23361,7 @@ static PyObject *_wrap_new_DropTarget(PyObject *self, PyObject *args, PyObject *
         (char *) "dataObject", NULL 
     };
     
         (char *) "dataObject", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_DropTarget",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_PyDropTarget",kwnames,&obj0)) goto fail;

     if (obj0) {
         if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDataObject,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
     }
     if (obj0) {
         if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDataObject,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
     }


@@ -25141,7 +25141,7 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"DropSource_DoDragDrop", (PyCFunction) _wrap_DropSource_DoDragDrop, METH_VARARGS | METH_KEYWORDS },
         { (char *)"DropSource_base_GiveFeedback", (PyCFunction) _wrap_DropSource_base_GiveFeedback, METH_VARARGS | METH_KEYWORDS },
         { (char *)"DropSource_swigregister", DropSource_swigregister, METH_VARARGS },
         { (char *)"DropSource_DoDragDrop", (PyCFunction) _wrap_DropSource_DoDragDrop, METH_VARARGS | METH_KEYWORDS },
         { (char *)"DropSource_base_GiveFeedback", (PyCFunction) _wrap_DropSource_base_GiveFeedback, METH_VARARGS | METH_KEYWORDS },
         { (char *)"DropSource_swigregister", DropSource_swigregister, METH_VARARGS },

-        { (char *)"new_DropTarget", (PyCFunction) _wrap_new_DropTarget, METH_VARARGS | METH_KEYWORDS },
+        { (char *)"new_PyDropTarget", (PyCFunction) _wrap_new_PyDropTarget, METH_VARARGS | METH_KEYWORDS },

         { (char *)"DropTarget__setCallbackInfo", (PyCFunction) _wrap_DropTarget__setCallbackInfo, METH_VARARGS | METH_KEYWORDS },
         { (char *)"delete_DropTarget", (PyCFunction) _wrap_delete_DropTarget, METH_VARARGS | METH_KEYWORDS },
         { (char *)"DropTarget_GetDataObject", (PyCFunction) _wrap_DropTarget_GetDataObject, METH_VARARGS | METH_KEYWORDS },
         { (char *)"DropTarget__setCallbackInfo", (PyCFunction) _wrap_DropTarget__setCallbackInfo, METH_VARARGS | METH_KEYWORDS },
         { (char *)"delete_DropTarget", (PyCFunction) _wrap_delete_DropTarget, METH_VARARGS | METH_KEYWORDS },
         { (char *)"DropTarget_GetDataObject", (PyCFunction) _wrap_DropTarget_GetDataObject, METH_VARARGS | METH_KEYWORDS },

diff --git a/wxPython/src/gtk/windows.py b/wxPython/src/gtk/windows.py
index 14556ff1848fe4b829d9a4463d45d99a1acd7f65..53fe6326139f5048b2890a4c5effd310e92ea735 100644 (file)
--- a/wxPython/src/gtk/windows.py
+++ b/wxPython/src/gtk/windows.py
@@ -14,7 +14,7 @@ class Panel(core.Window):
         """
         __init__(Window parent, int id=-1, Point pos=DefaultPosition, 
             Size size=DefaultSize, long style=wxTAB_TRAVERSAL|wxNO_BORDER, 
         """
         __init__(Window parent, int id=-1, Point pos=DefaultPosition, 
             Size size=DefaultSize, long style=wxTAB_TRAVERSAL|wxNO_BORDER, 

-            wxString name=PanelNameStr) -> Panel
+            String name=PanelNameStr) -> Panel

         """
         newobj = _windows.new_Panel(*args, **kwargs)
         self.this = newobj.this
         """
         newobj = _windows.new_Panel(*args, **kwargs)
         self.this = newobj.this


@@ -26,7 +26,7 @@ class Panel(core.Window):
         """
         Create(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
             long style=wxTAB_TRAVERSAL|wxNO_BORDER, 
         """
         Create(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
             long style=wxTAB_TRAVERSAL|wxNO_BORDER, 

-            wxString name=PanelNameStr) -> bool
+            String name=PanelNameStr) -> bool

         """
         return _windows.Panel_Create(*args, **kwargs)
 
         """
         return _windows.Panel_Create(*args, **kwargs)
 


@@ -57,7 +57,7 @@ class ScrolledWindow(Panel):
         """
         __init__(Window parent, int id=-1, Point pos=DefaultPosition, 
             Size size=DefaultSize, long style=wxHSCROLL|wxVSCROLL, 
         """
         __init__(Window parent, int id=-1, Point pos=DefaultPosition, 
             Size size=DefaultSize, long style=wxHSCROLL|wxVSCROLL, 

-            wxString name=PanelNameStr) -> ScrolledWindow
+            String name=PanelNameStr) -> ScrolledWindow

         """
         newobj = _windows.new_ScrolledWindow(*args, **kwargs)
         self.this = newobj.this
         """
         newobj = _windows.new_ScrolledWindow(*args, **kwargs)
         self.this = newobj.this


@@ -69,7 +69,7 @@ class ScrolledWindow(Panel):
         """
         Create(Window parent, int id=-1, Point pos=DefaultPosition, 
             Size size=DefaultSize, long style=wxHSCROLL|wxVSCROLL, 
         """
         Create(Window parent, int id=-1, Point pos=DefaultPosition, 
             Size size=DefaultSize, long style=wxHSCROLL|wxVSCROLL, 

-            wxString name=PanelNameStr) -> bool
+            String name=PanelNameStr) -> bool

         """
         return _windows.ScrolledWindow_Create(*args, **kwargs)
 
         """
         return _windows.ScrolledWindow_Create(*args, **kwargs)
 


@@ -230,15 +230,15 @@ class TopLevelWindow(core.Window):
         return _windows.TopLevelWindow_IsFullScreen(*args, **kwargs)
 
     def SetTitle(*args, **kwargs):
         return _windows.TopLevelWindow_IsFullScreen(*args, **kwargs)
 
     def SetTitle(*args, **kwargs):

-        """SetTitle(wxString title)"""
+        """SetTitle(String title)"""

         return _windows.TopLevelWindow_SetTitle(*args, **kwargs)
 
     def GetTitle(*args, **kwargs):
         return _windows.TopLevelWindow_SetTitle(*args, **kwargs)
 
     def GetTitle(*args, **kwargs):

-        """GetTitle() -> wxString"""
+        """GetTitle() -> String"""

         return _windows.TopLevelWindow_GetTitle(*args, **kwargs)
 
     def SetShape(*args, **kwargs):
         return _windows.TopLevelWindow_GetTitle(*args, **kwargs)
 
     def SetShape(*args, **kwargs):

-        """SetShape(wxRegion region) -> bool"""
+        """SetShape(Region region) -> bool"""

         return _windows.TopLevelWindow_SetShape(*args, **kwargs)
 
 
         return _windows.TopLevelWindow_SetShape(*args, **kwargs)
 
 


@@ -256,9 +256,9 @@ class Frame(TopLevelWindow):
         return "<%s.%s; proxy of C++ wxFrame instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """
         return "<%s.%s; proxy of C++ wxFrame instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """

-        __init__(Window parent, int id, wxString title, Point pos=DefaultPosition, 
+        __init__(Window parent, int id, String title, Point pos=DefaultPosition, 

             Size size=DefaultSize, long style=DEFAULT_FRAME_STYLE, 
             Size size=DefaultSize, long style=DEFAULT_FRAME_STYLE, 

-            wxString name=wxPyFrameNameStr) -> Frame
+            String name=wxPyFrameNameStr) -> Frame

         """
         newobj = _windows.new_Frame(*args, **kwargs)
         self.this = newobj.this
         """
         newobj = _windows.new_Frame(*args, **kwargs)
         self.this = newobj.this


@@ -268,9 +268,9 @@ class Frame(TopLevelWindow):
 
     def Create(*args, **kwargs):
         """
 
     def Create(*args, **kwargs):
         """

-        Create(Window parent, int id, wxString title, Point pos=DefaultPosition, 
+        Create(Window parent, int id, String title, Point pos=DefaultPosition, 

             Size size=DefaultSize, long style=DEFAULT_FRAME_STYLE, 
             Size size=DefaultSize, long style=DEFAULT_FRAME_STYLE, 

-            wxString name=wxPyFrameNameStr) -> bool
+            String name=wxPyFrameNameStr) -> bool

         """
         return _windows.Frame_Create(*args, **kwargs)
 
         """
         return _windows.Frame_Create(*args, **kwargs)
 


@@ -298,7 +298,7 @@ class Frame(TopLevelWindow):
     def CreateStatusBar(*args, **kwargs):
         """
         CreateStatusBar(int number=1, long style=ST_SIZEGRIP, int winid=0, 
     def CreateStatusBar(*args, **kwargs):
         """
         CreateStatusBar(int number=1, long style=ST_SIZEGRIP, int winid=0, 

-            wxString name=wxPyStatusLineNameStr) -> StatusBar
+            String name=wxPyStatusLineNameStr) -> StatusBar

         """
         return _windows.Frame_CreateStatusBar(*args, **kwargs)
 
         """
         return _windows.Frame_CreateStatusBar(*args, **kwargs)
 


@@ -311,7 +311,7 @@ class Frame(TopLevelWindow):
         return _windows.Frame_SetStatusBar(*args, **kwargs)
 
     def SetStatusText(*args, **kwargs):
         return _windows.Frame_SetStatusBar(*args, **kwargs)
 
     def SetStatusText(*args, **kwargs):

-        """SetStatusText(wxString text, int number=0)"""
+        """SetStatusText(String text, int number=0)"""

         return _windows.Frame_SetStatusText(*args, **kwargs)
 
     def SetStatusWidths(*args, **kwargs):
         return _windows.Frame_SetStatusText(*args, **kwargs)
 
     def SetStatusWidths(*args, **kwargs):


@@ -319,7 +319,7 @@ class Frame(TopLevelWindow):
         return _windows.Frame_SetStatusWidths(*args, **kwargs)
 
     def PushStatusText(*args, **kwargs):
         return _windows.Frame_SetStatusWidths(*args, **kwargs)
 
     def PushStatusText(*args, **kwargs):

-        """PushStatusText(wxString text, int number=0)"""
+        """PushStatusText(String text, int number=0)"""

         return _windows.Frame_PushStatusText(*args, **kwargs)
 
     def PopStatusText(*args, **kwargs):
         return _windows.Frame_PushStatusText(*args, **kwargs)
 
     def PopStatusText(*args, **kwargs):


@@ -335,7 +335,7 @@ class Frame(TopLevelWindow):
         return _windows.Frame_GetStatusBarPane(*args, **kwargs)
 
     def CreateToolBar(*args, **kwargs):
         return _windows.Frame_GetStatusBarPane(*args, **kwargs)
 
     def CreateToolBar(*args, **kwargs):

-        """CreateToolBar(long style=-1, int winid=-1, wxString name=wxPyToolBarNameStr) -> wxToolBar"""
+        """CreateToolBar(long style=-1, int winid=-1, String name=wxPyToolBarNameStr) -> wxToolBar"""

         return _windows.Frame_CreateToolBar(*args, **kwargs)
 
     def GetToolBar(*args, **kwargs):
         return _windows.Frame_CreateToolBar(*args, **kwargs)
 
     def GetToolBar(*args, **kwargs):


@@ -347,7 +347,7 @@ class Frame(TopLevelWindow):
         return _windows.Frame_SetToolBar(*args, **kwargs)
 
     def DoGiveHelp(*args, **kwargs):
         return _windows.Frame_SetToolBar(*args, **kwargs)
 
     def DoGiveHelp(*args, **kwargs):

-        """DoGiveHelp(wxString text, bool show)"""
+        """DoGiveHelp(String text, bool show)"""

         return _windows.Frame_DoGiveHelp(*args, **kwargs)
 
     def DoMenuUpdates(*args, **kwargs):
         return _windows.Frame_DoGiveHelp(*args, **kwargs)
 
     def DoMenuUpdates(*args, **kwargs):


@@ -375,9 +375,9 @@ class Dialog(TopLevelWindow):
         return "<%s.%s; proxy of C++ wxDialog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """
         return "<%s.%s; proxy of C++ wxDialog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """

-        __init__(Window parent, int id, wxString title, Point pos=DefaultPosition, 
+        __init__(Window parent, int id, String title, Point pos=DefaultPosition, 

             Size size=DefaultSize, long style=DEFAULT_DIALOG_STYLE, 
             Size size=DefaultSize, long style=DEFAULT_DIALOG_STYLE, 

-            wxString name=wxPyDialogNameStr) -> Dialog
+            String name=wxPyDialogNameStr) -> Dialog

         """
         newobj = _windows.new_Dialog(*args, **kwargs)
         self.this = newobj.this
         """
         newobj = _windows.new_Dialog(*args, **kwargs)
         self.this = newobj.this


@@ -387,9 +387,9 @@ class Dialog(TopLevelWindow):
 
     def Create(*args, **kwargs):
         """
 
     def Create(*args, **kwargs):
         """

-        Create(Window parent, int id, wxString title, Point pos=DefaultPosition, 
+        Create(Window parent, int id, String title, Point pos=DefaultPosition, 

             Size size=DefaultSize, long style=DEFAULT_DIALOG_STYLE, 
             Size size=DefaultSize, long style=DEFAULT_DIALOG_STYLE, 

-            wxString name=wxPyDialogNameStr) -> bool
+            String name=wxPyDialogNameStr) -> bool

         """
         return _windows.Dialog_Create(*args, **kwargs)
 
         """
         return _windows.Dialog_Create(*args, **kwargs)
 


@@ -402,7 +402,7 @@ class Dialog(TopLevelWindow):
         return _windows.Dialog_GetReturnCode(*args, **kwargs)
 
     def CreateTextSizer(*args, **kwargs):
         return _windows.Dialog_GetReturnCode(*args, **kwargs)
 
     def CreateTextSizer(*args, **kwargs):

-        """CreateTextSizer(wxString message) -> Sizer"""
+        """CreateTextSizer(String message) -> Sizer"""

         return _windows.Dialog_CreateTextSizer(*args, **kwargs)
 
     def CreateButtonSizer(*args, **kwargs):
         return _windows.Dialog_CreateTextSizer(*args, **kwargs)
 
     def CreateButtonSizer(*args, **kwargs):


@@ -450,9 +450,9 @@ class MiniFrame(Frame):
         return "<%s.%s; proxy of C++ wxMiniFrame instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """
         return "<%s.%s; proxy of C++ wxMiniFrame instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """

-        __init__(Window parent, int id, wxString title, Point pos=DefaultPosition, 
+        __init__(Window parent, int id, String title, Point pos=DefaultPosition, 

             Size size=DefaultSize, long style=DEFAULT_FRAME_STYLE, 
             Size size=DefaultSize, long style=DEFAULT_FRAME_STYLE, 

-            wxString name=wxPyFrameNameStr) -> MiniFrame
+            String name=wxPyFrameNameStr) -> MiniFrame

         """
         newobj = _windows.new_MiniFrame(*args, **kwargs)
         self.this = newobj.this
         """
         newobj = _windows.new_MiniFrame(*args, **kwargs)
         self.this = newobj.this


@@ -462,9 +462,9 @@ class MiniFrame(Frame):
 
     def Create(*args, **kwargs):
         """
 
     def Create(*args, **kwargs):
         """

-        Create(Window parent, int id, wxString title, Point pos=DefaultPosition, 
+        Create(Window parent, int id, String title, Point pos=DefaultPosition, 

             Size size=DefaultSize, long style=DEFAULT_FRAME_STYLE, 
             Size size=DefaultSize, long style=DEFAULT_FRAME_STYLE, 

-            wxString name=wxPyFrameNameStr) -> bool
+            String name=wxPyFrameNameStr) -> bool

         """
         return _windows.MiniFrame_Create(*args, **kwargs)
 
         """
         return _windows.MiniFrame_Create(*args, **kwargs)
 


@@ -494,7 +494,7 @@ class SplashScreenWindow(core.Window):
         return "<%s.%s; proxy of C++ wxSplashScreenWindow instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """
         return "<%s.%s; proxy of C++ wxSplashScreenWindow instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """

-        __init__(wxBitmap bitmap, Window parent, int id, Point pos=DefaultPosition, 
+        __init__(Bitmap bitmap, Window parent, int id, Point pos=DefaultPosition, 

             Size size=DefaultSize, long style=NO_BORDER) -> SplashScreenWindow
         """
         newobj = _windows.new_SplashScreenWindow(*args, **kwargs)
             Size size=DefaultSize, long style=NO_BORDER) -> SplashScreenWindow
         """
         newobj = _windows.new_SplashScreenWindow(*args, **kwargs)


@@ -504,11 +504,11 @@ class SplashScreenWindow(core.Window):
         self._setOORInfo(self)
 
     def SetBitmap(*args, **kwargs):
         self._setOORInfo(self)
 
     def SetBitmap(*args, **kwargs):

-        """SetBitmap(wxBitmap bitmap)"""
+        """SetBitmap(Bitmap bitmap)"""

         return _windows.SplashScreenWindow_SetBitmap(*args, **kwargs)
 
     def GetBitmap(*args, **kwargs):
         return _windows.SplashScreenWindow_SetBitmap(*args, **kwargs)
 
     def GetBitmap(*args, **kwargs):

-        """GetBitmap() -> wxBitmap"""
+        """GetBitmap() -> Bitmap"""

         return _windows.SplashScreenWindow_GetBitmap(*args, **kwargs)
 
 
         return _windows.SplashScreenWindow_GetBitmap(*args, **kwargs)
 
 


@@ -524,7 +524,7 @@ class SplashScreen(Frame):
         return "<%s.%s; proxy of C++ wxSplashScreen instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """
         return "<%s.%s; proxy of C++ wxSplashScreen instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """

-        __init__(wxBitmap bitmap, long splashStyle, int milliseconds, 
+        __init__(Bitmap bitmap, long splashStyle, int milliseconds, 

             Window parent, int id, Point pos=DefaultPosition, 
             Size size=DefaultSize, long style=wxSIMPLE_BORDER|wxFRAME_NO_TASKBAR|wxSTAY_ON_TOP) -> SplashScreen
         """
             Window parent, int id, Point pos=DefaultPosition, 
             Size size=DefaultSize, long style=wxSIMPLE_BORDER|wxFRAME_NO_TASKBAR|wxSTAY_ON_TOP) -> SplashScreen
         """


@@ -560,7 +560,7 @@ class StatusBar(core.Window):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxStatusBar instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxStatusBar instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):

-        """__init__(Window parent, int id=-1, long style=ST_SIZEGRIP, wxString name=wxPyStatusLineNameStr) -> StatusBar"""
+        """__init__(Window parent, int id=-1, long style=ST_SIZEGRIP, String name=wxPyStatusLineNameStr) -> StatusBar"""

         newobj = _windows.new_StatusBar(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         newobj = _windows.new_StatusBar(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1


@@ -568,7 +568,7 @@ class StatusBar(core.Window):
         self._setOORInfo(self)
 
     def Create(*args, **kwargs):
         self._setOORInfo(self)
 
     def Create(*args, **kwargs):

-        """Create(Window parent, int id, long style=ST_SIZEGRIP, wxString name=wxPyStatusLineNameStr) -> bool"""
+        """Create(Window parent, int id, long style=ST_SIZEGRIP, String name=wxPyStatusLineNameStr) -> bool"""

         return _windows.StatusBar_Create(*args, **kwargs)
 
     def SetFieldsCount(*args, **kwargs):
         return _windows.StatusBar_Create(*args, **kwargs)
 
     def SetFieldsCount(*args, **kwargs):


@@ -580,15 +580,15 @@ class StatusBar(core.Window):
         return _windows.StatusBar_GetFieldsCount(*args, **kwargs)
 
     def SetStatusText(*args, **kwargs):
         return _windows.StatusBar_GetFieldsCount(*args, **kwargs)
 
     def SetStatusText(*args, **kwargs):

-        """SetStatusText(wxString text, int number=0)"""
+        """SetStatusText(String text, int number=0)"""

         return _windows.StatusBar_SetStatusText(*args, **kwargs)
 
     def GetStatusText(*args, **kwargs):
         return _windows.StatusBar_SetStatusText(*args, **kwargs)
 
     def GetStatusText(*args, **kwargs):

-        """GetStatusText(int number=0) -> wxString"""
+        """GetStatusText(int number=0) -> String"""

         return _windows.StatusBar_GetStatusText(*args, **kwargs)
 
     def PushStatusText(*args, **kwargs):
         return _windows.StatusBar_GetStatusText(*args, **kwargs)
 
     def PushStatusText(*args, **kwargs):

-        """PushStatusText(wxString text, int number=0)"""
+        """PushStatusText(String text, int number=0)"""

         return _windows.StatusBar_PushStatusText(*args, **kwargs)
 
     def PopStatusText(*args, **kwargs):
         return _windows.StatusBar_PushStatusText(*args, **kwargs)
 
     def PopStatusText(*args, **kwargs):


@@ -650,7 +650,7 @@ class SplitterWindow(core.Window):
     def __init__(self, *args, **kwargs):
         """
         __init__(Window parent, int id, Point point=DefaultPosition, 
     def __init__(self, *args, **kwargs):
         """
         __init__(Window parent, int id, Point point=DefaultPosition, 

-            Size size=DefaultSize, long style=SP_3D, wxString name=wxPySplitterNameStr) -> SplitterWindow
+            Size size=DefaultSize, long style=SP_3D, String name=wxPySplitterNameStr) -> SplitterWindow

         """
         newobj = _windows.new_SplitterWindow(*args, **kwargs)
         self.this = newobj.this
         """
         newobj = _windows.new_SplitterWindow(*args, **kwargs)
         self.this = newobj.this


@@ -661,7 +661,7 @@ class SplitterWindow(core.Window):
     def Create(*args, **kwargs):
         """
         Create(Window parent, int id, Point point=DefaultPosition, 
     def Create(*args, **kwargs):
         """
         Create(Window parent, int id, Point point=DefaultPosition, 

-            Size size=DefaultSize, long style=SP_3D, wxString name=wxPySplitterNameStr) -> bool
+            Size size=DefaultSize, long style=SP_3D, String name=wxPySplitterNameStr) -> bool

         """
         return _windows.SplitterWindow_Create(*args, **kwargs)
 
         """
         return _windows.SplitterWindow_Create(*args, **kwargs)
 


@@ -678,7 +678,7 @@ class SplitterWindow(core.Window):
         return _windows.SplitterWindow_SetSplitMode(*args, **kwargs)
 
     def GetSplitMode(*args, **kwargs):
         return _windows.SplitterWindow_SetSplitMode(*args, **kwargs)
 
     def GetSplitMode(*args, **kwargs):

-        """GetSplitMode() -> wxSplitMode"""
+        """GetSplitMode() -> int"""

         return _windows.SplitterWindow_GetSplitMode(*args, **kwargs)
 
     def Initialize(*args, **kwargs):
         return _windows.SplitterWindow_GetSplitMode(*args, **kwargs)
 
     def Initialize(*args, **kwargs):


@@ -835,7 +835,7 @@ class SashWindow(core.Window):
         """
         __init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
             long style=wxCLIP_CHILDREN|wxSW_3D, 
         """
         __init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
             long style=wxCLIP_CHILDREN|wxSW_3D, 

-            wxString name=wxPySashNameStr) -> SashWindow
+            String name=wxPySashNameStr) -> SashWindow

         """
         newobj = _windows.new_SashWindow(*args, **kwargs)
         self.this = newobj.this
         """
         newobj = _windows.new_SashWindow(*args, **kwargs)
         self.this = newobj.this


@@ -847,28 +847,28 @@ class SashWindow(core.Window):
         """
         Create(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
             long style=wxCLIP_CHILDREN|wxSW_3D, 
         """
         Create(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
             long style=wxCLIP_CHILDREN|wxSW_3D, 

-            wxString name=wxPySashNameStr) -> bool
+            String name=wxPySashNameStr) -> bool

         """
         return _windows.SashWindow_Create(*args, **kwargs)
 
     def SetSashVisible(*args, **kwargs):
         """
         return _windows.SashWindow_Create(*args, **kwargs)
 
     def SetSashVisible(*args, **kwargs):

-        """SetSashVisible(wxSashEdgePosition edge, bool sash)"""
+        """SetSashVisible(int edge, bool sash)"""

         return _windows.SashWindow_SetSashVisible(*args, **kwargs)
 
     def GetSashVisible(*args, **kwargs):
         return _windows.SashWindow_SetSashVisible(*args, **kwargs)
 
     def GetSashVisible(*args, **kwargs):

-        """GetSashVisible(wxSashEdgePosition edge) -> bool"""
+        """GetSashVisible(int edge) -> bool"""

         return _windows.SashWindow_GetSashVisible(*args, **kwargs)
 
     def SetSashBorder(*args, **kwargs):
         return _windows.SashWindow_GetSashVisible(*args, **kwargs)
 
     def SetSashBorder(*args, **kwargs):

-        """SetSashBorder(wxSashEdgePosition edge, bool border)"""
+        """SetSashBorder(int edge, bool border)"""

         return _windows.SashWindow_SetSashBorder(*args, **kwargs)
 
     def HasBorder(*args, **kwargs):
         return _windows.SashWindow_SetSashBorder(*args, **kwargs)
 
     def HasBorder(*args, **kwargs):

-        """HasBorder(wxSashEdgePosition edge) -> bool"""
+        """HasBorder(int edge) -> bool"""

         return _windows.SashWindow_HasBorder(*args, **kwargs)
 
     def GetEdgeMargin(*args, **kwargs):
         return _windows.SashWindow_HasBorder(*args, **kwargs)
 
     def GetEdgeMargin(*args, **kwargs):

-        """GetEdgeMargin(wxSashEdgePosition edge) -> int"""
+        """GetEdgeMargin(int edge) -> int"""

         return _windows.SashWindow_GetEdgeMargin(*args, **kwargs)
 
     def SetDefaultBorderSize(*args, **kwargs):
         return _windows.SashWindow_GetEdgeMargin(*args, **kwargs)
 
     def SetDefaultBorderSize(*args, **kwargs):


@@ -920,7 +920,7 @@ class SashWindow(core.Window):
         return _windows.SashWindow_GetMaximumSizeY(*args, **kwargs)
 
     def SashHitTest(*args, **kwargs):
         return _windows.SashWindow_GetMaximumSizeY(*args, **kwargs)
 
     def SashHitTest(*args, **kwargs):

-        """SashHitTest(int x, int y, int tolerance=2) -> wxSashEdgePosition"""
+        """SashHitTest(int x, int y, int tolerance=2) -> int"""

         return _windows.SashWindow_SashHitTest(*args, **kwargs)
 
     def SizeWindows(*args, **kwargs):
         return _windows.SashWindow_SashHitTest(*args, **kwargs)
 
     def SizeWindows(*args, **kwargs):


@@ -947,17 +947,17 @@ class SashEvent(core.CommandEvent):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxSashEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxSashEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):

-        """__init__(int id=0, wxSashEdgePosition edge=SASH_NONE) -> SashEvent"""
+        """__init__(int id=0, int edge=SASH_NONE) -> SashEvent"""

         newobj = _windows.new_SashEvent(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def SetEdge(*args, **kwargs):
         newobj = _windows.new_SashEvent(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def SetEdge(*args, **kwargs):

-        """SetEdge(wxSashEdgePosition edge)"""
+        """SetEdge(int edge)"""

         return _windows.SashEvent_SetEdge(*args, **kwargs)
 
     def GetEdge(*args, **kwargs):
         return _windows.SashEvent_SetEdge(*args, **kwargs)
 
     def GetEdge(*args, **kwargs):

-        """GetEdge() -> wxSashEdgePosition"""
+        """GetEdge() -> int"""

         return _windows.SashEvent_GetEdge(*args, **kwargs)
 
     def SetDragRect(*args, **kwargs):
         return _windows.SashEvent_GetEdge(*args, **kwargs)
 
     def SetDragRect(*args, **kwargs):


@@ -969,11 +969,11 @@ class SashEvent(core.CommandEvent):
         return _windows.SashEvent_GetDragRect(*args, **kwargs)
 
     def SetDragStatus(*args, **kwargs):
         return _windows.SashEvent_GetDragRect(*args, **kwargs)
 
     def SetDragStatus(*args, **kwargs):

-        """SetDragStatus(wxSashDragStatus status)"""
+        """SetDragStatus(int status)"""

         return _windows.SashEvent_SetDragStatus(*args, **kwargs)
 
     def GetDragStatus(*args, **kwargs):
         return _windows.SashEvent_SetDragStatus(*args, **kwargs)
 
     def GetDragStatus(*args, **kwargs):

-        """GetDragStatus() -> wxSashDragStatus"""
+        """GetDragStatus() -> int"""

         return _windows.SashEvent_GetDragStatus(*args, **kwargs)
 
 
         return _windows.SashEvent_GetDragStatus(*args, **kwargs)
 
 


@@ -1037,19 +1037,19 @@ class QueryLayoutInfoEvent(core.Event):
         return _windows.QueryLayoutInfoEvent_GetSize(*args, **kwargs)
 
     def SetOrientation(*args, **kwargs):
         return _windows.QueryLayoutInfoEvent_GetSize(*args, **kwargs)
 
     def SetOrientation(*args, **kwargs):

-        """SetOrientation(wxLayoutOrientation orient)"""
+        """SetOrientation(int orient)"""

         return _windows.QueryLayoutInfoEvent_SetOrientation(*args, **kwargs)
 
     def GetOrientation(*args, **kwargs):
         return _windows.QueryLayoutInfoEvent_SetOrientation(*args, **kwargs)
 
     def GetOrientation(*args, **kwargs):

-        """GetOrientation() -> wxLayoutOrientation"""
+        """GetOrientation() -> int"""

         return _windows.QueryLayoutInfoEvent_GetOrientation(*args, **kwargs)
 
     def SetAlignment(*args, **kwargs):
         return _windows.QueryLayoutInfoEvent_GetOrientation(*args, **kwargs)
 
     def SetAlignment(*args, **kwargs):

-        """SetAlignment(wxLayoutAlignment align)"""
+        """SetAlignment(int align)"""

         return _windows.QueryLayoutInfoEvent_SetAlignment(*args, **kwargs)
 
     def GetAlignment(*args, **kwargs):
         return _windows.QueryLayoutInfoEvent_SetAlignment(*args, **kwargs)
 
     def GetAlignment(*args, **kwargs):

-        """GetAlignment() -> wxLayoutAlignment"""
+        """GetAlignment() -> int"""

         return _windows.QueryLayoutInfoEvent_GetAlignment(*args, **kwargs)
 
 
         return _windows.QueryLayoutInfoEvent_GetAlignment(*args, **kwargs)
 
 


@@ -1103,7 +1103,7 @@ class SashLayoutWindow(SashWindow):
         """
         __init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
             long style=wxCLIP_CHILDREN|wxSW_3D, 
         """
         __init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
             long style=wxCLIP_CHILDREN|wxSW_3D, 

-            wxString name=wxPySashLayoutNameStr) -> SashLayoutWindow
+            String name=wxPySashLayoutNameStr) -> SashLayoutWindow

         """
         newobj = _windows.new_SashLayoutWindow(*args, **kwargs)
         self.this = newobj.this
         """
         newobj = _windows.new_SashLayoutWindow(*args, **kwargs)
         self.this = newobj.this


@@ -1115,20 +1115,20 @@ class SashLayoutWindow(SashWindow):
         """
         Create(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
             long style=wxCLIP_CHILDREN|wxSW_3D, 
         """
         Create(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
             long style=wxCLIP_CHILDREN|wxSW_3D, 

-            wxString name=wxPySashLayoutNameStr) -> bool
+            String name=wxPySashLayoutNameStr) -> bool

         """
         return _windows.SashLayoutWindow_Create(*args, **kwargs)
 
     def GetAlignment(*args, **kwargs):
         """
         return _windows.SashLayoutWindow_Create(*args, **kwargs)
 
     def GetAlignment(*args, **kwargs):

-        """GetAlignment() -> wxLayoutAlignment"""
+        """GetAlignment() -> int"""

         return _windows.SashLayoutWindow_GetAlignment(*args, **kwargs)
 
     def GetOrientation(*args, **kwargs):
         return _windows.SashLayoutWindow_GetAlignment(*args, **kwargs)
 
     def GetOrientation(*args, **kwargs):

-        """GetOrientation() -> wxLayoutOrientation"""
+        """GetOrientation() -> int"""

         return _windows.SashLayoutWindow_GetOrientation(*args, **kwargs)
 
     def SetAlignment(*args, **kwargs):
         return _windows.SashLayoutWindow_GetOrientation(*args, **kwargs)
 
     def SetAlignment(*args, **kwargs):

-        """SetAlignment(wxLayoutAlignment alignment)"""
+        """SetAlignment(int alignment)"""

         return _windows.SashLayoutWindow_SetAlignment(*args, **kwargs)
 
     def SetDefaultSize(*args, **kwargs):
         return _windows.SashLayoutWindow_SetAlignment(*args, **kwargs)
 
     def SetDefaultSize(*args, **kwargs):


@@ -1136,7 +1136,7 @@ class SashLayoutWindow(SashWindow):
         return _windows.SashLayoutWindow_SetDefaultSize(*args, **kwargs)
 
     def SetOrientation(*args, **kwargs):
         return _windows.SashLayoutWindow_SetDefaultSize(*args, **kwargs)
 
     def SetOrientation(*args, **kwargs):

-        """SetOrientation(wxLayoutOrientation orientation)"""
+        """SetOrientation(int orientation)"""

         return _windows.SashLayoutWindow_SetOrientation(*args, **kwargs)
 
 
         return _windows.SashLayoutWindow_SetOrientation(*args, **kwargs)
 
 


@@ -1268,7 +1268,7 @@ class TipWindow(PopupTransientWindow):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxTipWindow instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxTipWindow instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):

-        """__init__(Window parent, wxString text, int maxLength=100, Rect rectBound=None) -> TipWindow"""
+        """__init__(Window parent, String text, int maxLength=100, Rect rectBound=None) -> TipWindow"""

         newobj = _windows.new_TipWindow(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         newobj = _windows.new_TipWindow(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1


@@ -1299,7 +1299,7 @@ class VScrolledWindow(Panel):
     def __init__(self, *args, **kwargs):
         """
         __init__(Window parent, int id=ID_ANY, Point pos=DefaultPosition, 
     def __init__(self, *args, **kwargs):
         """
         __init__(Window parent, int id=ID_ANY, Point pos=DefaultPosition, 

-            Size size=DefaultSize, long style=0, wxString name=PanelNameStr) -> VScrolledWindow
+            Size size=DefaultSize, long style=0, String name=PanelNameStr) -> VScrolledWindow

         """
         newobj = _windows.new_VScrolledWindow(*args, **kwargs)
         self.this = newobj.this
         """
         newobj = _windows.new_VScrolledWindow(*args, **kwargs)
         self.this = newobj.this


@@ -1314,7 +1314,7 @@ class VScrolledWindow(Panel):
     def Create(*args, **kwargs):
         """
         Create(Window parent, int id=ID_ANY, Point pos=DefaultPosition, 
     def Create(*args, **kwargs):
         """
         Create(Window parent, int id=ID_ANY, Point pos=DefaultPosition, 

-            Size size=DefaultSize, long style=0, wxString name=PanelNameStr) -> bool
+            Size size=DefaultSize, long style=0, String name=PanelNameStr) -> bool

         """
         return _windows.VScrolledWindow_Create(*args, **kwargs)
 
         """
         return _windows.VScrolledWindow_Create(*args, **kwargs)
 


@@ -1390,7 +1390,7 @@ class VListBox(VScrolledWindow):
     def __init__(self, *args, **kwargs):
         """
         __init__(Window parent, int id=ID_ANY, Point pos=DefaultPosition, 
     def __init__(self, *args, **kwargs):
         """
         __init__(Window parent, int id=ID_ANY, Point pos=DefaultPosition, 

-            Size size=DefaultSize, long style=0, wxString name=wxPyVListBoxNameStr) -> VListBox
+            Size size=DefaultSize, long style=0, String name=wxPyVListBoxNameStr) -> VListBox

         """
         newobj = _windows.new_VListBox(*args, **kwargs)
         self.this = newobj.this
         """
         newobj = _windows.new_VListBox(*args, **kwargs)
         self.this = newobj.this


@@ -1405,7 +1405,7 @@ class VListBox(VScrolledWindow):
     def Create(*args, **kwargs):
         """
         Create(Window parent, int id=ID_ANY, Point pos=DefaultPosition, 
     def Create(*args, **kwargs):
         """
         Create(Window parent, int id=ID_ANY, Point pos=DefaultPosition, 

-            Size size=DefaultSize, long style=0, wxString name=wxPyVListBoxNameStr) -> bool
+            Size size=DefaultSize, long style=0, String name=wxPyVListBoxNameStr) -> bool

         """
         return _windows.VListBox_Create(*args, **kwargs)
 
         """
         return _windows.VListBox_Create(*args, **kwargs)
 


@@ -1446,7 +1446,7 @@ class VListBox(VScrolledWindow):
         return _windows.VListBox_GetMargins(*args, **kwargs)
 
     def GetSelectionBackground(*args, **kwargs):
         return _windows.VListBox_GetMargins(*args, **kwargs)
 
     def GetSelectionBackground(*args, **kwargs):

-        """GetSelectionBackground() -> wxColour"""
+        """GetSelectionBackground() -> Colour"""

         return _windows.VListBox_GetSelectionBackground(*args, **kwargs)
 
     def SetItemCount(*args, **kwargs):
         return _windows.VListBox_GetSelectionBackground(*args, **kwargs)
 
     def SetItemCount(*args, **kwargs):


@@ -1490,7 +1490,7 @@ class VListBox(VScrolledWindow):
         return _windows.VListBox_SetMarginsXY(*args, **kwargs)
 
     def SetSelectionBackground(*args, **kwargs):
         return _windows.VListBox_SetMarginsXY(*args, **kwargs)
 
     def SetSelectionBackground(*args, **kwargs):

-        """SetSelectionBackground(wxColour col)"""
+        """SetSelectionBackground(Colour col)"""

         return _windows.VListBox_SetSelectionBackground(*args, **kwargs)
 
 
         return _windows.VListBox_SetSelectionBackground(*args, **kwargs)
 
 


@@ -1513,7 +1513,7 @@ class HtmlListBox(VListBox):
     def __init__(self, *args, **kwargs):
         """
         __init__(Window parent, int id=ID_ANY, Point pos=DefaultPosition, 
     def __init__(self, *args, **kwargs):
         """
         __init__(Window parent, int id=ID_ANY, Point pos=DefaultPosition, 

-            Size size=DefaultSize, long style=0, wxString name=wxPyVListBoxNameStr) -> HtmlListBox
+            Size size=DefaultSize, long style=0, String name=wxPyVListBoxNameStr) -> HtmlListBox

         """
         newobj = _windows.new_HtmlListBox(*args, **kwargs)
         self.this = newobj.this
         """
         newobj = _windows.new_HtmlListBox(*args, **kwargs)
         self.this = newobj.this


@@ -1528,7 +1528,7 @@ class HtmlListBox(VListBox):
     def Create(*args, **kwargs):
         """
         Create(Window parent, int id=ID_ANY, Point pos=DefaultPosition, 
     def Create(*args, **kwargs):
         """
         Create(Window parent, int id=ID_ANY, Point pos=DefaultPosition, 

-            Size size=DefaultSize, long style=0, wxString name=wxPyVListBoxNameStr) -> bool
+            Size size=DefaultSize, long style=0, String name=wxPyVListBoxNameStr) -> bool

         """
         return _windows.HtmlListBox_Create(*args, **kwargs)
 
         """
         return _windows.HtmlListBox_Create(*args, **kwargs)
 


@@ -1580,7 +1580,7 @@ class TaskBarIcon(core.EvtHandler):
         return _windows.TaskBarIcon_IsIconInstalled(*args, **kwargs)
 
     def SetIcon(*args, **kwargs):
         return _windows.TaskBarIcon_IsIconInstalled(*args, **kwargs)
 
     def SetIcon(*args, **kwargs):

-        """SetIcon(wxIcon icon, wxString tooltip=wxPyEmptyString) -> bool"""
+        """SetIcon(wxIcon icon, String tooltip=EmptyString) -> bool"""

         return _windows.TaskBarIcon_SetIcon(*args, **kwargs)
 
     def RemoveIcon(*args, **kwargs):
         return _windows.TaskBarIcon_SetIcon(*args, **kwargs)
 
     def RemoveIcon(*args, **kwargs):


@@ -1653,11 +1653,11 @@ class ColourData(core.Object):
         return _windows.ColourData_GetChooseFull(*args, **kwargs)
 
     def GetColour(*args, **kwargs):
         return _windows.ColourData_GetChooseFull(*args, **kwargs)
 
     def GetColour(*args, **kwargs):

-        """GetColour() -> wxColour"""
+        """GetColour() -> Colour"""

         return _windows.ColourData_GetColour(*args, **kwargs)
 
     def GetCustomColour(*args, **kwargs):
         return _windows.ColourData_GetColour(*args, **kwargs)
 
     def GetCustomColour(*args, **kwargs):

-        """GetCustomColour(int i) -> wxColour"""
+        """GetCustomColour(int i) -> Colour"""

         return _windows.ColourData_GetCustomColour(*args, **kwargs)
 
     def SetChooseFull(*args, **kwargs):
         return _windows.ColourData_GetCustomColour(*args, **kwargs)
 
     def SetChooseFull(*args, **kwargs):


@@ -1665,11 +1665,11 @@ class ColourData(core.Object):
         return _windows.ColourData_SetChooseFull(*args, **kwargs)
 
     def SetColour(*args, **kwargs):
         return _windows.ColourData_SetChooseFull(*args, **kwargs)
 
     def SetColour(*args, **kwargs):

-        """SetColour(wxColour colour)"""
+        """SetColour(Colour colour)"""

         return _windows.ColourData_SetColour(*args, **kwargs)
 
     def SetCustomColour(*args, **kwargs):
         return _windows.ColourData_SetColour(*args, **kwargs)
 
     def SetCustomColour(*args, **kwargs):

-        """SetCustomColour(int i, wxColour colour)"""
+        """SetCustomColour(int i, Colour colour)"""

         return _windows.ColourData_SetCustomColour(*args, **kwargs)
 
 
         return _windows.ColourData_SetCustomColour(*args, **kwargs)
 
 


@@ -1712,10 +1712,10 @@ class DirDialog(Dialog):
         return "<%s.%s; proxy of C++ wxDirDialog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """
         return "<%s.%s; proxy of C++ wxDirDialog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """

-        __init__(Window parent, wxString message=wxPyDirSelectorPromptStr, 
-            wxString defaultPath=wxPyEmptyString, 
-            long style=0, Point pos=DefaultPosition, Size size=DefaultSize, 
-            wxString name=wxPyDirDialogNameStr) -> DirDialog
+        __init__(Window parent, String message=wxPyDirSelectorPromptStr, 
+            String defaultPath=EmptyString, long style=0, 
+            Point pos=DefaultPosition, Size size=DefaultSize, 
+            String name=wxPyDirDialogNameStr) -> DirDialog

         """
         newobj = _windows.new_DirDialog(*args, **kwargs)
         self.this = newobj.this
         """
         newobj = _windows.new_DirDialog(*args, **kwargs)
         self.this = newobj.this


@@ -1724,11 +1724,11 @@ class DirDialog(Dialog):
         self._setOORInfo(self)
 
     def GetPath(*args, **kwargs):
         self._setOORInfo(self)
 
     def GetPath(*args, **kwargs):

-        """GetPath() -> wxString"""
+        """GetPath() -> String"""

         return _windows.DirDialog_GetPath(*args, **kwargs)
 
     def GetMessage(*args, **kwargs):
         return _windows.DirDialog_GetPath(*args, **kwargs)
 
     def GetMessage(*args, **kwargs):

-        """GetMessage() -> wxString"""
+        """GetMessage() -> String"""

         return _windows.DirDialog_GetMessage(*args, **kwargs)
 
     def GetStyle(*args, **kwargs):
         return _windows.DirDialog_GetMessage(*args, **kwargs)
 
     def GetStyle(*args, **kwargs):


@@ -1736,11 +1736,11 @@ class DirDialog(Dialog):
         return _windows.DirDialog_GetStyle(*args, **kwargs)
 
     def SetMessage(*args, **kwargs):
         return _windows.DirDialog_GetStyle(*args, **kwargs)
 
     def SetMessage(*args, **kwargs):

-        """SetMessage(wxString message)"""
+        """SetMessage(String message)"""

         return _windows.DirDialog_SetMessage(*args, **kwargs)
 
     def SetPath(*args, **kwargs):
         return _windows.DirDialog_SetMessage(*args, **kwargs)
 
     def SetPath(*args, **kwargs):

-        """SetPath(wxString path)"""
+        """SetPath(String path)"""

         return _windows.DirDialog_SetPath(*args, **kwargs)
 
     def ShowModal(*args, **kwargs):
         return _windows.DirDialog_SetPath(*args, **kwargs)
 
     def ShowModal(*args, **kwargs):


@@ -1760,9 +1760,9 @@ class FileDialog(Dialog):
         return "<%s.%s; proxy of C++ wxFileDialog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """
         return "<%s.%s; proxy of C++ wxFileDialog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """

-        __init__(Window parent, wxString message=wxPyFileSelectorPromptStr, 
-            wxString defaultDir=wxPyEmptyString, 
-            wxString defaultFile=wxPyEmptyString, wxString wildcard=wxPyFileSelectorDefaultWildcardStr, 
+        __init__(Window parent, String message=wxPyFileSelectorPromptStr, 
+            String defaultDir=EmptyString, String defaultFile=EmptyString, 
+            String wildcard=wxPyFileSelectorDefaultWildcardStr, 

             long style=0, 
             Point pos=DefaultPosition) -> FileDialog
         """
             long style=0, 
             Point pos=DefaultPosition) -> FileDialog
         """


@@ -1773,23 +1773,23 @@ class FileDialog(Dialog):
         self._setOORInfo(self)
 
     def SetMessage(*args, **kwargs):
         self._setOORInfo(self)
 
     def SetMessage(*args, **kwargs):

-        """SetMessage(wxString message)"""
+        """SetMessage(String message)"""

         return _windows.FileDialog_SetMessage(*args, **kwargs)
 
     def SetPath(*args, **kwargs):
         return _windows.FileDialog_SetMessage(*args, **kwargs)
 
     def SetPath(*args, **kwargs):

-        """SetPath(wxString path)"""
+        """SetPath(String path)"""

         return _windows.FileDialog_SetPath(*args, **kwargs)
 
     def SetDirectory(*args, **kwargs):
         return _windows.FileDialog_SetPath(*args, **kwargs)
 
     def SetDirectory(*args, **kwargs):

-        """SetDirectory(wxString dir)"""
+        """SetDirectory(String dir)"""

         return _windows.FileDialog_SetDirectory(*args, **kwargs)
 
     def SetFilename(*args, **kwargs):
         return _windows.FileDialog_SetDirectory(*args, **kwargs)
 
     def SetFilename(*args, **kwargs):

-        """SetFilename(wxString name)"""
+        """SetFilename(String name)"""

         return _windows.FileDialog_SetFilename(*args, **kwargs)
 
     def SetWildcard(*args, **kwargs):
         return _windows.FileDialog_SetFilename(*args, **kwargs)
 
     def SetWildcard(*args, **kwargs):

-        """SetWildcard(wxString wildCard)"""
+        """SetWildcard(String wildCard)"""

         return _windows.FileDialog_SetWildcard(*args, **kwargs)
 
     def SetStyle(*args, **kwargs):
         return _windows.FileDialog_SetWildcard(*args, **kwargs)
 
     def SetStyle(*args, **kwargs):


@@ -1801,23 +1801,23 @@ class FileDialog(Dialog):
         return _windows.FileDialog_SetFilterIndex(*args, **kwargs)
 
     def GetMessage(*args, **kwargs):
         return _windows.FileDialog_SetFilterIndex(*args, **kwargs)
 
     def GetMessage(*args, **kwargs):

-        """GetMessage() -> wxString"""
+        """GetMessage() -> String"""

         return _windows.FileDialog_GetMessage(*args, **kwargs)
 
     def GetPath(*args, **kwargs):
         return _windows.FileDialog_GetMessage(*args, **kwargs)
 
     def GetPath(*args, **kwargs):

-        """GetPath() -> wxString"""
+        """GetPath() -> String"""

         return _windows.FileDialog_GetPath(*args, **kwargs)
 
     def GetDirectory(*args, **kwargs):
         return _windows.FileDialog_GetPath(*args, **kwargs)
 
     def GetDirectory(*args, **kwargs):

-        """GetDirectory() -> wxString"""
+        """GetDirectory() -> String"""

         return _windows.FileDialog_GetDirectory(*args, **kwargs)
 
     def GetFilename(*args, **kwargs):
         return _windows.FileDialog_GetDirectory(*args, **kwargs)
 
     def GetFilename(*args, **kwargs):

-        """GetFilename() -> wxString"""
+        """GetFilename() -> String"""

         return _windows.FileDialog_GetFilename(*args, **kwargs)
 
     def GetWildcard(*args, **kwargs):
         return _windows.FileDialog_GetFilename(*args, **kwargs)
 
     def GetWildcard(*args, **kwargs):

-        """GetWildcard() -> wxString"""
+        """GetWildcard() -> String"""

         return _windows.FileDialog_GetWildcard(*args, **kwargs)
 
     def GetStyle(*args, **kwargs):
         return _windows.FileDialog_GetWildcard(*args, **kwargs)
 
     def GetStyle(*args, **kwargs):


@@ -1850,8 +1850,8 @@ class MultiChoiceDialog(Dialog):
         return "<%s.%s; proxy of C++ wxMultiChoiceDialog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """
         return "<%s.%s; proxy of C++ wxMultiChoiceDialog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """

-        __init__(Window parent, wxString message, wxString caption, 
-            int LCOUNT, wxString choices, long style=CHOICEDLG_STYLE, 
+        __init__(Window parent, String message, String caption, int LCOUNT, 
+            String choices, long style=CHOICEDLG_STYLE, 

             Point pos=DefaultPosition) -> MultiChoiceDialog
         """
         newobj = _windows.new_MultiChoiceDialog(*args, **kwargs)
             Point pos=DefaultPosition) -> MultiChoiceDialog
         """
         newobj = _windows.new_MultiChoiceDialog(*args, **kwargs)


@@ -1881,8 +1881,8 @@ class SingleChoiceDialog(Dialog):
         return "<%s.%s; proxy of C++ wxSingleChoiceDialog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """
         return "<%s.%s; proxy of C++ wxSingleChoiceDialog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """

-        __init__(Window parent, wxString message, wxString caption, 
-            int choices, wxString choices_array, long style=CHOICEDLG_STYLE, 
+        __init__(Window parent, String message, String caption, int choices, 
+            String choices_array, long style=CHOICEDLG_STYLE, 

             Point pos=DefaultPosition) -> SingleChoiceDialog
         """
         newobj = _windows.new_SingleChoiceDialog(*args, **kwargs)
             Point pos=DefaultPosition) -> SingleChoiceDialog
         """
         newobj = _windows.new_SingleChoiceDialog(*args, **kwargs)


@@ -1896,7 +1896,7 @@ class SingleChoiceDialog(Dialog):
         return _windows.SingleChoiceDialog_GetSelection(*args, **kwargs)
 
     def GetStringSelection(*args, **kwargs):
         return _windows.SingleChoiceDialog_GetSelection(*args, **kwargs)
 
     def GetStringSelection(*args, **kwargs):

-        """GetStringSelection() -> wxString"""
+        """GetStringSelection() -> String"""

         return _windows.SingleChoiceDialog_GetStringSelection(*args, **kwargs)
 
     def SetSelection(*args, **kwargs):
         return _windows.SingleChoiceDialog_GetStringSelection(*args, **kwargs)
 
     def SetSelection(*args, **kwargs):


@@ -1920,8 +1920,8 @@ class TextEntryDialog(Dialog):
         return "<%s.%s; proxy of C++ wxTextEntryDialog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """
         return "<%s.%s; proxy of C++ wxTextEntryDialog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """

-        __init__(Window parent, wxString message, wxString caption=wxPyGetTextFromUserPromptStr, 
-            wxString defaultValue=wxPyEmptyString, 
+        __init__(Window parent, String message, String caption=wxPyGetTextFromUserPromptStr, 
+            String defaultValue=EmptyString, 

             long style=wxOK|wxCANCEL|wxCENTRE, 
             Point pos=DefaultPosition) -> TextEntryDialog
         """
             long style=wxOK|wxCANCEL|wxCENTRE, 
             Point pos=DefaultPosition) -> TextEntryDialog
         """


@@ -1932,11 +1932,11 @@ class TextEntryDialog(Dialog):
         self._setOORInfo(self)
 
     def GetValue(*args, **kwargs):
         self._setOORInfo(self)
 
     def GetValue(*args, **kwargs):

-        """GetValue() -> wxString"""
+        """GetValue() -> String"""

         return _windows.TextEntryDialog_GetValue(*args, **kwargs)
 
     def SetValue(*args, **kwargs):
         return _windows.TextEntryDialog_GetValue(*args, **kwargs)
 
     def SetValue(*args, **kwargs):

-        """SetValue(wxString value)"""
+        """SetValue(String value)"""

         return _windows.TextEntryDialog_SetValue(*args, **kwargs)
 
     def ShowModal(*args, **kwargs):
         return _windows.TextEntryDialog_SetValue(*args, **kwargs)
 
     def ShowModal(*args, **kwargs):


@@ -1975,11 +1975,11 @@ class FontData(core.Object):
         return _windows.FontData_GetAllowSymbols(*args, **kwargs)
 
     def GetColour(*args, **kwargs):
         return _windows.FontData_GetAllowSymbols(*args, **kwargs)
 
     def GetColour(*args, **kwargs):

-        """GetColour() -> wxColour"""
+        """GetColour() -> Colour"""

         return _windows.FontData_GetColour(*args, **kwargs)
 
     def GetChosenFont(*args, **kwargs):
         return _windows.FontData_GetColour(*args, **kwargs)
 
     def GetChosenFont(*args, **kwargs):

-        """GetChosenFont() -> wxFont"""
+        """GetChosenFont() -> Font"""

         return _windows.FontData_GetChosenFont(*args, **kwargs)
 
     def GetEnableEffects(*args, **kwargs):
         return _windows.FontData_GetChosenFont(*args, **kwargs)
 
     def GetEnableEffects(*args, **kwargs):


@@ -1987,7 +1987,7 @@ class FontData(core.Object):
         return _windows.FontData_GetEnableEffects(*args, **kwargs)
 
     def GetInitialFont(*args, **kwargs):
         return _windows.FontData_GetEnableEffects(*args, **kwargs)
 
     def GetInitialFont(*args, **kwargs):

-        """GetInitialFont() -> wxFont"""
+        """GetInitialFont() -> Font"""

         return _windows.FontData_GetInitialFont(*args, **kwargs)
 
     def GetShowHelp(*args, **kwargs):
         return _windows.FontData_GetInitialFont(*args, **kwargs)
 
     def GetShowHelp(*args, **kwargs):


@@ -1999,15 +1999,15 @@ class FontData(core.Object):
         return _windows.FontData_SetAllowSymbols(*args, **kwargs)
 
     def SetChosenFont(*args, **kwargs):
         return _windows.FontData_SetAllowSymbols(*args, **kwargs)
 
     def SetChosenFont(*args, **kwargs):

-        """SetChosenFont(wxFont font)"""
+        """SetChosenFont(Font font)"""

         return _windows.FontData_SetChosenFont(*args, **kwargs)
 
     def SetColour(*args, **kwargs):
         return _windows.FontData_SetChosenFont(*args, **kwargs)
 
     def SetColour(*args, **kwargs):

-        """SetColour(wxColour colour)"""
+        """SetColour(Colour colour)"""

         return _windows.FontData_SetColour(*args, **kwargs)
 
     def SetInitialFont(*args, **kwargs):
         return _windows.FontData_SetColour(*args, **kwargs)
 
     def SetInitialFont(*args, **kwargs):

-        """SetInitialFont(wxFont font)"""
+        """SetInitialFont(Font font)"""

         return _windows.FontData_SetInitialFont(*args, **kwargs)
 
     def SetRange(*args, **kwargs):
         return _windows.FontData_SetInitialFont(*args, **kwargs)
 
     def SetRange(*args, **kwargs):


@@ -2058,7 +2058,7 @@ class MessageDialog(Dialog):
         return "<%s.%s; proxy of C++ wxMessageDialog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """
         return "<%s.%s; proxy of C++ wxMessageDialog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """

-        __init__(Window parent, wxString message, wxString caption=wxPyMessageBoxCaptionStr, 
+        __init__(Window parent, String message, String caption=wxPyMessageBoxCaptionStr, 

             long style=wxOK|wxCANCEL|wxCENTRE, 
             Point pos=DefaultPosition) -> MessageDialog
         """
             long style=wxOK|wxCANCEL|wxCENTRE, 
             Point pos=DefaultPosition) -> MessageDialog
         """


@@ -2085,8 +2085,8 @@ class ProgressDialog(Frame):
         return "<%s.%s; proxy of C++ wxProgressDialog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """
         return "<%s.%s; proxy of C++ wxProgressDialog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """

-        __init__(wxString title, wxString message, int maximum=100, 
-            Window parent=None, int style=wxPD_AUTO_HIDE|wxPD_APP_MODAL) -> ProgressDialog
+        __init__(String title, String message, int maximum=100, Window parent=None, 
+            int style=wxPD_AUTO_HIDE|wxPD_APP_MODAL) -> ProgressDialog

         """
         newobj = _windows.new_ProgressDialog(*args, **kwargs)
         self.this = newobj.this
         """
         newobj = _windows.new_ProgressDialog(*args, **kwargs)
         self.this = newobj.this


@@ -2095,7 +2095,7 @@ class ProgressDialog(Frame):
         self._setOORInfo(self)
 
     def Update(*args, **kwargs):
         self._setOORInfo(self)
 
     def Update(*args, **kwargs):

-        """Update(int value, wxString newmsg=wxPyEmptyString) -> bool"""
+        """Update(int value, String newmsg=EmptyString) -> bool"""

         return _windows.ProgressDialog_Update(*args, **kwargs)
 
     def Resume(*args, **kwargs):
         return _windows.ProgressDialog_Update(*args, **kwargs)
 
     def Resume(*args, **kwargs):


@@ -2149,11 +2149,11 @@ class FindDialogEvent(core.CommandEvent):
         return _windows.FindDialogEvent_GetFlags(*args, **kwargs)
 
     def GetFindString(*args, **kwargs):
         return _windows.FindDialogEvent_GetFlags(*args, **kwargs)
 
     def GetFindString(*args, **kwargs):

-        """GetFindString() -> wxString"""
+        """GetFindString() -> String"""

         return _windows.FindDialogEvent_GetFindString(*args, **kwargs)
 
     def GetReplaceString(*args, **kwargs):
         return _windows.FindDialogEvent_GetFindString(*args, **kwargs)
 
     def GetReplaceString(*args, **kwargs):

-        """GetReplaceString() -> wxString"""
+        """GetReplaceString() -> String"""

         return _windows.FindDialogEvent_GetReplaceString(*args, **kwargs)
 
     def GetDialog(*args, **kwargs):
         return _windows.FindDialogEvent_GetReplaceString(*args, **kwargs)
 
     def GetDialog(*args, **kwargs):


@@ -2165,11 +2165,11 @@ class FindDialogEvent(core.CommandEvent):
         return _windows.FindDialogEvent_SetFlags(*args, **kwargs)
 
     def SetFindString(*args, **kwargs):
         return _windows.FindDialogEvent_SetFlags(*args, **kwargs)
 
     def SetFindString(*args, **kwargs):

-        """SetFindString(wxString str)"""
+        """SetFindString(String str)"""

         return _windows.FindDialogEvent_SetFindString(*args, **kwargs)
 
     def SetReplaceString(*args, **kwargs):
         return _windows.FindDialogEvent_SetFindString(*args, **kwargs)
 
     def SetReplaceString(*args, **kwargs):

-        """SetReplaceString(wxString str)"""
+        """SetReplaceString(String str)"""

         return _windows.FindDialogEvent_SetReplaceString(*args, **kwargs)
 
 
         return _windows.FindDialogEvent_SetReplaceString(*args, **kwargs)
 
 


@@ -2196,11 +2196,11 @@ class FindReplaceData(core.Object):
         except: pass
 
     def GetFindString(*args, **kwargs):
         except: pass
 
     def GetFindString(*args, **kwargs):

-        """GetFindString() -> wxString"""
+        """GetFindString() -> String"""

         return _windows.FindReplaceData_GetFindString(*args, **kwargs)
 
     def GetReplaceString(*args, **kwargs):
         return _windows.FindReplaceData_GetFindString(*args, **kwargs)
 
     def GetReplaceString(*args, **kwargs):

-        """GetReplaceString() -> wxString"""
+        """GetReplaceString() -> String"""

         return _windows.FindReplaceData_GetReplaceString(*args, **kwargs)
 
     def GetFlags(*args, **kwargs):
         return _windows.FindReplaceData_GetReplaceString(*args, **kwargs)
 
     def GetFlags(*args, **kwargs):


@@ -2212,11 +2212,11 @@ class FindReplaceData(core.Object):
         return _windows.FindReplaceData_SetFlags(*args, **kwargs)
 
     def SetFindString(*args, **kwargs):
         return _windows.FindReplaceData_SetFlags(*args, **kwargs)
 
     def SetFindString(*args, **kwargs):

-        """SetFindString(wxString str)"""
+        """SetFindString(String str)"""

         return _windows.FindReplaceData_SetFindString(*args, **kwargs)
 
     def SetReplaceString(*args, **kwargs):
         return _windows.FindReplaceData_SetFindString(*args, **kwargs)
 
     def SetReplaceString(*args, **kwargs):

-        """SetReplaceString(wxString str)"""
+        """SetReplaceString(String str)"""

         return _windows.FindReplaceData_SetReplaceString(*args, **kwargs)
 
 
         return _windows.FindReplaceData_SetReplaceString(*args, **kwargs)
 
 


@@ -2232,7 +2232,7 @@ class FindReplaceDialog(Dialog):
         return "<%s.%s; proxy of C++ wxFindReplaceDialog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """
         return "<%s.%s; proxy of C++ wxFindReplaceDialog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """

-        __init__(Window parent, FindReplaceData data, wxString title, 
+        __init__(Window parent, FindReplaceData data, String title, 

             int style=0) -> FindReplaceDialog
         """
         newobj = _windows.new_FindReplaceDialog(*args, **kwargs)
             int style=0) -> FindReplaceDialog
         """
         newobj = _windows.new_FindReplaceDialog(*args, **kwargs)


@@ -2243,7 +2243,7 @@ class FindReplaceDialog(Dialog):
 
     def Create(*args, **kwargs):
         """
 
     def Create(*args, **kwargs):
         """

-        Create(Window parent, FindReplaceData data, wxString title, 
+        Create(Window parent, FindReplaceData data, String title, 

             int style=0) -> bool
         """
         return _windows.FindReplaceDialog_Create(*args, **kwargs)
             int style=0) -> bool
         """
         return _windows.FindReplaceDialog_Create(*args, **kwargs)


@@ -2285,9 +2285,9 @@ class MDIParentFrame(Frame):
         return "<%s.%s; proxy of C++ wxMDIParentFrame instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """
         return "<%s.%s; proxy of C++ wxMDIParentFrame instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """

-        __init__(Window parent, int id, wxString title, Point pos=DefaultPosition, 
+        __init__(Window parent, int id, String title, Point pos=DefaultPosition, 

             Size size=DefaultSize, long style=wxDEFAULT_FRAME_STYLE|wxVSCROLL|wxHSCROLL, 
             Size size=DefaultSize, long style=wxDEFAULT_FRAME_STYLE|wxVSCROLL|wxHSCROLL, 

-            wxString name=wxPyFrameNameStr) -> MDIParentFrame
+            String name=wxPyFrameNameStr) -> MDIParentFrame

         """
         newobj = _windows.new_MDIParentFrame(*args, **kwargs)
         self.this = newobj.this
         """
         newobj = _windows.new_MDIParentFrame(*args, **kwargs)
         self.this = newobj.this


@@ -2297,9 +2297,9 @@ class MDIParentFrame(Frame):
 
     def Create(*args, **kwargs):
         """
 
     def Create(*args, **kwargs):
         """

-        Create(Window parent, int id, wxString title, Point pos=DefaultPosition, 
+        Create(Window parent, int id, String title, Point pos=DefaultPosition, 

             Size size=DefaultSize, long style=wxDEFAULT_FRAME_STYLE|wxVSCROLL|wxHSCROLL, 
             Size size=DefaultSize, long style=wxDEFAULT_FRAME_STYLE|wxVSCROLL|wxHSCROLL, 

-            wxString name=wxPyFrameNameStr) -> bool
+            String name=wxPyFrameNameStr) -> bool

         """
         return _windows.MDIParentFrame_Create(*args, **kwargs)
 
         """
         return _windows.MDIParentFrame_Create(*args, **kwargs)
 


@@ -2354,9 +2354,9 @@ class MDIChildFrame(Frame):
         return "<%s.%s; proxy of C++ wxMDIChildFrame instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """
         return "<%s.%s; proxy of C++ wxMDIChildFrame instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """

-        __init__(MDIParentFrame parent, int id, wxString title, Point pos=DefaultPosition, 
-            Size size=DefaultSize, 
-            long style=DEFAULT_FRAME_STYLE, wxString name=wxPyFrameNameStr) -> MDIChildFrame
+        __init__(MDIParentFrame parent, int id, String title, Point pos=DefaultPosition, 
+            Size size=DefaultSize, long style=DEFAULT_FRAME_STYLE, 
+            String name=wxPyFrameNameStr) -> MDIChildFrame

         """
         newobj = _windows.new_MDIChildFrame(*args, **kwargs)
         self.this = newobj.this
         """
         newobj = _windows.new_MDIChildFrame(*args, **kwargs)
         self.this = newobj.this


@@ -2366,9 +2366,9 @@ class MDIChildFrame(Frame):
 
     def Create(*args, **kwargs):
         """
 
     def Create(*args, **kwargs):
         """

-        Create(MDIParentFrame parent, int id, wxString title, Point pos=DefaultPosition, 
-            Size size=DefaultSize, 
-            long style=DEFAULT_FRAME_STYLE, wxString name=wxPyFrameNameStr) -> bool
+        Create(MDIParentFrame parent, int id, String title, Point pos=DefaultPosition, 
+            Size size=DefaultSize, long style=DEFAULT_FRAME_STYLE, 
+            String name=wxPyFrameNameStr) -> bool

         """
         return _windows.MDIChildFrame_Create(*args, **kwargs)
 
         """
         return _windows.MDIChildFrame_Create(*args, **kwargs)
 


@@ -2435,7 +2435,7 @@ class PyWindow(core.Window):
     def __init__(self, *args, **kwargs):
         """
         __init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
     def __init__(self, *args, **kwargs):
         """
         __init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 

-            long style=0, wxString name=PanelNameStr) -> PyWindow
+            long style=0, String name=PanelNameStr) -> PyWindow

         """
         newobj = _windows.new_PyWindow(*args, **kwargs)
         self.this = newobj.this
         """
         newobj = _windows.new_PyWindow(*args, **kwargs)
         self.this = newobj.this


@@ -2533,7 +2533,7 @@ class PyPanel(Panel):
     def __init__(self, *args, **kwargs):
         """
         __init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
     def __init__(self, *args, **kwargs):
         """
         __init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 

-            long style=0, wxString name=PanelNameStr) -> PyPanel
+            long style=0, String name=PanelNameStr) -> PyPanel

         """
         newobj = _windows.new_PyPanel(*args, **kwargs)
         self.this = newobj.this
         """
         newobj = _windows.new_PyPanel(*args, **kwargs)
         self.this = newobj.this


@@ -2663,7 +2663,7 @@ class PrintData(core.Object):
         return _windows.PrintData_Ok(*args, **kwargs)
 
     def GetPrinterName(*args, **kwargs):
         return _windows.PrintData_Ok(*args, **kwargs)
 
     def GetPrinterName(*args, **kwargs):

-        """GetPrinterName() -> wxString"""
+        """GetPrinterName() -> String"""

         return _windows.PrintData_GetPrinterName(*args, **kwargs)
 
     def GetColour(*args, **kwargs):
         return _windows.PrintData_GetPrinterName(*args, **kwargs)
 
     def GetColour(*args, **kwargs):


@@ -2671,11 +2671,11 @@ class PrintData(core.Object):
         return _windows.PrintData_GetColour(*args, **kwargs)
 
     def GetDuplex(*args, **kwargs):
         return _windows.PrintData_GetColour(*args, **kwargs)
 
     def GetDuplex(*args, **kwargs):

-        """GetDuplex() -> wxDuplexMode"""
+        """GetDuplex() -> int"""

         return _windows.PrintData_GetDuplex(*args, **kwargs)
 
     def GetPaperId(*args, **kwargs):
         return _windows.PrintData_GetDuplex(*args, **kwargs)
 
     def GetPaperId(*args, **kwargs):

-        """GetPaperId() -> wxPaperSize"""
+        """GetPaperId() -> int"""

         return _windows.PrintData_GetPaperId(*args, **kwargs)
 
     def GetPaperSize(*args, **kwargs):
         return _windows.PrintData_GetPaperId(*args, **kwargs)
 
     def GetPaperSize(*args, **kwargs):


@@ -2699,7 +2699,7 @@ class PrintData(core.Object):
         return _windows.PrintData_SetOrientation(*args, **kwargs)
 
     def SetPrinterName(*args, **kwargs):
         return _windows.PrintData_SetOrientation(*args, **kwargs)
 
     def SetPrinterName(*args, **kwargs):

-        """SetPrinterName(wxString name)"""
+        """SetPrinterName(String name)"""

         return _windows.PrintData_SetPrinterName(*args, **kwargs)
 
     def SetColour(*args, **kwargs):
         return _windows.PrintData_SetPrinterName(*args, **kwargs)
 
     def SetColour(*args, **kwargs):


@@ -2707,11 +2707,11 @@ class PrintData(core.Object):
         return _windows.PrintData_SetColour(*args, **kwargs)
 
     def SetDuplex(*args, **kwargs):
         return _windows.PrintData_SetColour(*args, **kwargs)
 
     def SetDuplex(*args, **kwargs):

-        """SetDuplex(wxDuplexMode duplex)"""
+        """SetDuplex(int duplex)"""

         return _windows.PrintData_SetDuplex(*args, **kwargs)
 
     def SetPaperId(*args, **kwargs):
         return _windows.PrintData_SetDuplex(*args, **kwargs)
 
     def SetPaperId(*args, **kwargs):

-        """SetPaperId(wxPaperSize sizeId)"""
+        """SetPaperId(int sizeId)"""

         return _windows.PrintData_SetPaperId(*args, **kwargs)
 
     def SetPaperSize(*args, **kwargs):
         return _windows.PrintData_SetPaperId(*args, **kwargs)
 
     def SetPaperSize(*args, **kwargs):


@@ -2723,23 +2723,23 @@ class PrintData(core.Object):
         return _windows.PrintData_SetQuality(*args, **kwargs)
 
     def GetPrinterCommand(*args, **kwargs):
         return _windows.PrintData_SetQuality(*args, **kwargs)
 
     def GetPrinterCommand(*args, **kwargs):

-        """GetPrinterCommand() -> wxString"""
+        """GetPrinterCommand() -> String"""

         return _windows.PrintData_GetPrinterCommand(*args, **kwargs)
 
     def GetPrinterOptions(*args, **kwargs):
         return _windows.PrintData_GetPrinterCommand(*args, **kwargs)
 
     def GetPrinterOptions(*args, **kwargs):

-        """GetPrinterOptions() -> wxString"""
+        """GetPrinterOptions() -> String"""

         return _windows.PrintData_GetPrinterOptions(*args, **kwargs)
 
     def GetPreviewCommand(*args, **kwargs):
         return _windows.PrintData_GetPrinterOptions(*args, **kwargs)
 
     def GetPreviewCommand(*args, **kwargs):

-        """GetPreviewCommand() -> wxString"""
+        """GetPreviewCommand() -> String"""

         return _windows.PrintData_GetPreviewCommand(*args, **kwargs)
 
     def GetFilename(*args, **kwargs):
         return _windows.PrintData_GetPreviewCommand(*args, **kwargs)
 
     def GetFilename(*args, **kwargs):

-        """GetFilename() -> wxString"""
+        """GetFilename() -> String"""

         return _windows.PrintData_GetFilename(*args, **kwargs)
 
     def GetFontMetricPath(*args, **kwargs):
         return _windows.PrintData_GetFilename(*args, **kwargs)
 
     def GetFontMetricPath(*args, **kwargs):

-        """GetFontMetricPath() -> wxString"""
+        """GetFontMetricPath() -> String"""

         return _windows.PrintData_GetFontMetricPath(*args, **kwargs)
 
     def GetPrinterScaleX(*args, **kwargs):
         return _windows.PrintData_GetFontMetricPath(*args, **kwargs)
 
     def GetPrinterScaleX(*args, **kwargs):


@@ -2759,27 +2759,27 @@ class PrintData(core.Object):
         return _windows.PrintData_GetPrinterTranslateY(*args, **kwargs)
 
     def GetPrintMode(*args, **kwargs):
         return _windows.PrintData_GetPrinterTranslateY(*args, **kwargs)
 
     def GetPrintMode(*args, **kwargs):

-        """GetPrintMode() -> wxPrintMode"""
+        """GetPrintMode() -> int"""

         return _windows.PrintData_GetPrintMode(*args, **kwargs)
 
     def SetPrinterCommand(*args, **kwargs):
         return _windows.PrintData_GetPrintMode(*args, **kwargs)
 
     def SetPrinterCommand(*args, **kwargs):

-        """SetPrinterCommand(wxString command)"""
+        """SetPrinterCommand(String command)"""

         return _windows.PrintData_SetPrinterCommand(*args, **kwargs)
 
     def SetPrinterOptions(*args, **kwargs):
         return _windows.PrintData_SetPrinterCommand(*args, **kwargs)
 
     def SetPrinterOptions(*args, **kwargs):

-        """SetPrinterOptions(wxString options)"""
+        """SetPrinterOptions(String options)"""

         return _windows.PrintData_SetPrinterOptions(*args, **kwargs)
 
     def SetPreviewCommand(*args, **kwargs):
         return _windows.PrintData_SetPrinterOptions(*args, **kwargs)
 
     def SetPreviewCommand(*args, **kwargs):

-        """SetPreviewCommand(wxString command)"""
+        """SetPreviewCommand(String command)"""

         return _windows.PrintData_SetPreviewCommand(*args, **kwargs)
 
     def SetFilename(*args, **kwargs):
         return _windows.PrintData_SetPreviewCommand(*args, **kwargs)
 
     def SetFilename(*args, **kwargs):

-        """SetFilename(wxString filename)"""
+        """SetFilename(String filename)"""

         return _windows.PrintData_SetFilename(*args, **kwargs)
 
     def SetFontMetricPath(*args, **kwargs):
         return _windows.PrintData_SetFilename(*args, **kwargs)
 
     def SetFontMetricPath(*args, **kwargs):

-        """SetFontMetricPath(wxString path)"""
+        """SetFontMetricPath(String path)"""

         return _windows.PrintData_SetFontMetricPath(*args, **kwargs)
 
     def SetPrinterScaleX(*args, **kwargs):
         return _windows.PrintData_SetFontMetricPath(*args, **kwargs)
 
     def SetPrinterScaleX(*args, **kwargs):


@@ -2807,7 +2807,7 @@ class PrintData(core.Object):
         return _windows.PrintData_SetPrinterTranslation(*args, **kwargs)
 
     def SetPrintMode(*args, **kwargs):
         return _windows.PrintData_SetPrinterTranslation(*args, **kwargs)
 
     def SetPrintMode(*args, **kwargs):

-        """SetPrintMode(wxPrintMode printMode)"""
+        """SetPrintMode(int printMode)"""

         return _windows.PrintData_SetPrintMode(*args, **kwargs)
 
     def __nonzero__(self): return self.Ok() 
         return _windows.PrintData_SetPrintMode(*args, **kwargs)
 
     def __nonzero__(self): return self.Ok() 


@@ -2899,7 +2899,7 @@ class PageSetupDialogData(core.Object):
         return _windows.PageSetupDialogData_GetMinMarginBottomRight(*args, **kwargs)
 
     def GetPaperId(*args, **kwargs):
         return _windows.PageSetupDialogData_GetMinMarginBottomRight(*args, **kwargs)
 
     def GetPaperId(*args, **kwargs):

-        """GetPaperId() -> wxPaperSize"""
+        """GetPaperId() -> int"""

         return _windows.PageSetupDialogData_GetPaperId(*args, **kwargs)
 
     def GetPaperSize(*args, **kwargs):
         return _windows.PageSetupDialogData_GetPaperId(*args, **kwargs)
 
     def GetPaperSize(*args, **kwargs):


@@ -2939,7 +2939,7 @@ class PageSetupDialogData(core.Object):
         return _windows.PageSetupDialogData_SetMinMarginBottomRight(*args, **kwargs)
 
     def SetPaperId(*args, **kwargs):
         return _windows.PageSetupDialogData_SetMinMarginBottomRight(*args, **kwargs)
 
     def SetPaperId(*args, **kwargs):

-        """SetPaperId(wxPaperSize id)"""
+        """SetPaperId(int id)"""

         return _windows.PageSetupDialogData_SetPaperId(*args, **kwargs)
 
     def SetPaperSize(*args, **kwargs):
         return _windows.PageSetupDialogData_SetPaperId(*args, **kwargs)
 
     def SetPaperSize(*args, **kwargs):


@@ -3150,7 +3150,7 @@ class PrintDialog(Dialog):
         return _windows.PrintDialog_GetPrintDialogData(*args, **kwargs)
 
     def GetPrintDC(*args, **kwargs):
         return _windows.PrintDialog_GetPrintDialogData(*args, **kwargs)
 
     def GetPrintDC(*args, **kwargs):

-        """GetPrintDC() -> wxDC"""
+        """GetPrintDC() -> DC"""

         return _windows.PrintDialog_GetPrintDC(*args, **kwargs)
 
     def ShowModal(*args, **kwargs):
         return _windows.PrintDialog_GetPrintDC(*args, **kwargs)
 
     def ShowModal(*args, **kwargs):


@@ -3196,11 +3196,11 @@ class Printer(core.Object):
         return _windows.Printer_Print(*args, **kwargs)
 
     def PrintDialog(*args, **kwargs):
         return _windows.Printer_Print(*args, **kwargs)
 
     def PrintDialog(*args, **kwargs):

-        """PrintDialog(Window parent) -> wxDC"""
+        """PrintDialog(Window parent) -> DC"""

         return _windows.Printer_PrintDialog(*args, **kwargs)
 
     def ReportError(*args, **kwargs):
         return _windows.Printer_PrintDialog(*args, **kwargs)
 
     def ReportError(*args, **kwargs):

-        """ReportError(Window parent, Printout printout, wxString message)"""
+        """ReportError(Window parent, Printout printout, String message)"""

         return _windows.Printer_ReportError(*args, **kwargs)
 
     def Setup(*args, **kwargs):
         return _windows.Printer_ReportError(*args, **kwargs)
 
     def Setup(*args, **kwargs):


@@ -3212,7 +3212,7 @@ class Printer(core.Object):
         return _windows.Printer_GetAbort(*args, **kwargs)
 
     def GetLastError(*args, **kwargs):
         return _windows.Printer_GetAbort(*args, **kwargs)
 
     def GetLastError(*args, **kwargs):

-        """Printer.GetLastError() -> wxPrinterError"""
+        """Printer.GetLastError() -> int"""

         return _windows.Printer_GetLastError(*args, **kwargs)
 
     GetLastError = staticmethod(GetLastError)
         return _windows.Printer_GetLastError(*args, **kwargs)
 
     GetLastError = staticmethod(GetLastError)


@@ -3225,14 +3225,14 @@ class PrinterPtr(Printer):
 _windows.Printer_swigregister(PrinterPtr)
 
 def Printer_GetLastError(*args, **kwargs):
 _windows.Printer_swigregister(PrinterPtr)
 
 def Printer_GetLastError(*args, **kwargs):

-    """Printer_GetLastError() -> wxPrinterError"""
+    """Printer_GetLastError() -> int"""

     return _windows.Printer_GetLastError(*args, **kwargs)
 
 class Printout(core.Object):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxPyPrintout instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
     return _windows.Printer_GetLastError(*args, **kwargs)
 
 class Printout(core.Object):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxPyPrintout instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):

-        """__init__(wxString title=wxPyPrintoutTitleStr) -> Printout"""
+        """__init__(String title=wxPyPrintoutTitleStr) -> Printout"""

         newobj = _windows.new_Printout(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         newobj = _windows.new_Printout(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1


@@ -3244,15 +3244,15 @@ class Printout(core.Object):
         return _windows.Printout__setCallbackInfo(*args, **kwargs)
 
     def GetTitle(*args, **kwargs):
         return _windows.Printout__setCallbackInfo(*args, **kwargs)
 
     def GetTitle(*args, **kwargs):

-        """GetTitle() -> wxString"""
+        """GetTitle() -> String"""

         return _windows.Printout_GetTitle(*args, **kwargs)
 
     def GetDC(*args, **kwargs):
         return _windows.Printout_GetTitle(*args, **kwargs)
 
     def GetDC(*args, **kwargs):

-        """GetDC() -> wxDC"""
+        """GetDC() -> DC"""

         return _windows.Printout_GetDC(*args, **kwargs)
 
     def SetDC(*args, **kwargs):
         return _windows.Printout_GetDC(*args, **kwargs)
 
     def SetDC(*args, **kwargs):

-        """SetDC(wxDC dc)"""
+        """SetDC(DC dc)"""

         return _windows.Printout_SetDC(*args, **kwargs)
 
     def SetPageSizePixels(*args, **kwargs):
         return _windows.Printout_SetDC(*args, **kwargs)
 
     def SetPageSizePixels(*args, **kwargs):


@@ -3338,7 +3338,7 @@ class PreviewCanvas(ScrolledWindow):
         """
         __init__(PrintPreview preview, Window parent, Point pos=DefaultPosition, 
             Size size=DefaultSize, long style=0, 
         """
         __init__(PrintPreview preview, Window parent, Point pos=DefaultPosition, 
             Size size=DefaultSize, long style=0, 

-            wxString name=wxPyPreviewCanvasNameStr) -> PreviewCanvas
+            String name=wxPyPreviewCanvasNameStr) -> PreviewCanvas

         """
         newobj = _windows.new_PreviewCanvas(*args, **kwargs)
         self.this = newobj.this
         """
         newobj = _windows.new_PreviewCanvas(*args, **kwargs)
         self.this = newobj.this


@@ -3359,9 +3359,9 @@ class PreviewFrame(Frame):
         return "<%s.%s; proxy of C++ wxPreviewFrame instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """
         return "<%s.%s; proxy of C++ wxPreviewFrame instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """

-        __init__(PrintPreview preview, Frame parent, wxString title, 
-            Point pos=DefaultPosition, Size size=DefaultSize, 
-            long style=DEFAULT_FRAME_STYLE, wxString name=wxPyFrameNameStr) -> PreviewFrame
+        __init__(PrintPreview preview, Frame parent, String title, Point pos=DefaultPosition, 
+            Size size=DefaultSize, 
+            long style=DEFAULT_FRAME_STYLE, String name=wxPyFrameNameStr) -> PreviewFrame

         """
         newobj = _windows.new_PreviewFrame(*args, **kwargs)
         self.this = newobj.this
         """
         newobj = _windows.new_PreviewFrame(*args, **kwargs)
         self.this = newobj.this


@@ -3416,7 +3416,7 @@ class PreviewControlBar(Panel):
         """
         __init__(PrintPreview preview, long buttons, Window parent, 
             Point pos=DefaultPosition, Size size=DefaultSize, 
         """
         __init__(PrintPreview preview, long buttons, Window parent, 
             Point pos=DefaultPosition, Size size=DefaultSize, 

-            long style=TAB_TRAVERSAL, wxString name=PanelNameStr) -> PreviewControlBar
+            long style=TAB_TRAVERSAL, String name=PanelNameStr) -> PreviewControlBar

         """
         newobj = _windows.new_PreviewControlBar(*args, **kwargs)
         self.this = newobj.this
         """
         newobj = _windows.new_PreviewControlBar(*args, **kwargs)
         self.this = newobj.this


@@ -3510,11 +3510,11 @@ class PrintPreview(core.Object):
         return _windows.PrintPreview_GetCanvas(*args, **kwargs)
 
     def PaintPage(*args, **kwargs):
         return _windows.PrintPreview_GetCanvas(*args, **kwargs)
 
     def PaintPage(*args, **kwargs):

-        """PaintPage(PreviewCanvas canvas, wxDC dc) -> bool"""
+        """PaintPage(PreviewCanvas canvas, DC dc) -> bool"""

         return _windows.PrintPreview_PaintPage(*args, **kwargs)
 
     def DrawBlankPage(*args, **kwargs):
         return _windows.PrintPreview_PaintPage(*args, **kwargs)
 
     def DrawBlankPage(*args, **kwargs):

-        """DrawBlankPage(PreviewCanvas canvas, wxDC dc) -> bool"""
+        """DrawBlankPage(PreviewCanvas canvas, DC dc) -> bool"""

         return _windows.PrintPreview_DrawBlankPage(*args, **kwargs)
 
     def RenderPage(*args, **kwargs):
         return _windows.PrintPreview_DrawBlankPage(*args, **kwargs)
 
     def RenderPage(*args, **kwargs):


@@ -3590,11 +3590,11 @@ class PyPrintPreview(PrintPreview):
         return _windows.PyPrintPreview_base_SetCurrentPage(*args, **kwargs)
 
     def base_PaintPage(*args, **kwargs):
         return _windows.PyPrintPreview_base_SetCurrentPage(*args, **kwargs)
 
     def base_PaintPage(*args, **kwargs):

-        """base_PaintPage(PreviewCanvas canvas, wxDC dc) -> bool"""
+        """base_PaintPage(PreviewCanvas canvas, DC dc) -> bool"""

         return _windows.PyPrintPreview_base_PaintPage(*args, **kwargs)
 
     def base_DrawBlankPage(*args, **kwargs):
         return _windows.PyPrintPreview_base_PaintPage(*args, **kwargs)
 
     def base_DrawBlankPage(*args, **kwargs):

-        """base_DrawBlankPage(PreviewCanvas canvas, wxDC dc) -> bool"""
+        """base_DrawBlankPage(PreviewCanvas canvas, DC dc) -> bool"""

         return _windows.PyPrintPreview_base_DrawBlankPage(*args, **kwargs)
 
     def base_RenderPage(*args, **kwargs):
         return _windows.PyPrintPreview_base_DrawBlankPage(*args, **kwargs)
 
     def base_RenderPage(*args, **kwargs):


@@ -3626,9 +3626,9 @@ class PyPreviewFrame(PreviewFrame):
         return "<%s.%s; proxy of C++ wxPyPreviewFrame instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """
         return "<%s.%s; proxy of C++ wxPyPreviewFrame instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """

-        __init__(PrintPreview preview, Frame parent, wxString title, 
-            Point pos=DefaultPosition, Size size=DefaultSize, 
-            long style=DEFAULT_FRAME_STYLE, wxString name=wxPyFrameNameStr) -> PyPreviewFrame
+        __init__(PrintPreview preview, Frame parent, String title, Point pos=DefaultPosition, 
+            Size size=DefaultSize, 
+            long style=DEFAULT_FRAME_STYLE, String name=wxPyFrameNameStr) -> PyPreviewFrame

         """
         newobj = _windows.new_PyPreviewFrame(*args, **kwargs)
         self.this = newobj.this
         """
         newobj = _windows.new_PyPreviewFrame(*args, **kwargs)
         self.this = newobj.this


@@ -3675,7 +3675,7 @@ class PyPreviewControlBar(PreviewControlBar):
         """
         __init__(PrintPreview preview, long buttons, Window parent, 
             Point pos=DefaultPosition, Size size=DefaultSize, 
         """
         __init__(PrintPreview preview, long buttons, Window parent, 
             Point pos=DefaultPosition, Size size=DefaultSize, 

-            long style=0, wxString name=PanelNameStr) -> PyPreviewControlBar
+            long style=0, String name=PanelNameStr) -> PyPreviewControlBar

         """
         newobj = _windows.new_PyPreviewControlBar(*args, **kwargs)
         self.this = newobj.this
         """
         newobj = _windows.new_PyPreviewControlBar(*args, **kwargs)
         self.this = newobj.this

diff --git a/wxPython/src/gtk/wizard.py b/wxPython/src/gtk/wizard.py
index 65c71be1b34ab4acbeca89407a9f56be992feac9..04629bb764f5f6c7ccd0d5a66cacc167b80a26f1 100644 (file)
--- a/wxPython/src/gtk/wizard.py
+++ b/wxPython/src/gtk/wizard.py
@@ -51,7 +51,7 @@ class WizardPage(windows.Panel):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxWizardPage instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def Create(*args, **kwargs):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxWizardPage instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def Create(*args, **kwargs):

-        """Create(Wizard parent, wxBitmap bitmap=wxNullBitmap, wxString resource=wxPyEmptyString) -> bool"""
+        """Create(Wizard parent, Bitmap bitmap=wxNullBitmap, String resource=EmptyString) -> bool"""

         return _wizard.WizardPage_Create(*args, **kwargs)
 
     def GetPrev(*args, **kwargs):
         return _wizard.WizardPage_Create(*args, **kwargs)
 
     def GetPrev(*args, **kwargs):


@@ -63,7 +63,7 @@ class WizardPage(windows.Panel):
         return _wizard.WizardPage_GetNext(*args, **kwargs)
 
     def GetBitmap(*args, **kwargs):
         return _wizard.WizardPage_GetNext(*args, **kwargs)
 
     def GetBitmap(*args, **kwargs):

-        """GetBitmap() -> wxBitmap"""
+        """GetBitmap() -> Bitmap"""

         return _wizard.WizardPage_GetBitmap(*args, **kwargs)
 
 
         return _wizard.WizardPage_GetBitmap(*args, **kwargs)
 
 


@@ -78,7 +78,7 @@ class PyWizardPage(WizardPage):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxPyWizardPage instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxPyWizardPage instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):

-        """__init__(Wizard parent, wxBitmap bitmap=&wxNullBitmap, wxString resource=&wxPyEmptyString) -> PyWizardPage"""
+        """__init__(Wizard parent, Bitmap bitmap=&wxNullBitmap, String resource=&wxPyEmptyString) -> PyWizardPage"""

         newobj = _wizard.new_PyWizardPage(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         newobj = _wizard.new_PyWizardPage(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1


@@ -86,7 +86,7 @@ class PyWizardPage(WizardPage):
         self._setCallbackInfo(self, PyWizardPage);self._setOORInfo(self)
 
     def Create(*args, **kwargs):
         self._setCallbackInfo(self, PyWizardPage);self._setOORInfo(self)
 
     def Create(*args, **kwargs):

-        """Create(Wizard parent, wxBitmap bitmap=wxNullBitmap, wxString resource=wxPyEmptyString) -> bool"""
+        """Create(Wizard parent, Bitmap bitmap=wxNullBitmap, String resource=EmptyString) -> bool"""

         return _wizard.PyWizardPage_Create(*args, **kwargs)
 
     def _setCallbackInfo(*args, **kwargs):
         return _wizard.PyWizardPage_Create(*args, **kwargs)
 
     def _setCallbackInfo(*args, **kwargs):


@@ -185,7 +185,7 @@ class WizardPageSimple(WizardPage):
     def __init__(self, *args, **kwargs):
         """
         __init__(Wizard parent, WizardPage prev=None, WizardPage next=None, 
     def __init__(self, *args, **kwargs):
         """
         __init__(Wizard parent, WizardPage prev=None, WizardPage next=None, 

-            wxBitmap bitmap=wxNullBitmap, wxChar resource=None) -> WizardPageSimple
+            Bitmap bitmap=wxNullBitmap, wxChar resource=None) -> WizardPageSimple

         """
         newobj = _wizard.new_WizardPageSimple(*args, **kwargs)
         self.this = newobj.this
         """
         newobj = _wizard.new_WizardPageSimple(*args, **kwargs)
         self.this = newobj.this


@@ -196,7 +196,7 @@ class WizardPageSimple(WizardPage):
     def Create(*args, **kwargs):
         """
         Create(Wizard parent=None, WizardPage prev=None, WizardPage next=None, 
     def Create(*args, **kwargs):
         """
         Create(Wizard parent=None, WizardPage prev=None, WizardPage next=None, 

-            wxBitmap bitmap=wxNullBitmap, wxChar resource=None) -> bool
+            Bitmap bitmap=wxNullBitmap, wxChar resource=None) -> bool

         """
         return _wizard.WizardPageSimple_Create(*args, **kwargs)
 
         """
         return _wizard.WizardPageSimple_Create(*args, **kwargs)
 


@@ -236,8 +236,8 @@ class Wizard(windows.Dialog):
         return "<%s.%s; proxy of C++ wxWizard instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """
         return "<%s.%s; proxy of C++ wxWizard instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """

-        __init__(Window parent, int id=-1, wxString title=wxEmptyString, 
-            wxBitmap bitmap=wxNullBitmap, Point pos=DefaultPosition, 
+        __init__(Window parent, int id=-1, String title=wxEmptyString, 
+            Bitmap bitmap=wxNullBitmap, Point pos=DefaultPosition, 

             long style=DEFAULT_DIALOG_STYLE) -> Wizard
         """
         newobj = _wizard.new_Wizard(*args, **kwargs)
             long style=DEFAULT_DIALOG_STYLE) -> Wizard
         """
         newobj = _wizard.new_Wizard(*args, **kwargs)


@@ -248,8 +248,8 @@ class Wizard(windows.Dialog):
 
     def Create(*args, **kwargs):
         """
 
     def Create(*args, **kwargs):
         """

-        Create(Window parent, int id=-1, wxString title=wxEmptyString, 
-            wxBitmap bitmap=wxNullBitmap, Point pos=DefaultPosition) -> bool
+        Create(Window parent, int id=-1, String title=wxEmptyString, 
+            Bitmap bitmap=wxNullBitmap, Point pos=DefaultPosition) -> bool

         """
         return _wizard.Wizard_Create(*args, **kwargs)
 
         """
         return _wizard.Wizard_Create(*args, **kwargs)
 

diff --git a/wxPython/wxPython/core.py b/wxPython/wxPython/core.py
index 3a730bb285828c63e504fcd785c3f7a2aeb6f38b..0d83bea09cb1cfa00ccdfbb4491e677ee57b38fa 100644 (file)
--- a/wxPython/wxPython/core.py
+++ b/wxPython/wxPython/core.py
@@ -557,40 +557,28 @@ wxMOD_WIN = wx.core.MOD_WIN
 wxUPDATE_UI_NONE = wx.core.UPDATE_UI_NONE
 wxUPDATE_UI_RECURSE = wx.core.UPDATE_UI_RECURSE
 wxUPDATE_UI_FROMIDLE = wx.core.UPDATE_UI_FROMIDLE
 wxUPDATE_UI_NONE = wx.core.UPDATE_UI_NONE
 wxUPDATE_UI_RECURSE = wx.core.UPDATE_UI_RECURSE
 wxUPDATE_UI_FROMIDLE = wx.core.UPDATE_UI_FROMIDLE

+wxEmptyString = wx.core.EmptyString

 wxObject = wx.core.Object
 wxObjectPtr = wx.core.ObjectPtr
 wxBITMAP_TYPE_INVALID = wx.core.BITMAP_TYPE_INVALID
 wxBITMAP_TYPE_BMP = wx.core.BITMAP_TYPE_BMP
 wxObject = wx.core.Object
 wxObjectPtr = wx.core.ObjectPtr
 wxBITMAP_TYPE_INVALID = wx.core.BITMAP_TYPE_INVALID
 wxBITMAP_TYPE_BMP = wx.core.BITMAP_TYPE_BMP

-wxBITMAP_TYPE_BMP_RESOURCE = wx.core.BITMAP_TYPE_BMP_RESOURCE
-wxBITMAP_TYPE_RESOURCE = wx.core.BITMAP_TYPE_RESOURCE

 wxBITMAP_TYPE_ICO = wx.core.BITMAP_TYPE_ICO
 wxBITMAP_TYPE_ICO = wx.core.BITMAP_TYPE_ICO

-wxBITMAP_TYPE_ICO_RESOURCE = wx.core.BITMAP_TYPE_ICO_RESOURCE

 wxBITMAP_TYPE_CUR = wx.core.BITMAP_TYPE_CUR
 wxBITMAP_TYPE_CUR = wx.core.BITMAP_TYPE_CUR

-wxBITMAP_TYPE_CUR_RESOURCE = wx.core.BITMAP_TYPE_CUR_RESOURCE

 wxBITMAP_TYPE_XBM = wx.core.BITMAP_TYPE_XBM
 wxBITMAP_TYPE_XBM_DATA = wx.core.BITMAP_TYPE_XBM_DATA
 wxBITMAP_TYPE_XPM = wx.core.BITMAP_TYPE_XPM
 wxBITMAP_TYPE_XPM_DATA = wx.core.BITMAP_TYPE_XPM_DATA
 wxBITMAP_TYPE_TIF = wx.core.BITMAP_TYPE_TIF
 wxBITMAP_TYPE_XBM = wx.core.BITMAP_TYPE_XBM
 wxBITMAP_TYPE_XBM_DATA = wx.core.BITMAP_TYPE_XBM_DATA
 wxBITMAP_TYPE_XPM = wx.core.BITMAP_TYPE_XPM
 wxBITMAP_TYPE_XPM_DATA = wx.core.BITMAP_TYPE_XPM_DATA
 wxBITMAP_TYPE_TIF = wx.core.BITMAP_TYPE_TIF

-wxBITMAP_TYPE_TIF_RESOURCE = wx.core.BITMAP_TYPE_TIF_RESOURCE

 wxBITMAP_TYPE_GIF = wx.core.BITMAP_TYPE_GIF
 wxBITMAP_TYPE_GIF = wx.core.BITMAP_TYPE_GIF

-wxBITMAP_TYPE_GIF_RESOURCE = wx.core.BITMAP_TYPE_GIF_RESOURCE

 wxBITMAP_TYPE_PNG = wx.core.BITMAP_TYPE_PNG
 wxBITMAP_TYPE_PNG = wx.core.BITMAP_TYPE_PNG

-wxBITMAP_TYPE_PNG_RESOURCE = wx.core.BITMAP_TYPE_PNG_RESOURCE

 wxBITMAP_TYPE_JPEG = wx.core.BITMAP_TYPE_JPEG
 wxBITMAP_TYPE_JPEG = wx.core.BITMAP_TYPE_JPEG

-wxBITMAP_TYPE_JPEG_RESOURCE = wx.core.BITMAP_TYPE_JPEG_RESOURCE

 wxBITMAP_TYPE_PNM = wx.core.BITMAP_TYPE_PNM
 wxBITMAP_TYPE_PNM = wx.core.BITMAP_TYPE_PNM

-wxBITMAP_TYPE_PNM_RESOURCE = wx.core.BITMAP_TYPE_PNM_RESOURCE

 wxBITMAP_TYPE_PCX = wx.core.BITMAP_TYPE_PCX
 wxBITMAP_TYPE_PCX = wx.core.BITMAP_TYPE_PCX

-wxBITMAP_TYPE_PCX_RESOURCE = wx.core.BITMAP_TYPE_PCX_RESOURCE

 wxBITMAP_TYPE_PICT = wx.core.BITMAP_TYPE_PICT
 wxBITMAP_TYPE_PICT = wx.core.BITMAP_TYPE_PICT

-wxBITMAP_TYPE_PICT_RESOURCE = wx.core.BITMAP_TYPE_PICT_RESOURCE

 wxBITMAP_TYPE_ICON = wx.core.BITMAP_TYPE_ICON
 wxBITMAP_TYPE_ICON = wx.core.BITMAP_TYPE_ICON

-wxBITMAP_TYPE_ICON_RESOURCE = wx.core.BITMAP_TYPE_ICON_RESOURCE

 wxBITMAP_TYPE_ANI = wx.core.BITMAP_TYPE_ANI
 wxBITMAP_TYPE_IFF = wx.core.BITMAP_TYPE_IFF
 wxBITMAP_TYPE_MACCURSOR = wx.core.BITMAP_TYPE_MACCURSOR
 wxBITMAP_TYPE_ANI = wx.core.BITMAP_TYPE_ANI
 wxBITMAP_TYPE_IFF = wx.core.BITMAP_TYPE_IFF
 wxBITMAP_TYPE_MACCURSOR = wx.core.BITMAP_TYPE_MACCURSOR

-wxBITMAP_TYPE_MACCURSOR_RESOURCE = wx.core.BITMAP_TYPE_MACCURSOR_RESOURCE

 wxBITMAP_TYPE_ANY = wx.core.BITMAP_TYPE_ANY
 wxCURSOR_NONE = wx.core.CURSOR_NONE
 wxCURSOR_ARROW = wx.core.CURSOR_ARROW
 wxBITMAP_TYPE_ANY = wx.core.BITMAP_TYPE_ANY
 wxCURSOR_NONE = wx.core.CURSOR_NONE
 wxCURSOR_ARROW = wx.core.CURSOR_ARROW