X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/00360d4699d23a01c1c62d5d1c128bd9739a239d..91f43f15ba484bbddcf46bc03fe57e89e6fd2585:/wxPython/src/mac/gdi.py?ds=sidebyside

diff --git a/wxPython/src/mac/gdi.py b/wxPython/src/mac/gdi.py
index 292e3e7a57..5c0456b351 100644
--- a/wxPython/src/mac/gdi.py
+++ b/wxPython/src/mac/gdi.py
@@ -122,9 +122,6 @@ class wxIconPtr(wxGDIObjectPtr):
     def __del__(self,gdic=gdic):
         if self.thisown == 1 :
             gdic.delete_wxIcon(self)
-    def LoadFile(self, *_args, **_kwargs):
-        val = apply(gdic.wxIcon_LoadFile,(self,) + _args, _kwargs)
-        return val
     def Ok(self, *_args, **_kwargs):
         val = apply(gdic.wxIcon_Ok,(self,) + _args, _kwargs)
         return val
@@ -190,6 +187,51 @@ class wxNativeFontInfoPtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
+    def Init(self, *_args, **_kwargs):
+        val = apply(gdic.wxNativeFontInfo_Init,(self,) + _args, _kwargs)
+        return val
+    def GetPointSize(self, *_args, **_kwargs):
+        val = apply(gdic.wxNativeFontInfo_GetPointSize,(self,) + _args, _kwargs)
+        return val
+    def GetStyle(self, *_args, **_kwargs):
+        val = apply(gdic.wxNativeFontInfo_GetStyle,(self,) + _args, _kwargs)
+        return val
+    def GetWeight(self, *_args, **_kwargs):
+        val = apply(gdic.wxNativeFontInfo_GetWeight,(self,) + _args, _kwargs)
+        return val
+    def GetUnderlined(self, *_args, **_kwargs):
+        val = apply(gdic.wxNativeFontInfo_GetUnderlined,(self,) + _args, _kwargs)
+        return val
+    def GetFaceName(self, *_args, **_kwargs):
+        val = apply(gdic.wxNativeFontInfo_GetFaceName,(self,) + _args, _kwargs)
+        return val
+    def GetFamily(self, *_args, **_kwargs):
+        val = apply(gdic.wxNativeFontInfo_GetFamily,(self,) + _args, _kwargs)
+        return val
+    def GetEncoding(self, *_args, **_kwargs):
+        val = apply(gdic.wxNativeFontInfo_GetEncoding,(self,) + _args, _kwargs)
+        return val
+    def SetPointSize(self, *_args, **_kwargs):
+        val = apply(gdic.wxNativeFontInfo_SetPointSize,(self,) + _args, _kwargs)
+        return val
+    def SetStyle(self, *_args, **_kwargs):
+        val = apply(gdic.wxNativeFontInfo_SetStyle,(self,) + _args, _kwargs)
+        return val
+    def SetWeight(self, *_args, **_kwargs):
+        val = apply(gdic.wxNativeFontInfo_SetWeight,(self,) + _args, _kwargs)
+        return val
+    def SetUnderlined(self, *_args, **_kwargs):
+        val = apply(gdic.wxNativeFontInfo_SetUnderlined,(self,) + _args, _kwargs)
+        return val
+    def SetFaceName(self, *_args, **_kwargs):
+        val = apply(gdic.wxNativeFontInfo_SetFaceName,(self,) + _args, _kwargs)
+        return val
+    def SetFamily(self, *_args, **_kwargs):
+        val = apply(gdic.wxNativeFontInfo_SetFamily,(self,) + _args, _kwargs)
+        return val
+    def SetEncoding(self, *_args, **_kwargs):
+        val = apply(gdic.wxNativeFontInfo_SetEncoding,(self,) + _args, _kwargs)
+        return val
     def FromString(self, *_args, **_kwargs):
         val = apply(gdic.wxNativeFontInfo_FromString,(self,) + _args, _kwargs)
         return val
@@ -199,11 +241,18 @@ class wxNativeFontInfoPtr :
     def __str__(self, *_args, **_kwargs):
         val = apply(gdic.wxNativeFontInfo___str__,(self,) + _args, _kwargs)
         return val
