Remove wxUSE_WCHAR_T checks.

wxWidgets requires wchar_t for some time now; wx/chartype.h has a check
to fail complation without it. Simplify code by removing now-dead code
for the !wxUSE_WCHAR_T case.

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

diff --git a/include/wx/buffer.h b/include/wx/buffer.h
index 4be2660b67f6337ec91ee3f3398056336ebacbbc..d9640e25c040ea98758d3a5dce5d5d154a7742f6 100644 (file)
--- a/include/wx/buffer.h
+++ b/include/wx/buffer.h
@@ -359,7 +359,6 @@ public:
     wxCharBuffer(const wxCStrData& cstr);
 };
 
     wxCharBuffer(const wxCStrData& cstr);
 };
 

-#if wxUSE_WCHAR_T

 WXDLLIMPEXP_TEMPLATE_INSTANCE_BASE( wxScopedCharTypeBuffer<wchar_t> )
 WXDLLIMPEXP_TEMPLATE_INSTANCE_BASE( wxCharTypeBuffer<wchar_t> )
 
 WXDLLIMPEXP_TEMPLATE_INSTANCE_BASE( wxScopedCharTypeBuffer<wchar_t> )
 WXDLLIMPEXP_TEMPLATE_INSTANCE_BASE( wxCharTypeBuffer<wchar_t> )
 


@@ -379,7 +378,6 @@ public:
 
     wxWCharBuffer(const wxCStrData& cstr);
 };
 
     wxWCharBuffer(const wxCStrData& cstr);
 };

-#endif // wxUSE_WCHAR_T

 
 // wxCharTypeBuffer<T> implicitly convertible to T*
 template <typename T>
 
 // wxCharTypeBuffer<T> implicitly convertible to T*
 template <typename T>

diff --git a/include/wx/chartype.h b/include/wx/chartype.h
index 480d1b1e2d003f7dc45b903f02085d0b7520014f..88b1d5e624fceb156d9f349f61ab369e204fc615 100644 (file)
--- a/include/wx/chartype.h
+++ b/include/wx/chartype.h
@@ -59,37 +59,35 @@
     #endif
 #endif
 
     #endif
 #endif
 

-#if wxUSE_WCHAR_T
-    #ifdef HAVE_WCHAR_H
-        /* the current (as of Nov 2002) version of cygwin has a bug in its */
-        /* wchar.h -- there is no extern "C" around the declarations in it */
-        /* and this results in linking errors later; also, at least on some */
-        /* Cygwin versions, wchar.h requires sys/types.h */
-        #ifdef __CYGWIN__
-            #include <sys/types.h>
-            #ifdef __cplusplus
-                extern "C" {
-            #endif
-        #endif /* Cygwin */
-
-        #include <wchar.h>
-
-        #if defined(__CYGWIN__) && defined(__cplusplus)
-            }
-        #endif /* Cygwin and C++ */
-
-    #elif defined(HAVE_WCSTR_H)
-        /* old compilers have relevant declarations here */
-        #include <wcstr.h>
-    #elif defined(__FreeBSD__) || defined(__DARWIN__) || defined(__EMX__)
-        /* include stdlib.h for wchar_t */
-        #include <stdlib.h>
-    #endif /* HAVE_WCHAR_H */
-
-    #ifdef HAVE_WIDEC_H
-        #include <widec.h>
-    #endif
-#endif /* wxUSE_WCHAR_T */
+#ifdef HAVE_WCHAR_H
+    /* the current (as of Nov 2002) version of cygwin has a bug in its */
+    /* wchar.h -- there is no extern "C" around the declarations in it */
+    /* and this results in linking errors later; also, at least on some */
+    /* Cygwin versions, wchar.h requires sys/types.h */
+    #ifdef __CYGWIN__
+        #include <sys/types.h>
+        #ifdef __cplusplus
+            extern "C" {
+        #endif
+    #endif /* Cygwin */
+
+    #include <wchar.h>
+
+    #if defined(__CYGWIN__) && defined(__cplusplus)
+        }
+    #endif /* Cygwin and C++ */
+
+#elif defined(HAVE_WCSTR_H)
+    /* old compilers have relevant declarations here */
+    #include <wcstr.h>
+#elif defined(__FreeBSD__) || defined(__DARWIN__) || defined(__EMX__)
+    /* include stdlib.h for wchar_t */
+    #include <stdlib.h>
+#endif /* HAVE_WCHAR_H */
+
+#ifdef HAVE_WIDEC_H
+    #include <widec.h>
+#endif

 
 /* -------------------------------------------------------------------------- */
 /* define wxHAVE_TCHAR_SUPPORT for the compilers which support the TCHAR type */
 
 /* -------------------------------------------------------------------------- */
 /* define wxHAVE_TCHAR_SUPPORT for the compilers which support the TCHAR type */

diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h
index 38210b3e7554dfcd5d57df95be400bc446e31cc5..54c0c112fd79ee55263cee6a641912fdabb54d2a 100644 (file)
--- a/include/wx/chkconf.h
+++ b/include/wx/chkconf.h
@@ -1313,15 +1313,6 @@
 #   endif
 #endif /* wxUSE_TEXTFILE */
 
 #   endif
 #endif /* wxUSE_TEXTFILE */
 

-#if wxUSE_XML && !wxUSE_WCHAR_T
-#   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_XML requires wxUSE_WCHAR_T"
-#   else
-#       undef wxUSE_XML
-#       define wxUSE_XML 0
-#   endif
-#endif /* wxUSE_XML */
-

 #if !wxUSE_DYNLIB_CLASS
 #   if wxUSE_DYNAMIC_LOADER
 #       ifdef wxABORT_ON_CONFIG_ERROR
 #if !wxUSE_DYNLIB_CLASS
 #   if wxUSE_DYNAMIC_LOADER
 #       ifdef wxABORT_ON_CONFIG_ERROR

diff --git a/include/wx/confbase.h b/include/wx/confbase.h
index e0ed69ff5e37b3bab4249b0b03c3cd9e41c73f29..9df8edcc0a355385e8709786cdf2265de0e64ed7 100644 (file)
--- a/include/wx/confbase.h
+++ b/include/wx/confbase.h
@@ -226,10 +226,8 @@ public:
   // template Read() would be used
   wxString Read(const wxString& key, const char* defVal) const
     { return Read(key, wxString(defVal)); }
   // template Read() would be used
   wxString Read(const wxString& key, const char* defVal) const
     { return Read(key, wxString(defVal)); }

-#if wxUSE_WCHAR_T

   wxString Read(const wxString& key, const wchar_t* defVal) const
     { return Read(key, wxString(defVal)); }
   wxString Read(const wxString& key, const wchar_t* defVal) const
     { return Read(key, wxString(defVal)); }

-#endif

 
   long ReadLong(const wxString& key, long defVal) const
     { long l; (void)Read(key, &l, defVal); return l; }
 
   long ReadLong(const wxString& key, long defVal) const
     { long l; (void)Read(key, &l, defVal); return l; }


@@ -273,10 +271,8 @@ public:
     { return Write(key, wxString(value)); }
   bool Write(const wxString& key, const unsigned char *value)
     { return Write(key, wxString(value)); }
     { return Write(key, wxString(value)); }
   bool Write(const wxString& key, const unsigned char *value)
     { return Write(key, wxString(value)); }

-#if wxUSE_WCHAR_T

   bool Write(const wxString& key, const wchar_t *value)
     { return Write(key, wxString(value)); }
   bool Write(const wxString& key, const wchar_t *value)
     { return Write(key, wxString(value)); }

-#endif

 
 
   // we also have to provide specializations for other types which we want to
 
 
   // we also have to provide specializations for other types which we want to

