Create an NSAutoreleasePool in wxMacWakeUp().

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

diff --git a/src/osx/cocoa/toolbar.mm b/src/osx/cocoa/toolbar.mm
index b93b614850563e5c0431b4282048fe45f366bfb8..e7e62c6da75c6f62cf713e6c98c595ef8ee47094 100644 (file)
--- a/src/osx/cocoa/toolbar.mm
+++ b/src/osx/cocoa/toolbar.mm
@@ -136,7 +136,7 @@ public:
         {
             // separator size
             curSize = GetToolBar()->GetToolSize();
-            if ( GetToolBar()->GetWindowStyleFlag() & wxTB_VERTICAL )
+            if ( GetToolBar()->GetWindowStyleFlag() & (wxTB_LEFT|wxTB_RIGHT) )
                 curSize.y /= 4;
             else
                 curSize.x /= 4;
@@ -153,9 +153,9 @@ public:
     bool DoEnable( bool enable );
 
     void UpdateImages();
-    
+
     void UpdateToggleImage( bool toggle );
-    
+
     void UpdateLabel()
     {
 #if wxOSX_USE_NATIVE_TOOLBAR
@@ -167,7 +167,7 @@ public:
             wxCFStringRef l(labelStr, GetToolBarFontEncoding());
 
             [m_toolbarItem setLabel:l.AsNSString()];
-            
+
             wxCFStringRef sh( GetShortHelp(), GetToolBarFontEncoding() );
             [m_toolbarItem setToolTip:sh.AsNSString()];
         }
@@ -187,7 +187,7 @@ public:
 
         tbar->OnLeftClick( GetId(), IsToggled() );
     }
-    
+
 #if wxOSX_USE_NATIVE_TOOLBAR
     void SetToolbarItemRef( NSToolbarItem* ref )
     {
@@ -274,7 +274,7 @@ private:
 }
 
 - (NSToolbarItem *)toolbar:(NSToolbar *)toolbar itemForItemIdentifier:(NSString *)itemIdentifier willBeInsertedIntoToolbar:(BOOL)flag;
-    
+
 - (NSArray *)toolbarDefaultItemIdentifiers:(NSToolbar*)toolbar;
 
 - (NSArray *)toolbarAllowedItemIdentifiers:(NSToolbar*)toolbar;
@@ -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();
@@ -473,7 +479,7 @@ void wxToolBarTool::SetPosition( const wxPoint& position )
             frame.origin.y = mac_y;
             [m_controlHandle setFrame:frame];
         }
-    }    
+    }
 }
 
 void wxToolBarTool::UpdateImages()
@@ -493,7 +499,7 @@ void wxToolBarTool::UpdateImages()
         dc.DrawRectangle( 0, 0, w, h );
         dc.DrawBitmap( m_bmpNormal, 0, 0, true );
         dc.SelectObject( wxNullBitmap );
-        
+
         [(NSButton*) m_controlHandle setAlternateImage:m_alternateBitmap.GetNSImage()];
     }
     UpdateToggleImage( CanBeToggled() && IsToggled() );
