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 6eedcc962ae..ca2e6a977d4 100644 Binary files a/mozilla/widget/src/os2/res/col_resize.ptr and b/mozilla/widget/src/os2/res/col_resize.ptr differ diff --git a/mozilla/widget/src/os2/res/row_resize.ptr b/mozilla/widget/src/os2/res/row_resize.ptr index 6eedcc962ae..3efe5df54c8 100644 Binary files a/mozilla/widget/src/os2/res/row_resize.ptr and b/mozilla/widget/src/os2/res/row_resize.ptr differ diff --git a/mozilla/widget/src/os2/res/vertical_text.ptr b/mozilla/widget/src/os2/res/vertical_text.ptr index 6eedcc962ae..4c1d481dab7 100644 Binary files a/mozilla/widget/src/os2/res/vertical_text.ptr and b/mozilla/widget/src/os2/res/vertical_text.ptr differ 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