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

Associate/Disassociate now check for non-NULL pointer instead of requiring

Browse Source 
the caller to do so.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21894 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Elliott
2003-07-11 17:47:57 +00:00
parent 7d27dcf906
commit bac6f2348d
7 changed files with 34 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/wx/cocoa/NSButton.h
View File

@@ -24,7 +24,8 @@ public:
void AssociateNSButton(WX_NSButton cocoaNSButton); void AssociateNSButton(WX_NSButton cocoaNSButton);
inline void DisassociateNSButton(WX_NSButton cocoaNSButton) inline void DisassociateNSButton(WX_NSButton cocoaNSButton)
{ {
sm_cocoaHash.erase(cocoaNSButton); if(cocoaNSButton)
sm_cocoaHash.erase(cocoaNSButton);
} }
public: public:

3
include/wx/cocoa/NSWindow.h
View File

@@ -25,7 +25,8 @@ public:
void AssociateNSWindow(WX_NSWindow cocoaNSWindow); void AssociateNSWindow(WX_NSWindow cocoaNSWindow);
inline void DisassociateNSWindow(WX_NSWindow cocoaNSWindow) inline void DisassociateNSWindow(WX_NSWindow cocoaNSWindow)
{ {
sm_cocoaHash.erase(cocoaNSWindow); if(cocoaNSWindow)
sm_cocoaHash.erase(cocoaNSWindow);
} }
virtual void Cocoa_close(void) = 0; virtual void Cocoa_close(void) = 0;
virtual bool Cocoa_windowShouldClose(void) = 0; virtual bool Cocoa_windowShouldClose(void) = 0;

12
include/wx/cocoa/ObjcAssociate.h
View File

