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

diff --git a/include/wx/mediactrl.h b/include/wx/mediactrl.h
index 7468997881903e70e357948091794b4b2f377f11..b504a010e402c62c2d4727b771f2a138578a24d9 100644 (file)
--- a/include/wx/mediactrl.h
+++ b/include/wx/mediactrl.h
@@ -13,4 +13,5 @@
 #include "wx/msw/mediactrl.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/carbon/mediactrl.h"
 #include "wx/msw/mediactrl.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/carbon/mediactrl.h"

-#endif
\ No newline at end of file
+#endif
+

diff --git a/include/wx/msw/mediactrl.h b/include/wx/msw/mediactrl.h
index 9c59d05dfcbf6f36a96167df9536f868597de605..a65a2da47a36801fdca71fa9bd5ef3568346b09b 100644 (file)
--- a/include/wx/msw/mediactrl.h
+++ b/include/wx/msw/mediactrl.h
@@ -1,8 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/msw/mediactrl.h
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/msw/mediactrl.h

-// Purpose:     DirectX7+ wxMediaCtrl MSW 
+// Purpose:     DirectX7+ wxMediaCtrl MSW

 // Author:      Ryan Norton <wxprojects@comcast.net>
 // Author:      Ryan Norton <wxprojects@comcast.net>

-// Modified by: 
+// Modified by:

 // Created:     11/07/04
 // RCS-ID:      $Id$
 // Copyright:   (c) Ryan Norton
 // Created:     11/07/04
 // RCS-ID:      $Id$
 // Copyright:   (c) Ryan Norton


@@ -29,25 +29,25 @@ public:
     wxMediaCtrl() : m_imp(NULL)
     {                                                                   }
 
     wxMediaCtrl() : m_imp(NULL)
     {                                                                   }
 

-    wxMediaCtrl(wxWindow* parent, wxWindowID id, const wxString& fileName, 
-                const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, 
+    wxMediaCtrl(wxWindow* parent, wxWindowID id, const wxString& fileName,
+                const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,

                 long style = 0, long driver = 0, const wxString& name = wxPanelNameStr) : m_imp(NULL)
                 long style = 0, long driver = 0, const wxString& name = wxPanelNameStr) : m_imp(NULL)

-    {   Create(parent, id, fileName, pos, size, style, driver, name);    } 
+    {   Create(parent, id, fileName, pos, size, style, driver, name);    }

 
 
     wxMediaCtrl(wxWindow* parent, wxWindowID id, const wxURI& location,
 
 
     wxMediaCtrl(wxWindow* parent, wxWindowID id, const wxURI& location,

-                const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, 
+                const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,

                 long style = 0, long driver = 0, const wxString& name = wxPanelNameStr) : m_imp(NULL)
                 long style = 0, long driver = 0, const wxString& name = wxPanelNameStr) : m_imp(NULL)

-    {   Create(parent, id, location, pos, size, style, driver, name);    } 
+    {   Create(parent, id, location, pos, size, style, driver, name);    }

 
     ~wxMediaCtrl();
 
 
     ~wxMediaCtrl();
 

-    bool Create(wxWindow* parent, wxWindowID id, const wxString& fileName, 
-                const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, 
+    bool Create(wxWindow* parent, wxWindowID id, const wxString& fileName,
+                const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,

                 long style = 0, long driver = 0, const wxString& name = wxPanelNameStr);
 
                 long style = 0, long driver = 0, const wxString& name = wxPanelNameStr);
 

-    bool Create(wxWindow* parent, wxWindowID id, const wxURI& location, 
-                const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, 
+    bool Create(wxWindow* parent, wxWindowID id, const wxURI& location,
+                const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,

                 long style = 0, long driver = 0, const wxString& name = wxPanelNameStr);
 
     bool Play();
                 long style = 0, long driver = 0, const wxString& name = wxPanelNameStr);
 
     bool Play();


@@ -75,30 +75,31 @@ protected:
 
     class wxMediaCtrlImpl* m_imp;
     bool m_bLoaded;
 
     class wxMediaCtrlImpl* m_imp;
     bool m_bLoaded;

-    
+

     DECLARE_DYNAMIC_CLASS(wxMediaCtrl);
 };
 
 //Event stuff
     DECLARE_DYNAMIC_CLASS(wxMediaCtrl);
 };
 
 //Event stuff

