Update of /cvsroot/mahogany/M/include
In directory sc8-pr-cvs1:/tmp/cvs-serv11238/include

Modified Files:
        Mcclient.h 
Log Message:
need to #undef more stuff after including windows.h

Index: Mcclient.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/Mcclient.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -b -u -2 -r1.12 -r1.13
--- Mcclient.h  1 Jun 2003 22:48:26 -0000       1.12
+++ Mcclient.h  3 Aug 2003 23:57:12 -0000       1.13
@@ -44,14 +44,13 @@
 #  undef MESSAGE
 
-   // windows.h included from osdep.h under Windows #defines all these
-#  undef   CreateDialog
-#  undef   DrawText
-#  undef   FindWindow
-#  undef   GetCharWidth
-#  undef   GetClassInfo
-#  undef   GetMessage
-#  undef   LoadAccelerators
+   // windows.h included from osdep.h under Windows #defines many symbols which
+   // conflict with our ones
+#  ifdef OS_WIN
+      // including this header will #undef most of the harm done
+#     include <wx/msw/winundef.h>
+
+      // but not all
 #  undef   SendMessage
-#  undef   StartDoc
+#  endif // OS_WIN
 
    // finally it also defines the name commonly used as C++ template parameter!



-------------------------------------------------------
This SF.Net email sponsored by: Free pre-built ASP.NET sites including
Data Reports, E-commerce, Portals, and Forums are available now.
Download today and enter to win an XBOX or Visual Studio .NET.
http://aspnet.click-url.com/go/psa00100003ave/direct;at.aspnet_072303_01/01
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates

Reply via email to