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

Compilation and warnings fixes for wxUSE_HELP=0

Browse Source
This commit is contained in:
Václav Slavík 2017-02-02 18:22:05 +01:00
parent f28bdb9a92
commit 6aff1c8c64
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/wincmn.cpp
View File

@ -3887,6 +3887,7 @@ wxAccStatus wxWindowAccessible::GetDescription(int WXUNUSED(childId), wxString*
{ {
wxCHECK( GetWindow() != NULL, wxACC_FAIL ); wxCHECK( GetWindow() != NULL, wxACC_FAIL );
(void)description;
#if wxUSE_HELP #if wxUSE_HELP
wxString ht(GetWindow()->GetHelpTextAtPoint(wxDefaultPosition, wxHelpEvent::Origin_Keyboard)); wxString ht(GetWindow()->GetHelpTextAtPoint(wxDefaultPosition, wxHelpEvent::Origin_Keyboard));
if (!ht.empty()) if (!ht.empty())
@ -3904,6 +3905,7 @@ wxAccStatus wxWindowAccessible::GetHelpText(int WXUNUSED(childId), wxString* hel
{ {
wxCHECK( GetWindow() != NULL, wxACC_FAIL ); wxCHECK( GetWindow() != NULL, wxACC_FAIL );
(void)helpText;
#if wxUSE_HELP #if wxUSE_HELP
wxString ht(GetWindow()->GetHelpTextAtPoint(wxDefaultPosition, wxHelpEvent::Origin_Keyboard)); wxString ht(GetWindow()->GetHelpTextAtPoint(wxDefaultPosition, wxHelpEvent::Origin_Keyboard));
if (!ht.empty()) if (!ht.empty())

6
src/generic/datavgen.cpp
View File

@ -6093,6 +6093,7 @@ wxAccStatus wxDataViewCtrlAccessible::GetHelpText(int childId, wxString* helpTex
wxDataViewCtrl* dvCtrl = wxDynamicCast(GetWindow(), wxDataViewCtrl); wxDataViewCtrl* dvCtrl = wxDynamicCast(GetWindow(), wxDataViewCtrl);
wxCHECK( dvCtrl, wxACC_FAIL ); wxCHECK( dvCtrl, wxACC_FAIL );
#if wxUSE_HELP
if ( childId == wxACC_SELF ) if ( childId == wxACC_SELF )
{ {
*helpText = dvCtrl->GetHelpText(); *helpText = dvCtrl->GetHelpText();
@ -6112,6 +6113,11 @@ wxAccStatus wxDataViewCtrlAccessible::GetHelpText(int childId, wxString* helpTex
} }
} }
return wxACC_OK; return wxACC_OK;
#else
(void)childId;
(void)helpText;
return wxACC_NOT_IMPLEMENTED;
#endif
} }
// Returns the keyboard shortcut for this object or child. // Returns the keyboard shortcut for this object or child.