set m_encoding in wxCSConv ctor from name

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

diff --git a/include/wx/wxprec.h b/include/wx/wxprec.h
index 4037833a48c7c5f66a27792c7ba51413e1e47a0b..6baf80e6f04ed10fe65c6d95683b41a8979a6000 100644 (file)
--- a/include/wx/wxprec.h
+++ b/include/wx/wxprec.h
@@ -1,11 +1,11 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        wxprec.h
+// Name:        wx/wxprec.h

 // Purpose:     Includes the appropriate files for precompiled headers
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Purpose:     Includes the appropriate files for precompiled headers
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$

-// Copyright:   (c)
+// Copyright:   (c) Julian Smart

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -36,7 +36,7 @@
 
 #ifdef WX_PRECOMP
 
 
 #ifdef WX_PRECOMP
 

-// include <wx/wxchar.h> first to ensure that UNICODE macro is correctly set
+// include "wx/wxchar.h" first to ensure that UNICODE macro is correctly set

 // _before_ including <windows.h>
 #include "wx/wxchar.h"
 
 // _before_ including <windows.h>
 #include "wx/wxchar.h"
 


@@ -45,6 +45,21 @@
     #include "wx/msw/wrapwin.h"
 #endif
 
     #include "wx/msw/wrapwin.h"
 #endif
 

+// include all PalmOS headers at once
+#ifdef __WXPALMOS__
+#   include <PalmOS.h>
+#endif
+
+// include <os2.h>
+#ifdef __OS2__
+#   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"
 
 // include the most common wx headers
 #include "wx/wx.h"