mirror of
https://github.com/juce-framework/JUCE.git
synced 2026-01-10 23:44:24 +00:00
This commit is contained in:
parent
067e400d4e
commit
c3ea4ebe9c
1 changed files with 55 additions and 61 deletions
|
|
@ -89,7 +89,6 @@ BEGIN_JUCE_NAMESPACE
|
|||
#include "../../../src/juce_appframework/gui/graphics/contexts/juce_LowLevelGraphicsSoftwareRenderer.h"
|
||||
#include "../../../src/juce_appframework/gui/graphics/geometry/juce_PathIterator.h"
|
||||
#include "../../../src/juce_appframework/gui/components/layout/juce_ComponentMovementWatcher.h"
|
||||
#include "juce_win32_DynamicLibraryLoader.h"
|
||||
|
||||
|
||||
extern void juce_repeatLastProcessPriority() throw(); // in juce_win32_Threads.cpp
|
||||
|
|
@ -172,7 +171,7 @@ bool Desktop::canUseSemiTransparentWindows()
|
|||
#endif
|
||||
|
||||
//==============================================================================
|
||||
static const int extendedKeyModifier = 0x10000;
|
||||
const int extendedKeyModifier = 0x10000;
|
||||
|
||||
const int KeyPress::spaceKey = VK_SPACE;
|
||||
const int KeyPress::returnKey = VK_RETURN;
|
||||
|
|
@ -221,6 +220,8 @@ const int KeyPress::numberPadMultiply = VK_MULTIPLY | extendedKeyModifie
|
|||
const int KeyPress::numberPadDivide = VK_DIVIDE | extendedKeyModifier;
|
||||
const int KeyPress::numberPadSeparator = VK_SEPARATOR | extendedKeyModifier;
|
||||
const int KeyPress::numberPadDecimalPoint = VK_DECIMAL | extendedKeyModifier;
|
||||
const int KeyPress::numberPadEquals = VK_OEM_NEC_EQUAL | extendedKeyModifier;
|
||||
const int KeyPress::numberPadDelete = VK_DELETE | extendedKeyModifier;
|
||||
const int KeyPress::playKey = 0x30000;
|
||||
const int KeyPress::stopKey = 0x30001;
|
||||
const int KeyPress::fastForwardKey = 0x30002;
|
||||
|
|
@ -467,7 +468,7 @@ bool KeyPress::isKeyCurrentlyDown (int keyCode)
|
|||
return (GetKeyState (k) & 0x8000) != 0;
|
||||
}
|
||||
|
||||
const ModifierKeys ModifierKeys::getCurrentModifiersRealtime()
|
||||
const ModifierKeys ModifierKeys::getCurrentModifiersRealtime() throw()
|
||||
{
|
||||
updateKeyModifiers();
|
||||
|
||||
|
|
@ -2265,13 +2266,6 @@ static BOOL CALLBACK enumMonitorsProc (HMONITOR, HDC, LPRECT r, LPARAM userInfo)
|
|||
|
||||
void juce_updateMultiMonitorInfo (Array <Rectangle>& monitorCoords, const bool clipToWorkArea) throw()
|
||||
{
|
||||
/*DynamicLibraryLoader user32Dll ("user32.dll");
|
||||
DynamicLibraryImport (EnumDisplayMonitors, enumDisplayMonitors, BOOL, user32Dll,
|
||||
(HDC hdc, LPCRECT lprcClip, MONITORENUMPROC, LPARAM))
|
||||
|
||||
if (enumDisplayMonitors != 0)
|
||||
enumDisplayMonitors (0, 0, &enumMonitorsProc, (LPARAM) &monitorCoords);*/
|
||||
|
||||
EnumDisplayMonitors (0, 0, &enumMonitorsProc, (LPARAM) &monitorCoords);
|
||||
|
||||
// make sure the first in the list is the main monitor
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue