salmenu.cxx (bde8a4bd) salmenu.cxx (2dae3561)
1/**************************************************************
2 *
3 * Licensed to the Apache Software Foundation (ASF) under one
4 * or more contributor license agreements. See the NOTICE file
5 * distributed with this work for additional information
6 * regarding copyright ownership. The ASF licenses this file
7 * to you under the Apache License, Version 2.0 (the
8 * "License"); you may not use this file except in compliance

--- 241 unchanged lines hidden (view full) ---

250 mpMenu( nil ),
251 mpVCLMenu( NULL ),
252 mpFrame( NULL ),
253 mpParentSalMenu( NULL )
254{
255 if( ! mbMenuBar )
256 {
257 mpMenu = [[SalNSMenu alloc] initWithMenu: this];
1/**************************************************************
2 *
3 * Licensed to the Apache Software Foundation (ASF) under one
4 * or more contributor license agreements. See the NOTICE file
5 * distributed with this work for additional information
6 * regarding copyright ownership. The ASF licenses this file
7 * to you under the Apache License, Version 2.0 (the
8 * "License"); you may not use this file except in compliance

--- 241 unchanged lines hidden (view full) ---

250 mpMenu( nil ),
251 mpVCLMenu( NULL ),
252 mpFrame( NULL ),
253 mpParentSalMenu( NULL )
254{
255 if( ! mbMenuBar )
256 {
257 mpMenu = [[SalNSMenu alloc] initWithMenu: this];
258 [mpMenu setDelegate: mpMenu];
258 [mpMenu setDelegate: (id<NSMenuDelegate>)mpMenu];
259 }
260 else
261 {
262 mpMenu = [NSApp mainMenu];
263 }
264 [mpMenu setAutoenablesItems: NO];
265}
266

--- 697 unchanged lines hidden --- 		259 }
260 else
261 {
262 mpMenu = [NSApp mainMenu];
263 }
264 [mpMenu setAutoenablesItems: NO];
265}
266

--- 697 unchanged lines hidden ---