Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lame temporary "fix" for file names which are not UTF-8 encoded

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33014 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2005-03-24 02:42:15 +00:00
parent f5a1953b34
commit 01b92baa9c
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/gtk/filedlg.cpp
View File

@@ -21,6 +21,7 @@
#include "wx/intl.h" #include "wx/intl.h"
#include "wx/filename.h" #include "wx/filename.h"
#include "wx/msgdlg.h" #include "wx/msgdlg.h"
#include "wx/log.h"
#include <gtk/gtk.h> #include <gtk/gtk.h>
@@ -44,6 +45,12 @@ static void gtk_filedialog_ok_callback(GtkWidget *widget, wxFileDialog *dialog)
int style = dialog->GetStyle(); int style = dialog->GetStyle();
gchar* text = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(widget)); gchar* text = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(widget));
wxString filename(wxGTK_CONV_BACK(text)); wxString filename(wxGTK_CONV_BACK(text));
if ( filename.empty() )
{
// this is totally lame but better than silent error
wxLogWarning(_("This filename can't be used by wxWidgets because it contains invalid UTF-8 characters, please rename the file."));
return;
}
if ((style & wxSAVE) && (style & wxOVERWRITE_PROMPT)) if ((style & wxSAVE) && (style & wxOVERWRITE_PROMPT))
{ {

7
src/gtk1/filedlg.cpp
View File

@@ -21,6 +21,7 @@
#include "wx/intl.h" #include "wx/intl.h"
#include "wx/filename.h" #include "wx/filename.h"
#include "wx/msgdlg.h" #include "wx/msgdlg.h"
#include "wx/log.h"
#include <gtk/gtk.h> #include <gtk/gtk.h>
@@ -44,6 +45,12 @@ static void gtk_filedialog_ok_callback(GtkWidget *widget, wxFileDialog *dialog)
int style = dialog->GetStyle(); int style = dialog->GetStyle();
gchar* text = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(widget)); gchar* text = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(widget));
wxString filename(wxGTK_CONV_BACK(text)); wxString filename(wxGTK_CONV_BACK(text));
if ( filename.empty() )
{
// this is totally lame but better than silent error
wxLogWarning(_("This filename can't be used by wxWidgets because it contains invalid UTF-8 characters, please rename the file."));
return;
}
if ((style & wxSAVE) && (style & wxOVERWRITE_PROMPT)) if ((style & wxSAVE) && (style & wxOVERWRITE_PROMPT))
{ {