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

Use the new wxUSE_ABI_INCOMPATIBLE_FEATURES to enable enhancements for wxCocoa builds.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@48114 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Elliott
2007-08-15 17:58:46 +00:00
parent ae85087030
commit d50b18a354
7 changed files with 29 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/cocoa/NSView.h
View File

@@ -37,7 +37,7 @@ public:
virtual wxWindow* GetWxWindow() const virtual wxWindow* GetWxWindow() const
{ return NULL; } { return NULL; }
virtual void Cocoa_FrameChanged(void) = 0; virtual void Cocoa_FrameChanged(void) = 0;
#if 0 // ABI incompatibility #if wxUSE_ABI_INCOMPATIBLE_FEATURES
virtual void Cocoa_synthesizeMouseMoved(void) = 0; virtual void Cocoa_synthesizeMouseMoved(void) = 0;
#endif #endif
virtual bool Cocoa_acceptsFirstMouse(bool &acceptsFirstMouse, WX_NSEvent theEvent) virtual bool Cocoa_acceptsFirstMouse(bool &acceptsFirstMouse, WX_NSEvent theEvent)
@@ -70,7 +70,7 @@ public:
{ return false; } { return false; }
virtual bool Cocoa_resetCursorRects() virtual bool Cocoa_resetCursorRects()
{ return false; } { return false; }
#if 0 // ABI incompatibility #if wxUSE_ABI_INCOMPATIBLE_FEATURES
virtual bool Cocoa_viewDidMoveToWindow() virtual bool Cocoa_viewDidMoveToWindow()
{ return false; } { return false; }
virtual bool Cocoa_viewWillMoveToWindow(WX_NSWindow newWindow) virtual bool Cocoa_viewWillMoveToWindow(WX_NSWindow newWindow)

2
include/wx/cocoa/statbmp.h
View File

@@ -47,7 +47,7 @@ public:
// Cocoa specifics // Cocoa specifics
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
WX_NSImageView GetNSImageView() { return (WX_NSImageView)m_cocoaNSView; } WX_NSImageView GetNSImageView() { return (WX_NSImageView)m_cocoaNSView; }
#if 0 // ABI incompatibility #if wxUSE_ABI_INCOMPATIBLE_FEATURES
wxBitmap m_bitmap; wxBitmap m_bitmap;
#endif #endif

6
include/wx/cocoa/window.h
View File

@@ -111,7 +111,7 @@ protected:
void InitMouseEvent(wxMouseEvent &event, WX_NSEvent cocoaEvent); void InitMouseEvent(wxMouseEvent &event, WX_NSEvent cocoaEvent);
virtual wxWindow* GetWxWindow() const; virtual wxWindow* GetWxWindow() const;
virtual void Cocoa_FrameChanged(void); virtual void Cocoa_FrameChanged(void);
#if 0 // ABI incompatibility #if wxUSE_ABI_INCOMPATIBLE_FEATURES
virtual void Cocoa_synthesizeMouseMoved(void); virtual void Cocoa_synthesizeMouseMoved(void);
#else #else
void Cocoa_synthesizeMouseMoved(void); void Cocoa_synthesizeMouseMoved(void);
@@ -130,7 +130,7 @@ protected:
virtual bool Cocoa_otherMouseDragged(WX_NSEvent theEvent); virtual bool Cocoa_otherMouseDragged(WX_NSEvent theEvent);
virtual bool Cocoa_otherMouseUp(WX_NSEvent theEvent); virtual bool Cocoa_otherMouseUp(WX_NSEvent theEvent);
virtual bool Cocoa_resetCursorRects(); virtual bool Cocoa_resetCursorRects();
#if 0 // ABI incompatibility #if wxUSE_ABI_INCOMPATIBLE_FEATURES
virtual bool Cocoa_viewDidMoveToWindow(); virtual bool Cocoa_viewDidMoveToWindow();
virtual bool Cocoa_viewWillMoveToWindow(WX_NSWindow newWindow); virtual bool Cocoa_viewWillMoveToWindow(WX_NSWindow newWindow);
#endif #endif
@@ -139,7 +139,7 @@ protected:
wxWindowCocoaHider *m_cocoaHider; wxWindowCocoaHider *m_cocoaHider;
wxWindowCocoaScrollView *m_wxCocoaScrollView; wxWindowCocoaScrollView *m_wxCocoaScrollView;
bool m_isInPaint; bool m_isInPaint;
#if 0 // ABI incompatibility #if wxUSE_ABI_INCOMPATIBLE_FEATURES
wxCocoaTrackingRectManager *m_visibleTrackingRectManager; wxCocoaTrackingRectManager *m_visibleTrackingRectManager;
#endif #endif
static wxWindow *sm_capturedWindow; static wxWindow *sm_capturedWindow;

