diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-12-07 10:53:14 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-12-07 10:53:14 +0000 |
| commit | 7eb85599883f9ca732dbbc87e9dfbc3c0254f387 (patch) | |
| tree | 10e082a16b501cb9840215c2bc9e2931d9c266f2 /extensions/source/plugin/aqua | |
| parent | a56a678751079b91fe94a2b4eef6d02661b2c48c (diff) | |
INTEGRATION: CWS macosxquicktime01 (1.2.58); FILE MERGED
2007/10/27 09:00:18 pl 1.2.58.1: #i82621# changed SystemEnvData and SystemParentData for QUARTZ
Diffstat (limited to 'extensions/source/plugin/aqua')
| -rw-r--r-- | extensions/source/plugin/aqua/makefile.mk | 9 | ||||
| -rw-r--r-- | extensions/source/plugin/aqua/sysplug.cxx | 6 |
2 files changed, 10 insertions, 5 deletions
diff --git a/extensions/source/plugin/aqua/makefile.mk b/extensions/source/plugin/aqua/makefile.mk index 76c8c3eae9da..26e90036cfa5 100644 --- a/extensions/source/plugin/aqua/makefile.mk +++ b/extensions/source/plugin/aqua/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.2 $ +# $Revision: 1.3 $ # -# last change: $Author: rt $ $Date: 2007-07-05 08:49:23 $ +# last change: $Author: vg $ $Date: 2007-12-07 11:52:22 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -58,6 +58,11 @@ INCPRE+=-I$(SOLARINCDIR)$/npsdk CDEFS+=-DOJI .ENDIF +.IF "$(GUIBASE)"=="aqua" +OBJCXXFLAGS=-x objective-c++ -fobjc-exceptions +CFLAGSCXX+=$(OBJCXXFLAGS) +.ENDIF # "$(GUIBASE)"=="aqua" + SLOFILES=\ $(SLO)$/macmgr.obj \ $(SLO)$/sysplug.obj diff --git a/extensions/source/plugin/aqua/sysplug.cxx b/extensions/source/plugin/aqua/sysplug.cxx index 5cbb6c4ba62e..f61bbfa7572d 100644 --- a/extensions/source/plugin/aqua/sysplug.cxx +++ b/extensions/source/plugin/aqua/sysplug.cxx @@ -4,9 +4,9 @@ * * $RCSfile: sysplug.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: rt $ $Date: 2007-11-12 15:32:07 $ + * last change: $Author: vg $ $Date: 2007-12-07 11:52:36 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -46,7 +46,7 @@ int MacPluginComm::nConnCounter = 0; MacPluginComm::MacPluginComm( const String& mimetype, const String& library, - WindowRef aParent, + NSView* aParent, int nDescriptor1, int nDescriptor2 ) : |