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

started macosx compliant implementation

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13112 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2001-12-19 21:52:40 +00:00
parent 5f0b2f22d3
commit a7b04cfc5b
2 changed files with 186 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/mac/carbon/tooltip.cpp
View File

@@ -148,7 +148,7 @@ void wxToolTip::RelayEvent( wxWindow *win , wxMouseEvent &event )
s_ToolTipArea = wxRect2DInt( event.m_x - 2 , event.m_y - 2 , 4 , 4 ) ; s_ToolTipArea = wxRect2DInt( event.m_x - 2 , event.m_y - 2 , 4 , 4 ) ;
s_LastWindowEntered = win ; s_LastWindowEntered = win ;
WindowRef window = win->GetMacRootWindow() ; WindowRef window = win->MacGetRootWindow() ;
int x = event.m_x ; int x = event.m_x ;
int y = event.m_y ; int y = event.m_y ;
wxPoint local( x , y ) ; wxPoint local( x , y ) ;
@@ -209,6 +209,16 @@ void wxMacToolTip::Draw()
if ( m_window == s_ToolTipWindowRef ) if ( m_window == s_ToolTipWindowRef )
{ {
#if TARGET_CARBON
/*
if ( HMDisplayTag != (void*) kUnresolvedCFragSymbolAddress )
{
HMDisplayTag(
}
else
*/
#endif
{
#if TARGET_CARBON #if TARGET_CARBON
AGAPortHelper help( GetWindowPort( m_window ) ); AGAPortHelper help( GetWindowPort( m_window ) );
#else #else
@@ -273,8 +283,7 @@ void wxMacToolTip::Draw()
ClosePicture(); ClosePicture();
PenNormal() ; PenNormal() ;
SetThemeBackground(kThemeBrushNotificationWindowBackground,32,true) ; SetThemeBackground(kThemeBrushNotificationWindowBackground,32,true) ;
BackColor( yellowColor ) ; SetThemeTextColor(kThemeTextColorNotification,32,true) ;
ForeColor( blackColor ) ;
EraseRect( &m_rect ) ; EraseRect( &m_rect ) ;
FrameRect( &m_rect ) ; FrameRect( &m_rect ) ;
::MoveTo( m_rect.left + kTipBorder , m_rect.top + fontInfo.ascent + kTipBorder); ::MoveTo( m_rect.left + kTipBorder , m_rect.top + fontInfo.ascent + kTipBorder);
@@ -298,6 +307,7 @@ void wxMacToolTip::Draw()
::TextMode( srcOr ) ; ::TextMode( srcOr ) ;
// DrawText( m_label , 0 , m_label.Length() ) ; // DrawText( m_label , 0 , m_label.Length() ) ;
} }
}
} }
void wxToolTip::NotifyWindowDelete( WindowRef win ) void wxToolTip::NotifyWindowDelete( WindowRef win )

16
src/mac/tooltip.cpp
View File

@@ -148,7 +148,7 @@ void wxToolTip::RelayEvent( wxWindow *win , wxMouseEvent &event )
s_ToolTipArea = wxRect2DInt( event.m_x - 2 , event.m_y - 2 , 4 , 4 ) ; s_ToolTipArea = wxRect2DInt( event.m_x - 2 , event.m_y - 2 , 4 , 4 ) ;
s_LastWindowEntered = win ; s_LastWindowEntered = win ;
WindowRef window = win->GetMacRootWindow() ; WindowRef window = win->MacGetRootWindow() ;
int x = event.m_x ; int x = event.m_x ;
int y = event.m_y ; int y = event.m_y ;
wxPoint local( x , y ) ; wxPoint local( x , y ) ;
@@ -209,6 +209,16 @@ void wxMacToolTip::Draw()
if ( m_window == s_ToolTipWindowRef ) if ( m_window == s_ToolTipWindowRef )
{ {
#if TARGET_CARBON
/*
if ( HMDisplayTag != (void*) kUnresolvedCFragSymbolAddress )
{
HMDisplayTag(
}
else
*/
#endif
{
#if TARGET_CARBON #if TARGET_CARBON
AGAPortHelper help( GetWindowPort( m_window ) ); AGAPortHelper help( GetWindowPort( m_window ) );
#else #else
@@ -273,8 +283,7 @@ void wxMacToolTip::Draw()
ClosePicture(); ClosePicture();
PenNormal() ; PenNormal() ;
SetThemeBackground(kThemeBrushNotificationWindowBackground,32,true) ; SetThemeBackground(kThemeBrushNotificationWindowBackground,32,true) ;
BackColor( yellowColor ) ; SetThemeTextColor(kThemeTextColorNotification,32,true) ;
ForeColor( blackColor ) ;
EraseRect( &m_rect ) ; EraseRect( &m_rect ) ;
FrameRect( &m_rect ) ; FrameRect( &m_rect ) ;
::MoveTo( m_rect.left + kTipBorder , m_rect.top + fontInfo.ascent + kTipBorder); ::MoveTo( m_rect.left + kTipBorder , m_rect.top + fontInfo.ascent + kTipBorder);
@@ -298,6 +307,7 @@ void wxMacToolTip::Draw()
::TextMode( srcOr ) ; ::TextMode( srcOr ) ;
// DrawText( m_label , 0 , m_label.Length() ) ; // DrawText( m_label , 0 , m_label.Length() ) ;
} }
}
} }
void wxToolTip::NotifyWindowDelete( WindowRef win ) void wxToolTip::NotifyWindowDelete( WindowRef win )