pass correct tool id (and not always -1) to EVT_TOOL_RCLICKED() handler

[wxWidgets.git] / src / common / mediactrlcmn.cpp

diff --git a/src/common/mediactrlcmn.cpp b/src/common/mediactrlcmn.cpp
index 53ba95509ab9ec1f116a3df50eac7e95afabb002..51ba32f6c858f47ec38216934bf146919c6c7a5e 100644 (file)
--- a/src/common/mediactrlcmn.cpp
+++ b/src/common/mediactrlcmn.cpp
@@ -41,7 +41,7 @@
 //===========================================================================
 //
 // Implementation
-// 
+//
 //===========================================================================
 
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -67,17 +67,17 @@ DEFINE_EVENT_TYPE(wxEVT_MEDIA_STOP);
 // Searches for a backend that is installed on the system (backends
 // starting with lower characters in the alphabet are given priority),
 // and creates the control from it
-// 
+//
 // This searches by searching the global RTTI hashtable, class by class,
 // attempting to call CreateControl on each one found that is a derivative
-// of wxMediaBackend - if it succeededs Create returns true, otherwise
+// of wxMediaBackend - if it succeeded Create returns true, otherwise
 // it keeps iterating through the hashmap.
 //---------------------------------------------------------------------------
 bool wxMediaCtrl::Create(wxWindow* parent, wxWindowID id,
                 const wxString& fileName,
-                const wxPoint& pos, 
+                const wxPoint& pos,
                 const wxSize& size,
-                long style, 
+                long style,
                 const wxString& szBackend,
                 const wxValidator& validator,
                 const wxString& name)
