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

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

diff --git a/include/wx/wx.h b/include/wx/wx.h
index e50e3f9fc73da325575f4483e76a0788849d3004..a3bb3bfe06b22af0fcc8c2c2ae56be8c35a8ef2a 100644 (file)
--- a/include/wx/wx.h
+++ b/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"

diff --git a/src/cocoa/font.cpp b/src/cocoa/font.cpp
index 606e2e3d726e435a14a2f4f5dfe0da8747b377c6..88670a4d87d41f20b994af05d678001546c10b3f 100644 (file)
--- a/src/cocoa/font.cpp
+++ b/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"
 

diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp
index a81555a5cc105b8c7afb3a67fcb02eca8772a798..617a8d344baef341cfa985fdaf16147284a9e7d7 100644 (file)
--- a/src/common/gdicmn.cpp
+++ b/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;

diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp
index 462ea4940e3f62016eeb02502ff2d36962179ae6..1cef9c3ee5078dc5a2a4d74f298effd76a1376fa 100644 (file)
--- a/src/gtk/app.cpp
+++ b/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"

diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp
index 06a16e3fc0972f10f134bc4d0e58a60568a1d50e..4d47d138f2606e1cf3999be3d25c4da8ee005531 100644 (file)
--- a/src/gtk1/app.cpp
+++ b/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"

diff --git a/src/mac/carbon/utils.cpp b/src/mac/carbon/utils.cpp
index 5b715f598e6146b880f1a2fc81ffe1e30a24405c..e903a7d4d479af4f9066777387d6c70c1443b068 100644 (file)
--- a/src/mac/carbon/utils.cpp
+++ b/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>

diff --git a/src/mac/classic/fontenum.cpp b/src/mac/classic/fontenum.cpp
index e42113729b46b04a3d668081c418751082d9c982..11673812fc8677b775bf181735382bc3b3ecd6d6 100644 (file)
--- a/src/mac/classic/fontenum.cpp
+++ b/src/mac/classic/fontenum.cpp
@@ -1,8 +1,8 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        mac/fontenum.cpp
+// Name:        src/mac/classic/fontenum.cpp
 // Purpose:     wxFontEnumerator class for MacOS
 // Author:      Stefan Csomor
-// Modified by: 
+// Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
@@ -21,11 +21,11 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-  #pragma hdrstop
+    #pragma hdrstop
 #endif
 
 #ifndef WX_PRECOMP
-  #include "wx/font.h"
+    #include "wx/font.h"
 #endif
 
 #include "wx/fontenum.h"
@@ -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()
@@ -104,7 +104,7 @@ void wxFontEnumeratorHelper::DoEnumerate()
     Str255        p_name ;
 
     short         lines ;
-    
+
     menu = NewMenu( 32000 , "\pFont" )  ;
     AppendResMenu( menu , 'FONT' ) ;
     lines = CountMenuItems( menu ) ;
@@ -115,7 +115,7 @@ void wxFontEnumeratorHelper::DoEnumerate()
         wxString c_name = wxMacMakeStringFromPascal(p_name) ;
 
         /*
-          
+
           if ( m_fixedOnly )
         {
             // check that it's a fixed pitch font (there is *no* error here, the
@@ -126,7 +126,7 @@ void wxFontEnumeratorHelper::DoEnumerate()
                 return TRUE;
             }
         }
-    
+
         if ( m_charset != -1 )
         {
             // check that we have the right encoding
@@ -135,7 +135,7 @@ void wxFontEnumeratorHelper::DoEnumerate()
                 return TRUE;
             }
         }
-    
+
         */
         m_fontEnum->OnFacename( c_name ) ;
     }
@@ -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;
 }

diff --git a/src/mac/classic/utils.cpp b/src/mac/classic/utils.cpp
index 945f1ac07325b056cc819342f20bfa4d06aba197..7078e7a3c706d61035456fa1675b4b4674986a55 100644 (file)
--- a/src/mac/classic/utils.cpp
+++ b/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>

diff --git a/src/mac/corefoundation/cfstring.cpp b/src/mac/corefoundation/cfstring.cpp
index 2661bb0af8580adaa6fe5c2eb7eb5b3a72ec5dc1..ac72e36b7f25426ecabfe91fd80eb71a50162433 100644 (file)
--- a/src/mac/corefoundation/cfstring.cpp
+++ b/src/mac/corefoundation/cfstring.cpp
@@ -10,15 +10,16 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
+
 #ifndef WX_PRECOMP
     #include "wx/string.h"
     #include "wx/intl.h"
+    #if wxUSE_GUI
+        #include "wx/font.h"
+    #endif
 #endif
-#include "wx/mac/corefoundation/cfstring.h"
 
-#if wxUSE_GUI
-    #include "wx/font.h"
-#endif
+#include "wx/mac/corefoundation/cfstring.h"
 
 #ifdef __DARWIN__
     #include <CoreServices/CoreServices.h>
