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

wx/interaction.cpp: another WX compilation fix

diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m
index e57f63655eabbefbc5d3dbc18d9f536ebafc0eec..33f3d0e3dc36db2dc37e25d2d35ce173da2e5d83 100644 (file)
--- a/modules/gui/macosx/intf.m
+++ b/modules/gui/macosx/intf.m
@@ -47,6 +47,7 @@
 #include "embeddedwindow.h"
 #include "update.h"
 #include "AppleRemote.h"
+#import <vlc_interaction.h>
 
 /*****************************************************************************
  * Local prototypes.
@@ -1375,6 +1376,10 @@ static VLCMain *_o_sharedMainInstance = nil;
 
             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 )
             {
                 NSString *o_my_msg = [NSString stringWithFormat: @"%s: %s\n",
@@ -1389,6 +1394,7 @@ static VLCMain *_o_sharedMainInstance = nil;
                 [o_error makeKeyAndOrderFront: self];
                 [o_err_msg setEditable: NO];
             }
+            #endif
         }
 
         vlc_mutex_lock( p_intf->p_sys->p_sub->p_lock );

diff --git a/modules/gui/wxwidgets/dialogs/interaction.cpp b/modules/gui/wxwidgets/dialogs/interaction.cpp
index 1ae280e38811b438a9574d952aa439f502c65392..8caf481437dead7d564c6e0ef87e86c719c8915f 100644 (file)
--- a/modules/gui/wxwidgets/dialogs/interaction.cpp
+++ b/modules/gui/wxwidgets/dialogs/interaction.cpp
@@ -109,7 +109,7 @@ void InteractionDialog::Render()
     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
         label = new wxStaticText( widgets_panel, -1,