// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
-#if wxUSE_FILEDLG
+#if wxUSE_FILEDLG && defined(__WXGTK24__)
#include "wx/filedlg.h"
#ifndef WX_PRECOMP
#include "wx/intl.h"
+ #include "wx/msgdlg.h"
#endif
-#ifdef __WXGTK24__
-
#include <gtk/gtk.h>
#include "wx/gtk/private.h"
#include "wx/filename.h" // wxFilename
#include "wx/tokenzr.h" // wxStringTokenizer
#include "wx/filefn.h" // ::wxGetCwd
-#include "wx/msgdlg.h" // wxMessageDialog
//-----------------------------------------------------------------------------
// idle system
extern "C" {
static void gtk_filedialog_ok_callback(GtkWidget *widget, wxFileDialog *dialog)
{
- int style = dialog->GetStyle();
+ int style = dialog->GetWindowStyle();
gchar* filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(widget));
// gtk version numbers must be identical with the one in ctor (that calls set_do_overwrite_confirmation)
#if GTK_CHECK_VERSION(2,7,3)
if(gtk_check_version(2,7,3) != NULL)
#endif
- if ((style & wxSAVE) && (style & wxOVERWRITE_PROMPT))
+ if ((style & wxFD_SAVE) && (style & wxFD_OVERWRITE_PROMPT))
{
if ( g_file_test(filename, G_FILE_TEST_EXISTS) )
{
}
// change to the directory where the user went if asked
- if (style & wxCHANGE_DIR)
+ if (style & wxFD_CHANGE_DIR)
{
// Use chdir to not care about filename encodings
gchar* folder = g_path_get_dirname(filename);
// "clicked" for Cancel-button
//-----------------------------------------------------------------------------
-extern "C" {
-static void gtk_filedialog_cancel_callback(GtkWidget *WXUNUSED(w),
- wxFileDialog *dialog)
+extern "C"
+{
+
+static void gtk_filedialog_cancel_callback(GtkWidget *w, wxFileDialog *dialog)
{
wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
event.SetEventObject(dialog);
dialog->GetEventHandler()->ProcessEvent(event);
}
-}
-extern "C" {
static void gtk_filedialog_response_callback(GtkWidget *w,
gint response,
wxFileDialog *dialog)
if (response == GTK_RESPONSE_ACCEPT)
gtk_filedialog_ok_callback(w, dialog);
- else if (response == GTK_RESPONSE_CANCEL)
- gtk_filedialog_cancel_callback(w, dialog);
- else // "delete"
- {
+ else // GTK_RESPONSE_CANCEL or GTK_RESPONSE_NONE
gtk_filedialog_cancel_callback(w, dialog);
- dialog->m_destroyed_by_delete = true;
- }
}
+
+static void gtk_filedialog_update_preview_callback(GtkFileChooser *chooser,
+ gpointer user_data)
+{
+#if GTK_CHECK_VERSION(2,4,0)
+ GtkWidget *preview = GTK_WIDGET(user_data);
+
+ gchar *str = gtk_file_chooser_get_preview_filename(chooser);
+ wxGtkString filename(str);
+ if (str) g_free(str);
+
+ if ( !filename )
+ return;
+
+ GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file_at_size(filename, 128, 128, NULL);
+ gboolean have_preview = pixbuf != NULL;
+
+ gtk_image_set_from_pixbuf(GTK_IMAGE(preview), pixbuf);
+ if ( pixbuf )
+ g_object_unref (pixbuf);
+
+ gtk_file_chooser_set_preview_widget_active(chooser, have_preview);
+#else
+ wxUnusedVar(chooser);
+ wxUnusedVar(user_data);
+#endif // GTK+ 2.4+
}
-#endif // __WXGTK24__
+} // extern "C"
+
//-----------------------------------------------------------------------------
// wxFileDialog
const wxString& defaultDir,
const wxString& defaultFileName,
const wxString& wildCard,
- long style, const wxPoint& pos)
+ long style, const wxPoint& pos,
+ const wxSize& sz,
+ const wxString& name)
: wxGenericFileDialog(parent, message, defaultDir, defaultFileName,
- wildCard, style, pos, true )
+ wildCard, style, pos, sz, name, true )
{
-#ifdef __WXGTK24__
- if (!gtk_check_version(2,4,0))
+ if (gtk_check_version(2,4,0))
{
- wxASSERT_MSG( !( (style & wxSAVE) && (style & wxMULTIPLE) ), wxT("wxFileDialog - wxMULTIPLE used on a save dialog" ) );
- m_needParent = false;
- m_destroyed_by_delete = false;
+ wxGenericFileDialog::Create( parent, message, defaultDir,
+ defaultFileName, wildCard, style, pos );
+ return;
+ }
- if (!PreCreation(parent, pos, wxDefaultSize) ||
- !CreateBase(parent, wxID_ANY, pos, wxDefaultSize, style,
- wxDefaultValidator, wxT("filedialog")))
- {
- wxFAIL_MSG( wxT("wxFileDialog creation failed") );
- return;
- }
+ m_needParent = false;
- GtkFileChooserAction gtk_action;
- GtkWindow* gtk_parent = NULL;
- if (parent)
- gtk_parent = GTK_WINDOW( gtk_widget_get_toplevel(parent->m_widget) );
+ if (!PreCreation(parent, pos, wxDefaultSize) ||
+ !CreateBase(parent, wxID_ANY, pos, wxDefaultSize, style,
+ wxDefaultValidator, wxT("filedialog")))
+ {
+ wxFAIL_MSG( wxT("wxFileDialog creation failed") );
+ return;
+ }
- const gchar* ok_btn_stock;
- if ( style & wxSAVE )
- {
- gtk_action = GTK_FILE_CHOOSER_ACTION_SAVE;
- ok_btn_stock = GTK_STOCK_SAVE;
- }
- else
- {
- gtk_action = GTK_FILE_CHOOSER_ACTION_OPEN;
- ok_btn_stock = GTK_STOCK_OPEN;
- }
+ GtkFileChooserAction gtk_action;
+ GtkWindow* gtk_parent = NULL;
+ if (parent)
+ gtk_parent = GTK_WINDOW( gtk_widget_get_toplevel(parent->m_widget) );
- m_widget = gtk_file_chooser_dialog_new(
- wxGTK_CONV(m_message),
- gtk_parent,
- gtk_action,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- ok_btn_stock, GTK_RESPONSE_ACCEPT,
- NULL);
+ const gchar* ok_btn_stock;
+ if ( style & wxFD_SAVE )
+ {
+ gtk_action = GTK_FILE_CHOOSER_ACTION_SAVE;
+ ok_btn_stock = GTK_STOCK_SAVE;
+ }
+ else
+ {
+ gtk_action = GTK_FILE_CHOOSER_ACTION_OPEN;
+ ok_btn_stock = GTK_STOCK_OPEN;
+ }
- gtk_dialog_set_default_response(GTK_DIALOG(m_widget), GTK_RESPONSE_ACCEPT);
+ m_widget = gtk_file_chooser_dialog_new(
+ wxGTK_CONV(m_message),
+ gtk_parent,
+ gtk_action,
+ GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ ok_btn_stock, GTK_RESPONSE_ACCEPT,
+ NULL);
- if ( style & wxMULTIPLE )
- gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(m_widget), true);
+ gtk_dialog_set_default_response(GTK_DIALOG(m_widget), GTK_RESPONSE_ACCEPT);
- // local-only property could be set to false to allow non-local files to be loaded.
- // In that case get/set_uri(s) should be used instead of get/set_filename(s) everywhere
- // and the GtkFileChooserDialog should probably also be created with a backend,
- // e.g "gnome-vfs", "default", ... (gtk_file_chooser_dialog_new_with_backend).
- // Currently local-only is kept as the default - true:
- // gtk_file_chooser_set_local_only(GTK_FILE_CHOOSER(m_widget), true);
+ if ( style & wxFD_MULTIPLE )
+ gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(m_widget), true);
- g_signal_connect(G_OBJECT(m_widget), "response",
- GTK_SIGNAL_FUNC(gtk_filedialog_response_callback), (gpointer)this);
+ // gtk_widget_hide_on_delete is used here to avoid that Gtk automatically destroys
+ // the dialog when the user press ESC on the dialog: in that case a second call to
+ // ShowModal() would result in a bunch of Gtk-CRITICAL errors...
+ g_signal_connect (G_OBJECT(m_widget),
+ "delete_event",
+ G_CALLBACK (gtk_widget_hide_on_delete),
+ (gpointer)this);
- SetWildcard(wildCard);
+ // local-only property could be set to false to allow non-local files to be loaded.
+ // In that case get/set_uri(s) should be used instead of get/set_filename(s) everywhere
+ // and the GtkFileChooserDialog should probably also be created with a backend,
+ // e.g "gnome-vfs", "default", ... (gtk_file_chooser_dialog_new_with_backend).
+ // Currently local-only is kept as the default - true:
+ // gtk_file_chooser_set_local_only(GTK_FILE_CHOOSER(m_widget), true);
- if ( style & wxSAVE )
- {
- if ( !defaultDir.empty() )
- gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(m_widget),
- wxConvFileName->cWX2MB(defaultDir));
+ g_signal_connect (m_widget, "response",
+ G_CALLBACK (gtk_filedialog_response_callback), this);
- gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(m_widget),
- wxConvFileName->cWX2MB(defaultFileName));
+ SetWildcard(wildCard);
+
+ if ( style & wxFD_SAVE )
+ {
+ if ( !defaultDir.empty() )
+ gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(m_widget),
+ wxConvFileName->cWX2MB(defaultDir));
+
+ gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(m_widget),
+ wxGTK_CONV(defaultFileName));
#if GTK_CHECK_VERSION(2,7,3)
- if (!gtk_check_version(2,7,3))
- gtk_file_chooser_set_do_overwrite_confirmation(GTK_FILE_CHOOSER(m_widget), TRUE);
+ if ((style & wxFD_OVERWRITE_PROMPT) && !gtk_check_version(2,7,3))
+ gtk_file_chooser_set_do_overwrite_confirmation(GTK_FILE_CHOOSER(m_widget), TRUE);
#endif
+ }
+ else // wxFD_OPEN
+ {
+ if ( !defaultFileName.empty() )
+ {
+ wxString dir;
+ if ( defaultDir.empty() )
+ dir = ::wxGetCwd();
+ else
+ dir = defaultDir;
+
+ gtk_file_chooser_set_filename(
+ GTK_FILE_CHOOSER(m_widget),
+ wxConvFileName->cWX2MB( wxFileName(dir, defaultFileName).GetFullPath() ) );
}
- else
+ else if ( !defaultDir.empty() )
{
- if ( !defaultFileName.empty() )
- {
- wxString dir;
- if ( defaultDir.empty() )
- dir = ::wxGetCwd();
- else
- dir = defaultDir;
-
- gtk_file_chooser_set_filename(
- GTK_FILE_CHOOSER(m_widget),
- wxConvFileName->cWX2MB( wxFileName(dir, defaultFileName).GetFullPath() ) );
- }
- else if ( !defaultDir.empty() )
- gtk_file_chooser_set_current_folder( GTK_FILE_CHOOSER(m_widget),
- wxConvFileName->cWX2MB(defaultDir) );
+ gtk_file_chooser_set_current_folder( GTK_FILE_CHOOSER(m_widget),
+ wxConvFileName->cWX2MB(defaultDir) );
}
}
- else
-#endif
- wxGenericFileDialog::Create( parent, message, defaultDir, defaultFileName, wildCard, style, pos );
-}
-wxFileDialog::~wxFileDialog()
-{
-#ifdef __WXGTK24__
- if (!gtk_check_version(2,4,0))
+#if GTK_CHECK_VERSION(2,4,0)
+ if ( style & wxFD_PREVIEW )
{
- if (m_destroyed_by_delete)
- m_widget = NULL;
+ GtkWidget *previewImage = gtk_image_new();
+
+ gtk_file_chooser_set_preview_widget(GTK_FILE_CHOOSER(m_widget),
+ previewImage);
+ g_signal_connect(m_widget, "update-preview",
+ G_CALLBACK(gtk_filedialog_update_preview_callback),
+ previewImage);
}
-#endif
+#endif // GTK+ 2.4+
}
void wxFileDialog::OnFakeOk( wxCommandEvent &event )
{
-#ifdef __WXGTK24__
if (!gtk_check_version(2,4,0))
- wxDialog::OnOK( event );
+ EndDialog(wxID_OK);
else
-#endif
wxGenericFileDialog::OnListOk( event );
}
int wxFileDialog::ShowModal()
{
-#ifdef __WXGTK24__
if (!gtk_check_version(2,4,0))
return wxDialog::ShowModal();
else
-#endif
return wxGenericFileDialog::ShowModal();
}
bool wxFileDialog::Show( bool show )
{
-#ifdef __WXGTK24__
if (!gtk_check_version(2,4,0))
return wxDialog::Show( show );
else
-#endif
return wxGenericFileDialog::Show( show );
}
wxString wxFileDialog::GetPath() const
{
-#ifdef __WXGTK24__
if (!gtk_check_version(2,4,0))
- return wxConvFileName->cMB2WX(gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(m_widget)));
+ {
+ gchar *str = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(m_widget));
+ wxString ret = wxConvFileName->cMB2WX(str);
+ if (str) g_free(str);
+
+ return ret;
+ }
else
-#endif
return wxGenericFileDialog::GetPath();
}
void wxFileDialog::GetFilenames(wxArrayString& files) const
{
-#ifdef __WXGTK24__
if (!gtk_check_version(2,4,0))
{
GetPaths(files);
}
}
else
-#endif
wxGenericFileDialog::GetFilenames( files );
}
void wxFileDialog::GetPaths(wxArrayString& paths) const
{
-#ifdef __WXGTK24__
if (!gtk_check_version(2,4,0))
{
paths.Empty();
paths.Add(GetPath());
}
else
-#endif
wxGenericFileDialog::GetPaths( paths );
}
void wxFileDialog::SetMessage(const wxString& message)
{
-#ifdef __WXGTK24__
if (!gtk_check_version(2,4,0))
{
m_message = message;
SetTitle(message);
}
else
-#endif
wxGenericFileDialog::SetMessage( message );
}
void wxFileDialog::SetPath(const wxString& path)
{
-#ifdef __WXGTK24__
if (!gtk_check_version(2,4,0))
{
if (path.empty()) return;
gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(m_widget), wxConvFileName->cWX2MB(path));
}
else
-#endif
wxGenericFileDialog::SetPath( path );
}
void wxFileDialog::SetDirectory(const wxString& dir)
{
-#ifdef __WXGTK24__
if (!gtk_check_version(2,4,0))
{
if (wxDirExists(dir))
}
}
else
-#endif
wxGenericFileDialog::SetDirectory( dir );
}
wxString wxFileDialog::GetDirectory() const
{
-#ifdef __WXGTK24__
if (!gtk_check_version(2,4,0))
- return wxConvFileName->cMB2WX(
- gtk_file_chooser_get_current_folder( GTK_FILE_CHOOSER(m_widget) ) );
+ {
+ gchar *str = gtk_file_chooser_get_current_folder( GTK_FILE_CHOOSER(m_widget) );
+ wxString ret = wxConvFileName->cMB2WX(str);
+ if (str) g_free(str);
+
+ return ret;
+ }
else
-#endif
return wxGenericFileDialog::GetDirectory();
}
void wxFileDialog::SetFilename(const wxString& name)
{
-#ifdef __WXGTK24__
if (!gtk_check_version(2,4,0))
{
- if (GetStyle() & wxSAVE)
- gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(m_widget), wxConvFileName->cWX2MB(name));
+ if (HasFlag(wxFD_SAVE))
+ gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(m_widget), wxGTK_CONV(name));
else
SetPath(wxFileName(GetDirectory(), name).GetFullPath());
}
else
-#endif
wxGenericFileDialog::SetFilename( name );
}
wxString wxFileDialog::GetFilename() const
{
-#ifdef __WXGTK24__
if (!gtk_check_version(2,4,0))
- return wxFileName(
- wxConvFileName->cMB2WX(gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(m_widget))) ).GetFullName();
+ return wxFileName(GetPath()).GetFullName();
else
-#endif
return wxGenericFileDialog::GetFilename();
}
void wxFileDialog::SetWildcard(const wxString& wildCard)
{
-#ifdef __WXGTK24__
if (!gtk_check_version(2,4,0))
{
// parse filters
}
}
else
-#endif
wxGenericFileDialog::SetWildcard( wildCard );
}
void wxFileDialog::SetFilterIndex(int filterIndex)
{
-#ifdef __WXGTK24__
+
if (!gtk_check_version(2,4,0))
{
gpointer filter;
g_slist_free(filters);
}
else
-#endif
wxGenericFileDialog::SetFilterIndex( filterIndex );
}
int wxFileDialog::GetFilterIndex() const
{
-#ifdef __WXGTK24__
if (!gtk_check_version(2,4,0))
{
GtkFileChooser *chooser = GTK_FILE_CHOOSER(m_widget);
return index;
}
else
-#endif
return wxGenericFileDialog::GetFilterIndex();
}
-#endif // wxUSE_FILEDLG
+#endif // wxUSE_FILEDLG && __WXGTK24__
projects / wxWidgets.git / blobdiff