+    def FromUserString(self, *_args, **_kwargs):
+        val = apply(gdic.wxNativeFontInfo_FromUserString,(self,) + _args, _kwargs)
+        return val
+    def ToUserString(self, *_args, **_kwargs):
+        val = apply(gdic.wxNativeFontInfo_ToUserString,(self,) + _args, _kwargs)
+        return val
     def __repr__(self):
         return "<C wxNativeFontInfo instance at %s>" % (self.this,)
 class wxNativeFontInfo(wxNativeFontInfoPtr):
-    def __init__(self,this):
-        self.this = this
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(gdic.new_wxNativeFontInfo,_args,_kwargs)
+        self.thisown = 1
 
 
 
@@ -277,10 +326,19 @@ class wxFontPtr(wxGDIObjectPtr):
     def GetEncoding(self, *_args, **_kwargs):
         val = apply(gdic.wxFont_GetEncoding,(self,) + _args, _kwargs)
         return val
+    def IsFixedWidth(self, *_args, **_kwargs):
+        val = apply(gdic.wxFont_IsFixedWidth,(self,) + _args, _kwargs)
+        return val
     def GetNativeFontInfo(self, *_args, **_kwargs):
         val = apply(gdic.wxFont_GetNativeFontInfo,(self,) + _args, _kwargs)
         if val: val = wxNativeFontInfoPtr(val) 
         return val
+    def GetNativeFontInfoDesc(self, *_args, **_kwargs):
+        val = apply(gdic.wxFont_GetNativeFontInfoDesc,(self,) + _args, _kwargs)
+        return val
+    def GetNativeFontInfoUserDesc(self, *_args, **_kwargs):
+        val = apply(gdic.wxFont_GetNativeFontInfoUserDesc,(self,) + _args, _kwargs)
+        return val
     def SetPointSize(self, *_args, **_kwargs):
         val = apply(gdic.wxFont_SetPointSize,(self,) + _args, _kwargs)
         return val
@@ -305,6 +363,9 @@ class wxFontPtr(wxGDIObjectPtr):
     def SetNativeFontInfo(self, *_args, **_kwargs):
         val = apply(gdic.wxFont_SetNativeFontInfo,(self,) + _args, _kwargs)
         return val
+    def SetNativeFontInfoUserDesc(self, *_args, **_kwargs):
+        val = apply(gdic.wxFont_SetNativeFontInfoUserDesc,(self,) + _args, _kwargs)
+        return val
     def GetFamilyString(self, *_args, **_kwargs):
         val = apply(gdic.wxFont_GetFamilyString,(self,) + _args, _kwargs)
         return val
@@ -631,6 +692,13 @@ class wxDCPtr(wxObjectPtr):
     def DrawIcon(self, *_args, **_kwargs):
         val = apply(gdic.wxDC_DrawIcon,(self,) + _args, _kwargs)
         return val
+    def DrawLabel(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_DrawLabel,(self,) + _args, _kwargs)
+        return val
+    def DrawImageLabel(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_DrawImageLabel,(self,) + _args, _kwargs)
+        if val: val = wxRectPtr(val) ; val.thisown = 1
+        return val
     def DrawLine(self, *_args, **_kwargs):
         val = apply(gdic.wxDC_DrawLine,(self,) + _args, _kwargs)
         return val
@@ -908,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
@@ -1205,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
@@ -1242,6 +1348,7 @@ wxFONTFAMILY_SWISS = gdic.wxFONTFAMILY_SWISS
 wxFONTFAMILY_MODERN = gdic.wxFONTFAMILY_MODERN
 wxFONTFAMILY_TELETYPE = gdic.wxFONTFAMILY_TELETYPE
 wxFONTFAMILY_MAX = gdic.wxFONTFAMILY_MAX
+wxFONTFAMILY_UNKNOWN = gdic.wxFONTFAMILY_UNKNOWN
 wxFONTSTYLE_NORMAL = gdic.wxFONTSTYLE_NORMAL
 wxFONTSTYLE_ITALIC = gdic.wxFONTSTYLE_ITALIC
 wxFONTSTYLE_SLANT = gdic.wxFONTSTYLE_SLANT