Reverted wxString members to const wxChar * for struct BugsGridData

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

diff --git a/utils/wxPython/src/msw/gdi.py b/utils/wxPython/src/msw/gdi.py
index 34b2e025adf9daccabb8aa20b58b111e12bde8c9..b19e0c86e421f1f71a73ddd27bb7fccd7877a48f 100644 (file)
--- a/utils/wxPython/src/msw/gdi.py
+++ b/utils/wxPython/src/msw/gdi.py
@@ -2,50 +2,7 @@
 import gdic
 
 from misc import *
-class wxGDIImagePtr :
-    def __init__(self,this):
-        self.this = this
-        self.thisown = 0
-    def GetHandle(self, *_args, **_kwargs):
-        val = apply(gdic.wxGDIImage_GetHandle,(self,) + _args, _kwargs)
-        return val
-    def SetHandle(self, *_args, **_kwargs):
-        val = apply(gdic.wxGDIImage_SetHandle,(self,) + _args, _kwargs)
-        return val
-    def Ok(self, *_args, **_kwargs):
-        val = apply(gdic.wxGDIImage_Ok,(self,) + _args, _kwargs)
-        return val
-    def GetWidth(self, *_args, **_kwargs):
-        val = apply(gdic.wxGDIImage_GetWidth,(self,) + _args, _kwargs)
-        return val
-    def GetHeight(self, *_args, **_kwargs):
-        val = apply(gdic.wxGDIImage_GetHeight,(self,) + _args, _kwargs)
-        return val
-    def GetDepth(self, *_args, **_kwargs):
-        val = apply(gdic.wxGDIImage_GetDepth,(self,) + _args, _kwargs)
-        return val
-    def SetWidth(self, *_args, **_kwargs):
-        val = apply(gdic.wxGDIImage_SetWidth,(self,) + _args, _kwargs)
-        return val
-    def SetHeight(self, *_args, **_kwargs):
-        val = apply(gdic.wxGDIImage_SetHeight,(self,) + _args, _kwargs)
-        return val
-    def SetDepth(self, *_args, **_kwargs):
-        val = apply(gdic.wxGDIImage_SetDepth,(self,) + _args, _kwargs)
-        return val
-    def SetSize(self, *_args, **_kwargs):
-        val = apply(gdic.wxGDIImage_SetSize,(self,) + _args, _kwargs)
-        return val
-    def __repr__(self):
-        return "<C wxGDIImage instance at %s>" % (self.this,)
-class wxGDIImage(wxGDIImagePtr):
-    def __init__(self,this):
-        self.this = this
-
-
-
-
-class wxBitmapPtr(wxGDIImagePtr):
+class wxBitmapPtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
@@ -72,6 +29,36 @@ class wxBitmapPtr(wxGDIImagePtr):
     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):
@@ -96,7 +83,7 @@ class wxMask(wxMaskPtr):
 
 
 
-class wxIconPtr(wxGDIImagePtr):
+class wxIconPtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
@@ -106,6 +93,36 @@ class wxIconPtr(wxGDIImagePtr):
     def LoadFile(self, *_args, **_kwargs):
         val = apply(gdic.wxIcon_LoadFile,(self,) + _args, _kwargs)
         return val
+    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 GetHeight(self, *_args, **_kwargs):
+        val = apply(gdic.wxIcon_GetHeight,(self,) + _args, _kwargs)
+        return val
+    def GetDepth(self, *_args, **_kwargs):
+        val = apply(gdic.wxIcon_GetDepth,(self,) + _args, _kwargs)
+        return val
+    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 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,)
 class wxIcon(wxIconPtr):
@@ -116,13 +133,43 @@ class wxIcon(wxIconPtr):
 
 
 
-class wxCursorPtr(wxGDIImagePtr):
+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):
@@ -231,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)
@@ -449,6 +499,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
@@ -470,6 +523,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) 
@@ -484,6 +541,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
@@ -535,6 +595,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
@@ -562,6 +625,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):
@@ -592,12 +680,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