-class WXDLLEXPORT wxMediaEvent : public wxNotifyEvent 
-{ 
+class WXDLLEXPORT wxMediaEvent : public wxNotifyEvent
+{

 public:
 public:

-    wxMediaEvent(wxEventType commandType = wxEVT_NULL, int id = 0) 
-        : wxNotifyEvent(commandType, id) 
+    wxMediaEvent(wxEventType commandType = wxEVT_NULL, int id = 0)
+        : wxNotifyEvent(commandType, id)

     {               }
     {               }

-    
-    wxMediaEvent(const wxMediaEvent &clone) 
-            : wxNotifyEvent(clone.GetEventType(), clone.GetId()) 
+
+    wxMediaEvent(const wxMediaEvent &clone)
+            : wxNotifyEvent(clone.GetEventType(), clone.GetId())

     {               }
 
     {               }
 

-    wxEvent *Clone() { return new wxMediaEvent(*this); } 
-   
-    DECLARE_DYNAMIC_CLASS(wxMediaEvent) 
-}; 
+    wxEvent *Clone() { return new wxMediaEvent(*this); }
+
+    DECLARE_DYNAMIC_CLASS(wxMediaEvent)
+};
+
+#define wxMEDIA_FINISHED_ID    13000
+DECLARE_EVENT_TYPE(wxEVT_MEDIA_FINISHED, wxMEDIA_FINISHED_ID)
+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 wxMEDIA_FINISHED_ID    13000 
-DECLARE_EVENT_TYPE(wxEVT_MEDIA_FINISHED, wxMEDIA_FINISHED_ID) 
-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

 
 

-#endif // wxUSE_MEDIACTRL
\ No newline at end of file

diff --git a/src/common/cmndata.cpp b/src/common/cmndata.cpp
index d75430ee5d4d728138cede0256b91da5462c405e..39e55667e6cc21c6fa3c50a3c16c7535cddbcad7 100644 (file)
--- a/src/common/cmndata.cpp
+++ b/src/common/cmndata.cpp
@@ -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"
 

diff --git a/src/msw/mediactrl.cpp b/src/msw/mediactrl.cpp
index d3a0b2e6e7e90ea1b8af3faa68baac9d9ea1cf8b..09f36ba04ce153f308b96781eaf27a49b11e8cbe 100644 (file)
--- a/src/msw/mediactrl.cpp
+++ b/src/msw/mediactrl.cpp
@@ -2,7 +2,7 @@
 // Name:        msw/mediactrl.cpp
 // Purpose:     wxMediaCtrl MSW
 // Author:      Ryan Norton <wxprojects@comcast.net>
 // Name:        msw/mediactrl.cpp
 // Purpose:     wxMediaCtrl MSW
 // Author:      Ryan Norton <wxprojects@comcast.net>

-// Modified by: 
+// Modified by:

 // Created:     11/07/04
 // RCS-ID:      $Id$
 // Copyright:   (c) Ryan Norton
 // Created:     11/07/04
 // RCS-ID:      $Id$
 // Copyright:   (c) Ryan Norton


@@ -33,8 +33,8 @@
 //###########################################################################
 
 IMPLEMENT_CLASS(wxMediaCtrl, wxControl);
 //###########################################################################
 
 IMPLEMENT_CLASS(wxMediaCtrl, wxControl);

-IMPLEMENT_DYNAMIC_CLASS(wxMediaEvent, wxEvent); 
-DEFINE_EVENT_TYPE(wxEVT_MEDIA_FINISHED); 
+IMPLEMENT_DYNAMIC_CLASS(wxMediaEvent, wxEvent);
+DEFINE_EVENT_TYPE(wxEVT_MEDIA_FINISHED);

 
 //---------------------------------------------------------------------------
 //  wxMediaCtrlImpl
 
 //---------------------------------------------------------------------------
 //  wxMediaCtrlImpl


@@ -46,10 +46,10 @@ public:
     wxMediaCtrlImpl() : m_bLoaded(false)
     {                                                                   }
 
     wxMediaCtrlImpl() : m_bLoaded(false)
     {                                                                   }
 

-    virtual ~wxMediaCtrlImpl() 
+    virtual ~wxMediaCtrlImpl()

     {                               }
 
     {                               }
 

-    virtual bool Create(wxMediaCtrl* WXUNUSED(ctrl)) 
+    virtual bool Create(wxMediaCtrl* WXUNUSED(ctrl))

     {   return false;               }
 
     virtual bool Play() { return false; }
     {   return false;               }
 
     virtual bool Play() { return false; }


