projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed the wxDirExists() function so that if asked about the root directory of a drive...
[wxWidgets.git]
/
src
/
gtk1
/
filedlg.cpp
diff --git
a/src/gtk1/filedlg.cpp
b/src/gtk1/filedlg.cpp
index 558746b221ed81b54319e0168981def181dc1793..946ae917c47082900542b2fe9a860f3aa41344f4 100644
(file)
--- a/
src/gtk1/filedlg.cpp
+++ b/
src/gtk1/filedlg.cpp
@@
-1,5
+1,5
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: filedlg.cpp
+// Name:
gtk/
filedlg.cpp
// Purpose:
// Author: Robert Roebling
// Id: $Id$
// Purpose:
// Author: Robert Roebling
// Id: $Id$
@@
-17,9
+17,6
@@
#include "wx/generic/msgdlgg.h"
#include "wx/generic/msgdlgg.h"
-#ifdef __VMS__
-#define gtk_file_selection_hide_fileop_buttons gtk_file_selection_hide_fileop_
-#endif
#include <gtk/gtk.h>
//-----------------------------------------------------------------------------
#include <gtk/gtk.h>
//-----------------------------------------------------------------------------
@@
-86,6
+83,18
@@
void gtk_filedialog_ok_callback( GtkWidget *WXUNUSED(widget), wxFileDialog *dial
}
}
}
}
+ // change to the directory where the user went if asked
+ if ( style & wxCHANGE_DIR )
+ {
+ wxString cwd;
+ wxSplitPath(filename, &cwd, NULL, NULL);
+
+ if ( cwd != wxGetWorkingDirectory() )
+ {
+ wxSetWorkingDirectory(cwd);
+ }
+ }
+
dialog->SetPath( filename );
wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, wxID_OK);
dialog->SetPath( filename );
wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, wxID_OK);
@@
-124,9
+133,9
@@
wxFileDialog::wxFileDialog( wxWindow *parent, const wxString& message,
!CreateBase( parent, -1, pos, wxDefaultSize, style | wxDIALOG_MODAL, wxDefaultValidator, wxT("filedialog") ))
{
wxFAIL_MSG( wxT("wxXX creation failed") );
!CreateBase( parent, -1, pos, wxDefaultSize, style | wxDIALOG_MODAL, wxDefaultValidator, wxT("filedialog") ))
{
wxFAIL_MSG( wxT("wxXX creation failed") );
- return;
+
return;
}
}
-
+
m_message = message;
m_path = wxT("");
m_fileName = defaultFileName;
m_message = message;
m_path = wxT("");
m_fileName = defaultFileName;
@@
-159,10
+168,10
@@
wxFileDialog::wxFileDialog( wxWindow *parent, const wxString& message,
gtk_signal_connect( GTK_OBJECT(sel->cancel_button), "clicked",
GTK_SIGNAL_FUNC(gtk_filedialog_cancel_callback), (gpointer*)this );
gtk_signal_connect( GTK_OBJECT(sel->cancel_button), "clicked",
GTK_SIGNAL_FUNC(gtk_filedialog_cancel_callback), (gpointer*)this );
-
+
// strange way to internationalize
gtk_label_set( GTK_LABEL( GTK_BUTTON(sel->cancel_button)->child ), wxConvCurrent->cWX2MB(_("Cancel")) );
// strange way to internationalize
gtk_label_set( GTK_LABEL( GTK_BUTTON(sel->cancel_button)->child ), wxConvCurrent->cWX2MB(_("Cancel")) );
-
+
gtk_signal_connect( GTK_OBJECT(m_widget), "delete_event",
GTK_SIGNAL_FUNC(gtk_filedialog_delete_callback), (gpointer)this );
}
gtk_signal_connect( GTK_OBJECT(m_widget), "delete_event",
GTK_SIGNAL_FUNC(gtk_filedialog_delete_callback), (gpointer)this );
}
@@
-175,11
+184,11
@@
void wxFileDialog::SetPath(const wxString& path)
{
wxString ext;
wxSplitPath(path, &m_dir, &m_fileName, &ext);
{
wxString ext;
wxSplitPath(path, &m_dir, &m_fileName, &ext);
- if (!ext.IsEmpty())
- {
- m_fileName += wxT(".");
+
if (!ext.IsEmpty())
+
{
+
m_fileName += wxT(".");
m_fileName += ext;
m_fileName += ext;
- }
+
}
}
}
}
}
@@
-237,15
+246,15
@@
wxString wxLoadFileSelector( const wxChar *what, const wxChar *extension, const
{
wxChar *ext = (wxChar *)extension;
{
wxChar *ext = (wxChar *)extension;
- wxChar prompt[50];
- wxString str = _("Load %s file");
- wxSprintf(prompt, str, what);
+ wxString prompt = wxString::Format(_("Load %s file"), what);
+
+ if (*ext == wxT('.'))
+ ext++;
- if (*ext == wxT('.')) ext++;
- wxChar wild[60];
- wxSprintf(wild, wxT("*.%s"), ext);
+ wxString wild = wxString::Format(_T("*.%s"), ext);
- return wxFileSelector (prompt, (const wxChar *) NULL, default_name, ext, wild, 0, parent);
+ return wxFileSelector(prompt, (const wxChar *) NULL, default_name,
+ ext, wild, 0, parent);
}
wxString wxSaveFileSelector(const wxChar *what, const wxChar *extension, const wxChar *default_name,
}
wxString wxSaveFileSelector(const wxChar *what, const wxChar *extension, const wxChar *default_name,
@@
-253,14
+262,14
@@
wxString wxSaveFileSelector(const wxChar *what, const wxChar *extension, const w
{
wxChar *ext = (wxChar *)extension;
{
wxChar *ext = (wxChar *)extension;
- wxChar prompt[50];
- wxString str = _("Save %s file");
- wxSprintf(prompt, str, what);
+ wxString prompt = wxString::Format(_("Save %s file"), what);
+
+ if (*ext == wxT('.'))
+ ext++;
- if (*ext == wxT('.')) ext++;
- wxChar wild[60];
- wxSprintf(wild, wxT("*.%s"), ext);
+ wxString wild = wxString::Format(_T("*.%s"), ext);
- return wxFileSelector (prompt, (const wxChar *) NULL, default_name, ext, wild, 0, parent);
+ return wxFileSelector(prompt, (const wxChar *) NULL, default_name,
+ ext, wild, 0, parent);
}
}