Implemented toolbar/statusbar positioning

[wxWidgets.git] / include / wx / cocoa / NSWindow.h

diff --git a/include/wx/cocoa/NSWindow.h b/include/wx/cocoa/NSWindow.h
index c8ca32b1ae690915abe9d7acfaa7d944dc151aa9..04da760edc8e25e21bc882a3b8c0683ca4d7efa0 100644 (file)
--- a/include/wx/cocoa/NSWindow.h
+++ b/include/wx/cocoa/NSWindow.h
@@ -13,7 +13,7 @@
 #define __WX_COCOA_NSWINDOW_H__
 
 #include "wx/hashmap.h"
-#include "wx/cocoa/ObjcPose.h"
+#include "wx/cocoa/ObjcAssociate.h"
 
 WX_DECLARE_OBJC_HASHMAP(NSWindow);
 
@@ -25,7 +25,8 @@ public:
     void AssociateNSWindow(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 bool Cocoa_windowShouldClose(void) = 0;