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

g++ 4/wxMAC_USE_CORE_GRAPHICS warning fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36513 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2005-12-21 16:12:48 +00:00
parent 6c28639791
commit fe224552a9
3 changed files with 61 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/mac/carbon/notebmac.cpp
View File

@@ -325,10 +325,10 @@ bool wxNotebook::InsertPage(size_t nPage,
int wxNotebook::HitTest(const wxPoint& pt, long * flags) const
{
int resultV = wxNOT_FOUND;
int resultV = wxNOT_FOUND;
#if TARGET_API_MAC_OSX
const int countPages = GetPageCount();
const int countPages = GetPageCount();
HIPoint hipoint= { pt.x , pt.y } ;
HIViewPartCode outPart = 0 ;
OSStatus err = HIViewGetPartHit (
@@ -336,12 +336,12 @@ int wxNotebook::HitTest(const wxPoint& pt, long * flags) const
&hipoint ,
&outPart
);
int max = m_peer->GetMaximum() ;
if ( outPart == 0 && max > 0 )
{
// this is a hack, as unfortunately a hit on an already selected tab returns 0,
// so we have to go some extra miles to make sure we select something different
// so we have to go some extra miles to make sure we select something different
// and try again ..
int val = m_peer->GetValue() ;
int maxval = max ;
@@ -355,30 +355,30 @@ int wxNotebook::HitTest(const wxPoint& pt, long * flags) const
m_peer->SetValue( maxval ) ;
else
m_peer->SetValue( 1 ) ;
err = HIViewGetPartHit (
m_peer->GetControlRef() ,
&hipoint ,
&outPart
);
m_peer->GetControlRef() ,
&hipoint ,
&outPart
);
m_peer->SetValue( val ) ;
if ( max == 1 )
{
m_peer->SetMaximum( 1 ) ;
}
}
if ( outPart >= 1 && (size_t)outPart <= countPages )
if ( outPart >= 1 && outPart <= countPages )
{
resultV = outPart ;
}
}
#endif // TARGET_API_MAC_OSX
if (flags != NULL)
{
*flags = 0;
// we cannot differentiate better
if (resultV >= 1)
*flags |= wxNB_HITTEST_ONLABEL;