minor fixes

[wxWidgets.git] / utils / wxPython / src / msw / stattool.py

diff --git a/utils/wxPython/src/msw/stattool.py b/utils/wxPython/src/msw/stattool.py
index f16438105e3087a3a7b265dff78c9f8cf6b55749..35d725612d910e9969d1c7ce9087ba9a3e8a8c9b 100644 (file)
--- a/utils/wxPython/src/msw/stattool.py
+++ b/utils/wxPython/src/msw/stattool.py
@@ -10,52 +10,46 @@ from gdi import *
 from controls import *
 
 from events import *
 from controls import *
 
 from events import *

+import wx

 class wxStatusBarPtr(wxWindowPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
 class wxStatusBarPtr(wxWindowPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def GetFieldRect(self,arg0):
-        val = stattoolc.wxStatusBar_GetFieldRect(self.this,arg0)
-        val = wxRectPtr(val)
-        val.thisown = 1
+    def GetFieldRect(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxStatusBar_GetFieldRect,(self,) + _args, _kwargs)
+        if val: val = wxRectPtr(val) ; val.thisown = 1

         return val
         return val

-    def GetFieldsCount(self):
-        val = stattoolc.wxStatusBar_GetFieldsCount(self.this)
+    def GetFieldsCount(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxStatusBar_GetFieldsCount,(self,) + _args, _kwargs)

         return val
         return val

-    def GetStatusText(self,*args):
-        val = apply(stattoolc.wxStatusBar_GetStatusText,(self.this,)+args)
+    def GetStatusText(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxStatusBar_GetStatusText,(self,) + _args, _kwargs)

         return val
         return val

-    def DrawField(self,arg0,arg1):
-        val = stattoolc.wxStatusBar_DrawField(self.this,arg0.this,arg1)
+    def DrawField(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxStatusBar_DrawField,(self,) + _args, _kwargs)

         return val
         return val

-    def DrawFieldText(self,arg0,arg1):
-        val = stattoolc.wxStatusBar_DrawFieldText(self.this,arg0.this,arg1)
+    def DrawFieldText(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxStatusBar_DrawFieldText,(self,) + _args, _kwargs)

         return val
         return val

-    def InitColours(self):
-        val = stattoolc.wxStatusBar_InitColours(self.this)
+    def InitColours(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxStatusBar_InitColours,(self,) + _args, _kwargs)

         return val
         return val

-    def SetFieldsCount(self,*args):
-        val = apply(stattoolc.wxStatusBar_SetFieldsCount,(self.this,)+args)
+    def SetFieldsCount(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxStatusBar_SetFieldsCount,(self,) + _args, _kwargs)

         return val
         return val

-    def SetStatusText(self,arg0,*args):
-        val = apply(stattoolc.wxStatusBar_SetStatusText,(self.this,arg0,)+args)
+    def SetStatusText(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxStatusBar_SetStatusText,(self,) + _args, _kwargs)

         return val
         return val

-    def SetStatusWidths(self,arg0,*args):
-        val = apply(stattoolc.wxStatusBar_SetStatusWidths,(self.this,arg0,)+args)
+    def SetStatusWidths(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxStatusBar_SetStatusWidths,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxStatusBar instance>"
+        return "<C wxStatusBar instance at %s>" % (self.this,)

 class wxStatusBar(wxStatusBarPtr):
 class wxStatusBar(wxStatusBarPtr):

-    def __init__(self,arg0,arg1,*args) :
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        try: argl[1] = argl[1].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(stattoolc.new_wxStatusBar,(arg0.this,arg1,)+args)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(stattoolc.new_wxStatusBar,_args,_kwargs)

         self.thisown = 1
         self.thisown = 1

-        wxp._StdWindowCallbacks(self)
+        wx._StdWindowCallbacks(self)

 
 
 
 
 
 


@@ -64,107 +58,107 @@ class wxToolBarToolPtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def __del__(self):
+    def __del__(self,stattoolc=stattoolc):

         if self.thisown == 1 :
         if self.thisown == 1 :

-            stattoolc.delete_wxToolBarTool(self.this)
-    def SetSize(self,arg0,arg1):
-        val = stattoolc.wxToolBarTool_SetSize(self.this,arg0,arg1)
+            stattoolc.delete_wxToolBarTool(self)
+    def SetSize(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBarTool_SetSize,(self,) + _args, _kwargs)

         return val
         return val

-    def GetWidth(self):
-        val = stattoolc.wxToolBarTool_GetWidth(self.this)
+    def GetWidth(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBarTool_GetWidth,(self,) + _args, _kwargs)

         return val
         return val

-    def GetHeight(self):
-        val = stattoolc.wxToolBarTool_GetHeight(self.this)
+    def GetHeight(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBarTool_GetHeight,(self,) + _args, _kwargs)

         return val
     def __setattr__(self,name,value):
         if name == "m_toolStyle" :
         return val
     def __setattr__(self,name,value):
         if name == "m_toolStyle" :

-            stattoolc.wxToolBarTool_m_toolStyle_set(self.this,value)
+            stattoolc.wxToolBarTool_m_toolStyle_set(self,value)

             return
         if name == "m_clientData" :
             return
         if name == "m_clientData" :

-            stattoolc.wxToolBarTool_m_clientData_set(self.this,value)
+            stattoolc.wxToolBarTool_m_clientData_set(self,value)

             return
         if name == "m_index" :
             return
         if name == "m_index" :

-            stattoolc.wxToolBarTool_m_index_set(self.this,value)
+            stattoolc.wxToolBarTool_m_index_set(self,value)

             return
         if name == "m_x" :
             return
         if name == "m_x" :

-            stattoolc.wxToolBarTool_m_x_set(self.this,value)
+            stattoolc.wxToolBarTool_m_x_set(self,value)

             return
         if name == "m_y" :
             return
         if name == "m_y" :

-            stattoolc.wxToolBarTool_m_y_set(self.this,value)
+            stattoolc.wxToolBarTool_m_y_set(self,value)

             return
         if name == "m_width" :
             return
         if name == "m_width" :

-            stattoolc.wxToolBarTool_m_width_set(self.this,value)
+            stattoolc.wxToolBarTool_m_width_set(self,value)

             return
         if name == "m_height" :
             return
         if name == "m_height" :

-            stattoolc.wxToolBarTool_m_height_set(self.this,value)
+            stattoolc.wxToolBarTool_m_height_set(self,value)

             return
         if name == "m_toggleState" :
             return
         if name == "m_toggleState" :

-            stattoolc.wxToolBarTool_m_toggleState_set(self.this,value)
+            stattoolc.wxToolBarTool_m_toggleState_set(self,value)

             return
         if name == "m_isToggle" :
             return
         if name == "m_isToggle" :

-            stattoolc.wxToolBarTool_m_isToggle_set(self.this,value)
+            stattoolc.wxToolBarTool_m_isToggle_set(self,value)

             return
         if name == "m_deleteSecondBitmap" :
             return
         if name == "m_deleteSecondBitmap" :

-            stattoolc.wxToolBarTool_m_deleteSecondBitmap_set(self.this,value)
+            stattoolc.wxToolBarTool_m_deleteSecondBitmap_set(self,value)

             return
         if name == "m_enabled" :
             return
         if name == "m_enabled" :

-            stattoolc.wxToolBarTool_m_enabled_set(self.this,value)
+            stattoolc.wxToolBarTool_m_enabled_set(self,value)

             return
         if name == "m_bitmap1" :
             return
         if name == "m_bitmap1" :

-            stattoolc.wxToolBarTool_m_bitmap1_set(self.this,value.this)
+            stattoolc.wxToolBarTool_m_bitmap1_set(self,value.this)

             return
         if name == "m_bitmap2" :
             return
         if name == "m_bitmap2" :

-            stattoolc.wxToolBarTool_m_bitmap2_set(self.this,value.this)
+            stattoolc.wxToolBarTool_m_bitmap2_set(self,value.this)

             return
         if name == "m_isMenuCommand" :
             return
         if name == "m_isMenuCommand" :

-            stattoolc.wxToolBarTool_m_isMenuCommand_set(self.this,value)
+            stattoolc.wxToolBarTool_m_isMenuCommand_set(self,value)

             return
         if name == "m_shortHelpString" :
             return
         if name == "m_shortHelpString" :

-            stattoolc.wxToolBarTool_m_shortHelpString_set(self.this,value)
+            stattoolc.wxToolBarTool_m_shortHelpString_set(self,value)

             return
         if name == "m_longHelpString" :
             return
         if name == "m_longHelpString" :

-            stattoolc.wxToolBarTool_m_longHelpString_set(self.this,value)
+            stattoolc.wxToolBarTool_m_longHelpString_set(self,value)

             return
         self.__dict__[name] = value
     def __getattr__(self,name):
         if name == "m_toolStyle" : 
             return
         self.__dict__[name] = value
     def __getattr__(self,name):
         if name == "m_toolStyle" : 

-            return stattoolc.wxToolBarTool_m_toolStyle_get(self.this)
+            return stattoolc.wxToolBarTool_m_toolStyle_get(self)

         if name == "m_clientData" : 
         if name == "m_clientData" : 

-            return stattoolc.wxToolBarTool_m_clientData_get(self.this)
+            return stattoolc.wxToolBarTool_m_clientData_get(self)

         if name == "m_index" : 
         if name == "m_index" : 

-            return stattoolc.wxToolBarTool_m_index_get(self.this)
+            return stattoolc.wxToolBarTool_m_index_get(self)

         if name == "m_x" : 
         if name == "m_x" : 

-            return stattoolc.wxToolBarTool_m_x_get(self.this)
+            return stattoolc.wxToolBarTool_m_x_get(self)

         if name == "m_y" : 
         if name == "m_y" : 

-            return stattoolc.wxToolBarTool_m_y_get(self.this)
+            return stattoolc.wxToolBarTool_m_y_get(self)

         if name == "m_width" : 
         if name == "m_width" : 

-            return stattoolc.wxToolBarTool_m_width_get(self.this)
+            return stattoolc.wxToolBarTool_m_width_get(self)

         if name == "m_height" : 
         if name == "m_height" : 

-            return stattoolc.wxToolBarTool_m_height_get(self.this)
+            return stattoolc.wxToolBarTool_m_height_get(self)

         if name == "m_toggleState" : 
         if name == "m_toggleState" : 

-            return stattoolc.wxToolBarTool_m_toggleState_get(self.this)
+            return stattoolc.wxToolBarTool_m_toggleState_get(self)

         if name == "m_isToggle" : 
         if name == "m_isToggle" : 

-            return stattoolc.wxToolBarTool_m_isToggle_get(self.this)
+            return stattoolc.wxToolBarTool_m_isToggle_get(self)

         if name == "m_deleteSecondBitmap" : 
         if name == "m_deleteSecondBitmap" : 

-            return stattoolc.wxToolBarTool_m_deleteSecondBitmap_get(self.this)
+            return stattoolc.wxToolBarTool_m_deleteSecondBitmap_get(self)

         if name == "m_enabled" : 
         if name == "m_enabled" : 

-            return stattoolc.wxToolBarTool_m_enabled_get(self.this)
+            return stattoolc.wxToolBarTool_m_enabled_get(self)

         if name == "m_bitmap1" : 
         if name == "m_bitmap1" : 

-            return wxBitmapPtr(stattoolc.wxToolBarTool_m_bitmap1_get(self.this))
+            return wxBitmapPtr(stattoolc.wxToolBarTool_m_bitmap1_get(self))

         if name == "m_bitmap2" : 
         if name == "m_bitmap2" : 

-            return wxBitmapPtr(stattoolc.wxToolBarTool_m_bitmap2_get(self.this))
+            return wxBitmapPtr(stattoolc.wxToolBarTool_m_bitmap2_get(self))

         if name == "m_isMenuCommand" : 
         if name == "m_isMenuCommand" : 

-            return stattoolc.wxToolBarTool_m_isMenuCommand_get(self.this)
+            return stattoolc.wxToolBarTool_m_isMenuCommand_get(self)

         if name == "m_shortHelpString" : 
         if name == "m_shortHelpString" : 

-            return stattoolc.wxToolBarTool_m_shortHelpString_get(self.this)
+            return stattoolc.wxToolBarTool_m_shortHelpString_get(self)

         if name == "m_longHelpString" : 
         if name == "m_longHelpString" : 

-            return stattoolc.wxToolBarTool_m_longHelpString_get(self.this)
+            return stattoolc.wxToolBarTool_m_longHelpString_get(self)

         raise AttributeError,name
     def __repr__(self):
         raise AttributeError,name
     def __repr__(self):

-        return "<C wxToolBarTool instance>"
+        return "<C wxToolBarTool instance at %s>" % (self.this,)

 class wxToolBarTool(wxToolBarToolPtr):
 class wxToolBarTool(wxToolBarToolPtr):

-    def __init__(self) :
-        self.this = stattoolc.new_wxToolBarTool()
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(stattoolc.new_wxToolBarTool,_args,_kwargs)

         self.thisown = 1
 
 
         self.thisown = 1
 
 


@@ -174,94 +168,85 @@ class wxToolBarPtr(wxControlPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def AddSeparator(self):
-        val = stattoolc.wxToolBar_AddSeparator(self.this)
+    def AddSeparator(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBar_AddSeparator,(self,) + _args, _kwargs)

         return val
         return val

-    def AddTool(self,arg0,arg1,*args):
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        args = tuple(argl)
-        val = apply(stattoolc.wxToolBar_AddTool,(self.this,arg0,arg1.this,)+args)
-        val = wxToolBarToolPtr(val)
+    def AddTool(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBar_AddTool,(self,) + _args, _kwargs)
+        if val: val = wxToolBarToolPtr(val) 

         return val
         return val

-    def EnableTool(self,arg0,arg1):
-        val = stattoolc.wxToolBar_EnableTool(self.this,arg0,arg1)
+    def AddSimpleTool(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBar_AddSimpleTool,(self,) + _args, _kwargs)
+        if val: val = wxToolBarToolPtr(val) 

         return val
         return val

-    def FindToolForPosition(self,arg0,arg1):
-        val = stattoolc.wxToolBar_FindToolForPosition(self.this,arg0,arg1)
-        val = wxToolBarToolPtr(val)
+    def EnableTool(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBar_EnableTool,(self,) + _args, _kwargs)

         return val
         return val

-    def GetToolSize(self):
-        val = stattoolc.wxToolBar_GetToolSize(self.this)
-        val = wxSizePtr(val)
-        val.thisown = 1
+    def FindToolForPosition(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBar_FindToolForPosition,(self,) + _args, _kwargs)
+        if val: val = wxToolBarToolPtr(val) 

         return val
         return val

-    def GetToolBitmapSize(self):
-        val = stattoolc.wxToolBar_GetToolBitmapSize(self.this)
-        val = wxSizePtr(val)
-        val.thisown = 1
+    def GetToolSize(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBar_GetToolSize,(self,) + _args, _kwargs)
+        if val: val = wxSizePtr(val) ; val.thisown = 1

         return val
         return val

-    def GetMaxSize(self):
-        val = stattoolc.wxToolBar_GetMaxSize(self.this)
-        val = wxSizePtr(val)
-        val.thisown = 1
+    def GetToolBitmapSize(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBar_GetToolBitmapSize,(self,) + _args, _kwargs)
+        if val: val = wxSizePtr(val) ; val.thisown = 1

         return val
         return val

-    def GetToolEnabled(self,arg0):
-        val = stattoolc.wxToolBar_GetToolEnabled(self.this,arg0)
+    def SetToolBitmapSize(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBar_SetToolBitmapSize,(self,) + _args, _kwargs)

         return val
         return val

-    def GetToolLongHelp(self,arg0):
-        val = stattoolc.wxToolBar_GetToolLongHelp(self.this,arg0)
+    def GetMaxSize(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBar_GetMaxSize,(self,) + _args, _kwargs)
+        if val: val = wxSizePtr(val) ; val.thisown = 1

         return val
         return val

-    def GetToolPacking(self):
-        val = stattoolc.wxToolBar_GetToolPacking(self.this)
+    def GetToolEnabled(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBar_GetToolEnabled,(self,) + _args, _kwargs)

         return val
         return val

-    def GetToolSeparation(self):
-        val = stattoolc.wxToolBar_GetToolSeparation(self.this)
+    def GetToolLongHelp(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBar_GetToolLongHelp,(self,) + _args, _kwargs)

         return val
         return val

-    def GetToolShortHelp(self,arg0):
-        val = stattoolc.wxToolBar_GetToolShortHelp(self.this,arg0)
+    def GetToolPacking(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBar_GetToolPacking,(self,) + _args, _kwargs)

         return val
         return val

-    def GetToolState(self,arg0):
-        val = stattoolc.wxToolBar_GetToolState(self.this,arg0)
+    def GetToolSeparation(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBar_GetToolSeparation,(self,) + _args, _kwargs)

         return val
         return val

-    def Realize(self):
-        val = stattoolc.wxToolBar_Realize(self.this)
+    def GetToolShortHelp(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBar_GetToolShortHelp,(self,) + _args, _kwargs)

         return val
         return val

-    def SetToolBitmapSize(self,arg0):
-        val = stattoolc.wxToolBar_SetToolBitmapSize(self.this,arg0.this)
+    def GetToolState(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBar_GetToolState,(self,) + _args, _kwargs)

         return val
         return val

-    def SetToolLongHelp(self,arg0,arg1):
-        val = stattoolc.wxToolBar_SetToolLongHelp(self.this,arg0,arg1)
+    def Realize(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBar_Realize,(self,) + _args, _kwargs)

         return val
         return val

-    def SetToolShortHelp(self,arg0,arg1):
-        val = stattoolc.wxToolBar_SetToolShortHelp(self.this,arg0,arg1)
+    def SetToolLongHelp(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBar_SetToolLongHelp,(self,) + _args, _kwargs)

         return val
         return val

-    def SetMargins(self,arg0):
-        val = stattoolc.wxToolBar_SetMargins(self.this,arg0.this)
+    def SetToolShortHelp(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBar_SetToolShortHelp,(self,) + _args, _kwargs)

         return val
         return val

-    def SetToolPacking(self,arg0):
-        val = stattoolc.wxToolBar_SetToolPacking(self.this,arg0)
+    def SetMargins(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBar_SetMargins,(self,) + _args, _kwargs)

         return val
         return val

-    def SetToolSeparation(self,arg0):
-        val = stattoolc.wxToolBar_SetToolSeparation(self.this,arg0)
+    def SetToolPacking(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBar_SetToolPacking,(self,) + _args, _kwargs)

         return val
         return val

-    def ToggleTool(self,arg0,arg1):
-        val = stattoolc.wxToolBar_ToggleTool(self.this,arg0,arg1)
+    def SetToolSeparation(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBar_SetToolSeparation,(self,) + _args, _kwargs)
+        return val
+    def ToggleTool(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBar_ToggleTool,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxToolBar instance>"
+        return "<C wxToolBar instance at %s>" % (self.this,)

 class wxToolBar(wxToolBarPtr):
 class wxToolBar(wxToolBarPtr):

-    def __init__(self,arg0,arg1,*args) :
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        try: argl[1] = argl[1].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(stattoolc.new_wxToolBar,(arg0.this,arg1,)+args)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(stattoolc.new_wxToolBar,_args,_kwargs)

         self.thisown = 1
         self.thisown = 1

-        wxp._StdWindowCallbacks(self)
+        wx._StdWindowCallbacks(self)