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

build fix for wxUSE_DRAG_AND_DROP==0

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@76310 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2014-04-11 04:48:37 +00:00
parent 1932822ed5
commit 5ab1db6a30
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/osx/cocoa/private.h
View File

@@ -101,9 +101,9 @@ public :
void SetCursor( const wxCursor & cursor ); void SetCursor( const wxCursor & cursor );
void CaptureMouse(); void CaptureMouse();
void ReleaseMouse(); void ReleaseMouse();
#if wxUSE_DRAG_AND_DROP
void SetDropTarget(wxDropTarget* target); void SetDropTarget(wxDropTarget* target);
#endif
wxInt32 GetValue() const; wxInt32 GetValue() const;
void SetValue( wxInt32 v ); void SetValue( wxInt32 v );
wxBitmap GetBitmap() const; wxBitmap GetBitmap() const;
@@ -146,10 +146,12 @@ public :
// cocoa thunk connected calls // cocoa thunk connected calls
#if wxUSE_DRAG_AND_DROP
virtual unsigned int draggingEntered(void* sender, WXWidget slf, void* _cmd); virtual unsigned int draggingEntered(void* sender, WXWidget slf, void* _cmd);
virtual void draggingExited(void* sender, WXWidget slf, void* _cmd); virtual void draggingExited(void* sender, WXWidget slf, void* _cmd);
virtual unsigned int draggingUpdated(void* sender, WXWidget slf, void* _cmd); virtual unsigned int draggingUpdated(void* sender, WXWidget slf, void* _cmd);
virtual bool performDragOperation(void* sender, WXWidget slf, void* _cmd); virtual bool performDragOperation(void* sender, WXWidget slf, void* _cmd);
#endif
virtual void mouseEvent(WX_NSEvent event, WXWidget slf, void* _cmd); virtual void mouseEvent(WX_NSEvent event, WXWidget slf, void* _cmd);
virtual void cursorUpdate(WX_NSEvent event, WXWidget slf, void* _cmd); virtual void cursorUpdate(WX_NSEvent event, WXWidget slf, void* _cmd);
virtual void keyEvent(WX_NSEvent event, WXWidget slf, void* _cmd); virtual void keyEvent(WX_NSEvent event, WXWidget slf, void* _cmd);

4
src/osx/cocoa/window.mm
View File

@@ -1127,6 +1127,7 @@ void wxOSX_controlDoubleAction(NSView* self, SEL _cmd, id sender)
impl->controlDoubleAction(self, _cmd, sender); impl->controlDoubleAction(self, _cmd, sender);
} }
#if wxUSE_DRAG_AND_DROP
unsigned int wxWidgetCocoaImpl::draggingEntered(void* s, WXWidget WXUNUSED(slf), void *WXUNUSED(_cmd)) unsigned int wxWidgetCocoaImpl::draggingEntered(void* s, WXWidget WXUNUSED(slf), void *WXUNUSED(_cmd))
{ {
id <NSDraggingInfo>sender = (id <NSDraggingInfo>) s; id <NSDraggingInfo>sender = (id <NSDraggingInfo>) s;
@@ -1270,6 +1271,7 @@ bool wxWidgetCocoaImpl::performDragOperation(void* s, WXWidget WXUNUSED(slf), vo
return result != wxDragNone; return result != wxDragNone;
} }
#endif // wxUSE_DRAG_AND_DROP
void wxWidgetCocoaImpl::mouseEvent(WX_NSEvent event, WXWidget slf, void *_cmd) void wxWidgetCocoaImpl::mouseEvent(WX_NSEvent event, WXWidget slf, void *_cmd)
{ {
@@ -2354,6 +2356,7 @@ bool wxWidgetCocoaImpl::SetFocus()
return true; return true;
} }
#if wxUSE_DRAG_AND_DROP
void wxWidgetCocoaImpl::SetDropTarget(wxDropTarget* target) void wxWidgetCocoaImpl::SetDropTarget(wxDropTarget* target)
{ {
[m_osxView unregisterDraggedTypes]; [m_osxView unregisterDraggedTypes];
@@ -2375,6 +2378,7 @@ void wxWidgetCocoaImpl::SetDropTarget(wxDropTarget* target)
CFRelease(typesarray); CFRelease(typesarray);
} }
} }
#endif // wxUSE_DRAG_AND_DROP
void wxWidgetCocoaImpl::RemoveFromParent() void wxWidgetCocoaImpl::RemoveFromParent()
{ {