* modules/gui/wxwindows/*: fixed breakage.

modules/gui/wxwindows/Modules.am

@@ -5,7 +5,7 @@ SOURCES_wxwindows = \
 	dialogs.cpp \
 	open.cpp \
 	streamout.cpp \
-	stream.cpp \
+	streamwizard.cpp \
 	messages.cpp \
 	playlist.cpp \
 	iteminfo.cpp \

modules/gui/wxwindows/interface.cpp

@@ -2,7 +2,7 @@
  * interface.cpp : wxWindows plugin for vlc
  *****************************************************************************
  * Copyright (C) 2000-2001 VideoLAN
- * $Id: interface.cpp,v 1.69 2003/10/29 17:32:54 zorglub Exp $
+ * $Id: interface.cpp,v 1.70 2003/10/29 18:54:45 gbazin Exp $
  *
  * Authors: Gildas Bazin <gbazin@netcourrier.com>
  *
@@ -40,8 +40,6 @@
 /* include the toolbar graphics */
 #include "bitmaps/file.xpm"
 
-#include "bitmaps/stream.xpm"
-
 #include "bitmaps/disc.xpm"
 #include "bitmaps/net.xpm"
 #if 0
@@ -303,7 +301,7 @@ void Interface::CreateOurMenuBar()
 #define HELP_EJECT N_("Eject the DVD/CD")
 #define HELP_EXIT  N_("Exit this program")
 
-#define HELP_STREAM N_("Streaming wizard")
+#define HELP_STREAMWIZARD N_("Open the streaming wizard")
 #define HELP_OTHER N_("Open other types of inputs")
 
 #define HELP_PLAYLIST   N_("Open the playlist")
@@ -317,16 +315,16 @@ void Interface::CreateOurMenuBar()
 
     /* Create the "File" menu */
     wxMenu *file_menu = new wxMenu;
-    file_menu->Append( OpenFileSimple_Event, wxU(_("Simple &Open ...")),
+    file_menu->Append( OpenFileSimple_Event, wxU(_("Quick &Open ...")),
                        wxU(_(HELP_SIMPLE)) );
 
     file_menu->AppendSeparator();
     file_menu->Append( OpenFile_Event, wxU(_("Open &File...")),
-                      wxT(_(HELP_FILE)));
+                      wxU(_(HELP_FILE)));
     file_menu->Append( OpenDisc_Event, wxU(_("Open &Disc...")),
-                      wxT(_(HELP_DISC)));
+                      wxU(_(HELP_DISC)));
     file_menu->Append( OpenNet_Event, wxU(_("Open &Network Stream...")),
-                      wxT(_(HELP_NET)));
+                      wxU(_(HELP_NET)));
 
 #if 0
     file_menu->Append( OpenSat_Event, wxU(_("Open &Satellite Stream...")),
@@ -334,7 +332,7 @@ void Interface::CreateOurMenuBar()
 #endif
     file_menu->AppendSeparator();
     file_menu->Append( Stream_Event, wxU(_("Streaming Wizard...")),
-                       wxU(_(HELP_STREAM)) );
+                       wxU(_(HELP_STREAMWIZARD)) );
     file_menu->AppendSeparator();
     file_menu->Append( Exit_Event, wxU(_("E&xit")), wxU(_(HELP_EXIT)) );
 
@@ -416,8 +414,8 @@ void Interface::CreateOurToolBar()
 
     toolbar->SetToolBitmapSize( wxSize(TOOLBAR_BMP_WIDTH,TOOLBAR_BMP_HEIGHT) );
 
-    toolbar->AddTool( OpenFileSimple_Event, wxU(_("Simple open")), wxBitmap( file_xpm ),
-                      wxU(_(HELP_SIMPLE)) );
+    toolbar->AddTool( OpenFileSimple_Event, wxU(_("Quick")),
+                      wxBitmap( file_xpm ), wxU(_(HELP_SIMPLE)) );
 
     toolbar->AddSeparator();
 
@@ -433,11 +431,6 @@ void Interface::CreateOurToolBar()
 #endif
     toolbar->AddSeparator();
 
