~mdw
/
sgt
/
puzzles
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add WinHelp topic
[sgt/puzzles]
/
osx.m
diff --git
a/osx.m
b/osx.m
index
ed33bf6
..
7b6789d
100644
(file)
--- a/
osx.m
+++ b/
osx.m
@@
-383,7
+383,7
@@
struct frontend {
- (void)keyDown:(NSEvent *)ev;
- (void)activateTimer;
- (void)deactivateTimer;
- (void)keyDown:(NSEvent *)ev;
- (void)activateTimer;
- (void)deactivateTimer;
-- (void)setStatusLine:(
NSString
*)text;
+- (void)setStatusLine:(
char
*)text;
@end
@implementation MyImageView
@end
@implementation MyImageView
@@
-470,7
+470,8
@@
struct frontend {
frame.origin.y = 0;
frame.origin.x = 0;
frame.origin.y = 0;
frame.origin.x = 0;
- midend_size(me, &w, &h);
+ w = h = INT_MAX;
+ midend_size(me, &w, &h, FALSE);
frame.size.width = w;
frame.size.height = h;
frame.size.width = w;
frame.size.height = h;
@@
-501,7
+502,8
@@
struct frontend {
* initWithGame: simply call that one and pass it NULL.
*/
midend_new_game(me);
* initWithGame: simply call that one and pass it NULL.
*/
midend_new_game(me);
- midend_size(me, &w, &h);
+ w = h = INT_MAX;
+ midend_size(me, &w, &h, FALSE);
rect.size.width = w;
rect.size.height = h;
rect.size.width = w;
rect.size.height = h;
@@
-771,7
+773,8
@@
struct frontend {
NSSize size = {0,0};
int w, h;
NSSize size = {0,0};
int w, h;
- midend_size(me, &w, &h);
+ w = h = INT_MAX;
+ midend_size(me, &w, &h, FALSE);
size.width = w;
size.height = h;
size.width = w;
size.height = h;
@@
-1131,9
+1134,11
@@
struct frontend {
[self sheetEndWithStatus:NO];
}
[self sheetEndWithStatus:NO];
}
-- (void)setStatusLine:(
NSString
*)text
+- (void)setStatusLine:(
char
*)text
{
{
- [[status cell] setTitle:text];
+ char *rewritten = midend_rewrite_statusbar(me, text);
+ [[status cell] setTitle:[NSString stringWithCString:rewritten]];
+ sfree(rewritten);
}
@end
}
@end
@@
-1267,7
+1272,7
@@
void activate_timer(frontend *fe)
void status_bar(frontend *fe, char *text)
{
void status_bar(frontend *fe, char *text)
{
- [fe->window setStatusLine:
[NSString stringWithCString:text]
];
+ [fe->window setStatusLine:
text
];
}
/* ----------------------------------------------------------------------
}
/* ----------------------------------------------------------------------