piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-21 05:09:34 -06:00
Code Issues Packages Projects Releases Wiki Activity

wxWidgets3: update to svn r70933

Browse Source
This commit is contained in:
Shawn Hoffman
2012-03-17 18:12:27 -07:00
parent 0ed8af2287
commit a648aca65c
906 changed files with 39468 additions and 17244 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Externals/wxWidgets3/src/osx/notebook_osx.cpp vendored
View File

@ -4,7 +4,7 @@
// Author: Stefan Csomor
// Modified by:
// Created: 1998-01-01
// RCS-ID: $Id: notebook_osx.cpp 67243 2011-03-19 08:36:23Z SC $
// RCS-ID: $Id: notebook_osx.cpp 70340 2012-01-14 17:57:08Z VZ $
// Copyright: (c) Stefan Csomor
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
@ -145,7 +145,7 @@ bool wxNotebook::SetPageImage(size_t nPage, int nImage)
{
wxCHECK_MSG( IS_VALID_PAGE(nPage), false,
wxT("SetPageImage: invalid notebook page") );
wxCHECK_MSG( m_imageList && nImage < m_imageList->GetImageCount(), false,
wxCHECK_MSG( HasImageList() && nImage < GetImageList()->GetImageCount(), false,
wxT("SetPageImage: invalid image index") );
if ( nImage != m_images[nPage] )
@ -245,10 +245,10 @@ bool wxNotebook::InsertPage(size_t nPage,
return true;
}
int wxNotebook::HitTest(const wxPoint& WXUNUSED(pt), long * WXUNUSED(flags)) const
int wxNotebook::HitTest(const wxPoint& pt, long *flags) const
{
int resultV = wxNOT_FOUND;
#if 0
#ifdef __WXOSX_CARBON__
const int countPages = GetPageCount();
// we have to convert from Client to Window relative coordinates
@ -300,6 +300,9 @@ int wxNotebook::HitTest(const wxPoint& WXUNUSED(pt), long * WXUNUSED(flags)) con
else
*flags |= wxBK_HITTEST_NOWHERE;
}
#else
wxUnusedVar(pt);
wxUnusedVar(flags);
#endif
return resultV;
}
@ -517,6 +520,8 @@ bool wxNotebook::OSXHandleClicked( double WXUNUSED(timestampsec) )
newSel, m_selection );
event.SetEventObject( this );
HandleWindowEvent( event );
m_selection = newSel;
}
else
{