Refactored code out of GormPrivate and into separate headers.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/apps/gorm/trunk@21149 72102866-910b-0410-8b05-ffd578937521

ChangeLog

@@ -1,3 +1,34 @@
+2005-04-23 14:37 Gregory John Casamento <greg_casamento@yahoo.com>
+
+	* GormCore/GNUmakefile: Added new files.
+	* GormCore/GormBoxEditor.m: Added new includes.
+	* GormCore/GormControlEditor.m: Added new includes
+	* GormCore/GormDocument.m: Added new includes.
+	* GormCore/GormGenericEditor.m: Added new includes.
+	* GormCore/GormImageEditor.m: Added new includes.
+	* GormCore/GormInternalViewEditor.m: 
+	* GormCore/GormMatrixEditor.m: Added new includes
+	* GormCore/GormObjectEditor.m: Added new header.
+	* GormCore/GormPrivate.h: Removed declarations.
+	* GormCore/GormResourceEditor.m: Include new header.
+	* GormCore/GormScrollViewEditor.m: Include new header.
+	* GormCore/GormSoundEditor.m: Include new header.
+	* GormCore/GormSplitViewEditor.m: Added GormViewKnobs.h
+	* GormCore/GormViewEditor.m: Added GormViewKnobs.h
+	* GormCore/GormViewSizeInspector.m: Added GormViewKnobs.h
+	* GormCore/GormViewWithContentViewEditor.m: Added GormViewKnobs.h
+	* GormCore/GormWindowEditor.m: Added GormViewKnobs.h
+	* GormCore/GormSoundEditor.h: Pulled out of GormPrivate.h
+	* GormCore/GormImageEditor.h: Pulled out of GormPrivate.h
+	* GormCore/GormResourceEditor.h: Pulled out of GormPrivate.h
+	* GormCore/GormObjectEditor.h: Pulled out of GormPrivate.h
+	* GormCore/GormGenericEditor.h: Pulled out of GormPrivate.h
+	* Gorm.m: Added new includes
+	* GormPrefs/GormPalettesPref.m: Eliminated warning.
+	* Palettes/0Menus/GormMenuEditor.m: Removed unused variable.
+	* Palettes/3Containers/GormTabViewEditor.m: Added include to
+	GormViewKnobs.h
+
 2005-04-23 13:11 Gregory John Casamento <greg_casamento@yahoo.com>
 
 	* GormCore/GNUmakefile: Added new files.

Gorm.m

@@ -23,6 +23,8 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+
+#include <GormCore/GormGenericEditor.h>
 #include <GormCore/GormPrivate.h>
 #include <GormCore/GormFontViewController.h>
 #include <GormCore/GormSetNameController.h>

GormCore/GNUmakefile

@@ -138,7 +138,9 @@ GormCore_HEADER_FILES = \
 	GormFilesOwner.h \
 	GormFontViewController.h \
 	GormFunctions.h \
+	GormGenericEditor.h \
 	GormImage.h \
+	GormImageEditor.h \
 	GormImageInspector.h \
 	GormInspectorsManager.h \
 	GormInternalViewEditor.h \
@@ -149,9 +151,11 @@ GormCore_HEADER_FILES = \
 	GormPlacementInfo.h \
 	GormPrivate.h \
 	GormResource.h \
+	GormResourceEditor.h \
 	GormScrollViewAttributesInspector.h \
 	GormSetNameController.h \
 	GormSound.h \
+	GormSoundEditor.h \
 	GormSoundInspector.h \
 	GormSoundView.h \
 	GormSplitViewEditor.h \

GormCore/GormBoxEditor.m

@@ -22,12 +22,13 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-
+#include <InterfaceBuilder/IBObjectAdditions.h>
 #include <AppKit/AppKit.h>
+
 #include "GormPrivate.h"
 #include "GormBoxEditor.h"
 #include "GormInternalViewEditor.h"
-#include <InterfaceBuilder/IBObjectAdditions.h>
+#include "GormViewKnobs.h"
 
 #define _EO ((NSBox *)_editedObject)
 

GormCore/GormControlEditor.m

