g++ 4/wxMAC_USE_CORE_GRAPHICS warning fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36513 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -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 ;
|
||||
}
|
||||
|
@@ -193,7 +193,6 @@ pascal OSStatus wxDockEventHandler( EventHandlerCallRef inHandlerCallRef,
|
||||
// Which causes the wxApp handler just to skip it.
|
||||
//
|
||||
MenuRef taskbarMenuRef = MAC_WXHMENU(pTB->m_pMenu->GetHMenu());
|
||||
OSStatus result = eventNotHandledErr;
|
||||
OSErr err;
|
||||
|
||||
// get the HICommand from the event
|
||||
|
@@ -2649,7 +2649,9 @@ void wxWindowMac::OnSetFocus( wxFocusEvent& event )
|
||||
//wxChildFocusEvent eventFocus(this);
|
||||
//(void)GetEventHandler()->ProcessEvent(eventFocus);
|
||||
|
||||
#if !wxMAC_USE_CORE_GRAPHICS
|
||||
bool bIsFocusEvent = (event.GetEventType() == wxEVT_SET_FOCUS);
|
||||
#endif
|
||||
|
||||
// enable for patch 1376506 - perhaps?
|
||||
#if 0
|
||||
@@ -3263,11 +3265,11 @@ wxPoint wxGetMousePosition()
|
||||
|
||||
void wxWindowMac::OnMouseEvent( wxMouseEvent &event )
|
||||
{
|
||||
long evtType = event.GetEventType();
|
||||
// if ((evtType == ewxEVT_RIGHT_DOWN) || (evtType == wxEVT_CONTEXT_MENU))
|
||||
if ( event.GetEventType() == wxEVT_RIGHT_DOWN )
|
||||
{
|
||||
// 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
|
||||
// except that:
|
||||
//
|
||||
|
Reference in New Issue
Block a user