[haiku-webkit-commits] r424 - webkit/trunk/WebCore/platform/haiku

  • From: webkit@xxxxxxxxxxxxxxx
  • To: haiku-webkit-commits@xxxxxxxxxxxxx
  • Date: Sun, 18 Apr 2010 22:59:16 +0000

Author: stippi
Date: Sun Apr 18 22:59:15 2010
New Revision: 424
URL: http://mmlr.dyndns.org/changeset/424

Log:
Fixed setting the default cursor with the new semantics of CursorHaiku.cpp
after landing the patch upstream.

Modified:
   webkit/trunk/WebCore/platform/haiku/WidgetHaiku.cpp

Modified: webkit/trunk/WebCore/platform/haiku/WidgetHaiku.cpp
==============================================================================
--- webkit/trunk/WebCore/platform/haiku/WidgetHaiku.cpp Sun Apr 18 22:50:18 
2010        (r423)
+++ webkit/trunk/WebCore/platform/haiku/WidgetHaiku.cpp Sun Apr 18 22:59:15 
2010        (r424)
@@ -32,8 +32,8 @@
 #include "Cursor.h"
 #include "IntRect.h"
 #include "NotImplemented.h"
+#include <AppDefs.h>
 #include <View.h>
-#include <stdio.h>
 
 namespace WebCore {
 
@@ -91,8 +91,12 @@
 void Widget::setCursor(const Cursor& cursor)
 {
     AutoPlatformWidgetLocker locker(topLevelPlatformWidget());
-    if (locker.isLocked())
-        topLevelPlatformWidget()->SetViewCursor(cursor.impl());
+    if (locker.isLocked()) {
+        if (cursor.impl())
+            topLevelPlatformWidget()->SetViewCursor(cursor.impl());
+        else
+            topLevelPlatformWidget()->SetViewCursor(B_CURSOR_SYSTEM_DEFAULT);
+    }
 }
 
 void Widget::show()

Other related posts: