Commit 765427d0 authored by Felix Paul Kühne's avatar Felix Paul Kühne

osx/intf.m: don't show msg_err's in the OSX GUI anymore. Localised...

osx/intf.m: don't show msg_err's in the OSX GUI anymore. Localised errors/warnings are shown by the interaction framework now.
wx/interaction.cpp: another WX compilation fix
parent 7365e409
...@@ -47,6 +47,7 @@ ...@@ -47,6 +47,7 @@
#include "embeddedwindow.h" #include "embeddedwindow.h"
#include "update.h" #include "update.h"
#include "AppleRemote.h" #include "AppleRemote.h"
#import <vlc_interaction.h>
/***************************************************************************** /*****************************************************************************
* Local prototypes. * Local prototypes.
...@@ -1375,6 +1376,10 @@ static VLCMain *_o_sharedMainInstance = nil; ...@@ -1375,6 +1376,10 @@ static VLCMain *_o_sharedMainInstance = nil;
var_Get( p_intf->p_vlc, "verbose", &quiet ); var_Get( p_intf->p_vlc, "verbose", &quiet );
/* disable the display of msg_err for now
* the interaction system will take care of the error messages now
*/
#if 0
if( i_type == 1 && quiet.i_int > -1 ) if( i_type == 1 && quiet.i_int > -1 )
{ {
NSString *o_my_msg = [NSString stringWithFormat: @"%s: %s\n", NSString *o_my_msg = [NSString stringWithFormat: @"%s: %s\n",
...@@ -1389,6 +1394,7 @@ static VLCMain *_o_sharedMainInstance = nil; ...@@ -1389,6 +1394,7 @@ static VLCMain *_o_sharedMainInstance = nil;
[o_error makeKeyAndOrderFront: self]; [o_error makeKeyAndOrderFront: self];
[o_err_msg setEditable: NO]; [o_err_msg setEditable: NO];
} }
#endif
} }
vlc_mutex_lock( p_intf->p_sys->p_sub->p_lock ); vlc_mutex_lock( p_intf->p_sys->p_sub->p_lock );
......
...@@ -109,7 +109,7 @@ void InteractionDialog::Render() ...@@ -109,7 +109,7 @@ void InteractionDialog::Render()
wxGauge *gauge; wxGauge *gauge;
if( p_dialog->i_id == DIALOG_NONBLOCKING_ERRORS ) if( p_dialog->i_flags == DIALOG_BLOCKING_ERROR || p_dialog->i_flags == DIALOG_NONBLOCKING_ERROR )
{ {
wxTextCtrl *errors ; // Special case wxTextCtrl *errors ; // Special case
label = new wxStaticText( widgets_panel, -1, label = new wxStaticText( widgets_panel, -1,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment