Merged wxPython 2.2.2 over to the main branch

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8658 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

wxPython/src/gtk/misc.py

@@ -80,6 +80,17 @@ class wxRealPointPtr :
     def asTuple(self, *_args, **_kwargs):
         val = apply(miscc.wxRealPoint_asTuple,(self,) + _args, _kwargs)
         return val
+    def __add__(self, *_args, **_kwargs):
+        val = apply(miscc.wxRealPoint___add__,(self,) + _args, _kwargs)
+        if val: val = wxRealPointPtr(val) ; val.thisown = 1
+        return val
+    def __sub__(self, *_args, **_kwargs):
+        val = apply(miscc.wxRealPoint___sub__,(self,) + _args, _kwargs)
+        if val: val = wxRealPointPtr(val) ; val.thisown = 1
+        return val
+    def __cmp__(self, *_args, **_kwargs):
+        val = apply(miscc.wxRealPoint___cmp__,(self,) + _args, _kwargs)
+        return val
     def __setattr__(self,name,value):
         if name == "x" :
             miscc.wxRealPoint_x_set(self,value)
@@ -119,6 +130,17 @@ class wxPointPtr :
     def asTuple(self, *_args, **_kwargs):
         val = apply(miscc.wxPoint_asTuple,(self,) + _args, _kwargs)
         return val
+    def __add__(self, *_args, **_kwargs):
+        val = apply(miscc.wxPoint___add__,(self,) + _args, _kwargs)
+        if val: val = wxPointPtr(val) ; val.thisown = 1
+        return val
+    def __sub__(self, *_args, **_kwargs):
+        val = apply(miscc.wxPoint___sub__,(self,) + _args, _kwargs)
+        if val: val = wxPointPtr(val) ; val.thisown = 1
+        return val
+    def __cmp__(self, *_args, **_kwargs):
+        val = apply(miscc.wxPoint___cmp__,(self,) + _args, _kwargs)
+        return val
     def __setattr__(self,name,value):
         if name == "x" :
             miscc.wxPoint_x_set(self,value)
@@ -605,8 +627,6 @@ wxDisplaySize = miscc.wxDisplaySize
 
 wxEndBusyCursor = miscc.wxEndBusyCursor
 
-wxExecute = miscc.wxExecute
-
 wxGetElapsedTime = miscc.wxGetElapsedTime
 
 wxGetMousePosition = miscc.wxGetMousePosition
@@ -621,11 +641,13 @@ wxStartTimer = miscc.wxStartTimer
 
 wxGetOsVersion = miscc.wxGetOsVersion
 
+wxGetOsDescription = miscc.wxGetOsDescription
+
 wxSleep = miscc.wxSleep
 
-wxYield = miscc.wxYield
+wxUsleep = miscc.wxUsleep
 
-wxSafeYield = miscc.wxSafeYield
+wxYield = miscc.wxYield
 
 wxEnableTopLevelWindows = miscc.wxEnableTopLevelWindows
 
@@ -633,6 +655,23 @@ wxGetResource = miscc.wxGetResource
 
 wxStripMenuCodes = miscc.wxStripMenuCodes
 
+wxGetEmailAddress = miscc.wxGetEmailAddress
+
+wxGetHostName = miscc.wxGetHostName
+
+wxGetFullHostName = miscc.wxGetFullHostName
+
+wxGetUserId = miscc.wxGetUserId
+
+wxGetUserName = miscc.wxGetUserName
+
+wxGetHomeDir = miscc.wxGetHomeDir
+
+def wxGetAccelFromString(*_args, **_kwargs):
+    val = apply(miscc.wxGetAccelFromString,_args,_kwargs)
+    if val: val = wxAcceleratorEntryPtr(val)
+    return val
+
 
 
 #-------------- VARIABLE WRAPPERS ------------------