diff options
| author | Steve Block <steveblock@google.com> | 2010-02-02 14:57:50 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-02-04 15:06:55 +0000 |
| commit | d0825bca7fe65beaee391d30da42e937db621564 (patch) | |
| tree | 7461c49eb5844ffd1f35d1ba2c8b7584c1620823 /WebCore/platform/graphics/win/IconWin.cpp | |
| parent | 3db770bd97c5a59b6c7574ca80a39e5a51c1defd (diff) | |
| download | external_webkit-d0825bca7fe65beaee391d30da42e937db621564.zip external_webkit-d0825bca7fe65beaee391d30da42e937db621564.tar.gz external_webkit-d0825bca7fe65beaee391d30da42e937db621564.tar.bz2 | |
Merge webkit.org at r54127 : Initial merge by git
Change-Id: Ib661abb595522f50ea406f72d3a0ce17f7193c82
Diffstat (limited to 'WebCore/platform/graphics/win/IconWin.cpp')
| -rw-r--r-- | WebCore/platform/graphics/win/IconWin.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/WebCore/platform/graphics/win/IconWin.cpp b/WebCore/platform/graphics/win/IconWin.cpp index d71ca00..56b46de 100644 --- a/WebCore/platform/graphics/win/IconWin.cpp +++ b/WebCore/platform/graphics/win/IconWin.cpp @@ -27,7 +27,7 @@ #include <tchar.h> #include <windows.h> -#if PLATFORM(WINCE) +#if OS(WINCE) // SHGFI_SHELLICONSIZE is not available on WINCE #define SHGFI_SHELLICONSIZE 0 #endif @@ -63,7 +63,7 @@ PassRefPtr<Icon> Icon::createIconForFiles(const Vector<String>& filenames) return adoptRef(new Icon(sfi.hIcon)); } -#if PLATFORM(WINCE) +#if OS(WINCE) return 0; #else TCHAR buffer[MAX_PATH]; @@ -86,7 +86,7 @@ void Icon::paint(GraphicsContext* context, const IntRect& r) if (context->paintingDisabled()) return; -#if PLATFORM(WINCE) +#if OS(WINCE) context->drawIcon(m_hIcon, r, DI_NORMAL); #else HDC hdc = context->getWindowsContext(r); |