@@ -22,13 +22,15 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#include <InterfaceBuilder/IBObjectAdditions.h>
 #include <AppKit/AppKit.h>
 #include <Foundation/NSArchiver.h>
+
 #include "GormPrivate.h"
 #include "GormViewWithSubviewsEditor.h"
 #include "GormControlEditor.h"
 #include "GormPlacementInfo.h"
-#include <InterfaceBuilder/IBObjectAdditions.h>
+#include "GormViewKnobs.h"
 
 #define _EO ((NSControl *)_editedObject)
 

GormCore/GormDocument.m

@@ -47,6 +47,9 @@
 #include "GormImage.h"
 #include "GormViewResourceManager.h"
 #include "GormClassEditor.h"
+#include "GormSoundEditor.h"
+#include "GormImageEditor.h"
+#include "GormObjectEditor.h"
 
 @interface GormDisplayCell : NSButtonCell
 @end

GormCore/GormGenericEditor.h

@@ -0,0 +1,92 @@
+/* GormGenericEditor.h
+ *
+ * Copyright (C) 1999, 2003 Free Software Foundation, Inc.
+ *
+ * Author:	Richard Frith-Macdonald <richard@brainstrom.co.uk>
+ * Author:	Gregory John Casamento <greg_casamento@yahoo.com>
+ * Date:	1999, 2003, 2004
+ * 
+ * This file is part of GNUstep.
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#ifndef INCLUDED_GormGenericEditor_h
+#define INCLUDED_GormGenericEditor_h
+
+#include <InterfaceBuilder/InterfaceBuilder.h>
+#include <Foundation/Foundation.h>
+#include <AppKit/AppKit.h>
+
+@interface	GormGenericEditor : NSMatrix <IBEditors, IBSelectionOwners>
+{
+  NSMutableArray	*objects;
+  id<IBDocuments>	document;
+  id			selected;
+  NSPasteboard		*dragPb;
+  NSString		*dragType;
+  BOOL                  closed;
+  BOOL                  activated;
+  IBResourceManager     *resourceManager;
+}
+
+// class methods...
++ (id) editorForDocument: (id<IBDocuments>)aDocument;
++ (void) setEditor: (id)editor
+       forDocument: (id<IBDocuments>)aDocument; 
+
+// selection methods...
+- (void) selectObjects: (NSArray*)objects;
+- (BOOL) wantsSelection;
+- (void) copySelection;
+- (void) deleteSelection;
+- (void) pasteInSelection;
+- (void) refreshCells;
+- (void) closeSubeditors;
+
+- (NSWindow*) window;
+- (void) addObject: (id)anObject;
+- (void) refreshCells;
+- (void) removeObject: (id)anObject;
+- (BOOL) activate;
+- (id) initWithObject: (id)anObject inDocument: (id)aDocument;
+- (void) close;
+- (void) closeSubeditors;
+- (BOOL) containsObject: (id)anObject;
+- (void) copySelection;
+- (void) deleteSelection;
+- (id<IBDocuments>) document;
+- (id) editedObject;
+- (id<IBEditors>) openSubeditorForObject: (id)anObject;
+- (void) orderFront;
+- (void) pasteInSelection;
+- (NSRect) rectForObject: (id)anObject;
+
+- (NSArray *) objects;
+- (BOOL) isOpened;
+- (NSArray *) fileTypes;
+@end
+
+// private methods...
+@interface GormGenericEditor (PrivateMethods)
+- (void) groupSelectionInScrollView;
+- (void) groupSelectionInSplitView;
+- (void) groupSelectionInBox;
+- (void) ungroup;
+- (void) setEditor: (id)anEditor forDocument: (id<IBDocuments>)doc;
+- (id) changeSelection: (id)sender;
+@end
+
+#endif

GormCore/GormGenericEditor.m

@@ -23,15 +23,26 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include "GormPrivate.h"
+#include "GormGenericEditor.h"
 
 @implementation	GormGenericEditor
 
++ (id) editorForDocument: (id<IBDocuments>)aDocument
+{
+  // does nothing here, the subclass must define this.
+  return nil;
+}
+
 - (id) editorForDocument: (id<IBDocuments>)aDocument
 {
   return [[self class] editorForDocument: aDocument];
 }
 
++ (void) setEditor: (id)editor
+       forDocument: (id<IBDocuments>)aDocument
+{
+  // does nothing, defined by subclass.
+}
 
 - (void) setEditor: (id)editor
        forDocument: (id<IBDocuments>)aDocument

GormCore/GormImageEditor.h

@@ -0,0 +1,34 @@
+/* GormImageEditor.h
+ *
+ * Copyright (C) 1999, 2003 Free Software Foundation, Inc.
+ *
+ * Author:	Gregory John Casamento <greg_casamento@yahoo.com>
+ * Date:	1999, 2003, 2004
+ * 
+ * This file is part of GNUstep.
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#ifndef INCLUDED_GormImageEditor_h
+#define INCLUDED_GormImageEditor_h
+
+#include "GormResourceEditor.h"
+
+@interface GormImageEditor : GormResourceEditor 
+// + (GormImageEditor*) editorForDocument: (id<IBDocuments>)aDocument;
+@end
+
+#endif

GormCore/GormImageEditor.m

@@ -22,7 +22,8 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include "GormPrivate.h"
+#include "GormImageEditor.h"
+#include "GormProtocol.h"
 #include "GormFunctions.h"
 #include "GormPalettesManager.h"
 #include <AppKit/NSImage.h>

GormCore/GormInternalViewEditor.m

@@ -22,11 +22,14 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#include <InterfaceBuilder/IBObjectAdditions.h>
 #include <AppKit/AppKit.h>
+
 #include "GormPrivate.h"
 #include "GormInternalViewEditor.h"
 #include "GormFontViewController.h"
-#include <InterfaceBuilder/IBObjectAdditions.h>
+
+#include "GormViewKnobs.h"
 
 @class GormEditorToParent;
 
@@ -45,9 +48,10 @@ static NSImage *horizontalImage;
 @implementation NSView (IBObjectAdditions)
 - (NSString*) editorClassName
 {
+  // using NSBox gets rid of compiler warning, should be safe for all classes. 
   if ([self superview] && 
       (([[self superview] respondsToSelector: @selector(contentView)] &&
-	[(id)[self superview] contentView] == self) 
+	[(NSBox *)[self superview] contentView] == self) 
        ||
        [[self superview] isKindOfClass: [NSTabView class]]
        || 

GormCore/GormMatrixEditor.m

@@ -24,7 +24,9 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#include <InterfaceBuilder/IBObjectAdditions.h>
 #include <AppKit/AppKit.h>
+
 #include "GormPrivate.h"
 #include "GormImage.h"
 #include "GormViewEditor.h"
@@ -32,7 +34,7 @@
 #include "GormViewWithSubviewsEditor.h"
 #include "GormPlacementInfo.h"
 #include "GormFontViewController.h"
-#include <InterfaceBuilder/IBObjectAdditions.h>
+#include "GormViewKnobs.h"
 
 #define _EO ((NSMatrix*)_editedObject)
 

GormCore/GormObjectEditor.h

@@ -0,0 +1,43 @@
+/* GormObjectEditor.h
+ *
+ * Copyright (C) 1999, 2003 Free Software Foundation, Inc.
+ *
+ * Author:	Richard Frith-Macdonald <richard@brainstrom.co.uk>
+ * Author:	Gregory John Casamento <greg_casamento@yahoo.com>
+ * Date:	1999, 2003, 2004
+ * 
+ * This file is part of GNUstep.
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#ifndef INCLUDED_GormObjectEditor_h
+#define INCLUDED_GormObjectEditor_h
+
+#include "GormGenericEditor.h"
+
+@interface GormObjectEditor : GormGenericEditor 
+{
+}
++ (void) setEditor: (id)editor forDocument: (id<IBDocuments>)aDocument;
+- (void) draggedImage: (NSImage*)i endedAt: (NSPoint)p deposited: (BOOL)f;
+- (unsigned int) draggingSourceOperationMaskForLocal: (BOOL)flag;
+- (BOOL) acceptsTypeFromArray: (NSArray*)types;
+- (void) makeSelectionVisible: (BOOL)flag;
+- (void) resetObject: (id)anObject;
+- (void) removeAllInstancesOfClass: (NSString *)className;
+@end
+
+#endif

GormCore/GormObjectEditor.m

@@ -24,10 +24,12 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include "GormPrivate.h"
-#include "GormFunctions.h"
 #include <InterfaceBuilder/IBObjectAdditions.h>
-
+#include "GormPrivate.h"
+#include "GormObjectEditor.h"
+#include "GormFunctions.h"
+#include "GormDocument.h"
+#include "GormClassManager.h"
 /*
  * Method to return the image that should be used to display objects within
  * the matrix containing the objects in a document.

GormCore/GormPrivate.h

@@ -82,95 +82,6 @@ extern NSString *GormResizeCellNotification;
 - (NSString*) sizeInspectorClassName;
 @end
 
-@interface	GormGenericEditor : NSMatrix <IBEditors, IBSelectionOwners>
-{
-  NSMutableArray	*objects;
-  id<IBDocuments>	document;
-  id			selected;
-  NSPasteboard		*dragPb;
-  NSString		*dragType;
-  BOOL                  closed;
-  BOOL                  activated;
-  IBResourceManager     *resourceManager;
-}
-// selection methods...
-- (void) selectObjects: (NSArray*)objects;
-- (BOOL) wantsSelection;
-- (void) copySelection;
-- (void) deleteSelection;
-- (void) pasteInSelection;
-- (void) refreshCells;
-- (void) closeSubeditors;
-
-- (NSWindow*) window;
-- (void) addObject: (id)anObject;
-- (void) refreshCells;
-- (void) removeObject: (id)anObject;
-- (BOOL) activate;
-- (id) initWithObject: (id)anObject inDocument: (id)aDocument;
-- (void) close;
-- (void) closeSubeditors;
-- (BOOL) containsObject: (id)anObject;
-- (void) copySelection;
-- (void) deleteSelection;
-- (id<IBDocuments>) document;
-- (id) editedObject;
-- (id<IBEditors>) openSubeditorForObject: (id)anObject;
-- (void) orderFront;
-- (void) pasteInSelection;
-- (NSRect) rectForObject: (id)anObject;
-
-- (NSArray *) objects;
-- (BOOL) isOpened;
-- (NSArray *) fileTypes;
-@end
-
-// private methods...
-@interface GormGenericEditor (PrivateMethods)
-- (void) groupSelectionInScrollView;
-- (void) groupSelectionInSplitView;
-- (void) groupSelectionInBox;
-- (void) ungroup;
-- (void) setEditor: (id)anEditor forDocument: (id<IBDocuments>)doc;
-- (id) changeSelection: (id)sender;
-@end
-
-@interface GormObjectEditor : GormGenericEditor 
-{
-}
-+ (void) setEditor: (id)editor forDocument: (id<IBDocuments>)aDocument;
-- (void) draggedImage: (NSImage*)i endedAt: (NSPoint)p deposited: (BOOL)f;
-- (unsigned int) draggingSourceOperationMaskForLocal: (BOOL)flag;
-- (BOOL) acceptsTypeFromArray: (NSArray*)types;
-- (void) makeSelectionVisible: (BOOL)flag;
-- (void) resetObject: (id)anObject;
-- (void) removeAllInstancesOfClass: (NSString *)className;
-@end
-
-@interface GormResourceEditor : GormGenericEditor
-{
-}
-- (void) draggedImage: (NSImage*)i endedAt: (NSPoint)p deposited: (BOOL)f;
-- (unsigned int) draggingSourceOperationMaskForLocal: (BOOL)flag;
-- (void) refreshCells;
-- (id) placeHolderWithPath: (NSString *)path;
-- (NSArray *) pbTypes;
-- (NSString *) resourceType;
-- (void) addSystemResources;
-@end
-
-@interface GormSoundEditor : GormResourceEditor 
-{
-}
-+ (GormSoundEditor*) editorForDocument: (id<IBDocuments>)aDocument;
-@end
-
-@interface GormImageEditor : GormResourceEditor 
-{
-}
-+ (GormImageEditor*) editorForDocument: (id<IBDocuments>)aDocument;
-@end
-
 /*
  * NSDateFormatter and NSNumberFormatter extensions
  * for Gorm Formatters used in the Data Palette
@@ -218,14 +129,4 @@ extern NSString *GormResizeCellNotification;
                         inDocument: (id)document;
 @end
 
-/*
- * Functions for drawing knobs etc.
- */
-void GormDrawKnobsForRect(NSRect aFrame);
-void GormDrawOpenKnobsForRect(NSRect aFrame);
-NSRect GormExtBoundsForRect(NSRect aFrame);
-IBKnobPosition GormKnobHitInRect(NSRect aFrame, NSPoint p);
-void GormShowFastKnobFills(void);
-void GormShowFrameWithKnob(NSRect aRect, IBKnobPosition aKnob);
-
 #endif

