[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

paroga at webkit.org paroga at webkit.org
Wed Dec 22 15:11:12 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit c8efc051c93679e2474cd94dc4f2bcc4db7ca09a
Author: paroga at webkit.org <paroga at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 28 21:41:51 2010 +0000

    2010-10-28  Patrick Gansterer  <paroga at webkit.org>
    
            Reviewed by Adam Roben.
    
            Port ContextMenuItemWin.cpp to WinCE
            https://bugs.webkit.org/show_bug.cgi?id=48407
    
            * platform/win/ContextMenuItemWin.cpp:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70812 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index d809544..06f0e74 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-10-28  Patrick Gansterer  <paroga at webkit.org>
+
+        Reviewed by Adam Roben.
+
+        Port ContextMenuItemWin.cpp to WinCE
+        https://bugs.webkit.org/show_bug.cgi?id=48407
+
+        * platform/win/ContextMenuItemWin.cpp:
+
 2010-10-28  Ryosuke Niwa  <rniwa at webkit.org>
 
         Reviewed by Darin Adler.
diff --git a/WebCore/platform/win/ContextMenuItemWin.cpp b/WebCore/platform/win/ContextMenuItemWin.cpp
index e265c96..ade0db0 100644
--- a/WebCore/platform/win/ContextMenuItemWin.cpp
+++ b/WebCore/platform/win/ContextMenuItemWin.cpp
@@ -31,6 +31,18 @@
 #include <wtf/text/CString.h>
 #include <windows.h>
 
+#if OS(WINCE)
+#ifndef MFS_DISABLED
+#define MFS_DISABLED MF_GRAYED
+#endif
+#ifndef MIIM_FTYPE
+#define MIIM_FTYPE MIIM_TYPE
+#endif
+#ifndef MIIM_STRING
+#define MIIM_STRING 0
+#endif
+#endif
+
 namespace WebCore {
 
 ContextMenuItem::ContextMenuItem(LPMENUITEMINFO item)

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list