compilation fix for WXWIN_COMPATIBILITY_2_2

[wxWidgets.git] / wxPython / src / mac / gdi.py

diff --git a/wxPython/src/mac/gdi.py b/wxPython/src/mac/gdi.py
index 38ff3be790abf3f34426b45d594f7790c2e849d7..5c0456b3517d6c95e7bdfa43ee2333041843bf8b 100644 (file)
--- a/wxPython/src/mac/gdi.py
+++ b/wxPython/src/mac/gdi.py
@@ -976,6 +976,39 @@ class wxMemoryDC(wxMemoryDCPtr):
 
 
 
+class wxBufferedDCPtr(wxMemoryDCPtr):
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def __repr__(self):
+        return "<C wxBufferedDC instance at %s>" % (self.this,)
+class wxBufferedDC(wxBufferedDCPtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(gdic.new_wxBufferedDC,_args,_kwargs)
+        self.thisown = 1
+
+
+
+def wxBufferedDCInternalBuffer(*_args,**_kwargs):
+    val = wxBufferedDCPtr(apply(gdic.new_wxBufferedDCInternalBuffer,_args,_kwargs))
+    val.thisown = 1
+    return val
+
+
+class wxBufferedPaintDCPtr(wxBufferedDCPtr):
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def __repr__(self):
+        return "<C wxBufferedPaintDC instance at %s>" % (self.this,)
+class wxBufferedPaintDC(wxBufferedPaintDCPtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(gdic.new_wxBufferedPaintDC,_args,_kwargs)
+        self.thisown = 1
+
+
+
+
 class wxScreenDCPtr(wxDCPtr):
     def __init__(self,this):
         self.this = this
@@ -1041,60 +1074,6 @@ class wxWindowDC(wxWindowDCPtr):
 
 
 
-class wxMetaFilePtr(wxObjectPtr):
-    def __init__(self,this):
-        self.this = this
-        self.thisown = 0
-    def __del__(self,gdic=gdic):
-        if self.thisown == 1 :
-            gdic.delete_wxMetaFile(self)
-    def Ok(self, *_args, **_kwargs):
-        val = apply(gdic.wxMetaFile_Ok,(self,) + _args, _kwargs)
-        return val
-    def SetClipboard(self, *_args, **_kwargs):
-        val = apply(gdic.wxMetaFile_SetClipboard,(self,) + _args, _kwargs)
-        return val
-    def GetSize(self, *_args, **_kwargs):
-        val = apply(gdic.wxMetaFile_GetSize,(self,) + _args, _kwargs)
-        if val: val = wxSizePtr(val) ; val.thisown = 1
-        return val
-    def GetWidth(self, *_args, **_kwargs):
-        val = apply(gdic.wxMetaFile_GetWidth,(self,) + _args, _kwargs)
-        return val
-    def GetHeight(self, *_args, **_kwargs):
-        val = apply(gdic.wxMetaFile_GetHeight,(self,) + _args, _kwargs)
-        return val
-    def GetFileName(self, *_args, **_kwargs):
-        val = apply(gdic.wxMetaFile_GetFileName,(self,) + _args, _kwargs)
-        return val
-    def __repr__(self):
-        return "<C wxMetaFile instance at %s>" % (self.this,)
-class wxMetaFile(wxMetaFilePtr):
-    def __init__(self,*_args,**_kwargs):
-        self.this = apply(gdic.new_wxMetaFile,_args,_kwargs)
-        self.thisown = 1
-
-
-
-
-class wxMetaFileDCPtr(wxDCPtr):
-    def __init__(self,this):
-        self.this = this
-        self.thisown = 0
-    def Close(self, *_args, **_kwargs):
-        val = apply(gdic.wxMetaFileDC_Close,(self,) + _args, _kwargs)
-        if val: val = wxMetaFilePtr(val) 
-        return val
-    def __repr__(self):
-        return "<C wxMetaFileDC instance at %s>" % (self.this,)
-class wxMetaFileDC(wxMetaFileDCPtr):
-    def __init__(self,*_args,**_kwargs):
-        self.this = apply(gdic.new_wxMetaFileDC,_args,_kwargs)
-        self.thisown = 1
-
-
-
-
 class wxPalettePtr(wxGDIObjectPtr):
     def __init__(self,this):
         self.this = this
@@ -1175,9 +1154,6 @@ class wxRegionPtr(wxGDIObjectPtr):
     def Clear(self, *_args, **_kwargs):
         val = apply(gdic.wxRegion_Clear,(self,) + _args, _kwargs)
         return val
-    def Offset(self, *_args, **_kwargs):
-        val = apply(gdic.wxRegion_Offset,(self,) + _args, _kwargs)
-        return val
     def Contains(self, *_args, **_kwargs):
         val = apply(gdic.wxRegion_Contains,(self,) + _args, _kwargs)
         return val
@@ -1330,6 +1306,11 @@ def wxIconFromXPMData(*_args, **_kwargs):
     if val: val = wxIconPtr(val); val.thisown = 1
     return val
 
+def wxIconFromBitmap(*_args, **_kwargs):
+    val = apply(gdic.wxIconFromBitmap,_args,_kwargs)
+    if val: val = wxIconPtr(val); val.thisown = 1
+    return val
+
 def wxStockCursor(*_args, **_kwargs):
     val = apply(gdic.wxStockCursor,_args,_kwargs)
     if val: val = wxCursorPtr(val); val.thisown = 1