// Created: 12/12/98
// RCS-ID: $Id$
// Copyright: (c) Robert Roebling
-// Licence: wxWindows licence
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__
#pragma hdrstop
#endif
+#if wxUSE_FILEDLG
+
#ifndef __UNIX__
#error wxFileDialog currently only supports unix
#endif
+#include "wx/checkbox.h"
+#include "wx/textctrl.h"
+#include "wx/choice.h"
+#include "wx/checkbox.h"
+#include "wx/stattext.h"
#include "wx/filedlg.h"
#include "wx/debug.h"
#include "wx/log.h"
#include "wx/intl.h"
+#include "wx/listctrl.h"
#include "wx/msgdlg.h"
#include "wx/sizer.h"
#include "wx/bmpbuttn.h"
+#include "wx/tokenzr.h"
+#include "wx/mimetype.h"
+#include "wx/image.h"
+#include "wx/module.h"
+#include "wx/config.h"
+#include "wx/imaglist.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 <sys/types.h>
+#include <sys/stat.h>
+#include <dirent.h>
+#include <pwd.h>
+#ifndef __VMS
+# include <grp.h>
+#endif
+# 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"
+#include "wx/generic/folder.xpm"
+#include "wx/generic/deffile.xpm"
+#include "wx/generic/exefile.xpm"
+
+//-----------------------------------------------------------------------------
+// wxFileData
+//-----------------------------------------------------------------------------
-/* 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",
-/* pixels */
-" ",
-" @@@@@ ",
-" @#+#+#@ ",
-" @#+#+#+#@@@@@@ ",
-" @$$$$$$$$$$$$@.",
-" @$#+#+#+#+#+#@.",
-" @$+#+#+#+#+#+@.",
-" @$#+#+#+#+#+#@.",
-" @$+#+#+#+#+#+@.",
-" @$#+#+#+#+#+#@.",
-" @$+#+#+#+#+#+@.",
-" @$#+#+#+#+#+#@.",
-" @@@@@@@@@@@@@@.",
-" ..............",
-" ",
-" "};
+class wxFileData : public wxObject
+{
+private:
+ wxString m_name;
+ wxString m_fileName;
+ long m_size;
+ int m_hour;
+ int m_minute;
+ int m_year;
+ int m_month;
+ int m_day;
+ wxString m_permissions;
+ bool m_isDir;
+ bool m_isLink;
+ bool m_isExe;
+
+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();
+ void MakeItem( wxListItem &item );
+ void SetNewName( const wxString &name, const wxString &fname );
+
+private:
+ DECLARE_DYNAMIC_CLASS(wxFileData);
+};
+
+//-----------------------------------------------------------------------------
+// wxFileCtrl
+//-----------------------------------------------------------------------------
+
+class wxFileCtrl : public wxListCtrl
+{
+private:
+ wxString m_dirName;
+ bool m_showHidden;
+ wxString m_wild;
+
+public:
+ wxFileCtrl();
+ wxFileCtrl( wxWindow *win,
+ wxWindowID id,
+ const wxString &dirName,
+ const wxString &wild,
+ const wxPoint &pos = wxDefaultPosition,
+ const wxSize &size = wxDefaultSize,
+ long style = wxLC_LIST,
+ const wxValidator &validator = wxDefaultValidator,
+ const wxString &name = wxT("filelist") );
+ void ChangeToListMode();
+ void ChangeToReportMode();
+ void ChangeToIconMode();
+ void ShowHidden( bool show = TRUE );
+ long Add( wxFileData *fd, wxListItem &item );
+ void Update();
+ virtual void StatusbarText( wxChar *WXUNUSED(text) ) {};
+ void MakeDir();
+ void GoToParentDir();
+ void GoToHomeDir();
+ void GoToDir( const wxString &dir );
+ void SetWild( const wxString &wild );
+ void GetDir( wxString &dir );
+ void OnListDeleteItem( wxListEvent &event );
+ void OnListDeleteAllItems( wxListEvent &event );
+ void OnListEndLabelEdit( wxListEvent &event );
+
+private:
+ DECLARE_DYNAMIC_CLASS(wxFileCtrl);
+ DECLARE_EVENT_TABLE()
+};
+
+// ----------------------------------------------------------------------------
+// private classes - icons list management
+// ----------------------------------------------------------------------------
+
+class wxFileIconEntry : public wxObject
+{
+public:
+ wxFileIconEntry(int i) { id = i; }
+
+ int id;
+};
+
+
+class wxFileIconsTable
+{
+public:
+ wxFileIconsTable();
+
+ int GetIconID(const wxString& extension, const wxString& mime = wxEmptyString);
+ wxImageList *GetImageList() { return &m_ImageList; }
+
+protected:
+ wxImageList m_ImageList;
+ wxHashTable m_HashTable;
+};
+
+static wxFileIconsTable *g_IconsTable = NULL;
+
+#define FI_FOLDER 0
+#define FI_UNKNOWN 1
+#define FI_EXECUTABLE 2
+
+wxFileIconsTable::wxFileIconsTable() :
+ m_ImageList(16, 16),
+ m_HashTable(wxKEY_STRING)
+{
+ m_HashTable.DeleteContents(TRUE);
+ m_ImageList.Add(wxBitmap(folder_xpm)); // FI_FOLDER
+ m_ImageList.Add(wxBitmap(deffile_xpm)); // FI_UNKNOWN
+ if (GetIconID(wxEmptyString, _T("application/x-executable")) == FI_UNKNOWN)
+ { // FI_EXECUTABLE
+ m_ImageList.Add(wxBitmap(exefile_xpm));
+ m_HashTable.Delete(_T("exe"));
+ m_HashTable.Put(_T("exe"), new wxFileIconEntry(FI_EXECUTABLE));
+ }
+ /* else put into list by GetIconID
+ (KDE defines application/x-executable for *.exe and has nice icon)
+ */
+}
+
+
+
+static wxBitmap CreateAntialiasedBitmap(const wxImage& img)
+{
+ wxImage small(16, 16);
+ unsigned char *p1, *p2, *ps;
+ unsigned char mr = img.GetMaskRed(),
+ mg = img.GetMaskGreen(),
+ mb = img.GetMaskBlue();
+
+ unsigned x, y;
+ unsigned sr, sg, sb, smask;
+
+ p1 = img.GetData(), p2 = img.GetData() + 3 * 32, ps = small.GetData();
+ small.SetMaskColour(mr, mr, mr);
+
+ for (y = 0; y < 16; y++)
+ {
+ for (x = 0; x < 16; x++)
+ {
+ sr = sg = sb = smask = 0;
+ if (p1[0] != mr || p1[1] != mg || p1[2] != mb)
+ sr += p1[0], sg += p1[1], sb += p1[2];
+ else smask++;
+ p1 += 3;
+ if (p1[0] != mr || p1[1] != mg || p1[2] != mb)
+ sr += p1[0], sg += p1[1], sb += p1[2];
+ else smask++;
+ p1 += 3;
+ if (p2[0] != mr || p2[1] != mg || p2[2] != mb)
+ sr += p2[0], sg += p2[1], sb += p2[2];
+ else smask++;
+ p2 += 3;
+ if (p2[0] != mr || p2[1] != mg || p2[2] != mb)
+ sr += p2[0], sg += p2[1], sb += p2[2];
+ else smask++;
+ p2 += 3;
+
+ if (smask > 2)
+ ps[0] = ps[1] = ps[2] = mr;
+ else
+ ps[0] = sr >> 2, ps[1] = sg >> 2, ps[2] = sb >> 2;
+ ps += 3;
+ }
+ p1 += 32 * 3, p2 += 32 * 3;
+ }
+
+ return small.ConvertToBitmap();
+}
+
+
+// finds empty borders and return non-empty area of image:
+static wxImage CutEmptyBorders(const wxImage& img)
+{
+ unsigned char mr = img.GetMaskRed(),
+ mg = img.GetMaskGreen(),
+ mb = img.GetMaskBlue();
+ unsigned char *dt = img.GetData(), *dttmp;
+ unsigned w = img.GetWidth(), h = img.GetHeight();
+
+ unsigned top, bottom, left, right, i;
+ bool empt;
+
+#define MK_DTTMP(x,y) dttmp = dt + ((x + y * w) * 3)
+#define NOEMPTY_PIX(empt) if (dttmp[0] != mr || dttmp[1] != mg || dttmp[2] != mb) {empt = FALSE; break;}
+
+ for (empt = TRUE, top = 0; empt && top < h; top++)
+ {
+ MK_DTTMP(0, top);
+ for (i = 0; i < w; i++, dttmp+=3)
+ NOEMPTY_PIX(empt)
+ }
+ for (empt = TRUE, bottom = h-1; empt && bottom > top; bottom--)
+ {
+ MK_DTTMP(0, bottom);
+ for (i = 0; i < w; i++, dttmp+=3)
+ NOEMPTY_PIX(empt)
+ }
+ for (empt = TRUE, left = 0; empt && left < w; left++)
+ {
+ MK_DTTMP(left, 0);
+ for (i = 0; i < h; i++, dttmp+=3*w)
+ NOEMPTY_PIX(empt)
+ }
+ for (empt = TRUE, right = w-1; empt && right > left; right--)
+ {
+ MK_DTTMP(right, 0);
+ for (i = 0; i < h; i++, dttmp+=3*w)
+ NOEMPTY_PIX(empt)
+ }
+ top--, left--, bottom++, right++;
+
+ return img.GetSubImage(wxRect(left, top, right - left + 1, bottom - top + 1));
+}
+
+
+
+int wxFileIconsTable::GetIconID(const wxString& extension, const wxString& mime)
+{
+ if (!extension.IsEmpty())
+ {
+ wxFileIconEntry *entry = (wxFileIconEntry*) m_HashTable.Get(extension);
+ if (entry) return (entry -> id);
+ }
+
+ wxFileType *ft = (mime.IsEmpty()) ?
+ wxTheMimeTypesManager -> GetFileTypeFromExtension(extension) :
+ wxTheMimeTypesManager -> GetFileTypeFromMimeType(mime);
+ wxIcon ic;
+ if (ft == NULL || (!ft -> GetIcon(&ic)) || (!ic.Ok()))
+ {
+ int newid = FI_UNKNOWN;
+ m_HashTable.Put(extension, new wxFileIconEntry(newid));
+ return newid;
+ }
+ wxImage img(ic);
+ delete ft;
+
+ int id = m_ImageList.GetImageCount();
+ if (img.GetWidth() == 16 && img.GetHeight() == 16)
+ m_ImageList.Add(img.ConvertToBitmap());
+ else
+ {
+ if (img.GetWidth() != 32 || img.GetHeight() != 32)
+ m_ImageList.Add(CreateAntialiasedBitmap(CutEmptyBorders(img).Rescale(32, 32)));
+ else
+ m_ImageList.Add(CreateAntialiasedBitmap(img));
+ }
+ m_HashTable.Put(extension, new wxFileIconEntry(id));
+ return id;
+}
+
+
+
+// ----------------------------------------------------------------------------
+// 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 );
- struct stat lbuff;
- lstat( m_fileName.GetData(), &lbuff );
+ stat( m_fileName.fn_str(), &buff );
+#if !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
+ 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_isLink = S_ISLNK( lbuff.st_mode );
m_isExe = ((buff.st_mode & S_IXUSR ) == S_IXUSR );
m_size = buff.st_size;
m_month = t->tm_mon+1;
m_day = t->tm_mday;
m_year = t->tm_year;
+ m_year += 1900;
- 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)
{
case 0:
+ {
s = m_name;
- break;
+ }
+ break;
case 1:
+ {
if (m_isDir) s = _("<DIR>");
else if (m_isLink) s = _("<LINK>");
else s = LongToString( m_size );
- break;
+ }
+ 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(".");
s += IntToString( m_year );
- break;
+ }
+ 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;
void wxFileData::MakeItem( wxListItem &item )
{
item.m_text = m_name;
- item.m_colour = wxBLACK;
- if (IsExe()) item.m_colour = wxRED;
- if (IsDir()) item.m_colour = wxBLUE;
- if (IsDir()) item.m_image = 0; else item.m_image = -1;
+ item.ClearAttributes();
+ if (IsExe()) item.SetTextColour(*wxRED);
+ if (IsDir()) item.SetTextColour(*wxBLUE);
+
+ if (IsDir())
+ item.m_image = FI_FOLDER;
+ else if (IsExe())
+ item.m_image = FI_EXECUTABLE;
+ else if (m_name.Find(wxT('.')) != wxNOT_FOUND)
+ item.m_image = g_IconsTable -> GetIconID(m_name.AfterLast(wxT('.')));
+ else
+ item.m_image = FI_UNKNOWN;
+
if (IsLink())
{
wxColour *dg = wxTheColourDatabase->FindColour( "MEDIUM GREY" );
- item.m_colour = dg;
+ item.SetTextColour(*dg);
}
item.m_data = (long)this;
}
-
+
//-----------------------------------------------------------------------------
// wxFileCtrl
//-----------------------------------------------------------------------------
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()
{
- 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 ) :
wxListCtrl( win, id, pos, size, style, validator, name )
{
- wxImageList *imageList = new wxImageList( 16, 16 );
- imageList->Add( wxBitmap( folder_xpm ) );
+ if (! g_IconsTable) g_IconsTable = new wxFileIconsTable;
+ wxImageList *imageList = g_IconsTable -> GetImageList();
+
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();
+ int name_col_width = 0;
+ if (my_style & wxLC_REPORT)
+ {
+ if (GetColumnCount() > 0)
+ name_col_width = GetColumnWidth( 0 );
+ }
+
+ ClearAll();
if (my_style & wxLC_REPORT)
{
- InsertColumn( 0, _("Name"), wxLIST_FORMAT_LEFT, 110 );
+ if (name_col_width < 140) name_col_width = 140;
+ InsertColumn( 0, _("Name"), wxLIST_FORMAT_LEFT, name_col_width );
InsertColumn( 1, _("Size"), wxLIST_FORMAT_LEFT, 60 );
- InsertColumn( 2, _("Date"), wxLIST_FORMAT_LEFT, 55 );
+ InsertColumn( 2, _("Date"), wxLIST_FORMAT_LEFT, 65 );
InsertColumn( 3, _("Time"), wxLIST_FORMAT_LEFT, 50 );
InsertColumn( 4, _("Permissions"), wxLIST_FORMAT_LEFT, 120 );
}
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] != _T('.')))
+ if (m_showHidden || (s[0u] != wxT('.')))
{
- Add( fd, item );
+ Add( fd, item );
item.m_itemId++;
}
f = wxFindNextFile();
}
+
+ // Tokenize the wildcard string, so we can handle more than 1
+ // search pattern in a wildcard.
+ wxStringTokenizer tokenWild( m_wild, ";" );
+ while ( tokenWild.HasMoreTokens() )
+ {
+ res = m_dirName + wxT("/") + tokenWild.GetNextToken();
+ f = wxFindFirstFile( res.GetData(), wxFILE );
+ while (!f.IsEmpty())
+ {
+ res = wxFileNameFromPath( f );
+ fd = new wxFileData( res, f );
+ wxString s = fd->GetName();
+ if (m_showHidden || (s[0u] != wxT('.')))
+ {
+ Add( fd, item );
+ item.m_itemId++;
+ }
+ f = wxFindNextFile();
+ }
+ }
+
SortItems( ListCompare, 0 );
+
+ if (my_style & wxLC_REPORT)
+ {
+ SetColumnWidth( 1, wxLIST_AUTOSIZE );
+ SetColumnWidth( 2, wxLIST_AUTOSIZE );
+ SetColumnWidth( 3, wxLIST_AUTOSIZE );
+ }
}
void wxFileCtrl::SetWild( const wxString &wild )
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;
}
wxListItem item;
item.m_itemId = 0;
item.m_col = 0;
- int id = Add( fd, item );
-
+ long 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 );
- }
+ long 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 )
delete fd;
}
+void wxFileCtrl::OnListDeleteAllItems( wxListEvent &WXUNUSED(event) )
+{
+ wxListItem item;
+ item.m_mask = wxLIST_MASK_DATA;
+
+ item.m_itemId = GetNextItem( -1, wxLIST_NEXT_ALL );
+ while ( item.m_itemId != -1 )
+ {
+ GetItem( item );
+ wxFileData *fd = (wxFileData*)item.m_data;
+ delete fd;
+ item.m_data = 0;
+ SetItem( item );
+ item.m_itemId = GetNextItem( item.m_itemId, wxLIST_NEXT_ALL );
+ }
+}
+
void wxFileCtrl::OnListEndLabelEdit( wxListEvent &event )
{
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
+#define ID_CHECK wxID_FILEDLGG + 12
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)
+ EVT_CHECKBOX(ID_CHECK,wxFileDialog::OnCheck)
END_EVENT_TABLE()
+long wxFileDialog::s_lastViewStyle = wxLC_LIST;
+bool wxFileDialog::s_lastShowHidden = FALSE;
+
wxFileDialog::wxFileDialog(wxWindow *parent,
const wxString& message,
const wxString& defaultDir,
const wxString& wildCard,
long style,
const wxPoint& pos ) :
- wxDialog( parent, -1, message )
+ wxDialog( parent, -1, message, pos, wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER )
{
wxBeginBusyCursor();
-
+
+ if (wxConfig::Get(FALSE))
+ {
+ wxConfig::Get() -> Read(wxT("/wxWindows/wxFileDialog/ViewStyle"), &s_lastViewStyle);
+ wxConfig::Get() -> Read(wxT("/wxWindows/wxFileDialog/ShowHidden"), &s_lastShowHidden);
+ }
+
m_message = message;
m_dialogStyle = style;
+
+ if (m_dialogStyle == 0) m_dialogStyle = wxOPEN;
+ if ((m_dialogStyle & wxMULTIPLE ) && !(m_dialogStyle & wxOPEN))
+ m_dialogStyle |= wxOPEN;
+
m_dir = defaultDir;
- if (m_dir.IsEmpty()) m_dir = wxGetUserHome();
+ if ((m_dir.IsEmpty()) || (m_dir == wxT(".")))
+ {
+ 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;
-
+ m_filterExtension = wxEmptyString;
+
+ // 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();
+ }
+ if ( firstWild.Left( 2 ) == wxT("*.") )
+ m_filterExtension = firstWild.Mid( 1 );
+ if ( m_filterExtension == ".*" ) m_filterExtension = wxEmptyString;
+
+ // 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),
- wxLC_LIST | wxSUNKEN_BORDER | wxLC_SINGLE_SEL );
+
+ 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 );
+
+ if (m_dialogStyle & wxMULTIPLE)
+ m_list = new wxFileCtrl( this, ID_LIST_CTRL, m_dir, firstWild, wxDefaultPosition,
+ wxSize(440,180), s_lastViewStyle | wxSUNKEN_BORDER );
+ else
+ m_list = new wxFileCtrl( this, ID_LIST_CTRL, m_dir, firstWild, wxDefaultPosition,
+ wxSize(440,180), s_lastViewStyle | wxSUNKEN_BORDER | wxLC_SINGLE_SEL );
+ m_list -> ShowHidden(s_lastShowHidden);
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 );
+ 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 );
+ 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()
+{
+ if (wxConfig::Get(FALSE))
+ {
+ wxConfig::Get() -> Write(wxT("/wxWindows/wxFileDialog/ViewStyle"), s_lastViewStyle);
+ wxConfig::Get() -> Write(wxT("/wxWindows/wxFileDialog/ShowHidden"), s_lastShowHidden);
+ }
+}
+
+void wxFileDialog::OnChoice( wxCommandEvent &event )
+{
+ int index = (int)event.GetInt();
+ wxString *str = (wxString*) m_choice->GetClientData( index );
+ m_list->SetWild( *str );
+ m_filterIndex = index;
+ if ( str -> Left( 2 ) == wxT("*.") )
+ {
+ m_filterExtension = str -> Mid( 1 );
+ if (m_filterExtension == ".*") m_filterExtension = wxEmptyString;
+ }
+ else
+ m_filterExtension = wxEmptyString;
+}
+
+void wxFileDialog::OnCheck( wxCommandEvent &event )
+{
+ m_list->ShowHidden( (s_lastShowHidden = event.GetInt() != 0) );
+}
+
+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[0u] == 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[0u] != 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 (filename.Find( wxT('.') ) == wxNOT_FOUND ||
+ filename.AfterLast( wxT('.') ).Find( wxT('/') ) != wxNOT_FOUND)
+ filename << m_filterExtension;
if (wxFileExists( filename ))
{
wxString msg;
return;
}
}
- else if ( (m_dialogStyle & wxOPEN) && (m_dialogStyle & wxFILE_MUST_EXIST) )
+ else if ( m_dialogStyle & wxOPEN )
{
if ( !wxFileExists( filename ) )
- {
- wxMessageBox(_("Please choose an existing file."), _("Error"), wxOK);
+ if (filename.Find( wxT('.') ) == wxNOT_FOUND ||
+ filename.AfterLast( wxT('.') ).Find( wxT('/') ) != wxNOT_FOUND)
+ filename << m_filterExtension;
- return;
+ if ( m_dialogStyle & wxFILE_MUST_EXIST )
+ {
+ if ( !wxFileExists( filename ) )
+ {
+ wxMessageBox(_("Please choose an existing file."), _("Error"), wxOK | wxICON_ERROR );
+ return;
+ }
}
}
SetPath( filename );
- event.Skip();
+
+ // change to the directory where the user went if asked
+ if ( m_dialogStyle & wxCHANGE_DIR )
+ {
+ wxString cwd;
+ wxSplitPath(filename, &cwd, NULL, NULL);
+
+ if ( cwd != wxGetWorkingDirectory() )
+ {
+ wxSetWorkingDirectory(cwd);
+ }
+ }
+
+ wxCommandEvent event;
+ wxDialog::OnOK(event);
+}
+
+void wxFileDialog::OnListOk( wxCommandEvent &WXUNUSED(event) )
+{
+ HandleAction( m_text->GetValue() );
}
void wxFileDialog::OnList( wxCommandEvent &WXUNUSED(event) )
{
m_list->ChangeToListMode();
+ s_lastViewStyle = wxLC_LIST;
m_list->SetFocus();
}
void wxFileDialog::OnReport( wxCommandEvent &WXUNUSED(event) )
{
m_list->ChangeToReportMode();
+ s_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 );
}
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;
- }
+ }
+ }
+}
+
+void wxFileDialog::GetPaths( wxArrayString& paths ) const
+{
+ paths.Empty();
+ if (m_list->GetSelectedItemCount() == 0)
+ {
+ paths.Add( GetPath() );
+ return;
+ }
+
+ paths.Alloc( m_list->GetSelectedItemCount() );
+
+ wxString dir;
+ m_list->GetDir( dir );
+ if (dir != wxT("/")) dir += wxT("/");
+
+ wxListItem item;
+ item.m_mask = wxLIST_MASK_TEXT;
+
+ item.m_itemId = m_list->GetNextItem( -1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );
+ while ( item.m_itemId != -1 )
+ {
+ m_list->GetItem( item );
+ paths.Add( dir + item.m_text );
+ item.m_itemId = m_list->GetNextItem( item.m_itemId,
+ wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );
}
}
-
+
+void wxFileDialog::GetFilenames(wxArrayString& files) const
+{
+ files.Empty();
+ if (m_list->GetSelectedItemCount() == 0)
+ {
+ files.Add( GetFilename() );
+ return;
+ }
+ files.Alloc( m_list->GetSelectedItemCount() );
+
+ wxListItem item;
+ item.m_mask = wxLIST_MASK_TEXT;
+
+ item.m_itemId = m_list->GetNextItem( -1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );
+ while ( item.m_itemId != -1 )
+ {
+ m_list->GetItem( item );
+ files.Add( item.m_text );
+ item.m_itemId = m_list->GetNextItem( item.m_itemId,
+ wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );
+ }
+}
+
+
+
// ----------------------------------------------------------------------------
// 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 wxLoadFileSelector( const wxChar *what, const wxChar *extension, const wxChar *default_name, wxWindow *parent )
+wxString wxLoadFileSelector( const wxChar *what, const wxChar *ext, const wxChar *default_name, wxWindow *parent )
{
- wxChar *ext = (wxChar *)extension;
+ wxString prompt = wxString::Format(_("Load %s file"), what);
- wxChar prompt[50];
- wxString str = _("Load %s file");
- wxSprintf(prompt, str, what);
+ if (*ext == wxT('.'))
+ ext++;
- if (*ext == _T('.')) ext++;
- wxChar wild[60];
- wxSprintf(wild, _T("*.%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,
{
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 == _T('.')) ext++;
- wxChar wild[60];
- wxSprintf(wild, _T("*.%s"), ext);
+ if (*ext == wxT('.'))
+ ext++;
- return wxFileSelector (prompt, (const wxChar *) NULL, default_name, ext, wild, 0, parent);
+ wxString wild = wxString::Format(_T("*.%s"), ext);
+
+ return wxFileSelector(prompt, (const wxChar *) NULL, default_name,
+ ext, wild, 0, parent);
}
+
+
+
+
+
+// A module to allow icons table cleanup
+
+class wxFileDialogGenericModule: public wxModule
+{
+DECLARE_DYNAMIC_CLASS(wxFileDialogGenericModule)
+public:
+ wxFileDialogGenericModule() {}
+ bool OnInit() { return TRUE; }
+ void OnExit() { if (g_IconsTable) {delete g_IconsTable; g_IconsTable = NULL;} }
+};
+
+IMPLEMENT_DYNAMIC_CLASS(wxFileDialogGenericModule, wxModule)
+
+#endif // wxUSE_FILEDLG
projects / wxWidgets.git / blobdiff