Commit e9829fa6 authored by gbazin's avatar gbazin
Browse files

* modules/gui/wxwindows/preferences.cpp: windows can't have open _and_ save file dialogs so only use open file dialogs on win32 in the preferences menu.
* Makefile.am: removed INSTALL.win32 from the win32 package as it's only useful for developpers anyway.
parent ae65b15b
...@@ -464,8 +464,6 @@ package-win32: ...@@ -464,8 +464,6 @@ package-win32:
# Copy relevant files # Copy relevant files
cp "$(top_builddir)/vlc$(EXEEXT)" "$(srcdir)/tmp/" cp "$(top_builddir)/vlc$(EXEEXT)" "$(srcdir)/tmp/"
$(STRIP) "$(srcdir)/tmp/vlc$(EXEEXT)" $(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 ; \ for file in AUTHORS MAINTAINERS THANKS NEWS COPYING README ; \
do cp "$(srcdir)/$$file" "$(srcdir)/tmp/$${file}.txt" ; \ do cp "$(srcdir)/$$file" "$(srcdir)/tmp/$${file}.txt" ; \
unix2dos "$(srcdir)/tmp/$${file}.txt" ; done unix2dos "$(srcdir)/tmp/$${file}.txt" ; done
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* preferences.cpp : wxWindows plugin for vlc * preferences.cpp : wxWindows plugin for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2000-2001 VideoLAN * 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> * Authors: Gildas Bazin <gbazin@netcourrier.com>
* *
...@@ -1024,7 +1024,12 @@ void ConfigEvtHandler::OnCommandEvent( wxCommandEvent& event ) ...@@ -1024,7 +1024,12 @@ void ConfigEvtHandler::OnCommandEvent( wxCommandEvent& event )
if( config_data->i_config_type == CONFIG_ITEM_FILE ) if( config_data->i_config_type == CONFIG_ITEM_FILE )
{ {
wxFileDialog dialog( p_prefs_dialog, wxU(_("Open 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 ) if( dialog.ShowModal() == wxID_OK )
{ {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment