Browse Source

Don't use UWP code under windows, fixes mingw build

Closes #477
tags/1.9.7b
falkTX 8 years ago
parent
commit
fd32b075bc
1 changed files with 8 additions and 0 deletions
  1. +8
    -0
      source/modules/juce_gui_basics/native/juce_win32_Windowing.cpp

+ 8
- 0
source/modules/juce_gui_basics/native/juce_win32_Windowing.cpp View File

@@ -658,6 +658,7 @@ private:
juce_ImplementSingleton_SingleThreaded (OnScreenKeyboard) juce_ImplementSingleton_SingleThreaded (OnScreenKeyboard)
#if 0
//============================================================================== //==============================================================================
class UWPUIViewSettings class UWPUIViewSettings
{ {
@@ -808,6 +809,7 @@ private:
WindowsCreateStringFuncPtr createHString; WindowsCreateStringFuncPtr createHString;
WindowsDeleteStringFuncPtr deleteHString; WindowsDeleteStringFuncPtr deleteHString;
}; };
#endif
//============================================================================== //==============================================================================
class HWNDComponentPeer : public ComponentPeer, class HWNDComponentPeer : public ComponentPeer,
@@ -1174,16 +1176,20 @@ public:
ShowCaret (hwnd); ShowCaret (hwnd);
SetCaretPos (0, 0); SetCaretPos (0, 0);
#if 0
if (uwpViewSettings.isTabletModeActivatedForWindow (hwnd)) if (uwpViewSettings.isTabletModeActivatedForWindow (hwnd))
OnScreenKeyboard::getInstance()->activate(); OnScreenKeyboard::getInstance()->activate();
#endif
} }
void dismissPendingTextInput() override void dismissPendingTextInput() override
{ {
imeHandler.handleSetContext (hwnd, false); imeHandler.handleSetContext (hwnd, false);
#if 0
if (uwpViewSettings.isTabletModeActivatedForWindow (hwnd)) if (uwpViewSettings.isTabletModeActivatedForWindow (hwnd))
OnScreenKeyboard::getInstance()->deactivate(); OnScreenKeyboard::getInstance()->deactivate();
#endif
} }
void repaint (const Rectangle<int>& area) override void repaint (const Rectangle<int>& area) override
@@ -1441,7 +1447,9 @@ private:
HICON currentWindowIcon; HICON currentWindowIcon;
JuceDropTarget* dropTarget; JuceDropTarget* dropTarget;
uint8 updateLayeredWindowAlpha; uint8 updateLayeredWindowAlpha;
#if 0
UWPUIViewSettings uwpViewSettings; UWPUIViewSettings uwpViewSettings;
#endif
MultiTouchMapper<DWORD> currentTouches; MultiTouchMapper<DWORD> currentTouches;
#if JUCE_MODULE_AVAILABLE_juce_audio_plugin_client #if JUCE_MODULE_AVAILABLE_juce_audio_plugin_client
ModifierKeyProvider* modProvider; ModifierKeyProvider* modProvider;


Loading…
Cancel
Save