X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/78316bbe3589b0d9bad4de1706d3e8a3215b0867..b0230a69bcf6db9a18bbdefb0c3027c6a438ed55:/src/generic/filedlgg.cpp?ds=inline diff --git a/src/generic/filedlgg.cpp b/src/generic/filedlgg.cpp index c3b2280e4c..60b582dcfb 100644 --- a/src/generic/filedlgg.cpp +++ b/src/generic/filedlgg.cpp @@ -36,7 +36,7 @@ #include "wx/image.h" #include "wx/module.h" #include "wx/config.h" - +#include "wx/imaglist.h" #if wxUSE_TOOLTIPS #include "wx/tooltip.h" @@ -65,25 +65,24 @@ class wxFileIconEntry : public wxObject { - public: - wxFileIconEntry(int i) { id = i; } - - int id; +public: + wxFileIconEntry(int i) { id = i; } + + int id; }; class wxFileIconsTable { - public: +public: + wxFileIconsTable(); - wxFileIconsTable(); - - int GetIconID(const wxString& extension, const wxString& mime = wxEmptyString); - wxImageList *GetImageList() { return &m_ImageList; } + int GetIconID(const wxString& extension, const wxString& mime = wxEmptyString); + wxImageList *GetImageList() { return &m_ImageList; } - protected: - wxImageList m_ImageList; - wxHashTable m_HashTable; +protected: + wxImageList m_ImageList; + wxHashTable m_HashTable; }; static wxFileIconsTable *g_IconsTable = NULL; @@ -99,9 +98,9 @@ wxFileIconsTable::wxFileIconsTable() : 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) + if (GetIconID(wxEmptyString, _T("application/x-executable")) == FI_UNKNOWN) { // FI_EXECUTABLE - m_ImageList.Add(wxBitmap(exefile_xpm)); + m_ImageList.Add(wxBitmap(exefile_xpm)); m_HashTable.Delete(_T("exe")); m_HashTable.Put(_T("exe"), new wxFileIconEntry(FI_EXECUTABLE)); } @@ -116,16 +115,16 @@ static wxBitmap CreateAntialiasedBitmap(const wxImage& img) { wxImage small(16, 16); unsigned char *p1, *p2, *ps; - unsigned char mr = img.GetMaskRed(), - mg = img.GetMaskGreen(), + 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++) @@ -147,8 +146,8 @@ static wxBitmap CreateAntialiasedBitmap(const wxImage& img) sr += p2[0], sg += p2[1], sb += p2[2]; else smask++; p2 += 3; - - if (smask > 2) + + if (smask > 2) ps[0] = ps[1] = ps[2] = mr; else ps[0] = sr >> 2, ps[1] = sg >> 2, ps[2] = sb >> 2; @@ -164,18 +163,18 @@ static wxBitmap CreateAntialiasedBitmap(const wxImage& img) // finds empty borders and return non-empty area of image: static wxImage CutEmptyBorders(const wxImage& img) { - unsigned char mr = img.GetMaskRed(), - mg = img.GetMaskGreen(), + 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); @@ -215,7 +214,7 @@ int wxFileIconsTable::GetIconID(const wxString& extension, const wxString& mime) if (entry) return (entry -> id); } - wxFileType *ft = (mime.IsEmpty()) ? + wxFileType *ft = (mime.IsEmpty()) ? wxTheMimeTypesManager -> GetFileTypeFromExtension(extension) : wxTheMimeTypesManager -> GetFileTypeFromMimeType(mime); wxIcon ic; @@ -227,7 +226,7 @@ int wxFileIconsTable::GetIconID(const wxString& extension, const wxString& mime) } wxImage img(ic); delete ft; - + int id = m_ImageList.GetImageCount(); if (img.GetWidth() == 16 && img.GetHeight() == 16) m_ImageList.Add(img.ConvertToBitmap()); @@ -419,10 +418,10 @@ void wxFileData::MakeItem( wxListItem &item ) item.ClearAttributes(); if (IsExe()) item.SetTextColour(*wxRED); if (IsDir()) item.SetTextColour(*wxBLUE); - + if (IsDir()) item.m_image = FI_FOLDER; - else if (IsExe()) + 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('.'))); @@ -445,11 +444,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("/"); @@ -524,7 +523,7 @@ void wxFileCtrl::Update() if (GetColumnCount() > 0) name_col_width = GetColumnWidth( 0 ); } - + ClearAll(); if (my_style & wxLC_REPORT) { @@ -683,6 +682,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; @@ -873,10 +889,10 @@ wxFileDialog::wxFileDialog(wxWindow *parent, if (m_dialogStyle & wxMULTIPLE) m_list = new wxFileCtrl( this, ID_LIST_CTRL, m_dir, firstWild, wxDefaultPosition, - wxSize(440,180), s_lastViewStyle | wxSUNKEN_BORDER ); + 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 ); + wxSize(440,180), s_lastViewStyle | wxSUNKEN_BORDER | wxLC_SINGLE_SEL ); m_list -> ShowHidden(s_lastShowHidden); mainsizer->Add( m_list, 1, wxEXPAND | wxLEFT|wxRIGHT, 10 ); @@ -909,7 +925,7 @@ wxFileDialog::wxFileDialog(wxWindow *parent, mainsizer->Fit( this ); mainsizer->SetSizeHints( this ); - + Centre( wxBOTH ); if (m_fileName.IsEmpty()) @@ -1155,10 +1171,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 ); } } @@ -1177,10 +1194,11 @@ 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 ); } }