diff --git a/include/wx/convauto.h b/include/wx/convauto.h
index 4de2bee9e74c4ca82affe73ebbffd99a93bcf407..bc514cea3b0d8675c4221bf35569302723316ce0 100644 (file)
--- a/include/wx/convauto.h
+++ b/include/wx/convauto.h
@@ -14,8 +14,6 @@
 #include "wx/strconv.h"
 #include "wx/fontenc.h"
 
 #include "wx/strconv.h"
 #include "wx/fontenc.h"
 

-#if wxUSE_WCHAR_T
-

 // ----------------------------------------------------------------------------
 // wxConvAuto: uses BOM to automatically detect input encoding
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxConvAuto: uses BOM to automatically detect input encoding
 // ----------------------------------------------------------------------------


@@ -144,7 +142,5 @@ private:
     wxDECLARE_NO_ASSIGN_CLASS(wxConvAuto);
 };
 
     wxDECLARE_NO_ASSIGN_CLASS(wxConvAuto);
 };
 

-#endif // wxUSE_WCHAR_T
-

 #endif // _WX_CONVAUTO_H_
 
 #endif // _WX_CONVAUTO_H_
 

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 7f43f5391adc3417e3b6f154782dc23edf0bae24..b1e7f2062f8f588fccab2aff33c2cdb98f803667 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -908,7 +908,7 @@ typedef wxUint16 wxWord;
         #if defined(__MACH__) && !defined(SIZEOF_WCHAR_T)
             #define SIZEOF_WCHAR_T 4
         #endif
         #if defined(__MACH__) && !defined(SIZEOF_WCHAR_T)
             #define SIZEOF_WCHAR_T 4
         #endif

-        #if wxUSE_WCHAR_T && !defined(SIZEOF_WCHAR_T)
+        #if !defined(SIZEOF_WCHAR_T)

             /*  also assume that sizeof(wchar_t) == 2 (under Unix the most */
             /*  common case is 4 but there configure would have defined */
             /*  SIZEOF_WCHAR_T for us) */
             /*  also assume that sizeof(wchar_t) == 2 (under Unix the most */
             /*  common case is 4 but there configure would have defined */
             /*  SIZEOF_WCHAR_T for us) */


@@ -917,10 +917,14 @@ typedef wxUint16 wxWord;
                                     Wchar_tMustBeExactly2Bytes);
 
             #define SIZEOF_WCHAR_T 2
                                     Wchar_tMustBeExactly2Bytes);
 
             #define SIZEOF_WCHAR_T 2

-        #endif /*  wxUSE_WCHAR_T */
+        #endif /*  !defined(SIZEOF_WCHAR_T) */

     #endif
 #endif /*  Win/!Win */
 
     #endif
 #endif /*  Win/!Win */
 

+#ifndef SIZEOF_WCHAR_T
+    #error "SIZEOF_WCHAR_T must be defined, but isn't"
+#endif
+

 /* also define C99-like sized MIN/MAX constants */
 #define wxINT8_MIN CHAR_MIN
 #define wxINT8_MAX CHAR_MAX
 /* also define C99-like sized MIN/MAX constants */
 #define wxINT8_MIN CHAR_MIN
 #define wxINT8_MAX CHAR_MAX


@@ -1248,14 +1252,14 @@ typedef double wxDouble;
 
 /* Define wxChar16 and wxChar32                                              */
 
 
 /* Define wxChar16 and wxChar32                                              */
 

-#if wxUSE_WCHAR_T && (!defined(SIZEOF_WCHAR_T) || (SIZEOF_WCHAR_T == 2))
+#if SIZEOF_WCHAR_T == 2

     #define wxWCHAR_T_IS_WXCHAR16
     typedef wchar_t wxChar16;
 #else
     typedef wxUint16 wxChar16;
 #endif
 
     #define wxWCHAR_T_IS_WXCHAR16
     typedef wchar_t wxChar16;
 #else
     typedef wxUint16 wxChar16;
 #endif
 

-#if wxUSE_WCHAR_T && defined(SIZEOF_WCHAR_T) && (SIZEOF_WCHAR_T == 4)
+#if SIZEOF_WCHAR_T == 4

     #define wxWCHAR_T_IS_WXCHAR32
     typedef wchar_t wxChar32;
 #else
     #define wxWCHAR_T_IS_WXCHAR32
     typedef wchar_t wxChar32;
 #else

diff --git a/include/wx/encconv.h b/include/wx/encconv.h
index 2c4bfa21e2c37eb9801320631539fa90624a5e45..5447fb5980b54664cb3f34a6f6b759042b71fd3d 100644 (file)
--- a/include/wx/encconv.h
+++ b/include/wx/encconv.h
@@ -57,7 +57,7 @@ class WXDLLIMPEXP_BASE wxEncodingConverter : public wxObject
             virtual ~wxEncodingConverter() { if (m_Table) delete[] m_Table; }
 
             // Initialize conversion. Both output or input encoding may
             virtual ~wxEncodingConverter() { if (m_Table) delete[] m_Table; }
 
             // Initialize conversion. Both output or input encoding may

-            // be wxFONTENCODING_UNICODE, but only if wxUSE_WCHAR_T is set to 1.
+            // be wxFONTENCODING_UNICODE.

             //
             // All subsequent calls to Convert() will interpret it's argument
             // as a string in input_enc encoding and will output string in
             //
             // All subsequent calls to Convert() will interpret it's argument
             // as a string in input_enc encoding and will output string in


@@ -91,12 +91,11 @@ class WXDLLIMPEXP_BASE wxEncodingConverter : public wxObject
             bool Convert(char* str) const { return Convert(str, str); }
             wxString Convert(const wxString& input) const;
 
             bool Convert(char* str) const { return Convert(str, str); }
             wxString Convert(const wxString& input) const;
 

-#if wxUSE_WCHAR_T

             bool Convert(const char* input, wchar_t* output) const;
             bool Convert(const wchar_t* input, char* output) const;
             bool Convert(const wchar_t* input, wchar_t* output) const;
             bool Convert(wchar_t* str) const { return Convert(str, str); }
             bool Convert(const char* input, wchar_t* output) const;
             bool Convert(const wchar_t* input, char* output) const;
             bool Convert(const wchar_t* input, wchar_t* output) const;
             bool Convert(wchar_t* str) const { return Convert(str, str); }

-#endif
+

             // Return equivalent(s) for given font that are used
             // under given platform. wxPLATFORM_CURRENT means the plaform
             // this binary was compiled for
             // Return equivalent(s) for given font that are used
             // under given platform. wxPLATFORM_CURRENT means the plaform
             // this binary was compiled for


@@ -144,12 +143,7 @@ class WXDLLIMPEXP_BASE wxEncodingConverter : public wxObject
             }
 
     private:
             }
 
     private:

-
-#if wxUSE_WCHAR_T

             wchar_t *m_Table;
             wchar_t *m_Table;

-#else
-            char *m_Table;
-#endif

             bool m_UnicodeInput, m_UnicodeOutput;
             bool m_JustCopy;
 
             bool m_UnicodeInput, m_UnicodeOutput;
             bool m_JustCopy;
 

diff --git a/include/wx/html/htmlpars.h b/include/wx/html/htmlpars.h
index f4df4344dd4d736b42e0455fe2eef32938b814db..e9fd5e013a50472453feede1d7b57ba709d65426 100644 (file)
--- a/include/wx/html/htmlpars.h
+++ b/include/wx/html/htmlpars.h
@@ -269,8 +269,12 @@ public:
     virtual ~wxHtmlEntitiesParser();
 
     // Sets encoding of output string.
     virtual ~wxHtmlEntitiesParser();
 
     // Sets encoding of output string.

