// Created: 12/12/98
// RCS-ID: $Id$
// Copyright: (c) Robert Roebling
-// Licence: wxWindows licence
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__
#include "wx/msgdlg.h"
#include "wx/sizer.h"
#include "wx/bmpbuttn.h"
+#include "wx/tokenzr.h"
-#include "sys/types.h"
-#include "sys/stat.h"
-#include "dirent.h"
-#include "pwd.h"
-#include "grp.h"
-#include "time.h"
+#if wxUSE_TOOLTIPS
+ #include "wx/tooltip.h"
+#endif
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <dirent.h>
+#include <pwd.h>
+#include <grp.h>
+#include <time.h>
+#include <unistd.h>
#include "wx/generic/home.xpm"
#include "wx/generic/listview.xpm"
#include "wx/generic/repview.xpm"
+#include "wx/generic/new_dir.xpm"
+#include "wx/generic/dir_up.xpm"
/* XPM */
static char * folder_xpm[] = {
/* width height ncolors chars_per_pixel */
"16 16 6 1",
/* colors */
-" s None c None",
-". c #000000",
-"+ c #c0c0c0",
-"@ c #808080",
-"# c #ffff00",
-"$ c #ffffff",
+" s None c None",
+". c #000000",
+"+ c #c0c0c0",
+"@ c #808080",
+"# c #ffff00",
+"$ c #ffffff",
/* pixels */
" ",
" @@@@@ ",
" ",
" "};
+// ----------------------------------------------------------------------------
+// private functions
+// ----------------------------------------------------------------------------
+
+static
+int ListCompare( long data1, long data2, long WXUNUSED(data) )
+{
+ wxFileData *fd1 = (wxFileData*)data1 ;
+ wxFileData *fd2 = (wxFileData*)data2 ;
+ if (fd1->GetName() == wxT("..")) return -1;
+ if (fd2->GetName() == wxT("..")) return 1;
+ if (fd1->IsDir() && !fd2->IsDir()) return -1;
+ if (fd2->IsDir() && !fd1->IsDir()) return 1;
+ return wxStrcmp( fd1->GetName(), fd2->GetName() );
+}
+
//-----------------------------------------------------------------------------
// wxFileData
//-----------------------------------------------------------------------------
{
m_name = name;
m_fileName = fname;
-
+
struct stat buff;
- stat( m_fileName.GetData(), &buff );
+ stat( m_fileName.fn_str(), &buff );
struct stat lbuff;
- lstat( m_fileName.GetData(), &lbuff );
+ lstat( m_fileName.fn_str(), &lbuff );
struct tm *t = localtime( &lbuff.st_mtime );
// struct passwd *user = getpwuid( buff.st_uid );
m_day = t->tm_mday;
m_year = t->tm_year;
- m_permissions.sprintf( "%c%c%c",
- ((( buff.st_mode & S_IRUSR ) == S_IRUSR ) ? 'r' : '-'),
- ((( buff.st_mode & S_IWUSR ) == S_IWUSR ) ? 'w' : '-'),
- ((( buff.st_mode & S_IXUSR ) == S_IXUSR ) ? 'x' : '-') );
+ 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('-')) );
}
wxString wxFileData::GetName() const
s += _(" bytes ");
}
s += IntToString( m_day );
- s += _T(".");
+ s += wxT(".");
s += IntToString( m_month );
- s += _T(".");
+ s += wxT(".");
s += IntToString( m_year );
- s += _T(" ");
+ s += wxT(" ");
s += IntToString( m_hour );
- s += _T(":");
+ s += wxT(":");
s += IntToString( m_minute );
- s += _T(" ");
+ s += wxT(" ");
s += m_permissions;
return s;
};
-wxString wxFileData::GetEntry( const int num )
+wxString wxFileData::GetEntry( int num )
{
wxString s;
switch (num)
else s = LongToString( m_size );
break;
case 2:
- if (m_day < 10) s = _T("0"); else s = _T("");
+ if (m_day < 10) s = wxT("0"); else s = wxT("");
s += IntToString( m_day );
- s += _T(".");
- if (m_month < 10) s += _T("0");
+ s += wxT(".");
+ if (m_month < 10) s += wxT("0");
s += IntToString( m_month );
- s += _T(".");
- if (m_year < 10) s += _T("0"); // this should happen real soon...
+ s += wxT(".");
+ if (m_year < 10) s += wxT("0"); // this should happen real soon...
s += IntToString( m_year );
break;
case 3:
- if (m_hour < 10) s = _T("0"); else s = _T("");
+ if (m_hour < 10) s = wxT("0"); else s = wxT("");
s += IntToString( m_hour );
- s += _T(":");
- if (m_minute < 10) s += _T("0");
+ s += wxT(":");
+ if (m_minute < 10) s += wxT("0");
s += IntToString( m_minute );
break;
case 4:
s = m_permissions;
break;
default:
- s = _T("No entry");
+ s = wxT("No entry");
break;
}
return s;
}
item.m_data = (long)this;
}
-
+
//-----------------------------------------------------------------------------
// wxFileCtrl
//-----------------------------------------------------------------------------
wxFileCtrl::wxFileCtrl()
{
- m_dirName = _T("/");
+ m_dirName = wxT("/");
m_showHidden = FALSE;
}
-wxFileCtrl::wxFileCtrl( wxWindow *win, wxWindowID id,
+wxFileCtrl::wxFileCtrl( wxWindow *win, wxWindowID id,
const wxString &dirName, const wxString &wild,
const wxPoint &pos, const wxSize &size,
long style, const wxValidator &validator, const wxString &name ) :
wxImageList *imageList = new wxImageList( 16, 16 );
imageList->Add( wxBitmap( folder_xpm ) );
SetImageList( imageList, wxIMAGE_LIST_SMALL );
-
+
m_dirName = dirName;
m_wild = wild;
m_showHidden = FALSE;
Update();
}
-int ListCompare( const long data1, const long data2, const long WXUNUSED(data) )
-{
- wxFileData *fd1 = (wxFileData*)data1 ;
- wxFileData *fd2 = (wxFileData*)data2 ;
- if (fd1->GetName() == _T("..")) return -1;
- if (fd2->GetName() == _T("..")) return 1;
- if (fd1->IsDir() && !fd2->IsDir()) return -1;
- if (fd2->IsDir() && !fd1->IsDir()) return 1;
- return strcmp( fd1->GetName(), fd2->GetName() );
-}
-
long wxFileCtrl::Add( wxFileData *fd, wxListItem &item )
{
long ret = -1;
else if (my_style & wxLC_LIST)
{
ret = InsertItem( item );
- }
+ }
return ret;
}
void wxFileCtrl::Update()
-{
+{
ClearAll();
long my_style = GetWindowStyleFlag();
if (my_style & wxLC_REPORT)
{
- InsertColumn( 0, _("Name"), wxLIST_FORMAT_LEFT, 110 );
+ InsertColumn( 0, _("Name"), wxLIST_FORMAT_LEFT, 130 );
InsertColumn( 1, _("Size"), wxLIST_FORMAT_LEFT, 60 );
InsertColumn( 2, _("Date"), wxLIST_FORMAT_LEFT, 55 );
InsertColumn( 3, _("Time"), wxLIST_FORMAT_LEFT, 50 );
item.m_itemId = 0;
item.m_col = 0;
- if (m_dirName != _T("/"))
+ if (m_dirName != wxT("/"))
{
wxString p( wxPathOnly(m_dirName) );
- if (p.IsEmpty()) p = _T("/");
- fd = new wxFileData( _T(".."), p );
- Add( fd, item );
+ if (p.IsEmpty()) p = wxT("/");
+ fd = new wxFileData( wxT(".."), p );
+ Add( fd, item );
item.m_itemId++;
}
- wxString res = m_dirName + _T("/") + m_wild;
- wxString f( wxFindFirstFile( res.GetData(), 0 ) );
+ wxString res = m_dirName + wxT("/*");
+ wxString f( wxFindFirstFile( res.GetData(), wxDIR ) );
+ while (!f.IsEmpty())
+ {
+ res = wxFileNameFromPath( f );
+ fd = new wxFileData( res, f );
+ wxString s = fd->GetName();
+ if (m_showHidden || (s[0] != wxT('.')))
+ {
+ Add( fd, item );
+ item.m_itemId++;
+ }
+ f = wxFindNextFile();
+ }
+
+ res = m_dirName + wxT("/") + m_wild;
+ f = wxFindFirstFile( res.GetData(), wxFILE );
while (!f.IsEmpty())
{
res = wxFileNameFromPath( f );
fd = new wxFileData( res, f );
wxString s = fd->GetName();
- if (m_showHidden || (s[0] != _T('.')))
+ if (m_showHidden || (s[0] != wxT('.')))
{
- Add( fd, item );
+ Add( fd, item );
item.m_itemId++;
}
f = wxFindNextFile();
}
+
SortItems( ListCompare, 0 );
}
void wxFileCtrl::MakeDir()
{
- wxString new_name( _T("NewName") );
+ wxString new_name( wxT("NewName") );
wxString path( m_dirName );
- path += _T( "/" );
+ path += wxT("/");
path += new_name;
if (wxFileExists(path))
{
// try NewName0, NewName1 etc.
int i = 0;
- do {
+ do {
new_name = _("NewName");
- wxString num;
- num.Printf( _T("%d"), i );
- new_name += num;
-
+ wxString num;
+ num.Printf( wxT("%d"), i );
+ new_name += num;
+
path = m_dirName;
- path += _T("/");
+ path += wxT("/");
path += new_name;
- i++;
- } while (wxFileExists(path));
+ i++;
+ } while (wxFileExists(path));
}
-
+
wxLogNull log;
- if (!wxMkdir(path))
+ if (!wxMkdir(path))
{
wxMessageDialog dialog(this, _("Operation not permitted."), _("Error"), wxOK | wxICON_ERROR );
- dialog.ShowModal();
+ dialog.ShowModal();
return;
}
item.m_itemId = 0;
item.m_col = 0;
int id = Add( fd, item );
-
+
if (id != -1)
{
SortItems( ListCompare, 0 );
- id = FindItem( 0, (long)fd );
+ id = FindItem( 0, (long)fd );
EnsureVisible( id );
EditLabel( id );
}
void wxFileCtrl::GoToParentDir()
{
- if (m_dirName != _T("/"))
+ if (m_dirName != wxT("/"))
{
- wxString fname( wxFileNameFromPath(m_dirName) );
+ wxString fname( wxFileNameFromPath(m_dirName) );
m_dirName = wxPathOnly( m_dirName );
- if (m_dirName.IsEmpty()) m_dirName = _T("/");
+ if (m_dirName.IsEmpty()) m_dirName = wxT("/");
Update();
- int id = FindItem( 0, fname );
- if (id != -1)
- {
- SetItemState( id, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED );
- EnsureVisible( id );
- }
+ int id = FindItem( 0, fname );
+ if (id != -1)
+ {
+ SetItemState( id, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED );
+ EnsureVisible( id );
+ }
}
}
wxString s = wxGetUserHome( wxString() );
m_dirName = s;
Update();
+ SetItemState( 0, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED );
+ EnsureVisible( 0 );
}
void wxFileCtrl::GoToDir( const wxString &dir )
{
m_dirName = dir;
Update();
+ SetItemState( 0, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED );
+ EnsureVisible( 0 );
}
void wxFileCtrl::GetDir( wxString &dir )
{
wxFileData *fd = (wxFileData*)event.m_item.m_data;
wxASSERT( fd );
-
+
if ((event.GetLabel().IsEmpty()) ||
(event.GetLabel() == _(".")) ||
(event.GetLabel() == _("..")) ||
- (event.GetLabel().First( _T("/") ) != wxNOT_FOUND))
+ (event.GetLabel().First( wxT("/") ) != wxNOT_FOUND))
{
wxMessageDialog dialog(this, _("Illegal directory name."), _("Error"), wxOK | wxICON_ERROR );
- dialog.ShowModal();
+ dialog.ShowModal();
event.Veto();
- return;
+ return;
}
-
+
wxString new_name( wxPathOnly( fd->GetFullName() ) );
- new_name += _T("/");
+ new_name += wxT("/");
new_name += event.GetLabel();
-
+
wxLogNull log;
-
+
if (wxFileExists(new_name))
{
wxMessageDialog dialog(this, _("File name exists already."), _("Error"), wxOK | wxICON_ERROR );
- dialog.ShowModal();
+ dialog.ShowModal();
event.Veto();
}
-
+
if (wxRenameFile(fd->GetFullName(),new_name))
{
fd->SetNewName( new_name, event.GetLabel() );
- SetItemState( event.GetItem(), wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED );
+ SetItemState( event.GetItem(), wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED );
EnsureVisible( event.GetItem() );
}
else
{
wxMessageDialog dialog(this, _("Operation not permitted."), _("Error"), wxOK | wxICON_ERROR );
- dialog.ShowModal();
+ dialog.ShowModal();
event.Veto();
}
}
// wxFileDialog
//-----------------------------------------------------------------------------
-#define ID_LIST_CTRL 5010
-#define ID_LIST_MODE 5000
-#define ID_REPORT_MODE 5001
-#define ID_UP_DIR 5005
-#define ID_PARENT_DIR 5006
-#define ID_NEW_DIR 5007
+#define ID_LIST_MODE wxID_FILEDLGG
+#define ID_REPORT_MODE wxID_FILEDLGG + 1
+#define ID_UP_DIR wxID_FILEDLGG + 5
+#define ID_PARENT_DIR wxID_FILEDLGG + 6
+#define ID_NEW_DIR wxID_FILEDLGG + 7
+#define ID_CHOICE wxID_FILEDLGG + 8
+#define ID_TEXT wxID_FILEDLGG + 9
+#define ID_LIST_CTRL wxID_FILEDLGG + 10
+#define ID_ACTIVATED wxID_FILEDLGG + 11
IMPLEMENT_DYNAMIC_CLASS(wxFileDialog,wxDialog)
EVT_BUTTON(ID_NEW_DIR, wxFileDialog::OnNew)
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_LIST_ITEM_ACTIVATED(ID_LIST_CTRL, wxFileDialog::OnActivated)
+ EVT_CHOICE(ID_CHOICE,wxFileDialog::OnChoice)
+ EVT_TEXT_ENTER(ID_TEXT,wxFileDialog::OnTextEnter)
END_EVENT_TABLE()
wxFileDialog::wxFileDialog(wxWindow *parent,
const wxString& wildCard,
long style,
const wxPoint& pos ) :
- wxDialog( parent, -1, message )
+ wxDialog( parent, -1, message, pos, wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER )
{
wxBeginBusyCursor();
-
+
m_message = message;
m_dialogStyle = style;
m_dir = defaultDir;
- if (m_dir.IsEmpty()) m_dir = wxGetUserHome();
+ if (m_dir.IsEmpty())
+ {
+ char buf[200];
+ m_dir = getcwd( buf, sizeof(buf) );
+ }
m_path = defaultDir;
- m_path += _T("/");
+ m_path += wxT("/");
m_path += defaultFile;
m_fileName = defaultFile;
m_wildCard = wildCard;
m_filterIndex = 0;
-
+
+ // interpret wildcards
+
+ if (m_wildCard.IsEmpty())
+ m_wildCard = _("All files (*)|*");
+
+ wxStringTokenizer tokens( m_wildCard, wxT("|") );
+ wxString firstWild;
+ wxString firstWildText;
+ if (tokens.CountTokens() == 1)
+ {
+ firstWildText = tokens.GetNextToken();
+ firstWild = firstWildText;
+ }
+ else
+ {
+ wxASSERT_MSG( tokens.CountTokens() % 2 == 0, wxT("Wrong file type descripition") );
+ firstWildText = tokens.GetNextToken();
+ firstWild = tokens.GetNextToken();
+ }
+
+ // layout
+
wxBoxSizer *mainsizer = new wxBoxSizer( wxVERTICAL );
-
+
wxBoxSizer *buttonsizer = new wxBoxSizer( wxHORIZONTAL );
-
- buttonsizer->Add( new wxBitmapButton( this, ID_LIST_MODE, wxBitmap( listview_xpm ) ), 0, wxALL, 5 );
- buttonsizer->Add( new wxBitmapButton( this, ID_REPORT_MODE, wxBitmap( repview_xpm ) ), 0, wxALL, 5 );
+
+ wxBitmapButton *but;
+
+ but = new wxBitmapButton( this, ID_LIST_MODE, wxBitmap( listview_xpm ) );
+#if wxUSE_TOOLTIPS
+ but->SetToolTip( _("View files as a list view") );
+#endif
+ buttonsizer->Add( but, 0, wxALL, 5 );
+
+ but = new wxBitmapButton( this, ID_REPORT_MODE, wxBitmap( repview_xpm ) );
+#if wxUSE_TOOLTIPS
+ but->SetToolTip( _("View files as a detailed view") );
+#endif
+ buttonsizer->Add( but, 0, wxALL, 5 );
+
buttonsizer->Add( 30, 5, 1 );
- buttonsizer->Add( new wxButton( this, ID_UP_DIR, "Up" ), 0, wxALL, 5 );
- buttonsizer->Add( new wxBitmapButton( this, ID_PARENT_DIR, wxBitmap(home_xpm) ), 0, wxALL, 5 );
- buttonsizer->Add( new wxButton( this, ID_NEW_DIR, "New..." ), 0, wxALL, 5 );
+
+ but = new wxBitmapButton( this, ID_UP_DIR, wxBitmap( dir_up_xpm ) );
+#if wxUSE_TOOLTIPS
+ but->SetToolTip( _("Go to parent directory") );
+#endif
+ buttonsizer->Add( but, 0, wxALL, 5 );
+
+ but = new wxBitmapButton( this, ID_PARENT_DIR, wxBitmap(home_xpm) );
+#if wxUSE_TOOLTIPS
+ but->SetToolTip( _("Go to home directory") );
+#endif
+ buttonsizer->Add( but, 0, wxALL, 5);
+
+ buttonsizer->Add( 20, 20 );
+
+ but = new wxBitmapButton( this, ID_NEW_DIR, wxBitmap(new_dir_xpm) );
+#if wxUSE_TOOLTIPS
+ but->SetToolTip( _("Create new directory") );
+#endif
+ buttonsizer->Add( but, 0, wxALL, 5 );
+
mainsizer->Add( buttonsizer, 0, wxALL | wxEXPAND, 5 );
-
- m_list = new wxFileCtrl( this, ID_LIST_CTRL, m_dir, "*", wxDefaultPosition, wxSize(450,180),
+
+ wxBoxSizer *staticsizer = new wxBoxSizer( wxHORIZONTAL );
+ 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 );
+
+ m_list = new wxFileCtrl( this, ID_LIST_CTRL, m_dir, firstWild, wxDefaultPosition, wxSize(440,180),
wxLC_LIST | wxSUNKEN_BORDER | wxLC_SINGLE_SEL );
mainsizer->Add( m_list, 1, wxEXPAND | wxLEFT|wxRIGHT, 10 );
-
+
wxBoxSizer *textsizer = new wxBoxSizer( wxHORIZONTAL );
- m_text = new wxTextCtrl( this, -1, m_fileName );
+ m_text = new wxTextCtrl( this, ID_TEXT, m_fileName, wxDefaultPosition, wxDefaultSize, wxPROCESS_ENTER );
textsizer->Add( m_text, 1, wxCENTER | wxLEFT|wxRIGHT|wxTOP, 10 );
textsizer->Add( new wxButton( this, wxID_OK, _("OK") ), 0, wxCENTER | wxLEFT|wxRIGHT|wxTOP, 10 );
mainsizer->Add( textsizer, 0, wxEXPAND );
wxBoxSizer *choicesizer = new wxBoxSizer( wxHORIZONTAL );
- m_choice = new wxChoice( this, -1 );
- m_choice->Append( "*.txt" );
+ m_choice = new wxChoice( this, ID_CHOICE );
choicesizer->Add( m_choice, 1, wxCENTER|wxALL, 10 );
choicesizer->Add( new wxButton( this, wxID_CANCEL, _("Cancel") ), 0, wxCENTER | wxALL, 10 );
mainsizer->Add( choicesizer, 0, wxEXPAND );
+ m_choice->Append( firstWildText, (void*) new wxString( firstWild ) );
+ while (tokens.HasMoreTokens())
+ {
+ firstWildText = tokens.GetNextToken();
+ firstWild = tokens.GetNextToken();
+ m_choice->Append( firstWildText, (void*) new wxString( firstWild ) );
+ }
+ m_choice->SetSelection( 0 );
+
SetAutoLayout( TRUE );
SetSizer( mainsizer );
-
+
mainsizer->Fit( this );
mainsizer->SetSizeHints( this );
-
+
Centre( wxBOTH );
-
- m_list->SetFocus();
-
+
+ if (m_fileName.IsEmpty())
+ m_list->SetFocus();
+ else
+ m_text->SetFocus();
+
wxEndBusyCursor();
}
-void wxFileDialog::OnActivated( wxListEvent &WXUNUSED(event) )
+wxFileDialog::~wxFileDialog()
+{
+}
+
+void wxFileDialog::OnChoice( wxCommandEvent &event )
+{
+ wxString *str = (wxString*) m_choice->GetClientData( event.GetInt() );
+ m_list->SetWild( *str );
+}
+
+void wxFileDialog::OnActivated( wxListEvent &event )
+{
+ HandleAction( event.m_item.m_text );
+}
+
+void wxFileDialog::OnTextEnter( wxCommandEvent &WXUNUSED(event) )
{
wxCommandEvent cevent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_OK);
cevent.SetEventObject( this );
void wxFileDialog::OnSelected( wxListEvent &event )
{
- m_text->SetValue( event.m_item.m_text );
+ if (FindFocus() != m_list) return;
+
+ wxString filename( event.m_item.m_text );
+ if (filename == wxT("..")) return;
+
+ wxString dir;
+ m_list->GetDir( dir );
+ if (dir != wxT("/")) dir += wxT("/");
+ dir += filename;
+ if (wxDirExists(dir)) return;
+
+ m_text->SetValue( filename );
}
-void wxFileDialog::OnListOk( wxCommandEvent &event )
+void wxFileDialog::HandleAction( const wxString &fn )
{
- wxString filename( m_text->GetValue() );
+ wxString filename( fn );
wxString dir;
m_list->GetDir( dir );
if (filename.IsEmpty()) return;
-
- if (filename == _T(".."))
+ if (filename == wxT(".")) return;
+
+ if (filename == wxT(".."))
{
m_list->GoToParentDir();
m_list->SetFocus();
- return;
+ m_list->GetDir( dir );
+ m_static->SetLabel( dir );
+ return;
+ }
+
+ if (filename == wxT("~"))
+ {
+ m_list->GoToHomeDir();
+ m_list->SetFocus();
+ m_list->GetDir( dir );
+ m_static->SetLabel( dir );
+ return;
+ }
+
+ if (filename[0] == wxT('~'))
+ {
+ filename.Remove( 0, 1 );
+ wxString tmp( wxGetUserHome() );
+ tmp += wxT('/');
+ tmp += filename;
+ filename = tmp;
+ }
+
+ if ((filename.Find(wxT('*')) != wxNOT_FOUND) ||
+ (filename.Find(wxT('?')) != wxNOT_FOUND))
+ {
+ if (filename.Find(wxT('/')) != wxNOT_FOUND)
+ {
+ wxMessageBox(_("Illegal file specification."), _("Error"), wxOK | wxICON_ERROR );
+ return;
+ }
+ m_list->SetWild( filename );
+ return;
+ }
+
+ if (dir != wxT("/")) dir += wxT("/");
+ if (filename[0] != wxT('/'))
+ {
+ dir += filename;
+ filename = dir;
}
- if (dir != _T("/")) dir += _T("/");
- dir += filename;
- filename = dir;
-
if (wxDirExists(filename))
{
m_list->GoToDir( filename );
- m_text->SetValue( _T("") );
- return;
+ m_list->GetDir( dir );
+ m_static->SetLabel( dir );
+ return;
}
-
+
if ( (m_dialogStyle & wxSAVE) && (m_dialogStyle & wxOVERWRITE_PROMPT) )
{
if (wxFileExists( filename ))
{
if ( !wxFileExists( filename ) )
{
- wxMessageBox(_("Please choose an existing file."), _("Error"), wxOK);
-
+ wxMessageBox(_("Please choose an existing file."), _("Error"), wxOK | wxICON_ERROR );
return;
}
}
SetPath( filename );
- event.Skip();
+
+ wxCommandEvent event;
+ wxDialog::OnOK(event);
+}
+
+void wxFileDialog::OnListOk( wxCommandEvent &WXUNUSED(event) )
+{
+ HandleAction( m_text->GetValue() );
}
void wxFileDialog::OnList( wxCommandEvent &WXUNUSED(event) )
{
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 );
}
void wxFileDialog::OnNew( wxCommandEvent &WXUNUSED(event) )
{
wxString ext;
wxSplitPath(path, &m_dir, &m_fileName, &ext);
- if (!ext.IsEmpty())
- {
- m_fileName += _T(".");
+ if (!ext.IsEmpty())
+ {
+ m_fileName += wxT(".");
m_fileName += ext;
- }
+ }
}
}
-
+
// ----------------------------------------------------------------------------
// global functions
// ----------------------------------------------------------------------------
wxFileSelectorEx(const wxChar *message,
const wxChar *default_path,
const wxChar *default_filename,
- int *indexDefaultExtension,
+ int *WXUNUSED(indexDefaultExtension),
const wxChar *wildcard,
int flags,
wxWindow *parent,
int x, int y)
{
// TODO: implement this somehow
- return wxFileSelector(message, default_path, default_filename, _T(""),
+ return wxFileSelector(message, default_path, default_filename, wxT(""),
wildcard, flags, parent, x, y);
}
{
wxString filter2;
if ( defaultExtension && !filter )
- filter2 = wxString(_T("*.")) + wxString(defaultExtension) ;
+ filter2 = wxString(wxT("*.")) + wxString(defaultExtension) ;
else if ( filter )
filter2 = filter;
wxString str = _("Load %s file");
wxSprintf(prompt, str, what);
- if (*ext == _T('.')) ext++;
+ if (*ext == wxT('.')) ext++;
wxChar wild[60];
- wxSprintf(wild, _T("*.%s"), ext);
+ wxSprintf(wild, wxT("*.%s"), ext);
return wxFileSelector (prompt, (const wxChar *) NULL, default_name, ext, wild, 0, parent);
}
wxString str = _("Save %s file");
wxSprintf(prompt, str, what);
- if (*ext == _T('.')) ext++;
+ if (*ext == wxT('.')) ext++;
wxChar wild[60];
- wxSprintf(wild, _T("*.%s"), ext);
+ wxSprintf(wild, wxT("*.%s"), ext);
return wxFileSelector (prompt, (const wxChar *) NULL, default_name, ext, wild, 0, parent);
}
projects / wxWidgets.git / blobdiff