corrected access to NULL parameters in wxGetOsVersion

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

diff --git a/src/mac/tooltip.cpp b/src/mac/tooltip.cpp
index eb92ed996e03588510a1d2124dadba118b320a64..695582839ca08d85d325a3698fb0197c3cb39cbb 100644 (file)
--- a/src/mac/tooltip.cpp
+++ b/src/mac/tooltip.cpp
@@ -218,7 +218,7 @@ void wxMacToolTip::Draw()
 
                SetOrigin( 0 , 0 ) ;
                TextFont( kFontIDGeneva ) ;
-               TextSize( 9 ) ;
+               TextSize( 10 ) ;
                TextFace( 0 ) ;
                FontInfo fontInfo;
                ::GetFontInfo(&fontInfo);
@@ -271,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 ;
@@ -295,9 +295,7 @@ void wxMacToolTip::Draw()
                }
                                        
                ::DrawText( text , laststop , i - laststop ) ;
-               ::TextMode( srcOr ) ;
-               wxDC::MacInvalidateSetup() ;
-               
+               ::TextMode( srcOr ) ;           
        //      DrawText( m_label , 0 , m_label.Length() ) ;
        }
 }
@@ -331,7 +329,6 @@ void wxMacToolTip::Clear()
                DrawPicture(m_backpict, &m_rect);
                KillPicture(m_backpict);
                m_backpict = NULL ;
-               wxDC::MacInvalidateSetup() ;
        }
 }