X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b89dac7816168bc86d4862edb394e681c161a3e3..3355efa93c7ef81088344b7ddbc7355c4730bb57:/src/mac/carbon/tooltip.cpp?ds=sidebyside diff --git a/src/mac/carbon/tooltip.cpp b/src/mac/carbon/tooltip.cpp index 5974c8808e..240e8fee89 100644 --- a/src/mac/carbon/tooltip.cpp +++ b/src/mac/carbon/tooltip.cpp @@ -16,6 +16,7 @@ #if wxUSE_TOOLTIPS #include "wx/app.h" +#include "wx/dc.h" #include "wx/window.h" #include "wx/tooltip.h" #include "wx/timer.h" @@ -217,7 +218,7 @@ void wxMacToolTip::Draw() SetOrigin( 0 , 0 ) ; TextFont( kFontIDGeneva ) ; - TextSize( 9 ) ; + TextSize( 10 ) ; TextFace( 0 ) ; FontInfo fontInfo; ::GetFontInfo(&fontInfo); @@ -270,12 +271,12 @@ void wxMacToolTip::Draw() NULL); ClosePicture(); - RGBColor yellow = { 0xFFFF , 0xFFFF , (153<<8)+153 } ; - RGBBackColor( &yellow ) ; + PenNormal() ; + SetThemeBackground(kThemeBrushNotificationWindowBackground,32,true) ; + BackColor( yellowColor ) ; + ForeColor( blackColor ) ; EraseRect( &m_rect ) ; FrameRect( &m_rect ) ; - BackColor( whiteColor ) ; - ForeColor(blackColor ) ; ::MoveTo( m_rect.left + kTipBorder , m_rect.top + fontInfo.ascent + kTipBorder); i = 0 ; @@ -294,9 +295,7 @@ void wxMacToolTip::Draw() } ::DrawText( text , laststop , i - laststop ) ; - ::TextMode( srcOr ) ; - wxDC::MacInvalidateSetup() ; - + ::TextMode( srcOr ) ; // DrawText( m_label , 0 , m_label.Length() ) ; } } @@ -330,7 +329,6 @@ void wxMacToolTip::Clear() DrawPicture(m_backpict, &m_rect); KillPicture(m_backpict); m_backpict = NULL ; - wxDC::MacInvalidateSetup() ; } }