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

support for proper mouse events for controls embedded in native toolbars

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@57830 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2009-01-04 13:57:18 +00:00
parent eb0778f870
commit 2cdacc9a81
1 changed files with 25 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/mac/carbon/toplevel.cpp
View File

@@ -447,7 +447,22 @@ ControlRef wxMacFindControlUnderMouse( wxTopLevelWindowMac* toplevelWindow , con
{ {
#if TARGET_API_MAC_OSX #if TARGET_API_MAC_OSX
if ( UMAGetSystemVersion() >= 0x1030 ) if ( UMAGetSystemVersion() >= 0x1030 )
return FindControlUnderMouse( location , window , outPart ) ; {
HIPoint pt = CGPointMake(location.h, location.v);
HIViewRef contentView = NULL ;
HIViewFindByID( HIViewGetRoot( window ), kHIViewWindowContentID, &contentView );
HIViewConvertPoint( &pt, contentView, NULL );
HIViewRef control = NULL;
if ( HIViewGetSubviewHit( HIViewGetRoot( window ), &pt, true, &control ) == noErr )
{
if ( control != NULL )
{
if ( HIViewConvertPoint( &pt, NULL, control ) == noErr )
HIViewGetPartHit(control, &pt, outPart);
}
}
return control ;
}
#endif #endif
ControlRef rootControl = NULL ; ControlRef rootControl = NULL ;
@@ -495,7 +510,7 @@ pascal OSStatus wxMacTopLevelMouseEventHandler( EventHandlerCallRef handler , Ev
{ {
currentMouseWindow = wxApp::s_captureWindow ; currentMouseWindow = wxApp::s_captureWindow ;
} }
else if ( (IsWindowActive(window) && windowPart == inContent) ) else if ( IsWindowActive(window) && (windowPart == inContent||windowPart == inStructure) )
{ {
ControlPartCode part ; ControlPartCode part ;
control = wxMacFindControlUnderMouse( toplevelWindow , windowMouseLocation , window , &part ) ; control = wxMacFindControlUnderMouse( toplevelWindow , windowMouseLocation , window , &part ) ;
@@ -522,7 +537,7 @@ pascal OSStatus wxMacTopLevelMouseEventHandler( EventHandlerCallRef handler , Ev
} }
#endif #endif
} }
// disabled windows must not get any input messages // disabled windows must not get any input messages
if ( currentMouseWindow && !currentMouseWindow->MacIsReallyEnabled() ) if ( currentMouseWindow && !currentMouseWindow->MacIsReallyEnabled() )
currentMouseWindow = NULL; currentMouseWindow = NULL;
@@ -620,17 +635,12 @@ pascal OSStatus wxMacTopLevelMouseEventHandler( EventHandlerCallRef handler , Ev
currentMouseWindow->SetFocus(); currentMouseWindow->SetFocus();
} }
ControlPartCode dummyPart ;
#ifndef __WXMAC_OSX__
// if built-in find control is finding the wrong control (ie static box instead of overlaid // if built-in find control is finding the wrong control (ie static box instead of overlaid
// button, we cannot let the standard handler do its job, but must handle manually // button, we cannot let the standard handler do its job, but must handle manually
// this only can happen < 10.3
if ( ( cEvent.GetKind() == kEventMouseDown ) if ( cEvent.GetKind() == kEventMouseDown )
#ifdef __WXMAC_OSX__
&&
(FindControlUnderMouse(windowMouseLocation , window , &dummyPart) !=
wxMacFindControlUnderMouse( toplevelWindow , windowMouseLocation , window , &dummyPart ) )
#endif
)
{ {
if ( currentMouseWindow->MacIsReallyEnabled() ) if ( currentMouseWindow->MacIsReallyEnabled() )
{ {
@@ -651,6 +661,7 @@ pascal OSStatus wxMacTopLevelMouseEventHandler( EventHandlerCallRef handler , Ev
result = noErr ; result = noErr ;
} }
#endif
} }
if ( cEvent.GetKind() == kEventMouseUp && wxApp::s_captureWindow ) if ( cEvent.GetKind() == kEventMouseUp && wxApp::s_captureWindow )
@@ -1298,7 +1309,7 @@ void wxTopLevelWindowMac::DoMacCreateRealWindow(
SetWindowBounds( (WindowRef) m_macWindow , kWindowStructureRgn , &theBoundsRect ) ; SetWindowBounds( (WindowRef) m_macWindow , kWindowStructureRgn , &theBoundsRect ) ;
wxAssociateWinWithMacWindow( (WindowRef) m_macWindow , this ) ; wxAssociateWinWithMacWindow( (WindowRef) m_macWindow , this ) ;
UMASetWTitle( (WindowRef) m_macWindow , title , m_font.GetEncoding() ) ; UMASetWTitle( (WindowRef) m_macWindow , title , GetFont().GetEncoding() ) ;
m_peer = new wxMacControl(this , true /*isRootControl*/) ; m_peer = new wxMacControl(this , true /*isRootControl*/) ;
// There is a bug in 10.2.X for ::GetRootControl returning the window view instead of // There is a bug in 10.2.X for ::GetRootControl returning the window view instead of
@@ -1403,7 +1414,7 @@ void wxTopLevelWindowMac::SetTitle(const wxString& title)
void wxTopLevelWindowMac::SetLabel(const wxString& title) void wxTopLevelWindowMac::SetLabel(const wxString& title)
{ {
wxWindow::SetLabel( title ) ; wxWindow::SetLabel( title ) ;
UMASetWTitle( (WindowRef)m_macWindow , title , m_font.GetEncoding() ) ; UMASetWTitle( (WindowRef)m_macWindow , title , GetFont().GetEncoding() ) ;
} }
wxString wxTopLevelWindowMac::GetTitle() const wxString wxTopLevelWindowMac::GetTitle() const