fixed interpretation of <font size>: was always relative to current size, now conform...

[wxWidgets.git] / utils / wxPython / src / gtk / misc.py

diff --git a/utils/wxPython/src/gtk/misc.py b/utils/wxPython/src/gtk/misc.py
index f1d88ededcbc3b21c321c16c11abcb49f0ea7533..486aec9d0e20f328ab7ecfdcae9b48b5f54a3a5d 100644 (file)
--- a/utils/wxPython/src/gtk/misc.py
+++ b/utils/wxPython/src/gtk/misc.py
@@ -196,6 +196,18 @@ class wxRectPtr :
     def GetRight(self, *_args, **_kwargs):
         val = apply(miscc.wxRect_GetRight,(self,) + _args, _kwargs)
         return val
     def GetRight(self, *_args, **_kwargs):
         val = apply(miscc.wxRect_GetRight,(self,) + _args, _kwargs)
         return val

+    def SetLeft(self, *_args, **_kwargs):
+        val = apply(miscc.wxRect_SetLeft,(self,) + _args, _kwargs)
+        return val
+    def SetRight(self, *_args, **_kwargs):
+        val = apply(miscc.wxRect_SetRight,(self,) + _args, _kwargs)
+        return val
+    def SetTop(self, *_args, **_kwargs):
+        val = apply(miscc.wxRect_SetTop,(self,) + _args, _kwargs)
+        return val
+    def SetBottom(self, *_args, **_kwargs):
+        val = apply(miscc.wxRect_SetBottom,(self,) + _args, _kwargs)
+        return val

     def asTuple(self, *_args, **_kwargs):
         val = apply(miscc.wxRect_asTuple,(self,) + _args, _kwargs)
         return val
     def asTuple(self, *_args, **_kwargs):
         val = apply(miscc.wxRect_asTuple,(self,) + _args, _kwargs)
         return val


@@ -242,8 +254,11 @@ class wxPyTimerPtr :
     def __del__(self,miscc=miscc):
         if self.thisown == 1 :
             miscc.delete_wxPyTimer(self)
     def __del__(self,miscc=miscc):
         if self.thisown == 1 :
             miscc.delete_wxPyTimer(self)

-    def Interval(self, *_args, **_kwargs):
-        val = apply(miscc.wxPyTimer_Interval,(self,) + _args, _kwargs)
+    def GetInterval(self, *_args, **_kwargs):
+        val = apply(miscc.wxPyTimer_GetInterval,(self,) + _args, _kwargs)
+        return val
+    def IsOneShot(self, *_args, **_kwargs):
+        val = apply(miscc.wxPyTimer_IsOneShot,(self,) + _args, _kwargs)

         return val
     def Start(self, *_args, **_kwargs):
         val = apply(miscc.wxPyTimer_Start,(self,) + _args, _kwargs)
         return val
     def Start(self, *_args, **_kwargs):
         val = apply(miscc.wxPyTimer_Start,(self,) + _args, _kwargs)


@@ -381,6 +396,9 @@ class wxRegionPtr :
     def ContainsRect(self, *_args, **_kwargs):
         val = apply(miscc.wxRegion_ContainsRect,(self,) + _args, _kwargs)
         return val
     def ContainsRect(self, *_args, **_kwargs):
         val = apply(miscc.wxRegion_ContainsRect,(self,) + _args, _kwargs)
         return val

+    def ContainsRectDim(self, *_args, **_kwargs):
+        val = apply(miscc.wxRegion_ContainsRectDim,(self,) + _args, _kwargs)
+        return val

     def GetBox(self, *_args, **_kwargs):
         val = apply(miscc.wxRegion_GetBox,(self,) + _args, _kwargs)
         if val: val = wxRectPtr(val) ; val.thisown = 1
     def GetBox(self, *_args, **_kwargs):
         val = apply(miscc.wxRegion_GetBox,(self,) + _args, _kwargs)
         if val: val = wxRectPtr(val) ; val.thisown = 1