GormCore/GormResourceEditor.h

@@ -0,0 +1,40 @@
+/* GormResourceEditor.h
+ *
+ * Copyright (C) 2005 Free Software Foundation, Inc.
+ *
+ * Author:	Gregory John Casamento <greg_casamento@yahoo.com>
+ * Date:	2005
+ * 
+ * This file is part of GNUstep.
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#ifndef INCLUDED_GormResourceEditor_h
+#define INCLUDED_GormResourceEditor_h
+
+#include "GormGenericEditor.h"
+
+@interface GormResourceEditor : GormGenericEditor
+- (void) draggedImage: (NSImage*)i endedAt: (NSPoint)p deposited: (BOOL)f;
+- (unsigned int) draggingSourceOperationMaskForLocal: (BOOL)flag;
+- (void) refreshCells;
+- (id) placeHolderWithPath: (NSString *)path;
+- (NSArray *) pbTypes;
+- (NSString *) resourceType;
+- (void) addSystemResources;
+@end
+
+#endif

GormCore/GormResourceEditor.m

@@ -22,10 +22,12 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#include <AppKit/NSImage.h>
+#include "GormDocument.h"
 #include "GormPrivate.h"
+#include "GormResourceEditor.h"
 #include "GormFunctions.h"
 #include "GormPalettesManager.h"
-#include <AppKit/NSImage.h>
 #include "GormResource.h"
 
 @implementation	GormResourceEditor

GormCore/GormScrollViewEditor.m

@@ -23,8 +23,10 @@
  */
 
 #include <AppKit/AppKit.h>
