corrected detection of wchar_t under Mac OS X/Darwin

[wxWidgets.git] / src / mac / carbon / tooltip.cpp

diff --git a/src/mac/carbon/tooltip.cpp b/src/mac/carbon/tooltip.cpp
index 583bd9b8928fc278f9b2de31eb83e03bacdd886b..695582839ca08d85d325a3698fb0197c3cb39cbb 100644 (file)
--- a/src/mac/carbon/tooltip.cpp
+++ b/src/mac/carbon/tooltip.cpp
@@ -15,8 +15,11 @@
 
 #if wxUSE_TOOLTIPS
 
+#include "wx/app.h"
+#include "wx/dc.h"
 #include "wx/window.h"
 #include "wx/tooltip.h"
+#include "wx/timer.h"
 #include "wx/geometry.h"
 #include "wx/mac/aga.h"
 #include "wx/mac/uma.h"
@@ -215,7 +218,7 @@ void wxMacToolTip::Draw()
 
                SetOrigin( 0 , 0 ) ;
                TextFont( kFontIDGeneva ) ;
-               TextSize( 9 ) ;
+               TextSize( 10 ) ;
                TextFace( 0 ) ;
                FontInfo fontInfo;
                ::GetFontInfo(&fontInfo);
@@ -268,12 +271,12 @@ void wxMacToolTip::Draw()
                                   NULL);
 
                ClosePicture();
-               RGBColor yellow = { 0xFFFF  , 0xFFFF , (153<<8)+153 } ;
-               RGBBackColor( &yellow ) ;
-               EraseRect( &m_rect ) ;
+    PenNormal() ;
+               SetThemeBackground(kThemeBrushNotificationWindowBackground,32,true) ;
+               BackColor( yellowColor ) ;
+               ForeColor(magentaColor ) ;
+//             EraseRect( &m_rect ) ;
                FrameRect( &m_rect ) ;
-               BackColor( whiteColor ) ;
-               ForeColor(blackColor ) ;
                ::MoveTo( m_rect.left + kTipBorder , m_rect.top + fontInfo.ascent + kTipBorder);
 
                i = 0 ;
@@ -292,8 +295,7 @@ void wxMacToolTip::Draw()
                }
                                        
                ::DrawText( text , laststop , i - laststop ) ;
-               ::TextMode( srcOr ) ;
-               
+               ::TextMode( srcOr ) ;           
        //      DrawText( m_label , 0 , m_label.Length() ) ;
        }
 }