diff options
| author | culler <culler> | 2018-11-26 17:27:29 (GMT) |
|---|---|---|
| committer | culler <culler> | 2018-11-26 17:27:29 (GMT) |
| commit | 005e2c1a743b4a795a52f735a0f54e7f1e7d044b (patch) | |
| tree | 794a1415d09001b0f00b984d4c63c798c6bedec4 /macosx/tkMacOSXPrivate.h | |
| parent | 699bf05287364349ba5d1a4abdbe58128f733645 (diff) | |
| download | tk-005e2c1a743b4a795a52f735a0f54e7f1e7d044b.zip tk-005e2c1a743b4a795a52f735a0f54e7f1e7d044b.tar.gz tk-005e2c1a743b4a795a52f735a0f54e7f1e7d044b.tar.bz2 | |
Mac code cleanup. Move interfaces for subclasses of AppKit classes to
tkMacOSXPrivate.h when possible. Also Utility windows cannot go fullscreen.
Diffstat (limited to 'macosx/tkMacOSXPrivate.h')
| -rw-r--r-- | macosx/tkMacOSXPrivate.h | 65 |
1 files changed, 55 insertions, 10 deletions
diff --git a/macosx/tkMacOSXPrivate.h b/macosx/tkMacOSXPrivate.h index f3228c4..a2a7a8f 100644 --- a/macosx/tkMacOSXPrivate.h +++ b/macosx/tkMacOSXPrivate.h @@ -250,6 +250,9 @@ VISIBILITY_HIDDEN - (BOOL)isSpecial:(NSUInteger)special; @end +@interface TKMenu(TKMenuDelegate) <NSMenuDelegate> +@end + VISIBILITY_HIDDEN @interface TKApplication : NSApplication { @private @@ -278,6 +281,22 @@ VISIBILITY_HIDDEN - (void)_lockAutoreleasePool; - (void)_unlockAutoreleasePool; @end +@interface TKApplication(TKKeyboard) +- (void) keyboardChanged: (NSNotification *) notification; +@end +@interface TKApplication(TKWindowEvent) <NSApplicationDelegate> +- (void) _setupWindowNotifications; +@end +@interface TKApplication(TKMenu) +- (void)tkSetMainMenu:(TKMenu *)menu; +@end +@interface TKApplication(TKMenus) +- (void) _setupMenus; +@end +@interface NSApplication(TKNotify) +/* We need to declare this hidden method. */ +- (void) _modalSession: (NSModalSession) session sendEvent: (NSEvent *) event; +@end @interface TKApplication(TKEvent) - (NSEvent *)tkProcessEvent:(NSEvent *)theEvent; @end @@ -287,9 +306,6 @@ VISIBILITY_HIDDEN @interface TKApplication(TKKeyEvent) - (NSEvent *)tkProcessKeyEvent:(NSEvent *)theEvent; @end -@interface TKApplication(TKMenu) -- (void)tkSetMainMenu:(TKMenu *)menu; -@end @interface TKApplication(TKClipboard) - (void)tkProvidePasteboard:(TkDisplay *)dispPtr; - (void)tkCheckPasteboard; @@ -314,13 +330,8 @@ VISIBILITY_HIDDEN @end VISIBILITY_HIDDEN -@interface TKContentView : NSView <NSTextInput> { -@private - /*Remove private API calls.*/ -#if 0 - id _savedSubviews; - BOOL _subviewsSetAside; -#endif +@interface TKContentView : NSView <NSTextInput> +{ NSString *privateWorkingText; } @end @@ -348,6 +359,12 @@ VISIBILITY_HIDDEN - (NSPoint) tkConvertPointFromScreen:(NSPoint)point; @end +@interface NSDrawerWindow : NSWindow +{ + id _i1, _i2; +} +@end + #pragma mark NSMenu & NSMenuItem Utilities @interface NSMenu(TKUtils) @@ -376,4 +393,32 @@ VISIBILITY_HIDDEN keyEquivalentModifierMask:(NSUInteger)keyEquivalentModifierMask; @end +@interface NSColorPanel(TKDialog) +- (void) _setUseModalAppearance: (BOOL) flag; +@end + +@interface NSFont(TKFont) +- (NSFont *) bestMatchingFontForCharacters: (const UTF16Char *) characters + length: (NSUInteger) length attributes: (NSDictionary *) attributes + actualCoveredLength: (NSUInteger *) coveredLength; +@end + +/* + * This method of NSApplication is not declared in NSApplication.h so we + * declare it here to be a method of the TKMenu category. + */ + +@interface NSApplication(TKMenu) +- (void) setAppleMenu: (NSMenu *) menu; +@end + #endif /* _TKMACPRIV */ + +/* + * Local Variables: + * mode: objc + * c-basic-offset: 4 + * fill-column: 79 + * coding: utf-8 + * End: + */ |