#include order with correct PCH support.

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

src/mac/carbon/font.cpp

@@ -16,12 +16,12 @@
 #ifndef WX_PRECOMP
     #include "wx/string.h"
     #include "wx/utils.h"
+    #include "wx/intl.h"
 #endif
 
 #include "wx/fontutil.h"
 #include "wx/gdicmn.h"
 #include "wx/fontutil.h"
-#include "wx/intl.h"
 
 #include "wx/mac/private.h"
 

src/mac/carbon/listbox.cpp

@@ -18,6 +18,7 @@
 #ifndef WX_PRECOMP
     #include "wx/dynarray.h"
     #include "wx/log.h"
+    #include "wx/intl.h"
     #include "wx/app.h"
     #include "wx/utils.h"
     #include "wx/button.h"
@@ -25,7 +26,6 @@
 
 #include "wx/settings.h"
 #include "wx/toplevel.h"
-#include "wx/intl.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl)
 
@@ -957,4 +957,4 @@ static pascal void ListBoxDrawProc(
 #endif
 
 
-#endif
+#endif // wxUSE_LISTBOX

src/mac/carbon/mediactrl.cpp

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        mac/carbon/mediactrl.cpp
+// Name:        src/mac/carbon/mediactrl.cpp
 // Purpose:     Built-in Media Backends for Mac
 // Author:      Ryan Norton <wxprojects@comcast.net>
 // Modified by:
@@ -36,12 +36,17 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
+#if wxUSE_MEDIACTRL
+
 #include "wx/mediactrl.h"
 
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+#endif
+
 // uma is for wxMacFSSpec
 #include "wx/mac/uma.h"
 #include "wx/timer.h"
-#include "wx/log.h"
 
 // standard QT stuff
 #ifndef __DARWIN__
@@ -52,8 +57,6 @@
 #include <QuickTime/QuickTimeComponents.h>
 #endif
 
-#if wxUSE_MEDIACTRL
-
 //---------------------------------------------------------------------------
 // Height and Width of movie controller in the movie control (apple samples)
 //---------------------------------------------------------------------------