@@ -592,19 +598,19 @@ bool wxToolBar::Create(
     if (parent->IsKindOf(CLASSINFO(wxFrame)) && wxSystemOptions::GetOptionInt(wxT("mac.toolbar.no-native")) != 1)
     {
         static wxNSToolbarDelegate* controller = nil;
-        
+
         if ( controller == nil )
             controller = [[wxNSToolbarDelegate alloc] init];
         wxString identifier = wxString::Format( wxT("%p"), this );
         wxCFStringRef cfidentifier(identifier);
         NSToolbar* tb =  [[NSToolbar alloc] initWithIdentifier:cfidentifier.AsNSString()];
-        
+
         m_macToolbar = tb ;
-        
+
         if (m_macToolbar != NULL)
         {
             [tb setDelegate:controller];
-            
+
             NSToolbarDisplayMode mode = NSToolbarDisplayModeDefault;
             NSToolbarSizeMode displaySize = NSToolbarSizeModeSmall;
 
@@ -699,8 +705,8 @@ 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])
         {
             windowFrame = [NSWindow contentRectForFrameRect:[tlw frame]
@@ -708,11 +714,11 @@ void wxToolBar::DoGetSize( int *width, int *height ) const
             toolbarHeight = NSHeight(windowFrame)
                         - NSHeight([[tlw contentView] frame]);
         }
- 
+
         if ( width != NULL )
-            *width = windowFrame.size.width;
+            *width = (int)windowFrame.size.width;
         if ( height != NULL )
-            *height = toolbarHeight;
+            *height = (int)toolbarHeight;
     }
     else
         wxToolBarBase::DoGetSize( width, height );
@@ -784,7 +790,7 @@ bool wxToolBar::MacInstallNativeToolbar(bool usesNative)
     if (usesNative && (m_macToolbar == NULL))
         return bResult;
 
-    if (usesNative && ((GetWindowStyleFlag() & wxTB_VERTICAL) != 0))
+    if (usesNative && ((GetWindowStyleFlag() & (wxTB_LEFT|wxTB_RIGHT|wxTB_BOTTOM)) != 0))
         return bResult;
 
     WXWindow tlw = MacGetTopLevelWindowRef();
@@ -804,7 +810,7 @@ bool wxToolBar::MacInstallNativeToolbar(bool usesNative)
             bResult = true;
             [tlw setToolbar:(NSToolbar*) m_macToolbar];
             [(NSToolbar*) m_macToolbar setVisible:YES];
-            
+
             m_peer->Move(0,0,0,0 );
             SetSize( wxSIZE_AUTO_WIDTH, 0 );
             m_peer->SetVisibility( false );
@@ -833,7 +839,7 @@ bool wxToolBar::MacInstallNativeToolbar(bool usesNative)
 
 bool wxToolBar::Realize()
 {
-    if (m_tools.GetCount() == 0)
+    if ( !wxToolBarBase::Realize() )
         return false;
 
     int maxWidth = 0;
@@ -902,7 +908,7 @@ bool wxToolBar::Realize()
         if ( y + cursize.y > maxHeight )
             maxHeight = y + cursize.y;
 
-        if ( GetWindowStyleFlag() & wxTB_VERTICAL )
+        if ( GetWindowStyleFlag() & (wxTB_LEFT|wxTB_RIGHT) )
         {
             int x1 = x + ( maxToolWidth - cursize.x ) / 2;
             tool->SetPosition( wxPoint(x1, y) );
@@ -914,7 +920,7 @@ bool wxToolBar::Realize()
         }
 
         // update the item positioning state
-        if ( GetWindowStyleFlag() & wxTB_VERTICAL )
+        if ( GetWindowStyleFlag() & (wxTB_LEFT|wxTB_RIGHT) )
             y += cursize.y + kwxMacToolSpacing;
         else
             x += cursize.x + kwxMacToolSpacing;
@@ -954,10 +960,16 @@ bool wxToolBar::Realize()
                             }
                         }
                     }
-                    wxString identifier = wxString::Format( wxT("%ld"), (long) tool );
-                    wxCFStringRef cfidentifier(identifier);
+                    if (tool->GetStyle() == wxTOOL_STYLE_SEPARATOR)
+                        [refTB insertItemWithItemIdentifier:NSToolbarSeparatorItemIdentifier atIndex:currentPosition];
+                    else
+                    {
+                            
+                        wxString identifier = wxString::Format( wxT("%ld"), (long) tool );
+                        wxCFStringRef cfidentifier(identifier);
 
-                    [refTB insertItemWithItemIdentifier:cfidentifier.AsNSString() atIndex:currentPosition];
+                        [refTB insertItemWithItemIdentifier:cfidentifier.AsNSString() atIndex:currentPosition];
+                    }
                     tool->SetIndex( currentPosition );
                 }
 
