Applied patch [ 708582 ] wxGenericFileDialog & expose generic wxFileCtrl

By John Labenski (jrl1)

The wxFileCtrl is a nice little widget that when
married with a wxDirCtrl makes for a simple, easy to
use explorer type widget.

include/wx/generic/filedlgg.h, src/generic/filedlg.cpp

Expose wxFileData and wxFileCtrl, rename wxFileDialog
to wxGenericFileDialog, it can be used in MSW now.

wxFileCtrl - added sorting for clicking in the col headers.
let wxGenericFileDialog manage it's own static text.
allow for viewing of root (for showing drives) in MSW
wxFileData - moved enum for wxFileCtrl col's into it.
added IsDrive and use bitmask instead of a slew of
bools for IsDir...

A couple bug fixes for wxFileCtrl for MSW, c:\.. is not
a file and can't be stated, show drives.

Basicly its the same as before, with no change besides
sorting for GTK. For MSW, the wxFileCtrl works in a few
more cases, hopefully all the MGL etc code was
untouched and should still work.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19964 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2003-04-03 13:10:08 +00:00
parent 72c30d6572
commit 23254b138a
2 changed files with 424 additions and 239 deletions

View File

@@ -1,6 +1,6 @@
/////////////////////////////////////////////////////////////////////////////
// Name: filedlgg.h
// Purpose: wxFileDialog
// Purpose: wxGenericFileDialog
// Author: Robert Roebling
// Modified by:
// Created: 8/17/99
@@ -17,13 +17,7 @@
#endif
#include "wx/dialog.h"
//-----------------------------------------------------------------------------
// data
//-----------------------------------------------------------------------------
WXDLLEXPORT_DATA(extern const wxChar *)wxFileSelectorPromptStr;
WXDLLEXPORT_DATA(extern const wxChar *)wxFileSelectorDefaultWildcardStr;
#include "wx/listctrl.h"
//-----------------------------------------------------------------------------
// classes
@@ -33,28 +27,44 @@ class wxCheckBox;
class wxChoice;
class wxFileData;
class wxFileCtrl;
class wxFileDialog;
class wxGenericFileDialog;
class wxListEvent;
class wxListItem;
class wxStaticText;
class wxTextCtrl;
#if defined(__WXUNIVERSAL__)||defined(__WXGTK__)||defined(__WXX11__)||defined(__WXMGL__)
#define USE_GENERIC_FILEDIALOG
#endif
#ifdef USE_GENERIC_FILEDIALOG
//-----------------------------------------------------------------------------
// data
//-----------------------------------------------------------------------------
WXDLLEXPORT_DATA(extern const wxChar *)wxFileSelectorPromptStr;
WXDLLEXPORT_DATA(extern const wxChar *)wxFileSelectorDefaultWildcardStr;
#endif // USE_GENERIC_FILEDIALOG
//-------------------------------------------------------------------------
// File selector
//-------------------------------------------------------------------------
class wxFileDialog: public wxDialog
class WXDLLEXPORT wxGenericFileDialog: public wxDialog
{
public:
wxFileDialog() { }
wxGenericFileDialog() { }
wxFileDialog(wxWindow *parent,
wxGenericFileDialog(wxWindow *parent,
const wxString& message = wxFileSelectorPromptStr,
const wxString& defaultDir = _T(""),
const wxString& defaultFile = _T(""),
const wxString& wildCard = wxFileSelectorDefaultWildcardStr,
long style = 0,
const wxPoint& pos = wxDefaultPosition);
virtual ~wxFileDialog();
virtual ~wxGenericFileDialog();
void SetMessage(const wxString& message) { SetTitle(message); }
void SetPath(const wxString& path);
@@ -115,14 +125,35 @@ protected:
wxStaticText *m_static;
private:
DECLARE_DYNAMIC_CLASS(wxFileDialog)
DECLARE_DYNAMIC_CLASS(wxGenericFileDialog)
DECLARE_EVENT_TABLE()
// these variables are preserved between wxFileDialog calls
// these variables are preserved between wxGenericFileDialog calls
static long ms_lastViewStyle; // list or report?
static bool ms_lastShowHidden; // did we show hidden files?
};
#ifdef USE_GENERIC_FILEDIALOG
class WXDLLEXPORT wxFileDialog: public wxGenericFileDialog
{
DECLARE_DYNAMIC_CLASS(wxFileDialog)
public:
wxFileDialog() {}
wxFileDialog(wxWindow *parent,
const wxString& message = wxFileSelectorPromptStr,
const wxString& defaultDir = _T(""),
const wxString& defaultFile = _T(""),
const wxString& wildCard = wxFileSelectorDefaultWildcardStr,
long style = 0,
const wxPoint& pos = wxDefaultPosition)
:wxGenericFileDialog(parent, message, defaultDir, defaultFile, wildCard, style, pos)
{
}
};
// File selector - backward compatibility
WXDLLEXPORT wxString
wxFileSelector(const wxChar *message = wxFileSelectorPromptStr,
@@ -159,9 +190,141 @@ wxSaveFileSelector(const wxChar *what,
const wxChar *default_name = (const wxChar *) NULL,
wxWindow *parent = (wxWindow *) NULL);
#endif // USE_GENERIC_FILEDIALOG
//-----------------------------------------------------------------------------
// wxFileData
//-----------------------------------------------------------------------------
class WXDLLEXPORT wxFileData
{
public:
enum fileType
{
is_file = 0,
is_dir = 0x0001,
is_link = 0x0002,
is_exe = 0x0004,
is_drive = 0x0008
};
wxFileData( const wxString &name, const wxString &fname, fileType type );
wxString GetName() const;
wxString GetFullName() const;
wxString GetHint() const;
// the wxFileCtrl fields in report view
enum fileListFieldType
{
FileList_Name,
FileList_Type,
FileList_Date,
FileList_Time,
#ifdef __UNIX__
FileList_Perm,
#endif // __UNIX__
FileList_Max
};
wxString GetEntry( fileListFieldType num ) const;
bool IsDir() const;
bool IsLink() const;
bool IsExe() const;
bool IsDrive() const;
long GetSize() const { return m_size; }
int GetHour() const { return m_hour; }
int GetMinute() const { return m_minute; }
int GetYear() const { return m_year; }
int GetMonth() const { return m_month; }
int GetDay() const { return m_day; }
void MakeItem( wxListItem &item );
void SetNewName( const wxString &name, const wxString &fname );
private:
wxString m_name;
wxString m_fileName;
long m_size;
int m_hour;
int m_minute;
int m_year;
int m_month;
int m_day;
wxString m_permissions;
int m_type;
};
//-----------------------------------------------------------------------------
// wxFileCtrl
//-----------------------------------------------------------------------------
class WXDLLEXPORT wxFileCtrl : public wxListCtrl
{
public:
wxFileCtrl();
wxFileCtrl( wxWindow *win,
wxWindowID id,
const wxString &wild,
bool showHidden,
const wxPoint &pos = wxDefaultPosition,
const wxSize &size = wxDefaultSize,
long style = wxLC_LIST,
const wxValidator &validator = wxDefaultValidator,
const wxString &name = wxT("filelist") );
virtual ~wxFileCtrl();
void ChangeToListMode();
void ChangeToReportMode();
void ChangeToIconMode();
void ShowHidden( bool show = TRUE );
bool GetShowHidden() const { return m_showHidden; }
long Add( wxFileData *fd, wxListItem &item );
void UpdateFiles();
virtual void StatusbarText( wxChar *WXUNUSED(text) ) {};
void MakeDir();
void GoToParentDir();
void GoToHomeDir();
void GoToDir( const wxString &dir );
void SetWild( const wxString &wild );
wxString GetWild() const { return m_wild; }
void GetDir( wxString &dir );
wxString GetDir() const { return m_dirName; }
void OnListDeleteItem( wxListEvent &event );
void OnListEndLabelEdit( wxListEvent &event );
void OnListColClick( wxListEvent &event );
// Associate commonly used UI controls with wxFileCtrl so that they can be
// disabled when they cannot be used (e.g. can't go to parent directory
// if wxFileCtrl already is in the root dir):
void SetGoToParentControl(wxWindow *ctrl) { m_goToParentControl = ctrl; }
void SetNewDirControl(wxWindow *ctrl) { m_newDirControl = ctrl; }
void SortItems(wxFileData::fileListFieldType field, bool foward);
bool GetSortDirection() const { return m_sort_foward > 0; }
wxFileData::fileListFieldType GetSortField() const { return m_sort_field; }
private:
void FreeItemData(const wxListItem& item);
void FreeAllItemsData();
wxString m_dirName;
bool m_showHidden;
wxString m_wild;
wxWindow *m_goToParentControl;
wxWindow *m_newDirControl;
int m_sort_foward;
wxFileData::fileListFieldType m_sort_field;
DECLARE_DYNAMIC_CLASS(wxFileCtrl);
DECLARE_EVENT_TABLE()
};
#endif
// _WX_DIRDLGG_H_
// _WX_FILEDLGG_H_