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

carbon cfm fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32316 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2005-02-23 15:48:52 +00:00
parent b905d6cc08
commit 23ad132ca3
2 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -545,9 +545,13 @@ pascal OSStatus wxMacTopLevelMouseEventHandler( EventHandlerCallRef handler , Ev
// 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
if ( ( cEvent.GetKind() == kEventMouseDown ) && if ( ( cEvent.GetKind() == kEventMouseDown )
#ifdef __WXMAC_OSX__
&&
(FindControlUnderMouse(windowMouseLocation , window , &dummyPart) != (FindControlUnderMouse(windowMouseLocation , window , &dummyPart) !=
wxMacFindControlUnderMouse( windowMouseLocation , window , &dummyPart ) ) ) wxMacFindControlUnderMouse( windowMouseLocation , window , &dummyPart ) )
#endif
)
{ {
if ( currentMouseWindow->MacIsReallyEnabled() ) if ( currentMouseWindow->MacIsReallyEnabled() )
{ {
@@ -1125,7 +1129,7 @@ void wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title,
wxAssociateWinWithMacWindow( (WindowRef) m_macWindow , this ) ; wxAssociateWinWithMacWindow( (WindowRef) m_macWindow , this ) ;
UMASetWTitle( (WindowRef) m_macWindow , title , m_font.GetEncoding() ) ; UMASetWTitle( (WindowRef) m_macWindow , title , m_font.GetEncoding() ) ;
m_peer = new wxMacControl() ; m_peer = new wxMacControl(this) ;
#if TARGET_API_MAC_OSX #if TARGET_API_MAC_OSX
// 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
// the content view, so we have to retrieve it explicitely // the content view, so we have to retrieve it explicitely

17
src/mac/carbon/utils.cpp
View File

@@ -1024,6 +1024,7 @@ void wxMacControl::SetDrawingEnabled( bool enable )
#endif #endif
} }
#if TARGET_API_MAC_OSX
bool wxMacControl::GetNeedsDisplay() const bool wxMacControl::GetNeedsDisplay() const
{ {
#if TARGET_API_MAC_OSX #if TARGET_API_MAC_OSX
@@ -1042,6 +1043,7 @@ void wxMacControl::SetNeedsDisplay( bool needsDisplay , RgnHandle where )
HIViewSetNeedsDisplay( m_controlRef , needsDisplay ) ; HIViewSetNeedsDisplay( m_controlRef , needsDisplay ) ;
#endif #endif
} }
#endif
void wxMacControl::Convert( wxPoint *pt , wxMacControl *from , wxMacControl *to ) void wxMacControl::Convert( wxPoint *pt , wxMacControl *from , wxMacControl *to )
{ {
@@ -1052,6 +1054,21 @@ void wxMacControl::Convert( wxPoint *pt , wxMacControl *from , wxMacControl *to
HIViewConvertPoint( &hiPoint , from->m_controlRef , to->m_controlRef ) ; HIViewConvertPoint( &hiPoint , from->m_controlRef , to->m_controlRef ) ;
pt->x = (int)hiPoint.x ; pt->x = (int)hiPoint.x ;
pt->y = (int)hiPoint.y ; pt->y = (int)hiPoint.y ;
#else
Rect fromRect ;
Rect toRect ;
from->GetRect( &fromRect ) ;
to->GetRect( &toRect ) ;
// correct the case of the root control
if ( fromRect.left == -32768 && fromRect.top == -32768 && fromRect.bottom == 32767 && fromRect.right == 32767)
fromRect.left = fromRect.top = 0 ;
if ( toRect.left == -32768 && toRect.top == -32768 && toRect.bottom == 32767 && toRect.right == 32767 )
toRect.left = toRect.top = 0 ;
pt->x = pt->x + fromRect.left - toRect.left ;
pt->y = pt->y + fromRect.top - toRect.top ;
#endif #endif
} }