Really remove the droppings when there are no pages

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

diff --git a/src/cocoa/mediactrl.mm b/src/cocoa/mediactrl.mm
index 0d09279525842935e94e84de9072023aeca4600f..bbbd81a75c5cadc54151fb0a8f5440dadd02662a 100644 (file)
--- a/src/cocoa/mediactrl.mm
+++ b/src/cocoa/mediactrl.mm
@@ -225,11 +225,11 @@ bool wxQTMediaBackend::CreateControl(wxControl* inctrl, wxWindow* parent,
     wxMediaCtrl* ctrl = (wxMediaCtrl*) inctrl;
 
     //Create the control base
     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);
     
     //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];
 
     ctrl->SetNSView(theView);
     [theView release];
 


@@ -239,7 +239,8 @@ bool wxQTMediaBackend::CreateControl(wxControl* inctrl, wxWindow* parent,
         parent->CocoaAddChild(ctrl);
         ctrl->SetInitialFrameRect(pos,size);
     }
         parent->CocoaAddChild(ctrl);
         ctrl->SetInitialFrameRect(pos,size);
     }

-    
+
+    [theView showController:false adjustingSize:true];

     m_movieview = theView;
     m_ctrl = ctrl;
     return true;
     m_movieview = theView;
     m_ctrl = ctrl;
     return true;


@@ -499,8 +500,3 @@ void wxQTMediaBackend::Move(int x, int y, int w, int h)
 FORCE_LINK_ME(basewxmediabackends);
 
 #endif //wxUSE_MEDIACTRL
 FORCE_LINK_ME(basewxmediabackends);
 
 #endif //wxUSE_MEDIACTRL

-
-
-
-
-