Implement wxChoice::Insert.

[wxWidgets.git] / src / cocoa / mediactrl.mm

diff --git a/src/cocoa/mediactrl.mm b/src/cocoa/mediactrl.mm
index 0d09279525842935e94e84de9072023aeca4600f..fa0ebb15b027f4ad420e2095850f52a5a37048e9 100644 (file)
--- a/src/cocoa/mediactrl.mm
+++ b/src/cocoa/mediactrl.mm
@@ -17,10 +17,6 @@
 // Pre-compiled header stuff
 //---------------------------------------------------------------------------
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "mediactrl.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -202,7 +198,7 @@ wxQTMediaBackend::~wxQTMediaBackend()
     if(m_timer)
         Cleanup();
 
-    //Note that ExitMovies() is not neccessary...
+    //Note that ExitMovies() is not necessary...
     ExitMovies();
 }
 
@@ -225,11 +221,11 @@ bool wxQTMediaBackend::CreateControl(wxControl* inctrl, wxWindow* parent,
     wxMediaCtrl* ctrl = (wxMediaCtrl*) inctrl;
 
     //Create the control base
-    wxASSERT(ctrl->CreateBase(parent,wid,pos,size,style, validator, size));
+    wxASSERT(ctrl->CreateBase(parent,wid,pos,size,style, validator, name));
     
     //Create the NSMovieView
     ctrl->SetNSView(NULL);
-    NSView* theView = [[NSMovieView alloc] initWithFrame: ctrl->MakeDefaultNSRect(size)];
+    NSMovieView* theView = [[NSMovieView alloc] initWithFrame: ctrl->MakeDefaultNSRect(size)];
     ctrl->SetNSView(theView);
     [theView release];
 
@@ -239,7 +235,8 @@ bool wxQTMediaBackend::CreateControl(wxControl* inctrl, wxWindow* parent,
         parent->CocoaAddChild(ctrl);
         ctrl->SetInitialFrameRect(pos,size);
     }
-    
+
+    [theView showController:false adjustingSize:true];
     m_movieview = theView;
     m_ctrl = ctrl;
     return true;
@@ -323,7 +320,7 @@ void wxQTMediaBackend::FinishLoad()
     //
     //Here, if the parent of the control has a sizer - we
     //tell it to recalculate the size of this control since
-    //the user opened a seperate media file
+    //the user opened a separate media file
     //
     m_ctrl->InvalidateBestSize();
     m_ctrl->GetParent()->Layout();
@@ -499,8 +496,3 @@ void wxQTMediaBackend::Move(int x, int y, int w, int h)
 FORCE_LINK_ME(basewxmediabackends);
 
 #endif //wxUSE_MEDIACTRL
-
-
-
-
-