Revision: 3434
http://skim-app.svn.sourceforge.net/skim-app/?rev=3434&view=rev
Author: hofman
Date: 2008-02-23 16:56:18 -0800 (Sat, 23 Feb 2008)
Log Message:
-----------
Add some declarations for 10.5 compatibility, mostly for avoiding compiler
warnings when linking against the 10.5 SDK.
Modified Paths:
--------------
trunk/SKPDFAnnotationNote.h
trunk/SKTransitionController.m
trunk/Skim_Prefix.pch
trunk/vendorsrc/martinkahr/RemoteControlWrapper/GlobalKeyboardDevice.m
Modified: trunk/SKPDFAnnotationNote.h
===================================================================
--- trunk/SKPDFAnnotationNote.h 2008-02-24 00:34:33 UTC (rev 3433)
+++ trunk/SKPDFAnnotationNote.h 2008-02-24 00:56:18 UTC (rev 3434)
@@ -145,6 +145,14 @@
#pragma mark -
[EMAIL PROTECTED] PDFAnnotationText (SKLeopardDeprecated)
+// these are deprecated on 10.5, but we don't want to use the popup for 10.4
compatibility; we check for existence before using this anyway
+- (BOOL)windowIsOpen;
+- (void)setWindowIsOpen:(BOOL)isOpen;
[EMAIL PROTECTED]
+
+#pragma mark -
+
@interface SKPDFAnnotationNote : PDFAnnotationText {
NSString *string;
NSImage *image;
Modified: trunk/SKTransitionController.m
===================================================================
--- trunk/SKTransitionController.m 2008-02-24 00:34:33 UTC (rev 3433)
+++ trunk/SKTransitionController.m 2008-02-24 00:56:18 UTC (rev 3434)
@@ -492,7 +492,7 @@
- (void)prepareOpenGL {
// Enable beam-synced updates.
- long parm = 1;
+ GLint parm = 1;
[[self openGLContext] setValues:&parm forParameter:NSOpenGLCPSwapInterval];
// Make sure that everything we don't need is disabled.
Modified: trunk/Skim_Prefix.pch
===================================================================
--- trunk/Skim_Prefix.pch 2008-02-24 00:34:33 UTC (rev 3433)
+++ trunk/Skim_Prefix.pch 2008-02-24 00:56:18 UTC (rev 3434)
@@ -59,6 +59,9 @@
#define CGFLOAT_DEFINED 1
#endif /* CGFLOAT_DEFINED */
+// From gl.h
+typedef int GLint;
+
@interface NSImage (SKLeopardOnly)
- (BOOL)isTemplate;
- (void)setTemplate:(BOOL)flag;
Modified: trunk/vendorsrc/martinkahr/RemoteControlWrapper/GlobalKeyboardDevice.m
===================================================================
--- trunk/vendorsrc/martinkahr/RemoteControlWrapper/GlobalKeyboardDevice.m
2008-02-24 00:34:33 UTC (rev 3433)
+++ trunk/vendorsrc/martinkahr/RemoteControlWrapper/GlobalKeyboardDevice.m
2008-02-24 00:56:18 UTC (rev 3434)
@@ -174,7 +174,7 @@
hotKeyID.signature = 'PTHk';
hotKeyID.id = (long)keycode;
- err = RegisterEventHotKey(keycode, modifiers, hotKeyID,
GetEventDispatcherTarget(), nil, &carbonHotKey );
+ err = RegisterEventHotKey(keycode, modifiers, hotKeyID,
GetEventDispatcherTarget(), 0, &carbonHotKey );
if( err )
return NO;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
