X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a2638e741dc365cb1dca308962e42ec2e6b16583..6f7c5199ed9bc29507d426b13db9346bf1860005:/src/generic/filedlgg.cpp?ds=sidebyside diff --git a/src/generic/filedlgg.cpp b/src/generic/filedlgg.cpp index 8e8f0365c4..10a1c4f423 100644 --- a/src/generic/filedlgg.cpp +++ b/src/generic/filedlgg.cpp @@ -366,16 +366,11 @@ int wxFileIconsTable::GetIconID(const wxString& extension, const wxString& mime) m_HashTable.Put(extension, new wxFileIconEntry(newid)); return newid; } -#ifdef __WIN32__ - wxBitmap myBitmap (ic.GetWidth(), ic.GetHeight() ) ; - wxMemoryDC memDC; - memDC.SelectObject( myBitmap ); - memDC.DrawIcon(ic,0,0); - memDC.SelectObject( wxNullBitmap ); - wxImage img = myBitmap.ConvertToImage(); -#else - wxImage img = ic.ConvertToImage(); -#endif + + wxBitmap tmpBmp; + tmpBmp.CopyFromIcon(ic); + wxImage img = tmpBmp.ConvertToImage(); + delete ft; int id = m_ImageList.GetImageCount(); @@ -445,37 +440,29 @@ wxFileData::wxFileData( const wxString &name, const wxString &fname ) if (name.length() == 2 && name[1u] == wxT(':')) { m_isDir = TRUE; - m_isExe = m_isLink = FALSE; + m_isExe = + m_isLink = FALSE; m_size = 0; return; } -#endif +#endif // __DOS__ || __WINDOWS__ wxStructStat buff; - wxStat( m_fileName, &buff ); #if defined(__UNIX__) && (!defined( __EMX__ ) && !defined(__VMS)) - struct stat lbuff; - lstat( m_fileName.fn_str(), &lbuff ); - m_isLink = S_ISLNK( lbuff.st_mode ); - struct tm *t = localtime( &lbuff.st_mtime ); -#else + lstat( m_fileName.fn_str(), &buff ); + m_isLink = S_ISLNK( buff.st_mode ); +#else // no lstat() + wxStat( m_fileName, &buff ); m_isLink = FALSE; - struct tm *t = localtime( &buff.st_mtime ); #endif -// struct passwd *user = getpwuid( buff.st_uid ); -// struct group *grp = getgrgid( buff.st_gid ); - -#ifdef __VISUALC__ - m_isDir = ((buff.st_mode & _S_IFDIR ) == _S_IFDIR ); -#else - m_isDir = S_ISDIR( buff.st_mode ); -#endif // VC++ - m_isExe = ((buff.st_mode & wxS_IXUSR ) == wxS_IXUSR ); + m_isDir = (buff.st_mode & S_IFDIR) != 0; + m_isExe = (buff.st_mode & wxS_IXUSR) != 0; m_size = buff.st_size; + const struct tm * const t = localtime( &buff.st_mtime ); m_hour = t->tm_hour; m_minute = t->tm_min; m_month = t->tm_mon+1; @@ -483,21 +470,10 @@ wxFileData::wxFileData( const wxString &name, const wxString &fname ) m_year = t->tm_year; m_year += 1900; - char buffer[10]; - sprintf( buffer, "%c%c%c", - ((( buff.st_mode & wxS_IRUSR ) == wxS_IRUSR ) ? 'r' : '-'), - ((( buff.st_mode & wxS_IWUSR ) == wxS_IWUSR ) ? 'w' : '-'), - ((( buff.st_mode & wxS_IXUSR ) == wxS_IXUSR ) ? 'x' : '-') ); -#if wxUSE_UNICODE - m_permissions = wxConvUTF8.cMB2WC( buffer ); -#else - m_permissions = buffer; -#endif - -// m_permissions.sprintf( wxT("%c%c%c"), -// ((( buff.st_mode & S_IRUSR ) == S_IRUSR ) ? wxT('r') : wxT('-')), -// ((( buff.st_mode & S_IWUSR ) == S_IWUSR ) ? wxT('w') : wxT('-')), -// ((( buff.st_mode & S_IXUSR ) == S_IXUSR ) ? wxT('x') : wxT('-')) ); + m_permissions.Printf(_T("%c%c%c"), + buff.st_mode & wxS_IRUSR ? _T('r') : _T('-'), + buff.st_mode & wxS_IWUSR ? _T('w') : _T('-'), + buff.st_mode & wxS_IXUSR ? _T('x') : _T('-')); } wxString wxFileData::GetName() const @@ -1311,13 +1287,13 @@ void wxFileDialog::OnTextChange( wxCommandEvent &WXUNUSED(event) ) // not get the file whose name they typed. if (m_list->GetSelectedItemCount() > 0) { - long item = m_list->GetNextItem(-1, wxLIST_NEXT_ALL, + long item = m_list->GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); while ( item != -1 ) - { + { m_list->SetItemState(item,0, wxLIST_STATE_SELECTED); item = m_list->GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); - } + } } } } @@ -1564,50 +1540,98 @@ void wxFileDialog::GetFilenames(wxArrayString& files) const // global functions // ---------------------------------------------------------------------------- +// common part of both wxFileSelectorEx() and wxFileSelector() +static wxString +DoSelectFile(const wxChar *title, + const wxChar *defaultDir, + const wxChar *defaultFileName, + const wxChar *defaultExtension, + int *indexDefaultExtension, + const wxChar *filter, + int flags, + wxWindow *parent, + int x, + int y) +{ + // the filter may be either given explicitly or created automatically from + // the default extension + wxString filterReal; + if ( filter ) + { + // the user has specified the filter explicitly, use it + filterReal = filter; + } + else if ( !wxIsEmpty(defaultExtension) ) + { + // create the filter to match the given extension + filterReal << wxT("*.") << defaultExtension; + } + + wxFileDialog fileDialog(parent, + title, + defaultDir, + defaultFileName, + filterReal, + flags, + wxPoint(x, y)); + + wxString path; + if ( fileDialog.ShowModal() == wxID_OK ) + { + path = fileDialog.GetPath(); + if ( indexDefaultExtension ) + { + *indexDefaultExtension = fileDialog.GetFilterIndex(); + } + } + + return path; +} + wxString -wxFileSelectorEx(const wxChar *message, - const wxChar *default_path, - const wxChar *default_filename, - int *WXUNUSED(indexDefaultExtension), - const wxChar *wildcard, +wxFileSelectorEx(const wxChar *title, + const wxChar *defaultDir, + const wxChar *defaultFileName, + int *indexDefaultExtension, + const wxChar *filter, int flags, wxWindow *parent, - int x, int y) + int x, + int y) { - // TODO: implement this somehow - return wxFileSelector(message, default_path, default_filename, wxT(""), - wildcard, flags, parent, x, y); + return DoSelectFile(title, + defaultDir, + defaultFileName, + wxT(""), // def ext determined by index + indexDefaultExtension, + filter, + flags, + parent, + x, + y); } -wxString wxFileSelector( const wxChar *title, - const wxChar *defaultDir, const wxChar *defaultFileName, - const wxChar *defaultExtension, const wxChar *filter, int flags, - wxWindow *parent, int x, int y ) +wxString +wxFileSelector(const wxChar *title, + const wxChar *defaultDir, + const wxChar *defaultFileName, + const wxChar *defaultExtension, + const wxChar *filter, + int flags, + wxWindow *parent, + int x, + int y) { - wxString filter2; - if ( defaultExtension && !filter ) - filter2 = wxString(wxT("*.")) + wxString(defaultExtension) ; - else if ( filter ) - filter2 = filter; - - wxString defaultDirString; - if (defaultDir) - defaultDirString = defaultDir; - - wxString defaultFilenameString; - if (defaultFileName) - defaultFilenameString = defaultFileName; - - wxFileDialog fileDialog( parent, title, defaultDirString, defaultFilenameString, filter2, flags, wxPoint(x, y) ); - - if ( fileDialog.ShowModal() == wxID_OK ) - { - return fileDialog.GetPath(); - } - else - { - return wxEmptyString; - } + return DoSelectFile(title, + defaultDir, + defaultFileName, + defaultExtension, + NULL, // not interested in filter index + filter, + flags, + parent, + x, + y); } static wxString GetWildcardString(const wxChar *ext)