X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/aa2a5b8696bf412f2cc1c49b316f4bca2c3c367c..4077bf8dc4b51daf3754adcbcd1e0c45f8c2d05f:/wxPython/src/gtk/stattool.py

diff --git a/wxPython/src/gtk/stattool.py b/wxPython/src/gtk/stattool.py
index d691c4579a..4e8be2301b 100644
--- a/wxPython/src/gtk/stattool.py
+++ b/wxPython/src/gtk/stattool.py
@@ -54,13 +54,14 @@ class wxStatusBar(wxStatusBarPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(stattoolc.new_wxStatusBar,_args,_kwargs)
         self.thisown = 1
-        #wx._StdWindowCallbacks(self)
+        self._setOORInfo(self)
 
 
 
 def wxPreStatusBar(*_args,**_kwargs):
     val = wxStatusBarPtr(apply(stattoolc.new_wxPreStatusBar,_args,_kwargs))
     val.thisown = 1
+    val._setOORInfo(val)
     return val
 
 
@@ -101,17 +102,20 @@ class wxToolBarToolBasePtr(wxObjectPtr):
     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)
+    def GetNormalBitmap(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBarToolBase_GetNormalBitmap,(self,) + _args, _kwargs)
         if val: val = wxBitmapPtr(val) 
         return val
-    def GetBitmap2(self, *_args, **_kwargs):
-        val = apply(stattoolc.wxToolBarToolBase_GetBitmap2,(self,) + _args, _kwargs)
+    def GetDisabledBitmap(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBarToolBase_GetDisabledBitmap,(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) 
+        if val: val = wxBitmapPtr(val) ; val.thisown = 1
+        return val
+    def GetLabel(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBarToolBase_GetLabel,(self,) + _args, _kwargs)
         return val
     def GetShortHelp(self, *_args, **_kwargs):
         val = apply(stattoolc.wxToolBarToolBase_GetShortHelp,(self,) + _args, _kwargs)
@@ -134,11 +138,14 @@ class wxToolBarToolBasePtr(wxObjectPtr):
     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)
+    def SetNormalBitmap(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBarToolBase_SetNormalBitmap,(self,) + _args, _kwargs)
+        return val
+    def SetDisabledBitmap(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBarToolBase_SetDisabledBitmap,(self,) + _args, _kwargs)
         return val
-    def SetBitmap2(self, *_args, **_kwargs):
-        val = apply(stattoolc.wxToolBarToolBase_SetBitmap2,(self,) + _args, _kwargs)
+    def SetLabel(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBarToolBase_SetLabel,(self,) + _args, _kwargs)
         return val
     def Detach(self, *_args, **_kwargs):
         val = apply(stattoolc.wxToolBarToolBase_Detach,(self,) + _args, _kwargs)
@@ -154,6 +161,12 @@ class wxToolBarToolBasePtr(wxObjectPtr):
         return val
     def __repr__(self):
         return "<C wxToolBarToolBase instance at %s>" % (self.this,)
+    
+    GetBitmap1 = GetNormalBitmap
+    GetBitmap2 = GetDisabledBitmap
+    SetBitmap1 = SetNormalBitmap
+    SetBitmap2 = SetDisabledBitmap
+    
 class wxToolBarToolBase(wxToolBarToolBasePtr):
     def __init__(self,this):
         self.this = this
@@ -286,6 +299,12 @@ class wxToolBarBasePtr(wxControlPtr):
         val = apply(stattoolc.wxToolBarBase_GetToolSize,(self,) + _args, _kwargs)
         if val: val = wxSizePtr(val) ; val.thisown = 1
         return val
+    def FindToolForPosition(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBarBase_FindToolForPosition,(self,) + _args, _kwargs)
+        return val
+    def IsVertical(self, *_args, **_kwargs):
+        val = apply(stattoolc.wxToolBarBase_IsVertical,(self,) + _args, _kwargs)
+        return val
     def __repr__(self):
         return "<C wxToolBarBase instance at %s>" % (self.this,)
 class wxToolBarBase(wxToolBarBasePtr):
@@ -311,13 +330,14 @@ class wxToolBar(wxToolBarPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(stattoolc.new_wxToolBar,_args,_kwargs)
         self.thisown = 1
-        #wx._StdWindowCallbacks(self)
+        self._setOORInfo(self)
 
 
 
 def wxPreToolBar(*_args,**_kwargs):
     val = wxToolBarPtr(apply(stattoolc.new_wxPreToolBar,_args,_kwargs))
     val.thisown = 1
+    val._setOORInfo(val)
     return val
 
 
@@ -337,13 +357,14 @@ class wxToolBarSimple(wxToolBarSimplePtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(stattoolc.new_wxToolBarSimple,_args,_kwargs)
         self.thisown = 1
-        #wx._StdWindowCallbacks(self)
+        self._setOORInfo(self)
 
 
 
 def wxPreToolBarSimple(*_args,**_kwargs):
     val = wxToolBarSimplePtr(apply(stattoolc.new_wxPreToolBarSimple,_args,_kwargs))
     val.thisown = 1
+    val._setOORInfo(val)
     return val