Fix compilation for some wxMSW configurations.

wx/scopeguard.h was not always included when using PCH, so include it in any
case, not just #ifndef WX_PRECOMP.

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

diff --git a/src/msw/font.cpp b/src/msw/font.cpp
index ae1df60343416c363ff001e6cd6894d5278d59dc..d7931aabf067f8cd261fb72de69d8c5791346d97 100644 (file)
--- a/src/msw/font.cpp
+++ b/src/msw/font.cpp
@@ -32,7 +32,6 @@
     #include "wx/app.h"
     #include "wx/log.h"
     #include "wx/encinfo.h"
     #include "wx/app.h"
     #include "wx/log.h"
     #include "wx/encinfo.h"

-    #include "wx/scopeguard.h"

 #endif // WX_PRECOMP
 
 #include "wx/msw/private.h"
 #endif // WX_PRECOMP
 
 #include "wx/msw/private.h"


@@ -44,6 +43,7 @@
     #include "wx/sysopt.h"
 #endif
 
     #include "wx/sysopt.h"
 #endif
 

+#include "wx/scopeguard.h"

 #include "wx/tokenzr.h"
 
 #if wxUSE_EXTENDED_RTTI
 #include "wx/tokenzr.h"
 
 #if wxUSE_EXTENDED_RTTI