Some ifdef's to correct compile problems on wxMac

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

diff --git a/wxPython/contrib/dllwidget/dllwidget_.i b/wxPython/contrib/dllwidget/dllwidget_.i
index 37aa1781db54980a7634de7d69d73accda5c513f..47c2f246451997b059f65bb54776b31a15c038a1 100644 (file)
--- a/wxPython/contrib/dllwidget/dllwidget_.i
+++ b/wxPython/contrib/dllwidget/dllwidget_.i
@@ -14,7 +14,7 @@
 
 
 %{
-#include "export.h"
+#include "wxPython.h"
 #include "dllwidget.h"
 %}
 
@@ -27,6 +27,13 @@
 %extern windows.i
 %extern _defs.i
 
+//----------------------------------------------------------------------
+
+%{
+    // Put some wx default wxChar* values into wxStrings.
+    static const wxString wxPyEmptyString(wxT(""));
+%}
+
 //---------------------------------------------------------------------------
 
 /*
@@ -82,8 +89,8 @@ class wxDllWidget : public wxPanel
 public:
     wxDllWidget(wxWindow *parent,
                 wxWindowID id = -1,
-                const wxString& dllName = wxEmptyString,
-                const wxString& className = wxEmptyString,
+                const wxString& dllName = wxPyEmptyString,
+                const wxString& className = wxPyEmptyString,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = 0);
@@ -92,8 +99,8 @@ public:
 
     bool Ok();
 
-    int SendCommand(int cmd, const wxString& param = wxEmptyString);
-    wxWindow* GetEmbeddedWindow();
+    int SendCommand(int cmd, const wxString& param = wxPyEmptyString);
+    wxWindow* GetWidgetWindow();
 
     static wxString GetDllExt();
 };
@@ -102,9 +109,6 @@ public:
 
 %init %{
 
-    wxClassInfo::CleanUpClasses();
-    wxClassInfo::InitializeClasses();
-
 %}