Changes needed for new RTL methods, and also various other updates to

[wxWidgets.git] / wxPython / src / gdi.i

diff --git a/wxPython/src/gdi.i b/wxPython/src/gdi.i
index 79c9c82caf3f4a40aa67ea3478068ef3d3aecc86..fe351aebe31d7d4f59e9d30f1cd14e3ce961296f 100644 (file)
--- a/wxPython/src/gdi.i
+++ b/wxPython/src/gdi.i
@@ -10,7 +10,7 @@
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
-%module gdi
+%module(package="wx") _gdi
 
 //---------------------------------------------------------------------------
 
@@ -18,21 +18,18 @@
 #include "wx/wxPython/wxPython.h"
 #include "wx/wxPython/pyclasses.h"
     
-    DECLARE_DEF_STRING(EmptyString);
 %}
 
 //---------------------------------------------------------------------------
 
 %import core.i
-%pythoncode { wx = core }
+%pythoncode { wx = _core }
 
+MAKE_CONST_WXSTRING_NOSWIG(EmptyString);
 
-// Include all the files that make up this module
-
-%include _gdi_rename.i
 
+// Include all the files that make up this module
 
-// GDI
 %include _gdiobj.i
 %include _colour.i
 %include _palette.i
@@ -47,9 +44,14 @@
 %include _dc.i
 %include _imaglist.i
 %include _stockobjs.i
-%include _dragimg.i
 %include _effects.i
-
+%include _renderer.i
+%include _pseudodc.i
 
 //---------------------------------------------------------------------------
+%init %{
+    // Work around a chicken/egg problem in drawlist.cpp
+    wxPyDrawList_SetAPIPtr();
+%}
+
 //---------------------------------------------------------------------------