use wx/crt.h as the 'official' header for wxCRT wrappers instead of wxchar.h; add...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46395 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/crt.h b/include/wx/crt.h
index f6996509b5b4983dbc81370c7c41f0a0effc2498..ee7f6cb9451e13955da2cde7bf2c67e525c37d79 100644 (file)
--- a/include/wx/crt.h
+++ b/include/wx/crt.h
@@ -11,6 +11,11 @@
 #ifndef _WX_CRT_H_
 #define _WX_CRT_H_
 
-#include "wx/wxchar.h"
+// include wxChar type definition:
+#include "wx/chartype.h"
+
+// and wrappers for CRT functions:
+#include "wx/wxcrt.h"
+#include "wx/wxcrtvararg.h"
 
 #endif // _WX_CRT_H_

diff --git a/include/wx/string.h b/include/wx/string.h
index 76e8db2178b1608b5844941607d67a380e01268f..86eb7eef964259bcf1b668be6280c4966910c23e 100644 (file)
--- a/include/wx/string.h
+++ b/include/wx/string.h
@@ -3094,11 +3094,11 @@ wxStringIteratorNode::~wxStringIteratorNode()
 #endif // wxUSE_UNICODE_UTF8
 
 #if WXWIN_COMPATIBILITY_2_8
-    // lot of code out there doesn't explicitly include wx/wxchar.h, but uses
+    // lot of code out there doesn't explicitly include wx/crt.h, but uses
     // CRT wrappers that are now declared in wx/wxcrt.h and wx/wxcrtvararg.h,
     // so let's include this header now that wxString is defined and it's safe
     // to do it:
-    #include "wx/wxchar.h"
+    #include "wx/crt.h"
 #endif
 
 #endif  // _WX_WXSTRING_H_

diff --git a/include/wx/wxchar.h b/include/wx/wxchar.h
index ee1bed8f1cff6be686c41d8d6224e456319741c1..b5951817099b44942d8927d3390e76958bf35e0d 100644 (file)
--- a/include/wx/wxchar.h
+++ b/include/wx/wxchar.h
@@ -12,11 +12,8 @@
 #ifndef _WX_WXCHAR_H_
 #define _WX_WXCHAR_H_
 
-// include wxChar type definition:
-#include "wx/chartype.h"
-
-// and wrappers for CRT functions:
-#include "wx/wxcrt.h"
-#include "wx/wxcrtvararg.h"
+// This header used to define CRT functions wrappers in wxWidgets 2.8. This is
+// now done in (headers included by) wx/crt.h, so include it for compatibility:
+#include "wx/crt.h"
 
 #endif /* _WX_WXCHAR_H_ */

diff --git a/include/wx/wxcrt.h b/include/wx/wxcrt.h
index 4e82f89b87ac68999e74d816ed562377d32c4c58..6d4abb3dbe9d47e87ac28a63b72623943e39dba8 100644 (file)
--- a/include/wx/wxcrt.h
+++ b/include/wx/wxcrt.h
@@ -13,6 +13,9 @@
 #ifndef _WX_WXCRT_H_
 #define _WX_WXCRT_H_
 
+// NB: User code should include wx/crt.h instead of including this
+//     header directly.
+
 #include "wx/wxcrtbase.h"
 #include "wx/string.h"
 

diff --git a/include/wx/wxcrtvararg.h b/include/wx/wxcrtvararg.h
index 2fd54d4fedf193ae687a62f1d24243e338771b1f..cb8b2998c8c6d2e17cf71cfcedad01a38215b88e 100644 (file)
--- a/include/wx/wxcrtvararg.h
+++ b/include/wx/wxcrtvararg.h
@@ -13,6 +13,9 @@
 #ifndef _WX_WXCRTVARARG_H_
 #define _WX_WXCRTVARARG_H_
 
+// NB: User code should include wx/crt.h instead of including this
+//     header directly.
+
 #include "wx/wxcrt.h"
 #include "wx/strvararg.h"
 

diff --git a/src/common/db.cpp b/src/common/db.cpp
index 7ca9dc47ae85db1c45dd18807ccba36958e05af6..cf4f9a28b9b6d4b2c771560cc795b88fd278079c 100644 (file)
--- a/src/common/db.cpp
+++ b/src/common/db.cpp
@@ -43,7 +43,7 @@
 #endif
 
 #include "wx/filefn.h"
-#include "wx/wxchar.h"
+#include "wx/crt.h"
 
 #include <stdio.h>
 #include <string.h>

diff --git a/src/common/log.cpp b/src/common/log.cpp
index 113d20215896a924690dd199d8e363647a66a855..a9446dc8983a5bcfa0ce246c9fb4d0287ed2330f 100644 (file)
--- a/src/common/log.cpp
+++ b/src/common/log.cpp
@@ -42,7 +42,7 @@
 #include "wx/msgout.h"
 #include "wx/textfile.h"
 #include "wx/thread.h"
-#include "wx/wxchar.h"
+#include "wx/crt.h"
 
 // other standard headers
 #ifndef __WXWINCE__

diff --git a/src/common/wxcrt.cpp b/src/common/wxcrt.cpp
index b8961dcccd188082137b042f68b8d3c95372b394..a0430b73dc2bc0200779c51537caf840e6341d59 100644 (file)
--- a/src/common/wxcrt.cpp
+++ b/src/common/wxcrt.cpp
@@ -20,7 +20,7 @@
     #pragma hdrstop
 #endif
 
