// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
#ifdef __GNUG__
#pragma implementation "filedlgg.h"
#endif
#include <direct.h>
#endif
-# include <time.h>
+#include <time.h>
#include <unistd.h>
+// ----------------------------------------------------------------------------
+// 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
//-----------------------------------------------------------------------------
-class wxFileData : public wxObject
+class wxFileData
{
public:
- wxFileData() { }
wxFileData( const wxString &name, const wxString &fname );
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 );
bool m_isDir;
bool m_isLink;
bool m_isExe;
-
- DECLARE_DYNAMIC_CLASS(wxFileData);
};
//-----------------------------------------------------------------------------
wxFileCtrl();
wxFileCtrl( wxWindow *win,
wxWindowID id,
- const wxString &dirName,
const wxString &wild,
+ bool showHidden,
const wxPoint &pos = wxDefaultPosition,
const wxSize &size = wxDefaultSize,
long style = wxLC_LIST,
const wxValidator &validator = wxDefaultValidator,
const wxString &name = wxT("filelist") );
+ virtual ~wxFileCtrl();
+
void ChangeToListMode();
void ChangeToReportMode();
void ChangeToIconMode();
void SetWild( const wxString &wild );
void GetDir( wxString &dir );
void OnListDeleteItem( wxListEvent &event );
- void OnListDeleteAllItems( wxListEvent &event );
void OnListEndLabelEdit( wxListEvent &event );
-
+
// Associate commonly used UI controls with wxFileCtrl so that they can be
// disabled when they cannot be used (e.g. can't go to parent directory
// if wxFileCtrl already is in the root dir):
void SetNewDirControl(wxWindow *ctrl) { m_newDirControl = ctrl; }
private:
+ void FreeItemData(const wxListItem& item);
+ void FreeAllItemsData();
+
wxString m_dirName;
bool m_showHidden;
wxString m_wild;
-
+
wxWindow *m_goToParentControl;
wxWindow *m_newDirControl;
// FI_FOLDER:
m_ImageList.Add(wxArtProvider::GetBitmap(wxART_FOLDER, wxART_CMN_DIALOG));
// FI_UNKNOWN:
- m_ImageList.Add(wxArtProvider::GetBitmap(wxART_NORMAL_FILE, wxART_CMN_DIALOG));
+ m_ImageList.Add(wxArtProvider::GetBitmap(wxART_NORMAL_FILE, wxART_CMN_DIALOG));
// FI_EXECUTABLE:
if (GetIconID(wxEmptyString, _T("application/x-executable")) == FI_UNKNOWN)
{
// wxFileData
//-----------------------------------------------------------------------------
-IMPLEMENT_DYNAMIC_CLASS(wxFileData,wxObject);
-
wxFileData::wxFileData( const wxString &name, const wxString &fname )
{
m_name = name;
m_fileName = fname;
-
+
#if defined(__DOS__) || defined(__WINDOWS__)
// VS: In case the file is root directory of a volume (e.g. "C:"),
// we don't want it stat()ed, since the drive may not be in:
}
#endif
- struct stat buff;
- wxStat( m_fileName.fn_str(), &buff );
+ wxStructStat buff;
+ wxStat( m_fileName, &buff );
#if defined(__UNIX__) && (!defined( __EMX__ ) && !defined(__VMS))
struct stat lbuff;
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('-')) );
+ char buffer[10];
+ sprintf( buffer, "%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' : '-') );
+#if wxUSE_UNICODE
+ m_permissions = wxConvUTF8.cMB2WC( buffer );
+#else
+ m_permissions = buffer;
+#endif
+
+// 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
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
//-----------------------------------------------------------------------------
-IMPLEMENT_DYNAMIC_CLASS(wxFileCtrl,wxListCtrl);
+IMPLEMENT_DYNAMIC_CLASS(wxFileCtrl,wxListCtrl)
BEGIN_EVENT_TABLE(wxFileCtrl,wxListCtrl)
EVT_LIST_DELETE_ITEM(-1, wxFileCtrl::OnListDeleteItem)
- EVT_LIST_DELETE_ALL_ITEMS(-1, wxFileCtrl::OnListDeleteAllItems)
EVT_LIST_END_LABEL_EDIT(-1, wxFileCtrl::OnListEndLabelEdit)
END_EVENT_TABLE()
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,
+ 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)
+ if (! g_IconsTable)
g_IconsTable = new wxFileIconsTable;
wxImageList *imageList = g_IconsTable->GetImageList();
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_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()
{
wxBusyCursor bcur; // this may take a while...
-
+
long my_style = GetWindowStyleFlag();
int name_col_width = 0;
if (my_style & wxLC_REPORT)
name_col_width = GetColumnWidth( 0 );
}
+ FreeAllItemsData();
ClearAll();
+
if (my_style & wxLC_REPORT)
{
if (name_col_width < 140) name_col_width = 140;
#if defined(__DOS__) || defined(__WINDOWS__)
if ( IsTopMostDir(m_dirName) )
- {
+ {
// Pseudo-directory with all available drives listed...
for (int drive = 1; drive <= 26; drive++)
{
{
wxString dirPrefix(dirname + wxFILE_SEP_PATH);
int hiddenFlag = m_showHidden ? wxDIR_HIDDEN : 0;
-
+
bool cont;
wxString f;
cont = dir.GetNext(&f);
}
- // Tokenize the wildcard string, so we can handle more than 1
+ // Tokenize the wildcard string, so we can handle more than 1
// search pattern in a wildcard.
wxStringTokenizer tokenWild(m_wild, wxT(";"));
while ( tokenWild.HasMoreTokens() )
{
- cont = dir.GetFirst(&f, tokenWild.GetNextToken(),
+ cont = dir.GetFirst(&f, tokenWild.GetNextToken(),
wxDIR_FILES | hiddenFlag);
while (cont)
{
SetColumnWidth(2, wxLIST_AUTOSIZE);
SetColumnWidth(3, wxLIST_AUTOSIZE);
}
-
+
// Finally, enable/disable context-dependent controls:
if ( m_goToParentControl )
m_goToParentControl->Enable(!IsTopMostDir(m_dirName));
wxString fname( wxFileNameFromPath(m_dirName) );
m_dirName = wxPathOnly( m_dirName );
#ifdef __UNIX__
- if (m_dirName.IsEmpty())
+ if (m_dirName.IsEmpty())
m_dirName = wxT("/");
#endif
UpdateFiles();
dir = m_dirName;
}
-void wxFileCtrl::OnListDeleteItem( wxListEvent &event )
+void wxFileCtrl::FreeItemData(const wxListItem& item)
{
- wxFileData *fd = (wxFileData*)event.m_item.m_data;
+ wxFileData *fd = (wxFileData*)item.m_data;
delete fd;
}
-void wxFileCtrl::OnListDeleteAllItems( wxListEvent &WXUNUSED(event) )
+void wxFileCtrl::OnListDeleteItem( wxListEvent &event )
+{
+ FreeItemData(event.m_item);
+}
+
+void wxFileCtrl::FreeAllItemsData()
{
wxListItem item;
item.m_mask = wxLIST_MASK_DATA;
while ( item.m_itemId != -1 )
{
GetItem( item );
- wxFileData *fd = (wxFileData*)item.m_data;
- delete fd;
- item.m_data = 0;
- SetItem( item );
+ FreeItemData(item);
item.m_itemId = GetNextItem( item.m_itemId, wxLIST_NEXT_ALL );
}
}
}
}
+wxFileCtrl::~wxFileCtrl()
+{
+ FreeAllItemsData();
+}
+
//-----------------------------------------------------------------------------
// wxFileDialog
//-----------------------------------------------------------------------------
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);
- wxConfig::Get()->Read(wxT("/wxWindows/wxFileDialog/ShowHidden"),
- &s_lastShowHidden);
+ wxConfig::Get()->Read(wxT("/wxWindows/wxFileDialog/ViewStyle"),
+ &ms_lastViewStyle);
+ wxConfig::Get()->Read(wxT("/wxWindows/wxFileDialog/ShowHidden"),
+ &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;
{
m_dir = wxGetCwd();
}
-
+
size_t len = m_dir.Len();
if ((len > 1) && (m_dir[len-1] == wxFILE_SEP_PATH))
m_dir.Remove( len-1, 1 );
wxBitmapButton *but;
- but = new wxBitmapButton(this, ID_LIST_MODE,
+ but = new wxBitmapButton(this, ID_LIST_MODE,
wxArtProvider::GetBitmap(wxART_LIST_VIEW, wxART_CMN_DIALOG));
#if wxUSE_TOOLTIPS
but->SetToolTip( _("View files as a list view") );
buttonsizer->Add( 30, 5, 1 );
- wxWindow *butDirUp =
+ wxWindow *butDirUp =
new wxBitmapButton(this, ID_UP_DIR,
wxArtProvider::GetBitmap(wxART_GO_DIR_UP, wxART_CMN_DIALOG));
#if wxUSE_TOOLTIPS
buttonsizer->Add( 20, 20 );
#endif //!__DOS__
- wxWindow *butNewDir =
+ wxWindow *butNewDir =
new wxBitmapButton(this, ID_NEW_DIR,
wxArtProvider::GetBitmap(wxART_NEW_DIR, wxART_CMN_DIALOG));
#if wxUSE_TOOLTIPS
#endif
buttonsizer->Add( butNewDir, 0, wxALL, 5 );
- mainsizer->Add( buttonsizer, 0, wxALL | wxEXPAND, 5 );
+ if (wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA)
+ mainsizer->Add( buttonsizer, 0, wxALL | wxEXPAND, 0 );
+ else
+ mainsizer->Add( buttonsizer, 0, wxALL | wxEXPAND, 5 );
wxBoxSizer *staticsizer = new wxBoxSizer( wxHORIZONTAL );
- staticsizer->Add( new wxStaticText( this, -1, _("Current directory:") ), 0, wxRIGHT, 10 );
+ if (wxSystemSettings::GetScreenType() > wxSYS_SCREEN_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, ID_LIST_CTRL, firstWild, ms_lastShowHidden,
+ wxDefaultPosition, wxSize(540,200),
+ style2);
+
m_list->SetNewDirControl(butNewDir);
m_list->SetGoToParentControl(butDirUp);
-
- mainsizer->Add( m_list, 1, wxEXPAND | wxLEFT|wxRIGHT, 10 );
-
- wxBoxSizer *textsizer = new wxBoxSizer( wxHORIZONTAL );
- 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, 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 );
- 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 );
+
+ if (wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA)
+ {
+ // PDAs have a different screen layout
+ mainsizer->Add( m_list, 1, wxEXPAND | wxLEFT|wxRIGHT, 5 );
+
+ wxBoxSizer *choicesizer = new wxBoxSizer( wxHORIZONTAL );
+ m_choice = new wxChoice( this, ID_CHOICE );
+ choicesizer->Add( m_choice, 1, wxCENTER|wxALL, 5 );
+ mainsizer->Add( choicesizer, 0, wxEXPAND );
+
+ wxBoxSizer *textsizer = new wxBoxSizer( wxHORIZONTAL );
+ m_text = new wxTextCtrl( this, ID_TEXT, m_fileName, wxDefaultPosition, wxDefaultSize, wxPROCESS_ENTER );
+ textsizer->Add( m_text, 1, wxCENTER | wxALL, 5 );
+ mainsizer->Add( textsizer, 0, wxEXPAND );
+
+ m_check = new wxCheckBox( this, ID_CHECK, _("Show hidden files") );
+ m_check->SetValue( ms_lastShowHidden );
+ textsizer->Add( m_check, 0, wxCENTER|wxALL, 5 );
+
+ buttonsizer = new wxBoxSizer( wxHORIZONTAL );
+ buttonsizer->Add( new wxButton( this, wxID_OK, _("OK") ), 0, wxCENTER | wxALL, 5 );
+ buttonsizer->Add( new wxButton( this, wxID_CANCEL, _("Cancel") ), 0, wxCENTER | wxALL, 5 );
+ mainsizer->Add( buttonsizer, 0, wxALIGN_RIGHT );
+ }
+ else
+ {
+ mainsizer->Add( m_list, 1, wxEXPAND | wxLEFT|wxRIGHT, 10 );
+
+ wxBoxSizer *textsizer = new wxBoxSizer( wxHORIZONTAL );
+ 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, ID_CHOICE );
+ choicesizer->Add( m_choice, 1, wxCENTER|wxALL, 10 );
+ m_check = new wxCheckBox( this, ID_CHECK, _("Show hidden files") );
+ 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 );
+ }
m_choice->Append( firstWildText, (void*) new wxString( firstWild ) );
while (tokens.HasMoreTokens())
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);
}
}
+int wxFileDialog::ShowModal()
+{
+ m_list->GoToDir(m_dir);
+
+ return wxDialog::ShowModal();
+}
+
+void wxFileDialog::SetFilterIndex( int filterindex )
+{
+ m_choice->SetSelection( filterindex );
+ wxCommandEvent event;
+ event.SetInt( filterindex );
+ OnChoice( event );
+}
+
void wxFileDialog::OnChoice( wxCommandEvent &event )
{
int index = (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 )
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();
}
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;
wxString dir;
m_list->GetDir( dir );
#ifdef __UNIX__
- if (dir != wxT("/"))
+ if (dir != wxT("/"))
#endif
dir += wxFILE_SEP_PATH;
}
}
-wxString wxLoadFileSelector( const wxChar *what, const wxChar *ext, const wxChar *default_name, wxWindow *parent )
+static wxString GetWildcardString(const wxChar *ext)
{
- wxString prompt = wxString::Format(_("Load %s file"), what);
-
- if (*ext == wxT('.'))
- ext++;
+ wxString wild;
+ if ( ext )
+ {
+ if ( *ext == wxT('.') )
+ ext++;
- wxString wild = wxString::Format(_T("*.%s"), ext);
+ wild << _T("*.") << ext;
+ }
+ else // no extension specified
+ {
+ wild = wxFileSelectorDefaultWildcardStr;
+ }
- return wxFileSelector(prompt, (const wxChar *) NULL, default_name,
- ext, wild, 0, parent);
+ return wild;
}
-wxString wxSaveFileSelector(const wxChar *what, const wxChar *extension, const wxChar *default_name,
- wxWindow *parent )
+wxString wxLoadFileSelector(const wxChar *what,
+ const wxChar *ext,
+ const wxChar *nameDef,
+ wxWindow *parent)
{
- wxChar *ext = (wxChar *)extension;
-
- wxString prompt = wxString::Format(_("Save %s file"), what);
-
- if (*ext == wxT('.'))
- ext++;
-
- wxString wild = wxString::Format(_T("*.%s"), ext);
+ wxString prompt;
+ if ( what && *what )
+ prompt = wxString::Format(_("Load %s file"), what);
+ else
+ prompt = _("Load file");
- return wxFileSelector(prompt, (const wxChar *) NULL, default_name,
- ext, wild, 0, parent);
+ return wxFileSelector(prompt, NULL, nameDef, ext,
+ GetWildcardString(ext), 0, parent);
}
+wxString wxSaveFileSelector(const wxChar *what,
+ const wxChar *ext,
+ const wxChar *nameDef,
+ wxWindow *parent)
+{
+ wxString prompt;
+ if ( what && *what )
+ prompt = wxString::Format(_("Save %s file"), what);
+ else
+ prompt = _("Save file");
-
-
-
+ return wxFileSelector(prompt, NULL, nameDef, ext,
+ GetWildcardString(ext), 0, parent);
+}
// A module to allow icons table cleanup
IMPLEMENT_DYNAMIC_CLASS(wxFileDialogGenericModule, wxModule)
#endif // wxUSE_FILEDLG
+
projects / wxWidgets.git / blobdiff