Include wx/font.h according to precompiled headers of wx/wx.h (with other minor cleaning).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39734 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/wx.h

@@ -35,6 +35,7 @@
 #include "wx/frame.h"
 #include "wx/bitmap.h"
 #include "wx/colour.h"
+#include "wx/font.h"
 #include "wx/dc.h"
 #include "wx/dcclient.h"
 #include "wx/dcmemory.h"

src/cocoa/font.cpp

@@ -11,11 +11,12 @@
 
 #include "wx/wxprec.h"
 
+#include "wx/font.h"
+
 #ifndef WX_PRECOMP
     #include "wx/string.h"
 #endif
 
-#include "wx/font.h"
 #include "wx/gdicmn.h"
 #include "wx/encinfo.h"
 

src/common/gdicmn.cpp

@@ -28,10 +28,9 @@
     #include "wx/settings.h"
     #include "wx/bitmap.h"
     #include "wx/colour.h"
+    #include "wx/font.h"
 #endif
 
-#include "wx/font.h"
-
 WXDLLIMPEXP_DATA_CORE(wxBrushList*) wxTheBrushList;
 WXDLLIMPEXP_DATA_CORE(wxFontList*)  wxTheFontList;
 WXDLLIMPEXP_DATA_CORE(wxPenList*)   wxThePenList;

src/gtk/app.cpp

@@ -26,10 +26,10 @@
     #include "wx/settings.h"
     #include "wx/msgdlg.h"
     #include "wx/memory.h"
+    #include "wx/font.h"
 #endif
 
 #include "wx/gdicmn.h"
-#include "wx/font.h"
 #include "wx/file.h"
 #include "wx/filename.h"
 #include "wx/module.h"

src/gtk1/app.cpp

@@ -26,10 +26,10 @@
     #include "wx/settings.h"
     #include "wx/msgdlg.h"
     #include "wx/memory.h"
+    #include "wx/font.h"
 #endif
 
 #include "wx/gdicmn.h"
-#include "wx/font.h"
 #include "wx/file.h"
 #include "wx/filename.h"
 #include "wx/module.h"

src/mac/carbon/utils.cpp

@@ -18,6 +18,7 @@
     #include "wx/app.h"
     #if wxUSE_GUI
         #include "wx/toplevel.h"
+        #include "wx/font.h"
     #endif
 #endif
 
@@ -25,7 +26,6 @@
 
 #if wxUSE_GUI
     #include "wx/mac/uma.h"
-    #include "wx/font.h"
 #endif
 
 #include <ctype.h>

src/mac/classic/fontenum.cpp

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        mac/fontenum.cpp
+// Name:        src/mac/classic/fontenum.cpp
 // Purpose:     wxFontEnumerator class for MacOS
 // Author:      Stefan Csomor
 // Modified by:
@@ -78,7 +78,7 @@ wxFontEnumeratorHelper::wxFontEnumeratorHelper(wxFontEnumerator *fontEnum)
 {
     m_fontEnum = fontEnum;
     m_charset = -1;
-    m_fixedOnly = FALSE;
+    m_fixedOnly = false;
 }
 
 bool wxFontEnumeratorHelper::SetEncoding(wxFontEncoding encoding)
@@ -89,13 +89,13 @@ bool wxFontEnumeratorHelper::SetEncoding(wxFontEncoding encoding)
         if ( !wxFontMapper::Get()->GetAltForEncoding(encoding, &info) )
         {
             // no such encodings at all
-            return FALSE;
+            return false;
         }
     }
     m_charset = info.charset;
     m_facename = info.facename;
 
-    return TRUE;
+    return true;
 }
 
 void wxFontEnumeratorHelper::DoEnumerate()
@@ -158,12 +158,12 @@ bool wxFontEnumerator::EnumerateFacenames(wxFontEncoding encoding,
     }
     // else: no such fonts, unknown encoding
 
-    return TRUE;
+    return true;
 }
 
 bool wxFontEnumerator::EnumerateEncodings(const wxString& family)
 {
     wxFAIL_MSG(wxT("wxFontEnumerator::EnumerateEncodings() not yet implemented"));
 
-    return TRUE;
+    return true;
 }

src/mac/classic/utils.cpp

@@ -16,13 +16,15 @@
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/app.h"
+    #if wxUSE_GUI
+        #include "wx/font.h"
+    #endif
 #endif
 
 #include "wx/apptrait.h"
 
 #if wxUSE_GUI
     #include "wx/mac/uma.h"
-    #include "wx/font.h"
 #endif
 
 #include <ctype.h>

src/mac/corefoundation/cfstring.cpp

@@ -10,16 +10,17 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
+
 #ifndef WX_PRECOMP
     #include "wx/string.h"
     #include "wx/intl.h"
-#endif
+    #if wxUSE_GUI
-#include "wx/mac/corefoundation/cfstring.h"
-
-#if wxUSE_GUI
         #include "wx/font.h"
