Author: fredkiefer
Date: Sat Sep 19 18:45:36 2015
New Revision: 39004
URL: http://svn.gna.org/viewcvs/gnustep?rev=39004&view=rev
Log:
First set of changes based on pathces by Josh Freeman
<[email protected]>
Modified:
libs/gui/trunk/ChangeLog
libs/gui/trunk/Headers/AppKit/NSMatrix.h
libs/gui/trunk/Headers/AppKit/NSMenu.h
libs/gui/trunk/Source/NSActionCell.m
libs/gui/trunk/Source/NSApplication.m
libs/gui/trunk/Source/NSBitmapImageRep.m
libs/gui/trunk/Source/NSDocumentController.m
libs/gui/trunk/Source/NSMatrix.m
libs/gui/trunk/Source/NSMenuItem.m
libs/gui/trunk/Source/externs.m
Modified: libs/gui/trunk/ChangeLog
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/trunk/ChangeLog?rev=39004&r1=39003&r2=39004&view=diff
==============================================================================
--- libs/gui/trunk/ChangeLog (original)
+++ libs/gui/trunk/ChangeLog Sat Sep 19 18:45:36 2015
@@ -1,3 +1,20 @@
+2015-09-19 Fred Kiefer <[email protected]>
+
+ * Headers/AppKit/NSMenu.h,
+ * Source/externs.m: Add NSMenuDidEndTrackingNotification.
+ * Headers/AppKit/NSMatrix.h,
+ * Source/NSMatrix.m: Define delegate protocol and add (empty) tool
+ tip methods.
+ * Source/NSApplication.m: Send begin and end sheet notifications.
+ * Source/NSDocumentController.m: Replace all usages of
+ shouldCreateUI with the display parameter.
+ * Source/NSMenuItem.m: Decode atributes of separator item.
+ * Source/NSBitmapImageRep.m (-copyWithZone): Make a mutable copy
+ of the properties as well.
+ * Source/NSActionCell.m (-setAttributedStringValue:): Update the
+ control view.
+ Patches based on changes by Josh Freeman <[email protected]>
+
2015-09-13 Fred Kiefer <[email protected]>
* Source/NSTextView.m: Invalidate insertion point timer in
Modified: libs/gui/trunk/Headers/AppKit/NSMatrix.h
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/trunk/Headers/AppKit/NSMatrix.h?rev=39004&r1=39003&r2=39004&view=diff
==============================================================================
--- libs/gui/trunk/Headers/AppKit/NSMatrix.h (original)
+++ libs/gui/trunk/Headers/AppKit/NSMatrix.h Sat Sep 19 18:45:36 2015
@@ -48,6 +48,9 @@
NSListModeMatrix,
NSTrackModeMatrix
} NSMatrixMode;
+
+@protocol NSMatrixDelegate <NSControlTextEditingDelegate>
+@end
@interface NSMatrix : NSControl <NSCoding>
{
@@ -304,6 +307,12 @@
*/
- (void) resetCursorRects;
+/*
+ * Handling tool tips
+ */
+- (NSString *) toolTipForCell: (NSCell *)cell;
+- (void) setToolTip: (NSString *)toolTipString forCell: (NSCell *)cell;
+
@end
#endif /* _GNUstep_H_NSMatrix */
Modified: libs/gui/trunk/Headers/AppKit/NSMenu.h
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/trunk/Headers/AppKit/NSMenu.h?rev=39004&r1=39003&r2=39004&view=diff
==============================================================================
--- libs/gui/trunk/Headers/AppKit/NSMenu.h (original)
+++ libs/gui/trunk/Headers/AppKit/NSMenu.h Sat Sep 19 18:45:36 2015
@@ -820,5 +820,6 @@
APPKIT_EXPORT NSString* const NSMenuDidAddItemNotification;
APPKIT_EXPORT NSString* const NSMenuDidRemoveItemNotification;
APPKIT_EXPORT NSString* const NSMenuDidChangeItemNotification;
+APPKIT_EXPORT NSString* const NSMenuDidEndTrackingNotification;
#endif // _GNUstep_H_NSMenu
Modified: libs/gui/trunk/Source/NSActionCell.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/trunk/Source/NSActionCell.m?rev=39004&r1=39003&r2=39004&view=diff
==============================================================================
--- libs/gui/trunk/Source/NSActionCell.m (original)
+++ libs/gui/trunk/Source/NSActionCell.m Sat Sep 19 18:45:36 2015
@@ -268,6 +268,26 @@
}
}
+- (void) setAttributedStringValue: (NSAttributedString*)attribStr
+{
+ [super setAttributedStringValue: attribStr];
+ if (_control_view)
+ {
+ if ([_control_view isKindOfClass: controlClass])
+ {
+ if (_cell.in_editing)
+ {
+ [self _updateFieldEditor:
+ [(NSControl *)_control_view currentEditor]];
+ }
+ else
+ {
+ [(NSControl *)_control_view updateCell: self];
+ }
+ }
+ }
+}
+
/*
* Target and Action
*/
Modified: libs/gui/trunk/Source/NSApplication.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/trunk/Source/NSApplication.m?rev=39004&r1=39003&r2=39004&view=diff
==============================================================================
--- libs/gui/trunk/Source/NSApplication.m (original)
+++ libs/gui/trunk/Source/NSApplication.m Sat Sep 19 18:45:36 2015
@@ -2017,6 +2017,9 @@
[sheet setParentWindow: docWindow];
[docWindow setAttachedSheet: sheet];
+ [[NSNotificationCenter defaultCenter]
+ postNotificationName: NSWindowWillBeginSheetNotification
+ object: docWindow];
ret = [self runModalForWindow: sheet
relativeToWindow: docWindow];
@@ -2031,6 +2034,9 @@
[docWindow setAttachedSheet: nil];
[sheet setParentWindow: nil];
+ [[NSNotificationCenter defaultCenter]
+ postNotificationName: NSWindowDidEndSheetNotification
+ object: docWindow];
}
/**
Modified: libs/gui/trunk/Source/NSBitmapImageRep.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/trunk/Source/NSBitmapImageRep.m?rev=39004&r1=39003&r2=39004&view=diff
==============================================================================
--- libs/gui/trunk/Source/NSBitmapImageRep.m (original)
+++ libs/gui/trunk/Source/NSBitmapImageRep.m Sat Sep 19 18:45:36 2015
@@ -1761,7 +1761,7 @@
copy = (NSBitmapImageRep*)[super copyWithZone: zone];
- copy->_properties = [_properties copyWithZone: zone];
+ copy->_properties = [_properties mutableCopyWithZone: zone];
copy->_imageData = [_imageData mutableCopyWithZone: zone];
copy->_imagePlanes = NSZoneMalloc(zone, sizeof(unsigned char*) * MAX_PLANES);
if (_imageData == nil)
Modified: libs/gui/trunk/Source/NSDocumentController.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/trunk/Source/NSDocumentController.m?rev=39004&r1=39003&r2=39004&view=diff
==============================================================================
--- libs/gui/trunk/Source/NSDocumentController.m (original)
+++ libs/gui/trunk/Source/NSDocumentController.m Sat Sep 19 18:45:36 2015
@@ -505,13 +505,10 @@
}
[self addDocument: document];
- if ([self shouldCreateUI])
+ if (display)
{
[document makeWindowControllers];
- if (display)
- {
- [document showWindows];
- }
+ [document showWindows];
}
return document;
@@ -520,7 +517,7 @@
/**
* Creates an [NSDocument] object from the data at the absolute path
* given in fileName. Causes the document to be displayed if display
- * is YES, unless the -shouldCreateUI method returns NO.
+ * is YES.
*/
- (id) openDocumentWithContentsOfFile: (NSString*)fileName
display: (BOOL)display
@@ -540,7 +537,7 @@
[self addDocument: document];
- if ([self shouldCreateUI])
+ if (display)
{
[document makeWindowControllers];
}
@@ -549,7 +546,7 @@
// remember this document as opened
[self noteNewRecentDocument: document];
- if (display && [self shouldCreateUI])
+ if (display)
{
[document showWindows];
}
@@ -560,7 +557,7 @@
/**
* Creates an [NSDocument] object from the data at the supplied url.<br />
* Causes the document to be displayed if display
- * is YES, unless the -shouldCreateUI method returns NO.
+ * is YES.
*/
- (id) openDocumentWithContentsOfURL: (NSURL *)url display: (BOOL)display
{
@@ -579,7 +576,7 @@
[self addDocument: document];
- if ([self shouldCreateUI])
+ if (display)
{
[document makeWindowControllers];
}
@@ -588,7 +585,7 @@
// remember this document as opened
[self noteNewRecentDocument: document];
- if (display && [self shouldCreateUI])
+ if (display)
{
[document showWindows];
}
@@ -596,7 +593,7 @@
return document;
}
-- (id) openUntitledDocumentAndDisplay: (BOOL)flag
+- (id) openUntitledDocumentAndDisplay: (BOOL)display
error: (NSError **)err
{
NSString *type;
@@ -605,7 +602,7 @@
if (OVERRIDDEN(openUntitledDocumentOfType:display:))
{
- return [self openUntitledDocumentOfType: type display: flag];
+ return [self openUntitledDocumentOfType: type display: display];
}
else
{
@@ -618,13 +615,10 @@
}
[self addDocument: document];
- if ([self shouldCreateUI])
+ if (display)
{
[document makeWindowControllers];
- if (flag)
- {
- [document showWindows];
- }
+ [document showWindows];
}
return document;
@@ -632,13 +626,13 @@
}
- (id) openDocumentWithContentsOfURL: (NSURL *)url
- display: (BOOL)flag
+ display: (BOOL)display
error: (NSError **)err
{
if (OVERRIDDEN(openDocumentWithContentsOfFile:display:) && [url isFileURL])
{
return [self openDocumentWithContentsOfFile: [url path]
- display: flag];
+ display: display];
}
else
{
@@ -664,7 +658,7 @@
[self addDocument: document];
- if ([self shouldCreateUI])
+ if (display)
{
[document makeWindowControllers];
}
@@ -673,7 +667,7 @@
// remember this document as opened
[self noteNewRecentDocument: document];
- if (flag && [self shouldCreateUI])
+ if (display)
{
[document showWindows];
}
Modified: libs/gui/trunk/Source/NSMatrix.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/trunk/Source/NSMatrix.m?rev=39004&r1=39003&r2=39004&view=diff
==============================================================================
--- libs/gui/trunk/Source/NSMatrix.m (original)
+++ libs/gui/trunk/Source/NSMatrix.m Sat Sep 19 18:45:36 2015
@@ -2717,6 +2717,17 @@
}
}
+- (NSString*) toolTipForCell: (NSCell*)cell
+{
+ // FIXME
+ return @"";
+}
+
+- (void) setToolTip: (NSString*)toolTipString forCell: (NSCell*)cell
+{
+ // FIXME
+}
+
- (void) encodeWithCoder: (NSCoder*)aCoder
{
[super encodeWithCoder: aCoder];
Modified: libs/gui/trunk/Source/NSMenuItem.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/trunk/Source/NSMenuItem.m?rev=39004&r1=39003&r2=39004&view=diff
==============================================================================
--- libs/gui/trunk/Source/NSMenuItem.m (original)
+++ libs/gui/trunk/Source/NSMenuItem.m Sat Sep 19 18:45:36 2015
@@ -651,7 +651,7 @@
isSeparator = [aDecoder decodeBoolForKey: @"NSIsSeparator"];
}
- if (isSeparator)
+ if (isSeparator && ![self isSeparatorItem])
{
RELEASE(self);
@@ -660,7 +660,7 @@
// should not be autoreleased. Do a retain
// to prevent it from being released automatically.
//
- return RETAIN([NSMenuItem separatorItem]);
+ self = RETAIN([NSMenuItem separatorItem]);
}
//
Modified: libs/gui/trunk/Source/externs.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/trunk/Source/externs.m?rev=39004&r1=39003&r2=39004&view=diff
==============================================================================
--- libs/gui/trunk/Source/externs.m (original)
+++ libs/gui/trunk/Source/externs.m Sat Sep 19 18:45:36 2015
@@ -416,6 +416,7 @@
NSString* const NSMenuDidAddItemNotification = @"NSMenuDidAddItemNotification";
NSString* const NSMenuDidRemoveItemNotification =
@"NSMenuDidRemoveItemNotification";
NSString* const NSMenuDidChangeItemNotification =
@"NSMenuDidChangeItemNotification";
+NSString* const NSMenuDidEndTrackingNotification =
@"NSMenuDidEndTrackingNotification";
// NSPopUpButton notification
NSString *NSPopUpButtonWillPopUpNotification =
@"NSPopUpButtonWillPopUpNotification";
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
