Do not use Tooltips if they are disabled

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

diff --git a/src/common/encconv.cpp b/src/common/encconv.cpp
index da88c09d5227dccf783f70ab1d243d3fa5a06180..92c8b04362f0092e81484acd7091b1c3fa300f1e 100644 (file)
--- a/src/common/encconv.cpp
+++ b/src/common/encconv.cpp
@@ -32,7 +32,7 @@
 #endif
 
 #ifdef __WXMAC__
-    #include "wx/mac/corefoundation/cfstring.h"
+    #include "wx/osx/core/cfstring.h"
     #include <CoreFoundation/CFStringEncodingExt.h>
 
     wxUint16 gMacEncodings[wxFONTENCODING_MACMAX-wxFONTENCODING_MACMIN+1][128] ;
@@ -51,11 +51,11 @@ static const wxUint16* GetEncTable(wxFontEncoding enc)
         int i = enc-wxFONTENCODING_MACMIN ;
         if ( gMacEncodingsInited[i] == false )
         {
-            // create 
+            // create
             CFStringEncoding cfencoding = wxMacGetSystemEncFromFontEnc( enc ) ;
             if( !CFStringIsEncodingAvailable( cfencoding ) )
                 return NULL;
-                
+
             memset( gMacEncodings[i] , 0 , 128 * 2 );
             char s[2] = { 0 , 0 };
             CFRange firstchar = CFRangeMake( 0, 1 );
@@ -84,12 +84,14 @@ typedef struct {
     wxUint8  c;
 } CharsetItem;
 
-extern "C" int wxCMPFUNC_CONV
+extern "C"
+{
+static int wxCMPFUNC_CONV
 CompareCharsetItems(const void *i1, const void *i2)
 {
     return ( ((CharsetItem*)i1) -> u - ((CharsetItem*)i2) -> u );
 }
-
+}
 
 static CharsetItem* BuildReverseTable(const wxUint16 *tbl)
 {
@@ -321,7 +323,7 @@ bool wxEncodingConverter::Convert(const wchar_t* input, wchar_t* output) const
                 wxT("You must call wxEncodingConverter::Init() before actually converting!"));
 
     bool replaced = false;
-    
+
     for (i = input, o = output; *i != 0;)
         *(o++) = (wchar_t)(GetTableValue(m_Table, (wxUint8)*(i++), replaced));
     *o = 0;