AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename wxEVT_DIRCTRL_CHANGED to wxEVT_DIRCTRL_SELECTIONCHANGED.

Browse Source 
This is more consistent with the existing wxEVT_FILECTRL_SELECTIONCHANGED.

Closes #15209.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74002 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2013-05-16 14:33:01 +00:00
parent c6dae1699e
commit 40c7c7f473
5 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/changes.txt
View File

@ -634,7 +634,7 @@ All (GUI):
- Close wxLogWindow automatically if it's the last remaining top level window.
- Implement clipping for wxSVGFileDC (Steve Benbow).
- Add wxDirCtrl::GetPath() (troelsk).
- Add wxEVT_COMMAND_DIRCTRL_CHANGED event (troelsk).
- Add wxEVT_DIRCTRL_SELECTIONCHANGED event (troelsk).
- Add wxControl::GetSizeFromTextSize() (Manuel Martin).
- Optionally allow showing tooltips for disabled ribbon buttons (wxBen).
- Add wxTL_NO_HEADER style to wxTreeListCtrl (robboto).

10
include/wx/generic/dirctrlg.h
View File

@ -209,10 +209,12 @@ private:
wxDECLARE_NO_COPY_CLASS(wxGenericDirCtrl);
};
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_DIRCTRL_CHANGED, wxTreeEvent );
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_DIRCTRL_SELECTIONCHANGED, wxTreeEvent );
#define EVT_DIRCTRL_CHANGED(id, fn) \
wx__DECLARE_EVT1(wxEVT_DIRCTRL_CHANGED, id, wxTreeEventHandler(fn))
#define wx__DECLARE_DIRCTRL_EVT(evt, id, fn) \
wx__DECLARE_EVT1(wxEVT_DIRCTRL_ ## evt, id, wxTreeEventHandler(fn))
#define EVT_DIRCTRL_SELECTIONCHANGED(id, fn) wx__DECLARE_DIRCTRL_EVT(SELECTIONCHANGED, id, fn)
//-----------------------------------------------------------------------------
// wxDirFilterListCtrl
@ -307,7 +309,7 @@ extern WXDLLIMPEXP_DATA_CORE(wxFileIconsTable *) wxTheFileIconsTable;
#endif // wxUSE_DIRDLG || wxUSE_FILEDLG || wxUSE_FILECTRL
// old wxEVT_COMMAND_* constants
#define wxEVT_COMMAND_DIRCTRL_CHANGED wxEVT_DIRCTRL_CHANGED
#define wxEVT_COMMAND_DIRCTRL_SELECTIONCHANGED wxEVT_DIRCTRL_SELECTIONCHANGED
#endif
// _WX_DIRCTRLG_H_

6
interface/wx/dirctrl.h
View File

@ -51,9 +51,9 @@ enum
@library{wxcore}
@category{ctrl}
@appearance{genericdirctrl}
@event{EVT_DIRCTRL_CHANGED(id, func)}
@event{EVT_DIRCTRL_SELECTIONCHANGED(id, func)}
Selected directory has changed.
Processes a @c wxEVT_DIRCTRL_CHANGED event type.
Processes a @c wxEVT_DIRCTRL_SELECTIONCHANGED event type.
Notice that this event is generated even for the changes done by the
program itself and not only those done by the user.
@since 2.9.5
@ -278,4 +278,4 @@ public:
void FillFilterList(const wxString& filter, int defaultFilter);
};
wxEventType wxEVT_DIRCTRL_CHANGED;
wxEventType wxEVT_DIRCTRL_SELECTIONCHANGED;

2
samples/widgets/dirctrl.cpp
View File

@ -156,7 +156,7 @@ BEGIN_EVENT_TABLE(DirCtrlWidgetsPage, WidgetsPage)
EVT_BUTTON(DirCtrlPage_SetPath, DirCtrlWidgetsPage::OnButtonSetPath)
EVT_CHECKBOX(wxID_ANY, DirCtrlWidgetsPage::OnCheckBox)
EVT_RADIOBOX(wxID_ANY, DirCtrlWidgetsPage::OnRadioBox)
EVT_DIRCTRL_CHANGED(DirCtrlPage_Ctrl, DirCtrlWidgetsPage::OnSelChanged)
EVT_DIRCTRL_SELECTIONCHANGED(DirCtrlPage_Ctrl, DirCtrlWidgetsPage::OnSelChanged)
END_EVENT_TABLE()
// ============================================================================

4
src/generic/dirctrlg.cpp
View File

@ -106,7 +106,7 @@ bool wxIsDriveAvailable(const wxString& dirName);
// events
// ----------------------------------------------------------------------------
wxDEFINE_EVENT( wxEVT_DIRCTRL_CHANGED, wxTreeEvent );
wxDEFINE_EVENT( wxEVT_DIRCTRL_SELECTIONCHANGED, wxTreeEvent );
// ----------------------------------------------------------------------------
// wxGetAvailableDrives, for WINDOWS, DOS, OS2, MAC, UNIX (returns "/")
@ -703,7 +703,7 @@ void wxGenericDirCtrl::OnEndEditItem(wxTreeEvent &event)
void wxGenericDirCtrl::OnTreeSelChange(wxTreeEvent &event)
{
wxTreeEvent changedEvent(wxEVT_DIRCTRL_CHANGED, GetId());
wxTreeEvent changedEvent(wxEVT_DIRCTRL_SELECTIONCHANGED, GetId());
changedEvent.SetEventObject(this);
changedEvent.SetItem(event.GetItem());