mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-02-01 03:10:06 +00:00
Code Activity

Changed NPAPI builds to always use the Cocoa UI model unless JUCE_USE_NPAPI_CARBON_UI is set to 1

Browse source
This commit is contained in:
jules 2012-11-15 10:26:52 +00:00
parent c16c3a7c28
commit 0d4d67da40
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
modules/juce_browser_plugin/wrapper/juce_NPAPI_GlueCode.cpp
View file

@ -471,7 +471,7 @@ public:
NP_CGContext* const cgContext = (window != nullptr) ? (NP_CGContext*) window->window : nullptr;
log ("NP_CGContext: " + String::toHexString ((pointer_sized_int) cgContext));
#ifndef __LP64__
#if JUCE_USE_NPAPI_CARBON_UI
WindowRef windowRef = cgContext != nullptr ? (WindowRef) cgContext->window : 0;
if (windowRef != 0)
@ -999,10 +999,10 @@ NPError NPP_New (NPMIMEType pluginType, NPP npp, ::uint16 mode, ::int16 argc, ch
#if JUCE_MAC
browser.setvalue (npp, (NPPVariable) NPNVpluginDrawingModel, (void*) NPDrawingModelCoreGraphics);
#ifdef __LP64__
browser.setvalue (npp, (NPPVariable) 1001 /*NPPVpluginEventModel*/, (void*) 1 /*NPEventModelCocoa*/);
#else
#if JUCE_USE_NPAPI_CARBON_UI
browser.setvalue (npp, (NPPVariable) 1001 /*NPPVpluginEventModel*/, 0 /*NPEventModelCarbon*/);
#else
browser.setvalue (npp, (NPPVariable) 1001 /*NPPVpluginEventModel*/, (void*) 1 /*NPEventModelCocoa*/);
#endif
#endif