Use event modifiers and accessors rather than m_ variables directly, which are now protected rather than public with 2.4 compatibility disabled
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31454 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -239,7 +239,7 @@ void SwitchView::OnFocus(wxFocusEvent& event) {
|
||||
wxScrollBar *hscroll = m_dyn_sash->GetHScrollBar(this);
|
||||
wxScrollBar *vscroll = m_dyn_sash->GetVScrollBar(this);
|
||||
|
||||
if (event.m_eventObject == hscroll || event.m_eventObject == vscroll) {
|
||||
if (event.GetEventObject() == hscroll || event.GetEventObject() == vscroll) {
|
||||
m_view->SetFocus();
|
||||
} else {
|
||||
event.Skip();
|
||||
|
@@ -1558,11 +1558,11 @@ void wxFrameLayout::FirePluginEvent( cbPluginEvent& event )
|
||||
{
|
||||
bool isInputEvt = true;
|
||||
#if wxCHECK_VERSION(2,3,0)
|
||||
if ( event.m_eventType != cbEVT_PL_LEFT_DOWN &&
|
||||
event.m_eventType != cbEVT_PL_LEFT_UP &&
|
||||
event.m_eventType != cbEVT_PL_RIGHT_DOWN &&
|
||||
event.m_eventType != cbEVT_PL_RIGHT_UP &&
|
||||
event.m_eventType != cbEVT_PL_MOTION )
|
||||
if ( event.GetEventType() != cbEVT_PL_LEFT_DOWN &&
|
||||
event.GetEventType() != cbEVT_PL_LEFT_UP &&
|
||||
event.GetEventType() != cbEVT_PL_RIGHT_DOWN &&
|
||||
event.GetEventType() != cbEVT_PL_RIGHT_UP &&
|
||||
event.GetEventType() != cbEVT_PL_MOTION )
|
||||
isInputEvt = false;
|
||||
#else
|
||||
switch ( event.m_eventType )
|
||||
|
@@ -1180,7 +1180,7 @@ void wxDynamicSashWindowLeaf::OnScroll(wxScrollEvent &WXUNUSED(event)) {
|
||||
}
|
||||
|
||||
void wxDynamicSashWindowLeaf::OnFocus(wxFocusEvent &event) {
|
||||
if (event.m_eventObject == m_hscroll || event.m_eventObject == m_vscroll) {
|
||||
if (event.GetEventObject() == m_hscroll || event.GetEventObject() == m_vscroll) {
|
||||
m_child->SetFocus();
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user