unicode compilation fix

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

diff --git a/src/common/encconv.cpp b/src/common/encconv.cpp
index 5ad61864642eca6e5238292ef6dbc447c3335b12..03dc30ffb9942e700a10d08e4b4360bd1294e472 100644 (file)
--- a/src/common/encconv.cpp
+++ b/src/common/encconv.cpp
@@ -7,7 +7,7 @@
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "encconv.h"
 #endif
 
 #pragma implementation "encconv.h"
 #endif
 


@@ -121,10 +121,8 @@ bool wxEncodingConverter::Init(wxFontEncoding input_enc, wxFontEncoding output_e
             m_Table[out_tbl[i]] = (tchar)(128 + i);
 
         m_UnicodeInput = TRUE;
             m_Table[out_tbl[i]] = (tchar)(128 + i);
 
         m_UnicodeInput = TRUE;

-        return TRUE;

     }
     }

-
-    else
+    else // input !Unicode

     {
         if ((in_tbl = GetEncTable(input_enc)) == NULL) return FALSE;
         if (output_enc != wxFONTENCODING_UNICODE)
     {
         if ((in_tbl = GetEncTable(input_enc)) == NULL) return FALSE;
         if (output_enc != wxFONTENCODING_UNICODE)


@@ -142,7 +140,7 @@ bool wxEncodingConverter::Init(wxFontEncoding input_enc, wxFontEncoding output_e
         }
         // FIXME: write a substitute for bsearch
 #ifndef __WXWINCE__
         }
         // FIXME: write a substitute for bsearch
 #ifndef __WXWINCE__

-        else
+        else // output !Unicode

         {
             CharsetItem *rev = BuildReverseTable(out_tbl);
             CharsetItem *item;
         {
             CharsetItem *rev = BuildReverseTable(out_tbl);
             CharsetItem *item;


@@ -166,11 +164,11 @@ bool wxEncodingConverter::Init(wxFontEncoding input_enc, wxFontEncoding output_e
             }
 
             delete[] rev;
             }
 
             delete[] rev;

-            return TRUE;

         }
         }

-#endif
-        return TRUE;
+#endif // !__WXWINCE__

     }
     }

+
+    return TRUE;

 }
 
 
 }