Tries to fix wxListBox focus problems.

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

diff --git a/src/mac/tooltip.cpp b/src/mac/tooltip.cpp
index 5974c8808e31505f4448cca2fe1e775eaa0a57b6..240e8fee8963ffe464c1f7ef3abaa47b089630ca 100644 (file)
--- a/src/mac/tooltip.cpp
+++ b/src/mac/tooltip.cpp
@@ -16,6 +16,7 @@
 #if wxUSE_TOOLTIPS
 
 #include "wx/app.h"
 #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/window.h"
 #include "wx/tooltip.h"
 #include "wx/timer.h"


@@ -217,7 +218,7 @@ void wxMacToolTip::Draw()
 
                SetOrigin( 0 , 0 ) ;
                TextFont( kFontIDGeneva ) ;
 
                SetOrigin( 0 , 0 ) ;
                TextFont( kFontIDGeneva ) ;

-               TextSize( 9 ) ;
+               TextSize( 10 ) ;

                TextFace( 0 ) ;
                FontInfo fontInfo;
                ::GetFontInfo(&fontInfo);
                TextFace( 0 ) ;
                FontInfo fontInfo;
                ::GetFontInfo(&fontInfo);


@@ -270,12 +271,12 @@ void wxMacToolTip::Draw()
                                   NULL);
 
                ClosePicture();
                                   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 ) ;
                EraseRect( &m_rect ) ;
                FrameRect( &m_rect ) ;

-               BackColor( whiteColor ) ;
-               ForeColor(blackColor ) ;

                ::MoveTo( m_rect.left + kTipBorder , m_rect.top + fontInfo.ascent + kTipBorder);
 
                i = 0 ;
                ::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 ) ;
                }
                                        
                ::DrawText( text , laststop , i - laststop ) ;

-               ::TextMode( srcOr ) ;
-               wxDC::MacInvalidateSetup() ;
-               
+               ::TextMode( srcOr ) ;           

        //      DrawText( m_label , 0 , m_label.Length() ) ;
        }
 }
        //      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 ;
                DrawPicture(m_backpict, &m_rect);
                KillPicture(m_backpict);
                m_backpict = NULL ;

-               wxDC::MacInvalidateSetup() ;

        }
 }
 
        }
 }