OS/2 only updates for CSS3 cursor support

widget/src/os2/nsWindow.cpp

@@ -1688,7 +1688,7 @@ NS_METHOD nsWindow::SetCursor(nsCursor aCursor)
 {
   HPOINTER newPointer = NULLHANDLE;
 
-  switch(aCursor) {
+  switch (aCursor) {
     case eCursor_select:
       newPointer = ::WinQuerySysPointer(HWND_DESKTOP, SPTR_TEXT, FALSE);
       break;
@@ -1762,7 +1762,7 @@ NS_METHOD nsWindow::SetCursor(nsCursor aCursor)
       break;
   
     case eCursor_context_menu:
-    // XXX: No suitable cursor, needs implementing
+      // XXX this CSS3 cursor needs to be implemented
       break;
   
     case eCursor_zoom_in:
@@ -1779,21 +1779,20 @@ NS_METHOD nsWindow::SetCursor(nsCursor aCursor)
       break;
   
     case eCursor_col_resize:
-    // XXX not 100% appropriate perhaps
-    newPointer = ::WinQuerySysPointer(HWND_DESKTOP, SPTR_SIZEWE, FALSE);
+      newPointer = gPtrArray[IDC_COLRESIZE-IDC_BASE];
       break;
   
     case eCursor_row_resize:
-    // XXX not 100% appropriate perhaps
-    newPointer = ::WinQuerySysPointer(HWND_DESKTOP, SPTR_SIZENS, FALSE);
+      newPointer = gPtrArray[IDC_ROWRESIZE-IDC_BASE];
       break;
   
     case eCursor_vertical_text:
-    // XXX: No suitable cursor, needs implementing
+      newPointer = gPtrArray[IDC_VERTICALTEXT-IDC_BASE];
       break;
   
     case eCursor_all_scroll:
-    newPointer = ::WinQuerySysPointer(HWND_DESKTOP, SPTR_SIZE, FALSE);
+      // XXX not 100% appropriate perhaps
+      newPointer = ::WinQuerySysPointer(HWND_DESKTOP, SPTR_MOVE, FALSE);
       break;
   
     case eCursor_nesw_resize:

widget/src/os2/wdgtos2rc.h

@@ -45,11 +45,14 @@
 #define IDC_ALIAS                       4105
 #define IDC_ZOOMIN                      4106
 #define IDC_ZOOMOUT                     4107
+#define IDC_COLRESIZE                   4108
+#define IDC_ROWRESIZE                   4109
+#define IDC_VERTICALTEXT                4110
 
 /* OS/2 specific */
-#define IDC_ARROWWAIT                   4108
-#define IDC_CROSS                       4109
-#define IDC_HELP                        4110
+#define IDC_ARROWWAIT                   4111
+#define IDC_CROSS                       4112
+#define IDC_HELP                        4113
 
 #define IDC_COUNT IDC_HELP-IDC_BASE+1
 

widget/src/os2/widget.rc

@@ -45,6 +45,9 @@ POINTER IDC_COPY           res\copy.ptr
 POINTER IDC_ALIAS          res\aliasb.ptr
 POINTER IDC_ZOOMIN         res\zoom_in.ptr
 POINTER IDC_ZOOMOUT        res\zoom_out.ptr
+POINTER IDC_COLRESIZE      res\col_resize.ptr
+POINTER IDC_ROWRESIZE      res\row_resize.ptr
+POINTER IDC_VERTICALTEXT   res\vertical_text.ptr
 
 POINTER IDC_ARROWWAIT      res\arrow_wait.ptr
 POINTER IDC_CROSS          res\crosshair.ptr