From 7c5fbe2a792c629a297111d03abde5edf6161873 Mon Sep 17 00:00:00 2001 From: David Elliott Date: Tue, 16 Dec 2003 19:28:21 +0000 Subject: [PATCH] 1. Initialize m_mouseDownTool = NULL. Fixes crash when clicking a non-tool part of the toolbar before clicking a tool. 2. Added wxAutoNSAutoreleasePool to CreateButtonCell() and Realize() git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24887 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/cocoa/toolbar.mm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/cocoa/toolbar.mm b/src/cocoa/toolbar.mm index 03b84d6b63..a72e61cde4 100644 --- a/src/cocoa/toolbar.mm +++ b/src/cocoa/toolbar.mm @@ -147,6 +147,8 @@ wxToolBarTool::~wxToolBarTool() bool wxToolBarTool::CreateButtonCell() { + wxAutoNSAutoreleasePool pool; + NSImage *nsimage = [m_bmpNormal.GetNSImage(true) retain]; m_cocoaNSButtonCell = [[NSButtonCell alloc] initTextCell:nil]; [m_cocoaNSButtonCell setImage:nsimage]; @@ -205,6 +207,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxControl) void wxToolBar::Init() { m_owningFrame = NULL; + m_mouseDownTool = NULL; } wxToolBar::~wxToolBar() @@ -327,6 +330,8 @@ bool wxToolBar::Cocoa_mouseDown(WX_NSEvent theEvent) bool wxToolBar::Realize() { + wxAutoNSAutoreleasePool pool; + wxToolBarToolsList::compatibility_iterator node; NSSize totalSize = NSZeroSize; // This is for horizontal, TODO: vertical -- 2.45.2