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

MacHandleControlClick extended by mouseStillDown state for supporting things like THUMBRELEASE

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20998 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2003-06-07 20:58:38 +00:00
parent e71a0aa95f
commit 4b26b60fac
22 changed files with 60 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/mac/control.cpp
View File

@@ -78,7 +78,7 @@ pascal void wxMacLiveScrollbarActionProc( ControlHandle control , ControlPartCod
wxControl* wx = (wxControl*) GetControlReference( control ) ;
if ( wx )
{
wx->MacHandleControlClick( control , partCode ) ;
wx->MacHandleControlClick( control , partCode , true /* stillDown */ ) ;
}
}
}
@@ -365,7 +365,11 @@ void wxControl::MacPostControlCreate()
{
ControlFontStyleRec controlstyle ;
controlstyle.flags = kControlUseFontMask ;
controlstyle.font = kControlFontSmallSystemFont ;
if (IsKindOf( CLASSINFO( wxButton ) ) )
controlstyle.font = kControlFontSmallSystemFont ; // eventually kControlFontBigSystemFont ;
else
controlstyle.font = kControlFontSmallSystemFont ;
::SetControlFontStyle( (ControlHandle) m_macControl , &controlstyle ) ;
}
@@ -871,11 +875,9 @@ void wxControl::OnMouseEvent( wxMouseEvent &event )
{
controlpart = ::HandleControlClick( control , localwhere , modifiers , (ControlActionUPP) -1 ) ;
wxTheApp->s_lastMouseDown = 0 ;
if ( control && controlpart != kControlNoPart &&
! IsKindOf( CLASSINFO( wxScrollBar ) )
) // otherwise we will get the event twice for scrollbar
if ( control && controlpart != kControlNoPart )
{
MacHandleControlClick( control , controlpart ) ;
MacHandleControlClick( control , controlpart , false /* mouse not down anymore */ ) ;
}
}
}
@@ -895,7 +897,7 @@ bool wxControl::MacCanFocus() const
return false ;
}
void wxControl::MacHandleControlClick( WXWidget control , wxInt16 controlpart )
void wxControl::MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool WXUNUSED( mouseStillDown ) )
{
wxASSERT_MSG( (ControlHandle) m_macControl != NULL , wxT("No valid mac control") ) ;
}