Mercurial > sdl-ios-xcode
annotate src/video/default_cursor.h @ 4324:1496aa09e41e SDL-1.2
Steven Noonan to sdl
While trying to build the SDLMain.m included with SDL 1.2.14, with
#define SDL_USE_NIB_FILE 1:
/Users/steven/Development/darwinia/targets/macosx/Darwinia/SDLMain.m:
In function '-[SDLMain fixMenu:withAppName:]':
/Users/steven/Development/darwinia/targets/macosx/Darwinia/SDLMain.m:122:
warning: 'sizeToFit' is deprecated (declared at
/Developer/SDKs/MacOSX10.6.sdk/System/Library/Frameworks/AppKit.framework/Headers/NSMenu.h:281)
/Users/steven/Development/darwinia/targets/macosx/Darwinia/SDLMain.m:
In function 'main':
/Users/steven/Development/darwinia/targets/macosx/Darwinia/SDLMain.m:376:
warning: 'poseAsClass:' is deprecated (declared at
/Developer/SDKs/MacOSX10.6.sdk/System/Library/Frameworks/Foundation.framework/Headers/NSObject.h:127)
/Users/steven/Development/darwinia/targets/macosx/Darwinia/SDLMain.m:376:
error: 'poseAsClass:' is unavailable (declared at
/Developer/SDKs/MacOSX10.6.sdk/System/Library/Frameworks/Foundation.framework/Headers/NSObject.h:127)
/Users/steven/Development/darwinia/targets/macosx/Darwinia/SDLMain.m:377:
warning: passing argument 2 of 'NSApplicationMain' from incompatible
pointer type
Eric Wing to Sam
I don't have time today to look at this in detail, but the problem is definitely the poseAsClass: method.
This was deprecated in Obj-C 2.0 and not retained in 64-bit.
I've never used this method and it has always been limited to esoteric uses. I think this is why Apple wanted to dump it (among complicating some other things they do). I have read about others getting bit by this when migrating. Long story short, there really isn't a migration path for this method. The question that then must be asked is why are we using it (what does it accomplish), and then figure out the 'proper' way of accomplishing that.
Glancing at SDLMain.m, it's not obvious to me why it is there or what it is really accomplishing. My only speculation is that NSApplicationMain hardcodes something to look for NSApplication and a subclass (SDLApplication) fails for some reason (assuming that the original coder did this for good reason).
Three thoughts come to mind.
1) The Info.plist has properties to control things related to the startup class and nib.
NSPrincipalClass, NSMainNibFile
Maybe principle class needs to be SDLApplication and we can delete the poseAs
2) I was told that 10.6 introduced new APIs to make programatic NIB wrangling and avoidance easier. Unfortunately, I don't know the specifics.
3) Instead of subclassing NSApplication in SDLMain.m, maybe we can just add a category. It looks like the following is the only thing that is done (quick glance):
@interface SDLApplication : NSApplication
@end
@implementation SDLApplication
/* Invoked from the Quit menu item */
- (void)terminate:(id)sender
{
/* Post a SDL_QUIT event */
SDL_Event event;
event.type = SDL_QUIT;
SDL_PushEvent(&event);
}
@end
So instead, we change this to: (warning written in mail and untested)
@interface NSApplication (SDLApplication)
- (void) terminate:(id)sender;
@end
@implementation NSApplication (SDLApplication)
/* Invoked from the Quit menu item */
- (void)terminate:(id)sender
{
/* Post a SDL_QUIT event */
SDL_Event event;
event.type = SDL_QUIT;
SDL_PushEvent(&event);
}
@end
Then everywhere SDLApplication is used, we change it to NSApplication (and remove the poseAsClass line).
Perhaps you could ask the bug reporter to try this solution (#3).
And if that fails, maybe try #1.
-Eric
Steven Noonan to Sam
The suggested change (diff below) seems to work fine.
- Steven
author | Sam Lantinga <slouken@libsdl.org> |
---|---|
date | Mon, 12 Oct 2009 21:07:12 +0000 |
parents | a1b03ba2fcd0 |
children |
rev | line source |
---|---|
0 | 1 /* |
2 SDL - Simple DirectMedia Layer | |
4159 | 3 Copyright (C) 1997-2009 Sam Lantinga |
0 | 4 |
5 This library is free software; you can redistribute it and/or | |
1312
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
6 modify it under the terms of the GNU Lesser General Public |
0 | 7 License as published by the Free Software Foundation; either |
1312
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
8 version 2.1 of the License, or (at your option) any later version. |
0 | 9 |
10 This library is distributed in the hope that it will be useful, | |
11 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
1312
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
13 Lesser General Public License for more details. |
0 | 14 |
1312
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
15 You should have received a copy of the GNU Lesser General Public |
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
16 License along with this library; if not, write to the Free Software |
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
17 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA |
0 | 18 |
19 Sam Lantinga | |
252
e8157fcb3114
Updated the source with the correct e-mail address
Sam Lantinga <slouken@libsdl.org>
parents:
21
diff
changeset
|
20 slouken@libsdl.org |
0 | 21 */ |
22 | |
23 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * | |
24 * Default cursor - it happens to be the Mac cursor, but could be anything */ | |
25 | |
26 #define DEFAULT_CWIDTH 16 | |
27 #define DEFAULT_CHEIGHT 16 | |
28 #define DEFAULT_CHOTX 0 | |
29 #define DEFAULT_CHOTY 0 | |
30 | |
31 /* Added a real MacOS cursor, at the request of Luc-Olivier de Charrière */ | |
32 #define USE_MACOS_CURSOR | |
33 | |
34 #ifdef USE_MACOS_CURSOR | |
35 | |
36 static unsigned char default_cdata[] = | |
37 { | |
38 0x00,0x00, | |
39 0x40,0x00, | |
40 0x60,0x00, | |
41 0x70,0x00, | |
42 0x78,0x00, | |
43 0x7C,0x00, | |
44 0x7E,0x00, | |
45 0x7F,0x00, | |
46 0x7F,0x80, | |
47 0x7C,0x00, | |
48 0x6C,0x00, | |
49 0x46,0x00, | |
50 0x06,0x00, | |
51 0x03,0x00, | |
52 0x03,0x00, | |
53 0x00,0x00 | |
54 }; | |
55 static unsigned char default_cmask[] = | |
56 { | |
57 0xC0,0x00, | |
58 0xE0,0x00, | |
59 0xF0,0x00, | |
60 0xF8,0x00, | |
61 0xFC,0x00, | |
62 0xFE,0x00, | |
63 0xFF,0x00, | |
64 0xFF,0x80, | |
65 0xFF,0xC0, | |
66 0xFF,0xE0, | |
67 0xFE,0x00, | |
68 0xEF,0x00, | |
69 0xCF,0x00, | |
70 0x87,0x80, | |
71 0x07,0x80, | |
72 0x03,0x00 | |
73 }; | |
74 | |
75 #else | |
76 | |
77 static unsigned char default_cdata[] = | |
78 { | |
79 0x00,0x00, | |
80 0x40,0x00, | |
81 0x60,0x00, | |
82 0x70,0x00, | |
83 0x78,0x00, | |
84 0x7C,0x00, | |
85 0x7E,0x00, | |
86 0x7F,0x00, | |
87 0x7F,0x80, | |
88 0x7C,0x00, | |
89 0x6C,0x00, | |
90 0x46,0x00, | |
91 0x06,0x00, | |
92 0x03,0x00, | |
93 0x03,0x00, | |
94 0x00,0x00 | |
95 }; | |
96 static unsigned char default_cmask[] = | |
97 { | |
98 0x40,0x00, | |
99 0xE0,0x00, | |
100 0xF0,0x00, | |
101 0xF8,0x00, | |
102 0xFC,0x00, | |
103 0xFE,0x00, | |
104 0xFF,0x00, | |
105 0xFF,0x80, | |
106 0xFF,0xC0, | |
107 0xFF,0x80, | |
108 0xFE,0x00, | |
109 0xEF,0x00, | |
110 0x4F,0x00, | |
111 0x07,0x80, | |
112 0x07,0x80, | |
113 0x03,0x00 | |
114 }; | |
115 | |
116 #endif /* TRUE_MACINTOSH_CURSOR */ |