Added "set new icon" menu item to taskbar sample; updated some makefiles

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

diff --git a/utils/wxPython/src/wxp.cpp b/utils/wxPython/src/wxp.cpp
index 59bf61d2b7eb50ac0b737f64d8da2097b2ce4ddf..cea3c3c5c41096eb905c9c5fbb712182d44679e0 100644 (file)
--- a/utils/wxPython/src/wxp.cpp
+++ b/utils/wxPython/src/wxp.cpp
@@ -33,6 +33,16 @@
  * and things like that.
  *
  * $Log$
+ * 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
@@ -632,6 +642,10 @@ extern wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source);
 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(