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

Use event modifiers and accessors rather than m_ variables directly, which are now protected rather than public with 2.4 compatibility disabled

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31454 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Kevin Hock
2005-01-18 15:08:15 +00:00
parent 1e6eb02501
commit 687706f5e7
44 changed files with 151 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/mac/carbon/window.cpp
View File

@@ -2512,29 +2512,29 @@ void wxWindowMac::ScrollWindow(int dx, int dy, const wxRect *rect)
void wxWindowMac::MacOnScroll(wxScrollEvent &event )
{
if ( event.m_eventObject == m_vScrollBar || event.m_eventObject == m_hScrollBar )
if ( event.GetEventObject() == m_vScrollBar || event.GetEventObject() == m_hScrollBar )
{
wxScrollWinEvent wevent;
wevent.SetPosition(event.GetPosition());
wevent.SetOrientation(event.GetOrientation());
wevent.m_eventObject = this;
wevent.SetEventObject(this);
if (event.m_eventType == wxEVT_SCROLL_TOP)
wevent.m_eventType = wxEVT_SCROLLWIN_TOP;
else if (event.m_eventType == wxEVT_SCROLL_BOTTOM)
wevent.m_eventType = wxEVT_SCROLLWIN_BOTTOM;
else if (event.m_eventType == wxEVT_SCROLL_LINEUP)
wevent.m_eventType = wxEVT_SCROLLWIN_LINEUP;
else if (event.m_eventType == wxEVT_SCROLL_LINEDOWN)
wevent.m_eventType = wxEVT_SCROLLWIN_LINEDOWN;
else if (event.m_eventType == wxEVT_SCROLL_PAGEUP)
wevent.m_eventType = wxEVT_SCROLLWIN_PAGEUP;
else if (event.m_eventType == wxEVT_SCROLL_PAGEDOWN)
wevent.m_eventType = wxEVT_SCROLLWIN_PAGEDOWN;
else if (event.m_eventType == wxEVT_SCROLL_THUMBTRACK)
wevent.m_eventType = wxEVT_SCROLLWIN_THUMBTRACK;
else if (event.m_eventType == wxEVT_SCROLL_THUMBRELEASE)
wevent.m_eventType = wxEVT_SCROLLWIN_THUMBRELEASE;
if (event.GetEventType() == wxEVT_SCROLL_TOP)
wevent.SetEventType( wxEVT_SCROLLWIN_TOP );
else if (event.GetEventType() == wxEVT_SCROLL_BOTTOM)
wevent.SetEventType( wxEVT_SCROLLWIN_BOTTOM );
else if (event.GetEventType() == wxEVT_SCROLL_LINEUP)
wevent.SetEventType( wxEVT_SCROLLWIN_LINEUP );
else if (event.GetEventType() == wxEVT_SCROLL_LINEDOWN)
wevent.SetEventType( wxEVT_SCROLLWIN_LINEDOWN );
else if (event.GetEventType() == wxEVT_SCROLL_PAGEUP)
wevent.SetEventType( wxEVT_SCROLLWIN_PAGEUP );
else if (event.GetEventType() == wxEVT_SCROLL_PAGEDOWN)
wevent.SetEventType( wxEVT_SCROLLWIN_PAGEDOWN );
else if (event.GetEventType() == wxEVT_SCROLL_THUMBTRACK)
wevent.SetEventType( wxEVT_SCROLLWIN_THUMBTRACK );
else if (event.GetEventType() == wxEVT_SCROLL_THUMBRELEASE)
wevent.SetEventType( wxEVT_SCROLLWIN_THUMBRELEASE );
GetEventHandler()->ProcessEvent(wevent);
}
@@ -2845,7 +2845,7 @@ bool wxWindowMac::MacDoRedraw( WXHRGN updatergnr , long time )
{
// paint the window itself
wxPaintEvent event;
event.m_timeStamp = time ;
event.SetTimestamp(time);
event.SetEventObject(this);
handled = GetEventHandler()->ProcessEvent(event);