make XPM data pointer parameter fully const

[wxWidgets.git] / src / mac / carbon / fontutil.cpp

diff --git a/src/mac/carbon/fontutil.cpp b/src/mac/carbon/fontutil.cpp
index e352f7269ec2ec8024a70ffe33d682f845d2b5e9..5fc4804433c487269b55e65b0f74067a78c63417 100644 (file)
--- a/src/mac/carbon/fontutil.cpp
+++ b/src/mac/carbon/fontutil.cpp
@@ -9,19 +9,6 @@
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 

-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-#ifdef __GNUG__
-    #pragma implementation "fontutil.h"
-#endif
-
-// For compilers that support precompilation, includes "wx.h".

 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__


@@ -30,33 +17,27 @@
 
 #ifndef WX_PRECOMP
     #include "wx/string.h"
 
 #ifndef WX_PRECOMP
     #include "wx/string.h"

+    #include "wx/wxcrtvararg.h"

     #include "wx/log.h"
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/intl.h"

-#endif //WX_PRECOMP
+#endif

 
 #include "wx/fontutil.h"
 #include "wx/fontmap.h"
 
 #include "wx/fontutil.h"
 #include "wx/fontmap.h"

-
+#include "wx/encinfo.h"

 #include "wx/tokenzr.h"
 
 #include "wx/tokenzr.h"
 

-// ============================================================================
-// implementation
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// wxNativeEncodingInfo
-// ----------------------------------------------------------------------------
-
-// convert to/from the string representation: format is
-//      facename[;charset]

 
 

-bool wxNativeEncodingInfo::FromString(const wxString& s)
+// convert to/from the string representation:
+// format is facename[;charset]
+//
+bool wxNativeEncodingInfo::FromString( const wxString& s )

 {
 {

-    wxStringTokenizer tokenizer(s, _T(";"));
+    wxStringTokenizer tokenizer(s, wxT(";"));

 
     facename = tokenizer.GetNextToken();
     if ( !facename )
 
     facename = tokenizer.GetNextToken();
     if ( !facename )

-        return FALSE;
+        return false;

 
     wxString tmp = tokenizer.GetNextToken();
     if ( !tmp )
 
     wxString tmp = tokenizer.GetNextToken();
     if ( !tmp )


@@ -67,23 +48,19 @@ bool wxNativeEncodingInfo::FromString(const wxString& s)
     }
     else
     {
     }
     else
     {

-        if ( wxSscanf(tmp, _T("%u"), &charset) != 1 )
-        {
+        if ( wxSscanf( tmp, wxT("%u"), &charset ) != 1 )

             // should be a number!
             // should be a number!

-            return FALSE;
-        }
+            return false;

     }
 
     }
 

-    return TRUE;
+    return true;

 }
 
 wxString wxNativeEncodingInfo::ToString() const
 {
     wxString s(facename);
     if ( charset != 0 )
 }
 
 wxString wxNativeEncodingInfo::ToString() const
 {
     wxString s(facename);
     if ( charset != 0 )

-    {
-        s << _T(';') << charset;
-    }
+        s << wxT(';') << charset;

 
     return s;
 }
 
     return s;
 }


@@ -92,68 +69,20 @@ wxString wxNativeEncodingInfo::ToString() const
 // helper functions
 // ----------------------------------------------------------------------------
 
 // helper functions
 // ----------------------------------------------------------------------------
 

-bool wxGetNativeFontEncoding(wxFontEncoding encoding,
-                             wxNativeEncodingInfo *info)
+bool wxGetNativeFontEncoding( wxFontEncoding encoding, wxNativeEncodingInfo *info )

 {
 {

-    wxCHECK_MSG( info, FALSE, _T("bad pointer in wxGetNativeFontEncoding") );
+    wxCHECK_MSG( info, false, wxT("bad pointer in wxGetNativeFontEncoding") );

 
     if ( encoding == wxFONTENCODING_DEFAULT )
 
     if ( encoding == wxFONTENCODING_DEFAULT )

-    {

         encoding = wxFont::GetDefaultEncoding();
         encoding = wxFont::GetDefaultEncoding();

-    }

 
 

-    switch ( encoding )
-    {
-        // although this function is supposed to return an exact match, do do
-        // some mappings here for the most common case of "standard" encoding
-        case wxFONTENCODING_SYSTEM:
-        case wxFONTENCODING_ISO8859_1:
-        case wxFONTENCODING_ISO8859_15:
-        case wxFONTENCODING_CP1252:
-            info->charset = 0;
-            break;
-
-        case wxFONTENCODING_CP1250:
-            info->charset = 0;
-            break;
-
-        case wxFONTENCODING_CP1251:
-            info->charset = 0;
-            break;
-
-        case wxFONTENCODING_CP1253:
-            info->charset = 0;
-            break;
-
-        case wxFONTENCODING_CP1254:
-            info->charset = 0;
-            break;
-
-        case wxFONTENCODING_CP1255:
-            info->charset = 0;
-            break;
-
-        case wxFONTENCODING_CP1256:
-            info->charset = 0;
-            break;
-
-        case wxFONTENCODING_CP1257:
-            info->charset = 0;
-            break;
-
-        case wxFONTENCODING_CP437:
-             info->charset = 0;
-           break;
-
-        default:
-            // no way to translate this encoding into a Windows charset
-            return FALSE;
-    }
+    info->encoding = encoding;

 
 

-    return TRUE;
+    return true;

 }
 
 }
 

-bool wxTestFontEncoding(const wxNativeEncodingInfo& info)
+bool wxTestFontEncoding( const wxNativeEncodingInfo& WXUNUSED(info) )

 {
 {

-    return TRUE;
+    // basically we should be able to support every encoding via the OS
+    return true;

 }
 }