-    toolbar->AddTool( Stream_Event, wxU(_("Stream")), wxBitmap( stream_xpm ),
-                      wxU(_(HELP_STREAM)) );
-
-    toolbar->AddSeparator();
-
     toolbar->AddTool( StopStream_Event, wxU(_("Stop")), wxBitmap( stop_xpm ),
                       wxU(_(HELP_STOP)) );
     toolbar->AddTool( PlayStream_Event, wxU(_("Play")), wxBitmap( play_xpm ),
@@ -647,17 +640,15 @@ void Interface::CreateOurExtraPanel()
     extra_sizer->SetSizeHints(extra_frame);
 
     /* Write down initial values */
-
-    if( strstr( config_GetPsz( p_intf, "audio-filter" ), "visual" ) )
+    psz_filters = config_GetPsz( p_intf, "audio-filter" );
+    if( psz_filters && strstr( psz_filters, "visual" ) )
     {
         visual_checkbox->SetValue(1);
     }
+    if( psz_filters ) free( psz_filters );
 
     psz_filters = config_GetPsz( p_intf, "filter" );
-
-    if(psz_filters == NULL) psz_filters=strdup("");
-
-    if( strstr(psz_filters,"adjust") )
+    if( psz_filters && strstr( psz_filters, "adjust" ) )
     {
         adjust_check->SetValue( 1 );
         saturation_slider->Enable();
@@ -673,6 +664,7 @@ void Interface::CreateOurExtraPanel()
         brightness_slider->Disable();
         hue_slider->Disable();
     }
+    if( psz_filters ) free( psz_filters );
 
     int i_value = config_GetInt( p_intf, "hue" );
     if( i_value > 0 && i_value < 360 )
@@ -690,7 +682,6 @@ void Interface::CreateOurExtraPanel()
         brightness_slider->SetValue( (int)(100 * f_value) );
 
     extra_frame->Hide();
-    free(psz_filters);
 }
 
 void Interface::UpdateAcceleratorTable()

modules/gui/wxwindows/iteminfo.cpp

@@ -2,7 +2,7 @@
  * iteminfo.cpp : wxWindows plugin for vlc
  *****************************************************************************
  * Copyright (C) 2000-2001 VideoLAN
- * $Id: iteminfo.cpp,v 1.3 2003/10/29 17:32:54 zorglub Exp $
+ * $Id: iteminfo.cpp,v 1.4 2003/10/29 18:54:45 gbazin Exp $
  *
  * Authors: Clment Stenac <zorglub@videolan.org>
  *
@@ -243,11 +243,11 @@ wxPanel *ItemInfoDialog::GroupPanel( wxWindow* parent )
                                  wxCB_READONLY );
 
     wxButton *newgroup_button = new wxButton( group_subpanel, New_Event,
-                                    wxT(_("New Group")));
+                                    wxU(_("New Group")));
 
     for( int i=0; i< p_playlist->i_groups ; i++)
     {
-        group_combo->Append( wxT( p_playlist->pp_groups[i]->psz_name));
+        group_combo->Append( wxU( p_playlist->pp_groups[i]->psz_name ) );
     }
 
     vlc_object_release ( p_playlist );
@@ -299,7 +299,7 @@ void ItemInfoDialog::OnOk( wxCommandEvent& WXUNUSED(event) )
         for (int i=0 ; i< p_playlist->i_groups ; i++)
         {
            if( !strcasecmp( p_playlist->pp_groups[i]->psz_name,
-                           group_combo->GetValue() ))
+                            group_combo->GetValue().mb_str() ))
            {
                p_item->i_group = p_playlist->pp_groups[i]->i_id;
                break;
@@ -328,7 +328,7 @@ void ItemInfoDialog::OnNewGroup( wxCommandEvent& WXUNUSED(event) )
     {
         if( p_newgroup->ShowModal() == wxID_OK && p_newgroup->psz_name)
         {
-            group_combo->Append( wxT( p_newgroup->psz_name));
+            group_combo->Append( wxU( p_newgroup->psz_name ) );
         }
         delete( p_newgroup );
     }

modules/gui/wxwindows/stream.cpp → modules/gui/wxwindows/streamwizard.cpp

@@ -2,7 +2,7 @@
  * stream.cpp : wxWindows plugin for vlc
  *****************************************************************************
  * Copyright (C) 2000-2001 VideoLAN
- * $Id: stream.cpp,v 1.1 2003/10/29 18:00:46 zorglub Exp $
+ * $Id: streamwizard.cpp,v 1.1 2003/10/29 18:54:46 gbazin Exp $
  *
  * Authors: Clment Stenac <zorglub@videolan.org>
  *
@@ -241,7 +241,7 @@ void StreamDialog::OnStart( wxCommandEvent& event )
             i_total_options += sout_mrl.GetCount();
 
         }
-        msg_Dbg(p_intf,"playings %s",p_open_dialog->mrl[i].mb_str());
+        msg_Dbg(p_intf,"playings %s",(const char *)p_open_dialog->mrl[i].mb_str());
         playlist_Add( p_playlist, (const char *)p_open_dialog->mrl[i].mb_str(),
                       (const char **)ppsz_options, i_total_options,
                       PLAYLIST_APPEND | (i ? 0 : PLAYLIST_GO), PLAYLIST_END );