@@ -70,7 +70,7 @@ public:
 
     virtual double GetPlaybackRate() { return 0; }
     virtual bool SetPlaybackRate(double) { return false; }
 
     virtual double GetPlaybackRate() { return 0; }
     virtual bool SetPlaybackRate(double) { return false; }

-    
+

     virtual bool MSWWindowProc(WXUINT, WXWPARAM, WXLPARAM) { return false; }
 
     bool IsLoaded()
     virtual bool MSWWindowProc(WXUINT, WXWPARAM, WXLPARAM) { return false; }
 
     bool IsLoaded()


@@ -197,12 +197,12 @@ public:
 //
 //---------------------------------------------------------------------------
 
 //
 //---------------------------------------------------------------------------
 

-bool wxMediaCtrl::Create(wxWindow* parent, wxWindowID id, const wxString& fileName, 
-                         const wxPoint& pos, const wxSize& size, 
+bool wxMediaCtrl::Create(wxWindow* parent, wxWindowID id, const wxString& fileName,
+                         const wxPoint& pos, const wxSize& size,

                          long style, long WXUNUSED(driver), const wxString& name)
 {
     //base create
                          long style, long WXUNUSED(driver), const wxString& name)
 {
     //base create

-    if ( !wxControl::Create(parent, id, pos, size, (style | wxNO_BORDER) | wxCLIP_CHILDREN, 
+    if ( !wxControl::Create(parent, id, pos, size, (style | wxNO_BORDER) | wxCLIP_CHILDREN,

                             wxDefaultValidator, name) )
         return false;
 
                             wxDefaultValidator, name) )
         return false;
 


@@ -235,12 +235,12 @@ bool wxMediaCtrl::Create(wxWindow* parent, wxWindowID id, const wxString& fileNa
     return true;
 }
 
     return true;
 }
 

-bool wxMediaCtrl::Create(wxWindow* parent, wxWindowID id, const wxURI& location, 
-                         const wxPoint& pos, const wxSize& size, 
+bool wxMediaCtrl::Create(wxWindow* parent, wxWindowID id, const wxURI& location,
+                         const wxPoint& pos, const wxSize& size,

                          long style, long WXUNUSED(driver), const wxString& name)
 {
     //base create
                          long style, long WXUNUSED(driver), const wxString& name)
 {
     //base create

-    if ( !wxControl::Create(parent, id, pos, size, (style | wxNO_BORDER) | wxCLIP_CHILDREN, 
+    if ( !wxControl::Create(parent, id, pos, size, (style | wxNO_BORDER) | wxCLIP_CHILDREN,

                             wxDefaultValidator, name) )
         return false;
 
                             wxDefaultValidator, name) )
         return false;
 


@@ -383,7 +383,7 @@ wxMediaCtrl::~wxMediaCtrl()
 //
 //---------------------------------------------------------------------------
 
 //
 //---------------------------------------------------------------------------
 

-#if wxUSE_DIRECTSHOW 
+#if wxUSE_DIRECTSHOW

 
 wxDXMediaCtrlImpl::wxDXMediaCtrlImpl() : m_pGB(NULL)
 {
 
 wxDXMediaCtrlImpl::wxDXMediaCtrlImpl() : m_pGB(NULL)
 {


@@ -409,14 +409,14 @@ bool wxDXMediaCtrlImpl::Create(wxMediaCtrl* ctrl)
 bool wxDXMediaCtrlImpl::Load(const wxString& fileName)
 {
     if(m_bLoaded)
 bool wxDXMediaCtrlImpl::Load(const wxString& fileName)
 {
     if(m_bLoaded)

-        Cleanup();                        
-        
+        Cleanup();
+

     SAFE_RELEASE(m_pGB);
 
     CoCreateInstance(CLSID_FilterGraph, NULL, CLSCTX_INPROC_SERVER,
                       IID_IGraphBuilder, (void**)&m_pGB);
 
     SAFE_RELEASE(m_pGB);
 
     CoCreateInstance(CLSID_FilterGraph, NULL, CLSCTX_INPROC_SERVER,
                       IID_IGraphBuilder, (void**)&m_pGB);
 

-    //load the graph & render 
+    //load the graph & render

     if( FAILED(m_pGB->RenderFile(fileName.wc_str(wxConvLocal), NULL)) )
         return false;
 
     if( FAILED(m_pGB->RenderFile(fileName.wc_str(wxConvLocal), NULL)) )
         return false;
 


@@ -440,7 +440,7 @@ bool wxDXMediaCtrlImpl::Load(const wxString& fileName)
 
         nSX = nSY = 0;
     }
 
         nSX = nSY = 0;
     }

-    else 
+    else

     {
         m_bVideo = true;
     }
     {
         m_bVideo = true;
     }


@@ -505,9 +505,9 @@ bool wxDXMediaCtrlImpl::SetPosition(long where)
     LONGLONG pos = ((LONGLONG)where) * 10000;
 
     return SUCCEEDED( m_pMS->SetPositions(
     LONGLONG pos = ((LONGLONG)where) * 10000;
 
     return SUCCEEDED( m_pMS->SetPositions(

-                                &pos, 
+                                &pos,

                                 AM_SEEKING_AbsolutePositioning,
                                 AM_SEEKING_AbsolutePositioning,

-                                NULL, 
+                                NULL,

                                 AM_SEEKING_NoPositioning
                                     ) );
 }
                                 AM_SEEKING_NoPositioning
                                     ) );
 }


@@ -536,7 +536,7 @@ wxMediaState wxDXMediaCtrlImpl::GetState()
     HRESULT hr;
     OAFilterState theState;
     hr = m_pMC->GetState(INFINITE, &theState);
     HRESULT hr;
     OAFilterState theState;
     hr = m_pMC->GetState(INFINITE, &theState);

-    
+

     wxASSERT( SUCCEEDED(hr) );
 
     //MSW state is the same as ours
     wxASSERT( SUCCEEDED(hr) );
 
     //MSW state is the same as ours


@@ -568,8 +568,8 @@ bool wxDXMediaCtrlImpl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lPa
 
         // Process all queued events
         while(SUCCEEDED(m_pME->GetEvent(&evCode, (LONG_PTR *) &evParam1,
 
         // Process all queued events
         while(SUCCEEDED(m_pME->GetEvent(&evCode, (LONG_PTR *) &evParam1,

-                                       (LONG_PTR *) &evParam2, 0) 
-                       ) 
+                                       (LONG_PTR *) &evParam2, 0)
+                       )

              )
         {
             // Free memory associated with callback, since we're not using it
              )
         {
             // Free memory associated with callback, since we're not using it


@@ -589,7 +589,7 @@ bool wxDXMediaCtrlImpl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lPa
                 wxMediaEvent theEvent(wxEVT_MEDIA_FINISHED, m_ctrl->GetId());
                 m_ctrl->GetParent()->ProcessEvent(theEvent);
             }
                 wxMediaEvent theEvent(wxEVT_MEDIA_FINISHED, m_ctrl->GetId());
                 m_ctrl->GetParent()->ProcessEvent(theEvent);
             }

-        }    
+        }

         return true;
     }
     return false;
         return true;
     }
     return false;


