diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/ports/SkImageEncoder_WIC.cpp | 2 | ||||
-rw-r--r-- | src/utils/win/SkWGL_win.cpp | 2 | ||||
-rw-r--r-- | src/views/win/SkOSWindow_win.cpp | 52 |
3 files changed, 2 insertions, 54 deletions
diff --git a/src/ports/SkImageEncoder_WIC.cpp b/src/ports/SkImageEncoder_WIC.cpp index 1ae9257395..dc5160413f 100644 --- a/src/ports/SkImageEncoder_WIC.cpp +++ b/src/ports/SkImageEncoder_WIC.cpp @@ -159,7 +159,7 @@ bool SkEncodeImageWithWIC(SkWStream* stream, const SkPixmap& pixmap, PROPBAG2 name = { 0 }; name.dwType = PROPBAG2_TYPE_DATA; name.vt = VT_R4; - name.pstrName = L"ImageQuality"; + name.pstrName = const_cast<LPOLESTR>(L"ImageQuality"); VARIANT value; VariantInit(&value); diff --git a/src/utils/win/SkWGL_win.cpp b/src/utils/win/SkWGL_win.cpp index d46123d1bf..cce7a56b75 100644 --- a/src/utils/win/SkWGL_win.cpp +++ b/src/utils/win/SkWGL_win.cpp @@ -229,7 +229,7 @@ void destroy_dummy_window(HWND dummy) { } #define GET_PROC(NAME, SUFFIX) f##NAME = \ - (##NAME##Proc) wglGetProcAddress("wgl" #NAME #SUFFIX) + (NAME##Proc) wglGetProcAddress("wgl" #NAME #SUFFIX) SkWGLExtensions::SkWGLExtensions() : fGetExtensionsString(nullptr) diff --git a/src/views/win/SkOSWindow_win.cpp b/src/views/win/SkOSWindow_win.cpp index 8be15d1d20..4c5f151c97 100644 --- a/src/views/win/SkOSWindow_win.cpp +++ b/src/views/win/SkOSWindow_win.cpp @@ -243,58 +243,6 @@ void SkOSWindow::onSetTitle(const char title[]){ SetWindowTextA((HWND)fHWND, title); } -enum { - SK_MacReturnKey = 36, - SK_MacDeleteKey = 51, - SK_MacEndKey = 119, - SK_MacLeftKey = 123, - SK_MacRightKey = 124, - SK_MacDownKey = 125, - SK_MacUpKey = 126, - - SK_Mac0Key = 0x52, - SK_Mac1Key = 0x53, - SK_Mac2Key = 0x54, - SK_Mac3Key = 0x55, - SK_Mac4Key = 0x56, - SK_Mac5Key = 0x57, - SK_Mac6Key = 0x58, - SK_Mac7Key = 0x59, - SK_Mac8Key = 0x5b, - SK_Mac9Key = 0x5c -}; - -static SkKey raw2key(uint32_t raw) -{ - static const struct { - uint32_t fRaw; - SkKey fKey; - } gKeys[] = { - { SK_MacUpKey, kUp_SkKey }, - { SK_MacDownKey, kDown_SkKey }, - { SK_MacLeftKey, kLeft_SkKey }, - { SK_MacRightKey, kRight_SkKey }, - { SK_MacReturnKey, kOK_SkKey }, - { SK_MacDeleteKey, kBack_SkKey }, - { SK_MacEndKey, kEnd_SkKey }, - { SK_Mac0Key, k0_SkKey }, - { SK_Mac1Key, k1_SkKey }, - { SK_Mac2Key, k2_SkKey }, - { SK_Mac3Key, k3_SkKey }, - { SK_Mac4Key, k4_SkKey }, - { SK_Mac5Key, k5_SkKey }, - { SK_Mac6Key, k6_SkKey }, - { SK_Mac7Key, k7_SkKey }, - { SK_Mac8Key, k8_SkKey }, - { SK_Mac9Key, k9_SkKey } - }; - - for (unsigned i = 0; i < SK_ARRAY_COUNT(gKeys); i++) - if (gKeys[i].fRaw == raw) - return gKeys[i].fKey; - return kNONE_SkKey; -} - /////////////////////////////////////////////////////////////////////////////////////// void SkEvent::SignalNonEmptyQueue() |