@@ -388,18 +406,42 @@ class wxRegionPtr :
     def Intersect(self, *_args, **_kwargs):
         val = apply(miscc.wxRegion_Intersect,(self,) + _args, _kwargs)
         return val
     def Intersect(self, *_args, **_kwargs):
         val = apply(miscc.wxRegion_Intersect,(self,) + _args, _kwargs)
         return val

+    def IntersectRect(self, *_args, **_kwargs):
+        val = apply(miscc.wxRegion_IntersectRect,(self,) + _args, _kwargs)
+        return val
+    def IntersectRegion(self, *_args, **_kwargs):
+        val = apply(miscc.wxRegion_IntersectRegion,(self,) + _args, _kwargs)
+        return val

     def IsEmpty(self, *_args, **_kwargs):
         val = apply(miscc.wxRegion_IsEmpty,(self,) + _args, _kwargs)
         return val
     def IsEmpty(self, *_args, **_kwargs):
         val = apply(miscc.wxRegion_IsEmpty,(self,) + _args, _kwargs)
         return val

+    def Union(self, *_args, **_kwargs):
+        val = apply(miscc.wxRegion_Union,(self,) + _args, _kwargs)
+        return val
+    def UnionRect(self, *_args, **_kwargs):
+        val = apply(miscc.wxRegion_UnionRect,(self,) + _args, _kwargs)
+        return val
+    def UnionRegion(self, *_args, **_kwargs):
+        val = apply(miscc.wxRegion_UnionRegion,(self,) + _args, _kwargs)
+        return val

     def Subtract(self, *_args, **_kwargs):
         val = apply(miscc.wxRegion_Subtract,(self,) + _args, _kwargs)
         return val
     def Subtract(self, *_args, **_kwargs):
         val = apply(miscc.wxRegion_Subtract,(self,) + _args, _kwargs)
         return val

-    def Union(self, *_args, **_kwargs):
-        val = apply(miscc.wxRegion_Union,(self,) + _args, _kwargs)
+    def SubtractRect(self, *_args, **_kwargs):
+        val = apply(miscc.wxRegion_SubtractRect,(self,) + _args, _kwargs)
+        return val
+    def SubtractRegion(self, *_args, **_kwargs):
+        val = apply(miscc.wxRegion_SubtractRegion,(self,) + _args, _kwargs)

         return val
     def Xor(self, *_args, **_kwargs):
         val = apply(miscc.wxRegion_Xor,(self,) + _args, _kwargs)
         return val
         return val
     def Xor(self, *_args, **_kwargs):
         val = apply(miscc.wxRegion_Xor,(self,) + _args, _kwargs)
         return val

+    def XorRect(self, *_args, **_kwargs):
+        val = apply(miscc.wxRegion_XorRect,(self,) + _args, _kwargs)
+        return val
+    def XorRegion(self, *_args, **_kwargs):
+        val = apply(miscc.wxRegion_XorRegion,(self,) + _args, _kwargs)
+        return val

     def __repr__(self):
         return "<C wxRegion instance at %s>" % (self.this,)
 class wxRegion(wxRegionPtr):
     def __repr__(self):
         return "<C wxRegion instance at %s>" % (self.this,)
 class wxRegion(wxRegionPtr):


@@ -525,6 +567,8 @@ class wxBusyInfo(wxBusyInfoPtr):
 
 #-------------- FUNCTION WRAPPERS ------------------
 
 
 #-------------- FUNCTION WRAPPERS ------------------
 

+wxIntersectRect = miscc.wxIntersectRect
+

 wxNewId = miscc.wxNewId
 
 wxRegisterId = miscc.wxRegisterId
 wxNewId = miscc.wxNewId
 
 wxRegisterId = miscc.wxRegisterId


@@ -565,6 +609,8 @@ wxEnableTopLevelWindows = miscc.wxEnableTopLevelWindows
 
 wxGetResource = miscc.wxGetResource
 
 
 wxGetResource = miscc.wxGetResource
 

+wxStripMenuCodes = miscc.wxStripMenuCodes
+

 
 
 #-------------- VARIABLE WRAPPERS ------------------
 
 
 #-------------- VARIABLE WRAPPERS ------------------