@@ -692,7 +692,7 @@ wxWMMEMediaCtrlImpl::wxWMMEMediaCtrlImpl() : m_bVideo(false)
 /*        TCHAR sz[5000];
         mciGetErrorString(nError, sz, 5000);
             wxMessageBox(wxString::Format(_T("Error:%s"), sz));
 /*        TCHAR sz[5000];
         mciGetErrorString(nError, sz, 5000);
             wxMessageBox(wxString::Format(_T("Error:%s"), sz));

-  */          
+  */

 }
 
 wxWMMEMediaCtrlImpl::~wxWMMEMediaCtrlImpl()
 }
 
 wxWMMEMediaCtrlImpl::~wxWMMEMediaCtrlImpl()


@@ -701,7 +701,7 @@ wxWMMEMediaCtrlImpl::~wxWMMEMediaCtrlImpl()
 }
 
 bool wxWMMEMediaCtrlImpl::Create(wxMediaCtrl* ctrl)
 }
 
 bool wxWMMEMediaCtrlImpl::Create(wxMediaCtrl* ctrl)

-{    
+{

     m_ctrl = ctrl;
     return true;
 }
     m_ctrl = ctrl;
     return true;
 }


@@ -720,7 +720,7 @@ bool wxWMMEMediaCtrlImpl::Load(const wxString& fileName)
     //then it actually automagically finds the device for you!
     if ( mciSendCommand(0, MCI_OPEN,
          MCI_OPEN_ELEMENT,
     //then it actually automagically finds the device for you!
     if ( mciSendCommand(0, MCI_OPEN,
          MCI_OPEN_ELEMENT,

-        (DWORD)(LPVOID)&openParms) != 0)  
+        (DWORD)(LPVOID)&openParms) != 0)

     return false;
 
     m_hDev = openParms.wDeviceID;
     return false;
 
     m_hDev = openParms.wDeviceID;


