X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a85ad1db05e7d940383fdf75671f1aa69dacbb42..f239a20092359e3c914adb79bd39f3f5d2b2e06f:/src/generic/dirctrlg.cpp?ds=sidebyside diff --git a/src/generic/dirctrlg.cpp b/src/generic/dirctrlg.cpp index 27ae4e40b1..e27a75acd3 100644 --- a/src/generic/dirctrlg.cpp +++ b/src/generic/dirctrlg.cpp @@ -29,7 +29,6 @@ #include "wx/icon.h" #include "wx/settings.h" #include "wx/msgdlg.h" - #include "wx/cmndata.h" #include "wx/choice.h" #include "wx/textctrl.h" #include "wx/layout.h" @@ -40,6 +39,7 @@ #include "wx/module.h" #endif +#include "wx/filename.h" #include "wx/filefn.h" #include "wx/imaglist.h" #include "wx/tokenzr.h" @@ -52,7 +52,7 @@ #endif #if defined(__WXMAC__) - #include "wx/mac/private.h" // includes mac headers + #include "wx/osx/private.h" // includes mac headers #endif #ifdef __WXMSW__ @@ -108,7 +108,7 @@ bool wxIsDriveAvailable(const wxString& dirName); size_t wxGetAvailableDrives(wxArrayString &paths, wxArrayString &names, wxArrayInt &icon_ids) { -#if defined(__WINDOWS__) || defined(__DOS__) || defined(__OS2__) +#ifdef wxHAS_FILESYSTEM_VOLUMES #ifdef __WXWINCE__ // No logical drives; return "\" @@ -164,9 +164,10 @@ size_t wxGetAvailableDrives(wxArrayString &paths, wxArrayString &names, wxArrayI { if (ulDriveMap & ( 1 << i )) { - wxString path, name; - path.Printf(wxT("%c:\\"), 'A' + i); - name.Printf(wxT("%c:"), 'A' + i); + const wxString path = wxFileName::GetVolumeString( + 'A' + i, wxPATH_GET_SEPARATOR); + const wxString name = wxFileName::GetVolumeString( + 'A' + i, wxPATH_NO_SEPARATOR); // Note: If _filesys is unsupported by some compilers, // we can always replace it by DosQueryFSAttach @@ -201,25 +202,23 @@ size_t wxGetAvailableDrives(wxArrayString &paths, wxArrayString &names, wxArrayI } } #else // !__WIN32__, !__OS2__ - int drive; - /* If we can switch to the drive, it exists. */ - for( drive = 1; drive <= 26; drive++ ) + for ( char drive = 'A'; drive <= 'Z'; drive++ ) { - wxString path, name; - path.Printf(wxT("%c:\\"), (char) (drive + 'a' - 1)); - name.Printf(wxT("%c:"), (char) (drive + 'A' - 1)); + const wxString + path = wxFileName::GetVolumeString(drive, wxPATH_GET_SEPARATOR); if (wxIsDriveAvailable(path)) { paths.Add(path); - names.Add(name); - icon_ids.Add((drive <= 2) ? wxFileIconsTable::floppy : wxFileIconsTable::drive); + names.Add(wxFileName::GetVolumeString(drive, wxPATH_NO_SEPARATOR)); + icon_ids.Add(drive <= 2 ? wxFileIconsTable::floppy + : wxFileIconsTable::drive); } } #endif // __WIN32__/!__WIN32__ -#elif defined(__WXMAC__) +#elif defined(__WXMAC__) && wxOSX_USE_COCOA_OR_CARBON ItemCount volumeIndex = 1; OSErr err = noErr ; @@ -437,63 +436,6 @@ bool wxDirItemData::HasFiles(const wxString& WXUNUSED(spec)) const // wxGenericDirCtrl //----------------------------------------------------------------------------- - -#if wxUSE_EXTENDED_RTTI -WX_DEFINE_FLAGS( wxGenericDirCtrlStyle ) - -wxBEGIN_FLAGS( wxGenericDirCtrlStyle ) - // new style border flags, we put them first to - // use them for streaming out - wxFLAGS_MEMBER(wxBORDER_SIMPLE) - wxFLAGS_MEMBER(wxBORDER_SUNKEN) - wxFLAGS_MEMBER(wxBORDER_DOUBLE) - wxFLAGS_MEMBER(wxBORDER_RAISED) - wxFLAGS_MEMBER(wxBORDER_STATIC) - wxFLAGS_MEMBER(wxBORDER_NONE) - - // old style border flags - wxFLAGS_MEMBER(wxSIMPLE_BORDER) - wxFLAGS_MEMBER(wxSUNKEN_BORDER) - wxFLAGS_MEMBER(wxDOUBLE_BORDER) - wxFLAGS_MEMBER(wxRAISED_BORDER) - wxFLAGS_MEMBER(wxSTATIC_BORDER) - wxFLAGS_MEMBER(wxBORDER) - - // standard window styles - wxFLAGS_MEMBER(wxTAB_TRAVERSAL) - wxFLAGS_MEMBER(wxCLIP_CHILDREN) - wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW) - wxFLAGS_MEMBER(wxWANTS_CHARS) - wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE) - wxFLAGS_MEMBER(wxALWAYS_SHOW_SB ) - wxFLAGS_MEMBER(wxVSCROLL) - wxFLAGS_MEMBER(wxHSCROLL) - - wxFLAGS_MEMBER(wxDIRCTRL_DIR_ONLY) - wxFLAGS_MEMBER(wxDIRCTRL_3D_INTERNAL) - wxFLAGS_MEMBER(wxDIRCTRL_SELECT_FIRST) - -wxEND_FLAGS( wxGenericDirCtrlStyle ) - -IMPLEMENT_DYNAMIC_CLASS_XTI(wxGenericDirCtrl, wxControl,"wx/dirctrl.h") - -wxBEGIN_PROPERTIES_TABLE(wxGenericDirCtrl) - wxHIDE_PROPERTY( Children ) - wxPROPERTY( DefaultPath , wxString , SetDefaultPath , GetDefaultPath , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) - wxPROPERTY( Filter , wxString , SetFilter , GetFilter , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group") ) - wxPROPERTY( DefaultFilter , int , SetFilterIndex, GetFilterIndex, EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group") ) - wxPROPERTY_FLAGS( WindowStyle, wxGenericDirCtrlStyle, long, SetWindowStyleFlag, GetWindowStyleFlag, EMPTY_MACROVALUE , 0, wxT("Helpstring"), wxT("group") ) -wxEND_PROPERTIES_TABLE() - -wxBEGIN_HANDLERS_TABLE(wxGenericDirCtrl) -wxEND_HANDLERS_TABLE() - -wxCONSTRUCTOR_8( wxGenericDirCtrl , wxWindow* , Parent , wxWindowID , Id , wxString , DefaultPath , - wxPoint , Position , wxSize , Size , long , WindowStyle , wxString , Filter , int , DefaultFilter ) -#else -IMPLEMENT_DYNAMIC_CLASS(wxGenericDirCtrl, wxControl) -#endif - BEGIN_EVENT_TABLE(wxGenericDirCtrl, wxControl) EVT_TREE_ITEM_EXPANDING (wxID_TREECTRL, wxGenericDirCtrl::OnExpandItem) EVT_TREE_ITEM_COLLAPSED (wxID_TREECTRL, wxGenericDirCtrl::OnCollapseItem) @@ -528,7 +470,7 @@ void wxGenericDirCtrl::ExpandRoot() } bool wxGenericDirCtrl::Create(wxWindow *parent, - const wxWindowID id, + const wxWindowID treeid, const wxString& dir, const wxPoint& pos, const wxSize& size, @@ -537,7 +479,7 @@ bool wxGenericDirCtrl::Create(wxWindow *parent, int defaultFilter, const wxString& name) { - if (!wxControl::Create(parent, id, pos, size, style, wxDefaultValidator, name)) + if (!wxControl::Create(parent, treeid, pos, size, style, wxDefaultValidator, name)) return false; SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE)); @@ -560,6 +502,9 @@ bool wxGenericDirCtrl::Create(wxWindow *parent, if (style & wxDIRCTRL_EDIT_LABELS) treeStyle |= wxTR_EDIT_LABELS; + if (style & wxDIRCTRL_MULTIPLE) + treeStyle |= wxTR_MULTIPLE; + if ((style & wxDIRCTRL_3D_INTERNAL) == 0) treeStyle |= wxNO_BORDER; @@ -617,9 +562,9 @@ void wxGenericDirCtrl::Init() m_filterListCtrl = NULL; } -wxTreeCtrl* wxGenericDirCtrl::CreateTreeCtrl(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long treeStyle) +wxTreeCtrl* wxGenericDirCtrl::CreateTreeCtrl(wxWindow *parent, wxWindowID treeid, const wxPoint& pos, const wxSize& size, long treeStyle) { - return new wxTreeCtrl(parent, id, pos, size, treeStyle); + return new wxTreeCtrl(parent, treeid, pos, size, treeStyle); } void wxGenericDirCtrl::ShowHidden( bool show ) @@ -629,9 +574,22 @@ void wxGenericDirCtrl::ShowHidden( bool show ) m_showHidden = show; - wxString path = GetPath(); - ReCreateTree(); - SetPath(path); + if ( HasFlag(wxDIRCTRL_MULTIPLE) ) + { + wxArrayString paths; + GetPaths(paths); + ReCreateTree(); + for ( unsigned n = 0; n < paths.size(); n++ ) + { + ExpandPath(paths[n]); + } + } + else + { + wxString path = GetPath(); + ReCreateTree(); + SetPath(path); + } } const wxTreeItemId @@ -639,11 +597,11 @@ wxGenericDirCtrl::AddSection(const wxString& path, const wxString& name, int ima { wxDirItemData *dir_item = new wxDirItemData(path,name,true); - wxTreeItemId id = AppendItem( m_rootId, name, imageId, -1, dir_item); + wxTreeItemId treeid = AppendItem( m_rootId, name, imageId, -1, dir_item); - m_treeCtrl->SetItemHasChildren(id); + m_treeCtrl->SetItemHasChildren(treeid); - return id; + return treeid; } void wxGenericDirCtrl::SetupSections() @@ -668,7 +626,8 @@ void wxGenericDirCtrl::SetFocus() { // we don't need focus ourselves, give it to the tree so that the user // could navigate it - m_treeCtrl->SetFocus(); + if (m_treeCtrl) + m_treeCtrl->SetFocus(); } void wxGenericDirCtrl::OnBeginEditItem(wxTreeEvent &event) @@ -706,8 +665,8 @@ void wxGenericDirCtrl::OnEndEditItem(wxTreeEvent &event) return; } - wxTreeItemId id = event.GetItem(); - wxDirItemData *data = (wxDirItemData*)m_treeCtrl->GetItemData( id ); + wxTreeItemId treeid = event.GetItem(); + wxDirItemData *data = (wxDirItemData*)m_treeCtrl->GetItemData( treeid ); wxASSERT( data ); wxString new_name( wxPathOnly( data->m_path ) ); @@ -743,14 +702,9 @@ void wxGenericDirCtrl::OnExpandItem(wxTreeEvent &event) // ctor when wxTR_HIDE_ROOT was specified if (!m_rootId.IsOk()) - m_rootId = m_treeCtrl->GetRootItem(); ExpandDir(parentId); - if ( m_treeCtrl->GetChildrenCount(parentId, false) == 0 ) - { - m_treeCtrl->SetItemHasChildren(parentId, false); - } } void wxGenericDirCtrl::OnCollapseItem(wxTreeEvent &event ) @@ -767,22 +721,15 @@ void wxGenericDirCtrl::CollapseDir(wxTreeItemId parentId) return; data->m_isExpanded = false; - wxTreeItemIdValue cookie; - /* Workaround because DeleteChildren has disapeared (why?) and - * CollapseAndReset doesn't work as advertised (deletes parent too) */ - child = m_treeCtrl->GetFirstChild(parentId, cookie); - while (child.IsOk()) - { - m_treeCtrl->Delete(child); - /* Not GetNextChild below, because the cookie mechanism can't - * handle disappearing children! */ - child = m_treeCtrl->GetFirstChild(parentId, cookie); - } + + m_treeCtrl->Freeze(); if (parentId != m_treeCtrl->GetRootItem()) - m_treeCtrl->Collapse(parentId); + m_treeCtrl->CollapseAndReset(parentId); + m_treeCtrl->DeleteChildren(parentId); + m_treeCtrl->Thaw(); } -void wxGenericDirCtrl::ExpandDir(wxTreeItemId parentId) +void wxGenericDirCtrl::PopulateNode(wxTreeItemId parentId) { wxDirItemData *data = (wxDirItemData *) m_treeCtrl->GetItemData(parentId); @@ -881,6 +828,10 @@ void wxGenericDirCtrl::ExpandDir(wxTreeItemId parentId) filenames.Sort(wxDirCtrlStringCompareFunction); } + // Now we really know whether we have any children so tell the tree control + // about it. + m_treeCtrl->SetItemHasChildren(parentId, !dirs.empty() || !filenames.empty()); + // Add the sorted dirs size_t i; for (i = 0; i < dirs.GetCount(); i++) @@ -892,17 +843,17 @@ void wxGenericDirCtrl::ExpandDir(wxTreeItemId parentId) path += eachFilename; wxDirItemData *dir_item = new wxDirItemData(path,eachFilename,true); - wxTreeItemId id = AppendItem( parentId, eachFilename, + wxTreeItemId treeid = AppendItem( parentId, eachFilename, wxFileIconsTable::folder, -1, dir_item); - m_treeCtrl->SetItemImage( id, wxFileIconsTable::folder_open, + m_treeCtrl->SetItemImage( treeid, wxFileIconsTable::folder_open, wxTreeItemIcon_Expanded ); // assume that it does have children by default as it can take a long // time to really check for this (think remote drives...) // - // and if we're wrong, we'll correct it later in OnExpandItem() if + // and if we're wrong, we'll correct the icon later if // the user really tries to open this item - m_treeCtrl->SetItemHasChildren(id); + m_treeCtrl->SetItemHasChildren(treeid); } // Add the sorted filenames @@ -925,6 +876,12 @@ void wxGenericDirCtrl::ExpandDir(wxTreeItemId parentId) } } +void wxGenericDirCtrl::ExpandDir(wxTreeItemId parentId) +{ + // ExpandDir() will not actually expand the tree node, just populate it + PopulateNode(parentId); +} + void wxGenericDirCtrl::ReCreateTree() { CollapseDir(m_treeCtrl->GetRootItem()); @@ -1003,15 +960,15 @@ wxTreeItemId wxGenericDirCtrl::FindChild(wxTreeItemId parentId, const wxString& bool wxGenericDirCtrl::ExpandPath(const wxString& path) { bool done = false; - wxTreeItemId id = FindChild(m_rootId, path, done); - wxTreeItemId lastId = id; // The last non-zero id - while (id.IsOk() && !done) + wxTreeItemId treeid = FindChild(m_rootId, path, done); + wxTreeItemId lastId = treeid; // The last non-zero treeid + while (treeid.IsOk() && !done) { - ExpandDir(id); + ExpandDir(treeid); - id = FindChild(id, path, done); - if (id.IsOk()) - lastId = id; + treeid = FindChild(treeid, path, done); + if (treeid.IsOk()) + lastId = treeid; } if (!lastId.IsOk()) return false; @@ -1059,17 +1016,17 @@ bool wxGenericDirCtrl::ExpandPath(const wxString& path) bool wxGenericDirCtrl::CollapsePath(const wxString& path) { bool done = false; - wxTreeItemId id = FindChild(m_rootId, path, done); - wxTreeItemId lastId = id; // The last non-zero id + wxTreeItemId treeid = FindChild(m_rootId, path, done); + wxTreeItemId lastId = treeid; // The last non-zero treeid - while ( id.IsOk() && !done ) + while ( treeid.IsOk() && !done ) { - CollapseDir(id); + CollapseDir(treeid); - id = FindChild(id, path, done); + treeid = FindChild(treeid, path, done); - if ( id.IsOk() ) - lastId = id; + if ( treeid.IsOk() ) + lastId = treeid; } if ( !lastId.IsOk() ) @@ -1084,22 +1041,52 @@ bool wxGenericDirCtrl::CollapsePath(const wxString& path) wxString wxGenericDirCtrl::GetPath() const { - wxTreeItemId id = m_treeCtrl->GetSelection(); - if (id) + // Allow calling GetPath() in multiple selection from OnSelFilter + if (m_treeCtrl->HasFlag(wxTR_MULTIPLE)) + { + wxArrayTreeItemIds items; + m_treeCtrl->GetSelections(items); + if (items.size() > 0) + { + // return first string only + wxTreeItemId treeid = items[0]; + wxDirItemData* data = (wxDirItemData*) m_treeCtrl->GetItemData(treeid); + return data->m_path; + } + + return wxEmptyString; + } + + wxTreeItemId treeid = m_treeCtrl->GetSelection(); + if (treeid) { - wxDirItemData* data = (wxDirItemData*) m_treeCtrl->GetItemData(id); + wxDirItemData* data = (wxDirItemData*) m_treeCtrl->GetItemData(treeid); return data->m_path; } else return wxEmptyString; } +void wxGenericDirCtrl::GetPaths(wxArrayString& paths) const +{ + paths.clear(); + + wxArrayTreeItemIds items; + m_treeCtrl->GetSelections(items); + for ( unsigned n = 0; n < items.size(); n++ ) + { + wxTreeItemId treeid = items[n]; + wxDirItemData* data = (wxDirItemData*) m_treeCtrl->GetItemData(treeid); + paths.Add(data->m_path); + } +} + wxString wxGenericDirCtrl::GetFilePath() const { - wxTreeItemId id = m_treeCtrl->GetSelection(); - if (id) + wxTreeItemId treeid = m_treeCtrl->GetSelection(); + if (treeid) { - wxDirItemData* data = (wxDirItemData*) m_treeCtrl->GetItemData(id); + wxDirItemData* data = (wxDirItemData*) m_treeCtrl->GetItemData(treeid); if (data->m_isDir) return wxEmptyString; else @@ -1109,6 +1096,21 @@ wxString wxGenericDirCtrl::GetFilePath() const return wxEmptyString; } +void wxGenericDirCtrl::GetFilePaths(wxArrayString& paths) const +{ + paths.clear(); + + wxArrayTreeItemIds items; + m_treeCtrl->GetSelections(items); + for ( unsigned n = 0; n < items.size(); n++ ) + { + wxTreeItemId treeid = items[n]; + wxDirItemData* data = (wxDirItemData*) m_treeCtrl->GetItemData(treeid); + if ( !data->m_isDir ) + paths.Add(data->m_path); + } +} + void wxGenericDirCtrl::SetPath(const wxString& path) { m_defaultPath = path; @@ -1116,11 +1118,48 @@ void wxGenericDirCtrl::SetPath(const wxString& path) ExpandPath(path); } +void wxGenericDirCtrl::SelectPath(const wxString& path, bool select) +{ + bool done = false; + wxTreeItemId treeid = FindChild(m_rootId, path, done); + wxTreeItemId lastId = treeid; // The last non-zero treeid + while ( treeid.IsOk() && !done ) + { + treeid = FindChild(treeid, path, done); + if ( treeid.IsOk() ) + lastId = treeid; + } + if ( !lastId.IsOk() ) + return; + + if ( done ) + { + m_treeCtrl->SelectItem(treeid, select); + } +} + +void wxGenericDirCtrl::SelectPaths(const wxArrayString& paths) +{ + if ( HasFlag(wxDIRCTRL_MULTIPLE) ) + { + UnselectAll(); + for ( unsigned n = 0; n < paths.size(); n++ ) + { + SelectPath(paths[n]); + } + } +} + +void wxGenericDirCtrl::UnselectAll() +{ + m_treeCtrl->UnselectAll(); +} + // Not used #if 0 -void wxGenericDirCtrl::FindChildFiles(wxTreeItemId id, int dirFlags, wxArrayString& filenames) +void wxGenericDirCtrl::FindChildFiles(wxTreeItemId treeid, int dirFlags, wxArrayString& filenames) { - wxDirItemData *data = (wxDirItemData *) m_treeCtrl->GetItemData(id); + wxDirItemData *data = (wxDirItemData *) m_treeCtrl->GetItemData(treeid); // This may take a longish time. Go to busy cursor wxBusyCursor busy; @@ -1276,7 +1315,7 @@ BEGIN_EVENT_TABLE(wxDirFilterListCtrl, wxChoice) END_EVENT_TABLE() bool wxDirFilterListCtrl::Create(wxGenericDirCtrl* parent, - const wxWindowID id, + const wxWindowID treeid, const wxPoint& pos, const wxSize& size, long style) @@ -1290,7 +1329,7 @@ bool wxDirFilterListCtrl::Create(wxGenericDirCtrl* parent, : wxBORDER_NONE; } - return wxChoice::Create(parent, id, pos, size, 0, NULL, style); + return wxChoice::Create(parent, treeid, pos, size, 0, NULL, style); } void wxDirFilterListCtrl::Init() @@ -1302,16 +1341,33 @@ void wxDirFilterListCtrl::OnSelFilter(wxCommandEvent& WXUNUSED(event)) { int sel = GetSelection(); - wxString currentPath = m_dirCtrl->GetPath(); + if (m_dirCtrl->HasFlag(wxDIRCTRL_MULTIPLE)) + { + wxArrayString paths; + m_dirCtrl->GetPaths(paths); + + m_dirCtrl->SetFilterIndex(sel); + + // If the filter has changed, the view is out of date, so + // collapse the tree. + m_dirCtrl->ReCreateTree(); - m_dirCtrl->SetFilterIndex(sel); + // Expand and select the previously selected paths + for (unsigned int i = 0; i < paths.GetCount(); i++) + { + m_dirCtrl->ExpandPath(paths.Item(i)); + } + } + else + { + wxString currentPath = m_dirCtrl->GetPath(); - // If the filter has changed, the view is out of date, so - // collapse the tree. - m_dirCtrl->ReCreateTree(); + m_dirCtrl->SetFilterIndex(sel); + m_dirCtrl->ReCreateTree(); - // Try to restore the selection, or at least the directory - m_dirCtrl->ExpandPath(currentPath); + // Try to restore the selection, or at least the directory + m_dirCtrl->ExpandPath(currentPath); + } } void wxDirFilterListCtrl::FillFilterList(const wxString& filter, int defaultFilter) @@ -1337,7 +1393,7 @@ void wxDirFilterListCtrl::FillFilterList(const wxString& filter, int defaultFilt #ifndef __WXGTK20__ /* Computer (c) Julian Smart */ -static const char * file_icons_tbl_computer_xpm[] = { +static const char* const file_icons_tbl_computer_xpm[] = { /* columns rows colors chars-per-pixel */ "16 16 42 1", "r c #4E7FD0", @@ -1407,7 +1463,7 @@ static const char * file_icons_tbl_computer_xpm[] = { // ---------------------------------------------------------------------------- // global instance of a wxFileIconsTable -wxFileIconsTable* wxTheFileIconsTable = (wxFileIconsTable *)NULL; +wxFileIconsTable* wxTheFileIconsTable = NULL; // A module to allow icons table cleanup @@ -1419,11 +1475,7 @@ public: bool OnInit() { wxTheFileIconsTable = new wxFileIconsTable; return true; } void OnExit() { - if (wxTheFileIconsTable) - { - delete wxTheFileIconsTable; - wxTheFileIconsTable = NULL; - } + wxDELETE(wxTheFileIconsTable); } }; @@ -1432,9 +1484,9 @@ IMPLEMENT_DYNAMIC_CLASS(wxFileIconsTableModule, wxModule) class wxFileIconEntry : public wxObject { public: - wxFileIconEntry(int i) { id = i; } + wxFileIconEntry(int i) { iconid = i; } - int id; + int iconid; }; wxFileIconsTable::wxFileIconsTable() @@ -1498,14 +1550,14 @@ void wxFileIconsTable::Create() wxART_CMN_DIALOG, wxSize(16, 16))); // executable - if (GetIconID(wxEmptyString, _T("application/x-executable")) == file) + if (GetIconID(wxEmptyString, wxT("application/x-executable")) == file) { m_smallImageList->Add(wxArtProvider::GetBitmap(wxART_EXECUTABLE_FILE, wxART_CMN_DIALOG, wxSize(16, 16))); - delete m_HashTable->Get(_T("exe")); - m_HashTable->Delete(_T("exe")); - m_HashTable->Put(_T("exe"), new wxFileIconEntry(executable)); + delete m_HashTable->Get(wxT("exe")); + m_HashTable->Delete(wxT("exe")); + m_HashTable->Put(wxT("exe"), new wxFileIconEntry(executable)); } /* else put into list by GetIconID (KDE defines application/x-executable for *.exe and has nice icon) @@ -1636,7 +1688,7 @@ int wxFileIconsTable::GetIconID(const wxString& extension, const wxString& mime) if (!extension.empty()) { wxFileIconEntry *entry = (wxFileIconEntry*) m_HashTable->Get(extension); - if (entry) return (entry -> id); + if (entry) return (entry -> iconid); } wxFileType *ft = (mime.empty()) ? @@ -1656,7 +1708,7 @@ int wxFileIconsTable::GetIconID(const wxString& extension, const wxString& mime) delete ft; - if ( !ic.Ok() ) + if ( !ic.IsOk() ) { int newid = file; m_HashTable->Put(extension, new wxFileIconEntry(newid)); @@ -1666,7 +1718,7 @@ int wxFileIconsTable::GetIconID(const wxString& extension, const wxString& mime) wxBitmap bmp; bmp.CopyFromIcon(ic); - if ( !bmp.Ok() ) + if ( !bmp.IsOk() ) { int newid = file; m_HashTable->Put(extension, new wxFileIconEntry(newid)); @@ -1675,7 +1727,7 @@ int wxFileIconsTable::GetIconID(const wxString& extension, const wxString& mime) const unsigned int size = 16; - int id = m_smallImageList->GetImageCount(); + int treeid = m_smallImageList->GetImageCount(); if ((bmp.GetWidth() == (int) size) && (bmp.GetHeight() == (int) size)) { m_smallImageList->Add(bmp); @@ -1693,8 +1745,8 @@ int wxFileIconsTable::GetIconID(const wxString& extension, const wxString& mime) } #endif // wxUSE_IMAGE - m_HashTable->Put(extension, new wxFileIconEntry(id)); - return id; + m_HashTable->Put(extension, new wxFileIconEntry(treeid)); + return treeid; #else // !wxUSE_MIMETYPE