Digital Mars fixes

[wxWidgets.git] / src / mgl / fontenum.cpp

diff --git a/src/mgl/fontenum.cpp b/src/mgl/fontenum.cpp
index 1af6e579c707cca9ff81232b40710bd581396795..c3a523e17b0cfb55b839c4daf8740f69e94f4717 100644 (file)
--- a/src/mgl/fontenum.cpp
+++ b/src/mgl/fontenum.cpp
@@ -1,12 +1,19 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        src/unix/fontenum.cpp
+// Name:        src/mgl/fontenum.cpp
 // Purpose:     wxFontEnumerator class for MGL
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
 // ============================================================================
 // declarations
 // ============================================================================
@@ -15,23 +22,14 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "fontenum.h"
-#endif
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
+#include "wx/fontenum.h"
 
-#ifdef __BORLANDC__
-    #pragma hdrstop
+#ifndef WX_PRECOMP
+    #include "wx/dynarray.h"
+    #include "wx/string.h"
+    #include "wx/utils.h"
 #endif
 
-#include "wx/defs.h"
-#include "wx/dynarray.h"
-#include "wx/string.h"
-#include "wx/utils.h"
-
-#include "wx/fontenum.h"
 #include "wx/encinfo.h"
 #include "wx/fontutil.h"
 
@@ -49,7 +47,7 @@
 bool wxFontEnumerator::EnumerateFacenames(wxFontEncoding encoding,
                                           bool fixedWidthOnly)
 {
-    bool found = FALSE;
+    bool found = false;
     wxMGLFontFamilyList *list = wxTheFontsManager->GetFamilyList();
     wxMGLFontFamilyList::Node *node;
     wxMGLFontFamily *f = NULL;
@@ -57,7 +55,7 @@ bool wxFontEnumerator::EnumerateFacenames(wxFontEncoding encoding,
 
     if ( encoding != wxFONTENCODING_SYSTEM )
         wxGetNativeFontEncoding(encoding, &info);
-     
+
     for (node = list->GetFirst(); node; node = node->GetNext())
     {
         f = node->GetData();
@@ -65,9 +63,9 @@ bool wxFontEnumerator::EnumerateFacenames(wxFontEncoding encoding,
         if ( (!fixedWidthOnly || f->GetInfo()->isFixed) &&
              (encoding == wxFONTENCODING_SYSTEM || wxTestFontEncoding(info)) )
         {
-            found = TRUE;
+            found = true;
             if ( !OnFacename(f->GetName()) )
-                return TRUE;
+                return true;
         }
     }
 
@@ -76,7 +74,7 @@ bool wxFontEnumerator::EnumerateFacenames(wxFontEncoding encoding,
 
 bool wxFontEnumerator::EnumerateEncodings(const wxString& family)
 {
-    static wxFontEncoding encodings[] = 
+    static wxFontEncoding encodings[] =
     {
         wxFONTENCODING_ISO8859_1,
         wxFONTENCODING_ISO8859_2,
@@ -102,11 +100,11 @@ bool wxFontEnumerator::EnumerateEncodings(const wxString& family)
         wxFONTENCODING_CP1256,
         wxFONTENCODING_CP1257,
         wxFONTENCODING_KOI8,
-        
+
         wxFONTENCODING_SYSTEM
     };
-    
-    static const char *encodingNames[] = 
+
+    static const char *encodingNames[] =
     {
         "iso88590-1",
         "iso88590-2",
@@ -132,18 +130,18 @@ bool wxFontEnumerator::EnumerateEncodings(const wxString& family)
         "koi-8",
         NULL
     };
-    
+
     wxNativeEncodingInfo info;
     info.facename = family;
-    
+
     for (size_t i = 0; encodings[i] != wxFONTENCODING_SYSTEM; i++)
     {
         if ( !wxGetNativeFontEncoding(encodings[i], &info) ||
-             !wxTestFontEncoding(info) ) 
+             !wxTestFontEncoding(info) )
             continue;
         if ( !OnFontEncoding(family, encodingNames[i]) )
             break;
     }
 
-    return TRUE;
+    return true;
 }