wxUSE_POSTSCRIPT is not a sufficient test by itself for

wxPostScriptPrintNative data.  This is probably still not
100% correct but at least msw builds again for mingw now.

Fixed bogus eof (and removed junk whitespace) from mediactl.


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

include/wx/mediactrl.h

@@ -14,3 +14,4 @@
 #elif defined(__WXMAC__)
 #include "wx/mac/carbon/mediactrl.h"
 #endif
+

include/wx/msw/mediactrl.h

@@ -102,3 +102,4 @@ typedef void (wxEvtHandler::*wxMediaEventFunction)(wxMediaEvent&);
 #define EVT_MEDIA_FINISHED(winid, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_MEDIA_FINISHED, winid, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxMediaEventFunction) & fn, (wxObject *) NULL ),
 
 #endif // wxUSE_MEDIACTRL
+

src/common/cmndata.cpp

@@ -258,7 +258,9 @@ bool wxPrintData::Ok() const
     return m_nativeData->Ok();
 }
 
-#if WXWIN_COMPATIBILITY_2_4
+// What should happen here?  wxPostScriptPrintNativeData is not
+// defined unless all this is true on MSW.
+#if WXWIN_COMPATIBILITY_2_4 && wxUSE_PRINTING_ARCHITECTURE && (!defined(__WXMSW__) || wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW)
 
 #include "wx/generic/prntdlgg.h"
 

src/msw/mediactrl.cpp

@@ -883,3 +883,4 @@ bool wxWMMEMediaCtrlImpl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM l
 }
 
 #endif //wxUSE_MEDIACTRL
+