Compilation fixes

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

diff --git a/utils/wxPython/src/gtk/stattool.py b/utils/wxPython/src/gtk/stattool.py
index 6b7a740521b7536426d66fc169772723bd14ca9c..f9cc36b5f9472fb032281242c56fac3199dac99a 100644 (file)
--- a/utils/wxPython/src/gtk/stattool.py
+++ b/utils/wxPython/src/gtk/stattool.py
@@ -7,6 +7,8 @@ from windows import *
 
 from gdi import *
 
 
 from gdi import *
 

+from clip_dnd import *
+

 from controls import *
 
 from events import *
 from controls import *
 
 from events import *


@@ -15,205 +17,315 @@ class wxStatusBarPtr(wxWindowPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     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 GetBorderX(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxStatusBar_GetBorderX,(self,) + _args, _kwargs)

         return val
         return val

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

         return val
         return val

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

         return val
         return val

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

         return val
         return val

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

         return val
         return val

-    def SetStatusWidths(self,arg0,*args):
-        val = apply(stattoolc.wxStatusBar_SetStatusWidths,(self.this,arg0,)+args)
+    def SetMinHeight(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxStatusBar_SetMinHeight,(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
         wx._StdWindowCallbacks(self)
 
 
 
 
         self.thisown = 1
         wx._StdWindowCallbacks(self)
 
 
 
 

-class wxToolBarToolPtr :
+class wxToolBarToolBasePtr :

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

-    def __del__(self):
-        if self.thisown == 1 :
-            stattoolc.delete_wxToolBarTool(self.this)
-    def __setattr__(self,name,value):
-        if name == "m_toolStyle" :
-            stattoolc.wxToolBarTool_m_toolStyle_set(self.this,value)
-            return
-        if name == "m_clientData" :
-            stattoolc.wxToolBarTool_m_clientData_set(self.this,value)
-            return
-        if name == "m_index" :
-            stattoolc.wxToolBarTool_m_index_set(self.this,value)
-            return
-        if name == "m_toggleState" :
-            stattoolc.wxToolBarTool_m_toggleState_set(self.this,value)
-            return
-        if name == "m_isToggle" :
-            stattoolc.wxToolBarTool_m_isToggle_set(self.this,value)
-            return
-        if name == "m_deleteSecondBitmap" :
-            stattoolc.wxToolBarTool_m_deleteSecondBitmap_set(self.this,value)
-            return
-        if name == "m_enabled" :
-            stattoolc.wxToolBarTool_m_enabled_set(self.this,value)
-            return
-        if name == "m_bitmap1" :
-            stattoolc.wxToolBarTool_m_bitmap1_set(self.this,value.this)
-            return
-        if name == "m_bitmap2" :
-            stattoolc.wxToolBarTool_m_bitmap2_set(self.this,value.this)
-            return
-        if name == "m_isMenuCommand" :
-            stattoolc.wxToolBarTool_m_isMenuCommand_set(self.this,value)
-            return
-        if name == "m_shortHelpString" :
-            stattoolc.wxToolBarTool_m_shortHelpString_set(self.this,value)
-            return
-        if name == "m_longHelpString" :
-            stattoolc.wxToolBarTool_m_longHelpString_set(self.this,value)
-            return
-        self.__dict__[name] = value
-    def __getattr__(self,name):
-        if name == "m_toolStyle" : 
-            return stattoolc.wxToolBarTool_m_toolStyle_get(self.this)
-        if name == "m_clientData" : 
-            return stattoolc.wxToolBarTool_m_clientData_get(self.this)
-        if name == "m_index" : 
-            return stattoolc.wxToolBarTool_m_index_get(self.this)
-        if name == "m_toggleState" : 
-            return stattoolc.wxToolBarTool_m_toggleState_get(self.this)
-        if name == "m_isToggle" : 
-            return stattoolc.wxToolBarTool_m_isToggle_get(self.this)
-        if name == "m_deleteSecondBitmap" : 
-            return stattoolc.wxToolBarTool_m_deleteSecondBitmap_get(self.this)
-        if name == "m_enabled" : 
-            return stattoolc.wxToolBarTool_m_enabled_get(self.this)
-        if name == "m_bitmap1" : 
-            return wxBitmapPtr(stattoolc.wxToolBarTool_m_bitmap1_get(self.this))
-        if name == "m_bitmap2" : 
-            return wxBitmapPtr(stattoolc.wxToolBarTool_m_bitmap2_get(self.this))
-        if name == "m_isMenuCommand" : 
-            return stattoolc.wxToolBarTool_m_isMenuCommand_get(self.this)
-        if name == "m_shortHelpString" : 
-            return stattoolc.wxToolBarTool_m_shortHelpString_get(self.this)
-        if name == "m_longHelpString" : 
-            return stattoolc.wxToolBarTool_m_longHelpString_get(self.this)
-        raise AttributeError,name
+    def Destroy(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBarToolBase_Destroy,(self,) + _args, _kwargs)
+        return val
+    def GetId(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBarToolBase_GetId,(self,) + _args, _kwargs)
+        return val
+    def GetControl(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBarToolBase_GetControl,(self,) + _args, _kwargs)
+        if val: val = wxControlPtr(val) 
+        return val
+    def GetToolBar(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBarToolBase_GetToolBar,(self,) + _args, _kwargs)
+        if val: val = wxToolBarBasePtr(val) 
+        return val
+    def IsButton(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBarToolBase_IsButton,(self,) + _args, _kwargs)
+        return val
+    def IsControl(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBarToolBase_IsControl,(self,) + _args, _kwargs)
+        return val
+    def IsSeparator(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBarToolBase_IsSeparator,(self,) + _args, _kwargs)
+        return val
+    def GetStyle(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBarToolBase_GetStyle,(self,) + _args, _kwargs)
+        return val
+    def IsEnabled(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBarToolBase_IsEnabled,(self,) + _args, _kwargs)
+        return val
+    def IsToggled(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBarToolBase_IsToggled,(self,) + _args, _kwargs)
+        return val
+    def CanBeToggled(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBarToolBase_CanBeToggled,(self,) + _args, _kwargs)
+        return val
+    def GetBitmap1(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBarToolBase_GetBitmap1,(self,) + _args, _kwargs)
+        if val: val = wxBitmapPtr(val) 
+        return val
+    def GetBitmap2(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBarToolBase_GetBitmap2,(self,) + _args, _kwargs)
+        if val: val = wxBitmapPtr(val) 
+        return val
+    def GetBitmap(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBarToolBase_GetBitmap,(self,) + _args, _kwargs)
+        if val: val = wxBitmapPtr(val) 
+        return val
+    def GetShortHelp(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBarToolBase_GetShortHelp,(self,) + _args, _kwargs)
+        return val
+    def GetLongHelp(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBarToolBase_GetLongHelp,(self,) + _args, _kwargs)
+        return val
+    def Enable(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBarToolBase_Enable,(self,) + _args, _kwargs)
+        return val
+    def Toggle(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBarToolBase_Toggle,(self,) + _args, _kwargs)
+        return val
+    def SetToggle(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBarToolBase_SetToggle,(self,) + _args, _kwargs)
+        return val
+    def SetShortHelp(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBarToolBase_SetShortHelp,(self,) + _args, _kwargs)
+        return val
+    def SetLongHelp(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBarToolBase_SetLongHelp,(self,) + _args, _kwargs)
+        return val
+    def SetBitmap1(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBarToolBase_SetBitmap1,(self,) + _args, _kwargs)
+        return val
+    def SetBitmap2(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBarToolBase_SetBitmap2,(self,) + _args, _kwargs)
+        return val
+    def Detach(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBarToolBase_Detach,(self,) + _args, _kwargs)
+        return val
+    def Attach(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBarToolBase_Attach,(self,) + _args, _kwargs)
+        return val
+    def GetClientData(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBarToolBase_GetClientData,(self,) + _args, _kwargs)
+        return val
+    def SetClientData(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBarToolBase_SetClientData,(self,) + _args, _kwargs)
+        return val

     def __repr__(self):
     def __repr__(self):

-        return "<C wxToolBarTool instance>"
-class wxToolBarTool(wxToolBarToolPtr):
-    def __init__(self) :
-        self.this = stattoolc.new_wxToolBarTool()
-        self.thisown = 1
+        return "<C wxToolBarToolBase instance at %s>" % (self.this,)
+class wxToolBarToolBase(wxToolBarToolBasePtr):
+    def __init__(self,this):
+        self.this = this

 
 
 
 
 
 
 
 

-class wxToolBarPtr(wxControlPtr):
+class wxToolBarBasePtr(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 AddTool(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBarBase_AddTool,(self,) + _args, _kwargs)
+        if val: val = wxToolBarToolBasePtr(val) 
+        return val
+    def AddSimpleTool(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBarBase_AddSimpleTool,(self,) + _args, _kwargs)
+        if val: val = wxToolBarToolBasePtr(val) 
+        return val
+    def InsertTool(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBarBase_InsertTool,(self,) + _args, _kwargs)
+        if val: val = wxToolBarToolBasePtr(val) 
+        return val
+    def InsertSimpleTool(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBarBase_InsertSimpleTool,(self,) + _args, _kwargs)
+        if val: val = wxToolBarToolBasePtr(val) 
+        return val
+    def AddControl(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBarBase_AddControl,(self,) + _args, _kwargs)
+        if val: val = wxToolBarToolBasePtr(val) 
+        return val
+    def InsertControl(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBarBase_InsertControl,(self,) + _args, _kwargs)
+        if val: val = wxToolBarToolBasePtr(val) 
+        return val
+    def AddSeparator(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBarBase_AddSeparator,(self,) + _args, _kwargs)
+        if val: val = wxToolBarToolBasePtr(val) 

         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 InsertSeparator(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBarBase_InsertSeparator,(self,) + _args, _kwargs)
+        if val: val = wxToolBarToolBasePtr(val) 

         return val
         return val

-    def AddSimpleTool(self,arg0,arg1,*args):
-        val = apply(stattoolc.wxToolBar_AddSimpleTool,(self.this,arg0,arg1.this,)+args)
-        val = wxToolBarToolPtr(val)
+    def RemoveTool(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBarBase_RemoveTool,(self,) + _args, _kwargs)
+        if val: val = wxToolBarToolBasePtr(val) 

         return val
         return val

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

         return val
         return val

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

         return val
         return val

-    def GetToolLongHelp(self,arg0):
-        val = stattoolc.wxToolBar_GetToolLongHelp(self.this,arg0)
+    def ClearTools(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBarBase_ClearTools,(self,) + _args, _kwargs)

         return val
         return val

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

         return val
         return val

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

         return val
         return val

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

         return val
         return val

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

         return val
         return val

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

         return val
         return val

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

         return val
         return val

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

         return val
         return val

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

         return val
         return val

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

         return val
         return val

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

         return val
         return val

-    def ToggleTool(self,arg0,arg1):
-        val = stattoolc.wxToolBar_ToggleTool(self.this,arg0,arg1)
+    def SetToolLongHelp(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBarBase_SetToolLongHelp,(self,) + _args, _kwargs)
+        return val
+    def GetToolLongHelp(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBarBase_GetToolLongHelp,(self,) + _args, _kwargs)
+        return val
+    def SetMarginsXY(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBarBase_SetMarginsXY,(self,) + _args, _kwargs)
+        return val
+    def SetMargins(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBarBase_SetMargins,(self,) + _args, _kwargs)
+        return val
+    def SetToolPacking(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBarBase_SetToolPacking,(self,) + _args, _kwargs)
+        return val
+    def SetToolSeparation(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBarBase_SetToolSeparation,(self,) + _args, _kwargs)
+        return val
+    def GetToolMargins(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBarBase_GetToolMargins,(self,) + _args, _kwargs)
+        if val: val = wxSizePtr(val) ; val.thisown = 1
+        return val
+    def GetToolPacking(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBarBase_GetToolPacking,(self,) + _args, _kwargs)
+        return val
+    def GetToolSeparation(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBarBase_GetToolSeparation,(self,) + _args, _kwargs)
+        return val
+    def SetRows(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBarBase_SetRows,(self,) + _args, _kwargs)
+        return val
+    def SetMaxRowsCols(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBarBase_SetMaxRowsCols,(self,) + _args, _kwargs)
+        return val
+    def GetMaxRows(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBarBase_GetMaxRows,(self,) + _args, _kwargs)
+        return val
+    def GetMaxCols(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBarBase_GetMaxCols,(self,) + _args, _kwargs)
+        return val
+    def SetToolBitmapSize(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBarBase_SetToolBitmapSize,(self,) + _args, _kwargs)
+        return val
+    def GetToolBitmapSize(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBarBase_GetToolBitmapSize,(self,) + _args, _kwargs)
+        if val: val = wxSizePtr(val) ; val.thisown = 1
+        return val
+    def GetToolSize(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBarBase_GetToolSize,(self,) + _args, _kwargs)
+        if val: val = wxSizePtr(val) ; val.thisown = 1

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

-        return "<C wxToolBar instance>"
+        return "<C wxToolBarBase instance at %s>" % (self.this,)
+class wxToolBarBase(wxToolBarBasePtr):
+    def __init__(self,this):
+        self.this = this
+
+
+
+
+class wxToolBarPtr(wxToolBarBasePtr):
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def FindToolForPosition(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBar_FindToolForPosition,(self,) + _args, _kwargs)
+        if val: val = wxToolBarToolBasePtr(val) 
+        return val
+    def __repr__(self):
+        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
+        wx._StdWindowCallbacks(self)
+
+
+
+
+class wxToolBarSimplePtr(wxToolBarBasePtr):
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def FindToolForPosition(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBarSimple_FindToolForPosition,(self,) + _args, _kwargs)
+        if val: val = wxToolBarToolBasePtr(val) 
+        return val
+    def __repr__(self):
+        return "<C wxToolBarSimple instance at %s>" % (self.this,)
+class wxToolBarSimple(wxToolBarSimplePtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(stattoolc.new_wxToolBarSimple,_args,_kwargs)

         self.thisown = 1
         wx._StdWindowCallbacks(self)
 
         self.thisown = 1
         wx._StdWindowCallbacks(self)
 


@@ -228,3 +340,6 @@ class wxToolBar(wxToolBarPtr):
 
 #-------------- VARIABLE WRAPPERS ------------------
 
 
 #-------------- VARIABLE WRAPPERS ------------------
 

+wxTOOL_STYLE_BUTTON = stattoolc.wxTOOL_STYLE_BUTTON
+wxTOOL_STYLE_SEPARATOR = stattoolc.wxTOOL_STYLE_SEPARATOR
+wxTOOL_STYLE_CONTROL = stattoolc.wxTOOL_STYLE_CONTROL