From bd6e92aecf90330fa0801a11ee7bc1f1f8df0425 Mon Sep 17 00:00:00 2001
From: "mkaply%us.ibm.com"
 <mkaply%us.ibm.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 28 Dec 2004 21:05:27 +0000
Subject: [PATCH] OS/2 only updates for CSS3 cursor support

git-svn-id: svn://10.0.0.236/trunk@167067 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/widget/src/os2/nsWindow.cpp          | 253 +++++++++----------
 mozilla/widget/src/os2/res/col_resize.ptr    | Bin 2 -> 288 bytes
 mozilla/widget/src/os2/res/row_resize.ptr    | Bin 2 -> 288 bytes
 mozilla/widget/src/os2/res/vertical_text.ptr | Bin 2 -> 288 bytes
 mozilla/widget/src/os2/wdgtos2rc.h           |   9 +-
 mozilla/widget/src/os2/widget.rc             |   3 +
 6 files changed, 135 insertions(+), 130 deletions(-)

diff --git a/mozilla/widget/src/os2/nsWindow.cpp b/mozilla/widget/src/os2/nsWindow.cpp
index 03ee85ebfbf..16448450f83 100644
--- a/mozilla/widget/src/os2/nsWindow.cpp
+++ b/mozilla/widget/src/os2/nsWindow.cpp
@@ -1688,133 +1688,132 @@ NS_METHOD nsWindow::SetCursor(nsCursor aCursor)
 {
   HPOINTER newPointer = NULLHANDLE;
 
-  switch(aCursor) {
-  case eCursor_select:
-    newPointer = ::WinQuerySysPointer(HWND_DESKTOP, SPTR_TEXT, FALSE);
-    break;
-    
-  case eCursor_wait:
-    newPointer = ::WinQuerySysPointer(HWND_DESKTOP, SPTR_WAIT, FALSE);
-    break;
-
-  case eCursor_hyperlink:
-    newPointer = gPtrArray[IDC_SELECTANCHOR-IDC_BASE];
-    break;
-
-  case eCursor_standard:
-    newPointer = ::WinQuerySysPointer(HWND_DESKTOP, SPTR_ARROW, FALSE);
-    break;
-
-  case eCursor_n_resize:
-  case eCursor_s_resize:
-    newPointer = ::WinQuerySysPointer(HWND_DESKTOP, SPTR_SIZENS, FALSE);
-    break;
-
-  case eCursor_w_resize:
-  case eCursor_e_resize:
-    newPointer = ::WinQuerySysPointer(HWND_DESKTOP, SPTR_SIZEWE, FALSE);
-    break;
-
-  case eCursor_nw_resize:
-  case eCursor_se_resize:
-    newPointer = ::WinQuerySysPointer(HWND_DESKTOP, SPTR_SIZENWSE, FALSE);
-    break;
-
-  case eCursor_ne_resize:
-  case eCursor_sw_resize:
-    newPointer = ::WinQuerySysPointer(HWND_DESKTOP, SPTR_SIZENESW, FALSE);
-    break;
-
-  case eCursor_crosshair:
-    newPointer = gPtrArray[IDC_CROSS-IDC_BASE];
-    break;
-             
-  case eCursor_move:
-    newPointer = ::WinQuerySysPointer(HWND_DESKTOP, SPTR_MOVE, FALSE);
-    break;
-
-  case eCursor_help:
-    newPointer = gPtrArray[IDC_HELP-IDC_BASE];
-    break;
-
-  case eCursor_copy: // CSS3
-    newPointer = gPtrArray[IDC_COPY-IDC_BASE];
-    break;
-
-  case eCursor_alias:
-    newPointer = gPtrArray[IDC_ALIAS-IDC_BASE];
-    break;
-
-  case eCursor_cell:
-    newPointer = gPtrArray[IDC_CELL-IDC_BASE];
-    break;
-
-  case eCursor_grab:
-    newPointer = gPtrArray[IDC_GRAB-IDC_BASE];
-    break;
-
-  case eCursor_grabbing:
-    newPointer = gPtrArray[IDC_GRABBING-IDC_BASE];
-    break;
-
-  case eCursor_spinning:
-    newPointer = gPtrArray[IDC_ARROWWAIT-IDC_BASE];
-    break;
-
-  case eCursor_context_menu:
-    // XXX: No suitable cursor, needs implementing
-    break;
-
-  case eCursor_zoom_in:
-    newPointer = gPtrArray[IDC_ZOOMIN-IDC_BASE];
-    break;
-
-  case eCursor_zoom_out:
-    newPointer = gPtrArray[IDC_ZOOMOUT-IDC_BASE];
-    break;
-
-  case eCursor_not_allowed:
-  case eCursor_no_drop:
-    newPointer = ::WinQuerySysPointer(HWND_DESKTOP, SPTR_ILLEGAL, FALSE);
-    break;
-
-  case eCursor_col_resize:
-    // XXX not 100% appropriate perhaps
-    newPointer = ::WinQuerySysPointer(HWND_DESKTOP, SPTR_SIZEWE, FALSE);
-    break;
-
-  case eCursor_row_resize:
-    // XXX not 100% appropriate perhaps
-    newPointer = ::WinQuerySysPointer(HWND_DESKTOP, SPTR_SIZENS, FALSE);
-    break;
-
-  case eCursor_vertical_text:
-    // XXX: No suitable cursor, needs implementing
-    break;
-
-  case eCursor_all_scroll:
-    newPointer = ::WinQuerySysPointer(HWND_DESKTOP, SPTR_SIZE, FALSE);
-    break;
-
-  case eCursor_nesw_resize:
-    newPointer = ::WinQuerySysPointer(HWND_DESKTOP, SPTR_SIZENESW, FALSE);
-    break;
-
-  case eCursor_nwse_resize:
-    newPointer = ::WinQuerySysPointer(HWND_DESKTOP, SPTR_SIZENWSE, FALSE);
-    break;
-
-  case eCursor_ns_resize:
-    newPointer = ::WinQuerySysPointer(HWND_DESKTOP, SPTR_SIZENS, FALSE);
-    break;
-
-  case eCursor_ew_resize:
-    newPointer = ::WinQuerySysPointer(HWND_DESKTOP, SPTR_SIZEWE, FALSE);
-    break;
-
-  default:
-    NS_ASSERTION(0, "Invalid cursor type");
-    break;
+  switch (aCursor) {
+    case eCursor_select:
+      newPointer = ::WinQuerySysPointer(HWND_DESKTOP, SPTR_TEXT, FALSE);
+      break;
+      
+    case eCursor_wait:
+      newPointer = ::WinQuerySysPointer(HWND_DESKTOP, SPTR_WAIT, FALSE);
+      break;
+  
+    case eCursor_hyperlink:
+      newPointer = gPtrArray[IDC_SELECTANCHOR-IDC_BASE];
+      break;
+  
+    case eCursor_standard:
+      newPointer = ::WinQuerySysPointer(HWND_DESKTOP, SPTR_ARROW, FALSE);
+      break;
+  
+    case eCursor_n_resize:
+    case eCursor_s_resize:
+      newPointer = ::WinQuerySysPointer(HWND_DESKTOP, SPTR_SIZENS, FALSE);
+      break;
+  
+    case eCursor_w_resize:
+    case eCursor_e_resize:
+      newPointer = ::WinQuerySysPointer(HWND_DESKTOP, SPTR_SIZEWE, FALSE);
+      break;
+  
+    case eCursor_nw_resize:
+    case eCursor_se_resize:
+      newPointer = ::WinQuerySysPointer(HWND_DESKTOP, SPTR_SIZENWSE, FALSE);
+      break;
+  
+    case eCursor_ne_resize:
+    case eCursor_sw_resize:
+      newPointer = ::WinQuerySysPointer(HWND_DESKTOP, SPTR_SIZENESW, FALSE);
+      break;
+  
+    case eCursor_crosshair:
+      newPointer = gPtrArray[IDC_CROSS-IDC_BASE];
+      break;
+               
+    case eCursor_move:
+      newPointer = ::WinQuerySysPointer(HWND_DESKTOP, SPTR_MOVE, FALSE);
+      break;
+  
+    case eCursor_help:
+      newPointer = gPtrArray[IDC_HELP-IDC_BASE];
+      break;
+  
+    case eCursor_copy: // CSS3
+      newPointer = gPtrArray[IDC_COPY-IDC_BASE];
+      break;
+  
+    case eCursor_alias:
+      newPointer = gPtrArray[IDC_ALIAS-IDC_BASE];
+      break;
+  
+    case eCursor_cell:
+      newPointer = gPtrArray[IDC_CELL-IDC_BASE];
+      break;
+  
+    case eCursor_grab:
+      newPointer = gPtrArray[IDC_GRAB-IDC_BASE];
+      break;
+  
+    case eCursor_grabbing:
+      newPointer = gPtrArray[IDC_GRABBING-IDC_BASE];
+      break;
+  
+    case eCursor_spinning:
+      newPointer = gPtrArray[IDC_ARROWWAIT-IDC_BASE];
+      break;
+  
+    case eCursor_context_menu:
+      // XXX this CSS3 cursor needs to be implemented
+      break;
+  
+    case eCursor_zoom_in:
+      newPointer = gPtrArray[IDC_ZOOMIN-IDC_BASE];
+      break;
+  
+    case eCursor_zoom_out:
+      newPointer = gPtrArray[IDC_ZOOMOUT-IDC_BASE];
+      break;
+  
+    case eCursor_not_allowed:
+    case eCursor_no_drop:
+      newPointer = ::WinQuerySysPointer(HWND_DESKTOP, SPTR_ILLEGAL, FALSE);
+      break;
+  
+    case eCursor_col_resize:
+      newPointer = gPtrArray[IDC_COLRESIZE-IDC_BASE];
+      break;
+  
+    case eCursor_row_resize:
+      newPointer = gPtrArray[IDC_ROWRESIZE-IDC_BASE];
+      break;
+  
+    case eCursor_vertical_text:
+      newPointer = gPtrArray[IDC_VERTICALTEXT-IDC_BASE];
+      break;
+  
+    case eCursor_all_scroll:
+      // XXX not 100% appropriate perhaps
+      newPointer = ::WinQuerySysPointer(HWND_DESKTOP, SPTR_MOVE, FALSE);
+      break;
+  
+    case eCursor_nesw_resize:
+      newPointer = ::WinQuerySysPointer(HWND_DESKTOP, SPTR_SIZENESW, FALSE);
+      break;
+  
+    case eCursor_nwse_resize:
+      newPointer = ::WinQuerySysPointer(HWND_DESKTOP, SPTR_SIZENWSE, FALSE);
+      break;
+  
+    case eCursor_ns_resize:
+      newPointer = ::WinQuerySysPointer(HWND_DESKTOP, SPTR_SIZENS, FALSE);
+      break;
+  
+    case eCursor_ew_resize:
+      newPointer = ::WinQuerySysPointer(HWND_DESKTOP, SPTR_SIZEWE, FALSE);
+      break;
+  
+    default:
+      NS_ASSERTION(0, "Invalid cursor type");
+      break;
   }
 
   if (newPointer) {
diff --git a/mozilla/widget/src/os2/res/col_resize.ptr b/mozilla/widget/src/os2/res/col_resize.ptr
index 6eedcc962ae04096ba0ca1cef57b24a04a0326f5..ca2e6a977d441b4cca11cbe82484b50304525f81 100644
GIT binary patch
literal 288
zcmWFtkz!zA;9?MGPyo_AK&-&vz`zKEK=A+ne-Jg00O$nr!Fr%pH2i-3{{QFK&;LJv
U{rUflYuLdwhz}A+R}10;08(^$!T<mO

literal 2
JcmWFt0RRB@0Hpu`

diff --git a/mozilla/widget/src/os2/res/row_resize.ptr b/mozilla/widget/src/os2/res/row_resize.ptr
index 6eedcc962ae04096ba0ca1cef57b24a04a0326f5..3efe5df54c863191be997ffe31ca458a8bff3028 100644
GIT binary patch
literal 288
zcmWFtkz!zA;A9YGPyo_AK&-&vz`zKEK=A+ne-Jg00O$nbLH+;#|Lp(&|0DnZ|4)CQ
eHXt94flLr!V5mo-!5okf6od4E^n=U+i2(p)x^_4K

literal 2
JcmWFt0RRB@0Hpu`

diff --git a/mozilla/widget/src/os2/res/vertical_text.ptr b/mozilla/widget/src/os2/res/vertical_text.ptr
index 6eedcc962ae04096ba0ca1cef57b24a04a0326f5..4c1d481dab7248d37fd4bbf98fe7980b0f470e24 100644
GIT binary patch
literal 288
zcmWFtkz!zA;AD_tPyo_AK&-&vz`zKEK=A+ne-Jg00O$mogZlsb|HE(tLp_`g5(5BN
CL49!m

literal 2
JcmWFt0RRB@0Hpu`

diff --git a/mozilla/widget/src/os2/wdgtos2rc.h b/mozilla/widget/src/os2/wdgtos2rc.h
index 0b2071ecafb..f1fa44db9f3 100644
--- a/mozilla/widget/src/os2/wdgtos2rc.h
+++ b/mozilla/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
 
diff --git a/mozilla/widget/src/os2/widget.rc b/mozilla/widget/src/os2/widget.rc
index e37649829f1..702e27dae25 100644
--- a/mozilla/widget/src/os2/widget.rc
+++ b/mozilla/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