@@ -1007,14 +1019,14 @@ bool wxToolBar::Realize()
         node = node->GetNext();
     }
 
-    if ( GetWindowStyleFlag() & wxTB_HORIZONTAL )
+    if ( GetWindowStyleFlag() & (wxTB_TOP|wxTB_BOTTOM) )
     {
         // if not set yet, only one row
         if ( m_maxRows <= 0 )
             SetRows( 1 );
 
         m_minWidth = maxWidth;
-        maxWidth = tw;
+        // maxHeight = th;
         maxHeight += m_yMargin + kwxMacToolBarTopMargin;
         m_minHeight = m_maxHeight = maxHeight;
     }
@@ -1025,7 +1037,7 @@ bool wxToolBar::Realize()
             SetRows( GetToolsCount() );
 
         m_minHeight = maxHeight;
-        maxHeight = th;
+        // maxWidth = tw;
         maxWidth += m_xMargin + kwxMacToolBarLeftMargin;
         m_minWidth = m_maxWidth = maxWidth;
     }
@@ -1036,7 +1048,7 @@ bool wxToolBar::Realize()
         bool wantNativeToolbar, ownToolbarInstalled;
 
         // attempt to install the native toolbar
-        wantNativeToolbar = ((GetWindowStyleFlag() & wxTB_VERTICAL) == 0);
+        wantNativeToolbar = ((GetWindowStyleFlag() & (wxTB_LEFT|wxTB_BOTTOM|wxTB_RIGHT)) == 0);
         MacInstallNativeToolbar( wantNativeToolbar );
         (void)MacTopLevelHasNativeToolbar( &ownToolbarInstalled );
         if (!ownToolbarInstalled)
@@ -1199,7 +1211,7 @@ bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos), wxToolBarToolBase *toolBase)
                 wxASSERT( tool->GetControlHandle() == NULL );
                 toolSize.x /= 4;
                 toolSize.y /= 4;
-                if ( GetWindowStyleFlag() & wxTB_VERTICAL )
+                if ( GetWindowStyleFlag() & (wxTB_LEFT|wxTB_RIGHT) )
                     toolrect.size.height = toolSize.y;
                 else
                     toolrect.size.width = toolSize.x;
@@ -1230,9 +1242,9 @@ bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos), wxToolBarToolBase *toolBase)
                 [v setBordered:NO];
                 [v setButtonType: ( tool->CanBeToggled() ? NSOnOffButton : NSMomentaryPushInButton )];
                 [v setImplementation:tool];
-                
+
                 controlHandle = v;
-                
+
 #if wxOSX_USE_NATIVE_TOOLBAR
                 if (m_macToolbar != NULL)
                 {
@@ -1265,7 +1277,7 @@ bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos), wxToolBarToolBase *toolBase)
             if (m_macToolbar != NULL)
             {
                 WXWidget view = (WXWidget) tool->GetControl()->GetHandle() ;
-                wxCHECK_MSG( view, false, _T("control must be non-NULL") );
+                wxCHECK_MSG( view, false, wxT("control must be non-NULL") );
 
                 wxString identifier = wxString::Format(wxT("%ld"), (long) tool);
                 wxCFStringRef cfidentifier( identifier, wxFont::GetDefaultEncoding() );
@@ -1346,7 +1358,7 @@ bool wxToolBar::DoDeleteTool(size_t WXUNUSED(pos), wxToolBarToolBase *toolbase)
         wxToolBarTool *tool2 = (wxToolBarTool*) node->GetData();
         wxPoint pt = tool2->GetPosition();
 
-        if ( GetWindowStyleFlag() & wxTB_VERTICAL )
+        if ( GetWindowStyleFlag() & (wxTB_LEFT|wxTB_RIGHT) )
             pt.y -= sz.y;
         else
             pt.x -= sz.x;