@@ -45,11 +45,13 @@ WX_DECLARE_OBJC_INTERFACE_HASHMAP(ObjcClass) \
public: \ public: \
inline void Associate##ObjcClass(WX_##ObjcClass cocoaObjcClass) \ inline void Associate##ObjcClass(WX_##ObjcClass cocoaObjcClass) \
{ \ { \
sm_cocoaHash.insert(wxCocoa##ObjcClass##Hash::value_type(cocoaObjcClass,this)); \ if(cocoaObjcClass) \
sm_cocoaHash.insert(wxCocoa##ObjcClass##Hash::value_type(cocoaObjcClass,this)); \
} \ } \
inline void Disassociate##ObjcClass(WX_##ObjcClass cocoaObjcClass) \ inline void Disassociate##ObjcClass(WX_##ObjcClass cocoaObjcClass) \
{ \ { \
sm_cocoaHash.erase(cocoaObjcClass); \ if(cocoaObjcClass) \
sm_cocoaHash.erase(cocoaObjcClass); \
} }
#define WX_IMPLEMENT_OBJC_INTERFACE(ObjcClass) \ #define WX_IMPLEMENT_OBJC_INTERFACE(ObjcClass) \
@@ -68,11 +70,9 @@ protected: \
#define WX_IMPLEMENT_COCOA_OWNER(wxClass,ObjcClass,ObjcBase,ObjcRoot) \ #define WX_IMPLEMENT_COCOA_OWNER(wxClass,ObjcClass,ObjcBase,ObjcRoot) \
void wxClass::Set##ObjcClass(WX_##ObjcClass cocoaObjcClass) \ void wxClass::Set##ObjcClass(WX_##ObjcClass cocoaObjcClass) \
{ \ { \
if(m_cocoa##ObjcRoot) \ Disassociate##ObjcClass((WX_##ObjcClass)m_cocoa##ObjcRoot); \
Disassociate##ObjcClass((WX_##ObjcClass)m_cocoa##ObjcRoot); \
Set##ObjcBase(cocoaObjcClass); \ Set##ObjcBase(cocoaObjcClass); \
if(m_cocoa##ObjcRoot) \ Associate##ObjcClass((WX_##ObjcClass)m_cocoa##ObjcRoot); \
Associate##ObjcClass((WX_##ObjcClass)m_cocoa##ObjcRoot); \
} }
#endif // __WX_COCOA_OBJC_ASSOCIATE_H__ #endif // __WX_COCOA_OBJC_ASSOCIATE_H__

9
src/cocoa/NSButton.mm
View File

@@ -57,8 +57,11 @@ WX_IMPLEMENT_POSER(wxPoserNSButton);
void wxCocoaNSButton::AssociateNSButton(WX_NSButton cocoaNSButton) void wxCocoaNSButton::AssociateNSButton(WX_NSButton cocoaNSButton)
{ {
sm_cocoaHash.insert(wxCocoaNSButtonHash::value_type(cocoaNSButton,this)); if(cocoaNSButton)
[cocoaNSButton setTarget: cocoaNSButton]; {
[cocoaNSButton setAction: @selector(wxNSButtonAction:)]; sm_cocoaHash.insert(wxCocoaNSButtonHash::value_type(cocoaNSButton,this));
[cocoaNSButton setTarget: cocoaNSButton];
[cocoaNSButton setAction: @selector(wxNSButtonAction:)];
}
} }

16
src/cocoa/NSView.mm
View File

@@ -36,15 +36,21 @@ WX_IMPLEMENT_OBJC_INTERFACE_HASHMAP(NSView)
void wxCocoaNSView::AssociateNSView(WX_NSView cocoaNSView) void wxCocoaNSView::AssociateNSView(WX_NSView cocoaNSView)
{ {
sm_cocoaHash.insert(wxCocoaNSViewHash::value_type(cocoaNSView,this)); if(cocoaNSView)
[[NSNotificationCenter defaultCenter] addObserver:(id)sm_cocoaObserver selector:@selector(notificationFrameChanged:) name:@"NSViewFrameDidChangeNotification" object:cocoaNSView]; {
[cocoaNSView setPostsFrameChangedNotifications: YES]; sm_cocoaHash.insert(wxCocoaNSViewHash::value_type(cocoaNSView,this));
[[NSNotificationCenter defaultCenter] addObserver:(id)sm_cocoaObserver selector:@selector(notificationFrameChanged:) name:@"NSViewFrameDidChangeNotification" object:cocoaNSView];
[cocoaNSView setPostsFrameChangedNotifications: YES];
}
} }
void wxCocoaNSView::DisassociateNSView(WX_NSView cocoaNSView) void wxCocoaNSView::DisassociateNSView(WX_NSView cocoaNSView)
{ {
sm_cocoaHash.erase(cocoaNSView); if(cocoaNSView)
[[NSNotificationCenter defaultCenter] removeObserver:(id)sm_cocoaObserver name:@"NSViewFrameDidChangeNotification" object:cocoaNSView]; {
sm_cocoaHash.erase(cocoaNSView);
[[NSNotificationCenter defaultCenter] removeObserver:(id)sm_cocoaObserver name:@"NSViewFrameDidChangeNotification" object:cocoaNSView];
}
} }
// ============================================================================ // ============================================================================

7
src/cocoa/NSWindow.mm
View File

@@ -35,8 +35,11 @@ WX_IMPLEMENT_OBJC_INTERFACE_HASHMAP(NSWindow)
void wxCocoaNSWindow::AssociateNSWindow(WX_NSWindow cocoaNSWindow) void wxCocoaNSWindow::AssociateNSWindow(WX_NSWindow cocoaNSWindow)
{ {
[cocoaNSWindow setReleasedWhenClosed: NO]; if(cocoaNSWindow)
sm_cocoaHash.insert(wxCocoaNSWindowHash::value_type(cocoaNSWindow,this)); {
[cocoaNSWindow setReleasedWhenClosed: NO];
sm_cocoaHash.insert(wxCocoaNSWindowHash::value_type(cocoaNSWindow,this));
}
} }
// ============================================================================ // ============================================================================

6
src/cocoa/window.mm
View File

@@ -108,13 +108,11 @@ void wxWindowCocoa::SetNSView(WX_NSView cocoaNSView)
{ {
bool need_debug = cocoaNSView || m_cocoaNSView; bool need_debug = cocoaNSView || m_cocoaNSView;
if(need_debug) wxLogDebug("wxWindowCocoa=%p::SetNSView [m_cocoaNSView=%p retainCount]=%d",this,m_cocoaNSView,[m_cocoaNSView retainCount]); if(need_debug) wxLogDebug("wxWindowCocoa=%p::SetNSView [m_cocoaNSView=%p retainCount]=%d",this,m_cocoaNSView,[m_cocoaNSView retainCount]);
if(m_cocoaNSView) DisassociateNSView(m_cocoaNSView);
DisassociateNSView(m_cocoaNSView);
[cocoaNSView retain]; [cocoaNSView retain];
[m_cocoaNSView release]; [m_cocoaNSView release];
m_cocoaNSView = cocoaNSView; m_cocoaNSView = cocoaNSView;
if(m_cocoaNSView) AssociateNSView(m_cocoaNSView);
AssociateNSView(m_cocoaNSView);
if(need_debug) wxLogDebug("wxWindowCocoa=%p::SetNSView [cocoaNSView=%p retainCount]=%d",this,cocoaNSView,[cocoaNSView retainCount]); if(need_debug) wxLogDebug("wxWindowCocoa=%p::SetNSView [cocoaNSView=%p retainCount]=%d",this,cocoaNSView,[cocoaNSView retainCount]);
} }