don't do anything in SetWindowMenu() if we're setting the same menu as we already...

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

diff --git a/include/wx/cocoa/NSWindow.h b/include/wx/cocoa/NSWindow.h
index 4b16e5f7f061b0099f93498f480b9392f10d63cb..2a8e1a2e7a58cb25596bd9412a755233f8fd1a1e 100644 (file)
--- a/include/wx/cocoa/NSWindow.h
+++ b/include/wx/cocoa/NSWindow.h
@@ -17,22 +17,22 @@
 
 WX_DECLARE_OBJC_HASHMAP(NSWindow);
 
-class WXDLLEXPORT wxMenuBar;
-class WXDLLEXPORT wxTopLevelWindowCocoa;
+class WXDLLIMPEXP_FWD_CORE wxMenuBar;
+class WXDLLIMPEXP_FWD_CORE wxTopLevelWindowCocoa;
 
 DECLARE_WXCOCOA_OBJC_CLASS(NSMenuItem);
 DECLARE_WXCOCOA_OBJC_CLASS(wxNSWindowDelegate);
 
-class wxCocoaNSWindow
+class WXDLLIMPEXP_CORE wxCocoaNSWindow
 {
 /* NSWindow is a rather special case and requires some extra attention */
     WX_DECLARE_OBJC_INTERFACE_HASHMAP(NSWindow)
 public:
     void AssociateNSWindow(WX_NSWindow cocoaNSWindow);
     void DisassociateNSWindow(WX_NSWindow cocoaNSWindow);
-    virtual bool Cocoa_canBecomeKeyWindow(bool &canBecome)
+    virtual bool Cocoa_canBecomeKeyWindow(bool &WXUNUSED(canBecome))
     {   return false; }
-    virtual bool Cocoa_canBecomeMainWindow(bool &canBecome)
+    virtual bool Cocoa_canBecomeMainWindow(bool &WXUNUSED(canBecome))
     {   return false; }
     virtual bool CocoaDelegate_windowShouldClose(void) = 0;
     virtual void CocoaDelegate_windowWillClose(void) = 0;