gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-05-29 23:20:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Source/NSPrintInfo.m ([NSPrintInfo -paperSize]): Avoid returning

Browse source 
a nil object return value into a struct.
* Printing/GSLPR/GNUmakefile.preamble: Add
Source/$(GNUSTEP_TARGET_DIR) includes
* Tools/GNUmakefile.preamble: Likewise.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@19970 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Adam Fedor 2004-09-02 03:27:54 +00:00
parent ab6a805021
commit 19e45d5c7b
4 changed files with 19 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
2004-09-01 Adam Fedor <fedor@gnu.org>
* Source/NSPrintInfo.m ([NSPrintInfo -paperSize]): Avoid returning
a nil object return value into a struct.
* Printing/GSLPR/GNUmakefile.preamble: Add
Source/$(GNUSTEP_TARGET_DIR) includes
* Tools/GNUmakefile.preamble: Likewise.
2004-09-02 00:17 Alexander Malmberg <alexander@malmberg.org>
* Source/NSView.m (-replaceSubview:with:): Clarify documentation.

3
Printing/GSLPR/GNUmakefile.preamble
View file

@ -8,7 +8,8 @@ ADDITIONAL_OBJCFLAGS +=
ADDITIONAL_CFLAGS +=
# Additional include directories the compiler should search
ADDITIONAL_INCLUDE_DIRS += -I../../Headers/Additions -I../../Headers -I../../Source
ADDITIONAL_INCLUDE_DIRS += -I../../Headers/Additions -I../../Headers \
-I../../Source/$(GNUSTEP_TARGET_DIR)
# Additional LDFLAGS to pass to the linker
ADDITIONAL_LDFLAGS +=

7
Source/NSPrintInfo.m
View file

@ -256,7 +256,12 @@ static NSPrintInfo *sharedPrintInfo = nil;
- (NSSize)paperSize
{
return [(NSValue *)[_info objectForKey:NSPrintPaperSize] sizeValue];
/* Don't simplify this. Some OSs can't handle retuning a NULL value into
a struct. */
NSValue *val = [_info objectForKey:NSPrintPaperSize];
if (val == nil)
return NSMakeSize(0,0);
return [val sizeValue];
}
- (float)rightMargin

3
Tools/GNUmakefile.preamble
View file

@ -21,7 +21,8 @@
# ADDITIONAL_CFLAGS +=
# Additional include directories the compiler should search
ADDITIONAL_INCLUDE_DIRS += -I../Headers/Additions -I../Headers -I../Source
ADDITIONAL_INCLUDE_DIRS += -I../Headers/Additions -I../Headers \
-I../Source/$(GNUSTEP_TARGET_DIR)
# Additional LDFLAGS to pass to the linker
# ADDITIONAL_LDFLAGS +=