-#include "wx/wxchar.h"
+#include "wx/crt.h"
 
 #define _ISOC9X_SOURCE 1 // to get vsscanf()
 #define _BSD_SOURCE    1 // to still get strdup()
@@ -90,7 +90,7 @@ size_t WXDLLEXPORT wxMB2WC(wchar_t *buf, const char *psz, size_t n)
   // to just get the size of the needed buffer -- this is needed as otherwise
   // we have no idea about how much space we need and if the CRT doesn't
   // support it (the only currently known example being Metrowerks, see
-  // wx/wxchar.h) we don't use its mbstowcs() at all
+  // wx/crt.h) we don't use its mbstowcs() at all
 #ifdef HAVE_WCSRTOMBS
   return mbsrtowcs((wchar_t *) NULL, &psz, 0, &mbstate);
 #else

diff --git a/src/common/wxprintf.cpp b/src/common/wxprintf.cpp
index 20bea8eea47faf20f137d6222351021ab2e8d6af..c9f25d80821331c936ef6d9929af5937e564666f 100644 (file)
--- a/src/common/wxprintf.cpp
+++ b/src/common/wxprintf.cpp
@@ -20,7 +20,7 @@
     #pragma hdrstop
 #endif
 
-#include "wx/wxchar.h"
+#include "wx/crt.h"
 
 #include <string.h>
 

diff --git a/src/generic/fontdlgg.cpp b/src/generic/fontdlgg.cpp
index 32fb9da9363e7d9099f52443790bfb7fd2f4ece4..3dccde50dda3be80ed6832773d4e99d85f2a4433 100644 (file)
--- a/src/generic/fontdlgg.cpp
+++ b/src/generic/fontdlgg.cpp
@@ -20,7 +20,7 @@
 
 #ifndef WX_PRECOMP
     #include <stdio.h>
-    #include "wx/wxchar.h"
+    #include "wx/crt.h"
     #include "wx/utils.h"
     #include "wx/dialog.h"
     #include "wx/listbox.h"

diff --git a/src/mac/carbon/fontdlg.cpp b/src/mac/carbon/fontdlg.cpp
index 5e0b9757812762cddc194e854f266cba2aa8d5dd..e155dd7bd542e155cc0a9dd0a70c72cb85afe2fe 100644 (file)
--- a/src/mac/carbon/fontdlg.cpp
+++ b/src/mac/carbon/fontdlg.cpp
@@ -28,7 +28,7 @@
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
-    #include "wx/wxchar.h"
+    #include "wx/crt.h"
     #include "wx/dcclient.h"
     #include "wx/frame.h"
     #include "wx/textctrl.h"

diff --git a/src/msw/app.cpp b/src/msw/app.cpp
index 28e359be38958f13b472c22a80ed5bcbd8326a2c..843b4d3c887337e02fa36d81e5a2a76214bbe080 100644 (file)
--- a/src/msw/app.cpp
+++ b/src/msw/app.cpp
@@ -40,7 +40,7 @@
     #include "wx/dialog.h"
     #include "wx/msgdlg.h"
     #include "wx/intl.h"
-    #include "wx/wxchar.h"
+    #include "wx/crt.h"
     #include "wx/log.h"
     #include "wx/module.h"
 #endif

diff --git a/src/os2/app.cpp b/src/os2/app.cpp
index 65b080d5e955ec2d949e4b14c294dbe4b991d445..758e6c7c449c7ca93282e188834620bd09a2ac5b 100644 (file)
--- a/src/os2/app.cpp
+++ b/src/os2/app.cpp
@@ -28,7 +28,7 @@
     #include "wx/dialog.h"
     #include "wx/msgdlg.h"
     #include "wx/intl.h"
-    #include "wx/wxchar.h"
+    #include "wx/crt.h"
     #include "wx/log.h"
     #include "wx/module.h"
 #endif

diff --git a/src/os2/radiobox.cpp b/src/os2/radiobox.cpp
index 26c89bd5ac1a5fa503f4b42cfa1de2cd58f461c6..6b09f2264606d62d78942b13f6f6ab3bd797f631 100644 (file)
--- a/src/os2/radiobox.cpp
+++ b/src/os2/radiobox.cpp
@@ -18,7 +18,7 @@
 
 #ifndef WX_PRECOMP
     #include <stdio.h>
-    #include "wx/wxchar.h"
+    #include "wx/crt.h"
     #include "wx/string.h"
     #include "wx/bitmap.h"
     #include "wx/brush.h"

diff --git a/src/palmos/app.cpp b/src/palmos/app.cpp
index 7efb190ac698656600db3e8dd11947fd62fadca2..cfc5e1e70af14c2dc0f41d287455defbf1f65b71 100644 (file)
--- a/src/palmos/app.cpp
+++ b/src/palmos/app.cpp
@@ -39,7 +39,7 @@
     #include "wx/dialog.h"
     #include "wx/msgdlg.h"
     #include "wx/intl.h"
-    #include "wx/wxchar.h"
+    #include "wx/crt.h"
     #include "wx/log.h"
     #include "wx/module.h"
 #endif

diff --git a/src/unix/dialup.cpp b/src/unix/dialup.cpp
index 0f187a106b977e4c280ff1708f94f9cd3d611aa7..859e02730724fa533dcf82af75027871229c9253 100644 (file)
--- a/src/unix/dialup.cpp
+++ b/src/unix/dialup.cpp
@@ -29,7 +29,7 @@
 #include "wx/filefn.h"
 #include "wx/ffile.h"
 #include "wx/process.h"
-#include "wx/wxchar.h"
+#include "wx/crt.h"
 
 #include <stdlib.h>