all: support for unicode version of wxwidgets for win32, needs testing for other...

diff --git a/configure.ac b/configure.ac
index 2e047abe2b990a15dd69be00cb45588f97198985..0fc3fb4f89f1eea34ed3dc1d69f71e243ed0f021 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3881,6 +3881,12 @@ then
     fi
     VLC_ADD_LDFLAGS([wxwidgets],[`${WX_CONFIG} --libs`])
     VLC_ADD_CXXFLAGS([wxwidgets],[`${WX_CONFIG} --cxxflags`])
+    if ${WX_CONFIG} --unicode
+    then 
+      # wxwidgets should provide the following flags but does not
+      # the following is required to compile for win32
+      VLC_ADD_CXXFLAGS([wxwidgets],[-D_UNICODE -DUNICODE])
+    fi
     if test "$have_libcdio" = "yes"
     then 
       VLC_ADD_LDFLAGS([wxwidgets],[$LIBCDIO_LIBS])

diff --git a/modules/gui/wxwidgets/open.cpp b/modules/gui/wxwidgets/open.cpp
index 75328f02c4d9a0f22e26f8b3fb461e4844c9bed0..3fcd51edc75246baad3999dd68e2ee7bea15cc26 100644 (file)
--- a/modules/gui/wxwidgets/open.cpp
+++ b/modules/gui/wxwidgets/open.cpp
@@ -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;