undid one of the last SWIG tweaks

[wxWidgets.git] / wxPython / contrib / dllwidget / dllwidget_.py

diff --git a/wxPython/contrib/dllwidget/dllwidget_.py b/wxPython/contrib/dllwidget/dllwidget_.py
index 377dbf404d56d47384b60a508d2c2a37fd3619aa..39ace44c843ede88d8382d1fa3f977068e9bba0a 100644 (file)
--- a/wxPython/contrib/dllwidget/dllwidget_.py
+++ b/wxPython/contrib/dllwidget/dllwidget_.py
@@ -9,6 +9,8 @@ from windows import *
 
 from gdi import *
 
 
 from gdi import *
 

+from fonts import *
+

 from clip_dnd import *
 
 from events import *
 from clip_dnd import *
 
 from events import *


@@ -45,19 +47,19 @@ class wxDllWidgetPtr(wxPanelPtr):
         self.this = this
         self.thisown = 0
     def Ok(self, *_args, **_kwargs):
         self.this = this
         self.thisown = 0
     def Ok(self, *_args, **_kwargs):

-        val = apply(dllwidget_c.wxDllWidget_Ok,(self,) + _args, _kwargs)
+        val = dllwidget_c.wxDllWidget_Ok(self, *_args, **_kwargs)

         return val
     def SendCommand(self, *_args, **_kwargs):
         return val
     def SendCommand(self, *_args, **_kwargs):

-        val = apply(dllwidget_c.wxDllWidget_SendCommand,(self,) + _args, _kwargs)
+        val = dllwidget_c.wxDllWidget_SendCommand(self, *_args, **_kwargs)

         return val
         return val

-    def GetEmbeddedWindow(self, *_args, **_kwargs):
-        val = apply(dllwidget_c.wxDllWidget_GetEmbeddedWindow,(self,) + _args, _kwargs)
+    def GetWidgetWindow(self, *_args, **_kwargs):
+        val = dllwidget_c.wxDllWidget_GetWidgetWindow(self, *_args, **_kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxDllWidget instance at %s>" % (self.this,)
+        return "<%s.%s instance; proxy of C++ wxDllWidget instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)

 class wxDllWidget(wxDllWidgetPtr):
     def __init__(self,*_args,**_kwargs):
 class wxDllWidget(wxDllWidgetPtr):
     def __init__(self,*_args,**_kwargs):

-        self.this = apply(dllwidget_c.new_wxDllWidget,_args,_kwargs)
+        self.this = dllwidget_c.new_wxDllWidget(*_args,**_kwargs)

         self.thisown = 1
         self._setOORInfo(self)
 
         self.thisown = 1
         self._setOORInfo(self)