* modules/gui/wxwindows/preferences.cpp: windows can't have open _and_ save file...

* Makefile.am: removed INSTALL.win32 from the win32 package as it's only useful for developpers anyway.

diff --git a/Makefile.am b/Makefile.am
index 8e9cd65fff85f8e46e75f6d0fd6823d890fbd51d..cdf4b6672d615bb5aa8b69d14e502d3ed9011acc 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -464,8 +464,6 @@ package-win32:
 # Copy relevant files
        cp "$(top_builddir)/vlc$(EXEEXT)" "$(srcdir)/tmp/"
        $(STRIP) "$(srcdir)/tmp/vlc$(EXEEXT)"
-       cp "$(srcdir)/INSTALL.win32" "$(srcdir)/tmp/INSTALL.txt"
-       unix2dos "$(srcdir)/tmp/INSTALL.txt"
        for file in AUTHORS MAINTAINERS THANKS NEWS COPYING README ; \
          do cp "$(srcdir)/$$file" "$(srcdir)/tmp/$${file}.txt" ; \
          unix2dos "$(srcdir)/tmp/$${file}.txt" ; done

diff --git a/modules/gui/wxwindows/preferences.cpp b/modules/gui/wxwindows/preferences.cpp
index 54816de30009fcf39e142f7ba8025dd54bad5950..9b31b8d0007b7ab1422a33ace0c1463dc9110476 100644 (file)
--- a/modules/gui/wxwindows/preferences.cpp
+++ b/modules/gui/wxwindows/preferences.cpp
@@ -2,7 +2,7 @@
  * preferences.cpp : wxWindows plugin for vlc
  *****************************************************************************
  * Copyright (C) 2000-2001 VideoLAN
- * $Id: preferences.cpp,v 1.22 2003/06/19 12:21:53 gbazin Exp $
+ * $Id: preferences.cpp,v 1.23 2003/07/20 12:22:32 gbazin Exp $
  *
  * Authors: Gildas Bazin <gbazin@netcourrier.com>
  *
@@ -1024,7 +1024,12 @@ void ConfigEvtHandler::OnCommandEvent( wxCommandEvent& event )
     if( config_data->i_config_type == CONFIG_ITEM_FILE )
     {
         wxFileDialog dialog( p_prefs_dialog, wxU(_("Open file")),
-                             wxT(""), wxT(""), wxT("*.*"), wxOPEN | wxSAVE );
+                             wxT(""), wxT(""), wxT("*.*"),
+#if defined( __WXMSW__ )
+                             wxOPEN );
+#else
+                             wxOPEN | wxSAVE );
+#endif
 
         if( dialog.ShowModal() == wxID_OK )
         {