bh: thuban/libraries/thuban wxproj.cpp,1.7,1.8

[cvs@intevation.de]

Author: bh

Update of /thubanrepository/thuban/libraries/thuban
In directory doto:/tmp/cvs-serv18352/libraries/thuban

Modified Files:
	wxproj.cpp 
Log Message:
Move the compatibility code that
deals with the wxPython 2.4 version of wxPython.h into the #ifdef
branch that includes wxPython.h because it's only needed when
wxPython.h is used.  Also, it won't compile when
USE_WX_PYTHON_SWIG_HACK is set otherwise.


Index: wxproj.cpp
===================================================================
RCS file: /thubanrepository/thuban/libraries/thuban/wxproj.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- wxproj.cpp	5 Apr 2005 21:12:24 -0000	1.7
+++ wxproj.cpp	11 Apr 2005 18:18:08 -0000	1.8
@@ -38,9 +38,6 @@
  */
 #ifndef USE_WX_PYTHON_SWIG_HACK
 #include <wx/wxPython/wxPython.h>
-#else
-#include "swigPtrConvertHack.h"
-#endif
 
 /* Compatibility code to cope with wxPython.h from wxPython 2.4.
  *
@@ -69,8 +66,11 @@
 }
 #undef wxT
 #define wxT(a) ("_" a "_p")
-#endif
+#endif /* not wxPyConvertSwigPtr */
 
+#else /* USE_WX_PYTHON_SWIG_HACK */
+#include "swigPtrConvertHack.h"
+#endif /* USE_WX_PYTHON_SWIG_HACK */
 
 /* pyshapelib api pointer */
 static PyShapeLibAPI * pyshapelib_api;