Applied #15226 with modifications: wxRichTextCtrl: Implement setting properties with...

[wxWidgets.git] / include / wx / wxprec.h

diff --git a/include/wx/wxprec.h b/include/wx/wxprec.h
index 19f78394352a783e6ad6102101a4baeb011fb837..2b50dff4b355b7c9d0d05474a537d3b576c32d9d 100644 (file)
--- a/include/wx/wxprec.h
+++ b/include/wx/wxprec.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -17,7 +16,6 @@
 #if defined(__VISUALC__)   || \
     defined(__DMC__)       || \
     defined(__VISAGECPP__) || \
-    defined(__MWERKS__)    || \
     defined(__WATCOMC__)   || \
     defined(__BORLANDC__)
 
@@ -41,11 +39,13 @@
 #include "wx/chartype.h"
 
 // include standard Windows headers
-#if defined(__WXMSW__)
+#if defined(__WINDOWS__)
     #include "wx/msw/wrapwin.h"
+    #include "wx/msw/private.h"
+#endif
+#if defined(__WXMSW__)
     #include "wx/msw/wrapcctl.h"
     #include "wx/msw/wrapcdlg.h"
-    #include "wx/msw/private.h"
     #include "wx/msw/missing.h"
 #endif
 
@@ -54,11 +54,6 @@
 #   include "wx/os2/private.h"
 #endif
 
-// include mgl headers
-#ifdef __WXMGL__
-#   include "wx/mgl/private.h"
-#endif
-
 // include the most common wx headers
 #include "wx/wx.h"