// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
#ifdef __GNUG__
#pragma implementation "filedlgg.h"
#endif
#if wxUSE_FILEDLG
-#if !defined(__UNIX__) && !defined(__DOS__)
-#error wxFileDialog currently only supports Unix and DOS
+#if !defined(__UNIX__) && !defined(__DOS__) && !defined(__WIN32__)
+#error wxFileDialog currently only supports Unix, win32 and DOS
#endif
#include "wx/checkbox.h"
#include "wx/imaglist.h"
#include "wx/dir.h"
#include "wx/artprov.h"
+#include "wx/hash.h"
#if wxUSE_TOOLTIPS
#include "wx/tooltip.h"
#endif
#include <time.h>
+#if defined(__UNIX__) || defined(__DOS__)
#include <unistd.h>
+#endif
+
+// ----------------------------------------------------------------------------
+// constants
+// ----------------------------------------------------------------------------
+
+// the list ctrl fields in report view
+enum FileListField
+{
+ FileList_Name,
+ FileList_Type,
+ FileList_Date,
+ FileList_Time,
+#ifdef __UNIX__
+ FileList_Perm,
+#endif // __UNIX__
+ FileList_Max
+};
//-----------------------------------------------------------------------------
// wxFileData
wxString GetName() const;
wxString GetFullName() const;
wxString GetHint() const;
- wxString GetEntry( int num );
- bool IsDir();
- bool IsLink();
- bool IsExe();
- long GetSize();
+ wxString GetEntry( FileListField num ) const;
+
+ bool IsDir() const { return m_isDir; }
+ bool IsLink() const { return m_isLink; }
+ bool IsExe() const { return m_isExe; }
+ long GetSize() const { return m_size; }
+
void MakeItem( wxListItem &item );
void SetNewName( const wxString &name, const wxString &fname );
public:
wxFileCtrl();
wxFileCtrl( wxWindow *win,
+ wxStaticText *labelDir,
wxWindowID id,
- const wxString &dirName,
const wxString &wild,
+ bool showHidden,
const wxPoint &pos = wxDefaultPosition,
const wxSize &size = wxDefaultSize,
long style = wxLC_LIST,
wxWindow *m_goToParentControl;
wxWindow *m_newDirControl;
+ // the label showing the current directory
+ wxStaticText *m_labelDir;
+
DECLARE_DYNAMIC_CLASS(wxFileCtrl);
DECLARE_EVENT_TABLE()
};
static wxBitmap CreateAntialiasedBitmap(const wxImage& img)
{
- wxImage small(16, 16);
+ wxImage smallimg (16, 16);
unsigned char *p1, *p2, *ps;
unsigned char mr = img.GetMaskRed(),
mg = img.GetMaskGreen(),
unsigned x, y;
unsigned sr, sg, sb, smask;
- p1 = img.GetData(), p2 = img.GetData() + 3 * 32, ps = small.GetData();
- small.SetMaskColour(mr, mr, mr);
+ p1 = img.GetData(), p2 = img.GetData() + 3 * 32, ps = smallimg.GetData();
+ smallimg.SetMaskColour(mr, mr, mr);
for (y = 0; y < 16; y++)
{
p1 += 32 * 3, p2 += 32 * 3;
}
- return wxBitmap(small);
+ return wxBitmap(smallimg);
}
// finds empty borders and return non-empty area of image:
m_HashTable.Put(extension, new wxFileIconEntry(newid));
return newid;
}
- wxImage img = ic.ConvertToImage();
+
+ wxBitmap tmpBmp;
+ tmpBmp.CopyFromIcon(ic);
+ wxImage img = tmpBmp.ConvertToImage();
+
delete ft;
int id = m_ImageList.GetImageCount();
// ----------------------------------------------------------------------------
static
-int ListCompare( long data1, long data2, long WXUNUSED(data) )
+int ListCompare( long data1, long data2, long WXUNUSED(data))
{
wxFileData *fd1 = (wxFileData*)data1 ;
wxFileData *fd2 = (wxFileData*)data2 ;
if (name.length() == 2 && name[1u] == wxT(':'))
{
m_isDir = TRUE;
- m_isExe = m_isLink = FALSE;
+ m_isExe =
+ m_isLink = FALSE;
m_size = 0;
return;
}
-#endif
+#endif // __DOS__ || __WINDOWS__
- struct stat buff;
- wxStat( m_fileName.fn_str(), &buff );
+ wxStructStat buff;
#if defined(__UNIX__) && (!defined( __EMX__ ) && !defined(__VMS))
- struct stat lbuff;
- lstat( m_fileName.fn_str(), &lbuff );
- m_isLink = S_ISLNK( lbuff.st_mode );
- struct tm *t = localtime( &lbuff.st_mtime );
-#else
+ lstat( m_fileName.fn_str(), &buff );
+ m_isLink = S_ISLNK( buff.st_mode );
+#else // no lstat()
+ wxStat( m_fileName, &buff );
m_isLink = FALSE;
- struct tm *t = localtime( &buff.st_mtime );
#endif
-// struct passwd *user = getpwuid( buff.st_uid );
-// struct group *grp = getgrgid( buff.st_gid );
-
- m_isDir = S_ISDIR( buff.st_mode );
- m_isExe = ((buff.st_mode & S_IXUSR ) == S_IXUSR );
+ m_isDir = (buff.st_mode & S_IFDIR) != 0;
+ m_isExe = (buff.st_mode & wxS_IXUSR) != 0;
m_size = buff.st_size;
+ const struct tm * const t = localtime( &buff.st_mtime );
m_hour = t->tm_hour;
m_minute = t->tm_min;
m_month = t->tm_mon+1;
m_year = t->tm_year;
m_year += 1900;
- m_permissions.sprintf( wxT("%c%c%c"),
- ((( buff.st_mode & S_IRUSR ) == S_IRUSR ) ? wxT('r') : wxT('-')),
- ((( buff.st_mode & S_IWUSR ) == S_IWUSR ) ? wxT('w') : wxT('-')),
- ((( buff.st_mode & S_IXUSR ) == S_IXUSR ) ? wxT('x') : wxT('-')) );
+ m_permissions.Printf(_T("%c%c%c"),
+ buff.st_mode & wxS_IRUSR ? _T('r') : _T('-'),
+ buff.st_mode & wxS_IWUSR ? _T('w') : _T('-'),
+ buff.st_mode & wxS_IXUSR ? _T('x') : _T('-'));
}
wxString wxFileData::GetName() const
wxString wxFileData::GetHint() const
{
wxString s = m_fileName;
- s += " ";
- if (m_isDir) s += _("<DIR> ");
- else if (m_isLink) s += _("<LINK> ");
+ s += wxT(" ");
+ if (m_isDir) s += wxT("<DIR> ");
+ else if (m_isLink) s += wxT("<LINK> ");
else
{
s += LongToString( m_size );
- s += _(" bytes ");
+ s += wxT(" bytes ");
}
s += IntToString( m_day );
s += wxT(".");
return s;
};
-wxString wxFileData::GetEntry( int num )
+wxString wxFileData::GetEntry( FileListField num ) const
{
wxString s;
- switch (num)
+ switch ( num )
{
- case 0:
- {
+ case FileList_Name:
s = m_name;
- }
- break;
- case 1:
- {
- if (m_isDir) s = _("<DIR>");
- else if (m_isLink) s = _("<LINK>");
- else s = LongToString( m_size );
- }
- break;
- case 2:
- {
- if (m_day < 10) s = wxT("0"); else s = wxT("");
- s += IntToString( m_day );
- s += wxT(".");
- if (m_month < 10) s += wxT("0");
- s += IntToString( m_month );
- s += wxT(".");
- s += IntToString( m_year );
- }
- break;
- case 3:
- {
- if (m_hour < 10) s = wxT("0"); else s = wxT("");
- s += IntToString( m_hour );
- s += wxT(":");
- if (m_minute < 10) s += wxT("0");
- s += IntToString( m_minute );
break;
- }
- case 4:
- s = m_permissions;
+
+ case FileList_Type:
+ if (m_isDir)
+ s = _("<DIR>");
+ else if (m_isLink)
+ s = _("<LINK>");
+ else
+ s.Printf(_T("%ld"), m_size);
break;
- default:
- s = wxT("No entry");
+
+ case FileList_Date:
+ s.Printf(_T("%02d.%02d.%d"), m_day, m_month, m_year);
break;
- }
- return s;
-}
-bool wxFileData::IsDir()
-{
- return m_isDir;
-}
+ case FileList_Time:
+ s.Printf(_T("%02d:%02d"), m_hour, m_minute);
+ break;
-bool wxFileData::IsExe()
-{
- return m_isExe;
-}
+#ifdef __UNIX__
+ case FileList_Perm:
+ s = m_permissions;
+ break;
+#endif // __UNIX__
-bool wxFileData::IsLink()
-{
- return m_isLink;
-}
+ default:
+ wxFAIL_MSG( _T("unexpected field in wxFileData::GetEntry()") );
+ }
-long wxFileData::GetSize()
-{
- return m_size;
+ return s;
}
void wxFileData::SetNewName( const wxString &name, const wxString &fname )
{
item.m_text = m_name;
item.ClearAttributes();
- if (IsExe()) item.SetTextColour(*wxRED);
- if (IsDir()) item.SetTextColour(*wxBLUE);
+ if (IsExe())
+ item.SetTextColour(*wxRED);
+ if (IsDir())
+ item.SetTextColour(*wxBLUE);
if (IsDir())
item.m_image = FI_FOLDER;
if (IsLink())
{
- wxColour *dg = wxTheColourDatabase->FindColour( "MEDIUM GREY" );
+ wxColour *dg = wxTheColourDatabase->FindColour( _T("MEDIUM GREY") );
item.SetTextColour(*dg);
}
item.m_data = (long)this;
wxFileCtrl::wxFileCtrl()
{
-#if defined(__UNIX__)
- m_dirName = wxT("/");
-#elif defined(__DOS__)
- m_dirName = wxT("");
-#endif
m_showHidden = FALSE;
}
-wxFileCtrl::wxFileCtrl(wxWindow *win, wxWindowID id,
- const wxString &dirName, const wxString &wild,
- const wxPoint &pos, const wxSize &size,
- long style, const wxValidator &validator,
+wxFileCtrl::wxFileCtrl(wxWindow *win,
+ wxStaticText *labelDir,
+ wxWindowID id,
+ const wxString& wild,
+ bool showHidden,
+ const wxPoint& pos,
+ const wxSize& size,
+ long style,
+ const wxValidator &validator,
const wxString &name)
- : wxListCtrl(win, id, pos, size, style, validator, name)
+ : wxListCtrl(win, id, pos, size, style, validator, name),
+ m_wild(wild)
{
if (! g_IconsTable)
g_IconsTable = new wxFileIconsTable;
SetImageList( imageList, wxIMAGE_LIST_SMALL );
- m_goToParentControl = m_newDirControl = NULL;
+ m_goToParentControl =
+ m_newDirControl = NULL;
- m_dirName = dirName;
- m_wild = wild;
- m_showHidden = FALSE;
- UpdateFiles();
+ m_labelDir = labelDir;
+
+ m_showHidden = showHidden;
}
void wxFileCtrl::ChangeToListMode()
long my_style = GetWindowStyleFlag();
if (my_style & wxLC_REPORT)
{
-#ifdef __UNIX__
- const int noEntries = 5;
-#else
- const int noEntries = 4;
-#endif
ret = InsertItem( item );
- for (int i = 1; i < noEntries; i++)
- SetItem( item.m_itemId, i, fd->GetEntry( i) );
+ for (int i = 1; i < FileList_Max; i++)
+ SetItem( item.m_itemId, i, fd->GetEntry((FileListField)i) );
}
else if (my_style & wxLC_LIST)
{
void wxFileCtrl::UpdateFiles()
{
+ // don't do anything before ShowModal() call which sets m_dirName
+ if ( m_dirName.empty() )
+ return;
+
wxBusyCursor bcur; // this may take a while...
long my_style = GetWindowStyleFlag();
}
}
- SortItems(ListCompare, 0);
+ SortItems((wxListCtrlCompare)ListCompare, 0);
if ( my_style & wxLC_REPORT )
{
if (id != -1)
{
- SortItems( ListCompare, 0 );
+ SortItems( (wxListCtrlCompare) ListCompare, 0 );
id = FindItem( 0, (long)fd );
EnsureVisible( id );
EditLabel( id );
SetItemState( id, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED );
EnsureVisible( id );
}
+
+ m_labelDir->SetLabel(m_dirName);
}
}
UpdateFiles();
SetItemState( 0, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED );
EnsureVisible( 0 );
+
+ m_labelDir->SetLabel(dir);
}
void wxFileCtrl::GetDir( wxString &dir )
EVT_BUTTON(wxID_OK, wxFileDialog::OnListOk)
EVT_LIST_ITEM_SELECTED(ID_LIST_CTRL, wxFileDialog::OnSelected)
EVT_LIST_ITEM_ACTIVATED(ID_LIST_CTRL, wxFileDialog::OnActivated)
- EVT_CHOICE(ID_CHOICE,wxFileDialog::OnChoice)
+ EVT_CHOICE(ID_CHOICE,wxFileDialog::OnChoiceFilter)
EVT_TEXT_ENTER(ID_TEXT,wxFileDialog::OnTextEnter)
+ EVT_TEXT(ID_TEXT,wxFileDialog::OnTextChange)
EVT_CHECKBOX(ID_CHECK,wxFileDialog::OnCheck)
END_EVENT_TABLE()
-long wxFileDialog::s_lastViewStyle = wxLC_LIST;
-bool wxFileDialog::s_lastShowHidden = FALSE;
+long wxFileDialog::ms_lastViewStyle = wxLC_LIST;
+bool wxFileDialog::ms_lastShowHidden = FALSE;
wxFileDialog::wxFileDialog(wxWindow *parent,
- const wxString& message,
- const wxString& defaultDir,
- const wxString& defaultFile,
- const wxString& wildCard,
- long style,
- const wxPoint& pos ) :
- wxDialog( parent, -1, message, pos, wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER )
+ const wxString& message,
+ const wxString& defaultDir,
+ const wxString& defaultFile,
+ const wxString& wildCard,
+ long style,
+ const wxPoint& pos )
+ : wxDialog( parent, -1, message, pos, wxDefaultSize,
+ wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER )
{
- wxBusyCursor bcur;
-
if (wxConfig::Get(FALSE))
{
wxConfig::Get()->Read(wxT("/wxWindows/wxFileDialog/ViewStyle"),
- &s_lastViewStyle);
+ &ms_lastViewStyle);
wxConfig::Get()->Read(wxT("/wxWindows/wxFileDialog/ShowHidden"),
- &s_lastShowHidden);
+ &ms_lastShowHidden);
}
m_message = message;
m_dialogStyle = style;
- if (m_dialogStyle == 0) m_dialogStyle = wxOPEN;
+ if (m_dialogStyle == 0)
+ m_dialogStyle = wxOPEN;
if ((m_dialogStyle & wxMULTIPLE ) && !(m_dialogStyle & wxOPEN))
m_dialogStyle |= wxOPEN;
}
if ( firstWild.Left( 2 ) == wxT("*.") )
m_filterExtension = firstWild.Mid( 1 );
- if ( m_filterExtension == ".*" ) m_filterExtension = wxEmptyString;
+ if ( m_filterExtension == wxT(".*") )
+ m_filterExtension = wxEmptyString;
// layout
+
+ bool is_pda = (wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA);
wxBoxSizer *mainsizer = new wxBoxSizer( wxVERTICAL );
#endif
buttonsizer->Add( butNewDir, 0, wxALL, 5 );
- if (wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA)
+ if (is_pda)
mainsizer->Add( buttonsizer, 0, wxALL | wxEXPAND, 0 );
else
mainsizer->Add( buttonsizer, 0, wxALL | wxEXPAND, 5 );
wxBoxSizer *staticsizer = new wxBoxSizer( wxHORIZONTAL );
- if (wxSystemSettings::GetScreenType() > wxSYS_SCREEN_PDA)
+ if (is_pda)
staticsizer->Add( new wxStaticText( this, -1, _("Current directory:") ), 0, wxRIGHT, 10 );
m_static = new wxStaticText( this, -1, m_dir );
staticsizer->Add( m_static, 1 );
mainsizer->Add( staticsizer, 0, wxEXPAND | wxLEFT|wxRIGHT|wxBOTTOM, 10 );
- if (m_dialogStyle & wxMULTIPLE)
- m_list = new wxFileCtrl( this, ID_LIST_CTRL, m_dir, firstWild, wxDefaultPosition,
- wxSize(540,200), s_lastViewStyle | wxSUNKEN_BORDER );
- else
- m_list = new wxFileCtrl( this, ID_LIST_CTRL, m_dir, firstWild, wxDefaultPosition,
- wxSize(540,200), s_lastViewStyle | wxSUNKEN_BORDER | wxLC_SINGLE_SEL );
- m_list->ShowHidden(s_lastShowHidden);
+ long style2 = ms_lastViewStyle | wxSUNKEN_BORDER;
+ if ( !(m_dialogStyle & wxMULTIPLE) )
+ style2 |= wxLC_SINGLE_SEL;
+
+ m_list = new wxFileCtrl( this, m_static, ID_LIST_CTRL,
+ firstWild, ms_lastShowHidden,
+ wxDefaultPosition, wxSize(540,200),
+ style2);
+
m_list->SetNewDirControl(butNewDir);
m_list->SetGoToParentControl(butDirUp);
- if (wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA)
+ if (is_pda)
{
// PDAs have a different screen layout
mainsizer->Add( m_list, 1, wxEXPAND | wxLEFT|wxRIGHT, 5 );
mainsizer->Add( textsizer, 0, wxEXPAND );
m_check = new wxCheckBox( this, ID_CHECK, _("Show hidden files") );
- m_check->SetValue( s_lastShowHidden );
+ m_check->SetValue( ms_lastShowHidden );
textsizer->Add( m_check, 0, wxCENTER|wxALL, 5 );
buttonsizer = new wxBoxSizer( wxHORIZONTAL );
m_choice = new wxChoice( this, ID_CHOICE );
choicesizer->Add( m_choice, 1, wxCENTER|wxALL, 10 );
m_check = new wxCheckBox( this, ID_CHECK, _("Show hidden files") );
- m_check->SetValue( s_lastShowHidden );
+ m_check->SetValue( ms_lastShowHidden );
choicesizer->Add( m_check, 0, wxCENTER|wxALL, 10 );
choicesizer->Add( new wxButton( this, wxID_CANCEL, _("Cancel") ), 0, wxCENTER | wxALL, 10 );
mainsizer->Add( choicesizer, 0, wxEXPAND );
Centre( wxBOTH );
-/*
- if (m_fileName.IsEmpty())
- m_list->SetFocus();
- else
-*/
- m_text->SetFocus();
+ m_text->SetFocus();
}
wxFileDialog::~wxFileDialog()
if (wxConfig::Get(FALSE))
{
wxConfig::Get()->Write(wxT("/wxWindows/wxFileDialog/ViewStyle"),
- s_lastViewStyle);
+ ms_lastViewStyle);
wxConfig::Get()->Write(wxT("/wxWindows/wxFileDialog/ShowHidden"),
- s_lastShowHidden);
+ ms_lastShowHidden);
}
}
-void wxFileDialog::OnChoice( wxCommandEvent &event )
+int wxFileDialog::ShowModal()
+{
+ m_list->GoToDir(m_dir);
+ m_text->SetValue(m_fileName);
+
+ return wxDialog::ShowModal();
+}
+
+void wxFileDialog::DoSetFilterIndex(int filterindex)
{
- int index = (int)event.GetInt();
- wxString *str = (wxString*) m_choice->GetClientData( index );
+ wxString *str = (wxString*) m_choice->GetClientData( filterindex );
m_list->SetWild( *str );
- m_filterIndex = index;
- if ( str -> Left( 2 ) == wxT("*.") )
+ m_filterIndex = filterindex;
+ if ( str->Left(2) == wxT("*.") )
{
- m_filterExtension = str -> Mid( 1 );
- if (m_filterExtension == ".*") m_filterExtension = wxEmptyString;
+ m_filterExtension = str->Mid(1);
+ if (m_filterExtension == _T(".*"))
+ m_filterExtension.clear();
}
else
- m_filterExtension = wxEmptyString;
+ {
+ m_filterExtension.clear();
+ }
+}
+
+void wxFileDialog::SetFilterIndex( int filterindex )
+{
+ m_choice->SetSelection( filterindex );
+
+ DoSetFilterIndex(filterindex);
+}
+
+void wxFileDialog::OnChoiceFilter( wxCommandEvent &event )
+{
+ DoSetFilterIndex((int)event.GetInt());
}
void wxFileDialog::OnCheck( wxCommandEvent &event )
{
- m_list->ShowHidden( (s_lastShowHidden = event.GetInt() != 0) );
+ m_list->ShowHidden( (ms_lastShowHidden = event.GetInt() != 0) );
}
void wxFileDialog::OnActivated( wxListEvent &event )
GetEventHandler()->ProcessEvent( cevent );
}
+static bool ignoreChanges = FALSE;
+
+void wxFileDialog::OnTextChange( wxCommandEvent &WXUNUSED(event) )
+{
+ if (!ignoreChanges)
+ {
+ // Clear selections. Otherwise when the user types in a value they may
+ // not get the file whose name they typed.
+ if (m_list->GetSelectedItemCount() > 0)
+ {
+ long item = m_list->GetNextItem(-1, wxLIST_NEXT_ALL,
+ wxLIST_STATE_SELECTED);
+ while ( item != -1 )
+ {
+ m_list->SetItemState(item,0, wxLIST_STATE_SELECTED);
+ item = m_list->GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
+ }
+ }
+ }
+}
+
void wxFileDialog::OnSelected( wxListEvent &event )
{
wxString filename( event.m_item.m_text );
dir += filename;
if (wxDirExists(dir)) return;
+ ignoreChanges = TRUE;
m_text->SetValue( filename );
+ ignoreChanges = FALSE;
}
void wxFileDialog::HandleAction( const wxString &fn )
{
m_list->GoToParentDir();
m_list->SetFocus();
- m_list->GetDir( dir );
- m_static->SetLabel( dir );
return;
}
{
m_list->GoToHomeDir();
m_list->SetFocus();
- m_list->GetDir( dir );
- m_static->SetLabel( dir );
return;
}
if (wxDirExists(filename))
{
m_list->GoToDir( filename );
- m_list->GetDir( dir );
- m_static->SetLabel( dir );
return;
}
-
- if ( (m_dialogStyle & wxSAVE) && (m_dialogStyle & wxOVERWRITE_PROMPT) )
+ // append the default extension to the filename if it doesn't have any
+ //
+ // VZ: the logic of testing for !wxFileExists() only for the open file
+ // dialog is not entirely clear to me, why don't we allow saving to a
+ // file without extension as well?
+ if ( !(m_dialogStyle & wxOPEN) || !wxFileExists(filename) )
{
- if (filename.Find( wxT('.') ) == wxNOT_FOUND ||
- filename.AfterLast( wxT('.') ).Find( wxFILE_SEP_PATH ) != wxNOT_FOUND)
- filename << m_filterExtension;
- if (wxFileExists( filename ))
+ wxString ext;
+ wxSplitPath(filename, NULL, NULL, &ext);
+ if ( ext.empty() )
{
- wxString msg;
- msg.Printf( _("File '%s' already exists, do you really want to "
- "overwrite it?"), filename.c_str() );
-
- if (wxMessageBox(msg, _("Confirm"), wxYES_NO) != wxYES)
- return;
+ // append the first extension of the filter string
+ filename += m_filterExtension.BeforeFirst(_T(';'));
}
}
- else if ( m_dialogStyle & wxOPEN )
+
+ // check that the file [doesn't] exist if necessary
+ if ( (m_dialogStyle & wxSAVE) &&
+ (m_dialogStyle & wxOVERWRITE_PROMPT) &&
+ wxFileExists( filename ) )
{
- if ( !wxFileExists( filename ) )
- if (filename.Find( wxT('.') ) == wxNOT_FOUND ||
- filename.AfterLast( wxT('.') ).Find( wxFILE_SEP_PATH ) != wxNOT_FOUND)
- filename << m_filterExtension;
+ wxString msg;
+ msg.Printf( _("File '%s' already exists, do you really want to "
+ "overwrite it?"), filename.c_str() );
- if ( m_dialogStyle & wxFILE_MUST_EXIST )
- {
- if ( !wxFileExists( filename ) )
- {
- wxMessageBox(_("Please choose an existing file."), _("Error"), wxOK | wxICON_ERROR );
- return;
- }
- }
+ if (wxMessageBox(msg, _("Confirm"), wxYES_NO) != wxYES)
+ return;
+ }
+ else if ( (m_dialogStyle & wxOPEN) &&
+ (m_dialogStyle & wxFILE_MUST_EXIST) &&
+ !wxFileExists(filename) )
+ {
+ wxMessageBox(_("Please choose an existing file."), _("Error"),
+ wxOK | wxICON_ERROR );
}
SetPath( filename );
void wxFileDialog::OnList( wxCommandEvent &WXUNUSED(event) )
{
m_list->ChangeToListMode();
- s_lastViewStyle = wxLC_LIST;
+ ms_lastViewStyle = wxLC_LIST;
m_list->SetFocus();
}
void wxFileDialog::OnReport( wxCommandEvent &WXUNUSED(event) )
{
m_list->ChangeToReportMode();
- s_lastViewStyle = wxLC_REPORT;
+ ms_lastViewStyle = wxLC_REPORT;
m_list->SetFocus();
}
{
m_list->GoToParentDir();
m_list->SetFocus();
- wxString dir;
- m_list->GetDir( dir );
- m_static->SetLabel( dir );
}
void wxFileDialog::OnHome( wxCommandEvent &WXUNUSED(event) )
{
m_list->GoToHomeDir();
m_list->SetFocus();
- wxString dir;
- m_list->GetDir( dir );
- m_static->SetLabel( dir );
-
- m_text->SetFocus();
}
void wxFileDialog::OnNew( wxCommandEvent &WXUNUSED(event) )
{
// not only set the full path but also update filename and dir
m_path = path;
- if ( !!path )
+ if ( !path.empty() )
{
wxString ext;
wxSplitPath(path, &m_dir, &m_fileName, &ext);
- if (!ext.IsEmpty())
+ if (!ext.empty())
{
m_fileName += wxT(".");
m_fileName += ext;
// global functions
// ----------------------------------------------------------------------------
+// common part of both wxFileSelectorEx() and wxFileSelector()
+static wxString
+DoSelectFile(const wxChar *title,
+ const wxChar *defaultDir,
+ const wxChar *defaultFileName,
+ const wxChar *defaultExtension,
+ int *indexDefaultExtension,
+ const wxChar *filter,
+ int flags,
+ wxWindow *parent,
+ int x,
+ int y)
+{
+ // the filter may be either given explicitly or created automatically from
+ // the default extension
+ wxString filterReal;
+ if ( filter )
+ {
+ // the user has specified the filter explicitly, use it
+ filterReal = filter;
+ }
+ else if ( !wxIsEmpty(defaultExtension) )
+ {
+ // create the filter to match the given extension
+ filterReal << wxT("*.") << defaultExtension;
+ }
+
+ wxFileDialog fileDialog(parent,
+ title,
+ defaultDir,
+ defaultFileName,
+ filterReal,
+ flags,
+ wxPoint(x, y));
+
+ wxString path;
+ if ( fileDialog.ShowModal() == wxID_OK )
+ {
+ path = fileDialog.GetPath();
+ if ( indexDefaultExtension )
+ {
+ *indexDefaultExtension = fileDialog.GetFilterIndex();
+ }
+ }
+
+ return path;
+}
+
wxString
-wxFileSelectorEx(const wxChar *message,
- const wxChar *default_path,
- const wxChar *default_filename,
- int *WXUNUSED(indexDefaultExtension),
- const wxChar *wildcard,
+wxFileSelectorEx(const wxChar *title,
+ const wxChar *defaultDir,
+ const wxChar *defaultFileName,
+ int *indexDefaultExtension,
+ const wxChar *filter,
int flags,
wxWindow *parent,
- int x, int y)
+ int x,
+ int y)
{
- // TODO: implement this somehow
- return wxFileSelector(message, default_path, default_filename, wxT(""),
- wildcard, flags, parent, x, y);
+ return DoSelectFile(title,
+ defaultDir,
+ defaultFileName,
+ wxT(""), // def ext determined by index
+ indexDefaultExtension,
+ filter,
+ flags,
+ parent,
+ x,
+ y);
}
-wxString wxFileSelector( const wxChar *title,
- const wxChar *defaultDir, const wxChar *defaultFileName,
- const wxChar *defaultExtension, const wxChar *filter, int flags,
- wxWindow *parent, int x, int y )
+wxString
+wxFileSelector(const wxChar *title,
+ const wxChar *defaultDir,
+ const wxChar *defaultFileName,
+ const wxChar *defaultExtension,
+ const wxChar *filter,
+ int flags,
+ wxWindow *parent,
+ int x,
+ int y)
{
- wxString filter2;
- if ( defaultExtension && !filter )
- filter2 = wxString(wxT("*.")) + wxString(defaultExtension) ;
- else if ( filter )
- filter2 = filter;
-
- wxString defaultDirString;
- if (defaultDir)
- defaultDirString = defaultDir;
-
- wxString defaultFilenameString;
- if (defaultFileName)
- defaultFilenameString = defaultFileName;
-
- wxFileDialog fileDialog( parent, title, defaultDirString, defaultFilenameString, filter2, flags, wxPoint(x, y) );
-
- if ( fileDialog.ShowModal() == wxID_OK )
- {
- return fileDialog.GetPath();
- }
- else
- {
- return wxEmptyString;
- }
+ return DoSelectFile(title,
+ defaultDir,
+ defaultFileName,
+ defaultExtension,
+ NULL, // not interested in filter index
+ filter,
+ flags,
+ parent,
+ x,
+ y);
}
static wxString GetWildcardString(const wxChar *ext)
IMPLEMENT_DYNAMIC_CLASS(wxFileDialogGenericModule, wxModule)
#endif // wxUSE_FILEDLG
+
projects / wxWidgets.git / blobdiff