#pragma implementation "tooltip.h"
#endif
-#include "wx/setup.h"
+#include "wx/defs.h"
#if wxUSE_TOOLTIPS
#include "wx/tooltip.h"
#include "wx/timer.h"
#include "wx/geometry.h"
-#include "wx/mac/aga.h"
#include "wx/mac/uma.h"
//-----------------------------------------------------------------------------
// global data
//-----------------------------------------------------------------------------
+class wxMacToolTipTimer ;
+
class wxMacToolTip
{
public :
PicHandle m_backpict ;
bool m_shown ;
long m_mark ;
+ wxMacToolTipTimer* m_timer ;
} ;
-class wxMacToolTipTimer : wxTimer
+class wxMacToolTipTimer : public wxTimer
{
public:
- wxMacToolTipTimer(wxMacToolTip* tip, int iMilliseconds) ;
-
- void Notify()
- {
- if ( m_mark == m_tip->GetMark() )
- m_tip->Draw() ;
-
- delete this;
- }
-
+ wxMacToolTipTimer() {} ;
+ wxMacToolTipTimer(wxMacToolTip* tip, int iMilliseconds) ;
+ virtual ~wxMacToolTipTimer() {} ;
+ void Notify()
+ {
+ if ( m_mark == m_tip->GetMark() )
+ m_tip->Draw() ;
+ }
protected:
- wxMacToolTip* m_tip;
- long m_mark ;
+ wxMacToolTip* m_tip;
+ long m_mark ;
};
//-----------------------------------------------------------------------------
static wxWindow* s_LastWindowEntered = NULL ;
static wxRect2DInt s_ToolTipArea ;
static WindowRef s_ToolTipWindowRef = NULL ;
+
+IMPLEMENT_ABSTRACT_CLASS(wxToolTip, wxObject)
+
wxToolTip::wxToolTip( const wxString &tip )
{
m_text = tip;
void wxToolTip::SetWindow( wxWindow *win )
{
- m_window = win;
+ m_window = win ;
}
void wxToolTip::Enable( bool flag )
s_ToolTipArea = wxRect2DInt( event.m_x - 2 , event.m_y - 2 , 4 , 4 ) ;
s_LastWindowEntered = win ;
- WindowRef window = win->MacGetRootWindow() ;
+ WindowRef window = MAC_WXHWND( win->MacGetRootWindow() ) ;
int x = event.m_x ;
int y = event.m_y ;
wxPoint local( x , y ) ;
m_backpict = NULL ;
m_mark = 0 ;
m_shown = false ;
+ m_timer = NULL ;
}
-void wxMacToolTip::Setup( WindowRef window , wxString text , wxPoint localPosition )
+void wxMacToolTip::Setup( WindowRef win , wxString text , wxPoint localPosition )
{
m_mark++ ;
Clear() ;
- m_position = localPosition ;
+ m_position = localPosition ;
m_label = wxMacMakeMacStringFromPC( text ) ;
- m_window = window ;
- s_ToolTipWindowRef = window ;
+ m_window =win;
+ s_ToolTipWindowRef = m_window ;
m_backpict = NULL ;
- new wxMacToolTipTimer( this , s_ToolTipDelay ) ;
+ if ( m_timer )
+ delete m_timer ;
+ m_timer = new wxMacToolTipTimer( this , s_ToolTipDelay ) ;
}
wxMacToolTip::~wxMacToolTip()
{
+ if ( m_timer )
+ delete m_timer ;
if ( m_backpict )
Clear() ;
}
*/
#endif
{
- #if TARGET_CARBON
- AGAPortHelper help( GetWindowPort( m_window ) );
- #else
- AGAPortHelper help( ( m_window ) );
- #endif
+ wxMacPortStateHelper help( (GrafPtr) GetWindowPort( m_window ) );
+
+ bool useDrawThemeText = ( DrawThemeTextBox != (void*) kUnresolvedCFragSymbolAddress ) ;
+
m_shown = true ;
- SetOrigin( 0 , 0 ) ;
- TextFont( kFontIDGeneva ) ;
- TextSize( 10 ) ;
- TextFace( 0 ) ;
+ FontFamilyID fontId ;
+ Str255 fontName ;
+ SInt16 fontSize ;
+ Style fontStyle ;
+ GetThemeFont(kThemeSmallSystemFont , GetApplicationScript() , fontName , &fontSize , &fontStyle ) ;
+ GetFNum( fontName, &fontId );
+
+ TextFont( fontId ) ;
+ TextSize( fontSize ) ;
+ TextFace( fontStyle ) ;
FontInfo fontInfo;
::GetFontInfo(&fontInfo);
short lineh = fontInfo.ascent + fontInfo.descent + fontInfo.leading;
m_rect.left = m_position.x + kTipOffset;
m_rect.top = m_position.y + kTipOffset;
m_rect.right = m_rect.left + width + 2 * kTipBorder;
+ if ( useDrawThemeText )
+ m_rect.right += kTipBorder ;
m_rect.bottom = m_rect.top + height + 2 * kTipBorder;
ClipRect( &m_rect ) ;
BackColor( whiteColor ) ;
NULL);
ClosePicture();
- PenNormal() ;
- SetThemeBackground(kThemeBrushNotificationWindowBackground,32,true) ;
- SetThemeTextColor(kThemeTextColorNotification,32,true) ;
- EraseRect( &m_rect ) ;
+ PenNormal() ;
+
+ RGBColor tooltipbackground = { 0xFFFF , 0xFFFF , 0xC000 } ;
+ BackColor( whiteColor ) ;
+ RGBForeColor( &tooltipbackground ) ;
+
+ PaintRect( &m_rect ) ;
+ ForeColor(blackColor ) ;
FrameRect( &m_rect ) ;
+ SetThemeTextColor(kThemeTextColorNotification,wxDisplayDepth(),true) ;
::MoveTo( m_rect.left + kTipBorder , m_rect.top + fontInfo.ascent + kTipBorder);
i = 0 ;
laststop = 0 ;
height = 0 ;
+
while( i < length )
{
if( text[i] == 13 || text[i] == 10)
{
- ::DrawText( text , laststop , i - laststop ) ;
- height += lineh ;
- ::MoveTo( m_rect.left + kTipBorder , m_rect.top + fontInfo.ascent + kTipBorder + height );
+ if ( useDrawThemeText )
+ {
+ Rect frame ;
+ frame.top = m_rect.top + kTipBorder + height ;
+ frame.left = m_rect.left + kTipBorder ;
+ frame.bottom = frame.top + 1000 ;
+ frame.right = frame.left + 1000 ;
+ CFStringRef mString = CFStringCreateWithBytes( NULL , (UInt8*) text + laststop , i - laststop , CFStringGetSystemEncoding(), false ) ;
+ ::DrawThemeTextBox( mString,
+ kThemeCurrentPortFont,
+ kThemeStateActive,
+ true,
+ &frame,
+ teJustLeft,
+ nil );
+ CFRelease( mString ) ;
+ height += lineh ;
+ }
+ else
+ {
+ ::DrawText( text , laststop , i - laststop ) ;
+ height += lineh ;
+ ::MoveTo( m_rect.left + kTipBorder , m_rect.top + fontInfo.ascent + kTipBorder + height );
+ }
laststop = i+1 ;
}
i++ ;
}
-
- ::DrawText( text , laststop , i - laststop ) ;
+ if ( useDrawThemeText )
+ {
+ Rect frame ;
+ frame.top = m_rect.top + kTipBorder + height ;
+ frame.left = m_rect.left + kTipBorder ;
+ frame.bottom = frame.top + 1000 ;
+ frame.right = frame.left + 1000 ;
+ CFStringRef mString = CFStringCreateWithCString( NULL , text + laststop , kCFStringEncodingMacRoman ) ;
+ ::DrawThemeTextBox( mString,
+ kThemeCurrentPortFont,
+ kThemeStateActive,
+ true,
+ &frame,
+ teJustLeft,
+ nil );
+ CFRelease( mString ) ;
+ }
+ else
+ {
+ ::DrawText( text , laststop , i - laststop ) ;
+ }
::TextMode( srcOr ) ;
- // DrawText( m_label , 0 , m_label.Length() ) ;
- }
+ }
}
}
-void wxToolTip::NotifyWindowDelete( WindowRef win )
+void wxToolTip::NotifyWindowDelete( WXHWND win )
{
if ( win == s_ToolTipWindowRef )
{
void wxMacToolTip::Clear()
{
m_mark++ ;
+ if ( m_timer )
+ {
+ delete m_timer ;
+ m_timer = NULL ;
+ }
if ( !m_shown )
return ;
if ( m_window == s_ToolTipWindowRef && m_backpict )
{
- #if TARGET_CARBON
- AGAPortHelper help( GetWindowPort(m_window) ) ;
- #else
- AGAPortHelper help( (m_window) ) ;
- #endif
+ wxMacPortStateHelper help( (GrafPtr) GetWindowPort(m_window) ) ;
+
m_shown = false ;
- SetOrigin( 0 , 0 ) ;
BackColor( whiteColor ) ;
ForeColor(blackColor ) ;
DrawPicture(m_backpict, &m_rect);
projects / wxWidgets.git / blobdiff