X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/19d8dd12a4c210c4ae932c1f9ff80b147b0cb1c4..9e06a15fc2f2144f7161dc813941e5c5ccd41132:/src/generic/dirctrlg.cpp?ds=sidebyside diff --git a/src/generic/dirctrlg.cpp b/src/generic/dirctrlg.cpp index 07359fdbcf..8e0994cf03 100644 --- a/src/generic/dirctrlg.cpp +++ b/src/generic/dirctrlg.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: dirctrlg.cpp +// Name: src/generic/dirctrlg.cpp // Purpose: wxGenericDirCtrl // Author: Harm van der Heijden, Robert Roebling, Julian Smart // Modified by: @@ -9,100 +9,99 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "dirctrlg.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif -#if wxUSE_DIRDLG +#if wxUSE_DIRDLG || wxUSE_FILEDLG #include "wx/generic/dirctrlg.h" -#include "wx/module.h" -#include "wx/utils.h" -#include "wx/button.h" -#include "wx/layout.h" -#include "wx/msgdlg.h" -#include "wx/textctrl.h" -#include "wx/textdlg.h" +#ifndef WX_PRECOMP + #include "wx/hash.h" + #include "wx/intl.h" + #include "wx/log.h" + #include "wx/utils.h" + #include "wx/button.h" + #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" + #include "wx/sizer.h" + #include "wx/textdlg.h" + #include "wx/gdicmn.h" + #include "wx/image.h" + #include "wx/module.h" +#endif + #include "wx/filefn.h" -#include "wx/cmndata.h" -#include "wx/gdicmn.h" -#include "wx/intl.h" #include "wx/imaglist.h" -#include "wx/icon.h" -#include "wx/log.h" -#include "wx/sizer.h" #include "wx/tokenzr.h" #include "wx/dir.h" -#include "wx/settings.h" #include "wx/artprov.h" -#include "wx/hash.h" #include "wx/mimetype.h" -#include "wx/image.h" -#include "wx/choice.h" -#include "wx/filedlg.h" // for wxFileDialogBase::ParseWildcard #if wxUSE_STATLINE #include "wx/statline.h" #endif #if defined(__WXMAC__) - #include "wx/mac/private.h" // includes mac headers + #include "wx/mac/private.h" // includes mac headers #endif #ifdef __WXMSW__ #include +#include "wx/msw/winundef.h" +#include "wx/volume.h" // FIXME - Mingw32 1.0 has both _getdrive() and _chdrive(). For now, let's assume // older releases don't, but it should be verified and the checks modified // accordingly. #if !defined(__GNUWIN32__) || (defined(__MINGW32_MAJOR_VERSION) && __MINGW32_MAJOR_VERSION >= 1) #if !defined(__WXWINCE__) - #include + #include #endif - #include - #include + #include + #include #endif #endif #if defined(__OS2__) || defined(__DOS__) - #ifdef __OS2__ - #define INCL_BASE - #include - #ifndef __EMX__ - #include + #ifdef __OS2__ + #define INCL_BASE + #include + #ifndef __EMX__ + #include + #endif + #include + #include #endif - #include - #include - #endif - extern bool wxIsDriveAvailable(const wxString& dirName); #endif // __OS2__ #if defined(__WXMAC__) -# ifdef __DARWIN__ -# include "MoreFilesX.h" -# else -# include "MoreFilesExtras.h" -# endif + #include "MoreFilesX.h" #endif #ifdef __BORLANDC__ -#include "dos.h" + #include "dos.h" #endif +extern WXDLLEXPORT_DATA(const wxChar) wxFileSelectorDefaultWildcardStr[]; + // If compiled under Windows, this macro can cause problems #ifdef GetFirstChild #undef GetFirstChild #endif +bool wxIsDriveAvailable(const wxString& dirName); + // ---------------------------------------------------------------------------- // wxGetAvailableDrives, for WINDOWS, DOS, OS2, MAC, UNIX (returns "/") // ---------------------------------------------------------------------------- @@ -115,74 +114,92 @@ size_t wxGetAvailableDrives(wxArrayString &paths, wxArrayString &names, wxArrayI // No logical drives; return "\" paths.Add(wxT("\\")); names.Add(wxT("\\")); - return 1; -#elif defined(__WIN32__) - wxChar driveBuffer[256]; - size_t n = (size_t) GetLogicalDriveStrings(255, driveBuffer); - size_t i = 0; - while (i < n) - { - wxString path, name; - path.Printf(wxT("%c:\\"), driveBuffer[i]); - name.Printf(wxT("%c:"), driveBuffer[i]); + icon_ids.Add(wxFileIconsTable::computer); +#elif defined(__WIN32__) && wxUSE_FSVOLUME + // TODO: this code (using wxFSVolumeBase) should be used for all platforms + // but unfortunately wxFSVolumeBase is not implemented everywhere + const wxArrayString as = wxFSVolumeBase::GetVolumes(); + for (size_t i = 0; i < as.GetCount(); i++) + { + wxString path = as[i]; + wxFSVolume vol(path); int imageId; - int driveType = ::GetDriveType(path); - switch (driveType) + switch (vol.GetKind()) { - case DRIVE_REMOVABLE: - if (path == wxT("a:\\") || path == wxT("b:\\")) + case wxFS_VOL_FLOPPY: + if ( (path == wxT("a:\\")) || (path == wxT("b:\\")) ) imageId = wxFileIconsTable::floppy; else imageId = wxFileIconsTable::removeable; break; - case DRIVE_CDROM: + case wxFS_VOL_DVDROM: + case wxFS_VOL_CDROM: imageId = wxFileIconsTable::cdrom; break; - case DRIVE_REMOTE: - case DRIVE_FIXED: + case wxFS_VOL_NETWORK: + if (path[0] == wxT('\\')) + continue; // skip "\\computer\folder" + imageId = wxFileIconsTable::drive; + break; + case wxFS_VOL_DISK: + case wxFS_VOL_OTHER: default: imageId = wxFileIconsTable::drive; break; } - paths.Add(path); - names.Add(name); + names.Add(vol.GetDisplayName()); icon_ids.Add(imageId); - - while (driveBuffer[i] != wxT('\0')) - i ++; - i ++; - if (driveBuffer[i] == wxT('\0')) - break; } #elif defined(__OS2__) APIRET rc; ULONG ulDriveNum = 0; ULONG ulDriveMap = 0; rc = ::DosQueryCurrentDisk(&ulDriveNum, &ulDriveMap); - if ( rc == 0){ + if ( rc == 0) + { size_t i = 0; while (i < 26) { - if (ulDriveMap & ( 1 << i )) - { - wxString path, name; - path.Printf(wxT("%c:\\"), 'A' + i); - name.Printf(wxT("%c:"), 'A' + i); - - int imageId; - if (path == wxT("A:\\") || path == wxT("B:\\")) - imageId = wxFileIconsTable::floppy; - else - imageId = wxFileIconsTable::drive; - paths.Add(path); - names.Add(name); - icon_ids.Add(imageId); - } + if (ulDriveMap & ( 1 << i )) + { + wxString path, name; + path.Printf(wxT("%c:\\"), 'A' + i); + name.Printf(wxT("%c:"), 'A' + i); + + // Note: If _filesys is unsupported by some compilers, + // we can always replace it by DosQueryFSAttach + char filesysname[20]; +#ifdef __WATCOMC__ + ULONG cbBuffer = sizeof(filesysname); + PFSQBUFFER2 pfsqBuffer = (PFSQBUFFER2)filesysname; + APIRET rc = ::DosQueryFSAttach(name.fn_str(),0,FSAIL_QUERYNAME,pfsqBuffer,&cbBuffer); + if (rc != NO_ERROR) + { + filesysname[0] = '\0'; + } +#else + _filesys(name.fn_str(), filesysname, sizeof(filesysname)); +#endif + /* FAT, LAN, HPFS, CDFS, NFS */ + int imageId; + if (path == wxT("A:\\") || path == wxT("B:\\")) + imageId = wxFileIconsTable::floppy; + else if (!strcmp(filesysname, "CDFS")) + imageId = wxFileIconsTable::cdrom; + else if (!strcmp(filesysname, "LAN") || + !strcmp(filesysname, "NFS")) + imageId = wxFileIconsTable::drive; + else + imageId = wxFileIconsTable::drive; + paths.Add(path); + names.Add(name); + icon_ids.Add(imageId); + } i ++; - } - } + } + } #else // !__WIN32__, !__OS2__ int drive; @@ -203,87 +220,36 @@ size_t wxGetAvailableDrives(wxArrayString &paths, wxArrayString &names, wxArrayI #endif // __WIN32__/!__WIN32__ #elif defined(__WXMAC__) -#ifdef __DARWIN__ - FSRef **theVolRefs; - ItemCount theVolCount; - char thePath[FILENAME_MAX]; - - if (FSGetMountedVolumes(&theVolRefs, &theVolCount) == noErr) { - ItemCount index; - ::HLock( (Handle)theVolRefs ) ; - for (index = 0; index < theVolCount; ++index) { - // get the POSIX path associated with the FSRef - if ( FSRefMakePath(&((*theVolRefs)[index]), - (UInt8 *)thePath, sizeof(thePath)) != noErr ) { - continue; - } - // add path separator at end if necessary - wxString path( thePath , wxConvLocal) ; - if (path.Last() != wxFILE_SEP_PATH) { - path += wxFILE_SEP_PATH; - } - // get Mac volume name for display - FSVolumeRefNum vRefNum ; - HFSUniStr255 volumeName ; - if ( FSGetVRefNum(&((*theVolRefs)[index]), &vRefNum) != noErr ) { - continue; - } - if ( FSGetVInfo(vRefNum, &volumeName, NULL, NULL) != noErr ) { - continue; - } - // get C string from Unicode HFS name - // see: http://developer.apple.com/carbon/tipsandtricks.html - CFStringRef cfstr = CFStringCreateWithCharacters( kCFAllocatorDefault, - volumeName.unicode, - volumeName.length ); - // Do something with str - char *cstr = NewPtr(CFStringGetLength(cfstr) + 1); - if (( cstr == NULL ) || - !CFStringGetCString(cfstr, cstr, CFStringGetLength(cfstr) + 1, - kCFStringEncodingMacRoman)) + ItemCount volumeIndex = 1; + OSErr err = noErr ; + + while( noErr == err ) + { + HFSUniStr255 volumeName ; + FSRef fsRef ; + FSVolumeInfo volumeInfo ; + err = FSGetVolumeInfo(0, volumeIndex, NULL, kFSVolInfoFlags , &volumeInfo , &volumeName, &fsRef); + if( noErr == err ) + { + wxString path = wxMacFSRefToPath( &fsRef ) ; + wxString name = wxMacHFSUniStrToString( &volumeName ) ; + + if ( (volumeInfo.flags & kFSVolFlagSoftwareLockedMask) || (volumeInfo.flags & kFSVolFlagHardwareLockedMask) ) { - CFRelease( cstr ); - continue; + icon_ids.Add(wxFileIconsTable::cdrom); } - wxString name( cstr , wxConvLocal ); - DisposePtr( cstr ); - CFRelease( cfstr ); - - GetVolParmsInfoBuffer volParmsInfo; - UInt32 actualSize; - if ( FSGetVolParms(vRefNum, sizeof(volParmsInfo), &volParmsInfo, &actualSize) != noErr ) { - continue; + else + { + icon_ids.Add(wxFileIconsTable::drive); } + // todo other removable paths.Add(path); names.Add(name); - - if ( VolIsEjectable(&volParmsInfo) ) - icon_ids.Add(wxFileIconsTable::cdrom); - else - icon_ids.Add(wxFileIconsTable::drive); - } - ::HUnlock( (Handle)theVolRefs ); - ::DisposeHandle( (Handle)theVolRefs ); - } -#else // !__DARWIN__ - FSSpec volume; - short index = 1; - while(1) - { - short actualCount = 0 ; - if (OnLine(&volume, 1, &actualCount, &index ) != noErr || actualCount==0) - { - break; + volumeIndex++ ; } - - wxString name = wxMacFSSpec2MacFilename( &volume ); - paths.Add(name + wxFILE_SEP_PATH); - names.Add(name); - icon_ids.Add(wxFileIconsTable::drive); } -#endif // __DARWIN__ #elif defined(__UNIX__) paths.Add(wxT("/")); @@ -292,6 +258,8 @@ size_t wxGetAvailableDrives(wxArrayString &paths, wxArrayString &names, wxArrayI #else #error "Unsupported platform in wxGenericDirCtrl!" #endif + wxASSERT_MSG( (paths.GetCount() == names.GetCount()), wxT("The number of paths and their human readable names should be equal in number.")); + wxASSERT_MSG( (paths.GetCount() == icon_ids.GetCount()), wxT("Wrong number of icons for available drives.")); return paths.GetCount(); } @@ -304,24 +272,26 @@ size_t wxGetAvailableDrives(wxArrayString &paths, wxArrayString &names, wxArrayI bool wxIsDriveAvailable(const wxString& dirName) { // FIXME_MGL - this method leads to hang up under Watcom for some reason -#ifndef __WATCOMC__ - if ( dirName.Len() == 3 && dirName[1u] == wxT(':') ) +#ifdef __WATCOMC__ + wxUnusedVar(dirName); +#else + if ( dirName.length() == 3 && dirName[1u] == wxT(':') ) { wxString dirNameLower(dirName.Lower()); - // VS: always return TRUE for removable media, since Win95 doesn't + // VS: always return true for removable media, since Win95 doesn't // like it when MS-DOS app accesses empty floppy drive return (dirNameLower[0u] == wxT('a') || dirNameLower[0u] == wxT('b') || - wxPathExists(dirNameLower)); + wxDirExists(dirNameLower)); } else #endif - return TRUE; + return true; } #elif defined(__WINDOWS__) || defined(__OS2__) -int setdrive(int drive) +int setdrive(int WXUNUSED_IN_WINCE(drive)) { #ifdef __WXWINCE__ return 0; @@ -329,47 +299,47 @@ int setdrive(int drive) (defined(__MINGW32_MAJOR_VERSION) && __MINGW32_MAJOR_VERSION >= 1) return _chdrive(drive); #else - wxChar newdrive[4]; + wxChar newdrive[4]; - if (drive < 1 || drive > 31) - return -1; - newdrive[0] = (wxChar)(wxT('A') + drive - 1); - newdrive[1] = wxT(':'); + if (drive < 1 || drive > 31) + return -1; + newdrive[0] = (wxChar)(wxT('A') + drive - 1); + newdrive[1] = wxT(':'); #ifdef __OS2__ - newdrive[2] = wxT('\\'); - newdrive[3] = wxT('\0'); + newdrive[2] = wxT('\\'); + newdrive[3] = wxT('\0'); #else - newdrive[2] = wxT('\0'); + newdrive[2] = wxT('\0'); #endif #if defined(__WXMSW__) - if (::SetCurrentDirectory(newdrive)) + if (::SetCurrentDirectory(newdrive)) #else // VA doesn't know what LPSTR is and has its own set - if (!DosSetCurrentDir((PSZ)newdrive)) + if (!DosSetCurrentDir((PSZ)newdrive)) #endif - return 0; - else - return -1; + return 0; + else + return -1; #endif // !GNUWIN32 } -bool wxIsDriveAvailable(const wxString& dirName) +bool wxIsDriveAvailable(const wxString& WXUNUSED_IN_WINCE(dirName)) { #ifdef __WXWINCE__ - return FALSE; + return false; #else #ifdef __WIN32__ UINT errorMode = SetErrorMode(SEM_FAILCRITICALERRORS | SEM_NOOPENFILEERRORBOX); #endif - bool success = TRUE; + bool success = true; // Check if this is a root directory and if so, // whether the drive is available. - if (dirName.Len() == 3 && dirName[(size_t)1] == wxT(':')) + if (dirName.length() == 3 && dirName[(size_t)1] == wxT(':')) { wxString dirNameLower(dirName.Lower()); #if defined(__GNUWIN32__) && !(defined(__MINGW32_MAJOR_VERSION) && __MINGW32_MAJOR_VERSION >= 1) - success = wxPathExists(dirNameLower); + success = wxDirExists(dirNameLower); #else #if defined(__OS2__) // Avoid changing to drive since no media may be inserted. @@ -383,7 +353,7 @@ bool wxIsDriveAvailable(const wxString& dirName) if (err == -1) { - success = FALSE; + success = false; } #endif } @@ -396,12 +366,17 @@ bool wxIsDriveAvailable(const wxString& dirName) } #endif // __WINDOWS__ || __OS2__ +#endif // wxUSE_DIRDLG || wxUSE_FILEDLG + + + +#if wxUSE_DIRDLG // Function which is called by quick sort. We want to override the default wxArrayString behaviour, // and sort regardless of case. -static int wxCMPFUNC_CONV wxDirCtrlStringCompareFunction(wxString* strFirst, wxString* strSecond) +static int wxCMPFUNC_CONV wxDirCtrlStringCompareFunction(const wxString& strFirst, const wxString& strSecond) { - return strFirst->CmpNoCase(*strSecond); + return strFirst.CmpNoCase(strSecond); } //----------------------------------------------------------------------------- @@ -417,15 +392,11 @@ wxDirItemData::wxDirItemData(const wxString& path, const wxString& name, * In UnixLand we just check whether the first char is a dot * For FileNameFromPath read LastDirNameInThisPath ;-) */ // m_isHidden = (bool)(wxFileNameFromPath(*m_path)[0] == '.'); - m_isHidden = FALSE; - m_isExpanded = FALSE; + m_isHidden = false; + m_isExpanded = false; m_isDir = isDir; } -wxDirItemData::~wxDirItemData() -{ -} - void wxDirItemData::SetNewDirName(const wxString& path) { m_path = path; @@ -434,14 +405,14 @@ void wxDirItemData::SetNewDirName(const wxString& path) bool wxDirItemData::HasSubDirs() const { - if (m_path.IsEmpty()) - return FALSE; + if (m_path.empty()) + return false; wxDir dir; { wxLogNull nolog; if ( !dir.Open(m_path) ) - return FALSE; + return false; } return dir.HasSubDirs(); @@ -449,14 +420,14 @@ bool wxDirItemData::HasSubDirs() const bool wxDirItemData::HasFiles(const wxString& WXUNUSED(spec)) const { - if (m_path.IsEmpty()) - return FALSE; + if (m_path.empty()) + return false; wxDir dir; { wxLogNull nolog; if ( !dir.Open(m_path) ) - return FALSE; + return false; } return dir.HasFiles(); @@ -479,7 +450,7 @@ wxBEGIN_FLAGS( wxGenericDirCtrlStyle ) wxFLAGS_MEMBER(wxBORDER_RAISED) wxFLAGS_MEMBER(wxBORDER_STATIC) wxFLAGS_MEMBER(wxBORDER_NONE) - + // old style border flags wxFLAGS_MEMBER(wxSIMPLE_BORDER) wxFLAGS_MEMBER(wxSUNKEN_BORDER) @@ -501,7 +472,6 @@ wxBEGIN_FLAGS( wxGenericDirCtrlStyle ) wxFLAGS_MEMBER(wxDIRCTRL_DIR_ONLY) wxFLAGS_MEMBER(wxDIRCTRL_3D_INTERNAL) wxFLAGS_MEMBER(wxDIRCTRL_SELECT_FIRST) - wxFLAGS_MEMBER(wxDIRCTRL_SHOW_FILTERS) wxEND_FLAGS( wxGenericDirCtrlStyle ) @@ -509,17 +479,17 @@ 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( 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 ) +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 @@ -537,6 +507,26 @@ wxGenericDirCtrl::wxGenericDirCtrl(void) Init(); } +void wxGenericDirCtrl::ExpandRoot() +{ + ExpandDir(m_rootId); // automatically expand first level + + // Expand and select the default path + if (!m_defaultPath.empty()) + { + ExpandPath(m_defaultPath); + } +#ifdef __UNIX__ + else + { + // On Unix, there's only one node under the (hidden) root node. It + // represents the / path, so the user would always have to expand it; + // let's do it ourselves + ExpandPath( wxT("/") ); + } +#endif +} + bool wxGenericDirCtrl::Create(wxWindow *parent, const wxWindowID id, const wxString& dir, @@ -548,13 +538,24 @@ bool wxGenericDirCtrl::Create(wxWindow *parent, const wxString& name) { if (!wxControl::Create(parent, id, pos, size, style, wxDefaultValidator, name)) - return FALSE; + return false; SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE)); + SetForegroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT)); Init(); - long treeStyle = wxTR_HAS_BUTTONS | wxTR_HIDE_ROOT; + long treeStyle = wxTR_HAS_BUTTONS; + + // On Windows CE, if you hide the root, you get a crash when + // attempting to access data for children of the root item. +#ifndef __WXWINCE__ + treeStyle |= wxTR_HIDE_ROOT; +#endif + +#ifdef __WXGTK20__ + treeStyle |= wxTR_NO_LINES; +#endif if (style & wxDIRCTRL_EDIT_LABELS) treeStyle |= wxTR_EDIT_LABELS; @@ -564,20 +565,18 @@ bool wxGenericDirCtrl::Create(wxWindow *parent, else treeStyle |= wxBORDER_SUNKEN; - long filterStyle = 0; - if ((style & wxDIRCTRL_3D_INTERNAL) == 0) - filterStyle |= wxNO_BORDER; - else - filterStyle |= wxBORDER_SUNKEN; - - m_treeCtrl = new wxTreeCtrl(this, wxID_TREECTRL, pos, size, treeStyle); + m_treeCtrl = CreateTreeCtrl(this, wxID_TREECTRL, + wxPoint(0,0), GetClientSize(), treeStyle); - if (!filter.IsEmpty() && (style & wxDIRCTRL_SHOW_FILTERS)) - m_filterListCtrl = new wxDirFilterListCtrl(this, wxID_FILTERLISTCTRL, wxDefaultPosition, wxDefaultSize, filterStyle); + if (!filter.empty()) + m_filterListCtrl = new wxDirFilterListCtrl(this, wxID_FILTERLISTCTRL); m_defaultPath = dir; m_filter = filter; + if (m_filter.empty()) + m_filter = wxFileSelectorDefaultWildcardStr; + SetFilterIndex(defaultFilter); if (m_filterListCtrl) @@ -585,8 +584,8 @@ bool wxGenericDirCtrl::Create(wxWindow *parent, m_treeCtrl->SetImageList(wxTheFileIconsTable->GetSmallImageList()); - m_showHidden = FALSE; - wxDirItemData* rootData = new wxDirItemData(wxT(""), wxT(""), TRUE); + m_showHidden = false; + wxDirItemData* rootData = new wxDirItemData(wxEmptyString, wxEmptyString, true); wxString rootName; @@ -598,16 +597,13 @@ bool wxGenericDirCtrl::Create(wxWindow *parent, m_rootId = m_treeCtrl->AddRoot( rootName, 3, -1, rootData); m_treeCtrl->SetItemHasChildren(m_rootId); - ExpandDir(m_rootId); // automatically expand first level - // Expand and select the default path - if (!m_defaultPath.IsEmpty()) - ExpandPath(m_defaultPath); + ExpandRoot(); - SetBestSize(size); + SetInitialSize(size); DoResize(); - return TRUE; + return true; } wxGenericDirCtrl::~wxGenericDirCtrl() @@ -616,15 +612,23 @@ wxGenericDirCtrl::~wxGenericDirCtrl() void wxGenericDirCtrl::Init() { - m_showHidden = FALSE; + m_showHidden = false; m_currentFilter = 0; m_currentFilterStr = wxEmptyString; // Default: any file m_treeCtrl = NULL; m_filterListCtrl = NULL; } +wxTreeCtrl* wxGenericDirCtrl::CreateTreeCtrl(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long treeStyle) +{ + return new wxTreeCtrl(parent, id, pos, size, treeStyle); +} + void wxGenericDirCtrl::ShowHidden( bool show ) { + if ( m_showHidden == show ) + return; + m_showHidden = show; wxString path = GetPath(); @@ -635,7 +639,7 @@ void wxGenericDirCtrl::ShowHidden( bool show ) const wxTreeItemId wxGenericDirCtrl::AddSection(const wxString& path, const wxString& name, int imageId) { - wxDirItemData *dir_item = new wxDirItemData(path,name,TRUE); + wxDirItemData *dir_item = new wxDirItemData(path,name,true); wxTreeItemId id = AppendItem( m_rootId, name, imageId, -1, dir_item); @@ -651,10 +655,15 @@ void wxGenericDirCtrl::SetupSections() size_t n, count = wxGetAvailableDrives(paths, names, icons); +#ifdef __WXGTK20__ + wxString home = wxGetHomeDir(); + AddSection( home, _("Home directory"), 1); + home += wxT("/Desktop"); + AddSection( home, _("Desktop"), 1); +#endif + for (n = 0; n < count; n++) - { AddSection(paths[n], names[n], icons[n]); - } } void wxGenericDirCtrl::OnBeginEditItem(wxTreeEvent &event) @@ -676,9 +685,12 @@ void wxGenericDirCtrl::OnBeginEditItem(wxTreeEvent &event) void wxGenericDirCtrl::OnEndEditItem(wxTreeEvent &event) { - if ((event.GetLabel().IsEmpty()) || - (event.GetLabel() == _(".")) || - (event.GetLabel() == _("..")) || + if (event.IsEditCancelled()) + return; + + if ((event.GetLabel().empty()) || + (event.GetLabel() == wxT(".")) || + (event.GetLabel() == wxT("..")) || (event.GetLabel().Find(wxT('/')) != wxNOT_FOUND) || (event.GetLabel().Find(wxT('\\')) != wxNOT_FOUND) || (event.GetLabel().Find(wxT('|')) != wxNOT_FOUND)) @@ -745,7 +757,7 @@ void wxGenericDirCtrl::CollapseDir(wxTreeItemId parentId) if (!data->m_isExpanded) return; - data->m_isExpanded = FALSE; + data->m_isExpanded = false; wxTreeItemIdValue cookie; /* Workaround because DeleteChildren has disapeared (why?) and * CollapseAndReset doesn't work as advertised (deletes parent too) */ @@ -757,6 +769,8 @@ void wxGenericDirCtrl::CollapseDir(wxTreeItemId parentId) * handle disappearing children! */ child = m_treeCtrl->GetFirstChild(parentId, cookie); } + if (parentId != m_treeCtrl->GetRootItem()) + m_treeCtrl->Collapse(parentId); } void wxGenericDirCtrl::ExpandDir(wxTreeItemId parentId) @@ -766,7 +780,7 @@ void wxGenericDirCtrl::ExpandDir(wxTreeItemId parentId) if (data->m_isExpanded) return; - data->m_isExpanded = TRUE; + data->m_isExpanded = true; if (parentId == m_treeCtrl->GetRootItem()) { @@ -780,12 +794,12 @@ void wxGenericDirCtrl::ExpandDir(wxTreeItemId parentId) wxString dirName(data->m_path); -#if defined(__WINDOWS__) || defined(__DOS__) || defined(__OS2__) +#if (defined(__WINDOWS__) && !defined(__WXWINCE__)) || defined(__DOS__) || defined(__OS2__) // Check if this is a root directory and if so, // whether the drive is avaiable. if (!wxIsDriveAvailable(dirName)) { - data->m_isExpanded = FALSE; + data->m_isExpanded = false; //wxMessageBox(wxT("Sorry, this drive is not available.")); return; } @@ -829,8 +843,6 @@ void wxGenericDirCtrl::ExpandDir(wxTreeItemId parentId) // Now do the filenames -- but only if we're allowed to if ((GetWindowStyle() & wxDIRCTRL_DIR_ONLY) == 0) { - wxLogNull log; - d.Open(dirName); if (d.IsOpened()) @@ -844,7 +856,7 @@ void wxGenericDirCtrl::ExpandDir(wxTreeItemId parentId) while(strTok.HasMoreTokens()) { curFilter = strTok.GetNextToken(); - if (d.GetFirst(& eachFilename, m_currentFilterStr, style)) + if (d.GetFirst(& eachFilename, curFilter, style)) { do { @@ -862,15 +874,15 @@ void wxGenericDirCtrl::ExpandDir(wxTreeItemId parentId) // Add the sorted dirs size_t i; - for (i = 0; i < dirs.Count(); i++) + for (i = 0; i < dirs.GetCount(); i++) { - wxString eachFilename(dirs[i]); + eachFilename = dirs[i]; path = dirName; if (!wxEndsWithPathSeparator(path)) path += wxString(wxFILE_SEP_PATH); path += eachFilename; - wxDirItemData *dir_item = new wxDirItemData(path,eachFilename,TRUE); + wxDirItemData *dir_item = new wxDirItemData(path,eachFilename,true); wxTreeItemId id = AppendItem( parentId, eachFilename, wxFileIconsTable::folder, -1, dir_item); m_treeCtrl->SetItemImage( id, wxFileIconsTable::folder_open, @@ -891,15 +903,15 @@ void wxGenericDirCtrl::ExpandDir(wxTreeItemId parentId) // Add the sorted filenames if ((GetWindowStyle() & wxDIRCTRL_DIR_ONLY) == 0) { - for (i = 0; i < filenames.Count(); i++) + for (i = 0; i < filenames.GetCount(); i++) { - wxString eachFilename(filenames[i]); + eachFilename = filenames[i]; path = dirName; if (!wxEndsWithPathSeparator(path)) path += wxString(wxFILE_SEP_PATH); path += eachFilename; //path = dirName + wxString(wxT("/")) + eachFilename; - wxDirItemData *dir_item = new wxDirItemData(path,eachFilename,FALSE); + wxDirItemData *dir_item = new wxDirItemData(path,eachFilename,false); int image_id = wxFileIconsTable::file; if (eachFilename.Find(wxT('.')) != wxNOT_FOUND) image_id = wxTheFileIconsTable->GetIconID(eachFilename.AfterLast(wxT('.'))); @@ -911,7 +923,18 @@ void wxGenericDirCtrl::ExpandDir(wxTreeItemId parentId) void wxGenericDirCtrl::ReCreateTree() { CollapseDir(m_treeCtrl->GetRootItem()); - ExpandDir(m_treeCtrl->GetRootItem()); + ExpandRoot(); +} + +void wxGenericDirCtrl::CollapseTree() +{ + wxTreeItemIdValue cookie; + wxTreeItemId child = m_treeCtrl->GetFirstChild(m_rootId, cookie); + while (child.IsOk()) + { + CollapseDir(child); + child = m_treeCtrl->GetNextChild(m_rootId, cookie); + } } // Find the child that matches the first part of 'path'. @@ -939,7 +962,7 @@ wxTreeItemId wxGenericDirCtrl::FindChild(wxTreeItemId parentId, const wxString& { wxDirItemData* data = (wxDirItemData*) m_treeCtrl->GetItemData(childId); - if (data && !data->m_path.IsEmpty()) + if (data && !data->m_path.empty()) { wxString childPath(data->m_path); if (!wxEndsWithPathSeparator(childPath)) @@ -950,15 +973,15 @@ wxTreeItemId wxGenericDirCtrl::FindChild(wxTreeItemId parentId, const wxString& childPath.MakeLower(); #endif - if (childPath.Len() <= path2.Len()) + if (childPath.length() <= path2.length()) { - wxString path3 = path2.Mid(0, childPath.Len()); + wxString path3 = path2.Mid(0, childPath.length()); if (childPath == path3) { - if (path3.Len() == path2.Len()) - done = TRUE; + if (path3.length() == path2.length()) + done = true; else - done = FALSE; + done = false; return childId; } } @@ -974,7 +997,7 @@ wxTreeItemId wxGenericDirCtrl::FindChild(wxTreeItemId parentId, const wxString& // and select the given tree item. bool wxGenericDirCtrl::ExpandPath(const wxString& path) { - bool done = FALSE; + bool done = false; wxTreeItemId id = FindChild(m_rootId, path, done); wxTreeItemId lastId = id; // The last non-zero id while (id.IsOk() && !done) @@ -985,50 +1008,75 @@ bool wxGenericDirCtrl::ExpandPath(const wxString& path) if (id.IsOk()) lastId = id; } - if (lastId.IsOk()) + if (!lastId.IsOk()) + return false; + + wxDirItemData *data = (wxDirItemData *) m_treeCtrl->GetItemData(lastId); + if (data->m_isDir) { - wxDirItemData *data = (wxDirItemData *) m_treeCtrl->GetItemData(lastId); - if (data->m_isDir) - { - m_treeCtrl->Expand(lastId); - } - if ((GetWindowStyle() & wxDIRCTRL_SELECT_FIRST) && data->m_isDir) + m_treeCtrl->Expand(lastId); + } + if ((GetWindowStyle() & wxDIRCTRL_SELECT_FIRST) && data->m_isDir) + { + // Find the first file in this directory + wxTreeItemIdValue cookie; + wxTreeItemId childId = m_treeCtrl->GetFirstChild(lastId, cookie); + bool selectedChild = false; + while (childId.IsOk()) { - // Find the first file in this directory - wxTreeItemIdValue cookie; - wxTreeItemId childId = m_treeCtrl->GetFirstChild(lastId, cookie); - bool selectedChild = FALSE; - while (childId.IsOk()) - { - wxDirItemData* data = (wxDirItemData*) m_treeCtrl->GetItemData(childId); + data = (wxDirItemData*) m_treeCtrl->GetItemData(childId); - if (data && data->m_path != wxT("") && !data->m_isDir) - { - m_treeCtrl->SelectItem(childId); - m_treeCtrl->EnsureVisible(childId); - selectedChild = TRUE; - break; - } - childId = m_treeCtrl->GetNextChild(lastId, cookie); - } - if (!selectedChild) + if (data && data->m_path != wxEmptyString && !data->m_isDir) { - m_treeCtrl->SelectItem(lastId); - m_treeCtrl->EnsureVisible(lastId); + m_treeCtrl->SelectItem(childId); + m_treeCtrl->EnsureVisible(childId); + selectedChild = true; + break; } + childId = m_treeCtrl->GetNextChild(lastId, cookie); } - else + if (!selectedChild) { m_treeCtrl->SelectItem(lastId); m_treeCtrl->EnsureVisible(lastId); } - - return TRUE; } else - return FALSE; + { + m_treeCtrl->SelectItem(lastId); + m_treeCtrl->EnsureVisible(lastId); + } + + return true; } + +bool wxGenericDirCtrl::CollapsePath(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 ) + { + CollapseDir(id); + + id = FindChild(id, path, done); + + if ( id.IsOk() ) + lastId = id; + } + + if ( !lastId.IsOk() ) + return false; + + m_treeCtrl->SelectItem(lastId); + m_treeCtrl->EnsureVisible(lastId); + + return true; +} + + wxString wxGenericDirCtrl::GetPath() const { wxTreeItemId id = m_treeCtrl->GetSelection(); @@ -1114,43 +1162,55 @@ void wxGenericDirCtrl::SetFilterIndex(int n) if (ExtractWildcard(m_filter, n, f, d)) m_currentFilterStr = f; else +#ifdef __UNIX__ + m_currentFilterStr = wxT("*"); +#else m_currentFilterStr = wxT("*.*"); +#endif } void wxGenericDirCtrl::SetFilter(const wxString& filter) { m_filter = filter; + if (!filter.empty() && !m_filterListCtrl) + m_filterListCtrl = new wxDirFilterListCtrl(this, wxID_FILTERLISTCTRL); + else if (filter.empty() && m_filterListCtrl) + { + m_filterListCtrl->Destroy(); + m_filterListCtrl = NULL; + } + wxString f, d; if (ExtractWildcard(m_filter, m_currentFilter, f, d)) m_currentFilterStr = f; else +#ifdef __UNIX__ + m_currentFilterStr = wxT("*"); +#else m_currentFilterStr = wxT("*.*"); +#endif + // current filter index is meaningless after filter change, set it to zero + SetFilterIndex(0); + if (m_filterListCtrl) + m_filterListCtrl->FillFilterList(m_filter, 0); } // Extract description and actual filter from overall filter string bool wxGenericDirCtrl::ExtractWildcard(const wxString& filterStr, int n, wxString& filter, wxString& description) { wxArrayString filters, descriptions; - int count = ParseFilter(filterStr, filters, descriptions); + int count = wxParseCommonDialogsFilter(filterStr, descriptions, filters); if (count > 0 && n < count) { filter = filters[n]; description = descriptions[n]; - return TRUE; + return true; } - return FALSE; + return false; } -// Parses the global filter, returning the number of filters. -// Returns 0 if none or if there's a problem. -// filterStr is in the form: "All files (*.*)|*.*|JPEG Files (*.jpeg)|*.jpg" - -int wxGenericDirCtrl::ParseFilter(const wxString& filterStr, wxArrayString& filters, wxArrayString& descriptions) -{ - return wxFileDialogBase::ParseWildcard(filterStr, descriptions, filters ); -} void wxGenericDirCtrl::DoResize() { @@ -1161,14 +1221,6 @@ void wxGenericDirCtrl::DoResize() wxSize filterSz ; if (m_filterListCtrl) { -#ifdef __WXMSW__ - // For some reason, this is required in order for the - // correct control height to always be returned, rather - // than the drop-down list height which is sometimes returned. - wxSize oldSize = m_filterListCtrl->GetSize(); - m_filterListCtrl->SetSize(-1, -1, oldSize.x+10, -1, wxSIZE_USE_EXISTING); - m_filterListCtrl->SetSize(-1, -1, oldSize.x, -1, wxSIZE_USE_EXISTING); -#endif filterSz = m_filterListCtrl->GetSize(); sz.y -= (filterSz.y + verticalSpacing); } @@ -1189,9 +1241,9 @@ void wxGenericDirCtrl::OnSize(wxSizeEvent& WXUNUSED(event)) } wxTreeItemId wxGenericDirCtrl::AppendItem (const wxTreeItemId & parent, - const wxString & text, - int image, int selectedImage, - wxTreeItemData * data) + const wxString & text, + int image, int selectedImage, + wxTreeItemData * data) { wxTreeCtrl *treeCtrl = GetTreeCtrl (); @@ -1215,15 +1267,24 @@ wxTreeItemId wxGenericDirCtrl::AppendItem (const wxTreeItemId & parent, IMPLEMENT_CLASS(wxDirFilterListCtrl, wxChoice) BEGIN_EVENT_TABLE(wxDirFilterListCtrl, wxChoice) - EVT_CHOICE(-1, wxDirFilterListCtrl::OnSelFilter) + EVT_CHOICE(wxID_ANY, wxDirFilterListCtrl::OnSelFilter) END_EVENT_TABLE() -bool wxDirFilterListCtrl::Create(wxGenericDirCtrl* parent, const wxWindowID id, - const wxPoint& pos, - const wxSize& size, - long style) +bool wxDirFilterListCtrl::Create(wxGenericDirCtrl* parent, + const wxWindowID id, + const wxPoint& pos, + const wxSize& size, + long style) { m_dirCtrl = parent; + + // by default our border style is determined by the style of our parent + if ( !(style & wxBORDER_MASK) ) + { + style |= parent->HasFlag(wxDIRCTRL_3D_INTERNAL) ? wxBORDER_SUNKEN + : wxBORDER_NONE; + } + return wxChoice::Create(parent, id, pos, size, 0, NULL, style); } @@ -1252,7 +1313,7 @@ void wxDirFilterListCtrl::FillFilterList(const wxString& filter, int defaultFilt { Clear(); wxArrayString descriptions, filters; - size_t n = (size_t) m_dirCtrl->ParseFilter(filter, filters, descriptions); + size_t n = (size_t) wxParseCommonDialogsFilter(filter, descriptions, filters); if (n > 0 && defaultFilter < (int) n) { @@ -1261,178 +1322,80 @@ void wxDirFilterListCtrl::FillFilterList(const wxString& filter, int defaultFilt SetSelection(defaultFilter); } } +#endif // wxUSE_DIRDLG +#if wxUSE_DIRDLG || wxUSE_FILEDLG // ---------------------------------------------------------------------------- // wxFileIconsTable icons // ---------------------------------------------------------------------------- -/* Open folder */ -static const char * file_icons_tbl_folder_open_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 */ -" ", -" @@@@@ ", -" @$$$$$@ ", -" @$#+#+#$@@@@@@ ", -" @$+#+#+$$$$$$@.", -" @$#+#+#+#+#+#@.", -"@@@@@@@@@@@@@#@.", -"@$$$$$$$$$$@@+@.", -"@$#+#+#+#+##.@@.", -" @$#+#+#+#+#+.@.", -" @$+#+#+#+#+#.@.", -" @$+#+#+#+##@..", -" @@@@@@@@@@@@@.", -" .............", -" ", -" "}; - -/* Computer */ +#ifndef __WXGTK24__ +/* Computer (c) Julian Smart */ static const char * file_icons_tbl_computer_xpm[] = { -"16 16 7 1", -" s None c None", -". c #808080", -"X c #c0c0c0", -"o c Black", -"O c Gray100", -"+ c #008080", -"@ c Blue", -" ........... ", -" .XXXXXXXXXX.o", -" .OOOOOOOOO..o", -" .OoooooooX..o", -" .Oo+...@+X..o", -" .Oo+XXX.+X..o", -" .Oo+....+X..o", -" .Oo++++++X..o", -" .OXXXXXXXX.oo", -" ..........o.o", -" ...........Xo", -" .XXXXXXXXXX.o", -" .o.o.o.o.o...o", -" .oXoXoXoXoXo.o ", -".XOXXXXXXXXX.o ", -"............o "}; - -/* Drive */ -static const char * file_icons_tbl_drive_xpm[] = { -"16 16 7 1", -" s None c None", -". c #808080", -"X c #c0c0c0", -"o c Black", -"O c Gray100", -"+ c Green", -"@ c #008000", -" ", -" ", -" ", -" ", -" ............. ", -" .XXXXXXXXXXXX.o", -".OOOOOOOOOOOO..o", -".XXXXXXXXX+@X..o", -".XXXXXXXXXXXX..o", -".X..........X..o", -".XOOOOOOOOOOX..o", -"..............o ", -" ooooooooooooo ", -" ", -" ", -" "}; - -/* CD-ROM */ -static const char *file_icons_tbl_cdrom_xpm[] = { -"16 16 10 1", -" s None c None", -". c #808080", -"X c #c0c0c0", -"o c Yellow", -"O c Blue", -"+ c Black", -"@ c Gray100", -"# c #008080", -"$ c Green", -"% c #008000", -" ... ", -" ..XoX.. ", -" .O.XoXXX+ ", -" ...O.oXXXX+ ", -" .O..X.XXXX+ ", -" ....X.+..XXX+", -" .XXX.+@+.XXX+", -" .X@XX.+.X@@X+", -" .....X...#XX@+ ", -".@@@...XXo.O@X+ ", -".@XXX..XXoXOO+ ", -".@++++..XoX+++ ", -".@$%@@XX+++X.+ ", -".............+ ", -" ++++++++++++ ", -" "}; - -/* Floppy */ -static const char * file_icons_tbl_floppy_xpm[] = { -"16 16 7 1", -" s None c None", -". c #808080", -"X c Gray100", -"o c #c0c0c0", -"O c Black", -"+ c Cyan", -"@ c Red", -" ......X", -" .ooooooO", -" .+++++OO", -" .++++++O", -" .++++++O", -" .ooooooO", -" .......o....oO", -" .oooooo.o.O.XoO", -".XXXXXXXXOOOOOO ", -".ooooooooo@o..O ", -".ooo....oooo..O ", -".o..OOOO...o..O ", -".oooXXXXoooo..O ", -".............O ", -" OOOOOOOOOOOO ", -" "}; - -/* Removeable */ -static const char * file_icons_tbl_removeable_xpm[] = { -"16 16 7 1", -" s None c None", -". c #808080", -"X c #c0c0c0", -"o c Black", -"O c Gray100", -"+ c Red", -"@ c #800000", -" ", -" ", -" ", -" ............. ", -" .XXXXXXXXXXXX.o", -".OOOOOOOOOOOO..o", -".OXXXXXXXXXXX..o", -".O+@.oooooo.X..o", -".OXXOooooooOX..o", -".OXXXOOOOOOXX..o", -".OXXXXXXXXXXX..o", -".O............o ", -" ooooooooooooo ", -" ", +/* columns rows colors chars-per-pixel */ +"16 16 42 1", +"r c #4E7FD0", +"$ c #7198D9", +"; c #DCE6F6", +"q c #FFFFFF", +"u c #4A7CCE", +"# c #779DDB", +"w c #95B2E3", +"y c #7FA2DD", +"f c #3263B4", +"= c #EAF0FA", +"< c #B1C7EB", +"% c #6992D7", +"9 c #D9E4F5", +"o c #9BB7E5", +"6 c #F7F9FD", +", c #BED0EE", +"3 c #F0F5FC", +"1 c #A8C0E8", +" c None", +"0 c #FDFEFF", +"4 c #C4D5F0", +"@ c #81A4DD", +"e c #4377CD", +"- c #E2EAF8", +"i c #9FB9E5", +"> c #CCDAF2", +"+ c #89A9DF", +"s c #5584D1", +"t c #5D89D3", +": c #D2DFF4", +"5 c #FAFCFE", +"2 c #F5F8FD", +"8 c #DFE8F7", +"& c #5E8AD4", +"X c #638ED5", +"a c #CEDCF2", +"p c #90AFE2", +"d c #2F5DA9", +"* c #5282D0", +"7 c #E5EDF9", +". c #A2BCE6", +"O c #8CACE0", +/* pixels */ " ", -" "}; +" .XXXXXXXXXXX ", +" oXO++@#$%&*X ", +" oX=-;:>,<1%X ", +" oX23=-;:4,$X ", +" oX5633789:@X ", +" oX05623=78+X ", +" oXqq05623=OX ", +" oX,,,,,<<<$X ", +" wXXXXXXXXXXe ", +" XrtX%$$y@+O,, ", +" uyiiiiiiiii@< ", +" ouiiiiiiiiiipAdd(wxArtProvider::GetBitmap(wxART_FOLDER, wxART_CMN_DIALOG)); + m_smallImageList->Add(wxArtProvider::GetBitmap(wxART_FOLDER, + wxART_CMN_DIALOG, + wxSize(16, 16))); // folder_open - m_smallImageList->Add(wxIcon(file_icons_tbl_folder_open_xpm)); + m_smallImageList->Add(wxArtProvider::GetBitmap(wxART_FOLDER_OPEN, + wxART_CMN_DIALOG, + wxSize(16, 16))); // computer +#ifdef __WXGTK24__ + // GTK24 uses this icon in the file open dialog + m_smallImageList->Add(wxArtProvider::GetBitmap(wxART_HARDDISK, + wxART_CMN_DIALOG, + wxSize(16, 16))); +#else m_smallImageList->Add(wxIcon(file_icons_tbl_computer_xpm)); +#endif // drive - m_smallImageList->Add(wxIcon(file_icons_tbl_drive_xpm)); + m_smallImageList->Add(wxArtProvider::GetBitmap(wxART_HARDDISK, + wxART_CMN_DIALOG, + wxSize(16, 16))); // cdrom - m_smallImageList->Add(wxIcon(file_icons_tbl_cdrom_xpm)); + m_smallImageList->Add(wxArtProvider::GetBitmap(wxART_CDROM, + wxART_CMN_DIALOG, + wxSize(16, 16))); // floppy - m_smallImageList->Add(wxIcon(file_icons_tbl_floppy_xpm)); + m_smallImageList->Add(wxArtProvider::GetBitmap(wxART_FLOPPY, + wxART_CMN_DIALOG, + wxSize(16, 16))); // removeable - m_smallImageList->Add(wxIcon(file_icons_tbl_removeable_xpm)); + m_smallImageList->Add(wxArtProvider::GetBitmap(wxART_REMOVABLE, + wxART_CMN_DIALOG, + wxSize(16, 16))); // file - m_smallImageList->Add(wxArtProvider::GetBitmap(wxART_NORMAL_FILE, wxART_CMN_DIALOG)); + m_smallImageList->Add(wxArtProvider::GetBitmap(wxART_NORMAL_FILE, + wxART_CMN_DIALOG, + wxSize(16, 16))); // executable if (GetIconID(wxEmptyString, _T("application/x-executable")) == file) { - m_smallImageList->Add(wxArtProvider::GetBitmap(wxART_EXECUTABLE_FILE, wxART_CMN_DIALOG)); + 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)); @@ -1529,14 +1515,14 @@ wxImageList *wxFileIconsTable::GetSmallImageList() return m_smallImageList; } -#if wxUSE_MIMETYPE && wxUSE_IMAGE +#if wxUSE_MIMETYPE && wxUSE_IMAGE && (!defined(__WXMSW__) || wxUSE_WXDIB) // VS: we don't need this function w/o wxMimeTypesManager because we'll only have // one icon and we won't resize it static wxBitmap CreateAntialiasedBitmap(const wxImage& img) { const unsigned int size = 16; - + wxImage smallimg (size, size); unsigned char *p1, *p2, *ps; unsigned char mr = img.GetMaskRed(), @@ -1574,12 +1560,16 @@ static wxBitmap CreateAntialiasedBitmap(const wxImage& img) if (smask > 2) ps[0] = ps[1] = ps[2] = mr; else - ps[0] = sr >> 2, ps[1] = sg >> 2, ps[2] = sb >> 2; + { + ps[0] = (unsigned char)(sr >> 2); + ps[1] = (unsigned char)(sg >> 2); + ps[2] = (unsigned char)(sb >> 2); + } ps += 3; } p1 += size*2 * 3, p2 += size*2 * 3; } - + return wxBitmap(smallimg); } @@ -1598,27 +1588,27 @@ static wxImage CutEmptyBorders(const wxImage& img) 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;} +#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++) + 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--) + 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++) + 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--) + for (empt = true, right = w-1; empt && right > left; right--) { MK_DTTMP(right, 0); for (i = 0; i < h; i++, dttmp+=3*w) @@ -1638,13 +1628,13 @@ int wxFileIconsTable::GetIconID(const wxString& extension, const wxString& mime) Create(); #if wxUSE_MIMETYPE - if (!extension.IsEmpty()) + if (!extension.empty()) { wxFileIconEntry *entry = (wxFileIconEntry*) m_HashTable->Get(extension); if (entry) return (entry -> id); } - wxFileType *ft = (mime.IsEmpty()) ? + wxFileType *ft = (mime.empty()) ? wxTheMimeTypesManager -> GetFileTypeFromExtension(extension) : wxTheMimeTypesManager -> GetFileTypeFromMimeType(mime); @@ -1655,10 +1645,10 @@ int wxFileIconsTable::GetIconID(const wxString& extension, const wxString& mime) wxLogNull logNull; if ( ft && ft->GetIcon(&iconLoc) ) { - ic = wxIcon( iconLoc.GetFileName() ); + ic = wxIcon( iconLoc ); } } - + delete ft; if ( !ic.Ok() ) @@ -1679,13 +1669,13 @@ int wxFileIconsTable::GetIconID(const wxString& extension, const wxString& mime) } const unsigned int size = 16; - + int id = m_smallImageList->GetImageCount(); if ((bmp.GetWidth() == (int) size) && (bmp.GetHeight() == (int) size)) { m_smallImageList->Add(bmp); } -#if wxUSE_IMAGE +#if wxUSE_IMAGE && (!defined(__WXMSW__) || wxUSE_WXDIB) else { wxImage img = bmp.ConvertToImage(); @@ -1703,6 +1693,7 @@ int wxFileIconsTable::GetIconID(const wxString& extension, const wxString& mime) #else // !wxUSE_MIMETYPE + wxUnusedVar(mime); if (extension == wxT("exe")) return executable; else @@ -1710,4 +1701,4 @@ int wxFileIconsTable::GetIconID(const wxString& extension, const wxString& mime) #endif // wxUSE_MIMETYPE/!wxUSE_MIMETYPE } -#endif // wxUSE_DIRDLG +#endif // wxUSE_DIRDLG || wxUSE_FILEDLG