// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
-#if wxUSE_FILEDLG && defined(__WXGTK24__)
+#if wxUSE_FILEDLG
#include "wx/filedlg.h"
#include <gtk/gtk.h>
#include "wx/gtk/private.h"
+#ifdef __UNIX__
#include <unistd.h> // chdir
+#endif
#include "wx/filename.h" // wxFilename
#include "wx/tokenzr.h" // wxStringTokenizer
wxGtkString 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)
+#ifndef __WXGTK3__
#if GTK_CHECK_VERSION(2,7,3)
- if(gtk_check_version(2,7,3) != NULL)
+ if (gtk_check_version(2, 7, 3) != NULL)
#endif
- if ((style & wxFD_SAVE) && (style & wxFD_OVERWRITE_PROMPT))
{
- if ( g_file_test(filename, G_FILE_TEST_EXISTS) )
+ if ((style & wxFD_SAVE) && (style & wxFD_OVERWRITE_PROMPT))
{
- wxString msg;
-
- msg.Printf(
- _("File '%s' already exists, do you really want to overwrite it?"),
- wxString(filename, *wxConvFileName));
-
- wxMessageDialog dlg(dialog, msg, _("Confirm"),
- wxYES_NO | wxICON_QUESTION);
- if (dlg.ShowModal() != wxID_YES)
- return;
+ if ( g_file_test(filename, G_FILE_TEST_EXISTS) )
+ {
+ wxString msg;
+
+ msg.Printf(
+ _("File '%s' already exists, do you really want to overwrite it?"),
+ wxString::FromUTF8(filename));
+
+ wxMessageDialog dlg(dialog, msg, _("Confirm"),
+ wxYES_NO | wxICON_QUESTION);
+ if (dlg.ShowModal() != wxID_YES)
+ return;
+ }
}
}
+#endif
if (style & wxFD_FILE_MUST_EXIST)
{
wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, wxID_OK);
event.SetEventObject(dialog);
- dialog->GetEventHandler()->ProcessEvent(event);
+ dialog->HandleWindowEvent(event);
}
}
{
wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
event.SetEventObject(dialog);
- dialog->GetEventHandler()->ProcessEvent(event);
+ dialog->HandleWindowEvent(event);
}
static void gtk_filedialog_response_callback(GtkWidget *w,
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);
wxGtkString filename(gtk_file_chooser_get_preview_filename(chooser));
g_object_unref (pixbuf);
gtk_file_chooser_set_preview_widget_active(chooser, have_preview);
-#else
- wxUnusedVar(chooser);
- wxUnusedVar(user_data);
-#endif // GTK+ 2.4+
}
} // extern "C"
+void wxFileDialog::AddChildGTK(wxWindowGTK* child)
+{
+ // allow dialog to be resized smaller horizontally
+ gtk_widget_set_size_request(
+ child->m_widget, child->GetMinWidth(), child->m_height);
+
+ gtk_file_chooser_set_extra_widget(
+ GTK_FILE_CHOOSER(m_widget), child->m_widget);
+}
//-----------------------------------------------------------------------------
// wxFileDialog
//-----------------------------------------------------------------------------
-IMPLEMENT_DYNAMIC_CLASS(wxFileDialog,wxGenericFileDialog)
+IMPLEMENT_DYNAMIC_CLASS(wxFileDialog,wxFileDialogBase)
-BEGIN_EVENT_TABLE(wxFileDialog,wxGenericFileDialog)
+BEGIN_EVENT_TABLE(wxFileDialog,wxFileDialogBase)
EVT_BUTTON(wxID_OK, wxFileDialog::OnFakeOk)
+ EVT_SIZE(wxFileDialog::OnSize)
END_EVENT_TABLE()
wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message,
long style, const wxPoint& pos,
const wxSize& sz,
const wxString& name)
- : wxGenericFileDialog(parent, message, defaultDir, defaultFileName,
- wildCard, style, pos, sz, name, true )
+ : wxFileDialogBase()
+{
+ Create(parent, message, defaultDir, defaultFileName, wildCard, style, pos, sz, name);
+}
+
+bool wxFileDialog::Create(wxWindow *parent, const wxString& message,
+ const wxString& defaultDir,
+ const wxString& defaultFileName,
+ const wxString& wildCard,
+ long style, const wxPoint& pos,
+ const wxSize& sz,
+ const wxString& name)
{
- if (gtk_check_version(2,4,0))
+ parent = GetParentForModalDialog(parent, style);
+
+ if (!wxFileDialogBase::Create(parent, message, defaultDir, defaultFileName,
+ wildCard, style, pos, sz, name))
{
- wxGenericFileDialog::Create( parent, message, defaultDir,
- defaultFileName, wildCard, style, pos );
- return;
+ return false;
}
- parent = GetParentForModalDialog(parent);
-
if (!PreCreation(parent, pos, wxDefaultSize) ||
!CreateBase(parent, wxID_ANY, pos, wxDefaultSize, style,
wxDefaultValidator, wxT("filedialog")))
{
wxFAIL_MSG( wxT("wxFileDialog creation failed") );
- return;
+ return false;
}
GtkFileChooserAction gtk_action;
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
ok_btn_stock, GTK_RESPONSE_ACCEPT,
NULL);
+ g_object_ref(m_widget);
+ GtkFileChooser* file_chooser = GTK_FILE_CHOOSER(m_widget);
- m_fc.SetWidget( GTK_FILE_CHOOSER(m_widget) );
+ m_fc.SetWidget(file_chooser);
gtk_dialog_set_default_response(GTK_DIALOG(m_widget), GTK_RESPONSE_ACCEPT);
if ( style & wxFD_MULTIPLE )
- gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(m_widget), true);
+ gtk_file_chooser_set_select_multiple(file_chooser, true);
// 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),
+ g_signal_connect(m_widget,
"delete_event",
G_CALLBACK (gtk_widget_hide_on_delete),
- (gpointer)this);
+ this);
// 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", ...
+ // 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);
g_signal_connect (m_widget, "response",
G_CALLBACK (gtk_filedialog_response_callback), this);
+
+ // deal with extensions/filters
SetWildcard(wildCard);
+ wxString defaultFileNameWithExt = defaultFileName;
+ if ( !wildCard.empty() && !defaultFileName.empty() &&
+ !wxFileName(defaultFileName).HasExt() )
+ {
+ // append the default extension to the initial file name: GTK won't do
+ // it for us by default (unlike e.g. MSW)
+ const wxString defaultExt = m_fc.GetCurrentWildCard().AfterFirst('.');
+ if ( defaultExt.find_first_of("?*") == wxString::npos )
+ defaultFileNameWithExt += "." + defaultExt;
+ }
+
+
// if defaultDir is specified it should contain the directory and
// defaultFileName should contain the default name of the file, however if
// directory is not given, defaultFileName contains both
wxFileName fn;
if ( defaultDir.empty() )
- fn.Assign(defaultFileName);
- else if ( !defaultFileName.empty() )
- fn.Assign(defaultDir, defaultFileName);
+ fn.Assign(defaultFileNameWithExt);
+ else if ( !defaultFileNameWithExt.empty() )
+ fn.Assign(defaultDir, defaultFileNameWithExt);
else
fn.AssignDir(defaultDir);
const wxString dir = fn.GetPath();
if ( !dir.empty() )
{
- gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(m_widget),
- dir.fn_str());
+ gtk_file_chooser_set_current_folder(file_chooser, wxGTK_CONV_FN(dir));
}
const wxString fname = fn.GetFullName();
{
if ( !fname.empty() )
{
- gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(m_widget),
- fname.fn_str());
+ gtk_file_chooser_set_current_name(file_chooser, wxGTK_CONV_FN(fname));
}
#if GTK_CHECK_VERSION(2,7,3)
- if ((style & wxFD_OVERWRITE_PROMPT) && !gtk_check_version(2,7,3))
- gtk_file_chooser_set_do_overwrite_confirmation(GTK_FILE_CHOOSER(m_widget), TRUE);
+ if ((style & wxFD_OVERWRITE_PROMPT)
+#ifndef __WXGTK3__
+ && gtk_check_version(2,7,3) == NULL
+#endif
+ )
+ {
+ gtk_file_chooser_set_do_overwrite_confirmation(file_chooser, true);
+ }
#endif
}
else // wxFD_OPEN
{
if ( !fname.empty() )
{
- gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(m_widget),
- fn.GetFullPath().fn_str());
+ gtk_file_chooser_set_filename(file_chooser,
+ wxGTK_CONV_FN(fn.GetFullPath()));
}
}
-#if GTK_CHECK_VERSION(2,4,0)
if ( style & wxFD_PREVIEW )
{
GtkWidget *previewImage = gtk_image_new();
- gtk_file_chooser_set_preview_widget(GTK_FILE_CHOOSER(m_widget),
- previewImage);
+ gtk_file_chooser_set_preview_widget(file_chooser, previewImage);
g_signal_connect(m_widget, "update-preview",
G_CALLBACK(gtk_filedialog_update_preview_callback),
previewImage);
}
-#endif // GTK+ 2.4+
+
+ return true;
}
-void wxFileDialog::OnFakeOk( wxCommandEvent &event )
+wxFileDialog::~wxFileDialog()
{
- if (!gtk_check_version(2,4,0))
- EndDialog(wxID_OK);
- else
- wxGenericFileDialog::OnOk( event );
+ if (m_extraControl)
+ {
+ // get chooser to drop its reference right now, allowing wxWindow dtor
+ // to verify that ref count drops to zero
+ gtk_file_chooser_set_extra_widget(
+ GTK_FILE_CHOOSER(m_widget), NULL);
+ }
+}
+
+void wxFileDialog::OnFakeOk(wxCommandEvent& WXUNUSED(event))
+{
+ EndDialog(wxID_OK);
}
int wxFileDialog::ShowModal()
{
- if (!gtk_check_version(2,4,0))
- return wxDialog::ShowModal();
- else
- return wxGenericFileDialog::ShowModal();
+ CreateExtraControl();
+
+ return wxDialog::ShowModal();
}
-bool wxFileDialog::Show( bool show )
+void wxFileDialog::DoSetSize(int WXUNUSED(x), int WXUNUSED(y),
+ int WXUNUSED(width), int WXUNUSED(height),
+ int WXUNUSED(sizeFlags))
{
- if (!gtk_check_version(2,4,0))
- return wxDialog::Show( show );
- else
- return wxGenericFileDialog::Show( show );
}
-void wxFileDialog::DoSetSize(int x, int y, int width, int height, int sizeFlags )
+void wxFileDialog::OnSize(wxSizeEvent&)
{
- if (!m_wxwindow)
- return;
- else
- wxGenericFileDialog::DoSetSize( x, y, width, height, sizeFlags );
+ // avoid calling DoLayout(), which will set the (wrong) size of
+ // m_extraControl, its size is managed by GtkFileChooser
}
wxString wxFileDialog::GetPath() const
{
- if (!gtk_check_version(2,4,0))
- {
- return m_fc.GetPath();
- }
-
- return wxGenericFileDialog::GetPath();
+ return m_fc.GetPath();
}
void wxFileDialog::GetFilenames(wxArrayString& files) const
{
- if (!gtk_check_version(2,4,0))
- {
- m_fc.GetFilenames( files );
- }
- else
- wxGenericFileDialog::GetFilenames( files );
+ m_fc.GetFilenames( files );
}
void wxFileDialog::GetPaths(wxArrayString& paths) const
{
- if (!gtk_check_version(2,4,0))
- {
- m_fc.GetPaths( paths );
- }
- else
- wxGenericFileDialog::GetPaths( paths );
+ m_fc.GetPaths( paths );
}
void wxFileDialog::SetMessage(const wxString& message)
{
- if (!gtk_check_version(2,4,0))
- {
- m_message = message;
- SetTitle(message);
- }
- else
- wxGenericFileDialog::SetMessage( message );
+ m_message = message;
+ SetTitle(message);
}
void wxFileDialog::SetPath(const wxString& path)
{
- if (!gtk_check_version(2,4,0))
- {
- m_fc.SetPath( path );
- }
- else
- wxGenericFileDialog::SetPath( path );
+ // Don't do anything if no path is specified, in particular don't set the
+ // path to m_dir below as this would result in opening the dialog in the
+ // parent directory of this one instead of m_dir itself.
+ if ( path.empty() )
+ return;
+
+ // we need an absolute path for GTK native chooser so ensure that we have
+ // it: use the initial directory if it was set or just CWD otherwise (this
+ // is the default behaviour if m_dir is empty)
+ wxFileName fn(path);
+ fn.MakeAbsolute(m_dir);
+ m_fc.SetPath(fn.GetFullPath());
}
void wxFileDialog::SetDirectory(const wxString& dir)
{
- if (!gtk_check_version(2,4,0))
+ if (m_fc.SetDirectory( dir ))
{
- m_fc.SetDirectory( dir );
+ // Cache the dir, as gtk_file_chooser_get_current_folder()
+ // doesn't return anything until the dialog has been shown
+ m_dir = dir;
}
- else
- wxGenericFileDialog::SetDirectory( dir );
}
wxString wxFileDialog::GetDirectory() const
{
- if (!gtk_check_version(2,4,0))
+ wxString currentDir( m_fc.GetDirectory() );
+ if (currentDir.empty())
{
- m_fc.GetDirectory();
+ // m_fc.GetDirectory() will return empty until the dialog has been shown
+ // in which case use any previously provided value
+ currentDir = m_dir;
}
-
- return wxGenericFileDialog::GetDirectory();
+ return currentDir;
}
void wxFileDialog::SetFilename(const wxString& name)
{
- if (!gtk_check_version(2,4,0))
+ if (HasFdFlag(wxFD_SAVE))
{
- if (HasFdFlag(wxFD_SAVE))
- gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(m_widget), wxGTK_CONV(name));
- else
- SetPath(wxFileName(GetDirectory(), name).GetFullPath());
+ gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(m_widget), wxGTK_CONV(name));
+ m_fileName = name;
}
+
else
- wxGenericFileDialog::SetFilename( name );
+ {
+ wxString path( GetDirectory() );
+ if (path.empty())
+ {
+ // SetPath() fires an assert if fed other than filepaths
+ return;
+ }
+ SetPath(wxFileName(path, name).GetFullPath());
+ m_fileName = name;
+ }
}
wxString wxFileDialog::GetFilename() const
{
- if (!gtk_check_version(2,4,0))
- return m_fc.GetFilename();
- else
- return wxGenericFileDialog::GetFilename();
+ wxString currentFilename( m_fc.GetFilename() );
+ if (currentFilename.empty())
+ {
+ // m_fc.GetFilename() will return empty until the dialog has been shown
+ // in which case use any previously provided value
+ currentFilename = m_fileName;
+ }
+ return currentFilename;
}
void wxFileDialog::SetWildcard(const wxString& wildCard)
{
- if (!gtk_check_version(2,4,0))
- {
- m_fc.SetWildcard( wildCard );
- }
- else
- wxGenericFileDialog::SetWildcard( wildCard );
+ wxFileDialogBase::SetWildcard(wildCard);
+ m_fc.SetWildcard( GetWildcard() );
}
void wxFileDialog::SetFilterIndex(int filterIndex)
{
-
- if (!gtk_check_version(2,4,0))
- {
- m_fc.SetFilterIndex( filterIndex);
- }
- else
- wxGenericFileDialog::SetFilterIndex( filterIndex );
+ m_fc.SetFilterIndex( filterIndex);
}
int wxFileDialog::GetFilterIndex() const
{
- if (!gtk_check_version(2,4,0))
- {
- return m_fc.GetFilterIndex();
- }
- else
- return wxGenericFileDialog::GetFilterIndex();
+ return m_fc.GetFilterIndex();
}
-#endif // wxUSE_FILEDLG && __WXGTK24__
+#endif // wxUSE_FILEDLG
projects / wxWidgets.git / blobdiff