+
 #include "GormPrivate.h"
 #include "GormBoxEditor.h"
+#include "GormViewKnobs.h"
 
 #define _EO ((NSScrollView *)_editedObject)
 

GormCore/GormSoundEditor.h

@@ -0,0 +1,34 @@
+/* GormSoundEditor.h
+ *
+ * Copyright (C) 1999, 2003 Free Software Foundation, Inc.
+ *
+ * Author:	Gregory John Casamento <greg_casamento@yahoo.com>
+ * Date:	1999, 2003, 2004
+ * 
+ * This file is part of GNUstep.
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#ifndef INCLUDED_GormSoundEditor_h
+#define INCLUDED_GormSoundEditor_h
+
+#include "GormResourceEditor.h"
+
+@interface GormSoundEditor : GormResourceEditor 
+// + (GormSoundEditor*) editorForDocument: (id<IBDocuments>)aDocument;
+@end
+
+#endif

GormCore/GormSoundEditor.m

@@ -22,7 +22,8 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include "GormPrivate.h"
+#include "GormSoundEditor.h"
+#include "GormProtocol.h"
 #include "GormFunctions.h"
 #include "GormPalettesManager.h"
 #include <AppKit/NSSound.h>

GormCore/GormSplitViewEditor.m

@@ -22,12 +22,14 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#include <InterfaceBuilder/IBObjectAdditions.h>
 #include <AppKit/AppKit.h>
+
 #include "GormPrivate.h"
 #include "GormSplitViewEditor.h"
 #include "GormInternalViewEditor.h"
 #include "GormBoxEditor.h"
-#include <InterfaceBuilder/IBObjectAdditions.h>
+#include "GormViewKnobs.h"
 
 #define _EO ((NSSplitView *)_editedObject)
 

GormCore/GormViewEditor.m

@@ -25,12 +25,13 @@
 #include <AppKit/AppKit.h>
 #include <Foundation/NSUserDefaults.h>
 
-#include "GormPrivate.h"
+#include "GormGenericEditor.h"
 #include "GormViewEditor.h"
 #include "GormViewWithSubviewsEditor.h"
 #include "GormPlacementInfo.h"
 #include "GormFunctions.h"
 #include "GormViewWindow.h"
+#include "GormViewKnobs.h"
 
 #include <math.h>
 #include <stdlib.h>

GormCore/GormViewSizeInspector.m

@@ -23,6 +23,7 @@
  */
 
 #include "GormPrivate.h"
+#include "GormViewKnobs.h"
 
 @implementation	NSView (GormInspectors)
 - (NSString*) sizeInspectorClassName

GormCore/GormViewWithContentViewEditor.m

@@ -27,7 +27,7 @@
 #include "GormViewWithContentViewEditor.h"
 #include "GormPlacementInfo.h"
 #include "GormSplitViewEditor.h"
-
+#include "GormViewKnobs.h"
 
 @interface GormViewEditor (Private)
 - (NSRect) _displayMovingFrameWithHint: (NSRect) frame

GormCore/GormWindowEditor.m

@@ -22,11 +22,14 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#include <InterfaceBuilder/IBViewAdditions.h>
+#include <InterfaceBuilder/IBObjectAdditions.h>
+
 #include "GormPrivate.h"
 #include "GormViewWithContentViewEditor.h"
 #include "GormInternalViewEditor.h"
-#include <InterfaceBuilder/IBViewAdditions.h>
-#include <InterfaceBuilder/IBObjectAdditions.h>
+#include "GormViewKnobs.h"
+
 #include <math.h>
 
 #define _EO ((NSWindow *)_editedObject)

GormPrefs/GormPalettesPref.m

@@ -1,7 +1,32 @@
-#include <GormCore/GormPrivate.h>
+#/* GormPalettesPref.m
+ *
+ * Copyright (C) 2004 Free Software Foundation, Inc.
+ *
+ * Author:	Gregory John Casamento <greg_casamento@yahoo.com>
+ * Date:	2004
+ * 
+ * This file is part of GNUstep.
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
 #include <Foundation/NSUserDefaults.h>
 #include <AppKit/NSWindow.h>
 #include <AppKit/NSNibLoading.h>
