Corrected bug in DoSetSize() (wxALLOW_MINUS_ONE)

[wxWidgets.git] / src / common / string.cpp

diff --git a/src/common/string.cpp b/src/common/string.cpp
index 37f88471720d8b8aabe8df7b1ed639ef05115a33..89cc7772f16434d12412a599a36683650ae2af67 100644 (file)
--- a/src/common/string.cpp
+++ b/src/common/string.cpp
@@ -2128,7 +2128,7 @@ static void wxLoadCharacterSets(void)
   if (already_loaded) return;
 
   already_loaded = TRUE;
   if (already_loaded) return;
 
   already_loaded = TRUE;

-#if defined(__UNIX__)
+#if defined(__UNIX__) && wxUSE_TEXTFILE

   // search through files in /usr/share/i18n/charmaps
   wxString fname;
   for (fname = ::wxFindFirstFile(_T("/usr/share/i18n/charmaps/*"));
   // search through files in /usr/share/i18n/charmaps
   wxString fname;
   for (fname = ::wxFindFirstFile(_T("/usr/share/i18n/charmaps/*"));