@@ -93,7 +93,7 @@ bool wxMediaCtrl::Create(wxWindow* parent, wxWindowID id,
 
         if (!fileName.empty())
         {
-            if (!m_imp->Load(fileName))
+            if (!Load(fileName))
             {
                 delete m_imp;
                 m_imp = NULL;
@@ -101,6 +101,7 @@ bool wxMediaCtrl::Create(wxWindow* parent, wxWindowID id,
             }
         }
 
+        SetBestFittingSize(size);
         return true;
     }
     else
@@ -113,17 +114,23 @@ bool wxMediaCtrl::Create(wxWindow* parent, wxWindowID id,
         {
             if(!DoCreate(classInfo, parent, id,
                          pos, size, style, validator, name))
-                continue;        
+                continue;
 
             if (!fileName.empty())
             {
-                if (m_imp->Load(fileName))
+                if (Load(fileName))
+                {
+                    SetBestFittingSize(size);
                     return true;
+                }
                 else
                     delete m_imp;
             }
             else
+            {
+                SetBestFittingSize(size);
                 return true;
+            }
 
             classInfo = NextBackend();
         }
@@ -135,9 +142,9 @@ bool wxMediaCtrl::Create(wxWindow* parent, wxWindowID id,
 
 bool wxMediaCtrl::Create(wxWindow* parent, wxWindowID id,
                 const wxURI& location,
-                const wxPoint& pos, 
+                const wxPoint& pos,
                 const wxSize& size,
-                long style, 
+                long style,
                 const wxString& szBackend,
                 const wxValidator& validator,
                 const wxString& name)
@@ -151,13 +158,14 @@ bool wxMediaCtrl::Create(wxWindow* parent, wxWindowID id,
             return false;
         }
 
-        if (!m_imp->Load(location))
+        if (!Load(location))
         {
             delete m_imp;
             m_imp = NULL;
             return false;
         }
 
+        SetBestFittingSize(size);
         return true;
     }
     else
@@ -170,10 +178,13 @@ bool wxMediaCtrl::Create(wxWindow* parent, wxWindowID id,
         {
             if(!DoCreate(classInfo, parent, id,
                          pos, size, style, validator, name))
-                continue;        
+                continue;
 
-            if (m_imp->Load(location))
+            if (Load(location))
+            {
+                SetBestFittingSize(size);
                 return true;
+            }
             else
                 delete m_imp;
 
@@ -192,24 +203,24 @@ bool wxMediaCtrl::Create(wxWindow* parent, wxWindowID id,
 //---------------------------------------------------------------------------
 bool wxMediaCtrl::DoCreate(wxClassInfo* classInfo,
                             wxWindow* parent, wxWindowID id,
-                            const wxPoint& pos, 
+                            const wxPoint& pos,
                             const wxSize& size,
-                            long style, 
+                            long style,
                             const wxValidator& validator,
                             const wxString& name)
 {
     m_imp = (wxMediaBackend*)classInfo->CreateObject();
-    
+
     if( m_imp->CreateControl(this, parent, id, pos, size,
                              style, validator, name) )
     {
-        this->Connect(GetId(), wxEVT_MEDIA_FINISHED, 
+        this->Connect(GetId(), wxEVT_MEDIA_FINISHED,
                         (wxObjectEventFunction) (wxEventFunction)
-                        (wxMediaEventFunction) 
+                        (wxMediaEventFunction)
                             &wxMediaCtrl::OnMediaFinished);
         return true;
     }
-    
+
     delete m_imp;
     return false;
 }
@@ -221,7 +232,7 @@ bool wxMediaCtrl::DoCreate(wxClassInfo* classInfo,
 // Search through the RTTI hashmap one at a
 // time, attempting to create each derivative
 // of wxMediaBackend
-// 
+//
 //
 // STL isn't compatable with and will have a compilation error
 // on a wxNode, however, wxHashTable::compatibility_iterator is
@@ -290,12 +301,12 @@ bool wxMediaCtrl::Load(const wxURI& location)
 // wxMediaCtrl::Stop
 // wxMediaCtrl::GetPlaybackRate
 // wxMediaCtrl::SetPlaybackRate
-// wxMediaCtrl::SetPosition
-// wxMediaCtrl::GetPosition
-// wxMediaCtrl::GetDuration
+// wxMediaCtrl::Seek --> SetPosition
+// wxMediaCtrl::Tell --> GetPosition
+// wxMediaCtrl::Length --> GetDuration
 // wxMediaCtrl::GetState
 // wxMediaCtrl::DoGetBestSize
-// 
+//
 // 1) Check to see whether the backend exists and is loading
 // 2) Call the backend's version of the method, returning success
 //    if the backend's version succeeds
@@ -335,25 +346,43 @@ bool wxMediaCtrl::SetPlaybackRate(double dRate)
     return false;
 }
 
-bool wxMediaCtrl::SetPosition(wxLongLong where)
+wxFileOffset wxMediaCtrl::Seek(wxFileOffset where, wxSeekMode mode)
 {
-    if(m_imp && m_bLoaded)
-        return m_imp->SetPosition(where);
-    return false;
+    wxFileOffset offset;
+
+    switch (mode)
+    {
+    case wxFromStart:
+        offset = where;
+        break;
+    case wxFromEnd:
+        offset = Length() - where;
+        break;
+//    case wxFromCurrent:
+    default:
+        offset = Tell() + where;
+        break;
+    }
+
+    if(m_imp && m_bLoaded && m_imp->SetPosition(offset))
+        return offset;
+    return wxInvalidOffset;
 }
 
-wxLongLong wxMediaCtrl::GetPosition()
+wxFileOffset wxMediaCtrl::Tell()
 {
+    //FIXME
     if(m_imp && m_bLoaded)
-        return m_imp->GetPosition();
-    return 0;
+        return (wxFileOffset) m_imp->GetPosition().ToLong();
+    return wxInvalidOffset;
 }
 
-wxLongLong wxMediaCtrl::GetDuration()
+wxFileOffset wxMediaCtrl::Length()
 {
+    //FIXME
     if(m_imp && m_bLoaded)
-        return m_imp->GetDuration();
-    return 0;
+        return (wxFileOffset) m_imp->GetDuration().ToLong();
+    return wxInvalidOffset;
 }
 
 wxMediaState wxMediaCtrl::GetState()
@@ -372,7 +401,7 @@ wxSize wxMediaCtrl::DoGetBestSize() const
 
 //---------------------------------------------------------------------------
 // wxMediaCtrl::DoMoveWindow
-// 
+//
 // 1) Call parent's version so that our control's window moves where
 //    it's supposed to
 // 2) If the backend exists and is loaded, move the video
@@ -396,7 +425,7 @@ bool wxMediaCtrl::IsLooped()
     return m_bLoop;
 }
 
-void wxMediaCtrl::OnMediaFinished(const wxMediaEvent& WXUNUSED(evt))
+void wxMediaCtrl::OnMediaFinished(wxMediaEvent& WXUNUSED(evt))
 {
     if(m_bLoop)
     {