6
src/cocoa/NSView.mm
View File

@@ -168,7 +168,7 @@ void wxCocoaNSView::DisassociateNSView(WX_NSView cocoaNSView)
- (void)viewDidMoveToWindow - (void)viewDidMoveToWindow
{ {
#if 0 // ABI incompatibility #if wxUSE_ABI_INCOMPATIBLE_FEATURES
wxCocoaNSView *win = wxCocoaNSView::GetFromCocoa(self); wxCocoaNSView *win = wxCocoaNSView::GetFromCocoa(self);
if( !win || !win->Cocoa_viewDidMoveToWindow() ) if( !win || !win->Cocoa_viewDidMoveToWindow() )
#endif #endif
@@ -177,7 +177,7 @@ void wxCocoaNSView::DisassociateNSView(WX_NSView cocoaNSView)
- (void)viewWillMoveToWindow:(NSWindow *)newWindow - (void)viewWillMoveToWindow:(NSWindow *)newWindow
{ {
#if 0 // ABI incompatibility #if wxUSE_ABI_INCOMPATIBLE_FEATURES
wxCocoaNSView *win = wxCocoaNSView::GetFromCocoa(self); wxCocoaNSView *win = wxCocoaNSView::GetFromCocoa(self);
if( !win || !win->Cocoa_viewWillMoveToWindow(newWindow) ) if( !win || !win->Cocoa_viewWillMoveToWindow(newWindow) )
#endif #endif
@@ -211,7 +211,7 @@ WX_DECLARE_GET_OBJC_CLASS(wxNSViewNotificationObserver,NSObject)
- (void)synthesizeMouseMovedForView: (NSView *)theView - (void)synthesizeMouseMovedForView: (NSView *)theView
{ {
#if 0 // ABI incompatibility #if wxUSE_ABI_INCOMPATIBLE_FEATURES
wxCocoaNSView *win = wxCocoaNSView::GetFromCocoa(theView); wxCocoaNSView *win = wxCocoaNSView::GetFromCocoa(theView);
wxCHECK_RET(win,wxT("synthesizeMouseMovedForView received but no wxWindow exists")); wxCHECK_RET(win,wxT("synthesizeMouseMovedForView received but no wxWindow exists"));
win->Cocoa_synthesizeMouseMoved(); win->Cocoa_synthesizeMouseMoved();

6
src/cocoa/control.mm
View File

@@ -177,7 +177,7 @@ WX_DECLARE_GET_OBJC_CLASS(wxNonControlNSControl,NSControl)
- (void)viewDidMoveToWindow - (void)viewDidMoveToWindow
{ {
#if 0 // ABI incompatibility #if wxUSE_ABI_INCOMPATIBLE_FEATURES
wxCocoaNSView *win = wxCocoaNSView::GetFromCocoa(self); wxCocoaNSView *win = wxCocoaNSView::GetFromCocoa(self);
if( !win || !win->Cocoa_viewDidMoveToWindow() ) if( !win || !win->Cocoa_viewDidMoveToWindow() )
#endif #endif
@@ -186,7 +186,7 @@ WX_DECLARE_GET_OBJC_CLASS(wxNonControlNSControl,NSControl)
- (void)viewWillMoveToWindow:(NSWindow *)newWindow - (void)viewWillMoveToWindow:(NSWindow *)newWindow
{ {
#if 0 // ABI incompatibility #if wxUSE_ABI_INCOMPATIBLE_FEATURES
wxCocoaNSView *win = wxCocoaNSView::GetFromCocoa(self); wxCocoaNSView *win = wxCocoaNSView::GetFromCocoa(self);
if( !win || !win->Cocoa_viewWillMoveToWindow(newWindow) ) if( !win || !win->Cocoa_viewWillMoveToWindow(newWindow) )
#endif #endif
@@ -221,7 +221,7 @@ bool wxControl::Create(wxWindow *parent, wxWindowID winid,
m_parent->CocoaAddChild(this); m_parent->CocoaAddChild(this);
SetInitialFrameRect(pos,size); SetInitialFrameRect(pos,size);
#if 0 // ABI incompatibility #if wxUSE_ABI_INCOMPATIBLE_FEATURES
// Controls should have a viewable-area tracking rect by default // Controls should have a viewable-area tracking rect by default
m_visibleTrackingRectManager = new wxCocoaTrackingRectManager(this); m_visibleTrackingRectManager = new wxCocoaTrackingRectManager(this);
#endif #endif

6
src/cocoa/statbmp.mm
View File

@@ -41,7 +41,7 @@ bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID winid,
[m_cocoaNSView release]; [m_cocoaNSView release];
[GetNSImageView() setImage:bitmap.GetNSImage(true)]; [GetNSImageView() setImage:bitmap.GetNSImage(true)];
#if 0 // ABI incompatibility #if wxUSE_ABI_INCOMPATIBLE_FEATURES
m_bitmap = bitmap; m_bitmap = bitmap;
#endif #endif
@@ -63,14 +63,14 @@ void wxStaticBitmap::SetIcon(const wxIcon& icon)
void wxStaticBitmap::SetBitmap(const wxBitmap& bitmap) void wxStaticBitmap::SetBitmap(const wxBitmap& bitmap)
{ {
[GetNSImageView() setImage:bitmap.GetNSImage(true)]; [GetNSImageView() setImage:bitmap.GetNSImage(true)];
#if 0 // ABI incompatibility #if wxUSE_ABI_INCOMPATIBLE_FEATURES
m_bitmap = bitmap; m_bitmap = bitmap;
#endif #endif
} }
wxBitmap wxStaticBitmap::GetBitmap() const wxBitmap wxStaticBitmap::GetBitmap() const
{ {
#if 0 // ABI incompatibility #if wxUSE_ABI_INCOMPATIBLE_FEATURES
return m_bitmap; return m_bitmap;
#else #else
// TODO: We can try to fake it and make a wxBitmap from the NSImage the control has. // TODO: We can try to fake it and make a wxBitmap from the NSImage the control has.

24
src/cocoa/window.mm
View File

@@ -273,7 +273,9 @@ protected:
wxWindowCocoa *m_owner; wxWindowCocoa *m_owner;
WX_NSView m_dummyNSView; WX_NSView m_dummyNSView;
virtual void Cocoa_FrameChanged(void); virtual void Cocoa_FrameChanged(void);
// virtual void Cocoa_synthesizeMouseMoved(void) {} #if wxUSE_ABI_INCOMPATIBLE_FEATURES
virtual void Cocoa_synthesizeMouseMoved(void) {}
#endif
#ifdef WXCOCOA_FILL_DUMMY_VIEW #ifdef WXCOCOA_FILL_DUMMY_VIEW
virtual bool Cocoa_drawRect(const NSRect& rect); virtual bool Cocoa_drawRect(const NSRect& rect);
#endif //def WXCOCOA_FILL_DUMMY_VIEW #endif //def WXCOCOA_FILL_DUMMY_VIEW
@@ -299,7 +301,9 @@ protected:
wxWindowCocoa *m_owner; wxWindowCocoa *m_owner;
WX_NSScrollView m_cocoaNSScrollView; WX_NSScrollView m_cocoaNSScrollView;
virtual void Cocoa_FrameChanged(void); virtual void Cocoa_FrameChanged(void);
// virtual void Cocoa_synthesizeMouseMoved(void) {} #if wxUSE_ABI_INCOMPATIBLE_FEATURES
virtual void Cocoa_synthesizeMouseMoved(void) {}
#endif
private: private:
wxWindowCocoaScrollView(); wxWindowCocoaScrollView();
}; };
@@ -483,7 +487,7 @@ void wxWindowCocoa::Init()
m_isBeingDeleted = false; m_isBeingDeleted = false;
m_isInPaint = false; m_isInPaint = false;
m_shouldBeEnabled = true; m_shouldBeEnabled = true;
#if 0 // ABI incompatibility #if wxUSE_ABI_INCOMPATIBLE_FEATURES
m_visibleTrackingRectManager = NULL; m_visibleTrackingRectManager = NULL;
#endif #endif
} }
@@ -549,7 +553,7 @@ void wxWindowCocoa::CocoaRemoveFromParent(void)
void wxWindowCocoa::SetNSView(WX_NSView cocoaNSView) void wxWindowCocoa::SetNSView(WX_NSView cocoaNSView)
{ {
#if 0 // ABI incompatibility #if wxUSE_ABI_INCOMPATIBLE_FEATURES
// Clear the visible area tracking rect if we have one. // Clear the visible area tracking rect if we have one.
delete m_visibleTrackingRectManager; delete m_visibleTrackingRectManager;
m_visibleTrackingRectManager = NULL; m_visibleTrackingRectManager = NULL;
@@ -700,7 +704,7 @@ void wxWindowCocoa::Cocoa_synthesizeMouseMoved()
bool wxWindowCocoa::Cocoa_mouseEntered(WX_NSEvent theEvent) bool wxWindowCocoa::Cocoa_mouseEntered(WX_NSEvent theEvent)
{ {
#if 0 // ABI incompatibility #if wxUSE_ABI_INCOMPATIBLE_FEATURES
if(m_visibleTrackingRectManager != NULL && m_visibleTrackingRectManager->IsOwnerOfEvent(theEvent)) if(m_visibleTrackingRectManager != NULL && m_visibleTrackingRectManager->IsOwnerOfEvent(theEvent))
{ {
m_visibleTrackingRectManager->BeginSynthesizingEvents(); m_visibleTrackingRectManager->BeginSynthesizingEvents();
@@ -723,7 +727,7 @@ bool wxWindowCocoa::Cocoa_mouseEntered(WX_NSEvent theEvent)
bool wxWindowCocoa::Cocoa_mouseExited(WX_NSEvent theEvent) bool wxWindowCocoa::Cocoa_mouseExited(WX_NSEvent theEvent)
{ {
#if 0 // ABI incompatibility #if wxUSE_ABI_INCOMPATIBLE_FEATURES
if(m_visibleTrackingRectManager != NULL && m_visibleTrackingRectManager->IsOwnerOfEvent(theEvent)) if(m_visibleTrackingRectManager != NULL && m_visibleTrackingRectManager->IsOwnerOfEvent(theEvent))
{ {
m_visibleTrackingRectManager->StopSynthesizingEvents(); m_visibleTrackingRectManager->StopSynthesizingEvents();
@@ -806,7 +810,7 @@ bool wxWindowCocoa::Cocoa_otherMouseUp(WX_NSEvent theEvent)
void wxWindowCocoa::Cocoa_FrameChanged(void) void wxWindowCocoa::Cocoa_FrameChanged(void)
{ {
wxLogTrace(wxTRACE_COCOA,wxT("wxWindow=%p::Cocoa_FrameChanged"),this); wxLogTrace(wxTRACE_COCOA,wxT("wxWindow=%p::Cocoa_FrameChanged"),this);
#if 0 // ABI incompatibility #if wxUSE_ABI_INCOMPATIBLE_FEATURES
if(m_visibleTrackingRectManager != NULL) if(m_visibleTrackingRectManager != NULL)
m_visibleTrackingRectManager->RebuildTrackingRect(); m_visibleTrackingRectManager->RebuildTrackingRect();
#endif #endif
@@ -827,7 +831,7 @@ bool wxWindowCocoa::SetCursor(const wxCursor &cursor)
bool wxWindowCocoa::Cocoa_resetCursorRects() bool wxWindowCocoa::Cocoa_resetCursorRects()
{ {
wxLogTrace(wxTRACE_COCOA,wxT("wxWindow=%p::Cocoa_resetCursorRects"),this); wxLogTrace(wxTRACE_COCOA,wxT("wxWindow=%p::Cocoa_resetCursorRects"),this);
#if 0 // ABI incompatibility #if wxUSE_ABI_INCOMPATIBLE_FEATURES
if(m_visibleTrackingRectManager != NULL) if(m_visibleTrackingRectManager != NULL)
m_visibleTrackingRectManager->RebuildTrackingRect(); m_visibleTrackingRectManager->RebuildTrackingRect();
#endif #endif
@@ -840,7 +844,7 @@ bool wxWindowCocoa::Cocoa_resetCursorRects()
return true; return true;
} }
#if 0 // ABI incompatibility #if wxUSE_ABI_INCOMPATIBLE_FEATURES
bool wxWindowCocoa::Cocoa_viewDidMoveToWindow() bool wxWindowCocoa::Cocoa_viewDidMoveToWindow()
{ {
wxLogTrace(wxTRACE_COCOA,wxT("wxWindow=%p::viewDidMoveToWindow"),this); wxLogTrace(wxTRACE_COCOA,wxT("wxWindow=%p::viewDidMoveToWindow"),this);
@@ -1497,7 +1501,7 @@ static NSPoint s_lastScreenMouseLocation = NSZeroPoint;
static void SynthesizeMouseMovedEvent(CFRunLoopObserverRef observer, CFRunLoopActivity activity, void *info) static void SynthesizeMouseMovedEvent(CFRunLoopObserverRef observer, CFRunLoopActivity activity, void *info)
{ {
#if 0 // ABI incompatibility #if wxUSE_ABI_INCOMPATIBLE_FEATURES
NSPoint screenMouseLocation = [NSEvent mouseLocation]; NSPoint screenMouseLocation = [NSEvent mouseLocation];
if(screenMouseLocation.x != s_lastScreenMouseLocation.x || screenMouseLocation.y != s_lastScreenMouseLocation.y) if(screenMouseLocation.x != s_lastScreenMouseLocation.x || screenMouseLocation.y != s_lastScreenMouseLocation.y)
{ {