@@ -737,7 +737,7 @@ bool wxWMMEMediaCtrlImpl::Load(const wxString& fileName)
     windowParms.hWnd = (HWND)m_ctrl->GetHandle();
     m_bVideo = (mciSendCommand(m_hDev, MCI_WINDOW,
                          0x00010000L //MCI_DGV_WINDOW_HWND
     windowParms.hWnd = (HWND)m_ctrl->GetHandle();
     m_bVideo = (mciSendCommand(m_hDev, MCI_WINDOW,
                          0x00010000L //MCI_DGV_WINDOW_HWND

-                         , 
+                         ,

                          (DWORD)(LPVOID)&windowParms) == 0);
     m_bLoaded = true;
 
                          (DWORD)(LPVOID)&windowParms) == 0);
     m_bLoaded = true;
 


@@ -746,7 +746,7 @@ bool wxWMMEMediaCtrlImpl::Load(const wxString& fileName)
     m_ctrl->GetParent()->Layout();
     m_ctrl->GetParent()->Refresh();
     m_ctrl->GetParent()->Update();
     m_ctrl->GetParent()->Layout();
     m_ctrl->GetParent()->Refresh();
     m_ctrl->GetParent()->Update();

-    
+

     return true;
 }
 
     return true;
 }
 


@@ -812,9 +812,9 @@ bool wxWMMEMediaCtrlImpl::SetPosition(long where)
 long wxWMMEMediaCtrlImpl::GetPosition()
 {
     MCI_STATUS_PARMS statusParms;
 long wxWMMEMediaCtrlImpl::GetPosition()
 {
     MCI_STATUS_PARMS statusParms;

-    
-    statusParms.dwItem = MCI_STATUS_POSITION; 
-    if (mciSendCommand(m_hDev, MCI_STATUS, MCI_STATUS_ITEM, 
+
+    statusParms.dwItem = MCI_STATUS_POSITION;
+    if (mciSendCommand(m_hDev, MCI_STATUS, MCI_STATUS_ITEM,

         (DWORD)(LPSTR)&statusParms) != 0)
         return 0;
 
         (DWORD)(LPSTR)&statusParms) != 0)
         return 0;
 


@@ -824,9 +824,9 @@ long wxWMMEMediaCtrlImpl::GetPosition()
 long wxWMMEMediaCtrlImpl::GetDuration()
 {
     MCI_STATUS_PARMS statusParms;
 long wxWMMEMediaCtrlImpl::GetDuration()
 {
     MCI_STATUS_PARMS statusParms;

-    
-    statusParms.dwItem = MCI_STATUS_LENGTH; 
-    if (mciSendCommand(m_hDev, MCI_STATUS, MCI_STATUS_ITEM, 
+
+    statusParms.dwItem = MCI_STATUS_LENGTH;
+    if (mciSendCommand(m_hDev, MCI_STATUS, MCI_STATUS_ITEM,

         (DWORD)(LPSTR)&statusParms) != 0)
         return 0;
 
         (DWORD)(LPSTR)&statusParms) != 0)
         return 0;
 


@@ -841,10 +841,10 @@ wxSize wxWMMEMediaCtrlImpl::DoGetBestSize() const
 {
     if(m_bVideo)
     {
 {
     if(m_bVideo)
     {

-        MCI_DGV_RECT_PARMS rect; 
+        MCI_DGV_RECT_PARMS rect;

 
         mciSendCommand(m_hDev, MCI_WHERE, 0x00020000L//MCI_DGV_WHERE_SOURCE
 
         mciSendCommand(m_hDev, MCI_WHERE, 0x00020000L//MCI_DGV_WHERE_SOURCE

-            , 
+            ,

             (DWORD)(LPSTR)&rect);
         return wxSize(rect.rc.right, rect.rc.bottom);
     }
             (DWORD)(LPSTR)&rect);
         return wxSize(rect.rc.right, rect.rc.bottom);
     }


@@ -882,4 +882,5 @@ bool wxWMMEMediaCtrlImpl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM l
     return false;
 }
 
     return false;
 }
 

-#endif //wxUSE_MEDIACTRL
\ No newline at end of file
+#endif //wxUSE_MEDIACTRL
+