restored (as deprecated) accidentally removed wx{Dir|File}Dialog::Get/SetStyle()

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

diff --git a/src/common/mediactrlcmn.cpp b/src/common/mediactrlcmn.cpp
index 4cb5a2b8df91771214afb7bdcd0cd6d5e23b84a0..b0d93db7af568972e499f9115b370fb8bc05686d 100644 (file)
--- a/src/common/mediactrlcmn.cpp
+++ b/src/common/mediactrlcmn.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        common/mediactrl.cpp
+// Name:        src/common/mediactrl.cpp
 // Purpose:     wxMediaCtrl common code
 // Author:      Ryan Norton <wxprojects@comcast.net>
 // Modified by:
@@ -19,26 +19,22 @@
 // Pre-compiled header stuff
 //---------------------------------------------------------------------------
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "mediactrl.h"
-#endif
-
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-#pragma hdrstop
+    #pragma hdrstop
+#endif
+
+#if wxUSE_MEDIACTRL
+
+#ifndef WX_PRECOMP
+    #include "wx/hash.h"
 #endif
 
 //---------------------------------------------------------------------------
 // Includes
 //---------------------------------------------------------------------------
 #include "wx/mediactrl.h"
-#include "wx/hash.h"
-
-//---------------------------------------------------------------------------
-// Compilation guard
-//---------------------------------------------------------------------------
-#if wxUSE_MEDIACTRL
 
 //===========================================================================
 //
@@ -50,15 +46,15 @@
 // RTTI and Event implementations
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
-IMPLEMENT_CLASS(wxMediaCtrl, wxControl);
+IMPLEMENT_CLASS(wxMediaCtrl, wxControl)
 DEFINE_EVENT_TYPE(wxEVT_MEDIA_STATECHANGED)
 DEFINE_EVENT_TYPE(wxEVT_MEDIA_PLAY)
 DEFINE_EVENT_TYPE(wxEVT_MEDIA_PAUSE)
-IMPLEMENT_CLASS(wxMediaBackend, wxObject);
-IMPLEMENT_DYNAMIC_CLASS(wxMediaEvent, wxEvent);
-DEFINE_EVENT_TYPE(wxEVT_MEDIA_FINISHED);
-DEFINE_EVENT_TYPE(wxEVT_MEDIA_LOADED);
-DEFINE_EVENT_TYPE(wxEVT_MEDIA_STOP);
+IMPLEMENT_CLASS(wxMediaBackend, wxObject)
+IMPLEMENT_DYNAMIC_CLASS(wxMediaEvent, wxEvent)
+DEFINE_EVENT_TYPE(wxEVT_MEDIA_FINISHED)
+DEFINE_EVENT_TYPE(wxEVT_MEDIA_LOADED)
+DEFINE_EVENT_TYPE(wxEVT_MEDIA_STOP)
 
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //
@@ -119,7 +115,7 @@ bool wxMediaCtrl::Create(wxWindow* parent, wxWindowID id,
             }
         }
 
-        SetBestFittingSize(size);
+        SetInitialSize(size);
         return true;
     }
     else
@@ -138,7 +134,7 @@ bool wxMediaCtrl::Create(wxWindow* parent, wxWindowID id,
             {
                 if (Load(fileName))
                 {
-                    SetBestFittingSize(size);
+                    SetInitialSize(size);
                     return true;
                 }
                 else
@@ -146,7 +142,7 @@ bool wxMediaCtrl::Create(wxWindow* parent, wxWindowID id,
             }
             else
             {
-                SetBestFittingSize(size);
+                SetInitialSize(size);
                 return true;
             }
         }
@@ -182,7 +178,7 @@ bool wxMediaCtrl::Create(wxWindow* parent, wxWindowID id,
             return false;
         }
 
-        SetBestFittingSize(size);
+        SetInitialSize(size);
         return true;
     }
     else
@@ -199,7 +195,7 @@ bool wxMediaCtrl::Create(wxWindow* parent, wxWindowID id,
 
             if (Load(location))
             {
-                SetBestFittingSize(size);
+                SetInitialSize(size);
                 return true;
             }
             else
@@ -421,21 +417,21 @@ wxSize wxMediaCtrl::DoGetBestSize() const
     return wxSize(0,0);
 }
 
-double wxMediaCtrl::GetVolume() 
+double wxMediaCtrl::GetVolume()
 {
     if(m_imp && m_bLoaded)
         return m_imp->GetVolume();
     return 0.0;
 }
 
-bool wxMediaCtrl::SetVolume(double dVolume) 
+bool wxMediaCtrl::SetVolume(double dVolume)
 {
     if(m_imp && m_bLoaded)
         return m_imp->SetVolume(dVolume);
     return false;
 }
 
-bool wxMediaCtrl::ShowPlayerControls(wxMediaCtrlPlayerControls flags) 
+bool wxMediaCtrl::ShowPlayerControls(wxMediaCtrlPlayerControls flags)
 {
     if(m_imp)
         return m_imp->ShowPlayerControls(flags);
@@ -472,6 +468,19 @@ void wxMediaCtrl::DoMoveWindow(int x, int y, int w, int h)
         m_imp->Move(x, y, w, h);
 }
 
+//---------------------------------------------------------------------------
+// wxMediaCtrl::MacVisibilityChanged
+//---------------------------------------------------------------------------
+#ifdef __WXMAC__
+void wxMediaCtrl::MacVisibilityChanged()
+{
+    wxControl::MacVisibilityChanged();
+
+    if(m_imp)
+        m_imp->MacVisibilityChanged();
+}
+#endif
+
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //
 //  wxMediaBackendCommonBase
@@ -541,14 +550,10 @@ void wxMediaBackendCommonBase::QueueStopEvent()
 #include "wx/html/forcelnk.h"
 
 #ifdef __WXMSW__ // MSW has huge backends so we do it seperately
-FORCE_LINK(wxmediabackend_am);
-FORCE_LINK(wxmediabackend_wmp10);
+FORCE_LINK(wxmediabackend_am)
+FORCE_LINK(wxmediabackend_wmp10)
 #else
-FORCE_LINK(basewxmediabackends);
+FORCE_LINK(basewxmediabackends)
 #endif
-//---------------------------------------------------------------------------
-// End of compilation guard and of file
-//---------------------------------------------------------------------------
-#endif //wxUSE_MEDIACTRL
-
 
+#endif //wxUSE_MEDIACTRL