wchar_t is now always required, updated chartype.h check accordingly

[wxWidgets.git] / include / wx / msw / fontenum.h

diff --git a/include/wx/msw/fontenum.h b/include/wx/msw/fontenum.h
index fc1808dfcef3a5fcbe71e3b9441fcb2b7aec582c..57bb9c585efb6fb2035cf4fd113cc409a36fb4fa 100644 (file)
--- a/include/wx/msw/fontenum.h
+++ b/include/wx/msw/fontenum.h
@@ -1,20 +1,16 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        fontenum.h
+// Name:        wx/msw/fontenum.h
 // Purpose:     wxFontEnumerator class for Windows
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef _WX_FONTENUM_H_
-#define _WX_FONTENUM_H_
-
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "fontenum.h"
-#endif
+#ifndef _WX_FONTENUM_MSW_H_
+#define _WX_FONTENUM_MSW_H_
 
 /*
  * wxFontEnumerator: for gathering font information
@@ -24,12 +20,12 @@ class wxFontEnumerator: public wxObject
 {
 DECLARE_CLASS(wxFontEnumerator)
 public:
-    wxFontEnumerator() {};
+    wxFontEnumerator() {}
 
     // Enumerate the fonts.
     bool Enumerate();
 
-    // Stop enumeration if FALSE is returned.
+    // Stop enumeration if false is returned.
     // By default, the enumerator stores the facenames in a list for
     // retrieval via GetFacenames().
     virtual bool OnFont(const wxFont& font);
@@ -41,5 +37,4 @@ protected:
 };
 
 #endif
-  // _WX_FONTENUM_H_
-
+  // _WX_FONTENUM_MSW_H_