* modules/gui/wxwidgets: wx backward compatibility fixes by Daniel Stranger (vlc...

[vlc] / modules / gui / wxwidgets / open.cpp

diff --git a/modules/gui/wxwidgets/open.cpp b/modules/gui/wxwidgets/open.cpp
index 75328f02c4d9a0f22e26f8b3fb461e4844c9bed0..c2c2bc0ea82c6ed479dc773b7ecc44c2670ae0f7 100644 (file)
--- a/modules/gui/wxwidgets/open.cpp
+++ b/modules/gui/wxwidgets/open.cpp
@@ -501,7 +501,7 @@ OpenDialog::OpenDialog( intf_thread_t *_p_intf, wxWindow *_p_parent,
     /* Create notebook */
     notebook = new wxNotebook( panel, Notebook_Event );
 
-#if (!wxCHECK_VERSION(2,5,0))
+#if (!wxCHECK_VERSION(2,5,2))
     wxNotebookSizer *notebook_sizer = new wxNotebookSizer( notebook );
 #endif
 
@@ -577,7 +577,7 @@ OpenDialog::OpenDialog( intf_thread_t *_p_intf, wxWindow *_p_parent,
     wxBoxSizer *panel_sizer = new wxBoxSizer( wxVERTICAL );
     panel_sizer->Add( mrl_sizer_sizer, 0, wxEXPAND, 5 );
     panel_sizer->Add( label, 0, wxEXPAND | wxALL, 5 );
-#if (!wxCHECK_VERSION(2,5,0))
+#if (!wxCHECK_VERSION(2,5,2))
     panel_sizer->Add( notebook_sizer, 1, wxEXPAND | wxALL, 5 );
 #else
     panel_sizer->Add( notebook, 1, wxEXPAND | wxALL, 5 );
@@ -718,7 +718,7 @@ wxPanel *OpenDialog::DiscPanel( wxWindow* parent )
     for( char drive_letter = 'A'; drive_letter <= 'Z'; ++drive_letter )
     {
         char drive_name[3] = {drive_letter, ':', 0};
-        UINT type = GetDriveType( drive_name );
+        UINT type = GetDriveTypeA( drive_name );
         if( type == DRIVE_CDROM )
         {
             psz_default_device[0] = drive_letter;
@@ -1148,17 +1148,17 @@ void OpenDialog::OnOk( wxCommandEvent& WXUNUSED(event) )
         playlist_item_t *p_item;
         char *psz_utf8;
 
-        psz_utf8 = FromUTF32( mrl[i].wc_str() );
+        psz_utf8 = wxFromLocale( mrl[i] );
         p_item = playlist_ItemNew( p_intf, psz_utf8, psz_utf8 );
-        free( psz_utf8 );
+        wxLocaleFree( psz_utf8 );
 
         /* Insert options */
         while( i + 1 < (int)mrl.GetCount() &&
-               ((const char *)mrl[i + 1].wc_str())[0] == ':' )
+               ((const char *)mrl[i + 1].mb_str())[0] == ':' )
         {
-            psz_utf8 = FromUTF32( mrl[i + 1].wc_str() );
+            psz_utf8 = wxFromLocale( mrl[i + 1] );
             playlist_ItemAddOption( p_item, psz_utf8 );
-            free( psz_utf8 );
+            wxLocaleFree( psz_utf8 );
             i++;
         }
 
@@ -1167,9 +1167,9 @@ void OpenDialog::OnOk( wxCommandEvent& WXUNUSED(event) )
         {
             for( int j = 0; j < (int)subsfile_mrl.GetCount(); j++ )
             {
-                psz_utf8 = FromUTF32( subsfile_mrl[j].wc_str() );
+                psz_utf8 = wxFromLocale( subsfile_mrl[j] );
                 playlist_ItemAddOption( p_item, psz_utf8 );
-                free( psz_utf8 );
+                wxLocaleFree( psz_utf8 );
             }
         }
 
@@ -1178,9 +1178,9 @@ void OpenDialog::OnOk( wxCommandEvent& WXUNUSED(event) )
         {
             for( int j = 0; j < (int)sout_mrl.GetCount(); j++ )
             {
-                psz_utf8 = FromUTF32( sout_mrl[j].wc_str() );
+                psz_utf8 = wxFromLocale( sout_mrl[j] );
                 playlist_ItemAddOption( p_item, psz_utf8 );
-                free( psz_utf8 );
+                wxLocaleFree( psz_utf8 );
             }
         }
 
@@ -1334,7 +1334,7 @@ static char * ProbeDVD(const wxChar *device)
 {
   char **ppsz_cd_drives;
   const wxWX2MBbuf tmp_buf = wxConvCurrent->cWX2MB(device);
-  char *psz_device = (char *) tmp_buf;
+  char *psz_device = const_cast<char *>(tmp_buf.data());
 
   if( IsDVD(psz_device) )
   {
@@ -1404,7 +1404,7 @@ static char * ProbeCDDA(const wxChar *device)
 {
    char *ppsz_device[2];
    const wxWX2MBbuf tmp_buf = wxConvCurrent->cWX2MB(device);
-   char *psz_device = (char *) tmp_buf;
+   char *psz_device = const_cast<char *>(tmp_buf.data());
    ppsz_device[0] = (device && *device) ? psz_device : NULL;
    ppsz_device[1] = NULL;
    return ProbeDevice(ppsz_device, CDIO_FS_AUDIO, false);
@@ -1417,7 +1417,7 @@ static char * ProbeVCD(const wxChar *device)
 {
    char *ppsz_device[2];
    const wxWX2MBbuf tmp_buf = wxConvCurrent->cWX2MB(device);
-   char *psz_device = (char *) tmp_buf;
+   char *psz_device = const_cast<char *>(tmp_buf.data());
    ppsz_device[0] = (device && *device) ? psz_device : NULL;
    ppsz_device[1] = NULL;
    return ProbeDevice(ppsz_device,