* Made the open dialog a wxDialog to be able to call it from the wizard. Please test...

[vlc] / modules / gui / wxwindows / subtitles.cpp

diff --git a/modules/gui/wxwindows/subtitles.cpp b/modules/gui/wxwindows/subtitles.cpp
index c6061ffb46c3664f16a6bd085a0a46ce2167e3c0..e9c0a1c3e3687879ea8ad9c63b5badda9985137a 100644 (file)
--- a/modules/gui/wxwindows/subtitles.cpp
+++ b/modules/gui/wxwindows/subtitles.cpp
@@ -2,7 +2,7 @@
  * subtitles.cpp : wxWindows plugin for vlc
  *****************************************************************************
  * Copyright (C) 2000-2001 VideoLAN
- * $Id: subtitles.cpp,v 1.9 2003/12/22 15:42:44 gbazin Exp $
+ * $Id: subtitles.cpp,v 1.11 2004/02/14 12:36:16 gbazin Exp $
  *
  * Authors: Gildas Bazin <gbazin@netcourrier.com>
  *
@@ -33,9 +33,7 @@
 #include <vlc/intf.h>
 
 #include "wxwindows.h"
-#include <wx/textctrl.h>
 #include <wx/combobox.h>
-#include <wx/spinctrl.h>
 #include <wx/statline.h>
 
 #ifndef wxRB_SINGLE
@@ -64,7 +62,7 @@ END_EVENT_TABLE()
  * Constructor.
  *****************************************************************************/
 SubsFileDialog::SubsFileDialog( intf_thread_t *_p_intf, wxWindow* _p_parent ):
-    wxDialog( _p_parent, -1, wxU(_("Open subtitles file")),
+    wxDialog( _p_parent, -1, wxU(_("Subtitle options")),
               wxDefaultPosition, wxDefaultSize, wxDEFAULT_FRAME_STYLE )
 {
     /* Initializations */
@@ -85,8 +83,8 @@ SubsFileDialog::SubsFileDialog( intf_thread_t *_p_intf, wxWindow* _p_parent ):
     wxStaticBoxSizer *file_sizer = new wxStaticBoxSizer( file_box,
                                                         wxHORIZONTAL );
     char *psz_subsfile = config_GetPsz( p_intf, "sub-file" );
-    file_combo = new wxComboBox( panel, -1,
-                                 psz_subsfile ? wxL2U(psz_subsfile) : wxT(""),
+    if( !psz_subsfile ) psz_subsfile = strdup("");
+    file_combo = new wxComboBox( panel, -1, wxL2U(psz_subsfile),
                                  wxPoint(20,25), wxSize(300, -1), 0, NULL );
     if( psz_subsfile ) free( psz_subsfile );
     wxButton *browse_button = new wxButton( panel, FileBrowse_Event,