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

MinGW: Fix some build issues for 32-bit platforms

Browse source
This commit is contained in:
reuk 2021-07-27 20:24:51 +01:00
parent 5d7f59a19d
commit 20c23700e5
2 changed files with 15 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

16
modules/juce_gui_basics/native/juce_win32_Windowing.cpp
View file

@ -1056,7 +1056,13 @@ namespace IconConverters
header.bV5GreenMask = 0x0000FF00;
header.bV5BlueMask = 0x000000FF;
header.bV5AlphaMask = 0xFF000000;
#if JUCE_MINGW
header.bV5CSType = 'Win ';
#else
header.bV5CSType = LCS_WINDOWS_COLOR_SPACE;
#endif
header.bV5Intent = LCS_GM_IMAGES;
JUCE_END_IGNORE_WARNINGS_GCC_LIKE
@ -3933,7 +3939,7 @@ private:
case WM_IME_SETCONTEXT:
imeHandler.handleSetContext (h, wParam == TRUE);
lParam &= ~ISC_SHOWUICOMPOSITIONWINDOW;
lParam &= ~(LPARAM) ISC_SHOWUICOMPOSITIONWINDOW;
break;
case WM_IME_STARTCOMPOSITION: imeHandler.handleStartComposition (*this); return 0;
@ -4080,7 +4086,7 @@ private:
String getCompositionString (HIMC hImc, const DWORD type) const
{
jassert (hImc != nullptr);
jassert (hImc != HIMC{});
const auto stringSizeBytes = ImmGetCompositionString (hImc, type, nullptr, 0);
@ -4097,7 +4103,7 @@ private:
int getCompositionCaretPos (HIMC hImc, LPARAM lParam, const String& currentIMEString) const
{
jassert (hImc != nullptr);
jassert (hImc != HIMC{});
if ((lParam & CS_NOMOVECARET) != 0)
return compositionRange.getStart();
@ -4115,7 +4121,7 @@ private:
// returned range is relative to beginning of TextInputTarget, not composition string
Range<int> getCompositionSelection (HIMC hImc, LPARAM lParam) const
{
jassert (hImc != nullptr);
jassert (hImc != HIMC{});
int selectionStart = 0;
int selectionEnd = 0;
@ -4163,7 +4169,7 @@ private:
{
Array<Range<int>> result;
if (hImc != nullptr && (lParam & GCS_COMPCLAUSE) != 0)
if (hImc != HIMC{} && (lParam & GCS_COMPCLAUSE) != 0)
{
auto clauseDataSizeBytes = ImmGetCompositionString (hImc, GCS_COMPCLAUSE, nullptr, 0);

6
modules/juce_gui_extra/native/juce_win32_HWNDComponent.cpp
View file

@ -120,8 +120,10 @@ private:
{
auto windowFlags = GetWindowLongPtr (hwnd, -16);
windowFlags &= ~WS_POPUP;
windowFlags |= WS_CHILD;
using FlagType = decltype (windowFlags);
windowFlags &= ~(FlagType) WS_POPUP;
windowFlags |= (FlagType) WS_CHILD;
SetWindowLongPtr (hwnd, -16, windowFlags);
SetParent (hwnd, (HWND) currentPeer->getNativeHandle());