I think it's needed...

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

diff --git a/utils/wxPython/src/gtk/gdi.py b/utils/wxPython/src/gtk/gdi.py
index deff2b8544274744ad9487e5d642ddabe446b08f..538a8eb5d2549fef3d6f73c5f2e9c8669b7923ba 100644 (file)
--- a/utils/wxPython/src/gtk/gdi.py
+++ b/utils/wxPython/src/gtk/gdi.py
@@ -9,12 +9,6 @@ class wxBitmapPtr :
     def __del__(self,gdic=gdic):
         if self.thisown == 1 :
             gdic.delete_wxBitmap(self)
     def __del__(self,gdic=gdic):
         if self.thisown == 1 :
             gdic.delete_wxBitmap(self)

-    def GetDepth(self, *_args, **_kwargs):
-        val = apply(gdic.wxBitmap_GetDepth,(self,) + _args, _kwargs)
-        return val
-    def GetHeight(self, *_args, **_kwargs):
-        val = apply(gdic.wxBitmap_GetHeight,(self,) + _args, _kwargs)
-        return val

     def GetPalette(self, *_args, **_kwargs):
         val = apply(gdic.wxBitmap_GetPalette,(self,) + _args, _kwargs)
         if val: val = wxPalettePtr(val) 
     def GetPalette(self, *_args, **_kwargs):
         val = apply(gdic.wxBitmap_GetPalette,(self,) + _args, _kwargs)
         if val: val = wxPalettePtr(val) 


@@ -23,30 +17,36 @@ class wxBitmapPtr :
         val = apply(gdic.wxBitmap_GetMask,(self,) + _args, _kwargs)
         if val: val = wxMaskPtr(val) 
         return val
         val = apply(gdic.wxBitmap_GetMask,(self,) + _args, _kwargs)
         if val: val = wxMaskPtr(val) 
         return val

-    def GetWidth(self, *_args, **_kwargs):
-        val = apply(gdic.wxBitmap_GetWidth,(self,) + _args, _kwargs)
-        return val

     def LoadFile(self, *_args, **_kwargs):
         val = apply(gdic.wxBitmap_LoadFile,(self,) + _args, _kwargs)
         return val
     def LoadFile(self, *_args, **_kwargs):
         val = apply(gdic.wxBitmap_LoadFile,(self,) + _args, _kwargs)
         return val

-    def Ok(self, *_args, **_kwargs):
-        val = apply(gdic.wxBitmap_Ok,(self,) + _args, _kwargs)
-        return val

     def SaveFile(self, *_args, **_kwargs):
         val = apply(gdic.wxBitmap_SaveFile,(self,) + _args, _kwargs)
         return val
     def SaveFile(self, *_args, **_kwargs):
         val = apply(gdic.wxBitmap_SaveFile,(self,) + _args, _kwargs)
         return val

-    def SetDepth(self, *_args, **_kwargs):
-        val = apply(gdic.wxBitmap_SetDepth,(self,) + _args, _kwargs)
-        return val
-    def SetHeight(self, *_args, **_kwargs):
-        val = apply(gdic.wxBitmap_SetHeight,(self,) + _args, _kwargs)
-        return val

     def SetMask(self, *_args, **_kwargs):
         val = apply(gdic.wxBitmap_SetMask,(self,) + _args, _kwargs)
         return val
     def SetMask(self, *_args, **_kwargs):
         val = apply(gdic.wxBitmap_SetMask,(self,) + _args, _kwargs)
         return val

+    def Ok(self, *_args, **_kwargs):
+        val = apply(gdic.wxBitmap_Ok,(self,) + _args, _kwargs)
+        return val
+    def GetWidth(self, *_args, **_kwargs):
+        val = apply(gdic.wxBitmap_GetWidth,(self,) + _args, _kwargs)
+        return val
+    def GetHeight(self, *_args, **_kwargs):
+        val = apply(gdic.wxBitmap_GetHeight,(self,) + _args, _kwargs)
+        return val
+    def GetDepth(self, *_args, **_kwargs):
+        val = apply(gdic.wxBitmap_GetDepth,(self,) + _args, _kwargs)
+        return val

     def SetWidth(self, *_args, **_kwargs):
         val = apply(gdic.wxBitmap_SetWidth,(self,) + _args, _kwargs)
         return val
     def SetWidth(self, *_args, **_kwargs):
         val = apply(gdic.wxBitmap_SetWidth,(self,) + _args, _kwargs)
         return val