-    // Has no effect if wxUSE_WCHAR_T==0 or wxUSE_UNICODE==1
+    // Has no effect if wxUSE_UNICODE==1
+#if wxUSE_UNICODE
+    void SetEncoding(wxFontEncoding WXUNUSED(encoding)) {}
+#else

     void SetEncoding(wxFontEncoding encoding);
     void SetEncoding(wxFontEncoding encoding);

+#endif

 
     // Parses entities in input and replaces them with respective characters
     // (with respect to output encoding)
 
     // Parses entities in input and replaces them with respective characters
     // (with respect to output encoding)


@@ -287,7 +291,7 @@ public:
 #endif
 
 protected:
 #endif
 
 protected:

-#if wxUSE_WCHAR_T && !wxUSE_UNICODE
+#if !wxUSE_UNICODE

     wxMBConv *m_conv;
     wxFontEncoding m_encoding;
 #endif
     wxMBConv *m_conv;
     wxFontEncoding m_encoding;
 #endif

diff --git a/include/wx/propgrid/propgridiface.h b/include/wx/propgrid/propgridiface.h
index 7b4041b4caa6d1188a8a3c4f40880e95ecf4b336..d68fa7abe85d15cafd799e69ad9f4d4bcca4597b 100644 (file)
--- a/include/wx/propgrid/propgridiface.h
+++ b/include/wx/propgrid/propgridiface.h
@@ -64,13 +64,11 @@ public:
         m_ptr.charName = str;
         m_flags = IsCharPtr;
     }
         m_ptr.charName = str;
         m_flags = IsCharPtr;
     }

-#if wxUSE_WCHAR_T

     wxPGPropArgCls( const wchar_t* str )
     {
         m_ptr.wcharName = str;
         m_flags = IsWCharPtr;
     }
     wxPGPropArgCls( const wchar_t* str )
     {
         m_ptr.wcharName = str;
         m_flags = IsWCharPtr;
     }

-#endif

     /** This constructor is required for NULL. */
     wxPGPropArgCls( int )
     {
     /** This constructor is required for NULL. */
     wxPGPropArgCls( int )
     {


@@ -100,9 +98,7 @@ private:
     {
         wxPGProperty* property;
         const char* charName;
     {
         wxPGProperty* property;
         const char* charName;

-#if wxUSE_WCHAR_T

         const wchar_t* wcharName;
         const wchar_t* wcharName;

-#endif

         const wxString* stringName;
     } m_ptr;
     unsigned char m_flags;
         const wxString* stringName;
     } m_ptr;
     unsigned char m_flags;


@@ -1171,12 +1167,10 @@ public:
         wxVariant v(value);
         SetPropVal( id, v );
     }
         wxVariant v(value);
         SetPropVal( id, v );
     }

-#if wxUSE_WCHAR_T

     void SetPropertyValue( wxPGPropArg id, const wchar_t* value )
     {
         SetPropertyValueString( id, wxString(value) );
     }
     void SetPropertyValue( wxPGPropArg id, const wchar_t* value )
     {
         SetPropertyValueString( id, wxString(value) );
     }

