diff --git a/PCLib/GNUmakefile b/PCLib/GNUmakefile index b771880..aececeb 100644 --- a/PCLib/GNUmakefile +++ b/PCLib/GNUmakefile @@ -62,7 +62,8 @@ ProjectType.h \ Server.h \ PCSplitView.h \ PCEditor.h \ -PCEditorController.h +PCEditorController.h \ +PCDefines.h # diff --git a/PCLib/PCBrowserController.h b/PCLib/PCBrowserController.h index af51d1b..620c3f9 100644 --- a/PCLib/PCBrowserController.h +++ b/PCLib/PCBrowserController.h @@ -24,6 +24,9 @@ $Id$ */ +#ifndef _PCBROWSERCONTROLLER_H +#define _PCBROWSERCONTROLLER_H + #import @class PCProject; @@ -56,3 +59,5 @@ - (BOOL)browser:(NSBrowser *)sender selectCellWithString:(NSString *)title inColumn:(int)column; @end + +#endif diff --git a/PCLib/PCBundleLoader.h b/PCLib/PCBundleLoader.h index 0d4ad76..7cec75a 100644 --- a/PCLib/PCBundleLoader.h +++ b/PCLib/PCBundleLoader.h @@ -24,6 +24,9 @@ $Id$ */ +#ifndef _PCBUNDLELOADER_H +#define _PCBUNDLELOADER_H + /* Descriotion: @@ -68,3 +71,5 @@ - (void)bundleLoader:(id)sender didLoadBundle:(NSBundle *)aBundle; @end + +#endif diff --git a/PCLib/PCEditor.h b/PCLib/PCEditor.h index 10df789..52dfb05 100644 --- a/PCLib/PCEditor.h +++ b/PCLib/PCEditor.h @@ -45,6 +45,8 @@ - (BOOL)revertFile; - (void)windowWillClose:(NSNotification *)aNotif; +- (void)windowDidBecomeKey:(NSNotification *)aNotification; +- (void)windowDidResignKey:(NSNotification *)aNotification; @end @@ -54,5 +56,8 @@ @end +extern NSString *PCEditorDidBecomeKeyNotification; +extern NSString *PCEditorDidResignKeyNotification; + #endif // _PCEDITOR_H_ diff --git a/PCLib/PCEditor.m b/PCLib/PCEditor.m index d184107..de7c484 100644 --- a/PCLib/PCEditor.m +++ b/PCLib/PCEditor.m @@ -11,6 +11,9 @@ #import "PCEditor.h" #import "PCEditorView.h" +NSString *PCEditorDidBecomeKeyNotification=@"PCEditorDidBecomeKeyNotification"; +NSString *PCEditorDidResignKeyNotification=@"PCEditorDidResignKeyNotification"; + @interface PCEditor (InitUI) - (void)_initUI; @@ -200,12 +203,28 @@ [view setText:text]; } -- (void)windowWillClose:(NSNotification *)aNotif +- (void)windowWillClose:(NSNotification *)aNotification { - if( [[aNotif object] isEqual:window] ) + if( [[aNotification object] isEqual:window] ) { [self close]; } } +- (void)windowDidBecomeKey:(NSNotification *)aNotification +{ + if( [[aNotification object] isEqual:window] ) + { + [[NSNotificationCenter defaultCenter] postNotificationName:PCEditorDidBecomeKeyNotification object:self]; + } +} + +- (void)windowDidResignKey:(NSNotification *)aNotification +{ + if( [[aNotification object] isEqual:window] ) + { + [[NSNotificationCenter defaultCenter] postNotificationName:PCEditorDidResignKeyNotification object:self]; + } +} + @end diff --git a/PCLib/PCEditorView.m b/PCLib/PCEditorView.m index 3bc984d..0581a4e 100644 --- a/PCLib/PCEditorView.m +++ b/PCLib/PCEditorView.m @@ -370,7 +370,7 @@ static BOOL isInitialised = NO; NSString *chars = [anEvent charactersIgnoringModifiers]; int modifiers = [anEvent modifierFlags]; - if(([chars lossyCString][0] == 's') && (modifiers & NSAlternateKeyMask)) + if(([chars lossyCString][0] == 's') && (modifiers & NSCommandKeyMask)) { [editor saveFile]; diff --git a/PCLib/PCFileManager.h b/PCLib/PCFileManager.h index b17e017..06d2da3 100644 --- a/PCLib/PCFileManager.h +++ b/PCLib/PCFileManager.h @@ -24,6 +24,9 @@ $Id$ */ +#ifndef _PCFILEMANAGER_H +#define _PCFILEMANAGER_H + #import @interface PCFileManager : NSObject @@ -89,5 +92,4 @@ @end - - +#endif diff --git a/PCLib/PCProject.h b/PCLib/PCProject.h index d53bce7..5b2ae78 100644 --- a/PCLib/PCProject.h +++ b/PCLib/PCProject.h @@ -24,6 +24,9 @@ $Id$ */ +#ifndef _PCPROJECT_H +#define _PCPROJECT_H + #import #import "ProjectBuilder.h" @@ -304,3 +307,5 @@ static NSString * const PCBuildTool = @"BUILDTOOL"; - (void)windowWillClose:(NSNotification *)aNotification; @end + +#endif diff --git a/PCLib/PCProjectBuilder.h b/PCLib/PCProjectBuilder.h index bd042d4..3d7667c 100644 --- a/PCLib/PCProjectBuilder.h +++ b/PCLib/PCProjectBuilder.h @@ -24,6 +24,9 @@ $Id$ */ +#ifndef _PCPROJECTBUILDER_H +#define _PCPROJECTBUILDER_H + #import @class PCProject; @@ -73,6 +76,4 @@ @end - - - +#endif diff --git a/PCLib/PCProjectManager.h b/PCLib/PCProjectManager.h index cf3d19b..7ac730d 100644 --- a/PCLib/PCProjectManager.h +++ b/PCLib/PCProjectManager.h @@ -24,6 +24,9 @@ $Id$ */ +#ifndef _PCPROJECTMANAGER_H +#define _PCPROJECTMANAGER_H + #import #import "PCProject.h" @@ -135,7 +138,6 @@ - (BOOL)openFile:(NSString *)path; - (BOOL)saveFile; -- (BOOL)saveFileAs:(NSString *)path; - (BOOL)revertFile; - (BOOL)renameFileTo:(NSString *)path; - (BOOL)removeFilePermanently:(BOOL)yn; @@ -171,4 +173,4 @@ extern NSString *ActiveProjectDidChangeNotification; - +#endif diff --git a/PCLib/PCProjectManager.m b/PCLib/PCProjectManager.m index 8169b4e..bd596c4 100644 --- a/PCLib/PCProjectManager.m +++ b/PCLib/PCProjectManager.m @@ -520,10 +520,6 @@ NSString *ActiveProjectDidChangeNotification = @"ActiveProjectDidChange"; return [activeProject saveFile]; } -- (BOOL)saveFileAs:(NSString *)path -{ -} - - (BOOL)revertFile { if (!activeProject) diff --git a/PCLib/PCServer.h b/PCLib/PCServer.h index 2486563..5438c7d 100644 --- a/PCLib/PCServer.h +++ b/PCLib/PCServer.h @@ -24,6 +24,9 @@ $Id$ */ +#ifndef _PCSERVER_H +#define _PCSERVER_H + #import #import "Server.h" @@ -103,3 +106,5 @@ extern NSString *PCProjectBuildDidStopNotification; - (void)connectionDidDie:(NSNotification *)notif; @end + +#endif diff --git a/PCLib/PreferenceController.h b/PCLib/PreferenceController.h index 9223ab5..3ae7dcb 100644 --- a/PCLib/PreferenceController.h +++ b/PCLib/PreferenceController.h @@ -24,6 +24,9 @@ $Id$ */ +#ifndef _PREFERENCE_CONTOLLER_PROTO_H +#define _PREFERENCE_CONTOLLER_PROTO_H + /* Description: @@ -45,3 +48,5 @@ - (id)controller; @end + +#endif diff --git a/PCLib/ProjectBuilder.h b/PCLib/ProjectBuilder.h index dd61d27..52fc2a2 100644 --- a/PCLib/ProjectBuilder.h +++ b/PCLib/ProjectBuilder.h @@ -24,6 +24,9 @@ $Id$ */ +#ifndef _PROJECT_BUILDER_PROTO_H +#define _PROJECT_BUILDER_PROTO_H + #import @class PCProject; @@ -35,3 +38,5 @@ - (void)showInspectorForProject:(PCProject *)aProject; @end + +#endif diff --git a/PCLib/ProjectCenter.h b/PCLib/ProjectCenter.h index b5db806..f6b6190 100644 --- a/PCLib/ProjectCenter.h +++ b/PCLib/ProjectCenter.h @@ -24,56 +24,29 @@ $Id$ */ -#define PC_EXTERN extern -#define PRIVATE_EXTERN __private_extern__ - -#define BUNDLE_PATH @"/LocalDeveloper/ProjectCenter/Bundles" - -#define Editor @"Editor" -#define Debugger @"Debugger" -#define Compiler @"Compiler" -#define PromptOnClean @"PromtOnClean" -#define PromptOnQuit @"PromtOnQuit" -#define SaveOnQuit @"SaveOnQuit" -#define AutoSave @"AutoSave" -#define KeepBackup @"KeepBackup" -#define AutoSavePeriod @"AutoSavePeriod" -#define RootBuildDirectory @"RootBuildDirectory" -#define DeleteCacheWhenQuitting @"DeleteBuildCacheWhenQuitting" -#define BundlePaths @"BundlePaths" -#define SuccessSound @"SuccessSound" -#define FailureSound @"FailureSound" -#define ExternalEditor @"ExternalEditor" - -#define PCAppDidInitNotification @"PCAppDidInit" -#define PCAppWillTerminateNotification @"PCAppWillTerminate" - -#define NIB_NOT_FOUND_EXCEPTION @"NibNotFoundException" -#define UNKNOWN_PROJECT_TYPE_EXCEPTION @"UnknownProjectTypeException" -#define NOT_A_PROJECT_TYPE_EXCEPTION @"NoProjectTypeCreatorException" -#define PROJECT_CREATION_EXCEPTION @"ProjectCreationException" -#define PROJECT_OPEN_FAILED_EXCEPTION @"ProjectOpenFailedException" -#define PROJECT_SAVE_FAILED_EXCEPTION @"ProjectSaveFailedException" -#define BUNDLE_MANAGER_EXCEPTION @"BundleManagerException" - -#import "PCBundleLoader.h" -#import "PCDataSource.h" -#import "PCProjectManager.h" -#import "PCServer.h" -#import "PCProject.h" -#import "PCProjectBuilder.h" -#import "PCProjectDebugger.h" -#import "PCFileManager.h" -#import "PCBrowserController.h" -#import "ProjectDebugger.h" -#import "ProjectEditor.h" -#import "ProjectType.h" -#import "Server.h" -#import "PreferenceController.h" -#import "ProjectBuilder.h" -#import "FileCreator.h" -#import "PCEditorView.h" - +#ifndef _PROJECTCENTER_H +#define _PROJECTCENTER_H +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#endif diff --git a/PCLib/ProjectCenter.pcproj b/PCLib/ProjectCenter.pcproj index b787be0..498f3ce 100644 --- a/PCLib/ProjectCenter.pcproj +++ b/PCLib/ProjectCenter.pcproj @@ -44,7 +44,8 @@ Server.h, PCSplitView.h, PCEditor.h, - PCEditorController.h + PCEditorController.h, + PCDefines.h ); INSTALLDIR = "$(GNUSTEP_SYSTEM_ROOT)"; LANGUAGE = English; diff --git a/PCLib/ProjectDebugger.h b/PCLib/ProjectDebugger.h index a6d9ba9..8bb4944 100644 --- a/PCLib/ProjectDebugger.h +++ b/PCLib/ProjectDebugger.h @@ -24,6 +24,9 @@ $Id$ */ +#ifndef _PROJECT_DEBUGGER_PROTO_H +#define _PROJECT_DEBUGGER_PROTO_H + /* Description: @@ -39,3 +42,5 @@ @protocol ProjectDebugger @end + +#endif diff --git a/PCLib/ProjectEditor.h b/PCLib/ProjectEditor.h index 056ca33..4cf18d9 100644 --- a/PCLib/ProjectEditor.h +++ b/PCLib/ProjectEditor.h @@ -24,6 +24,9 @@ $Id$ */ +#ifndef _PROJECT_EDITOR_PROTO_H +#define _PROJECT_EDITOR_PROTO_H + /* Description: @@ -54,3 +57,5 @@ - (void)editorWillTerminate:(id)editor; @end + +#endif diff --git a/PCLib/Server.h b/PCLib/Server.h index 9263ce8..8258b77 100644 --- a/PCLib/Server.h +++ b/PCLib/Server.h @@ -24,6 +24,9 @@ $Id$ */ +#ifndef _SERVER_PROTO_H +#define _SERVER_PROTO_H + #import #import "PCProject.h" @@ -57,3 +60,5 @@ - (BOOL)removeFileFromProject:(PCProject *)filePath; @end + +#endif