more fixes to compilation warnings from HP-UX build log. About 30% more to go
<sigh> git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5259 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -8,29 +8,29 @@
|
||||
// RCS-ID: $Id$
|
||||
// Licence: wxWindows licence
|
||||
//
|
||||
// Notes: wxDirDialog class written by Harm van der Heijden,
|
||||
// Notes: wxDirDialog class written by Harm van der Heijden,
|
||||
// uses wxDirCtrl class written by Robert Roebling for the
|
||||
// wxFile application, modified by Harm van der Heijden
|
||||
//
|
||||
// Description: This generic dirdialog implementation defines three classes:
|
||||
// 1) wxDirItemData(public wxTreeItemData) stores pathname and
|
||||
// displayed name for each item in the directory tree
|
||||
// 2) wxDirCtrl(public wxTreeCtrl) is a tree widget that
|
||||
// 2) wxDirCtrl(public wxTreeCtrl) is a tree widget that
|
||||
// displays a directory tree. It is possible to define sections
|
||||
// for fast access to parts of the file system (such as the
|
||||
// for fast access to parts of the file system (such as the
|
||||
// user's homedir, /usr/local, /tmp ...etc), similar to
|
||||
// Win95 Explorer's shortcuts to 'My Computer', 'Desktop', etc.
|
||||
// 3) wxDirDialog is the dialog box itself. The user can choose
|
||||
// a directory by navigating the tree, or by typing a dir
|
||||
// in an inputbox. The inputbox displays paths selected in the
|
||||
// tree. It is possible to create new directories. The user
|
||||
// will automatically be prompted for dir creation if he
|
||||
// will automatically be prompted for dir creation if he
|
||||
// enters a non-existing dir.
|
||||
//
|
||||
// TODO/BUGS: - standard sections only have reasonable defaults for Unix
|
||||
// (but others are easily added in wxDirCtrl::SetupSections)
|
||||
// - No direct support for "show hidden" toggle. Partly due
|
||||
// to laziness on my part and partly because
|
||||
// to laziness on my part and partly because
|
||||
// wxFindFirst/NextFile never seems to find hidden dirs
|
||||
// anyway.
|
||||
// - No automatic update of the tree (branch) after directory
|
||||
@@ -40,10 +40,10 @@
|
||||
// CDROM drive or something is involved) but that doesn't
|
||||
// seem to do anything. Need to look into that.
|
||||
// - Am still looking for an efficient way to delete wxTreeCtrl
|
||||
// branches. DeleteChildren has disappeared and
|
||||
// branches. DeleteChildren has disappeared and
|
||||
// CollapseAndReset( parent ) deletes the parent as well.
|
||||
// - The dialog window layout is done using wxConstraints. It
|
||||
// works, but it's not as simple as I'd like it to be (see
|
||||
// works, but it's not as simple as I'd like it to be (see
|
||||
// comments in wxDirDialog::doSize)
|
||||
//
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
@@ -103,9 +103,9 @@ class WXDLLEXPORT wxDirCtrl: public wxTreeCtrl
|
||||
public:
|
||||
bool m_showHidden;
|
||||
wxTreeItemId m_rootId;
|
||||
|
||||
|
||||
wxDirCtrl();
|
||||
wxDirCtrl(wxWindow *parent, const wxWindowID id = -1,
|
||||
wxDirCtrl(wxWindow *parent, const wxWindowID id = -1,
|
||||
const wxString &dir = wxDirDialogDefaultFolderStr,
|
||||
const wxPoint& pos = wxDefaultPosition,
|
||||
const wxSize& size = wxDefaultSize,
|
||||
@@ -116,12 +116,12 @@ public:
|
||||
void OnCollapseItem(wxTreeEvent &event );
|
||||
void OnBeginEditItem(wxTreeEvent &event );
|
||||
void OnEndEditItem(wxTreeEvent &event );
|
||||
|
||||
|
||||
protected:
|
||||
void CreateItems(const wxTreeItemId &parent);
|
||||
void SetupSections();
|
||||
wxArrayString m_paths, m_names;
|
||||
|
||||
|
||||
private:
|
||||
DECLARE_EVENT_TABLE()
|
||||
DECLARE_DYNAMIC_CLASS(wxDirCtrl)
|
||||
@@ -135,7 +135,7 @@ class WXDLLEXPORT wxDirDialog: public wxDialog
|
||||
{
|
||||
public:
|
||||
wxDirDialog() {}
|
||||
wxDirDialog(wxWindow *parent,
|
||||
wxDirDialog(wxWindow *parent,
|
||||
const wxString& message = wxFileSelectorPromptStr,
|
||||
const wxString& defaultPath = wxEmptyString,
|
||||
long style = 0, const wxPoint& pos = wxDefaultPosition);
|
||||
@@ -152,7 +152,7 @@ public:
|
||||
void OnTreeSelected( wxTreeEvent &event );
|
||||
void OnTreeKeyDown( wxTreeEvent &event );
|
||||
void OnOK(wxCommandEvent& event);
|
||||
void OnCancel(wxCommandEvent& event);
|
||||
void OnCancel(wxCommandEvent& event);
|
||||
void OnNew(wxCommandEvent& event);
|
||||
// void OnCheck(wxCommandEvent& event);
|
||||
|
||||
@@ -165,7 +165,7 @@ protected:
|
||||
wxTextCtrl *m_input;
|
||||
wxCheckBox *m_check; // not yet used
|
||||
wxButton *m_ok, *m_cancel, *m_new;
|
||||
|
||||
|
||||
private:
|
||||
DECLARE_EVENT_TABLE()
|
||||
DECLARE_DYNAMIC_CLASS(wxDirDialog)
|
||||
|
Reference in New Issue
Block a user