* modules/gui/wxwindows/*: compilation fixes for the unicode version.
   made the "Extended GUI" option a checkable menuitem.

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.61 2003/10/06 16:23:30 zorglub Exp $
+ * $Id: interface.cpp,v 1.62 2003/10/06 17:41:47 gbazin Exp $
  *
  * Authors: Gildas Bazin <gbazin@netcourrier.com>
  *
@@ -285,7 +285,7 @@ void Interface::CreateOurMenuBar()
 #define HELP_FILEINFO       N_("Show information about the file being played")
 
 #define HELP_PREFS N_("Go to the preferences menu")
-#define EXTRA_PREFS N_("Open the extended GUI")
+#define EXTRA_PREFS N_("Shows the extended GUI")
 
 #define HELP_ABOUT N_("About this program")
 
@@ -323,8 +323,8 @@ void Interface::CreateOurMenuBar()
     wxMenu *settings_menu = new wxMenu;
     settings_menu->Append( Prefs_Event, wxU(_("&Preferences...")),
                            wxU(_(HELP_PREFS)) );
-    settings_menu->Append( Extra_Event, wxU(_("&Extra GUI") ),
-                           wxU(_(EXTRA_PREFS)) );
+    settings_menu->AppendCheckItem( Extra_Event, wxU(_("&Extended GUI") ),
+                                    wxU(_(EXTRA_PREFS)) );
 
 
     /* Create the "Audio" menu */
@@ -478,8 +478,7 @@ void Interface::CreateOurExtraPanel()
     wxBoxSizer *extra_sizer = new wxBoxSizer( wxHORIZONTAL );
 
     /* Create static box to surround the adjust controls */
-    adjust_box = new wxStaticBox( extra_frame, -1,
-                  wxT(_("Image adjust")) );
+    adjust_box = new wxStaticBox( extra_frame, -1, wxU(_("Image adjust")) );
 
     /* Create the size for the frame */
     wxStaticBoxSizer *adjust_sizer =
@@ -540,8 +539,7 @@ void Interface::CreateOurExtraPanel()
 
 
     /* Create static box to surround the other controls */
-    other_box = new wxStaticBox( extra_frame, -1,
-                  wxT(_("Video Options")) );
+    other_box = new wxStaticBox( extra_frame, -1, wxU(_("Video Options")) );
 
     /* Create the sizer for the frame */
     wxStaticBoxSizer *other_sizer =
@@ -925,10 +923,9 @@ void Interface::OnContrastUpdate(wxScrollEvent& event)
 
 void Interface::OnRatio( wxCommandEvent& event )
 {
-   config_PutPsz( p_intf, "aspect-ratio", ratio_combo->GetValue() );
+   config_PutPsz( p_intf, "aspect-ratio", ratio_combo->GetValue().mb_str() );
 }
 
-
 void Interface::OnPlayStream( wxCommandEvent& WXUNUSED(event) )
 {
     wxCommandEvent dummy;

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.1 2003/10/06 16:23:30 zorglub Exp $
+ * $Id: iteminfo.cpp,v 1.2 2003/10/06 17:41:47 gbazin Exp $
  *
  * Authors: Clment Stenac <zorglub@videolan.org>
  *
@@ -157,7 +157,7 @@ wxPanel *ItemInfoDialog::InfoPanel( wxWindow* parent )
            new wxStaticText(info_subpanel, -1, wxU(_("URI")) );
 
     uri_text =  new wxTextCtrl( info_subpanel, Uri_Event,
-                                wxT(p_item->psz_uri),
+                                wxU(p_item->psz_uri),
                                 wxDefaultPosition, wxSize( 300, -1 ),
                                 wxTE_PROCESS_ENTER);
 
@@ -173,7 +173,7 @@ wxPanel *ItemInfoDialog::InfoPanel( wxWindow* parent )
 
     name_text =
                    new wxTextCtrl( info_subpanel, Uri_Event,
-                                   wxT(p_item->psz_name),
+                                   wxU(p_item->psz_name),
                                    wxDefaultPosition, wxSize( 300, -1 ),
                                    wxTE_PROCESS_ENTER);
 
@@ -188,7 +188,7 @@ wxPanel *ItemInfoDialog::InfoPanel( wxWindow* parent )
 
     author_text =
                    new wxTextCtrl( info_subpanel, Uri_Event,
-                                   wxT(p_item->psz_author),
+                                   wxU(p_item->psz_author),
                                    wxDefaultPosition, wxSize( 300, -1 ),
                                    wxTE_PROCESS_ENTER);
 
@@ -261,9 +261,9 @@ wxPanel *ItemInfoDialog::GroupPanel( wxWindow* parent )
  *****************************************************************************/
 void ItemInfoDialog::OnOk( wxCommandEvent& WXUNUSED(event) )
 {
-    p_item->psz_name = strdup( name_text->GetLineText(0) );
-    p_item->psz_uri = strdup( uri_text->GetLineText(0) );
-    p_item->psz_author = strdup( author_text->GetLineText(0) );
+    p_item->psz_name = strdup( name_text->GetLineText(0).mb_str() );
+    p_item->psz_uri = strdup( uri_text->GetLineText(0).mb_str() );
+    p_item->psz_author = strdup( author_text->GetLineText(0).mb_str() );
     vlc_bool_t b_old_enabled = p_item->b_enabled;
 
     playlist_t * p_playlist =
@@ -291,4 +291,4 @@ void ItemInfoDialog::OnCancel( wxCommandEvent& WXUNUSED(event) )
 
 /******************************************************************************
  * Info panel event methods.
- ******************************************************************************/
+ *****************************************************************************/