added operators for comparing wxString to wxCStrData

[wxWidgets.git] / src / cocoa / fontutil.cpp

diff --git a/src/cocoa/fontutil.cpp b/src/cocoa/fontutil.cpp
index 68060c945b9740a709a973b35fe5dbabc5608f5b..1a59d7e8e2393d7cff06beaf29e9d2d484f83103 100644 (file)
--- a/src/cocoa/fontutil.cpp
+++ b/src/cocoa/fontutil.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        unix/fontutil.cpp
+// Name:        src/cocoa/fontutil.cpp

 // Purpose:     Font helper functions for X11 (GDK/X)
 // Author:      Vadim Zeitlin
 // Modified by:
 // Purpose:     Font helper functions for X11 (GDK/X)
 // Author:      Vadim Zeitlin
 // Modified by:


@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
-    #pragma implementation "fontutil.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -28,14 +24,16 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#include "wx/fontutil.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

+    #include "wx/hash.h"
+    #include "wx/utils.h"
+    #include "wx/module.h"

 #endif // PCH
 
 #endif // PCH
 

-#include "wx/fontutil.h"

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

-#include "wx/hash.h"
-#include "wx/module.h"

 #include "wx/encinfo.h"
 
 #ifdef __WXGTK20__
 #include "wx/encinfo.h"
 
 #ifdef __WXGTK20__


@@ -72,7 +70,7 @@ wxFontStyle wxNativeFontInfo::GetStyle() const
             m_style = wxFONTSTYLE_SLANT;
             break;
     }
             m_style = wxFONTSTYLE_SLANT;
             break;
     }

-    
+

     return m_style;
 }
 
     return m_style;
 }
 


@@ -101,19 +99,19 @@ wxFontWeight wxNativeFontInfo::GetWeight() const
             m_weight = wxFONTWEIGHT_BOLD;
             break;
     }
             m_weight = wxFONTWEIGHT_BOLD;
             break;
     }

-    
+

     return m_weight;
 }
 
 bool wxNativeFontInfo::GetUnderlined() const
 {
     return m_weight;
 }
 
 bool wxNativeFontInfo::GetUnderlined() const
 {

-    return FALSE;
+    return false;

 }
 
 wxString wxNativeFontInfo::GetFaceName() const
 {
     wxString tmp = wxGTK_CONV_BACK( pango_font_description_get_family( description ) );
 }
 
 wxString wxNativeFontInfo::GetFaceName() const
 {
     wxString tmp = wxGTK_CONV_BACK( pango_font_description_get_family( description ) );

-    
+

     return tmp;
 }
 
     return tmp;
 }
 


@@ -133,7 +131,7 @@ wxFontEncoding wxNativeFontInfo::GetEncoding() const
 
 bool wxNativeEncodingInfo::FromString(const wxString& s)
 {
 
 bool wxNativeEncodingInfo::FromString(const wxString& s)
 {

-    return FALSE;
+    return false;

 }
 
 wxString wxNativeEncodingInfo::ToString() const
 }
 
 wxString wxNativeEncodingInfo::ToString() const


@@ -143,16 +141,16 @@ wxString wxNativeEncodingInfo::ToString() const
 
 bool wxTestFontEncoding(const wxNativeEncodingInfo& info)
 {
 
 bool wxTestFontEncoding(const wxNativeEncodingInfo& info)
 {

-    return TRUE;
+    return true;

 }
 
 bool wxGetNativeFontEncoding(wxFontEncoding encoding,
                              wxNativeEncodingInfo *info)
 {
 }
 
 bool wxGetNativeFontEncoding(wxFontEncoding encoding,
                              wxNativeEncodingInfo *info)
 {

-    return FALSE;
+    return false;

 }
 
 }
 

-#else 
+#else

    // __WXGTK20__
 
 #ifdef __X__
    // __WXGTK20__
 
 #ifdef __X__


@@ -166,7 +164,6 @@ bool wxGetNativeFontEncoding(wxFontEncoding encoding,
         #pragma message enable nosimpint
     #endif
 
         #pragma message enable nosimpint
     #endif
 

-    #include "wx/utils.h"       // for wxGetDisplay()

 #elif defined(__WXGTK__)
     // we have to declare struct tm to avoid problems with first forward
     // declaring it in C code (glib.h included from gdk.h does it) and then
 #elif defined(__WXGTK__)
     // we have to declare struct tm to avoid problems with first forward
     // declaring it in C code (glib.h included from gdk.h does it) and then


@@ -215,7 +212,7 @@ return wxEmptyString;
 bool wxGetNativeFontEncoding(wxFontEncoding encoding,
                              wxNativeEncodingInfo *info)
 {
 bool wxGetNativeFontEncoding(wxFontEncoding encoding,
                              wxNativeEncodingInfo *info)
 {

-    return FALSE;
+    return false;

 }
 
 bool wxTestFontEncoding(const wxNativeEncodingInfo& info)
 }
 
 bool wxTestFontEncoding(const wxNativeEncodingInfo& info)


@@ -247,7 +244,7 @@ bool wxFontModule::OnInit()
 {
     g_fontHash = new wxHashTable( wxKEY_STRING );
 
 {
     g_fontHash = new wxHashTable( wxKEY_STRING );
 

-    return TRUE;
+    return true;

 }
 
 void wxFontModule::OnExit()
 }
 
 void wxFontModule::OnExit()