+
+#include <GormCore/GormPrivate.h>
 #include "GormPalettesPref.h"
 
 @class NSTableView;
@@ -47,7 +72,7 @@ objectValueForTableColumn: (NSTableColumn *)tc
       return nil;
     }
   
-  _view =  [[window contentView] retain];
+  _view =  [[(NSWindow *)window contentView] retain];
   return self;
 }
 

Palettes/0Menus/GormMenuEditor.m

@@ -778,8 +778,6 @@ void _attachAll(NSMenu *menu, id document)
   enumerator = [items objectEnumerator];
   while ((item = [enumerator nextObject]) != nil)
     {
-      NSString	*title = [item title];
-
       if ([edited _ownedByPopUp])
 	{
 	  [item setOnStateImage: nil];

Palettes/3Containers/GormTabViewEditor.m

@@ -22,10 +22,13 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <AppKit/AppKit.h>
-#include <GormCore/GormPrivate.h>
-#include "GormTabViewEditor.h"
 #include <InterfaceBuilder/IBObjectAdditions.h>
+#include <AppKit/AppKit.h>
+
+#include <GormCore/GormPrivate.h>
+#include <GormCore/GormViewKnobs.h>
+
+#include "GormTabViewEditor.h"
 
 #define _EO ((NSTabView *)_editedObject)