Applied slightly-modified patch 1826540 from Gareth Simpson.

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

diff --git a/include/wx/msw/fontenum.h b/include/wx/msw/fontenum.h
index c5cc84c9ba358e17d5a23c99aa7696687b7696ff..57bb9c585efb6fb2035cf4fd113cc409a36fb4fa 100644 (file)
--- a/include/wx/msw/fontenum.h
+++ b/include/wx/msw/fontenum.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        fontenum.h
+// Name:        wx/msw/fontenum.h
 // Purpose:     wxFontEnumerator class for Windows
 // Author:      Julian Smart
 // Modified by:
@@ -9,12 +9,8 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef _WX_FONTENUM_H_
-#define _WX_FONTENUM_H_
-
-#ifdef __GNUG__
-#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_