-#endif

     void SetPropertyValue( wxPGPropArg id, const char* value )
     {
         SetPropertyValueString( id, wxString(value) );
     void SetPropertyValue( wxPGPropArg id, const char* value )
     {
         SetPropertyValueString( id, wxString(value) );

diff --git a/include/wx/strconv.h b/include/wx/strconv.h
index 0847360a8f364e1873ed5e5a4a96357287799128..25ce7a0fb60a5d5cb483914db12c1a9bc093e1a7 100644 (file)
--- a/include/wx/strconv.h
+++ b/include/wx/strconv.h
@@ -29,8 +29,6 @@
 #include <stdlib.h>
 #endif // ! __WXPALMOS5__
 
 #include <stdlib.h>
 #endif // ! __WXPALMOS5__
 

-#if wxUSE_WCHAR_T
-

 class WXDLLIMPEXP_FWD_BASE wxString;
 
 // the error value returned by wxMBConv methods
 class WXDLLIMPEXP_FWD_BASE wxString;
 
 // the error value returned by wxMBConv methods


@@ -643,33 +641,6 @@ extern WXDLLIMPEXP_DATA_BASE(wxMBConv *) wxConvUI;
     #define wxFNSTRINGCAST WXSTRINGCAST
 #endif
 
     #define wxFNSTRINGCAST WXSTRINGCAST
 #endif
 

-#else // !wxUSE_WCHAR_T
-
-// ----------------------------------------------------------------------------
-// stand-ins in absence of wchar_t
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_BASE wxMBConv
-{
-public:
-    const char* cMB2WX(const char *psz) const { return psz; }
-    const char* cWX2MB(const char *psz) const { return psz; }
-};
-
-#define wxConvFile wxConvLocal
-
-extern WXDLLIMPEXP_DATA_BASE(wxMBConv) wxConvLibc,
-                                       wxConvLocal,
-                                       wxConvISO8859_1,
-                                       wxConvUTF8;
-extern WXDLLIMPEXP_DATA_BASE(wxMBConv *) wxConvCurrent;
-
-#define wxFNCONV(name) name
-#define wxFNSTRINGCAST WXSTRINGCAST
-
-#endif
-  // wxUSE_WCHAR_T
-

 // ----------------------------------------------------------------------------
 // macros for the most common conversions
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // macros for the most common conversions
 // ----------------------------------------------------------------------------

diff --git a/include/wx/wxcrt.h b/include/wx/wxcrt.h
index aa398aea5fa90f6cd9ab3db8c196ea39150442cd..f9e68ef71e26d56f6573d429a1ab623bf825ea05 100644 (file)
--- a/include/wx/wxcrt.h
+++ b/include/wx/wxcrt.h
@@ -39,26 +39,16 @@ inline bool wxIsEmpty(const wxCStrData& s) { return s.AsString().empty(); }
 
 /* multibyte to wide char conversion functions and macros */
 
 
 /* multibyte to wide char conversion functions and macros */
 

-#if wxUSE_WCHAR_T
-    /* multibyte<->widechar conversion */
-    WXDLLIMPEXP_BASE size_t wxMB2WC(wchar_t *buf, const char *psz, size_t n);
-    WXDLLIMPEXP_BASE size_t wxWC2MB(char *buf, const wchar_t *psz, size_t n);
-
-    #if wxUSE_UNICODE
-        #define wxMB2WX wxMB2WC
-        #define wxWX2MB wxWC2MB
-        #define wxWC2WX wxStrncpy
-        #define wxWX2WC wxStrncpy
-    #else
-        #define wxMB2WX wxStrncpy
-        #define wxWX2MB wxStrncpy
-        #define wxWC2WX wxWC2MB
-        #define wxWX2WC wxMB2WC
-    #endif
-#else /* !wxUSE_UNICODE */
-    /* No wxUSE_WCHAR_T: we have to do something (JACS) */
-    #define wxMB2WC wxStrncpy
-    #define wxWC2MB wxStrncpy
+/* multibyte<->widechar conversion */
+WXDLLIMPEXP_BASE size_t wxMB2WC(wchar_t *buf, const char *psz, size_t n);
+WXDLLIMPEXP_BASE size_t wxWC2MB(char *buf, const wchar_t *psz, size_t n);
+
+#if wxUSE_UNICODE
+    #define wxMB2WX wxMB2WC
+    #define wxWX2MB wxWC2MB
+    #define wxWC2WX wxStrncpy
+    #define wxWX2WC wxStrncpy
+#else

     #define wxMB2WX wxStrncpy
     #define wxWX2MB wxStrncpy
     #define wxWC2WX wxWC2MB
     #define wxMB2WX wxStrncpy
     #define wxWX2MB wxStrncpy
     #define wxWC2WX wxWC2MB

diff --git a/interface/wx/encconv.h b/interface/wx/encconv.h
index ceba036f84db006c22cec23557f7d2866af5428d..857531c6155006779fe7eb0b522ec9b7d701b618 100644 (file)
--- a/interface/wx/encconv.h
+++ b/interface/wx/encconv.h
@@ -10,8 +10,7 @@
     @class wxEncodingConverter
 
     This class is capable of converting strings between two 8-bit encodings/charsets.
     @class wxEncodingConverter
 
     This class is capable of converting strings between two 8-bit encodings/charsets.

-    It can also convert from/to Unicode (but only if you compiled wxWidgets
-    with @c wxUSE_WCHAR_T set to 1).
+    It can also convert from/to Unicode.

 
     Only a limited subset of encodings is supported by wxEncodingConverter:
     @c wxFONTENCODING_ISO8859_1..15, @c wxFONTENCODING_CP1250..1257 and
 
     Only a limited subset of encodings is supported by wxEncodingConverter:
     @c wxFONTENCODING_ISO8859_1..15, @c wxFONTENCODING_CP1250..1257 and


@@ -64,9 +63,6 @@ public:
         considered a lossless operation.
 
         @note You must call Init() before using this method!
         considered a lossless operation.
 
         @note You must call Init() before using this method!

-
-        @note wchar_t versions of the method are not available if wxWidgets was
-              compiled with @c wxUSE_WCHAR_T set to 0.

     */
     bool Convert(const char* input, char* output) const;
     bool Convert(const wchar_t* input, wchar_t* output) const;
     */
     bool Convert(const char* input, char* output) const;
     bool Convert(const wchar_t* input, wchar_t* output) const;

diff --git a/samples/propgrid/propgrid.cpp b/samples/propgrid/propgrid.cpp
index b546314ab4f83a61f3e8ba8bbcf5bd7c6dda7dc2..34723fc3ea20268ae983833911110eeecf324364 100644 (file)
--- a/samples/propgrid/propgrid.cpp
+++ b/samples/propgrid/propgrid.cpp
@@ -1922,7 +1922,6 @@ void FormMain::PopulateWithLibraryConfig ()
     ADD_WX_LIB_CONF_GROUP(wxT("Unicode Support"))
     ADD_WX_LIB_CONF( wxUSE_UNICODE )
     ADD_WX_LIB_CONF( wxUSE_UNICODE_MSLU )
     ADD_WX_LIB_CONF_GROUP(wxT("Unicode Support"))
     ADD_WX_LIB_CONF( wxUSE_UNICODE )
     ADD_WX_LIB_CONF( wxUSE_UNICODE_MSLU )

-    ADD_WX_LIB_CONF( wxUSE_WCHAR_T )

 
     ADD_WX_LIB_CONF_GROUP(wxT("Global Features"))
     ADD_WX_LIB_CONF( wxUSE_EXCEPTIONS )
 
     ADD_WX_LIB_CONF_GROUP(wxT("Global Features"))
     ADD_WX_LIB_CONF( wxUSE_EXCEPTIONS )

diff --git a/src/common/convauto.cpp b/src/common/convauto.cpp
index dde8af743e435a2c48a4f89bafd775b5017e5184..8d8c24c0a3e21ee2199f5b1a0b92d2d7c25869fb 100644 (file)
--- a/src/common/convauto.cpp
+++ b/src/common/convauto.cpp
@@ -23,8 +23,6 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#if wxUSE_WCHAR_T
-

 #ifndef WX_PRECOMP
     #include "wx/wx.h"
 #endif //WX_PRECOMP
 #ifndef WX_PRECOMP
     #include "wx/wx.h"
 #endif //WX_PRECOMP


@@ -318,5 +316,3 @@ wxConvAuto::FromWChar(char *dst, size_t dstLen,
 
     return m_conv->FromWChar(dst, dstLen, src, srcLen);
 }
 
     return m_conv->FromWChar(dst, dstLen, src, srcLen);
 }

-
-#endif // wxUSE_WCHAR_T

diff --git a/src/common/encconv.cpp b/src/common/encconv.cpp
index 92c8b04362f0092e81484acd7091b1c3fa300f1e..a4b7143ff38981b27ec237acda1f7e03ac77e72d 100644 (file)
--- a/src/common/encconv.cpp
+++ b/src/common/encconv.cpp
@@ -25,12 +25,6 @@
     #include "unictabl.inc"
 #endif
 
     #include "unictabl.inc"
 #endif
 

-#if wxUSE_WCHAR_T
-    typedef wchar_t tchar;
-#else
-    typedef char tchar;
-#endif
-

 #ifdef __WXMAC__
     #include "wx/osx/core/cfstring.h"
     #include <CoreFoundation/CFStringEncodingExt.h>
 #ifdef __WXMAC__
     #include "wx/osx/core/cfstring.h"
     #include <CoreFoundation/CFStringEncodingExt.h>


@@ -124,10 +118,6 @@ bool wxEncodingConverter::Init(wxFontEncoding input_enc, wxFontEncoding output_e
 
     if (m_Table) {delete[] m_Table; m_Table = NULL;}
 
 
     if (m_Table) {delete[] m_Table; m_Table = NULL;}
 

-#if !wxUSE_WCHAR_T
-    if (input_enc == wxFONTENCODING_UNICODE || output_enc == wxFONTENCODING_UNICODE) return false;
-#endif
-

     if (input_enc == output_enc) {m_JustCopy = true; return true;}
 
     m_UnicodeOutput = (output_enc == wxFONTENCODING_UNICODE);
     if (input_enc == output_enc) {m_JustCopy = true; return true;}
 
     m_UnicodeOutput = (output_enc == wxFONTENCODING_UNICODE);


@@ -137,18 +127,18 @@ bool wxEncodingConverter::Init(wxFontEncoding input_enc, wxFontEncoding output_e
     {
         if ((out_tbl = GetEncTable(output_enc)) == NULL) return false;
 
     {
         if ((out_tbl = GetEncTable(output_enc)) == NULL) return false;
 

-        m_Table = new tchar[65536];
-        for (i = 0; i < 128; i++)  m_Table[i] = (tchar)i; // 7bit ASCII
-        for (i = 128; i < 65536; i++)  m_Table[i] = (tchar)0;
+        m_Table = new wchar_t[65536];
+        for (i = 0; i < 128; i++)  m_Table[i] = (wchar_t)i; // 7bit ASCII
+        for (i = 128; i < 65536; i++)  m_Table[i] = (wchar_t)0;

 
         if (method == wxCONVERT_SUBSTITUTE)
         {
             for (i = 0; i < encoding_unicode_fallback_count; i++)
 
         if (method == wxCONVERT_SUBSTITUTE)
         {
             for (i = 0; i < encoding_unicode_fallback_count; i++)

-                m_Table[encoding_unicode_fallback[i].c] = (tchar) encoding_unicode_fallback[i].s;
+                m_Table[encoding_unicode_fallback[i].c] = (wchar_t) encoding_unicode_fallback[i].s;

         }
 
         for (i = 0; i < 128; i++)
         }
 
         for (i = 0; i < 128; i++)

-            m_Table[out_tbl[i]] = (tchar)(128 + i);
+            m_Table[out_tbl[i]] = (wchar_t)(128 + i);

 
         m_UnicodeInput = true;
     }
 
         m_UnicodeInput = true;
     }


@@ -160,12 +150,12 @@ bool wxEncodingConverter::Init(wxFontEncoding input_enc, wxFontEncoding output_e
 
         m_UnicodeInput = false;
 
 
         m_UnicodeInput = false;
 

-        m_Table = new tchar[256];
-        for (i = 0; i < 128; i++)  m_Table[i] = (tchar)i; // 7bit ASCII
+        m_Table = new wchar_t[256];
+        for (i = 0; i < 128; i++)  m_Table[i] = (wchar_t)i; // 7bit ASCII

 
         if (output_enc == wxFONTENCODING_UNICODE)
         {
 
         if (output_enc == wxFONTENCODING_UNICODE)
         {

-            for (i = 0; i < 128; i++)  m_Table[128 + i] = (tchar)in_tbl[i];
+            for (i = 0; i < 128; i++)  m_Table[128 + i] = (wchar_t)in_tbl[i];

             return true;
         }
         else // output !Unicode
             return true;
         }
         else // output !Unicode


@@ -182,13 +172,9 @@ bool wxEncodingConverter::Init(wxFontEncoding input_enc, wxFontEncoding output_e
                     item = (CharsetItem*) bsearch(&key, encoding_unicode_fallback,
                                 encoding_unicode_fallback_count, sizeof(CharsetItem), CompareCharsetItems);
                 if (item)
                     item = (CharsetItem*) bsearch(&key, encoding_unicode_fallback,
                                 encoding_unicode_fallback_count, sizeof(CharsetItem), CompareCharsetItems);
                 if (item)

-                    m_Table[128 + i] = (tchar)item -> c;
+                    m_Table[128 + i] = (wchar_t)item -> c;

                 else
                 else

-#if wxUSE_WCHAR_T

                     m_Table[128 + i] = (wchar_t)(128 + i);
                     m_Table[128 + i] = (wchar_t)(128 + i);

-#else
-                    m_Table[128 + i] = (char)(128 + i);
-#endif

             }
 
             delete[] rev;
             }
 
             delete[] rev;


@@ -199,11 +185,11 @@ bool wxEncodingConverter::Init(wxFontEncoding input_enc, wxFontEncoding output_e
 }
 
 
 }
 
 

-#define REPLACEMENT_CHAR  ((tchar)'?')
+#define REPLACEMENT_CHAR  (L'?')

 
 

-inline tchar GetTableValue(const tchar *table, tchar value, bool& repl)
+inline wchar_t GetTableValue(const wchar_t *table, wchar_t value, bool& repl)

 {
 {

-    tchar r = table[value];
+    wchar_t r = table[value];

     if (r == 0 && value != 0)
     {
         r = REPLACEMENT_CHAR;
     if (r == 0 && value != 0)
     {
         r = REPLACEMENT_CHAR;


@@ -240,8 +226,6 @@ bool wxEncodingConverter::Convert(const char* input, char* output) const
 }
 
 
 }
 
 

-#if wxUSE_WCHAR_T
-

 bool wxEncodingConverter::Convert(const char* input, wchar_t* output) const
 {
     wxASSERT_MSG(m_UnicodeOutput, wxT("You cannot convert to 8-bit if output is const wchar_t*!"));
 bool wxEncodingConverter::Convert(const char* input, wchar_t* output) const
 {
     wxASSERT_MSG(m_UnicodeOutput, wxT("You cannot convert to 8-bit if output is const wchar_t*!"));


@@ -331,8 +315,6 @@ bool wxEncodingConverter::Convert(const wchar_t* input, wchar_t* output) const
     return !replaced;
 }
 
     return !replaced;
 }
 

-#endif // wxUSE_WCHAR_T
-

 
 wxString wxEncodingConverter::Convert(const wxString& input) const
 {
 
 wxString wxEncodingConverter::Convert(const wxString& input) const
 {

diff --git a/src/common/intl.cpp b/src/common/intl.cpp
index 0638da4e9548aa915e2ef1510706762647989cad..fa97d949908cdd56233f40db5ea9ffbd209c80de 100644 (file)
--- a/src/common/intl.cpp
+++ b/src/common/intl.cpp
@@ -65,7 +65,6 @@
 #include "wx/filename.h"
 #include "wx/tokenzr.h"
 #include "wx/fontmap.h"
 #include "wx/filename.h"
 #include "wx/tokenzr.h"
 #include "wx/fontmap.h"

-#include "wx/encconv.h"

 #include "wx/scopedptr.h"
 #include "wx/apptrait.h"
 #include "wx/stdpaths.h"
 #include "wx/scopedptr.h"
 #include "wx/apptrait.h"
 #include "wx/stdpaths.h"


@@ -1326,7 +1325,6 @@ bool wxMsgCatalogFile::FillHash(wxMessagesHash& hash,
     }
 #endif // wxUSE_UNICODE/wxUSE_FONTMAP
 
     }
 #endif // wxUSE_UNICODE/wxUSE_FONTMAP
 

-#if wxUSE_WCHAR_T

     // conversion to use to convert catalog strings to the GUI encoding
     wxMBConv *inputConv,
             *inputConvPtr = NULL; // same as inputConv but safely deleteable
     // conversion to use to convert catalog strings to the GUI encoding
     wxMBConv *inputConv,
             *inputConvPtr = NULL; // same as inputConv but safely deleteable


@@ -1353,43 +1351,6 @@ bool wxMsgCatalogFile::FillHash(wxMessagesHash& hash,
                             ? NULL
                             : new wxCSConv(msgIdCharset);
 
                             ? NULL
                             : new wxCSConv(msgIdCharset);
 

-#elif wxUSE_FONTMAP
-    wxASSERT_MSG( msgIdCharset.empty(),
-                wxS("non-ASCII msgid languages only supported if wxUSE_WCHAR_T=1") );
-
-    wxEncodingConverter converter;
-    if ( convertEncoding )
-    {
-        wxFontEncoding targetEnc = wxFONTENCODING_SYSTEM;
-        wxFontEncoding enc = wxFontMapperBase::Get()->CharsetToEncoding(m_charset, false);
-        if ( enc == wxFONTENCODING_SYSTEM )
-        {
-            convertEncoding = false; // unknown encoding
-        }
-        else
-        {
-            targetEnc = wxLocale::GetSystemEncoding();
-            if (targetEnc == wxFONTENCODING_SYSTEM)
-            {
-                wxFontEncodingArray a = wxEncodingConverter::GetPlatformEquivalents(enc);
-                if (a[0] == enc)
-                    // no conversion needed, locale uses native encoding
-                    convertEncoding = false;
-                if (a.GetCount() == 0)
-                    // we don't know common equiv. under this platform
-                    convertEncoding = false;
-                targetEnc = a[0];
-            }
-        }
-
-        if ( convertEncoding )
-        {
-            converter.Init(enc, targetEnc);
-        }
-    }
-#endif // wxUSE_WCHAR_T/!wxUSE_WCHAR_T
-    (void)convertEncoding; // get rid of warnings about unused parameter
-

     for (size_t32 i = 0; i < m_numStrings; i++)
     {
         const char *data = StringAtOfs(m_pOrigTable, i);
     for (size_t32 i = 0; i < m_numStrings; i++)
     {
         const char *data = StringAtOfs(m_pOrigTable, i);


@@ -1400,12 +1361,10 @@ bool wxMsgCatalogFile::FillHash(wxMessagesHash& hash,
 #if wxUSE_UNICODE
         msgid = wxString(data, *inputConv);
 #else // ASCII
 #if wxUSE_UNICODE
         msgid = wxString(data, *inputConv);
 #else // ASCII

-        #if wxUSE_WCHAR_T
-            if ( inputConv && sourceConv )
-                msgid = wxString(inputConv->cMB2WC(data), *sourceConv);
-            else
-        #endif
-                msgid = data;
+        if ( inputConv && sourceConv )
+            msgid = wxString(inputConv->cMB2WC(data), *sourceConv);
+        else
+            msgid = data;

 #endif // wxUSE_UNICODE
 
         data = StringAtOfs(m_pTransTable, i);
 #endif // wxUSE_UNICODE
 
         data = StringAtOfs(m_pTransTable, i);


@@ -1422,19 +1381,12 @@ bool wxMsgCatalogFile::FillHash(wxMessagesHash& hash,
             wxString msgstr;
 #if wxUSE_UNICODE
             msgstr = wxString(str, *inputConv);
             wxString msgstr;
 #if wxUSE_UNICODE
             msgstr = wxString(str, *inputConv);

-#elif wxUSE_WCHAR_T
+#else

             if ( inputConv )
                 msgstr = wxString(inputConv->cMB2WC(str), *wxConvUI);
             else
                 msgstr = str;
             if ( inputConv )
                 msgstr = wxString(inputConv->cMB2WC(str), *wxConvUI);
             else
                 msgstr = str;

-#else // !wxUSE_WCHAR_T
-        #if wxUSE_FONTMAP
-            if ( bConvertEncoding )
-                msgstr = wxString(converter.Convert(str));
-            else
-        #endif
-                msgstr = str;
-#endif // wxUSE_WCHAR_T/!wxUSE_WCHAR_T
+#endif // wxUSE_UNICODE/!wxUSE_UNICODE

 
             if ( !msgstr.empty() )
             {
 
             if ( !msgstr.empty() )
             {


@@ -1452,10 +1404,8 @@ bool wxMsgCatalogFile::FillHash(wxMessagesHash& hash,
         }
     }
 
         }
     }
 

-#if wxUSE_WCHAR_T

     delete sourceConv;
     delete inputConvPtr;
     delete sourceConv;
     delete inputConvPtr;

-#endif // wxUSE_WCHAR_T

 
     return true;
 }
 
     return true;
 }

diff --git a/src/common/strconv.cpp b/src/common/strconv.cpp
index 599048e9e212ca34ca3808274d9a771af780d2e2..7e7136ae9e96c9eb22e5c4054dcc24c6851d5441 100644 (file)
--- a/src/common/strconv.cpp
+++ b/src/common/strconv.cpp
@@ -28,8 +28,6 @@
 
 #include "wx/strconv.h"
 
 
 #include "wx/strconv.h"
 

-#if wxUSE_WCHAR_T
-

 #ifndef __WXWINCE__
 #include <errno.h>
 #endif
 #ifndef __WXWINCE__
 #include <errno.h>
 #endif


@@ -3455,14 +3453,3 @@ WXDLLIMPEXP_DATA_BASE(wxMBConv *) wxConvFileName =
 #else // !__DARWIN__
                                     wxGet_wxConvLibcPtr();
 #endif // __DARWIN__/!__DARWIN__
 #else // !__DARWIN__
                                     wxGet_wxConvLibcPtr();
 #endif // __DARWIN__/!__DARWIN__

-
-#else // !wxUSE_WCHAR_T
-
-// FIXME-UTF8: remove this, wxUSE_WCHAR_T is required now
-// stand-ins in absence of wchar_t
-WXDLLIMPEXP_DATA_BASE(wxMBConv) wxConvLibc,
-                                wxConvISO8859_1,
-                                wxConvLocal,
-                                wxConvUTF8;
-
-#endif // wxUSE_WCHAR_T/!wxUSE_WCHAR_T

diff --git a/src/common/wxcrt.cpp b/src/common/wxcrt.cpp
index db16fa9b18d762c8de933d51ffc6883be76b700b..55ad0812a89c2b22fd09deba2ab50e732689a280 100644 (file)
--- a/src/common/wxcrt.cpp
+++ b/src/common/wxcrt.cpp
@@ -81,7 +81,6 @@ using namespace std ;
     #include <xlocale.h>
 #endif
 
     #include <xlocale.h>
 #endif
 

-#if wxUSE_WCHAR_T

 WXDLLIMPEXP_BASE size_t wxMB2WC(wchar_t *buf, const char *psz, size_t n)
 {
   // assume that we have mbsrtowcs() too if we have wcsrtombs()
 WXDLLIMPEXP_BASE size_t wxMB2WC(wchar_t *buf, const char *psz, size_t n)
 {
   // assume that we have mbsrtowcs() too if we have wcsrtombs()


@@ -141,7 +140,6 @@ WXDLLIMPEXP_BASE size_t wxWC2MB(char *buf, const wchar_t *pwz, size_t n)
   return wxWcstombs(NULL, pwz, 0);
 #endif
 }
   return wxWcstombs(NULL, pwz, 0);
 #endif
 }

-#endif // wxUSE_WCHAR_T

 
 char* wxSetlocale(int category, const char *locale)
 {
 
 char* wxSetlocale(int category, const char *locale)
 {


@@ -735,7 +733,6 @@ int wxVsnprintf(wchar_t *str, size_t size, const wxString& format, va_list argpt
 }
 #endif // wxUSE_UNICODE
 
 }
 #endif // wxUSE_UNICODE
 

-#if wxUSE_WCHAR_T

 
 // ----------------------------------------------------------------------------
 // ctype.h stuff (currently unused)
 
 // ----------------------------------------------------------------------------
 // ctype.h stuff (currently unused)


@@ -953,8 +950,6 @@ wxCRT_StrftimeW(wchar_t *s, size_t maxsize, const wchar_t *fmt, const struct tm
 }
 #endif // !wxCRT_StrftimeW
 
 }
 #endif // !wxCRT_StrftimeW
 

-#endif // wxUSE_WCHAR_T
-

 #ifdef wxLongLong_t
 template<typename T>
 static wxULongLong_t
 #ifdef wxLongLong_t
 template<typename T>
 static wxULongLong_t


@@ -1109,7 +1104,7 @@ wxULongLong_t wxCRT_StrtoullW(const wchar_t* nptr, wchar_t** endptr, int base)
 #endif // wxLongLong_t
 
 // ----------------------------------------------------------------------------
 #endif // wxLongLong_t
 
 // ----------------------------------------------------------------------------

-// functions which we may need even if !wxUSE_WCHAR_T
+// strtok() functions

 // ----------------------------------------------------------------------------
 
 template<typename T>
 // ----------------------------------------------------------------------------
 
 template<typename T>

diff --git a/src/dfb/window.cpp b/src/dfb/window.cpp
index 6fed4e69f4f715e20ad45e246c5e5660415e1cd7..bfe64b16f073298bb8a7b1f3d798b05ff89cf0d8 100644 (file)
--- a/src/dfb/window.cpp
+++ b/src/dfb/window.cpp
@@ -967,13 +967,11 @@ static long GetUntraslatedKeyCode(DFBInputDeviceKeyIdentifier key_id,
                 return key_symbol;
             else
             {
                 return key_symbol;
             else
             {

-#if wxUSE_WCHAR_T

                 wchar_t chr = key_symbol;
                 wxCharBuffer buf(wxConvUI->cWC2MB(&chr, 1, NULL));
                 if ( buf )
                     return *buf; // may be 0 if failed
                 else
                 wchar_t chr = key_symbol;
                 wxCharBuffer buf(wxConvUI->cWC2MB(&chr, 1, NULL));
                 if ( buf )
                     return *buf; // may be 0 if failed
                 else

-#endif // wxUSE_WCHAR_T

                     return 0;
             }
 #endif
                     return 0;
             }
 #endif

diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp
index 66fced32c3d7690f9740b666c4cf2bb9e6cefbf0..5627fbe89a0d3e3e6584c461d4d51730c6101dbe 100644 (file)
--- a/src/gtk1/app.cpp
+++ b/src/gtk1/app.cpp
@@ -531,7 +531,6 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
 
     gtk_set_locale();
 
 
     gtk_set_locale();
 

-    // We should have the wxUSE_WCHAR_T test on the _outside_

     if (!wxOKlibc())
         wxConvCurrent = &wxConvLocal;
 
     if (!wxOKlibc())
         wxConvCurrent = &wxConvLocal;
 

diff --git a/src/html/helpdata.cpp b/src/html/helpdata.cpp
index 63b2988e614e0a26ab40d1cab624e8b85a909221..f67b1689c8886b8ba4b0dd82b4ce832635de23ff 100644 (file)
--- a/src/html/helpdata.cpp
+++ b/src/html/helpdata.cpp
@@ -569,7 +569,6 @@ bool wxHtmlHelpData::AddBookParam(const wxFSFile& bookfile,
     // Now store the contents range
     bookr->SetContentsRange(cont_start, m_contents.size());
 
     // Now store the contents range
     bookr->SetContentsRange(cont_start, m_contents.size());
 

-#if wxUSE_WCHAR_T

     // MS HTML Help files [written by MS HTML Help Workshop] are broken
     // in that the data are iso-8859-1 (including HTML entities), but must
     // be interpreted as being in language's windows charset. Correct the
     // MS HTML Help files [written by MS HTML Help Workshop] are broken
     // in that the data are iso-8859-1 (including HTML entities), but must
     // be interpreted as being in language's windows charset. Correct the


@@ -597,11 +596,6 @@ bool wxHtmlHelpData::AddBookParam(const wxFSFile& bookfile,
         }
         #undef CORRECT_STR
     }
         }
         #undef CORRECT_STR
     }

-#else
-    wxUnusedVar(IndexOld);
-    wxUnusedVar(ContentsOld);
-    wxASSERT_MSG(encoding == wxFONTENCODING_SYSTEM, wxT("Help files need charset conversion, but wxUSE_WCHAR_T is 0"));
-#endif // wxUSE_WCHAR_T/!wxUSE_WCHAR_T

 
     m_bookRecords.Add(bookr);
     if (!m_index.empty())
 
     m_bookRecords.Add(bookr);
     if (!m_index.empty())

diff --git a/src/html/htmlpars.cpp b/src/html/htmlpars.cpp
index 0b43365821117ff9a8a72c7b4817ee263b8c8003..3c312275a707e0a3007edb76210d6c3853cfec9d 100644 (file)
--- a/src/html/htmlpars.cpp
+++ b/src/html/htmlpars.cpp
@@ -433,7 +433,7 @@ void wxHtmlTagHandler::ParseInnerSource(const wxString& source)
 IMPLEMENT_DYNAMIC_CLASS(wxHtmlEntitiesParser,wxObject)
 
 wxHtmlEntitiesParser::wxHtmlEntitiesParser()
 IMPLEMENT_DYNAMIC_CLASS(wxHtmlEntitiesParser,wxObject)
 
 wxHtmlEntitiesParser::wxHtmlEntitiesParser()

-#if wxUSE_WCHAR_T && !wxUSE_UNICODE
+#if !wxUSE_UNICODE

     : m_conv(NULL), m_encoding(wxFONTENCODING_SYSTEM)
 #endif
 {
     : m_conv(NULL), m_encoding(wxFONTENCODING_SYSTEM)
 #endif
 {


@@ -441,14 +441,14 @@ wxHtmlEntitiesParser::wxHtmlEntitiesParser()
 
 wxHtmlEntitiesParser::~wxHtmlEntitiesParser()
 {
 
 wxHtmlEntitiesParser::~wxHtmlEntitiesParser()
 {

-#if wxUSE_WCHAR_T && !wxUSE_UNICODE
+#if !wxUSE_UNICODE

     delete m_conv;
 #endif
 }
 
     delete m_conv;
 #endif
 }
 

+#if !wxUSE_UNICODE

 void wxHtmlEntitiesParser::SetEncoding(wxFontEncoding encoding)
 {
 void wxHtmlEntitiesParser::SetEncoding(wxFontEncoding encoding)
 {

-#if wxUSE_WCHAR_T && !wxUSE_UNICODE

     if (encoding == m_encoding)
         return;
 
     if (encoding == m_encoding)
         return;
 


@@ -459,10 +459,8 @@ void wxHtmlEntitiesParser::SetEncoding(wxFontEncoding encoding)
         m_conv = NULL;
     else
         m_conv = new wxCSConv(wxFontMapper::GetEncodingName(m_encoding));
         m_conv = NULL;
     else
         m_conv = new wxCSConv(wxFontMapper::GetEncodingName(m_encoding));

-#else
-    (void) encoding;
-#endif

 }
 }

+#endif // !wxUSE_UNICODE

 
 wxString wxHtmlEntitiesParser::Parse(const wxString& input) const
 {
 
 wxString wxHtmlEntitiesParser::Parse(const wxString& input) const
 {


@@ -523,7 +521,6 @@ wxString wxHtmlEntitiesParser::Parse(const wxString& input) const
 #if !wxUSE_UNICODE
 wxChar wxHtmlEntitiesParser::GetCharForCode(unsigned code) const
 {
 #if !wxUSE_UNICODE
 wxChar wxHtmlEntitiesParser::GetCharForCode(unsigned code) const
 {

-#if wxUSE_WCHAR_T

     char buf[2];
     wchar_t wbuf[2];
     wbuf[0] = (wchar_t)code;
     char buf[2];
     wchar_t wbuf[2];
     wbuf[0] = (wchar_t)code;


@@ -532,9 +529,6 @@ wxChar wxHtmlEntitiesParser::GetCharForCode(unsigned code) const
     if (conv->WC2MB(buf, wbuf, 2) == (size_t)-1)
         return '?';
     return buf[0];
     if (conv->WC2MB(buf, wbuf, 2) == (size_t)-1)
         return '?';
     return buf[0];

-#else
-    return (code < 256) ? (wxChar)code : '?';
-#endif

 }
 #endif
 
 }
 #endif
 

diff --git a/src/html/m_layout.cpp b/src/html/m_layout.cpp
index 02d38228cdf25e7bd63cd8b9e36c30d6722bc2b5..b373e85a9d3bbc23b580351b8cd4ae5d0488facd 100644 (file)
--- a/src/html/m_layout.cpp
+++ b/src/html/m_layout.cpp
@@ -285,7 +285,7 @@ TAG_HANDLER_BEGIN(TITLE, "TITLE")
         if (winIface)
         {
             wxString title(tag.GetBeginIter(), tag.GetEndIter1());
         if (winIface)
         {
             wxString title(tag.GetBeginIter(), tag.GetEndIter1());

-#if !wxUSE_UNICODE && wxUSE_WCHAR_T
+#if !wxUSE_UNICODE

             const wxFontEncoding enc = m_WParser->GetInputEncoding();
             if ( enc != wxFONTENCODING_DEFAULT )
             {
             const wxFontEncoding enc = m_WParser->GetInputEncoding();
             if ( enc != wxFONTENCODING_DEFAULT )
             {

diff --git a/src/msw/textctrl.cpp b/src/msw/textctrl.cpp
index 8ffbfce0c1799c2cdf93365d1e8942f6541b10fb..d5e40992c3183f0764356e7e6cda7de356993b6d 100644 (file)
--- a/src/msw/textctrl.cpp
+++ b/src/msw/textctrl.cpp
@@ -1038,10 +1038,6 @@ wxTextCtrl::StreamIn(const wxString& value,
         wxLogLastError(wxT("EM_STREAMIN"));
     }
 
         wxLogLastError(wxT("EM_STREAMIN"));
     }
 

-#if !wxUSE_WCHAR_T
-    free(wchBuf);
-#endif // !wxUSE_WCHAR_T
-

     return true;
 }
 
     return true;
 }
 


@@ -1054,13 +1050,8 @@ wxTextCtrl::StreamOut(wxFontEncoding encoding, bool selectionOnly) const
 
     const int len = GetWindowTextLength(GetHwnd());
 
 
     const int len = GetWindowTextLength(GetHwnd());
 

-#if wxUSE_WCHAR_T

     wxWCharBuffer wchBuf(len);
     wchar_t *wpc = wchBuf.data();
     wxWCharBuffer wchBuf(len);
     wchar_t *wpc = wchBuf.data();

-#else
-    wchar_t *wchBuf = (wchar_t *)malloc((len + 1)*sizeof(wchar_t));
-    wchar_t *wpc = wchBuf;
-#endif

 
     wxStreamOutData data;
     data.wpc = wpc;
 
     wxStreamOutData data;
     data.wpc = wpc;


@@ -1100,10 +1091,6 @@ wxTextCtrl::StreamOut(wxFontEncoding encoding, bool selectionOnly) const
         }
     }
 
         }
     }
 

-#if !wxUSE_WCHAR_T
-    free(wchBuf);
-#endif // !wxUSE_WCHAR_T
-

     return out;
 }
 
     return out;
 }
 

diff --git a/src/propgrid/propgridiface.cpp b/src/propgrid/propgridiface.cpp
index d29e2f44986dfcc144451825445586d135bb7513..9acbb60a0ff9369ab1040f4922947f1a72819dd2 100644 (file)
--- a/src/propgrid/propgridiface.cpp
+++ b/src/propgrid/propgridiface.cpp
@@ -73,10 +73,8 @@ wxPGProperty* wxPGPropArgCls::GetPtr( wxPropertyGridInterface* iface ) const
         return iface->GetPropertyByNameA(*m_ptr.stringName);
     else if ( m_flags & IsCharPtr )
         return iface->GetPropertyByNameA(m_ptr.charName);
         return iface->GetPropertyByNameA(*m_ptr.stringName);
     else if ( m_flags & IsCharPtr )
         return iface->GetPropertyByNameA(m_ptr.charName);

-#if wxUSE_WCHAR_T

     else if ( m_flags & IsWCharPtr )
         return iface->GetPropertyByNameA(m_ptr.wcharName);
     else if ( m_flags & IsWCharPtr )
         return iface->GetPropertyByNameA(m_ptr.wcharName);

-#endif

 
     return NULL;
 }
 
     return NULL;
 }

diff --git a/tests/benchmarks/htmlparser/htmlpars.cpp b/tests/benchmarks/htmlparser/htmlpars.cpp
index 7d7e5eaed56ce2a4b264a7b1613f5f38e1e4682c..3bc1dea94a7a5f97a1afedd9f6f53ab8ed6efe5e 100644 (file)
--- a/tests/benchmarks/htmlparser/htmlpars.cpp
+++ b/tests/benchmarks/htmlparser/htmlpars.cpp
@@ -459,7 +459,7 @@ void wx28HtmlTagHandler::ParseInnerSource(const wxString& source)
 IMPLEMENT_DYNAMIC_CLASS(wx28HtmlEntitiesParser,wxObject)
 
 wx28HtmlEntitiesParser::wx28HtmlEntitiesParser()
 IMPLEMENT_DYNAMIC_CLASS(wx28HtmlEntitiesParser,wxObject)
 
 wx28HtmlEntitiesParser::wx28HtmlEntitiesParser()

-#if wxUSE_WCHAR_T && !wxUSE_UNICODE
+#if !wxUSE_UNICODE

     : m_conv(NULL), m_encoding(wxFONTENCODING_SYSTEM)
 #endif
 {
     : m_conv(NULL), m_encoding(wxFONTENCODING_SYSTEM)
 #endif
 {


@@ -467,14 +467,14 @@ wx28HtmlEntitiesParser::wx28HtmlEntitiesParser()
 
 wx28HtmlEntitiesParser::~wx28HtmlEntitiesParser()
 {
 
 wx28HtmlEntitiesParser::~wx28HtmlEntitiesParser()
 {

-#if wxUSE_WCHAR_T && !wxUSE_UNICODE
+#if !wxUSE_UNICODE

     delete m_conv;
 #endif
 }
 
 void wx28HtmlEntitiesParser::SetEncoding(wxFontEncoding encoding)
 {
     delete m_conv;
 #endif
 }
 
 void wx28HtmlEntitiesParser::SetEncoding(wxFontEncoding encoding)
 {

-#if wxUSE_WCHAR_T && !wxUSE_UNICODE
+#if !wxUSE_UNICODE

     if (encoding == m_encoding)
         return;
 
     if (encoding == m_encoding)
         return;
 


@@ -552,7 +552,6 @@ extern "C" int LINKAGEMODE wx28HtmlEntityCompare(const void *key, const void *it
 #if !wxUSE_UNICODE
 wxChar wx28HtmlEntitiesParser::GetCharForCode(unsigned code)
 {
 #if !wxUSE_UNICODE
 wxChar wx28HtmlEntitiesParser::GetCharForCode(unsigned code)
 {

-#if wxUSE_WCHAR_T

     char buf[2];
     wchar_t wbuf[2];
     wbuf[0] = (wchar_t)code;
     char buf[2];
     wchar_t wbuf[2];
     wbuf[0] = (wchar_t)code;


@@ -561,9 +560,6 @@ wxChar wx28HtmlEntitiesParser::GetCharForCode(unsigned code)
     if (conv->WC2MB(buf, wbuf, 2) == (size_t)-1)
         return '?';
     return buf[0];
     if (conv->WC2MB(buf, wbuf, 2) == (size_t)-1)
         return '?';
     return buf[0];

-#else
-    return (code < 256) ? (wxChar)code : '?';
-#endif

 }
 #endif
 
 }
 #endif
 

diff --git a/tests/benchmarks/htmlparser/htmlpars.h b/tests/benchmarks/htmlparser/htmlpars.h
index 5618267231f007933f5f2a70568b6147fa6d8558..db6637814aa1177e45fd044979cc8fe8fbfd682c 100644 (file)
--- a/tests/benchmarks/htmlparser/htmlpars.h
+++ b/tests/benchmarks/htmlparser/htmlpars.h
@@ -250,7 +250,7 @@ public:
     virtual ~wx28HtmlEntitiesParser();
 
     // Sets encoding of output string.
     virtual ~wx28HtmlEntitiesParser();
 
     // Sets encoding of output string.

-    // Has no effect if wxUSE_WCHAR_T==0 or wxUSE_UNICODE==1
+    // Has no effect if wxUSE_UNICODE==1

     void SetEncoding(wxFontEncoding encoding);
 
     // Parses entities in input and replaces them with respective characters
     void SetEncoding(wxFontEncoding encoding);
 
     // Parses entities in input and replaces them with respective characters


@@ -268,7 +268,7 @@ public:
 #endif
 
 protected:
 #endif
 
 protected:

-#if wxUSE_WCHAR_T && !wxUSE_UNICODE
+#if !wxUSE_UNICODE

     wxMBConv *m_conv;
     wxFontEncoding m_encoding;
 #endif
     wxMBConv *m_conv;
     wxFontEncoding m_encoding;
 #endif

diff --git a/tests/mbconv/convautotest.cpp b/tests/mbconv/convautotest.cpp
index 0c6292f625c83c9741a6943e2aaff5df904c607c..45fb79e0d530f0a95a9204dbcf2207b818de2ae4 100644 (file)
--- a/tests/mbconv/convautotest.cpp
+++ b/tests/mbconv/convautotest.cpp
@@ -17,8 +17,6 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#if wxUSE_WCHAR_T
-

 #include "wx/convauto.h"
 
 #include "wx/mstream.h"
 #include "wx/convauto.h"
 
 #include "wx/mstream.h"


@@ -207,6 +205,3 @@ void ConvAutoTestCase::StreamUTF32BE()
                    "\0\0\x03\xB2",
                    20, line1, line2);
 }
                    "\0\0\x03\xB2",
                    20, line1, line2);
 }

-
-#endif // wxUSE_WCHAR_T
-