From 90b0b362c8bdc5a29b77f65002904f74bb2ec3cb Mon Sep 17 00:00:00 2001 From: Riccardo Mottola Date: Tue, 7 Oct 2014 15:18:53 +0000 Subject: [PATCH] Revert windows-specific hacks by German to make project-type choice work. They would crash when using PC without the WinUX theme. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/apps/projectcenter/trunk@38111 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 6 ++++++ Framework/PCProjectManager.m | 7 ------- PCAppController.m | 34 ---------------------------------- 3 files changed, 6 insertions(+), 41 deletions(-) diff --git a/ChangeLog b/ChangeLog index 513f14c..b7a2283 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2014-10-07 Riccardo Mottola + + * Framework/PCProjectManager.m + * PCAppController.m + Revert windows-specific hacks by German to make project-type choice work. They would crash when using PC without the WinUX theme. + 2014-09-08 German Arias * Modules/Editors/ProjectCenter/Resources/LineJumper.gorm: Remove diff --git a/Framework/PCProjectManager.m b/Framework/PCProjectManager.m index d4a5144..0528f28 100644 --- a/Framework/PCProjectManager.m +++ b/Framework/PCProjectManager.m @@ -812,9 +812,6 @@ NSString *PCActiveProjectDidChangeNotification = @"PCActiveProjectDidChange"; NSString *projectType; PCProject *project; -#ifdef WIN32 - types = [NSArray arrayWithObject: @"pcproj"]; -#endif [self createProjectTypeAccessaryView]; @@ -846,11 +843,7 @@ NSString *PCActiveProjectDidChangeNotification = @"PCActiveProjectDidChange"; } } -#ifdef WIN32 - projectType = [(NSMenuItem *)sender title]; -#else projectType = [projectTypePopup titleOfSelectedItem]; -#endif if (!(project = [self createProjectOfType:projectType path:filePath])) { diff --git a/PCAppController.m b/PCAppController.m index 8cea667..d0fa19e 100644 --- a/PCAppController.m +++ b/PCAppController.m @@ -70,40 +70,6 @@ { [menuController setAppController:self]; [menuController setProjectManager:projectManager]; - -#ifdef WIN32 - NSMenuItem *item; - NSMenu *typeMenu = [NSMenu new]; - - [[typeMenu addItemWithTitle: @"Aggregate" - action: @selector(projectNew:) - keyEquivalent: @""] setTarget: menuController]; - [[typeMenu addItemWithTitle: @"Application" - action: @selector(projectNew:) - keyEquivalent: @""] setTarget: menuController]; - [[typeMenu addItemWithTitle: @"Bundle" - action: @selector(projectNew:) - keyEquivalent: @""] setTarget: menuController]; - [[typeMenu addItemWithTitle: @"Framework" - action: @selector(projectNew:) - keyEquivalent: @""] setTarget: menuController]; - [[typeMenu addItemWithTitle: @"Library" - action: @selector(projectNew:) - keyEquivalent: @""] setTarget: menuController]; - [[typeMenu addItemWithTitle: @"Resource Set" - action: @selector(projectNew:) - keyEquivalent: @""] setTarget: menuController]; - [[typeMenu addItemWithTitle: @"Tool" - action: @selector(projectNew:) - keyEquivalent: @""] setTarget: menuController]; - - item = [[[[NSApp mainMenu] itemWithTitle: _(@"Project")] submenu] - itemWithTitle: _(@"New...")]; - [item setTitle: _(@"New")]; - [item setKeyEquivalent: @""]; - [item setSubmenu: typeMenu]; - [typeMenu release]; -#endif } //============================================================================