@@ -633,7 +634,7 @@ wxFontEncoding wxMacGetFontEncFromSystemEnc(wxUint32 encoding)
 // converts this string into a carbon foundation string with optional pc 2 mac encoding
 void wxMacCFStringHolder::Assign( const wxString &st , wxFontEncoding encoding )
 {
-    Release() ; 
+    Release() ;
     if (st.IsEmpty())
     {
         m_cfs = CFSTR("") ;
@@ -668,7 +669,7 @@ wxString wxMacCFStringHolder::AsString(wxFontEncoding encoding)
 {
     if ( m_cfs == NULL )
         return wxEmptyString ;
-    
+
     Size cflen = CFStringGetLength( m_cfs )  ;
     size_t noChars ;
     wxChar* buf = NULL ;
@@ -706,4 +707,3 @@ wxString wxMacCFStringHolder::AsString(wxFontEncoding encoding)
     delete[] buf ;
     return result ;
 }
-

diff --git a/src/mgl/settings.cpp b/src/mgl/settings.cpp
index b0e7a2be4e328a1c8a7f2afe33ce75282d6b063c..c051f96414a38b0726b26f5e9fd6c22866312ff3 100644 (file)
--- a/src/mgl/settings.cpp
+++ b/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"
 

diff --git a/src/msw/font.cpp b/src/msw/font.cpp
index 308a36e837ddbf8b571b007115afcc1418b26ca4..5fcc96ffc8c6b82c7a739617a6bae6d1c16233a8 100644 (file)
--- a/src/msw/font.cpp
+++ b/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
@@ -573,7 +574,7 @@ void wxNativeFontInfo::SetFamily(wxFontFamily family)
     BYTE ff_family;
     wxArrayString facename;
 
-    // the list of fonts associated with a family was partially 
+    // the list of fonts associated with a family was partially
     // taken from http://www.codestyle.org/css/font-family
 
     switch ( family )
@@ -635,9 +636,9 @@ void wxNativeFontInfo::SetFamily(wxFontFamily family)
                 facename.Add(_T("MS Shell Dlg"));
 
             // Quoting the MSDN:
-            //     "MS Shell Dlg is a mapping mechanism that enables 
-            //     U.S. English Microsoft Windows NT, and Microsoft Windows 2000 to 
-            //     support locales that have characters that are not contained in code 
+            //     "MS Shell Dlg is a mapping mechanism that enables
+            //     U.S. English Microsoft Windows NT, and Microsoft Windows 2000 to
+            //     support locales that have characters that are not contained in code
             //     page 1252. It is not a font but a face name for a nonexistent font."
         }
     }
@@ -1095,4 +1096,3 @@ bool wxFont::IsFixedWidth() const
 
     return wxFontBase::IsFixedWidth();
 }
-

diff --git a/src/msw/menuitem.cpp b/src/msw/menuitem.cpp
index 8bcbd83aa0a85e47dd411e552e8e4ab2ca816ce8..25958f2c6e9a7bb675e10f37ce17c579bad4df9c 100644 (file)
--- a/src/msw/menuitem.cpp
+++ b/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"

diff --git a/src/os2/checklst.cpp b/src/os2/checklst.cpp
index b9f6e93e02ecaa86cbe7d5ffa6677ddf13eba069..8491b44200fb3a4e5943ab06e79faca9f0794c4c 100644 (file)
--- a/src/os2/checklst.cpp
+++ b/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

diff --git a/src/os2/font.cpp b/src/os2/font.cpp
index 9871769c778a7b82cb6a8cb7dcd53d3fd8b1c5b2..a85ff9d642b04c1a7810600991f9c02f23a11eaa 100644 (file)
--- a/src/os2/font.cpp
+++ b/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(
-  PFONTMETRICS                      pFM
-, int                               nNumFonts
-)
+void wxFont::SetFM( PFONTMETRICS pFM, int nNumFonts )
 {
     M_FONTDATA->SetFM(pFM);
     M_FONTDATA->SetNumFonts(nNumFonts);
 } // end of wxFont::SetFM
 
 
-void wxFont::SetPS(
-  HPS                               hPS
-)
+void wxFont::SetPS( HPS hPS )
 {
     Unshare();
 

diff --git a/src/os2/fontenum.cpp b/src/os2/fontenum.cpp
index af3bd9ec782c3baafa48dd6932443721b50991c8..1af60107aafd055a26f2bb3d6c36c6fa5f9ac03b 100644 (file)
--- a/src/os2/fontenum.cpp
+++ b/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"
+    #include "wx/font.h"
 #endif
 
-#include "wx/fontenum.h"
 #include "wx/fontmap.h"
 #include "wx/encinfo.h"
 

diff --git a/src/os2/gdiobj.cpp b/src/os2/gdiobj.cpp
index 699e33d4505f020809cb4cd93f50cbe2182b278a..909d5f70b6b983a5ad61a6702f4e252eee4404a0 100644 (file)
--- a/src/os2/gdiobj.cpp
+++ b/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)
 

diff --git a/src/os2/menuitem.cpp b/src/os2/menuitem.cpp
index 06ea4c8185256c20f559a626528c3c9a5986e32c..f72deae3e1555afb1811c2484d38697702b13c9c 100644 (file)
--- a/src/os2/menuitem.cpp
+++ b/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"

diff --git a/src/palmos/font.cpp b/src/palmos/font.cpp
index 5eebd464f5f37566715f35f00eed03b7d9b13cb8..643465f86491ba488790e1daaaa0f9a80562690a 100644 (file)
--- a/src/palmos/font.cpp
+++ b/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

diff --git a/src/palmos/menuitem.cpp b/src/palmos/menuitem.cpp
index 111a44c494ecb86d19434facbd4667a6992f8168..23d967875c4147fb936a43f128bb35bc77274c90 100644 (file)
--- a/src/palmos/menuitem.cpp
+++ b/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"