Better conversion functions for integral and floating point types,

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

diff --git a/wxPython/src/gdi.i b/wxPython/src/gdi.i
index 79c9c82caf3f4a40aa67ea3478068ef3d3aecc86..117e3705811e348d5bc82d8138a10bf0982c6f9d 100644 (file)
--- a/wxPython/src/gdi.i
+++ b/wxPython/src/gdi.i
@@ -18,7 +18,6 @@
 #include "wx/wxPython/wxPython.h"
 #include "wx/wxPython/pyclasses.h"
     
 #include "wx/wxPython/wxPython.h"
 #include "wx/wxPython/pyclasses.h"
     

-    DECLARE_DEF_STRING(EmptyString);

 %}
 
 //---------------------------------------------------------------------------
 %}
 
 //---------------------------------------------------------------------------


@@ -26,13 +25,14 @@
 %import core.i
 %pythoncode { wx = core }
 
 %import core.i
 %pythoncode { wx = core }
 

+%include _gdi_rename.i

 
 

-// Include all the files that make up this module

 
 

-%include _gdi_rename.i
+MAKE_CONST_WXSTRING_NOSWIG(EmptyString);

 
 
 
 

-// GDI
+// Include all the files that make up this module
+

 %include _gdiobj.i
 %include _colour.i
 %include _palette.i
 %include _gdiobj.i
 %include _colour.i
 %include _palette.i


@@ -47,9 +47,13 @@
 %include _dc.i
 %include _imaglist.i
 %include _stockobjs.i
 %include _dc.i
 %include _imaglist.i
 %include _stockobjs.i

-%include _dragimg.i

 %include _effects.i
 
 
 //---------------------------------------------------------------------------
 %include _effects.i
 
 
 //---------------------------------------------------------------------------

+%init %{
+    // Work around a chicken/egg problem in drawlist.cpp
+    wxPyDrawList_SetAPIPtr();
+%}
+

 //---------------------------------------------------------------------------
 //---------------------------------------------------------------------------