corrections to dynamic loading for Darwin

[wxWidgets.git] / utils / wxPython / src / wxp.cpp

diff --git a/utils/wxPython/src/wxp.cpp b/utils/wxPython/src/wxp.cpp
index 8b489867f4905526cffeb701e8bbcea7109ff975..cea3c3c5c41096eb905c9c5fbb712182d44679e0 100644 (file)
--- a/utils/wxPython/src/wxp.cpp
+++ b/utils/wxPython/src/wxp.cpp
@@ -33,8 +33,22 @@
  * and things like that.
  *
  * $Log$
- * Revision 1.2  1998/08/14 03:16:36  RD
- * removed some definitions that got removed from defs.h
+ * Revision 1.6  1999/06/28 21:39:47  VZ
+ * 1. wxStaticLine implemented (generic (ugly) and MSW versions)
+ * 2. wxTextDialog looks fine under MSW again
+ * 3. startup tips added: code, sample, docs
+ * 4. read-only text controls don't participate in TAB traversal
+ *
+ * Revision 1.5  1998/08/18 21:50:09  RD
+ *
+ * moving the SWIG-generated files to toolkit specific subdirectories
+ *
+ * Revision 1.4  1998/08/15 07:36:51  RD
+ * - Moved the header in the .i files out of the code that gets put into
+ * the .cpp files.  It caused CVS conflicts because of the RCS ID being
+ * different each time.
+ *
+ * - A few minor fixes.
  *
  ************************************************************************/
 
@@ -556,18 +570,6 @@ char *SWIG_GetPtr(char *_c, void **ptr, char *_t)
 
 #define SWIG_name    "wxpc"
 
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wxp.i
-// Purpose:     SWIG interface file for a python wxWindows module
-//
-// Author:      Robin Dunn
-//
-// Created:     5/22/98
-// RCS-ID:      $Id$
-// Copyright:   (c) 1998 by Total Control Software
-// Licence:     wxWindows license
-/////////////////////////////////////////////////////////////////////////////
-
 
 #ifdef __WXMSW__
 #include <windows.h>
@@ -632,12 +634,18 @@ extern char** string_LIST_helper(PyObject* source);
 extern wxPoint* wxPoint_LIST_helper(PyObject* source);
 extern wxBitmap** wxBitmap_LIST_helper(PyObject* source);
 extern wxString* wxString_LIST_helper(PyObject* source);
+#ifdef __WXMSW__
 extern wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source);
+#endif
 
 
 static char* wxStringErrorMsg = "string type is required for parameter";
 
 #ifdef __WXMSW__             // If building for win32...
+
+#include <windows.h>
+#undef GetClassName
+
 extern HINSTANCE wxhInstance;
 
 BOOL WINAPI DllMain(
@@ -1750,7 +1758,7 @@ SWIGEXPORT(void,initwxpc)() {
         PyDict_SetItemString(d,"wxEVT_COMMAND_TAB_SEL_CHANGING", PyInt_FromLong((long) wxEVT_COMMAND_TAB_SEL_CHANGING));
         PyDict_SetItemString(d,"wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED", PyInt_FromLong((long) wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED));
         PyDict_SetItemString(d,"wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING", PyInt_FromLong((long) wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING));
-        PyDict_SetItemString(d,"__version__", PyString_FromString("0.3.0"));
+        PyDict_SetItemString(d,"__version__", PyString_FromString("0.3.1"));
         PyDict_SetItemString(d,"cvar", SWIG_globals);
         SWIG_addvarlink(SWIG_globals,"wxPyDefaultPosition",_wrap_wxPyDefaultPosition_get, _wrap_wxPyDefaultPosition_set);
         SWIG_addvarlink(SWIG_globals,"wxPyDefaultSize",_wrap_wxPyDefaultSize_get, _wrap_wxPyDefaultSize_set);