+    def SetHeight(self, *_args, **_kwargs):
+        val = apply(gdic.wxBitmap_SetHeight,(self,) + _args, _kwargs)
+        return val
+    def SetDepth(self, *_args, **_kwargs):
+        val = apply(gdic.wxBitmap_SetDepth,(self,) + _args, _kwargs)
+        return val

     def __repr__(self):
         return "<C wxBitmap instance at %s>" % (self.this,)
 class wxBitmap(wxBitmapPtr):
     def __repr__(self):
         return "<C wxBitmap instance at %s>" % (self.this,)
 class wxBitmap(wxBitmapPtr):


@@ -61,9 +61,6 @@ class wxMaskPtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def __del__(self,gdic=gdic):
-        if self.thisown == 1 :
-            gdic.delete_wxMask(self)

     def __repr__(self):
         return "<C wxMask instance at %s>" % (self.this,)
 class wxMask(wxMaskPtr):
     def __repr__(self):
         return "<C wxMask instance at %s>" % (self.this,)
 class wxMask(wxMaskPtr):


@@ -74,36 +71,36 @@ class wxMask(wxMaskPtr):
 
 
 
 
 
 

-class wxIconPtr(wxBitmapPtr):
+class wxIconPtr :

     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __del__(self,gdic=gdic):
         if self.thisown == 1 :
             gdic.delete_wxIcon(self)
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __del__(self,gdic=gdic):
         if self.thisown == 1 :
             gdic.delete_wxIcon(self)

-    def GetDepth(self, *_args, **_kwargs):
-        val = apply(gdic.wxIcon_GetDepth,(self,) + _args, _kwargs)
+    def LoadFile(self, *_args, **_kwargs):
+        val = apply(gdic.wxIcon_LoadFile,(self,) + _args, _kwargs)

         return val
         return val

-    def GetHeight(self, *_args, **_kwargs):
-        val = apply(gdic.wxIcon_GetHeight,(self,) + _args, _kwargs)
+    def Ok(self, *_args, **_kwargs):
+        val = apply(gdic.wxIcon_Ok,(self,) + _args, _kwargs)

         return val
     def GetWidth(self, *_args, **_kwargs):
         val = apply(gdic.wxIcon_GetWidth,(self,) + _args, _kwargs)
         return val
         return val
     def GetWidth(self, *_args, **_kwargs):
         val = apply(gdic.wxIcon_GetWidth,(self,) + _args, _kwargs)
         return val

-    def LoadFile(self, *_args, **_kwargs):
-        val = apply(gdic.wxIcon_LoadFile,(self,) + _args, _kwargs)
+    def GetHeight(self, *_args, **_kwargs):
+        val = apply(gdic.wxIcon_GetHeight,(self,) + _args, _kwargs)

         return val
         return val

-    def Ok(self, *_args, **_kwargs):
-        val = apply(gdic.wxIcon_Ok,(self,) + _args, _kwargs)
+    def GetDepth(self, *_args, **_kwargs):
+        val = apply(gdic.wxIcon_GetDepth,(self,) + _args, _kwargs)

         return val
         return val

-    def SetDepth(self, *_args, **_kwargs):
-        val = apply(gdic.wxIcon_SetDepth,(self,) + _args, _kwargs)
+    def SetWidth(self, *_args, **_kwargs):
+        val = apply(gdic.wxIcon_SetWidth,(self,) + _args, _kwargs)

         return val
     def SetHeight(self, *_args, **_kwargs):
         val = apply(gdic.wxIcon_SetHeight,(self,) + _args, _kwargs)
         return val
         return val
     def SetHeight(self, *_args, **_kwargs):
         val = apply(gdic.wxIcon_SetHeight,(self,) + _args, _kwargs)
         return val

-    def SetWidth(self, *_args, **_kwargs):
-        val = apply(gdic.wxIcon_SetWidth,(self,) + _args, _kwargs)
+    def SetDepth(self, *_args, **_kwargs):
+        val = apply(gdic.wxIcon_SetDepth,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return "<C wxIcon instance at %s>" % (self.this,)
         return val
     def __repr__(self):
         return "<C wxIcon instance at %s>" % (self.this,)


@@ -115,7 +112,7 @@ class wxIcon(wxIconPtr):
 
 
 
 
 
 

-class wxCursorPtr(wxBitmapPtr):
+class wxCursorPtr :

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


@@ -229,6 +226,9 @@ class wxColourPtr :
         return val
     def __repr__(self):
         return "<C wxColour instance at %s>" % (self.this,)
         return val
     def __repr__(self):
         return "<C wxColour instance at %s>" % (self.this,)

+    asTuple = Get
+    def __str__(self): return str(self.asTuple())
+    def __repr__(self): return str(self.asTuple())

 class wxColour(wxColourPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(gdic.new_wxColour,_args,_kwargs)
 class wxColour(wxColourPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(gdic.new_wxColour,_args,_kwargs)


@@ -275,6 +275,12 @@ class wxPenPtr :
     def SetWidth(self, *_args, **_kwargs):
         val = apply(gdic.wxPen_SetWidth,(self,) + _args, _kwargs)
         return val
     def SetWidth(self, *_args, **_kwargs):
         val = apply(gdic.wxPen_SetWidth,(self,) + _args, _kwargs)
         return val

+    def GetDashes(self, *_args, **_kwargs):
+        val = apply(gdic.wxPen_GetDashes,(self,) + _args, _kwargs)
+        return val
+    def SetDashes(self, *_args, **_kwargs):
+        val = apply(gdic.wxPen_SetDashes,(self,) + _args, _kwargs)
+        return val

     def __repr__(self):
         return "<C wxPen instance at %s>" % (self.this,)
 class wxPen(wxPenPtr):
     def __repr__(self):
         return "<C wxPen instance at %s>" % (self.this,)
 class wxPen(wxPenPtr):


@@ -386,6 +392,9 @@ class wxDCPtr :
     def DrawRectangle(self, *_args, **_kwargs):
         val = apply(gdic.wxDC_DrawRectangle,(self,) + _args, _kwargs)
         return val
     def DrawRectangle(self, *_args, **_kwargs):
         val = apply(gdic.wxDC_DrawRectangle,(self,) + _args, _kwargs)
         return val

+    def DrawRotatedText(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_DrawRotatedText,(self,) + _args, _kwargs)
+        return val

     def DrawRoundedRectangle(self, *_args, **_kwargs):
         val = apply(gdic.wxDC_DrawRoundedRectangle,(self,) + _args, _kwargs)
         return val
     def DrawRoundedRectangle(self, *_args, **_kwargs):
         val = apply(gdic.wxDC_DrawRoundedRectangle,(self,) + _args, _kwargs)
         return val


@@ -719,11 +728,6 @@ def wxEmptyBitmap(*_args, **_kwargs):
     if val: val = wxBitmapPtr(val); val.thisown = 1
     return val
 
     if val: val = wxBitmapPtr(val); val.thisown = 1
     return val
 

-def wxNoRefBitmap(*_args, **_kwargs):
-    val = apply(gdic.wxNoRefBitmap,_args,_kwargs)
-    if val: val = wxBitmapPtr(val)
-    return val
-

 def wxMaskColour(*_args, **_kwargs):
     val = apply(gdic.wxMaskColour,_args,_kwargs)
     if val: val = wxMaskPtr(val); val.thisown = 1
 def wxMaskColour(*_args, **_kwargs):
     val = apply(gdic.wxMaskColour,_args,_kwargs)
     if val: val = wxMaskPtr(val); val.thisown = 1