From 7e38638c3499c679f25ec0029931aad8e62e70d3 Mon Sep 17 00:00:00 2001
From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= <vslavik@fastmail.fm>
Date: Wed, 16 Apr 2008 22:35:25 +0000
Subject: [PATCH] removed no longer needed wxOKlibc() helper

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53239 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/wxcrt.h   |  3 ---
 src/common/wxcrt.cpp | 21 ---------------------
 src/gtk/app.cpp      |  6 ------
 3 files changed, 30 deletions(-)

diff --git a/include/wx/wxcrt.h b/include/wx/wxcrt.h
index 6383a0f5d3..1549dc436b 100644
--- a/include/wx/wxcrt.h
+++ b/include/wx/wxcrt.h
@@ -39,9 +39,6 @@ inline bool wxIsEmpty(const wxString& s) { return s.empty(); }
 inline bool wxIsEmpty(const wxCStrData& s) { return s.AsString().empty(); }
 
 
-// FIXME-UTF8: get rid of this, it's ANSI only anyway
-WXDLLIMPEXP_BASE bool wxOKlibc(); /* for internal use */
-
 
 /* multibyte to wide char conversion functions and macros */
 
diff --git a/src/common/wxcrt.cpp b/src/common/wxcrt.cpp
index d6f7c35cda..9bd6305307 100644
--- a/src/common/wxcrt.cpp
+++ b/src/common/wxcrt.cpp
@@ -133,27 +133,6 @@ WXDLLIMPEXP_BASE size_t wxWC2MB(char *buf, const wchar_t *pwz, size_t n)
 }
 #endif // wxUSE_WCHAR_T
 
-WXDLLIMPEXP_BASE bool wxOKlibc()
-{
-#if wxUSE_WCHAR_T && defined(__UNIX__) && defined(__GLIBC__) && !defined(__WINE__)
-  // glibc 2.0 uses UTF-8 even when it shouldn't
-  wchar_t res = 0;
-  if ((MB_CUR_MAX == 2) &&
-      (wxMB2WC(&res, "\xdd\xa5", 1) == 1) &&
-      (res==0x765)) {
-    // this is UTF-8 allright, check whether that's what we want
-    char *cur_locale = setlocale(LC_CTYPE, NULL);
-    if ((strlen(cur_locale) < 4) ||
-            (strcasecmp(cur_locale + strlen(cur_locale) - 4, "utf8")) ||
-            (strcasecmp(cur_locale + strlen(cur_locale) - 5, "utf-8"))) {
-      // nope, don't use libc conversion
-      return false;
-    }
-  }
-#endif
-  return true;
-}
-
 char* wxSetlocale(int category, const char *locale)
 {
 #ifdef __WXWINCE__
diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp
index c4315c64e6..2041a588a7 100644
--- a/src/gtk/app.cpp
+++ b/src/gtk/app.cpp
@@ -364,14 +364,8 @@ bool wxApp::Initialize(int& argc_, wxChar **argv_)
     }
 #endif // wxUSE_THREADS
 
-    // We should have the wxUSE_WCHAR_T test on the _outside_
-#if wxUSE_WCHAR_T
     // gtk+ 2.0 supports Unicode through UTF-8 strings
     wxConvCurrent = &wxConvUTF8;
-#else // !wxUSE_WCHAR_T
-    if (!wxOKlibc())
-        wxConvCurrent = (wxMBConv*) NULL;
-#endif // wxUSE_WCHAR_T/!wxUSE_WCHAR_T
 
     // decide which conversion to use for the file names
 
-- 
2.45.2