[webkit-changes] [126454] trunk/Source/WebCore

[kevino]

Title: [126454] trunk/Source/WebCore

Revision

126454

Author

kev...@webkit.org

Date

2012-08-23 11:35:10 -0700 (Thu, 23 Aug 2012)

Log Message

[wx] Unreviewed build fix. Don't rely on implicit casts, explicitly use the
Cursor constructor that takes a platform cursor for creating native cursors.

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/wx/CursorWx.cpp

Diff

Modified: trunk/Source/WebCore/ChangeLog (126453 => 126454)

--- trunk/Source/WebCore/ChangeLog	2012-08-23 18:28:41 UTC (rev 126453)
+++ trunk/Source/WebCore/ChangeLog	2012-08-23 18:35:10 UTC (rev 126454)
@@ -1,3 +1,25 @@
+2012-08-23  Kevin Ollivier  <kev...@theolliviers.com>
+
+        [wx] Unreviewed build fix. Don't rely on implicit casts, explicitly use the
+        Cursor constructor that takes a platform cursor for creating native cursors.
+
+        * platform/wx/CursorWx.cpp:
+        (WebCore::pointerCursor):
+        (WebCore::crossCursor):
+        (WebCore::handCursor):
+        (WebCore::iBeamCursor):
+        (WebCore::waitCursor):
+        (WebCore::helpCursor):
+        (WebCore::eastResizeCursor):
+        (WebCore::northResizeCursor):
+        (WebCore::northEastResizeCursor):
+        (WebCore::northWestResizeCursor):
+        (WebCore::columnResizeCursor):
+        (WebCore::rowResizeCursor):
+        (WebCore::notAllowedCursor):
+        (WebCore::zoomInCursor):
+        (WebCore::moveCursor):
+
 2012-08-23  Bruno de Oliveira Abinader  <bruno.abina...@basyskom.com>
 
         Remove redundant check for negative values when using WebCore::Color::alpha()

Modified: trunk/Source/WebCore/platform/wx/CursorWx.cpp (126453 => 126454)

--- trunk/Source/WebCore/platform/wx/CursorWx.cpp	2012-08-23 18:28:41 UTC (rev 126453)
+++ trunk/Source/WebCore/platform/wx/CursorWx.cpp	2012-08-23 18:35:10 UTC (rev 126454)
@@ -62,61 +62,61 @@
 
 const Cursor& pointerCursor()
 {
-    static Cursor c = new wxCursor(wxCURSOR_ARROW);
+    static Cursor c = Cursor(new wxCursor(wxCURSOR_ARROW));
     return c;
 }
 
 const Cursor& crossCursor()
 {
-    static Cursor c = new wxCursor(wxCURSOR_CROSS);
+    static Cursor c = Cursor(new wxCursor(wxCURSOR_CROSS));
     return c;
 }
 
 const Cursor& handCursor()
 {
-    static Cursor c = new wxCursor(wxCURSOR_HAND);
+    static Cursor c = Cursor(new wxCursor(wxCURSOR_HAND));
     return c;
 }
 
 const Cursor& iBeamCursor()
 {
-    static Cursor c = new wxCursor(wxCURSOR_IBEAM);
+    static Cursor c = Cursor(new wxCursor(wxCURSOR_IBEAM));
     return c;
 }
 
 const Cursor& waitCursor()
 {
-    static Cursor c = new wxCursor(wxCURSOR_WAIT);
+    static Cursor c = Cursor(new wxCursor(wxCURSOR_WAIT));
     return c;
 }
 
 const Cursor& helpCursor()
 {
-    static Cursor c = new wxCursor(wxCURSOR_QUESTION_ARROW);
+    static Cursor c = Cursor(new wxCursor(wxCURSOR_QUESTION_ARROW));
     return c;
 }
 
 const Cursor& eastResizeCursor()
 {
-    static Cursor c = new wxCursor(wxCURSOR_SIZEWE);
+    static Cursor c = Cursor(new wxCursor(wxCURSOR_SIZEWE));
     return c;
 }
 
 const Cursor& northResizeCursor()
 {
-    static Cursor c = new wxCursor(wxCURSOR_SIZENS);
+    static Cursor c = Cursor(new wxCursor(wxCURSOR_SIZENS));
     return c;
 }
 
 const Cursor& northEastResizeCursor()
 {
-    static Cursor c = new wxCursor(wxCURSOR_SIZENESW);
+    static Cursor c = Cursor(new wxCursor(wxCURSOR_SIZENESW));
     return c;
 }
 
 const Cursor& northWestResizeCursor()
 {
-    static Cursor c = new wxCursor(wxCURSOR_SIZENWSE);
+    static Cursor c = Cursor(new wxCursor(wxCURSOR_SIZENWSE));
     return c;
 }
 
@@ -171,14 +171,14 @@
 const Cursor& columnResizeCursor()
 {
     // FIXME: Windows does not have a standard column resize cursor
-    static Cursor c = new wxCursor(wxCURSOR_SIZING);
+    static Cursor c = Cursor(new wxCursor(wxCURSOR_SIZING));
     return c;
 }
 
 const Cursor& rowResizeCursor()
 {
     // FIXME: Windows does not have a standard row resize cursor
-    static Cursor c = new wxCursor(wxCURSOR_SIZING);
+    static Cursor c = Cursor(new wxCursor(wxCURSOR_SIZING));
     return c;
 }
     
@@ -270,13 +270,13 @@
 
 const Cursor& notAllowedCursor()
 {
-    static Cursor c = new wxCursor(wxCURSOR_NO_ENTRY);
+    static Cursor c = Cursor(new wxCursor(wxCURSOR_NO_ENTRY));
     return c;
 }
 
 const Cursor& zoomInCursor()
 {
-    static Cursor c = new wxCursor(wxCURSOR_MAGNIFIER);
+    static Cursor c = Cursor(new wxCursor(wxCURSOR_MAGNIFIER));
     return c;
 }
 
@@ -300,7 +300,7 @@
 
 const Cursor& moveCursor()
 {
-    static Cursor c = new wxCursor(wxCURSOR_SIZING);
+    static Cursor c = Cursor(new wxCursor(wxCURSOR_SIZING));
     return c;
 }
 

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes