X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/eb7159455d8967dbfa384e338eb584d09964d3fa..2f3eae6a19cbfa92d40e4c069ba5779f50731e6f:/utils/wxPython/src/msw/gdi.py

diff --git a/utils/wxPython/src/msw/gdi.py b/utils/wxPython/src/msw/gdi.py
index 491e64eb7f..b2c401560c 100644
--- a/utils/wxPython/src/msw/gdi.py
+++ b/utils/wxPython/src/msw/gdi.py
@@ -9,15 +9,6 @@ class wxBitmapPtr :
     def __del__(self,gdic=gdic):
         if self.thisown == 1 :
             gdic.delete_wxBitmap(self)
-    def Create(self, *_args, **_kwargs):
-        val = apply(gdic.wxBitmap_Create,(self,) + _args, _kwargs)
-        return val
-    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) 
@@ -26,33 +17,48 @@ class wxBitmapPtr :
         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 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 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 SetPalette(self, *_args, **_kwargs):
         val = apply(gdic.wxBitmap_SetPalette,(self,) + _args, _kwargs)
         return val
+    def GetHandle(self, *_args, **_kwargs):
+        val = apply(gdic.wxBitmap_GetHandle,(self,) + _args, _kwargs)
+        return val
+    def SetHandle(self, *_args, **_kwargs):
+        val = apply(gdic.wxBitmap_SetHandle,(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 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 SetSize(self, *_args, **_kwargs):
+        val = apply(gdic.wxBitmap_SetSize,(self,) + _args, _kwargs)
+        return val
     def __repr__(self):
         return "<C wxBitmap instance at %s>" % (self.this,)
 class wxBitmap(wxBitmapPtr):
@@ -77,36 +83,45 @@ 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 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
-    def GetHeight(self, *_args, **_kwargs):
-        val = apply(gdic.wxIcon_GetHeight,(self,) + _args, _kwargs)
+    def GetHandle(self, *_args, **_kwargs):
+        val = apply(gdic.wxIcon_GetHandle,(self,) + _args, _kwargs)
+        return val
+    def SetHandle(self, *_args, **_kwargs):
+        val = apply(gdic.wxIcon_SetHandle,(self,) + _args, _kwargs)
+        return val
+    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
-    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
-    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
-    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
-    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 SetSize(self, *_args, **_kwargs):
+        val = apply(gdic.wxIcon_SetSize,(self,) + _args, _kwargs)
         return val
     def __repr__(self):
         return "<C wxIcon instance at %s>" % (self.this,)
@@ -118,16 +133,43 @@ class wxIcon(wxIconPtr):
 
 
 
-class wxCursorPtr(wxBitmapPtr):
+class wxCursorPtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __del__(self,gdic=gdic):
         if self.thisown == 1 :
             gdic.delete_wxCursor(self)
+    def GetHandle(self, *_args, **_kwargs):
+        val = apply(gdic.wxCursor_GetHandle,(self,) + _args, _kwargs)
+        return val
+    def SetHandle(self, *_args, **_kwargs):
+        val = apply(gdic.wxCursor_SetHandle,(self,) + _args, _kwargs)
+        return val
     def Ok(self, *_args, **_kwargs):
         val = apply(gdic.wxCursor_Ok,(self,) + _args, _kwargs)
         return val
+    def GetWidth(self, *_args, **_kwargs):
+        val = apply(gdic.wxCursor_GetWidth,(self,) + _args, _kwargs)
+        return val
+    def GetHeight(self, *_args, **_kwargs):
+        val = apply(gdic.wxCursor_GetHeight,(self,) + _args, _kwargs)
+        return val
+    def GetDepth(self, *_args, **_kwargs):
+        val = apply(gdic.wxCursor_GetDepth,(self,) + _args, _kwargs)
+        return val
+    def SetWidth(self, *_args, **_kwargs):
+        val = apply(gdic.wxCursor_SetWidth,(self,) + _args, _kwargs)
+        return val
+    def SetHeight(self, *_args, **_kwargs):
+        val = apply(gdic.wxCursor_SetHeight,(self,) + _args, _kwargs)
+        return val
+    def SetDepth(self, *_args, **_kwargs):
+        val = apply(gdic.wxCursor_SetDepth,(self,) + _args, _kwargs)
+        return val
+    def SetSize(self, *_args, **_kwargs):
+        val = apply(gdic.wxCursor_SetSize,(self,) + _args, _kwargs)
+        return val
     def __repr__(self):
         return "<C wxCursor instance at %s>" % (self.this,)
 class wxCursor(wxCursorPtr):
@@ -236,6 +278,9 @@ class wxColourPtr :
         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)
@@ -285,13 +330,13 @@ class wxPenPtr :
     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 GetStipple(self, *_args, **_kwargs):
         val = apply(gdic.wxPen_GetStipple,(self,) + _args, _kwargs)
         if val: val = wxBitmapPtr(val) 
         return val
-    def SetDashes(self, *_args, **_kwargs):
-        val = apply(gdic.wxPen_SetDashes,(self,) + _args, _kwargs)
-        return val
     def SetStipple(self, *_args, **_kwargs):
         val = apply(gdic.wxPen_SetStipple,(self,) + _args, _kwargs)
         return val
@@ -406,6 +451,9 @@ class wxDCPtr :
     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
@@ -765,11 +813,6 @@ def wxEmptyBitmap(*_args, **_kwargs):
     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 wxBitmapFromData(*_args, **_kwargs):
     val = apply(gdic.wxBitmapFromData,_args,_kwargs)
     if val: val = wxBitmapPtr(val); val.thisown = 1