wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 535908 - Patch for bug 396680 breaks 64-bit builds on SnowLeopard. r=josh

Browse Source
This commit is contained in:
Steven Michaud 2009-12-19 16:12:17 -06:00
parent 82d6c026db
commit e4960c1b24
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
widget/src/cocoa/nsAppShell.mm
View File

@ -1117,20 +1117,12 @@ nsAppShell::AfterProcessNextEvent(nsIThreadInternal *aThread,
@end
@interface PDEPluginCallback : NSObject
{
@public
id _printWindowController;
}
- (PMPrintSettings *)printSettings;
@end
@interface PDEPluginCallback (MethodSwizzling)
- (PDEPluginCallback *)nsAppShell_PDEPluginCallback_initWithPrintWindowController:(id)controller;
@interface NSObject (PDEPluginCallbackMethodSwizzling)
- (id)nsAppShell_PDEPluginCallback_initWithPrintWindowController:(id)controller;
- (void)nsAppShell_PDEPluginCallback_dealloc;
@end
@implementation PDEPluginCallback (MethodSwizzling)
@implementation NSObject (PDEPluginCallbackMethodSwizzling)
// On Leopard, the PDEPluginCallback class in Apple's PrintCocoaUI module
// fails to retain and release its PMPrintWindowController object. This
@ -1142,14 +1134,21 @@ nsAppShell::AfterProcessNextEvent(nsIThreadInternal *aThread,
// PrintCocoaUI.bundle is a "plugin" of the Carbon framework's Print
// framework.
- (PDEPluginCallback *)nsAppShell_PDEPluginCallback_initWithPrintWindowController:(id)controller
- (id)nsAppShell_PDEPluginCallback_initWithPrintWindowController:(id)controller
{
return [self nsAppShell_PDEPluginCallback_initWithPrintWindowController:[controller retain]];
}
- (void)nsAppShell_PDEPluginCallback_dealloc
{
[self->_printWindowController release];
// Since the PDEPluginCallback class is undocumented (and the OS header
// files have no definition for it), we need to use low-level methods to
// access its _printWindowController variable. (object_getInstanceVariable()
// is also available in Objective-C 2.0, so this code is 64-bit safe.)
id _printWindowController = nil;
object_getInstanceVariable(self, "_printWindowController",
(void **) &_printWindowController);
[_printWindowController release];
[self nsAppShell_PDEPluginCallback_dealloc];
}