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

fix build with wxUSE_MENU==0 (closes #10330)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58000 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-01-11 00:34:09 +00:00
parent 349c045ab3
commit faef508f6a
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/headerctrl.h
View File

@@ -121,6 +121,7 @@ public:
// UI helpers // UI helpers
// ---------- // ----------
#if wxUSE_MENU
// 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
@@ -140,6 +141,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
// 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
@@ -221,7 +223,9 @@ private:
// event handlers // event handlers
void OnSeparatorDClick(wxHeaderCtrlEvent& event); void OnSeparatorDClick(wxHeaderCtrlEvent& event);
#if wxUSE_MENU
void OnRClick(wxHeaderCtrlEvent& event); void OnRClick(wxHeaderCtrlEvent& event);
#endif // wxUSE_MENU
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
}; };

10
src/common/headerctrlcmn.cpp
View File

@@ -71,7 +71,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
EVT_HEADER_RIGHT_CLICK(wxID_ANY, wxHeaderCtrlBase::OnRClick) EVT_HEADER_RIGHT_CLICK(wxID_ANY, wxHeaderCtrlBase::OnRClick)
#endif // wxUSE_MENU
END_EVENT_TABLE() END_EVENT_TABLE()
void wxHeaderCtrlBase::ScrollWindow(int dx, void wxHeaderCtrlBase::ScrollWindow(int dx,
@@ -116,6 +118,8 @@ void wxHeaderCtrlBase::OnSeparatorDClick(wxHeaderCtrlEvent& event)
UpdateColumn(col); UpdateColumn(col);
} }
#if wxUSE_MENU
void wxHeaderCtrlBase::OnRClick(wxHeaderCtrlEvent& event) void wxHeaderCtrlBase::OnRClick(wxHeaderCtrlEvent& event)
{ {
if ( !HasFlag(wxHD_ALLOW_HIDE) ) if ( !HasFlag(wxHD_ALLOW_HIDE) )
@@ -127,6 +131,8 @@ void wxHeaderCtrlBase::OnRClick(wxHeaderCtrlEvent& event)
ShowColumnsMenu(ScreenToClient(wxGetMousePosition())); ShowColumnsMenu(ScreenToClient(wxGetMousePosition()));
} }
#endif // wxUSE_MENU
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// wxHeaderCtrlBase column reordering // wxHeaderCtrlBase column reordering
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@@ -263,6 +269,8 @@ wxHeaderCtrlBase::DoResizeColumnIndices(wxArrayInt& colIndices, unsigned int cou
// wxHeaderCtrl extra UI // wxHeaderCtrl extra UI
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
#if wxUSE_MENU
void wxHeaderCtrlBase::AddColumnsItems(wxMenu& menu, int idColumnsBase) void wxHeaderCtrlBase::AddColumnsItems(wxMenu& menu, int idColumnsBase)
{ {
const unsigned count = GetColumnCount(); const unsigned count = GetColumnCount();
@@ -310,6 +318,8 @@ bool wxHeaderCtrlBase::ShowColumnsMenu(const wxPoint& pt, const wxString& title)
return true; return true;
} }
#endif // wxUSE_MENU
bool wxHeaderCtrlBase::ShowCustomizeDialog() bool wxHeaderCtrlBase::ShowCustomizeDialog()
{ {
// prepare the data for showing the dialog // prepare the data for showing the dialog