// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "dirctrlg.h"
#endif
#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"
// 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 <direct.h>
+#endif
#include <stdlib.h>
#include <ctype.h>
#endif
#endif
-#ifdef __WXPM__
-
-#define INCL_BASE
-#include <os2.h>
-#ifndef __EMX__
-#include <direct.h>
-#endif
-#include <stdlib.h>
-#include <ctype.h>
-extern bool wxIsDriveAvailable(const wxString& dirName);
-#endif // __WXPM__
+#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__
#endif
// ----------------------------------------------------------------------------
-// wxGetAvailableDrives, for WINDOWS, DOS, WXPM, MAC, UNIX (returns "/")
+// wxGetAvailableDrives, for WINDOWS, DOS, OS2, MAC, UNIX (returns "/")
// ----------------------------------------------------------------------------
size_t wxGetAvailableDrives(wxArrayString &paths, wxArrayString &names, wxArrayInt &icon_ids)
{
-#if defined(__WINDOWS__) || defined(__DOS__) || defined(__WXPM__)
+#if defined(__WINDOWS__) || defined(__DOS__) || defined(__OS2__)
-#ifdef __WIN32__
+#ifdef __WXWINCE__
+ // No logical drives; return "\"
+ paths.Add(wxT("\\"));
+ names.Add(wxT("\\"));
+ icon_ids.Add(wxFileIconsTable::computer);
+#elif defined(__WIN32__)
wxChar driveBuffer[256];
size_t n = (size_t) GetLogicalDriveStrings(255, driveBuffer);
size_t i = 0;
path.Printf(wxT("%c:\\"), driveBuffer[i]);
name.Printf(wxT("%c:"), driveBuffer[i]);
- int imageId = wxFileIconsTable::drive;
+ int imageId;
int driveType = ::GetDriveType(path);
switch (driveType)
{
if (driveBuffer[i] == wxT('\0'))
break;
}
-#else // !__WIN32__
+#elif defined(__OS2__)
+ APIRET rc;
+ ULONG ulDriveNum = 0;
+ ULONG ulDriveMap = 0;
+ rc = ::DosQueryCurrentDisk(&ulDriveNum, &ulDriveMap);
+ 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);
+ }
+ i ++;
+ }
+ }
+#else // !__WIN32__, !__OS2__
int drive;
/* If we can switch to the drive, it exists. */
continue;
}
// add path separator at end if necessary
- wxString path( thePath ) ;
+ wxString path( thePath , wxConvLocal) ;
if (path.Last() != wxFILE_SEP_PATH) {
path += wxFILE_SEP_PATH;
}
CFStringRef cfstr = CFStringCreateWithCharacters( kCFAllocatorDefault,
volumeName.unicode,
volumeName.length );
- // Do something with str
+ // Do something with str
char *cstr = NewPtr(CFStringGetLength(cfstr) + 1);
if (( cstr == NULL ) ||
!CFStringGetCString(cfstr, cstr, CFStringGetLength(cfstr) + 1,
kCFStringEncodingMacRoman))
{
- CFRelease( cstr );
+ CFRelease( cfstr );
continue;
}
- wxString name( cstr );
+ wxString name( cstr , wxConvLocal );
DisposePtr( cstr );
CFRelease( cfstr );
#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') ||
}
else
#endif
- return TRUE;
+ return true;
}
-#elif defined(__WINDOWS__) || defined(__WXPM__)
+#elif defined(__WINDOWS__) || defined(__OS2__)
int setdrive(int drive)
{
-#if defined(__GNUWIN32__) && \
+#ifdef __WXWINCE__
+ wxUnusedVar(drive);
+ return 0;
+#elif defined(__GNUWIN32__) && \
(defined(__MINGW32_MAJOR_VERSION) && __MINGW32_MAJOR_VERSION >= 1)
return _chdrive(drive);
#else
- wxChar newdrive[3];
-
- if (drive < 1 || drive > 31)
- return -1;
- newdrive[0] = (wxChar)(wxT('A') + drive - 1);
- newdrive[1] = wxT(':');
- newdrive[2] = wxT('\0');
-#if defined(__WXMSW__)
-#ifdef __WIN16__
- if (wxSetWorkingDirectory(newdrive))
+ wxChar newdrive[4];
+
+ 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');
#else
- if (::SetCurrentDirectory(newdrive))
+ newdrive[2] = wxT('\0');
#endif
+#if defined(__WXMSW__)
+ 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__
+ 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.
#if defined(__GNUWIN32__) && !(defined(__MINGW32_MAJOR_VERSION) && __MINGW32_MAJOR_VERSION >= 1)
success = wxPathExists(dirNameLower);
#else
+ #if defined(__OS2__)
+ // Avoid changing to drive since no media may be inserted.
+ if (dirNameLower[(size_t)0] == 'a' || dirNameLower[(size_t)0] == 'b')
+ return success;
+ #endif
int currentDrive = _getdrive();
int thisDrive = (int) (dirNameLower[(size_t)0] - 'a' + 1) ;
int err = setdrive( thisDrive ) ;
if (err == -1)
{
- success = FALSE;
+ success = false;
}
#endif
}
#endif
return success;
+#endif
}
-#endif // __WINDOWS__ || __WXPM__
+#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 LINKAGEMODE wxDirCtrlStringCompareFunction(const void *first, const void *second)
+static int wxCMPFUNC_CONV wxDirCtrlStringCompareFunction(const wxString& strFirst, const wxString& strSecond)
{
- wxString *strFirst = (wxString *)first;
- wxString *strSecond = (wxString *)second;
-
- 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;
}
bool wxDirItemData::HasSubDirs() const
{
if (m_path.IsEmpty())
- return FALSE;
+ 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;
+ return false;
wxDir dir;
{
wxLogNull nolog;
if ( !dir.Open(m_path) )
- return FALSE;
+ return false;
}
return dir.HasFiles();
// 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)
+ wxFLAGS_MEMBER(wxDIRCTRL_SHOW_FILTERS)
+
+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 (-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()
const wxString& name)
{
if (!wxControl::Create(parent, id, pos, size, style, wxDefaultValidator, name))
- return FALSE;
+ return false;
SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
if ((style & wxDIRCTRL_3D_INTERNAL) == 0)
treeStyle |= wxNO_BORDER;
+ 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 = new wxTreeCtrl(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);
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;
-#if defined(__WINDOWS__) || defined(__WXPM__) || defined(__DOS__)
+#if defined(__WINDOWS__) || defined(__OS2__) || defined(__DOS__)
rootName = _("Computer");
#else
rootName = _("Sections");
if (!m_defaultPath.IsEmpty())
ExpandPath(m_defaultPath);
+ 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;
SetPath(path);
}
-void wxGenericDirCtrl::AddSection(const wxString& path, const wxString& name, int imageId)
+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 = m_treeCtrl->AppendItem( m_rootId, name, imageId, -1, dir_item);
+ wxTreeItemId id = AppendItem( m_rootId, name, imageId, -1, dir_item);
m_treeCtrl->SetItemHasChildren(id);
+
+ return id;
}
void wxGenericDirCtrl::SetupSections()
if (!data->m_isExpanded)
return;
- data->m_isExpanded = FALSE;
- long cookie;
+ 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);
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(__WXPM__)
+#if defined(__WINDOWS__) || 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;
}
// This may take a longish time. Go to busy cursor
wxBusyCursor busy;
-#if defined(__WINDOWS__) || defined(__DOS__) || defined(__WXPM__)
+#if defined(__WINDOWS__) || defined(__DOS__) || defined(__OS2__)
if (dirName.Last() == ':')
dirName += wxString(wxFILE_SEP_PATH);
#endif
dirs.Add(eachFilename);
}
}
- while (d.GetNext(& eachFilename));
+ while (d.GetNext(&eachFilename));
}
}
- dirs.Sort((wxArrayString::CompareFunction) wxDirCtrlStringCompareFunction);
+ dirs.Sort(wxDirCtrlStringCompareFunction);
// Now do the filenames -- but only if we're allowed to
if ((GetWindowStyle() & wxDIRCTRL_DIR_ONLY) == 0)
if (d.IsOpened())
{
- if (d.GetFirst(& eachFilename, m_currentFilterStr, wxDIR_FILES))
+ int style = wxDIR_FILES;
+ if (m_showHidden) style |= wxDIR_HIDDEN;
+ // Process each filter (ex: "JPEG Files (*.jpg;*.jpeg)|*.jpg;*.jpeg")
+ wxStringTokenizer strTok;
+ wxString curFilter;
+ strTok.SetString(m_currentFilterStr,wxT(";"));
+ while(strTok.HasMoreTokens())
{
- do
+ curFilter = strTok.GetNextToken();
+ if (d.GetFirst(& eachFilename, m_currentFilterStr, style))
{
- if ((eachFilename != wxT(".")) && (eachFilename != wxT("..")))
+ do
{
- filenames.Add(eachFilename);
+ if ((eachFilename != wxT(".")) && (eachFilename != wxT("..")))
+ {
+ filenames.Add(eachFilename);
+ }
}
+ while (d.GetNext(& eachFilename));
}
- while (d.GetNext(& eachFilename));
}
}
- filenames.Sort((wxArrayString::CompareFunction) wxDirCtrlStringCompareFunction);
+ filenames.Sort(wxDirCtrlStringCompareFunction);
}
// Add the sorted dirs
path += wxString(wxFILE_SEP_PATH);
path += eachFilename;
- wxDirItemData *dir_item = new wxDirItemData(path,eachFilename,TRUE);
- wxTreeItemId id = m_treeCtrl->AppendItem( parentId, eachFilename,
+ 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,
wxTreeItemIcon_Expanded );
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)m_treeCtrl->AppendItem( parentId, eachFilename, image_id, -1, dir_item);
+ (void) AppendItem( parentId, eachFilename, image_id, -1, dir_item);
}
}
}
path2 += wxString(wxFILE_SEP_PATH);
// In MSW or PM, case is not significant
-#if defined(__WINDOWS__) || defined(__DOS__) || defined(__WXPM__)
+#if defined(__WINDOWS__) || defined(__DOS__) || defined(__OS2__)
path2.MakeLower();
#endif
- long cookie;
+ wxTreeItemIdValue cookie;
wxTreeItemId childId = m_treeCtrl->GetFirstChild(parentId, cookie);
while (childId.IsOk())
{
childPath += wxString(wxFILE_SEP_PATH);
// In MSW and PM, case is not significant
-#if defined(__WINDOWS__) || defined(__DOS__) || defined(__WXPM__)
+#if defined(__WINDOWS__) || defined(__DOS__) || defined(__OS2__)
childPath.MakeLower();
#endif
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)
if ((GetWindowStyle() & wxDIRCTRL_SELECT_FIRST) && data->m_isDir)
{
// Find the first file in this directory
- long cookie;
+ 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
wxString dirName(data->m_path);
-#if defined(__WXMSW__) || defined(__WXPM__)
+#if defined(__WXMSW__) || defined(__OS2__)
if (dirName.Last() == ':')
dirName += wxString(wxFILE_SEP_PATH);
#endif
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"
-
+// filterStr is in the form: "All files (*.*)|*.*|JPEG Files (*.jpeg)|*.jpg"
int wxGenericDirCtrl::ParseFilter(const wxString& filterStr, wxArrayString& filters, wxArrayString& descriptions)
{
- wxString str(filterStr);
-
- wxString description, filter;
- int pos;
- bool finished = FALSE;
- do
- {
- pos = str.Find(wxT('|'));
- if (pos == -1)
- return 0; // Problem
- description = str.Left(pos);
- str = str.Mid(pos+1);
- pos = str.Find(wxT('|'));
- if (pos == -1)
- {
- filter = str;
- finished = TRUE;
- }
- else
- {
- filter = str.Left(pos);
- str = str.Mid(pos+1);
- }
- descriptions.Add(description);
- filters.Add(filter);
- }
- while (!finished) ;
-
- return filters.Count();
+ 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);
DoResize();
}
+wxTreeItemId wxGenericDirCtrl::AppendItem (const wxTreeItemId & parent,
+ const wxString & text,
+ int image, int selectedImage,
+ wxTreeItemData * data)
+{
+ wxTreeCtrl *treeCtrl = GetTreeCtrl ();
+
+ wxASSERT (treeCtrl);
+
+ if (treeCtrl)
+ {
+ return treeCtrl->AppendItem (parent, text, image, selectedImage, data);
+ }
+ else
+ {
+ return wxTreeItemId();
+ }
+}
+
+
//-----------------------------------------------------------------------------
// wxDirFilterListCtrl
//-----------------------------------------------------------------------------
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, filters, descriptions);
if (n > 0 && defaultFilter < (int) n)
{
- size_t i = 0;
- for (i = 0; i < n; i++)
+ for (size_t i = 0; i < n; i++)
Append(descriptions[i]);
SetSelection(defaultFilter);
}
}
+#endif // wxUSE_DIRDLG
+
+#if wxUSE_DIRDLG || wxUSE_FILEDLG
// ----------------------------------------------------------------------------
// wxFileIconsTable icons
DECLARE_DYNAMIC_CLASS(wxFileIconsTableModule)
public:
wxFileIconsTableModule() {}
- bool OnInit() { wxTheFileIconsTable = new wxFileIconsTable; return TRUE; }
+ bool OnInit() { wxTheFileIconsTable = new wxFileIconsTable; return true; }
void OnExit()
{
if (wxTheFileIconsTable)
wxFileIconsTable::~wxFileIconsTable()
{
- if (m_HashTable) delete m_HashTable;
+ if (m_HashTable)
+ {
+ WX_CLEAR_HASH_TABLE(*m_HashTable);
+ delete m_HashTable;
+ }
if (m_smallImageList) delete m_smallImageList;
}
void wxFileIconsTable::Create()
{
wxCHECK_RET(!m_smallImageList && !m_HashTable, wxT("creating icons twice"));
-printf("creating \n"); fflush(stdout);
m_HashTable = new wxHashTable(wxKEY_STRING);
m_smallImageList = new wxImageList(16, 16);
- m_HashTable->DeleteContents(TRUE);
// folder:
m_smallImageList->Add(wxArtProvider::GetBitmap(wxART_FOLDER, wxART_CMN_DIALOG));
// folder_open
if (GetIconID(wxEmptyString, _T("application/x-executable")) == file)
{
m_smallImageList->Add(wxArtProvider::GetBitmap(wxART_EXECUTABLE_FILE, wxART_CMN_DIALOG));
+ 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)
ps[0] = sr >> 2, ps[1] = sg >> 2, ps[2] = 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)
wxFileType *ft = (mime.IsEmpty()) ?
wxTheMimeTypesManager -> GetFileTypeFromExtension(extension) :
wxTheMimeTypesManager -> GetFileTypeFromMimeType(mime);
+
+ wxIconLocation iconLoc;
wxIcon ic;
- if (ft == NULL || (!ft->GetIcon(&ic)) || (!ic.Ok()))
+
+ {
+ wxLogNull logNull;
+ if ( ft && ft->GetIcon(&iconLoc) )
+ {
+ ic = wxIcon( iconLoc.GetFileName() );
+ }
+ }
+
+ delete ft;
+
+ if ( !ic.Ok() )
{
int newid = file;
m_HashTable->Put(extension, new wxFileIconEntry(newid));
return newid;
}
- wxBitmap tmpBmp;
- tmpBmp.CopyFromIcon(ic);
- wxImage img = tmpBmp.ConvertToImage();
+ wxBitmap bmp;
+ bmp.CopyFromIcon(ic);
- delete ft;
+ if ( !bmp.Ok() )
+ {
+ int newid = file;
+ m_HashTable->Put(extension, new wxFileIconEntry(newid));
+ return newid;
+ }
+
+ const unsigned int size = 16;
int id = m_smallImageList->GetImageCount();
- if (img.GetWidth() == 16 && img.GetHeight() == 16)
- m_smallImageList->Add(wxBitmap(img));
+ if ((bmp.GetWidth() == (int) size) && (bmp.GetHeight() == (int) size))
+ {
+ m_smallImageList->Add(bmp);
+ }
+#if wxUSE_IMAGE
else
{
- if (img.GetWidth() != 32 || img.GetHeight() != 32)
- m_smallImageList->Add(CreateAntialiasedBitmap(CutEmptyBorders(img).Rescale(32, 32)));
+ wxImage img = bmp.ConvertToImage();
+
+ 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