+    #endif
 #endif
 
+#include "wx/mac/corefoundation/cfstring.h"
+
 #ifdef __DARWIN__
     #include <CoreServices/CoreServices.h>
 #else
@@ -706,4 +707,3 @@ wxString wxMacCFStringHolder::AsString(wxFontEncoding encoding)
     delete[] buf ;
     return result ;
 }
-

src/mgl/settings.cpp

@@ -17,9 +17,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/colour.h"
+    #include "wx/font.h"
 #endif
 
-#include "wx/font.h"
 #include "wx/gdicmn.h"
 #include "wx/module.h"
 

src/msw/font.cpp

@@ -24,11 +24,12 @@
     #pragma hdrstop
 #endif
 
+#include "wx/font.h"
+
 #ifndef WX_PRECOMP
     #include "wx/list.h"
     #include "wx/utils.h"
     #include "wx/app.h"
-    #include "wx/font.h"
     #include "wx/log.h"
     #include "wx/encinfo.h"
 #endif // WX_PRECOMP
@@ -1095,4 +1096,3 @@ bool wxFont::IsFixedWidth() const
 
     return wxFontBase::IsFixedWidth();
 }
-

src/msw/menuitem.cpp

@@ -32,7 +32,6 @@
     #include "wx/font.h"
     #include "wx/bitmap.h"
     #include "wx/settings.h"
-    #include "wx/font.h"
     #include "wx/window.h"
     #include "wx/accel.h"
     #include "wx/string.h"

src/os2/checklst.cpp

@@ -30,9 +30,9 @@
     #include "wx/listbox.h"
     #include "wx/bitmap.h"
     #include "wx/colour.h"
+    #include "wx/font.h"
 #endif
 
-#include "wx/font.h"
 #include "wx/ownerdrw.h"
 
 #define INCL_PM

src/os2/font.cpp

@@ -20,12 +20,13 @@
 // headers
 // ----------------------------------------------------------------------------
 
+#include "wx/font.h"
+
 #ifndef WX_PRECOMP
     #include <stdio.h>
     #include "wx/list.h"
     #include "wx/utils.h"
     #include "wx/app.h"
-    #include "wx/font.h"
     #include "wx/log.h"
 #endif // WX_PRECOMP
 
@@ -1135,19 +1136,14 @@ const wxNativeFontInfo* wxFont::GetNativeFontInfo() const
 //
 // Internal use only method to set the FONTMETRICS array
 //
-void wxFont::SetFM(
+void wxFont::SetFM( PFONTMETRICS pFM, int nNumFonts )
-  PFONTMETRICS                      pFM
-, int                               nNumFonts
-)
 {
     M_FONTDATA->SetFM(pFM);
     M_FONTDATA->SetNumFonts(nNumFonts);
 } // end of wxFont::SetFM
 
 
-void wxFont::SetPS(
+void wxFont::SetPS( HPS hPS )
-  HPS                               hPS
-)
 {
     Unshare();
 

src/os2/fontenum.cpp

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        msw/fontenum.cpp
+// Name:        src/os2/fontenum.cpp
 // Purpose:     wxFontEnumerator class for Windows
 // Author:      Julian Smart
 // Modified by: David Webster to add support for font encodings
@@ -22,11 +22,12 @@
 
 #if wxUSE_FONTMAP
 
+#include "wx/fontenum.h"
+
 #ifndef WX_PRECOMP
     #include "wx/font.h"
 #endif
 
-#include "wx/fontenum.h"
 #include "wx/fontmap.h"
 #include "wx/encinfo.h"
 

src/os2/gdiobj.cpp

@@ -12,8 +12,12 @@
 #include "wx/wxprec.h"
 
 #include "wx/gdiobj.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/font.h"
+#endif
+
 #include "wx/gdicmn.h"
-#include "wx/font.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxGDIObject, wxObject)
 

src/os2/menuitem.cpp

@@ -22,7 +22,6 @@
     #include "wx/font.h"
     #include "wx/bitmap.h"
     #include "wx/settings.h"
-    #include "wx/font.h"
     #include "wx/window.h"
     #include "wx/accel.h"
     #include "wx/menu.h"

src/palmos/font.cpp

@@ -24,11 +24,12 @@
     #pragma hdrstop
 #endif
 
+#include "wx/font.h"
+
 #ifndef WX_PRECOMP
     #include "wx/list.h"
     #include "wx/utils.h"
     #include "wx/app.h"
-    #include "wx/font.h"
     #include "wx/log.h"
     #include "wx/encinfo.h"
 #endif // WX_PRECOMP

src/palmos/menuitem.cpp

@@ -32,7 +32,6 @@
     #include "wx/font.h"
     #include "wx/bitmap.h"
     #include "wx/settings.h"
-    #include "wx/font.h"
     #include "wx/window.h"
     #include "wx/accel.h"
     #include "wx/string.h"