Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

correct typo: s/wxUSE_MENU/&S/

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58010 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-01-11 00:57:48 +00:00
parent e721a2a2a4
commit 8a2e3f80f6
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/wx/headerctrl.h
View File

@@ -123,7 +123,7 @@ public:
// UI helpers // UI helpers
// ---------- // ----------
#if wxUSE_MENU #if wxUSE_MENUS
// show the popup menu containing all columns with check marks for the ones // show the popup menu containing all columns with check marks for the ones
// which are currently shown and return true if something was done using it // which are currently shown and return true if something was done using it
// (in this case UpdateColumnVisibility() will have been called) or false // (in this case UpdateColumnVisibility() will have been called) or false
@@ -143,7 +143,7 @@ public:
// the ids of the items corresponding to the columns are consecutive and // the ids of the items corresponding to the columns are consecutive and
// start from idColumnsBase // start from idColumnsBase
void AddColumnsItems(wxMenu& menu, int idColumnsBase = 0); void AddColumnsItems(wxMenu& menu, int idColumnsBase = 0);
#endif // wxUSE_MENU #endif // wxUSE_MENUS
// show the columns customization dialog and return true if something was // show the columns customization dialog and return true if something was
// changed using it (in which case UpdateColumnVisibility() and/or // changed using it (in which case UpdateColumnVisibility() and/or
@@ -225,9 +225,9 @@ private:
// event handlers // event handlers
void OnSeparatorDClick(wxHeaderCtrlEvent& event); void OnSeparatorDClick(wxHeaderCtrlEvent& event);
#if wxUSE_MENU #if wxUSE_MENUS
void OnRClick(wxHeaderCtrlEvent& event); void OnRClick(wxHeaderCtrlEvent& event);
#endif // wxUSE_MENU #endif // wxUSE_MENUS
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
}; };

12
src/common/headerctrlcmn.cpp
View File

@@ -73,9 +73,9 @@ extern WXDLLIMPEXP_DATA_CORE(const char) wxHeaderCtrlNameStr[] = "wxHeaderCtrl";
BEGIN_EVENT_TABLE(wxHeaderCtrlBase, wxControl) BEGIN_EVENT_TABLE(wxHeaderCtrlBase, wxControl)
EVT_HEADER_SEPARATOR_DCLICK(wxID_ANY, wxHeaderCtrlBase::OnSeparatorDClick) EVT_HEADER_SEPARATOR_DCLICK(wxID_ANY, wxHeaderCtrlBase::OnSeparatorDClick)
#if wxUSE_MENU #if wxUSE_MENUS
EVT_HEADER_RIGHT_CLICK(wxID_ANY, wxHeaderCtrlBase::OnRClick) EVT_HEADER_RIGHT_CLICK(wxID_ANY, wxHeaderCtrlBase::OnRClick)
#endif // wxUSE_MENU #endif // wxUSE_MENUS
END_EVENT_TABLE() END_EVENT_TABLE()
void wxHeaderCtrlBase::ScrollWindow(int dx, void wxHeaderCtrlBase::ScrollWindow(int dx,
@@ -120,7 +120,7 @@ void wxHeaderCtrlBase::OnSeparatorDClick(wxHeaderCtrlEvent& event)
UpdateColumn(col); UpdateColumn(col);
} }
#if wxUSE_MENU #if wxUSE_MENUS
void wxHeaderCtrlBase::OnRClick(wxHeaderCtrlEvent& event) void wxHeaderCtrlBase::OnRClick(wxHeaderCtrlEvent& event)
{ {
@@ -133,7 +133,7 @@ void wxHeaderCtrlBase::OnRClick(wxHeaderCtrlEvent& event)
ShowColumnsMenu(ScreenToClient(wxGetMousePosition())); ShowColumnsMenu(ScreenToClient(wxGetMousePosition()));
} }
#endif // wxUSE_MENU #endif // wxUSE_MENUS
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// wxHeaderCtrlBase column reordering // wxHeaderCtrlBase column reordering
@@ -271,7 +271,7 @@ wxHeaderCtrlBase::DoResizeColumnIndices(wxArrayInt& colIndices, unsigned int cou
// wxHeaderCtrl extra UI // wxHeaderCtrl extra UI
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
#if wxUSE_MENU #if wxUSE_MENUS
void wxHeaderCtrlBase::AddColumnsItems(wxMenu& menu, int idColumnsBase) void wxHeaderCtrlBase::AddColumnsItems(wxMenu& menu, int idColumnsBase)
{ {
@@ -320,7 +320,7 @@ bool wxHeaderCtrlBase::ShowColumnsMenu(const wxPoint& pt, const wxString& title)
return true; return true;
} }
#endif // wxUSE_MENU #endif // wxUSE_MENUS
bool wxHeaderCtrlBase::ShowCustomizeDialog() bool wxHeaderCtrlBase::ShowCustomizeDialog()
{ {