// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "dirctrlg.h"
#endif
#include "wx/generic/dirctrlg.h"
+#include "wx/module.h"
#include "wx/utils.h"
#include "wx/button.h"
#include "wx/layout.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"
// 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
#include <stdlib.h>
#include <ctype.h>
-
+extern bool wxIsDriveAvailable(const wxString& dirName);
#endif // __WXPM__
#if defined(__WXMAC__)
{
#if defined(__WINDOWS__) || defined(__DOS__) || defined(__WXPM__)
-#ifdef __WIN32__
+#ifdef __WXWINCE__
+ // 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;
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;
}
CFRelease( cstr );
continue;
}
- wxString name( cstr );
+ wxString name( cstr , wxConvLocal );
DisposePtr( cstr );
CFRelease( cfstr );
int setdrive(int drive)
{
-#if defined(__GNUWIN32__) && \
+#ifdef __WXWINCE__
+ return 0;
+#elif defined(__GNUWIN32__) && \
(defined(__MINGW32_MAJOR_VERSION) && __MINGW32_MAJOR_VERSION >= 1)
return _chdrive(drive);
#else
newdrive[1] = wxT(':');
newdrive[2] = wxT('\0');
#if defined(__WXMSW__)
-#ifdef __WIN16__
- if (wxSetWorkingDirectory(newdrive))
-#else
if (::SetCurrentDirectory(newdrive))
-#endif
#else
// VA doesn't know what LPSTR is and has its own set
if (DosSetCurrentDir((PSZ)newdrive))
bool wxIsDriveAvailable(const wxString& dirName)
{
+#ifdef __WXWINCE__
+ return FALSE;
+#else
#ifdef __WIN32__
UINT errorMode = SetErrorMode(SEM_FAILCRITICALERRORS | SEM_NOOPENFILEERRORBOX);
#endif
#endif
return success;
+#endif
}
#endif // __WINDOWS__ || __WXPM__
+
// 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 LINKAGEMODE wxDirCtrlStringCompareFunction(wxString* strFirst, wxString* strSecond)
{
- wxString *strFirst = (wxString *)first;
- wxString *strSecond = (wxString *)second;
-
return strFirst->CmpNoCase(*strSecond);
}
// wxGenericDirCtrl
//-----------------------------------------------------------------------------
+
+#if wxUSE_EXTENDED_RTTI
+WX_DEFINE_FLAGS( wxGenericDirCtrlStyle )
+
+WX_BEGIN_FLAGS( wxGenericDirCtrlStyle )
+ // new style border flags, we put them first to
+ // use them for streaming out
+ WX_FLAGS_MEMBER(wxBORDER_SIMPLE)
+ WX_FLAGS_MEMBER(wxBORDER_SUNKEN)
+ WX_FLAGS_MEMBER(wxBORDER_DOUBLE)
+ WX_FLAGS_MEMBER(wxBORDER_RAISED)
+ WX_FLAGS_MEMBER(wxBORDER_STATIC)
+ WX_FLAGS_MEMBER(wxBORDER_NONE)
+
+ // old style border flags
+ WX_FLAGS_MEMBER(wxSIMPLE_BORDER)
+ WX_FLAGS_MEMBER(wxSUNKEN_BORDER)
+ WX_FLAGS_MEMBER(wxDOUBLE_BORDER)
+ WX_FLAGS_MEMBER(wxRAISED_BORDER)
+ WX_FLAGS_MEMBER(wxSTATIC_BORDER)
+ WX_FLAGS_MEMBER(wxNO_BORDER)
+
+ // standard window styles
+ WX_FLAGS_MEMBER(wxTAB_TRAVERSAL)
+ WX_FLAGS_MEMBER(wxCLIP_CHILDREN)
+ WX_FLAGS_MEMBER(wxTRANSPARENT_WINDOW)
+ WX_FLAGS_MEMBER(wxWANTS_CHARS)
+ WX_FLAGS_MEMBER(wxNO_FULL_REPAINT_ON_RESIZE)
+ WX_FLAGS_MEMBER(wxALWAYS_SHOW_SB )
+ WX_FLAGS_MEMBER(wxVSCROLL)
+ WX_FLAGS_MEMBER(wxHSCROLL)
+
+ WX_FLAGS_MEMBER(wxDIRCTRL_DIR_ONLY)
+ WX_FLAGS_MEMBER(wxDIRCTRL_3D_INTERNAL)
+ WX_FLAGS_MEMBER(wxDIRCTRL_SELECT_FIRST)
+ WX_FLAGS_MEMBER(wxDIRCTRL_SHOW_FILTERS)
+
+WX_END_FLAGS( wxGenericDirCtrlStyle )
+
+IMPLEMENT_DYNAMIC_CLASS_XTI(wxGenericDirCtrl, wxControl,"wx/dirctrl.h")
+
+WX_BEGIN_PROPERTIES_TABLE(wxGenericDirCtrl)
+ WX_HIDE_PROPERTY( Children )
+ WX_PROPERTY( DefaultPath , wxString , SetDefaultPath , GetDefaultPath , , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+ WX_PROPERTY( Filter , wxString , SetFilter , GetFilter ,, 0 /*flags*/ , wxT("Helpstring") , wxT("group") )
+ WX_PROPERTY( DefaultFilter , int , SetFilterIndex, GetFilterIndex,, 0 /*flags*/ , wxT("Helpstring") , wxT("group") )
+WX_END_PROPERTIES_TABLE()
+
+WX_BEGIN_HANDLERS_TABLE(wxGenericDirCtrl)
+WX_END_HANDLERS_TABLE()
+
+WX_CONSTRUCTOR_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)
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);
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);
- 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()
wxArrayInt icons;
size_t n, count = wxGetAvailableDrives(paths, names, icons);
-
+
for (n = 0; n < count; n++)
{
AddSection(paths[n], names[n], icons[n]);
// VS: this is needed because the event handler is called from wxTreeCtrl
// ctor when wxTR_HIDE_ROOT was specified
- if (m_rootId == 0)
+
+ if (!m_rootId.IsOk())
+
m_rootId = m_treeCtrl->GetRootItem();
ExpandDir(parentId);
return;
data->m_isExpanded = FALSE;
- long cookie;
+ wxTreeItemIdValue cookie;
/* Workaround because DeleteChildren has disapeared (why?) and
* CollapseAndReset doesn't work as advertised (deletes parent too) */
child = m_treeCtrl->GetFirstChild(parentId, cookie);
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)
while (d.GetNext(& eachFilename));
}
}
- filenames.Sort((wxArrayString::CompareFunction) wxDirCtrlStringCompareFunction);
+ filenames.Sort(wxDirCtrlStringCompareFunction);
}
// Add the sorted dirs
path += eachFilename;
wxDirItemData *dir_item = new wxDirItemData(path,eachFilename,TRUE);
- wxTreeItemId id = m_treeCtrl->AppendItem( parentId, eachFilename,
+ wxTreeItemId id = AppendItem( parentId, eachFilename,
wxFileIconsTable::folder, -1, dir_item);
m_treeCtrl->SetItemImage( id, wxFileIconsTable::folder_open,
wxTreeItemIcon_Expanded );
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.MakeLower();
#endif
- long cookie;
+ wxTreeItemIdValue cookie;
wxTreeItemId childId = m_treeCtrl->GetFirstChild(parentId, cookie);
while (childId.IsOk())
{
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;
while (childId.IsOk())
// 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 wxFileDialogBase::ParseWildcard(filterStr, descriptions, filters );
}
void wxGenericDirCtrl::DoResize()
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
//-----------------------------------------------------------------------------
}
}
+
// ----------------------------------------------------------------------------
// wxFileIconsTable icons
// ----------------------------------------------------------------------------
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));
}
wxFileType *ft = (mime.IsEmpty()) ?
wxTheMimeTypesManager -> GetFileTypeFromExtension(extension) :
wxTheMimeTypesManager -> GetFileTypeFromMimeType(mime);
+
+ wxIconLocation iconLoc;
wxIcon ic;
- if (ft == NULL || (!ft->GetIcon(&ic)) || (!ic.Ok()))
+ if ( ft && ft->GetIcon(&iconLoc) )
+ {
+ ic = wxIcon(iconLoc);
+ }
+
+ delete ft;
+
+ if ( !ic.Ok() )
{
int newid = file;
m_HashTable->Put(extension, new wxFileIconEntry(newid));
tmpBmp.CopyFromIcon(ic);
wxImage img = tmpBmp.ConvertToImage();
- delete ft;
-
int id = m_smallImageList->GetImageCount();
if (img.GetWidth() == 16 && img.GetHeight() == 16)
m_smallImageList->Add(wxBitmap(img));
projects / wxWidgets.git / blobdiff