switching a few icons, removing OS9 folder icons

[wxWidgets.git] / src / osx / cocoa / toolbar.mm

diff --git a/src/osx/cocoa/toolbar.mm b/src/osx/cocoa/toolbar.mm
index 50ff8949a48e9508ec9a98fc9cf68e6d6c1454e3..a03be42b4632901c199dff7333d275ca4e5ea5a8 100644 (file)
--- a/src/osx/cocoa/toolbar.mm
+++ b/src/osx/cocoa/toolbar.mm
@@ -315,6 +315,7 @@ private:
 
 - (void) clickedAction: (id) sender
 {
+    wxUnusedVar(sender);
     if ( impl )
     {
         impl->Action();
@@ -337,21 +338,25 @@ private:
 
 - (NSArray *)toolbarDefaultItemIdentifiers:(NSToolbar*)toolbar
 {
+    wxUnusedVar(toolbar);
     return nil;
 }
 
 - (NSArray *)toolbarAllowedItemIdentifiers:(NSToolbar*)toolbar
 {
+    wxUnusedVar(toolbar);
     return nil;
 }
 
 - (NSArray *)toolbarSelectableItemIdentifiers:(NSToolbar *)toolbar
 {
+    wxUnusedVar(toolbar);
     return nil;
 }
 
 - (NSToolbarItem*) toolbar:(NSToolbar*) toolbar itemForItemIdentifier:(NSString*) itemIdentifier willBeInsertedIntoToolbar:(BOOL) flag
 {
+    wxUnusedVar(toolbar);
 #ifdef __LP64__
     wxToolBarTool* tool = (wxToolBarTool*) [itemIdentifier longLongValue];
 #else
@@ -393,6 +398,7 @@ private:
 
 - (void) clickedAction: (id) sender
 {
+    wxUnusedVar(sender);
     if ( impl )
     {
         impl->Action();
@@ -633,6 +639,7 @@ wxToolBar::~wxToolBar()
         if (m_macUsesNativeToolbar)
             MacInstallNativeToolbar( false );
 
+        [(NSToolbar*)m_macToolbar setDelegate:nil];
         [(NSToolbar*)m_macToolbar release];
         m_macToolbar = NULL;
     }
@@ -698,7 +705,7 @@ void wxToolBar::DoGetSize( int *width, int *height ) const
     {
         WXWindow tlw = MacGetTopLevelWindowRef();
         float toolbarHeight = 0.0;
-        NSRect windowFrame;
+        NSRect windowFrame = NSMakeRect(0, 0, 0, 0);
  
         if(m_macToolbar && [(NSToolbar*)m_macToolbar isVisible])
         {