fix for popup menus (part of patch 1238355)

[wxWidgets.git] / src / msw / mimetype.cpp

diff --git a/src/msw/mimetype.cpp b/src/msw/mimetype.cpp
index 9dedef77d558df38749131d91f320dd250083a4e..4720084cba385a5c37038760939a3b9ce709b5dc 100644 (file)
--- a/src/msw/mimetype.cpp
+++ b/src/msw/mimetype.cpp
@@ -18,19 +18,21 @@
 
 #if wxUSE_MIMETYPE
 
 
 #if wxUSE_MIMETYPE
 

+#include "wx/msw/mimetype.h"
+

 #ifndef WX_PRECOMP
     #include "wx/dynarray.h"
     #include "wx/string.h"
 #ifndef WX_PRECOMP
     #include "wx/dynarray.h"
     #include "wx/string.h"

+    #include "wx/intl.h"
+    #include "wx/log.h"

     #if wxUSE_GUI
         #include "wx/icon.h"
         #include "wx/msgdlg.h"
     #endif
 #endif //WX_PRECOMP
 
     #if wxUSE_GUI
         #include "wx/icon.h"
         #include "wx/msgdlg.h"
     #endif
 #endif //WX_PRECOMP
 

-#include "wx/log.h"

 #include "wx/file.h"
 #include "wx/iconloc.h"
 #include "wx/file.h"
 #include "wx/iconloc.h"

-#include "wx/intl.h"

 #include "wx/confbase.h"
 
 #ifdef __WXMSW__
 #include "wx/confbase.h"
 
 #ifdef __WXMSW__


@@ -38,8 +40,6 @@
     #include "wx/msw/private.h"
 #endif // OS
 
     #include "wx/msw/private.h"
 #endif // OS
 

-#include "wx/msw/mimetype.h"
-

 // other standard headers
 #include <ctype.h>
 
 // other standard headers
 #include <ctype.h>