Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19170 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2003-02-10 19:15:13 +00:00
parent cfef519aaa
commit 2ad50cc75b
2 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/mac/carbon/tooltip.cpp
View File

@@ -240,12 +240,15 @@ void wxMacToolTip::Draw()
LocalToGlobal( (Point *) &tag.absHotRect.bottom ); LocalToGlobal( (Point *) &tag.absHotRect.bottom );
SetPort( port ); SetPort( port );
if( m_helpTextRef ) if( m_helpTextRef )
CFRelease( m_helpTextRef ) {
CFRelease( m_helpTextRef ) ;
m_helpTextRef = NULL ;
}
m_helpTextRef = wxMacCreateCFString(m_label) ; m_helpTextRef = wxMacCreateCFString(m_label) ;
tag.content[kHMMinimumContentIndex].contentType = kHMCFStringContent ; tag.content[kHMMinimumContentIndex].contentType = kHMCFStringContent ;
tag.content[kHMMinimumContentIndex].u.tagCFString = text ; tag.content[kHMMinimumContentIndex].u.tagCFString = m_helpTextRef ;
tag.content[kHMMaximumContentIndex].contentType = kHMCFStringContent ; tag.content[kHMMaximumContentIndex].contentType = kHMCFStringContent ;
tag.content[kHMMaximumContentIndex].u.tagCFString = text ; tag.content[kHMMaximumContentIndex].u.tagCFString = m_helpTextRef ;
tag.tagSide = kHMDefaultSide; tag.tagSide = kHMDefaultSide;
HMDisplayTag( &tag ); HMDisplayTag( &tag );
} }
@@ -452,7 +455,10 @@ void wxMacToolTip::Clear()
#if TARGET_CARBON #if TARGET_CARBON
HMHideTag() ; HMHideTag() ;
if( m_helpTextRef ) if( m_helpTextRef )
CFRelease( m_helpTextRef ) {
CFRelease( m_helpTextRef ) ;
m_helpTextRef = NULL ;
}
#else #else
if ( m_window == s_ToolTipWindowRef && m_backpict ) if ( m_window == s_ToolTipWindowRef && m_backpict )
{ {

14
src/mac/tooltip.cpp
View File

@@ -240,12 +240,15 @@ void wxMacToolTip::Draw()
LocalToGlobal( (Point *) &tag.absHotRect.bottom ); LocalToGlobal( (Point *) &tag.absHotRect.bottom );
SetPort( port ); SetPort( port );
if( m_helpTextRef ) if( m_helpTextRef )
CFRelease( m_helpTextRef ) {
CFRelease( m_helpTextRef ) ;
m_helpTextRef = NULL ;
}
m_helpTextRef = wxMacCreateCFString(m_label) ; m_helpTextRef = wxMacCreateCFString(m_label) ;
tag.content[kHMMinimumContentIndex].contentType = kHMCFStringContent ; tag.content[kHMMinimumContentIndex].contentType = kHMCFStringContent ;
tag.content[kHMMinimumContentIndex].u.tagCFString = text ; tag.content[kHMMinimumContentIndex].u.tagCFString = m_helpTextRef ;
tag.content[kHMMaximumContentIndex].contentType = kHMCFStringContent ; tag.content[kHMMaximumContentIndex].contentType = kHMCFStringContent ;
tag.content[kHMMaximumContentIndex].u.tagCFString = text ; tag.content[kHMMaximumContentIndex].u.tagCFString = m_helpTextRef ;
tag.tagSide = kHMDefaultSide; tag.tagSide = kHMDefaultSide;
HMDisplayTag( &tag ); HMDisplayTag( &tag );
} }
@@ -452,7 +455,10 @@ void wxMacToolTip::Clear()
#if TARGET_CARBON #if TARGET_CARBON
HMHideTag() ; HMHideTag() ;
if( m_helpTextRef ) if( m_helpTextRef )
CFRelease( m_helpTextRef ) {
CFRelease( m_helpTextRef ) ;
m_helpTextRef = NULL ;
}
#else #else
if ( m_window == s_ToolTipWindowRef && m_backpict ) if ( m_window == s_ToolTipWindowRef && m_backpict )
{ {