Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wxUSE_POSTSCRIPT is not a sufficient test by itself for

Browse Source 
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
This commit is contained in:
Ron Lee
2004-11-12 06:52:19 +00:00
parent 33d8e2fcb6
commit 72259e0063
4 changed files with 73 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/wx/mediactrl.h
View File

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

1
include/wx/msw/mediactrl.h
View File

@@ -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 ), #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 #endif // wxUSE_MEDIACTRL

4
src/common/cmndata.cpp
View File

@@ -258,7 +258,9 @@ bool wxPrintData::Ok() const
return m_nativeData->Ok(); 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" #include "wx/generic/prntdlgg.h"

1
src/msw/mediactrl.cpp
View File

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