Compilation fixes

[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 82b0e48f78f0cab499b1b4229d2ba6fbde756e5b..a0e405a8e262cacc9a8f0ab38d7282f264073122 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 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) 
@@ -23,30 +17,36 @@ 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 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 __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 __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):
@@ -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 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 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 __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
@@ -138,6 +135,9 @@ class wxFontPtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
+    def Ok(self, *_args, **_kwargs):
+        val = apply(gdic.wxFont_Ok,(self,) + _args, _kwargs)
+        return val
     def GetFaceName(self, *_args, **_kwargs):
         val = apply(gdic.wxFont_GetFaceName,(self,) + _args, _kwargs)
         return val
@@ -226,6 +226,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)
@@ -272,6 +275,12 @@ class wxPenPtr :
     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):
@@ -383,6 +392,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
@@ -428,6 +440,9 @@ class wxDCPtr :
     def GetLogicalFunction(self, *_args, **_kwargs):
         val = apply(gdic.wxDC_GetLogicalFunction,(self,) + _args, _kwargs)
         return val
+    def GetLogicalScale(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_GetLogicalScale,(self,) + _args, _kwargs)
+        return val
     def GetMapMode(self, *_args, **_kwargs):
         val = apply(gdic.wxDC_GetMapMode,(self,) + _args, _kwargs)
         return val
@@ -449,6 +464,10 @@ class wxDCPtr :
         val = apply(gdic.wxDC_GetSize,(self,) + _args, _kwargs)
         if val: val = wxSizePtr(val) ; val.thisown = 1
         return val
+    def GetSizeMM(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_GetSizeMM,(self,) + _args, _kwargs)
+        if val: val = wxSizePtr(val) ; val.thisown = 1
+        return val
     def GetTextBackground(self, *_args, **_kwargs):
         val = apply(gdic.wxDC_GetTextBackground,(self,) + _args, _kwargs)
         if val: val = wxColourPtr(val) 
@@ -463,6 +482,9 @@ class wxDCPtr :
         val = apply(gdic.wxDC_GetTextForeground,(self,) + _args, _kwargs)
         if val: val = wxColourPtr(val) 
         return val
+    def GetUserScale(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_GetUserScale,(self,) + _args, _kwargs)
+        return val
     def LogicalToDeviceX(self, *_args, **_kwargs):
         val = apply(gdic.wxDC_LogicalToDeviceX,(self,) + _args, _kwargs)
         return val
@@ -514,6 +536,9 @@ class wxDCPtr :
     def SetLogicalFunction(self, *_args, **_kwargs):
         val = apply(gdic.wxDC_SetLogicalFunction,(self,) + _args, _kwargs)
         return val
+    def SetLogicalScale(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_SetLogicalScale,(self,) + _args, _kwargs)
+        return val
     def SetMapMode(self, *_args, **_kwargs):
         val = apply(gdic.wxDC_SetMapMode,(self,) + _args, _kwargs)
         return val
@@ -541,6 +566,31 @@ class wxDCPtr :
     def DrawBitmap(self, *_args, **_kwargs):
         val = apply(gdic.wxDC_DrawBitmap,(self,) + _args, _kwargs)
         return val
+    def CanDrawBitmap(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_CanDrawBitmap,(self,) + _args, _kwargs)
+        return val
+    def CanGetTextExtent(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_CanGetTextExtent,(self,) + _args, _kwargs)
+        return val
+    def GetDepth(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_GetDepth,(self,) + _args, _kwargs)
+        return val
+    def GetPPI(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_GetPPI,(self,) + _args, _kwargs)
+        if val: val = wxSizePtr(val) ; val.thisown = 1
+        return val
+    def GetLogicalOrigin(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_GetLogicalOrigin,(self,) + _args, _kwargs)
+        return val
+    def SetLogicalOrigin(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_SetLogicalOrigin,(self,) + _args, _kwargs)
+        return val
+    def GetDeviceOrigin(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_GetDeviceOrigin,(self,) + _args, _kwargs)
+        return val
+    def SetAxisOrientation(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_SetAxisOrientation,(self,) + _args, _kwargs)
+        return val
     def __repr__(self):
         return "<C wxDC instance at %s>" % (self.this,)
 class wxDC(wxDCPtr):
@@ -571,12 +621,12 @@ class wxScreenDCPtr(wxDCPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
+    def StartDrawingOnTopWin(self, *_args, **_kwargs):
+        val = apply(gdic.wxScreenDC_StartDrawingOnTopWin,(self,) + _args, _kwargs)
+        return val
     def StartDrawingOnTop(self, *_args, **_kwargs):
         val = apply(gdic.wxScreenDC_StartDrawingOnTop,(self,) + _args, _kwargs)
         return val
-    def StartDrawingOnTopRect(self, *_args, **_kwargs):
-        val = apply(gdic.wxScreenDC_StartDrawingOnTopRect,(self,) + _args, _kwargs)
-        return val
     def EndDrawingOnTop(self, *_args, **_kwargs):
         val = apply(gdic.wxScreenDC_EndDrawingOnTop,(self,) + _args, _kwargs)
         return val
@@ -716,11 +766,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 wxMaskColour(*_args, **_kwargs):
     val = apply(gdic.wxMaskColour,_args,_kwargs)
     if val: val = wxMaskPtr(val); val.thisown = 1