Commit graph

240 commits

Author SHA1 Message Date
ericwa
b991c601f7 * Source/NSCell.m (_updateFieldEditor:): Fix what I presume is
a typo. The "if (nil == _contents) { contents = @""; }" blocks were
dead code because the contents variable would later
be set to nil if _contents was nil. This was causing an exception
when starting editing an empty text field loaded from a xib.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@35011 72102866-910b-0410-8b05-ffd578937521
2012-03-27 19:26:17 +00:00
fredkiefer
e278d9956c Fix clang compiler warnings as reported by Sebastian Reitenbach
<sebastia@l00-bugdead-prods.de>.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@34608 72102866-910b-0410-8b05-ffd578937521
2012-01-23 14:27:58 +00:00
fredkiefer
b8d7da1687 * Source/NSCell.m (-setStringValue:, setObjectValue:): Always use
ASSIGNCOPY for the contents. This fixes memory leak of last commit.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@34585 72102866-910b-0410-8b05-ffd578937521
2012-01-19 08:47:52 +00:00
rmottola
28d954f7cd Copy contents before setting it [setObjectValue]
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@34584 72102866-910b-0410-8b05-ffd578937521
2012-01-19 00:40:47 +00:00
fredkiefer
ccf59ac3ca Replace some occurences of int with NSInteger
and unsigned with NSUInteger. This allows to recompile gui on 
64 bit systems after the change to NSNotFound in base.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@34312 72102866-910b-0410-8b05-ffd578937521
2011-12-17 17:16:09 +00:00
ericwa
5eae61ca3e * Headers/AppKit/NSImageCell.h:
* Headers/AppKit/NSCell.h: Move NSImageScaling constants to NSCell
* Source/NSImageCell.m:
* Source/NSCell.m: Refactor the image scaling logic to a private
method in NSCell, -_scaleImageWithSize:toFitInSize:scalingType:
which can be share by NSImageCell, NSButtonCell, and any other
cell classes that need it.
* Source/NSButtonCell.m:
* Headers/AppKit/NSButtonCell.h: Implement -imageScaling and
-setImageScaling methods. 
* Source/GSThemeDrawing.m:
* Headers/Additions/GNUstepGUI/GSTheme.h: Remove the
-drawImage:inButtonCell:withFrame:position: API intended
to let themes substitute images right before drawing,
as IMHO it's the wrong place to hook in new images (by
the time this method was caleld, sizing/positionging
was already done).


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@34160 72102866-910b-0410-8b05-ffd578937521
2011-11-11 23:10:15 +00:00
ericwa
9ed59b06a9 * Source/NSCell.m: Read/write NSLineBreakMode from the bits masked off
by 0xE00 in NSCellFlags2. The previous location they were being
read/written from was giving bogus values such as 7.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@34073 72102866-910b-0410-8b05-ffd578937521
2011-10-26 20:01:31 +00:00
ericwa
ed053b5b5e * Source/NSImageCell.m (-drawInteriorWithFrame:inView:): Simplify a bit
bit by using
-[NSImage drawInRect:fromRect:operation:fraction:respectFlipped:hints:]
* Source/NSCell.m (-drawInteriorWithFrame:inView:): Switch from
-[NSImage compositeToPoint...] to
-[NSImage drawInRect:fromRect:operation:fraction:respectFlipped:hints:]


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@33813 72102866-910b-0410-8b05-ffd578937521
2011-09-07 08:18:40 +00:00
ericwa
43972e0a3e * Source/NSButtonCell.m (-title): Return @"" instead of nil
* Source/NSButtonCell.m (-alternateTitle): Return @"" instead of nil
* Source/NSButtonCell.m (-attributedAlternateTitle): Use
[self alternateTitle] instead of accessing _altContents directly to guard
against _altContents being nil
* Source/NSButtonCell.m (-attributedTitle): Don't return nil. Use
[self title] instead of accessing _contents directly to guard against
_contents being nil
* Source/NSButtonCell.m (-keyEquivalent): Return @"" instead of nil
* Source/NSButtonCell.m (-encodeWithCoder):
For keyEquivelant and alternateTitle, now that the methods never return
nil, instead of checking if they return nil to decide whether to encode them,
check if the string length is > 0.
* Source/NSToolbarItem.m (-label): Return @"" instead of nil.
* Source/NSCell.m (-stringValue): Return @"" instead of nil
* Source/NSCell.m (-attributedStringValue): Don't return nil. Use
[self stringValue] instead of accessing _contents directly to guard against
_contents being nil.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@33598 72102866-910b-0410-8b05-ffd578937521
2011-07-21 06:31:34 +00:00
fredkiefer
5c93b41e6d Replace direct use of the isa pointer with a call to object_getClass()
to make David happy.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@33545 72102866-910b-0410-8b05-ffd578937521
2011-07-14 07:17:24 +00:00
theraven
3da9ac45b7 Lots of small tweaks to make -gui compile without warnings with clang.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@30119 72102866-910b-0410-8b05-ffd578937521
2010-04-10 20:33:30 +00:00
fredkiefer
3d559c477e Yet another set of #include -> #import replacement.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@30083 72102866-910b-0410-8b05-ffd578937521
2010-03-31 08:14:50 +00:00
fredkiefer
c06bffe250 Some more #include -> #import replacement.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@30036 72102866-910b-0410-8b05-ffd578937521
2010-03-25 21:30:28 +00:00
fredkiefer
d2321f05c7 Change tag to NSInteger.
Patch by Anibal Rindisbacher <anibal784@gmail.com>.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@30026 72102866-910b-0410-8b05-ffd578937521
2010-03-23 21:26:24 +00:00
wlux
6eaffce9ea Fix some optimistic coding in NSCell which was causing a crash in
AddressManager.app.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@29904 72102866-910b-0410-8b05-ffd578937521
2010-03-11 18:43:15 +00:00
fredkiefer
3a1e3b1b35 Started cleanup of #includes.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@29833 72102866-910b-0410-8b05-ffd578937521
2010-03-04 10:12:13 +00:00
fredkiefer
a67707b682 Fix up teh includes to compile again after latest changes to base. Still
plenty of warnings and the result isn't working at least on 64 bit
machines :-(


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@29685 72102866-910b-0410-8b05-ffd578937521
2010-02-20 10:40:44 +00:00
fredkiefer
b142ff7815 Start cleanup after big base change. Remove the usage of extension
methods.
New 10.5 methods on NSCell.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@29656 72102866-910b-0410-8b05-ffd578937521
2010-02-17 09:58:38 +00:00
rmottola
3d507957df removed c99-ism
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@29166 72102866-910b-0410-8b05-ffd578937521
2009-12-26 10:43:09 +00:00
gcasa
0371e4e2ce Corrected documentation.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@29160 72102866-910b-0410-8b05-ffd578937521
2009-12-22 22:29:41 +00:00
fredkiefer
32d83a1422 Cleaned up implementation of NSButtonCell title setting. This allowed to
remove special case from NSCell setString:.
Removed unneeded NSSliderCell methods.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@29142 72102866-910b-0410-8b05-ffd578937521
2009-12-19 23:05:48 +00:00
wlux
00fb50716f Phase out the wraps NSCell attribute, since it is implied by the
lineBreakMode attribute. Note that with this change cells now wrap by
default, as has always been the case on OS X.
Also fix a related inconsistency where text that is wrapped by the
cell was displayed in a single line during editing.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@29134 72102866-910b-0410-8b05-ffd578937521
2009-12-17 01:49:20 +00:00
wlux
68b0f819f2 Fix various issues when drawing controls with edited cells. This
includes a fix for the problem of properly resizing and redrawing the
editor when the cell is resized or moved during editing (bug #22678).


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@29133 72102866-910b-0410-8b05-ffd578937521
2009-12-17 01:03:07 +00:00
wlux
97d1907a52 Avoid writing back an unchanged string to the cell's field editor.
Fix bug where an attributed string would not be considered a valid
object value of a cell.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@29059 72102866-910b-0410-8b05-ffd578937521
2009-11-24 23:53:58 +00:00
fredkiefer
196917f012 Attempt to correct side effect of last NSActionCell change.
Small cleanup in NSCell.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@29020 72102866-910b-0410-8b05-ffd578937521
2009-11-16 11:40:14 +00:00
wlux
b34a156dd0 Fix NSActionCell implementation so that -setObjectValue: and
-setStringValue: have an effect while the cell is edited.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@29010 72102866-910b-0410-8b05-ffd578937521
2009-11-14 22:15:31 +00:00
fredkiefer
2395ea184f Replace nil with [NSDate distantFuture] in calls to nextEventMatchingMask:...dequeue:.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@28025 72102866-910b-0410-8b05-ffd578937521
2009-03-02 16:26:23 +00:00
rmottola
86afe7ecad removed debug log
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@27891 72102866-910b-0410-8b05-ffd578937521
2009-02-16 22:14:53 +00:00
rmottola
034643d0ce try to fix bugss in last change, Optimize in case of common string and check for nil.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@27889 72102866-910b-0410-8b05-ffd578937521
2009-02-16 21:40:26 +00:00
fredkiefer
9cf6a46575 Try to fix bug in last change on NSCell.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@27887 72102866-910b-0410-8b05-ffd578937521
2009-02-16 17:06:22 +00:00
gcasa
5efe558c2b * Source/NSCell.m: Change to implement 10.3 and later behavior for
the method setStringValue: as documented in Apple's documentation
	for the method.  This behavior was observed on Cocoa under 
	Mac OS 10.5.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@27874 72102866-910b-0410-8b05-ffd578937521
2009-02-16 00:31:23 +00:00
fredkiefer
1c046acbfc Add helper method for action sending.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@27773 72102866-910b-0410-8b05-ffd578937521
2009-02-03 22:49:22 +00:00
fredkiefer
7f9c5cf331 Moved _sizeForBorderType() into GSTheme header and added more methods
for theme abstraction.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@26836 72102866-910b-0410-8b05-ffd578937521
2008-09-08 18:59:48 +00:00
fedor
ce41d782c1 Revert library license version to 2 until applications can be converted
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@26619 72102866-910b-0410-8b05-ffd578937521
2008-06-10 04:01:49 +00:00
nicola
d7027c5148 Indented line
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@26367 72102866-910b-0410-8b05-ffd578937521
2008-03-20 11:44:13 +00:00
fredkiefer
f491ac4dfb Call sendAction:to: on control even when there is no action.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@26185 72102866-910b-0410-8b05-ffd578937521
2008-03-03 22:45:23 +00:00
gcasa
7b09a29b5c * Source/NSCell.m: Correction for bug#22332.
* Source/NSSegmentedCell.m: 
        * Source/NSSegmentedControl.m: Set up default values in init 
        methods.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@26075 72102866-910b-0410-8b05-ffd578937521
2008-02-17 01:45:17 +00:00
fredkiefer
2d16c15930 Bugs reported by gcc 4.2.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@25582 72102866-910b-0410-8b05-ffd578937521
2007-11-11 18:10:42 +00:00
fredkiefer
e25cceb710 Change all files to use GPL 3 and LGPL 3.
Prepare for next release.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@25536 72102866-910b-0410-8b05-ffd578937521
2007-10-29 21:16:17 +00:00
fredkiefer
504b77dae9 Add ivar in_editing, which gets set, during the editing/selection of the cell.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@25460 72102866-910b-0410-8b05-ffd578937521
2007-09-06 21:30:13 +00:00
fredkiefer
ddb1df7caa Editing patches partly by Andreas Höschler <ahoesch@smartsoft.de>.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@25426 72102866-910b-0410-8b05-ffd578937521
2007-08-31 10:52:52 +00:00
fredkiefer
561e8d0985 Better helper methods for cell string drawing. Implement MacOSX 10.4
methods on NSForm and NSFormCell.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@25421 72102866-910b-0410-8b05-ffd578937521
2007-08-29 14:59:29 +00:00
fredkiefer
ddf32956fb Correct values for the decoded action mask, as they changed on
2007-08-03.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@25419 72102866-910b-0410-8b05-ffd578937521
2007-08-28 17:52:18 +00:00
fredkiefer
c2b80f256b Add some 10.4 methods.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@25348 72102866-910b-0410-8b05-ffd578937521
2007-07-23 16:29:29 +00:00
fredkiefer
25280ce01a Try to better key encode the contents of the cell.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@25305 72102866-910b-0410-8b05-ffd578937521
2007-07-04 15:54:40 +00:00
fredkiefer
0ccb895f2b Extract cell border drawing into helper method.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@24928 72102866-910b-0410-8b05-ffd578937521
2007-03-23 22:34:02 +00:00
fredkiefer
f63c0258d2 Corrected and cleaned up focus ring drawing for cell classes.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@24924 72102866-910b-0410-8b05-ffd578937521
2007-03-22 17:47:56 +00:00
fredkiefer
cb8c948505 Revert change to _setupTextWithFrame:..., now we again use always a clip
view, but with a different size, depending if the text should be
scrollable.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@24433 72102866-910b-0410-8b05-ffd578937521
2007-01-30 13:39:57 +00:00
fredkiefer
200770a3e5 Add MaxOS 10.4 methods and required ivars to NSButtonCell, implemented
then and use this methods. Also adjusted subclasses tothis changes.
Split off theming code for buttons into two methods.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@24400 72102866-910b-0410-8b05-ffd578937521
2007-01-23 14:17:02 +00:00
fredkiefer
aa68ca06dc Added MacOSX 10.4 methods to NSControl and reworked the whole cell
editing mechanism.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@24380 72102866-910b-0410-8b05-ffd578937521
2007-01-18 17:24:33 +00:00