X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/13111b2ac81e694d6b69822dff61838ae66052b2..cd378f94bec1edc0f991ee55b02bfe3084de94e0:/src/generic/filedlgg.cpp diff --git a/src/generic/filedlgg.cpp b/src/generic/filedlgg.cpp index 5edd8cc50d..41e6ad08d0 100644 --- a/src/generic/filedlgg.cpp +++ b/src/generic/filedlgg.cpp @@ -32,6 +32,11 @@ #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" @@ -41,8 +46,10 @@ #include #include #include -#include -#include +#ifndef __VMS +# include +#endif +# include #include #include "wx/generic/home.xpm" @@ -50,35 +57,193 @@ #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" + +// ---------------------------------------------------------------------------- +// 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; +} + -/* 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 */ -" ", -" @@@@@ ", -" @#+#+#@ ", -" @#+#+#+#@@@@@@ ", -" @$$$$$$$$$$$$@.", -" @$#+#+#+#+#+#@.", -" @$+#+#+#+#+#+@.", -" @$#+#+#+#+#+#@.", -" @$+#+#+#+#+#+@.", -" @$#+#+#+#+#+#@.", -" @$+#+#+#+#+#+@.", -" @$#+#+#+#+#+#@.", -" @@@@@@@@@@@@@@.", -" ..............", -" ", -" "}; // ---------------------------------------------------------------------------- // private functions @@ -109,8 +274,8 @@ wxFileData::wxFileData( const wxString &name, const wxString &fname ) struct stat buff; stat( m_fileName.fn_str(), &buff ); - -#ifndef __EMX__ + +#if !defined( __EMX__ ) && !defined(__VMS) struct stat lbuff; lstat( m_fileName.fn_str(), &lbuff ); m_isLink = S_ISLNK( lbuff.st_mode ); @@ -133,6 +298,7 @@ wxFileData::wxFileData( const wxString &name, const wxString &fname ) m_month = t->tm_mon+1; m_day = t->tm_mday; 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('-')), @@ -181,30 +347,37 @@ wxString wxFileData::GetEntry( int num ) switch (num) { case 0: + { s = m_name; - break; + } + break; case 1: + { if (m_isDir) s = _(""); else if (m_isLink) s = _(""); else s = LongToString( m_size ); - break; + } + 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("."); - if (m_year < 10) s += wxT("0"); // this should happen real soon... s += IntToString( m_year ); - break; + } + 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; break; @@ -247,7 +420,16 @@ void wxFileData::MakeItem( wxListItem &item ) item.ClearAttributes(); if (IsExe()) item.SetTextColour(*wxRED); if (IsDir()) item.SetTextColour(*wxBLUE); - item.m_image = IsDir() ? 0 : -1; + + 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" ); @@ -264,9 +446,11 @@ 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() { m_dirName = wxT("/"); @@ -279,8 +463,9 @@ wxFileCtrl::wxFileCtrl( wxWindow *win, wxWindowID id, 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; @@ -333,13 +518,21 @@ long wxFileCtrl::Add( wxFileData *fd, wxListItem &item ) void wxFileCtrl::Update() { - ClearAll(); long my_style = GetWindowStyleFlag(); + int name_col_width = 0; if (my_style & wxLC_REPORT) { - InsertColumn( 0, _("Name"), wxLIST_FORMAT_LEFT, 130 ); + if (GetColumnCount() > 0) + name_col_width = GetColumnWidth( 0 ); + } + + ClearAll(); + if (my_style & wxLC_REPORT) + { + 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 ); } @@ -364,7 +557,7 @@ void wxFileCtrl::Update() res = wxFileNameFromPath( f ); fd = new wxFileData( res, f ); wxString s = fd->GetName(); - if (m_showHidden || (s[0] != wxT('.'))) + if (m_showHidden || (s[0u] != wxT('.'))) { Add( fd, item ); item.m_itemId++; @@ -379,7 +572,7 @@ void wxFileCtrl::Update() res = wxFileNameFromPath( f ); fd = new wxFileData( res, f ); wxString s = fd->GetName(); - if (m_showHidden || (s[0] != wxT('.'))) + if (m_showHidden || (s[0u] != wxT('.'))) { Add( fd, item ); item.m_itemId++; @@ -388,6 +581,13 @@ void wxFileCtrl::Update() } 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 ) @@ -487,6 +687,23 @@ void wxFileCtrl::OnListDeleteItem( wxListEvent &event ) 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; @@ -561,6 +778,9 @@ BEGIN_EVENT_TABLE(wxFileDialog,wxDialog) 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, @@ -572,12 +792,19 @@ wxFileDialog::wxFileDialog(wxWindow *parent, { 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 == wxT("."))) { @@ -590,6 +817,7 @@ wxFileDialog::wxFileDialog(wxWindow *parent, m_fileName = defaultFile; m_wildCard = wildCard; m_filterIndex = 0; + m_filterExtension = wxEmptyString; // interpret wildcards @@ -610,6 +838,9 @@ wxFileDialog::wxFileDialog(wxWindow *parent, firstWildText = tokens.GetNextToken(); firstWild = tokens.GetNextToken(); } + if ( firstWild.Left( 2 ) == wxT("*.") ) + m_filterExtension = firstWild.Mid( 1 ); + if ( m_filterExtension == ".*" ) m_filterExtension = wxEmptyString; // layout @@ -662,11 +893,12 @@ wxFileDialog::wxFileDialog(wxWindow *parent, 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), wxLC_LIST | wxSUNKEN_BORDER ); + 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), wxLC_LIST | wxSUNKEN_BORDER | wxLC_SINGLE_SEL ); + 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 ); @@ -679,7 +911,7 @@ wxFileDialog::wxFileDialog(wxWindow *parent, 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( FALSE ); + 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 ); @@ -701,9 +933,11 @@ wxFileDialog::wxFileDialog(wxWindow *parent, Centre( wxBOTH ); +/* if (m_fileName.IsEmpty()) m_list->SetFocus(); else +*/ m_text->SetFocus(); wxEndBusyCursor(); @@ -711,6 +945,11 @@ wxFileDialog::wxFileDialog(wxWindow *parent, 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 ) @@ -719,11 +958,18 @@ void wxFileDialog::OnChoice( wxCommandEvent &event ) 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( event.GetInt() ); + m_list->ShowHidden( (s_lastShowHidden = event.GetInt() != 0) ); } void wxFileDialog::OnActivated( wxListEvent &event ) @@ -741,16 +987,16 @@ void wxFileDialog::OnTextEnter( wxCommandEvent &WXUNUSED(event) ) void wxFileDialog::OnSelected( wxListEvent &event ) { 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 ); } @@ -780,7 +1026,7 @@ void wxFileDialog::HandleAction( const wxString &fn ) return; } - if (filename[0] == wxT('~')) + if (filename[0u] == wxT('~')) { filename.Remove( 0, 1 ); wxString tmp( wxGetUserHome() ); @@ -802,7 +1048,7 @@ void wxFileDialog::HandleAction( const wxString &fn ) } if (dir != wxT("/")) dir += wxT("/"); - if (filename[0] != wxT('/')) + if (filename[0u] != wxT('/')) { dir += filename; filename = dir; @@ -816,8 +1062,12 @@ void wxFileDialog::HandleAction( const wxString &fn ) 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; @@ -828,17 +1078,37 @@ void wxFileDialog::HandleAction( const wxString &fn ) return; } } - else if ( (m_dialogStyle & wxOPEN) && (m_dialogStyle & wxFILE_MUST_EXIST) ) + else if ( m_dialogStyle & wxOPEN ) { if ( !wxFileExists( filename ) ) + if (filename.Find( wxT('.') ) == wxNOT_FOUND || + filename.AfterLast( wxT('.') ).Find( wxT('/') ) != wxNOT_FOUND) + filename << m_filterExtension; + + if ( m_dialogStyle & wxFILE_MUST_EXIST ) { - wxMessageBox(_("Please choose an existing file."), _("Error"), wxOK | wxICON_ERROR ); - return; + if ( !wxFileExists( filename ) ) + { + wxMessageBox(_("Please choose an existing file."), _("Error"), wxOK | wxICON_ERROR ); + return; + } } } SetPath( filename ); - + + // 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); } @@ -851,12 +1121,14 @@ void wxFileDialog::OnListOk( wxCommandEvent &WXUNUSED(event) ) 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(); } @@ -907,7 +1179,7 @@ void wxFileDialog::GetPaths( wxArrayString& paths ) const paths.Add( GetPath() ); return; } - + paths.Alloc( m_list->GetSelectedItemCount() ); wxString dir; @@ -918,10 +1190,11 @@ void wxFileDialog::GetPaths( wxArrayString& paths ) const item.m_mask = wxLIST_MASK_TEXT; item.m_itemId = m_list->GetNextItem( -1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED ); - while ( item.m_itemId != -1 ) { + while ( item.m_itemId != -1 ) + { m_list->GetItem( item ); paths.Add( dir + item.m_text ); - item.m_itemId = m_list->GetNextItem( item.m_itemId + 1, + item.m_itemId = m_list->GetNextItem( item.m_itemId, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED ); } } @@ -940,14 +1213,17 @@ void wxFileDialog::GetFilenames(wxArrayString& files) const item.m_mask = wxLIST_MASK_TEXT; item.m_itemId = m_list->GetNextItem( -1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED ); - while ( item.m_itemId != -1 ) { + while ( item.m_itemId != -1 ) + { m_list->GetItem( item ); files.Add( item.m_text ); - item.m_itemId = m_list->GetNextItem( item.m_itemId + 1, + item.m_itemId = m_list->GetNextItem( item.m_itemId, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED ); } } + + // ---------------------------------------------------------------------------- // global functions // ---------------------------------------------------------------------------- @@ -998,19 +1274,17 @@ wxString wxFileSelector( const wxChar *title, } } -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 == wxT('.')) ext++; - wxChar wild[60]; - wxSprintf(wild, wxT("*.%s"), ext); + wxString wild = wxString::Format(_T("*.%s"), ext); - return wxFileSelector (prompt, (const wxChar *) NULL, default_name, ext, wild, 0, parent); + return wxFileSelector(prompt, (const wxChar *) NULL, default_name, + ext, wild, 0, parent); } wxString wxSaveFileSelector(const wxChar *what, const wxChar *extension, const wxChar *default_name, @@ -1018,14 +1292,31 @@ wxString wxSaveFileSelector(const wxChar *what, const wxChar *extension, const w { wxChar *ext = (wxChar *)extension; - wxChar prompt[50]; - wxString str = _("Save %s file"); - wxSprintf(prompt, str, what); + wxString prompt = wxString::Format(_("Save %s file"), what); - if (*ext == wxT('.')) ext++; - wxChar wild[60]; - wxSprintf(wild, wxT("*.%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)