From 42973237340a8abbb4cb2a79257742878efa2763 Mon Sep 17 00:00:00 2001
From: Vladimir Glazounov <vg@openoffice.org>
Date: Mon, 18 Aug 2008 12:28:52 +0000
Subject: INTEGRATION: CWS aquaupdateicon (1.13.42); FILE MERGED 2008/07/31
 13:55:06 pl 1.13.42.1: #i92043# refactor for tiger, which has problems with
 NSStatusItems at exit, so use one and only one

---
 vcl/aqua/source/app/saldata.cxx | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

(limited to 'vcl')

diff --git a/vcl/aqua/source/app/saldata.cxx b/vcl/aqua/source/app/saldata.cxx
index 7e6a89c45666..ff3bf7866aaa 100644
--- a/vcl/aqua/source/app/saldata.cxx
+++ b/vcl/aqua/source/app/saldata.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: saldata.cxx,v $
- * $Revision: 1.13 $
+ * $Revision: 1.14 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -32,6 +32,8 @@
 #include "precompiled_vcl.hxx"
 
 #include "saldata.hxx"
+#include "salnsmenu.h"
+#include "salinst.h"
 
 oslThreadKey SalData::s_aAutoReleaseKey = 0;
 
@@ -49,6 +51,7 @@ SalData::SalData()
     mpFirstVD( NULL ),
     mpFirstPrinter( NULL ),
     mpFontList( NULL ),
+    mpStatusItem( nil ),
     mxRGBSpace( CGColorSpaceCreateWithName(kCGColorSpaceGenericRGB) ),
     mxGraySpace( CGColorSpaceCreateWithName(kCGColorSpaceGenericGray) ),
     maCursors( POINTER_COUNT, INVALID_CURSOR_PTR ),
@@ -263,3 +266,21 @@ NSCursor* SalData::getCursor( PointerStyle i_eStyle )
     }
     return pCurs;
 }
+
+NSStatusItem* SalData::getStatusItem()
+{
+    SalData* pData = GetSalData();
+    if( ! pData->mpStatusItem )
+    {
+        NSStatusBar* pStatBar =[NSStatusBar systemStatusBar];
+        if( pStatBar )
+        {
+            pData->mpStatusItem = [pStatBar statusItemWithLength: NSVariableStatusItemLength];
+            [pData->mpStatusItem retain];
+            OOStatusItemView* pView = [[OOStatusItemView alloc] init];
+            [pData->mpStatusItem setView: pView ];
+            [pView display];
+        }
+    }
+    return pData->mpStatusItem;
+}
-- 
cgit