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

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

@@ -325,9 +325,9 @@ bool wxNotebook::InsertPage(size_t nPage,
int wxNotebook::HitTest(const wxPoint& pt, long * flags) const int wxNotebook::HitTest(const wxPoint& pt, long * flags) const
{ {
int resultV = wxNOT_FOUND; int resultV = wxNOT_FOUND;
#if TARGET_API_MAC_OSX #if TARGET_API_MAC_OSX
const int countPages = GetPageCount(); const int countPages = GetPageCount();
HIPoint hipoint= { pt.x , pt.y } ; HIPoint hipoint= { pt.x , pt.y } ;
HIViewPartCode outPart = 0 ; HIViewPartCode outPart = 0 ;
@@ -357,10 +357,10 @@ int wxNotebook::HitTest(const wxPoint& pt, long * flags) const
m_peer->SetValue( 1 ) ; m_peer->SetValue( 1 ) ;
err = HIViewGetPartHit ( err = HIViewGetPartHit (
m_peer->GetControlRef() , m_peer->GetControlRef() ,
&hipoint , &hipoint ,
&outPart &outPart
); );
m_peer->SetValue( val ) ; m_peer->SetValue( val ) ;
if ( max == 1 ) if ( max == 1 )
@@ -369,7 +369,7 @@ int wxNotebook::HitTest(const wxPoint& pt, long * flags) const
} }
} }
if ( outPart >= 1 && (size_t)outPart <= countPages ) if ( outPart >= 1 && outPart <= countPages )
{ {
resultV = outPart ; resultV = outPart ;
} }

1
src/mac/carbon/taskbar.cpp
View File

@@ -193,7 +193,6 @@ pascal OSStatus wxDockEventHandler( EventHandlerCallRef inHandlerCallRef,
// Which causes the wxApp handler just to skip it. // Which causes the wxApp handler just to skip it.
// //
MenuRef taskbarMenuRef = MAC_WXHMENU(pTB->m_pMenu->GetHMenu()); MenuRef taskbarMenuRef = MAC_WXHMENU(pTB->m_pMenu->GetHMenu());
OSStatus result = eventNotHandledErr;
OSErr err; OSErr err;
// get the HICommand from the event // get the HICommand from the event

6
src/mac/carbon/window.cpp
View File

@@ -2649,7 +2649,9 @@ void wxWindowMac::OnSetFocus( wxFocusEvent& event )
//wxChildFocusEvent eventFocus(this); //wxChildFocusEvent eventFocus(this);
//(void)GetEventHandler()->ProcessEvent(eventFocus); //(void)GetEventHandler()->ProcessEvent(eventFocus);
#if !wxMAC_USE_CORE_GRAPHICS
bool bIsFocusEvent = (event.GetEventType() == wxEVT_SET_FOCUS); bool bIsFocusEvent = (event.GetEventType() == wxEVT_SET_FOCUS);
#endif
// enable for patch 1376506 - perhaps? // enable for patch 1376506 - perhaps?
#if 0 #if 0
@@ -3263,11 +3265,11 @@ wxPoint wxGetMousePosition()
void wxWindowMac::OnMouseEvent( wxMouseEvent &event ) void wxWindowMac::OnMouseEvent( wxMouseEvent &event )
{ {
long evtType = event.GetEventType();
// if ((evtType == ewxEVT_RIGHT_DOWN) || (evtType == wxEVT_CONTEXT_MENU))
if ( event.GetEventType() == wxEVT_RIGHT_DOWN ) if ( event.GetEventType() == wxEVT_RIGHT_DOWN )
{ {
// copied from wxGTK : CS // copied from wxGTK : CS
// VZ: shouldn't we move this to base class then?
// generate a "context menu" event: this is similar to wxEVT_RIGHT_DOWN // generate a "context menu" event: this is similar to wxEVT_RIGHT_DOWN
// except that: // except that:
// //