X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5bf565977f9ec437b29ac6fd8ab77fce365f55f2..3df31b2d6e6ee809b2edc5cd2dac6275407c26c4:/src/osx/cocoa/toolbar.mm

diff --git a/src/osx/cocoa/toolbar.mm b/src/osx/cocoa/toolbar.mm
index 1b8b4866fe..a03be42b46 100644
--- a/src/osx/cocoa/toolbar.mm
+++ b/src/osx/cocoa/toolbar.mm
@@ -39,10 +39,6 @@ END_EVENT_TABLE()
 #pragma mark -
 #pragma mark Tool Implementation
 
-#if wxOSX_USE_COCOA
-#define wxOSX_USE_NATIVE_TOOLBAR 1
-#endif
-
 // ----------------------------------------------------------------------------
 // private classes
 // ----------------------------------------------------------------------------
@@ -162,6 +158,7 @@ public:
     
     void UpdateLabel()
     {
+#if wxOSX_USE_NATIVE_TOOLBAR
        if ( m_toolbarItem )
         {
             // strip mnemonics from the label for compatibility with the usual
@@ -174,6 +171,7 @@ public:
             wxCFStringRef sh( GetShortHelp(), GetToolBarFontEncoding() );
             [m_toolbarItem setToolTip:sh.AsNSString()];
         }
+#endif
     }
 
     void Action()
@@ -256,6 +254,8 @@ private:
 #endif
 };
 
+#if wxOSX_USE_NATIVE_TOOLBAR
+
 @interface wxNSToolbarItem : NSToolbarItem
 {
     wxToolBarTool* impl;
@@ -284,6 +284,8 @@ private:
 
 @end
 
+#endif
+
 
 @interface wxNSToolBarButton : NSButton
 {
@@ -298,6 +300,8 @@ private:
 
 @end
 
+#if wxOSX_USE_NATIVE_TOOLBAR
+
 @implementation wxNSToolbarItem
 
 - (id)initWithItemIdentifier: (NSString*) identifier
@@ -311,6 +315,7 @@ private:
 
 - (void) clickedAction: (id) sender
 {
+    wxUnusedVar(sender);
     if ( impl )
     {
         impl->Action();
@@ -333,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
@@ -374,6 +383,8 @@ private:
 
 @end
 
+#endif
+
 @implementation wxNSToolBarButton
 
 - (id)initWithFrame:(NSRect)frame
@@ -387,6 +398,7 @@ private:
 
 - (void) clickedAction: (id) sender
 {
+    wxUnusedVar(sender);
     if ( impl )
     {
         impl->Action();
@@ -627,6 +639,7 @@ wxToolBar::~wxToolBar()
         if (m_macUsesNativeToolbar)
             MacInstallNativeToolbar( false );
 
+        [(NSToolbar*)m_macToolbar setDelegate:nil];
         [(NSToolbar*)m_macToolbar release];
         m_macToolbar = NULL;
     }
@@ -692,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])
         {
@@ -1098,7 +1111,7 @@ void wxToolBar::MacSuperChangedPosition()
 
 void wxToolBar::SetToolNormalBitmap( int id, const wxBitmap& bitmap )
 {
-    wxToolBarTool* tool = wx_static_cast(wxToolBarTool*, FindById(id));
+    wxToolBarTool* tool = static_cast<wxToolBarTool*>(FindById(id));
     if ( tool )
     {
         wxCHECK_RET( tool->IsButton(), wxT("Can only set bitmap on button tools."));
@@ -1112,7 +1125,7 @@ void wxToolBar::SetToolNormalBitmap( int id, const wxBitmap& bitmap )
 
 void wxToolBar::SetToolDisabledBitmap( int id, const wxBitmap& bitmap )
 {
-    wxToolBarTool* tool = wx_static_cast(wxToolBarTool*, FindById(id));
+    wxToolBarTool* tool = static_cast<wxToolBarTool*>(FindById(id));
     if ( tool )
     {
         wxCHECK_RET( tool->IsButton(), wxT("Can only set bitmap on button tools."));
@@ -1140,7 +1153,7 @@ wxToolBarToolBase *wxToolBar::FindToolForPosition(wxCoord x, wxCoord y) const
         node = node->GetNext();
     }
 
-    return (wxToolBarToolBase*)NULL;
+    return NULL;
 }
 
 wxString wxToolBar::MacGetToolTipString( wxPoint &pt )
@@ -1167,7 +1180,7 @@ void wxToolBar::DoToggleTool(wxToolBarToolBase *t, bool toggle)
 
 bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos), wxToolBarToolBase *toolBase)
 {
-    wxToolBarTool *tool = wx_static_cast( wxToolBarTool*, toolBase );
+    wxToolBarTool *tool = static_cast< wxToolBarTool*>(toolBase );
     if (tool == NULL)
         return false;
 
@@ -1299,7 +1312,7 @@ void wxToolBar::DoSetToggle(wxToolBarToolBase *WXUNUSED(tool), bool WXUNUSED(tog
 
 bool wxToolBar::DoDeleteTool(size_t WXUNUSED(pos), wxToolBarToolBase *toolbase)
 {
-    wxToolBarTool* tool = wx_static_cast( wxToolBarTool*, toolbase );
+    wxToolBarTool* tool = static_cast< wxToolBarTool*>(toolbase );
     wxToolBarToolsList::compatibility_iterator node;
     for ( node = m_tools.GetFirst(); node; node = node->GetNext() )
     {