#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/mimetype.h"
#include "wx/image.h"
#include "wx/choice.h"
-#include "wx/filedlg.h" // for wxFileDialogBase::ParseWildcard
#if wxUSE_STATLINE
#include "wx/statline.h"
#ifdef __WXMSW__
#include <windows.h>
+#include "wx/msw/winundef.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
#endif
-#ifdef __OS2__
-
-#define INCL_BASE
-#include <os2.h>
-#ifndef __EMX__
-#include <direct.h>
-#endif
-#include <stdlib.h>
-#include <ctype.h>
-extern bool wxIsDriveAvailable(const wxString& dirName);
+#if defined(__OS2__) || defined(__DOS__)
+ #ifdef __OS2__
+ #define INCL_BASE
+ #include <os2.h>
+ #ifndef __EMX__
+ #include <direct.h>
+ #endif
+ #include <stdlib.h>
+ #include <ctype.h>
+ #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__
// No logical drives; return "\"
paths.Add(wxT("\\"));
names.Add(wxT("\\"));
- return 1;
+ icon_ids.Add(wxFileIconsTable::computer);
#elif defined(__WIN32__)
wxChar driveBuffer[256];
size_t n = (size_t) GetLogicalDriveStrings(255, driveBuffer);
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);
+
+ 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);
+ }
i ++;
- }
- }
+ }
+ }
#else // !__WIN32__, !__OS2__
int drive;
#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("/"));
#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();
}
if ( dirName.Len() == 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)
{
#ifdef __WXWINCE__
+ wxUnusedVar(drive);
return 0;
#elif defined(__GNUWIN32__) && \
(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)
{
#ifdef __WXWINCE__
- return FALSE;
+ wxUnusedVar(dirName);
+ 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.
{
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.
if (err == -1)
{
- success = FALSE;
+ success = false;
}
#endif
}
}
#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);
}
//-----------------------------------------------------------------------------
* 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;
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();
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();
wxFLAGS_MEMBER(wxBORDER_RAISED)
wxFLAGS_MEMBER(wxBORDER_STATIC)
wxFLAGS_MEMBER(wxBORDER_NONE)
-
+
// old style border flags
wxFLAGS_MEMBER(wxSIMPLE_BORDER)
wxFLAGS_MEMBER(wxSUNKEN_BORDER)
wxBEGIN_PROPERTIES_TABLE(wxGenericDirCtrl)
wxHIDE_PROPERTY( Children )
- wxPROPERTY( DefaultPath , wxString , SetDefaultPath , GetDefaultPath , , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
- wxPROPERTY( Filter , wxString , SetFilter , GetFilter ,, 0 /*flags*/ , wxT("Helpstring") , wxT("group") )
- wxPROPERTY( DefaultFilter , int , SetFilterIndex, GetFilterIndex,, 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
BEGIN_EVENT_TABLE(wxGenericDirCtrl, wxControl)
- EVT_TREE_ITEM_EXPANDING (-1, wxGenericDirCtrl::OnExpandItem)
- EVT_TREE_ITEM_COLLAPSED (-1, wxGenericDirCtrl::OnCollapseItem)
- EVT_TREE_BEGIN_LABEL_EDIT (-1, wxGenericDirCtrl::OnBeginEditItem)
- EVT_TREE_END_LABEL_EDIT (-1, wxGenericDirCtrl::OnEndEditItem)
+ EVT_TREE_ITEM_EXPANDING (wxID_TREECTRL, wxGenericDirCtrl::OnExpandItem)
+ EVT_TREE_ITEM_COLLAPSED (wxID_TREECTRL, wxGenericDirCtrl::OnCollapseItem)
+ EVT_TREE_BEGIN_LABEL_EDIT (wxID_TREECTRL, wxGenericDirCtrl::OnBeginEditItem)
+ EVT_TREE_END_LABEL_EDIT (wxID_TREECTRL, wxGenericDirCtrl::OnEndEditItem)
EVT_SIZE (wxGenericDirCtrl::OnSize)
END_EVENT_TABLE()
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,
const wxString& name)
{
if (!wxControl::Create(parent, id, pos, size, style, wxDefaultValidator, name))
- return FALSE;
+ return false;
SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
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;
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))
+ if (!filter.empty() && (style & wxDIRCTRL_SHOW_FILTERS))
m_filterListCtrl = new wxDirFilterListCtrl(this, wxID_FILTERLISTCTRL, wxDefaultPosition, wxDefaultSize, filterStyle);
m_defaultPath = dir;
m_filter = filter;
+ if (m_filter.empty())
+#ifdef __UNIX__
+ m_filter = wxT("*");
+#else
+ m_filter = wxT("*.*");
+#endif
+
SetFilterIndex(defaultFilter);
if (m_filterListCtrl)
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;
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);
DoResize();
- return TRUE;
+ return true;
}
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 )
{
m_showHidden = 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);
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)
void wxGenericDirCtrl::OnEndEditItem(wxTreeEvent &event)
{
- if ((event.GetLabel().IsEmpty()) ||
+ if ((event.GetLabel().empty()) ||
(event.GetLabel() == _(".")) ||
(event.GetLabel() == _("..")) ||
(event.GetLabel().Find(wxT('/')) != wxNOT_FOUND) ||
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) */
* handle disappearing children! */
child = m_treeCtrl->GetFirstChild(parentId, cookie);
}
+ if (parentId != m_treeCtrl->GetRootItem())
+ m_treeCtrl->Collapse(parentId);
}
void wxGenericDirCtrl::ExpandDir(wxTreeItemId parentId)
if (data->m_isExpanded)
return;
- data->m_isExpanded = TRUE;
+ data->m_isExpanded = true;
if (parentId == m_treeCtrl->GetRootItem())
{
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;
}
while(strTok.HasMoreTokens())
{
curFilter = strTok.GetNextToken();
- if (d.GetFirst(& eachFilename, m_currentFilterStr, style))
+ if (d.GetFirst(& eachFilename, curFilter, style))
{
do
{
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,
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('.')));
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'.
{
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))
if (childPath == path3)
{
if (path3.Len() == path2.Len())
- done = TRUE;
+ done = true;
else
- done = FALSE;
+ done = false;
return childId;
}
}
// 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)
// Find the first file in this directory
wxTreeItemIdValue cookie;
wxTreeItemId childId = m_treeCtrl->GetFirstChild(lastId, cookie);
- bool selectedChild = FALSE;
+ bool selectedChild = false;
while (childId.IsOk())
{
wxDirItemData* data = (wxDirItemData*) m_treeCtrl->GetItemData(childId);
- if (data && data->m_path != wxT("") && !data->m_isDir)
+ if (data && data->m_path != wxEmptyString && !data->m_isDir)
{
m_treeCtrl->SelectItem(childId);
m_treeCtrl->EnsureVisible(childId);
- selectedChild = TRUE;
+ selectedChild = true;
break;
}
childId = m_treeCtrl->GetNextChild(lastId, cookie);
m_treeCtrl->EnsureVisible(lastId);
}
- return TRUE;
+ return true;
}
else
- return FALSE;
+ return false;
}
wxString wxGenericDirCtrl::GetPath() const
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)
if (ExtractWildcard(m_filter, m_currentFilter, f, d))
m_currentFilterStr = f;
else
+#ifdef __UNIX__
+ m_currentFilterStr = wxT("*");
+#else
m_currentFilterStr = wxT("*.*");
+#endif
}
// 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;
}
+#if WXWIN_COMPATIBILITY_2_4
// 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 );
+ return wxParseCommonDialogsFilter(filterStr, descriptions, filters );
}
+#endif // WXWIN_COMPATIBILITY_2_4
void wxGenericDirCtrl::DoResize()
{
// 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);
+ m_filterListCtrl->SetSize(wxDefaultCoord,
+ wxDefaultCoord,
+ oldSize.x+10,
+ wxDefaultCoord,
+ wxSIZE_USE_EXISTING);
+ m_filterListCtrl->SetSize(wxDefaultCoord,
+ wxDefaultCoord,
+ oldSize.x,
+ wxDefaultCoord,
+ wxSIZE_USE_EXISTING);
#endif
filterSz = m_filterListCtrl->GetSize();
sz.y -= (filterSz.y + verticalSpacing);
}
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 ();
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,
{
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)
{
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 */
-" ",
-" @@@@@ ",
-" @$$$$$@ ",
-" @$#+#+#$@@@@@@ ",
-" @$+#+#+$$$$$$@.",
-" @$#+#+#+#+#+#@.",
-"@@@@@@@@@@@@@#@.",
-"@$$$$$$$$$$@@+@.",
-"@$#+#+#+#+##.@@.",
-" @$#+#+#+#+#+.@.",
-" @$+#+#+#+#+#.@.",
-" @$+#+#+#+##@..",
-" @@@@@@@@@@@@@.",
-" .............",
-" ",
-" "};
-
+#ifndef __WXGTK24__
/* Computer */
static const char * file_icons_tbl_computer_xpm[] = {
"16 16 7 1",
" .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 ",
-" ",
-" ",
-" "};
+#endif // GTK+ < 2.4
// ----------------------------------------------------------------------------
// wxFileIconsTable & friends
DECLARE_DYNAMIC_CLASS(wxFileIconsTableModule)
public:
wxFileIconsTableModule() {}
- bool OnInit() { wxTheFileIconsTable = new wxFileIconsTable; return TRUE; }
+ bool OnInit() { wxTheFileIconsTable = new wxFileIconsTable; return true; }
void OnExit()
{
if (wxTheFileIconsTable)
m_smallImageList = new wxImageList(16, 16);
// folder:
- m_smallImageList->Add(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));
return m_smallImageList;
}
-#if wxUSE_MIMETYPE
+#if wxUSE_MIMETYPE && wxUSE_IMAGE
// 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)
{
- wxImage smallimg (16, 16);
+ const unsigned int size = 16;
+
+ wxImage smallimg (size, size);
unsigned char *p1, *p2, *ps;
unsigned char mr = img.GetMaskRed(),
mg = img.GetMaskGreen(),
unsigned x, y;
unsigned sr, sg, sb, smask;
- p1 = img.GetData(), p2 = img.GetData() + 3 * 32, ps = smallimg.GetData();
+ p1 = img.GetData(), p2 = img.GetData() + 3 * size*2, ps = smallimg.GetData();
smallimg.SetMaskColour(mr, mr, mr);
- for (y = 0; y < 16; y++)
+ for (y = 0; y < size; y++)
{
- for (x = 0; x < 16; x++)
+ for (x = 0; x < size; x++)
{
sr = sg = sb = smask = 0;
if (p1[0] != mr || p1[1] != mg || p1[2] != mb)
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 += 32 * 3, p2 += 32 * 3;
+ p1 += size*2 * 3, p2 += size*2 * 3;
}
return wxBitmap(smallimg);
}
+// This function is currently not unused anymore
+#if 0
// finds empty borders and return non-empty area of image:
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)
return img.GetSubImage(wxRect(left, top, right - left + 1, bottom - top + 1));
}
+#endif // #if 0
+
#endif // wxUSE_MIMETYPE
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);
wxLogNull logNull;
if ( ft && ft->GetIcon(&iconLoc) )
{
- ic = wxIcon(iconLoc);
+ ic = wxIcon( iconLoc );
}
}
return newid;
}
+ const unsigned int size = 16;
+
int id = m_smallImageList->GetImageCount();
- if ((bmp.GetWidth() == 16) && (bmp.GetHeight() == 16))
+ if ((bmp.GetWidth() == (int) size) && (bmp.GetHeight() == (int) size))
+ {
m_smallImageList->Add(bmp);
+ }
+#if wxUSE_IMAGE
else
{
wxImage img = bmp.ConvertToImage();
- if ((img.GetWidth() != 32) || (img.GetHeight() != 32))
- m_smallImageList->Add(CreateAntialiasedBitmap(CutEmptyBorders(img).Rescale(32, 32)));
+ if ((img.GetWidth() != size*2) || (img.GetHeight() != size*2))
+// m_smallImageList->Add(CreateAntialiasedBitmap(CutEmptyBorders(img).Rescale(size*2, size*2)));
+ m_smallImageList->Add(CreateAntialiasedBitmap(img.Rescale(size*2, size*2)));
else
m_smallImageList->Add(CreateAntialiasedBitmap(img));
}
+#endif // wxUSE_IMAGE
+
m_HashTable->Put(extension, new wxFileIconEntry(id));
return id;
#else // !wxUSE_MIMETYPE
+ wxUnusedVar(mime);
if (extension == wxT("exe"))
return executable;
else
#endif // wxUSE_MIMETYPE/!wxUSE_MIMETYPE
}
-#endif // wxUSE_DIRDLG
+#endif // wxUSE_DIRDLG || wxUSE_FILEDLG
projects / wxWidgets.git / blobdiff