added an extra pixel to the margin in CalcSizeFromPage() (patch 1498847)

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

diff --git a/src/msw/mediactrl_wmp10.cpp b/src/msw/mediactrl_wmp10.cpp
index e1f8e1d08879b71ae95f744f50a50f83398a7844..2dc26fdbdf6cfb1646eaa33d400f91345c375150 100644 (file)
--- a/src/msw/mediactrl_wmp10.cpp
+++ b/src/msw/mediactrl_wmp10.cpp
@@ -50,20 +50,14 @@
 #pragma hdrstop
 #endif
 
 #pragma hdrstop
 #endif
 

-//---------------------------------------------------------------------------
-// MediaCtrl include
-//---------------------------------------------------------------------------
+#if wxUSE_MEDIACTRL
+

 #include "wx/mediactrl.h"
 
 #include "wx/mediactrl.h"
 

-//---------------------------------------------------------------------------
-// Compilation guard
-//---------------------------------------------------------------------------
-#if wxUSE_MEDIACTRL
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+#endif

 
 

-//---------------------------------------------------------------------------
-// WX Includes
-//---------------------------------------------------------------------------
-#include "wx/log.h"         // wxLogDebug

 #include "wx/msw/private.h" // user info and wndproc setting/getting
 #include "wx/msw/ole/activex.h" // wxActiveXContainer - COM-specific stuff
 
 #include "wx/msw/private.h" // user info and wndproc setting/getting
 #include "wx/msw/ole/activex.h" // wxActiveXContainer - COM-specific stuff
 


@@ -1515,7 +1509,4 @@ bool MyApp::OnInit()
 
 #endif // WMP mobile 9 hacks
 
 
 #endif // WMP mobile 9 hacks
 

-//---------------------------------------------------------------------------
-//  End wxMediaCtrl Compilation Guard and this file
-//---------------------------------------------------------------------------

 #endif // wxUSE_MEDIACTRL
 #endif // wxUSE_MEDIACTRL