diff --git a/mozilla/browser/app/splash.rc b/mozilla/browser/app/splash.rc index 67a24bb6862..bf6d5d10245 100644 --- a/mozilla/browser/app/splash.rc +++ b/mozilla/browser/app/splash.rc @@ -68,6 +68,7 @@ END #define IDC_COLRESIZE 4108 #define IDC_ROWRESIZE 4109 #define IDC_VERTICALTEXT 4110 +#define IDC_NONE 4112 IDC_GRAB CURSOR DISCARDABLE "../../widget/src/build/res/grab.cur" IDC_GRABBING CURSOR DISCARDABLE "../../widget/src/build/res/grabbing.cur" @@ -79,5 +80,6 @@ IDC_ZOOMOUT CURSOR DISCARDABLE "../../widget/src/build/res/zoom IDC_COLRESIZE CURSOR DISCARDABLE "../../widget/src/build/res/col_resize.cur" IDC_ROWRESIZE CURSOR DISCARDABLE "../../widget/src/build/res/row_resize.cur" IDC_VERTICALTEXT CURSOR DISCARDABLE "../../widget/src/build/res/vertical_text.cur" +IDC_NONE CURSOR DISCARDABLE "../../widget/src/build/res/none.cur" #endif diff --git a/mozilla/browser/app/splashos2.rc b/mozilla/browser/app/splashos2.rc index ef28454557d..4cb05869a42 100644 --- a/mozilla/browser/app/splashos2.rc +++ b/mozilla/browser/app/splashos2.rc @@ -71,6 +71,7 @@ POINTER IDC_ZOOMOUT "..\\..\\widget\\src\\os2\\res\\zoom_out.ptr" POINTER IDC_ARROWWAIT "..\\..\\widget\\src\\os2\\res\\arrow_wait.ptr" POINTER IDC_CROSS "..\\..\\widget\\src\\os2\\res\\crosshair.ptr" POINTER IDC_HELP "..\\..\\widget\\src\\os2\\res\\help.ptr" +POINTER IDC_NONE "..\\..\\widget\\src\\os2\\res\\help.ptr" ICON IDC_DNDURL "..\\..\\widget\\src\\os2\\res\\dndurl.ico" ICON IDC_DNDTEXT "..\\..\\widget\\src\\os2\\res\\dndtext.ico" diff --git a/mozilla/calendar/sunbird/app/splash.rc b/mozilla/calendar/sunbird/app/splash.rc index f340b74c175..5319a264df6 100644 --- a/mozilla/calendar/sunbird/app/splash.rc +++ b/mozilla/calendar/sunbird/app/splash.rc @@ -79,6 +79,7 @@ IDC_SELECTANCHOR CURSOR DISCARDABLE "../../widget/src/build/res/sele #define IDC_COLRESIZE 4108 #define IDC_ROWRESIZE 4109 #define IDC_VERTICALTEXT 4110 +#define IDC_NONE 4112 IDC_GRAB CURSOR DISCARDABLE "../../widget/src/build/res/grab.cur" IDC_GRABBING CURSOR DISCARDABLE "../../widget/src/build/res/grabbing.cur" @@ -90,5 +91,6 @@ IDC_ZOOMOUT CURSOR DISCARDABLE "../../widget/src/build/res/zoom IDC_COLRESIZE CURSOR DISCARDABLE "../../widget/src/build/res/col_resize.cur" IDC_ROWRESIZE CURSOR DISCARDABLE "../../widget/src/build/res/row_resize.cur" IDC_VERTICALTEXT CURSOR DISCARDABLE "../../widget/src/build/res/vertical_text.cur" +IDC_NONE CURSOR DISCARDABLE "../../widget/src/build/res/none.cur" #endif diff --git a/mozilla/calendar/sunbird/app/splashos2.rc b/mozilla/calendar/sunbird/app/splashos2.rc index 9e96ba03cf3..7f1392dd19b 100644 --- a/mozilla/calendar/sunbird/app/splashos2.rc +++ b/mozilla/calendar/sunbird/app/splashos2.rc @@ -71,6 +71,7 @@ POINTER IDC_ZOOMOUT "..\\..\\..\\widget\\src\\os2\\res\\zoom_out.ptr" POINTER IDC_ARROWWAIT "..\\..\\..\\widget\\src\\os2\\res\\arrow_wait.ptr" POINTER IDC_CROSS "..\\..\\..\\widget\\src\\os2\\res\\crosshair.ptr" POINTER IDC_HELP "..\\..\\..\\widget\\src\\os2\\res\\help.ptr" +POINTER IDC_NONE "..\\..\\..\\widget\\src\\os2\\res\\help.ptr" ICON IDC_DNDURL "..\\..\\..\\widget\\src\\os2\\res\\dndurl.ico" ICON IDC_DNDTEXT "..\\..\\..\\widget\\src\\os2\\res\\dndtext.ico" diff --git a/mozilla/content/events/src/nsEventStateManager.cpp b/mozilla/content/events/src/nsEventStateManager.cpp index e9cb325c543..c007bd2199b 100644 --- a/mozilla/content/events/src/nsEventStateManager.cpp +++ b/mozilla/content/events/src/nsEventStateManager.cpp @@ -2859,6 +2859,9 @@ nsEventStateManager::SetCursor(PRInt32 aCursor, imgIContainer* aContainer, case NS_STYLE_CURSOR_EW_RESIZE: c = eCursor_ew_resize; break; + case NS_STYLE_CURSOR_NONE: + c = eCursor_none; + break; } // First, try the imgIContainer, if non-null diff --git a/mozilla/layout/base/nsStyleConsts.h b/mozilla/layout/base/nsStyleConsts.h index cda21116ab2..9cf311fab60 100644 --- a/mozilla/layout/base/nsStyleConsts.h +++ b/mozilla/layout/base/nsStyleConsts.h @@ -324,6 +324,7 @@ #define NS_STYLE_CURSOR_NWSE_RESIZE 33 #define NS_STYLE_CURSOR_NS_RESIZE 34 #define NS_STYLE_CURSOR_EW_RESIZE 35 +#define NS_STYLE_CURSOR_NONE 36 // See nsStyleDisplay #define NS_STYLE_DIRECTION_LTR 0 diff --git a/mozilla/layout/style/nsCSSProps.cpp b/mozilla/layout/style/nsCSSProps.cpp index 6ccfe331ead..b0f5a5e1079 100644 --- a/mozilla/layout/style/nsCSSProps.cpp +++ b/mozilla/layout/style/nsCSSProps.cpp @@ -500,6 +500,7 @@ const PRInt32 nsCSSProps::kCursorKTable[] = { eCSSKeyword_nwse_resize, NS_STYLE_CURSOR_NWSE_RESIZE, eCSSKeyword_ns_resize, NS_STYLE_CURSOR_NS_RESIZE, eCSSKeyword_ew_resize, NS_STYLE_CURSOR_EW_RESIZE, + eCSSKeyword_none, NS_STYLE_CURSOR_NONE, // -moz- prefixed aliases for some CSS3 cursors for backward compat eCSSKeyword__moz_copy, NS_STYLE_CURSOR_COPY, eCSSKeyword__moz_alias, NS_STYLE_CURSOR_ALIAS, diff --git a/mozilla/layout/style/test/property_database.js b/mozilla/layout/style/test/property_database.js index a93bf886a3d..3e81eccf9ca 100644 --- a/mozilla/layout/style/test/property_database.js +++ b/mozilla/layout/style/test/property_database.js @@ -836,7 +836,7 @@ var gCSSProperties = { inherited: true, type: CSS_TYPE_LONGHAND, initial_values: [ "auto" ], - other_values: [ "crosshair", "default", "pointer", "move", "e-resize", "ne-resize", "nw-resize", "n-resize", "se-resize", "sw-resize", "s-resize", "w-resize", "text", "wait", "help", "progress" ], + other_values: [ "crosshair", "default", "pointer", "move", "e-resize", "ne-resize", "nw-resize", "n-resize", "se-resize", "sw-resize", "s-resize", "w-resize", "text", "wait", "help", "progress", "none" ], invalid_values: [] }, "direction": { diff --git a/mozilla/mail/app/splash.rc b/mozilla/mail/app/splash.rc index 1042f0a1c25..29ccaa91547 100644 --- a/mozilla/mail/app/splash.rc +++ b/mozilla/mail/app/splash.rc @@ -70,6 +70,7 @@ END #define IDC_COLRESIZE 4108 #define IDC_ROWRESIZE 4109 #define IDC_VERTICALTEXT 4110 +#define IDC_NONE 4112 IDC_GRAB CURSOR DISCARDABLE "../../widget/src/build/res/grab.cur" IDC_GRABBING CURSOR DISCARDABLE "../../widget/src/build/res/grabbing.cur" @@ -81,6 +82,7 @@ IDC_ZOOMOUT CURSOR DISCARDABLE "../../widget/src/build/res/zoom IDC_COLRESIZE CURSOR DISCARDABLE "../../widget/src/build/res/col_resize.cur" IDC_ROWRESIZE CURSOR DISCARDABLE "../../widget/src/build/res/row_resize.cur" IDC_VERTICALTEXT CURSOR DISCARDABLE "../../widget/src/build/res/vertical_text.cur" +IDC_NONE CURSOR DISCARDABLE "../../widget/src/build/res/none.cur" // For some reason IDI_MAILBIFF needs to be larger than the value of IDI_APPLICATION for static builds #define IDI_MAILBIFF 101 diff --git a/mozilla/mail/app/splashos2.rc b/mozilla/mail/app/splashos2.rc index b72dd12ed0a..dd5f635b151 100644 --- a/mozilla/mail/app/splashos2.rc +++ b/mozilla/mail/app/splashos2.rc @@ -71,6 +71,7 @@ POINTER IDC_ZOOMOUT "..\\..\\widget\\src\\os2\\res\\zoom_out.ptr" POINTER IDC_ARROWWAIT "..\\..\\widget\\src\\os2\\res\\arrow_wait.ptr" POINTER IDC_CROSS "..\\..\\widget\\src\\os2\\res\\crosshair.ptr" POINTER IDC_HELP "..\\..\\widget\\src\\os2\\res\\help.ptr" +POINTER IDC_NONE "..\\..\\widget\\src\\os2\\res\\help.ptr" ICON IDC_DNDURL "..\\..\\widget\\src\\os2\\res\\dndurl.ico" ICON IDC_DNDTEXT "..\\..\\widget\\src\\os2\\res\\dndtext.ico" diff --git a/mozilla/suite/app/splashos2.rc b/mozilla/suite/app/splashos2.rc index 3d2fab6fae0..bd6c8834913 100644 --- a/mozilla/suite/app/splashos2.rc +++ b/mozilla/suite/app/splashos2.rc @@ -61,6 +61,7 @@ POINTER IDC_ZOOMOUT "..\\..\\widget\\src\\os2\\res\\zoom_out.ptr" POINTER IDC_ARROWWAIT "..\\..\\widget\\src\\os2\\res\\arrow_wait.ptr" POINTER IDC_CROSS "..\\..\\widget\\src\\os2\\res\\crosshair.ptr" POINTER IDC_HELP "..\\..\\widget\\src\\os2\\res\\help.ptr" +POINTER IDC_NONE "..\\..\\widget\\src\\os2\\res\\help.ptr" ICON IDC_DNDURL "..\\..\\widget\\src\\os2\\res\\dndurl.ico" ICON IDC_DNDTEXT "..\\..\\widget\\src\\os2\\res\\dndtext.ico" diff --git a/mozilla/toolkit/library/xulrunos2.rc b/mozilla/toolkit/library/xulrunos2.rc index 4a0ad1e73fc..4306e8a655a 100644 --- a/mozilla/toolkit/library/xulrunos2.rc +++ b/mozilla/toolkit/library/xulrunos2.rc @@ -49,6 +49,7 @@ POINTER IDC_ZOOMOUT "..\\..\\widget\\src\\os2\\res\\zoom_out.ptr" POINTER IDC_ARROWWAIT "..\\..\\widget\\src\\os2\\res\\arrow_wait.ptr" POINTER IDC_CROSS "..\\..\\widget\\src\\os2\\res\\crosshair.ptr" POINTER IDC_HELP "..\\..\\widget\\src\\os2\\res\\help.ptr" +POINTER IDC_NONE "..\\..\\widget\\src\\os2\\res\\help.ptr" ICON IDC_DNDURL "..\\..\\widget\\src\\os2\\res\\dndurl.ico" ICON IDC_DNDTEXT "..\\..\\widget\\src\\os2\\res\\dndtext.ico" diff --git a/mozilla/widget/public/nsIWidget.h b/mozilla/widget/public/nsIWidget.h index 8f7fc73ca00..1773ffc10d0 100644 --- a/mozilla/widget/public/nsIWidget.h +++ b/mozilla/widget/public/nsIWidget.h @@ -206,6 +206,7 @@ enum nsCursor { ///(normal cursor, usually rendered as an arrow) eCursor_nwse_resize, eCursor_ns_resize, eCursor_ew_resize, + eCursor_none, // This one better be the last one in this list. eCursorCount }; diff --git a/mozilla/widget/src/beos/nsWindow.cpp b/mozilla/widget/src/beos/nsWindow.cpp index e4d5936702e..32ca1c83fad 100644 --- a/mozilla/widget/src/beos/nsWindow.cpp +++ b/mozilla/widget/src/beos/nsWindow.cpp @@ -1420,6 +1420,10 @@ NS_METHOD nsWindow::SetCursor(nsCursor aCursor) newCursor = (BCursor *)gCursorArray.SafeElementAt(1); break; + case eCursor_none: + // XXX: No suitable cursor, needs implementing + break; + default: NS_ASSERTION(0, "Invalid cursor type"); break; diff --git a/mozilla/widget/src/build/res/none.cur b/mozilla/widget/src/build/res/none.cur new file mode 100644 index 00000000000..2114dfaee3a Binary files /dev/null and b/mozilla/widget/src/build/res/none.cur differ diff --git a/mozilla/widget/src/build/widget.rc b/mozilla/widget/src/build/widget.rc index fab3d2d7903..efa88bb2730 100644 --- a/mozilla/widget/src/build/widget.rc +++ b/mozilla/widget/src/build/widget.rc @@ -50,6 +50,7 @@ IDC_ZOOMOUT CURSOR DISCARDABLE "res/zoom_out.cur" IDC_COLRESIZE CURSOR DISCARDABLE "res/col_resize.cur" IDC_ROWRESIZE CURSOR DISCARDABLE "res/row_resize.cur" IDC_VERTICALTEXT CURSOR DISCARDABLE "res/vertical_text.cur" +IDC_NONE CURSOR DISCARDABLE "res/none.cur" OPTPROPSHEET DIALOG DISCARDABLE 32, 32, 288, 226 STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | diff --git a/mozilla/widget/src/cocoa/nsCursorManager.mm b/mozilla/widget/src/cocoa/nsCursorManager.mm index af1f9666dce..3783b295026 100644 --- a/mozilla/widget/src/cocoa/nsCursorManager.mm +++ b/mozilla/widget/src/cocoa/nsCursorManager.mm @@ -199,6 +199,13 @@ static nsCursorManager *gInstance; if (aCursor != mCurrentCursor) { [[self getCursor: mCurrentCursor] unset]; [[self getCursor: aCursor] set]; + + if (aCursor == eCursor_none) { + [NSCursor hide]; + } else if (mCurrentCursor == eCursor_none) { + [NSCursor unhide]; + } + mCurrentCursor = aCursor; } } diff --git a/mozilla/widget/src/gtk2/nsGtkCursors.h b/mozilla/widget/src/gtk2/nsGtkCursors.h index 987ab778e2e..2c278e388f3 100644 --- a/mozilla/widget/src/gtk2/nsGtkCursors.h +++ b/mozilla/widget/src/gtk2/nsGtkCursors.h @@ -426,6 +426,33 @@ static const unsigned char moz_nwse_resize_mask_bits[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; +/* MOZ_CURSOR_NONE */ +static const unsigned char moz_none_bits[] = { + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; + +static const unsigned char moz_none_mask_bits[] = { + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; + enum { MOZ_CURSOR_HAND_GRAB, MOZ_CURSOR_HAND_GRABBING, @@ -440,7 +467,8 @@ enum { MOZ_CURSOR_ROW_RESIZE, MOZ_CURSOR_VERTICAL_TEXT, MOZ_CURSOR_NESW_RESIZE, - MOZ_CURSOR_NWSE_RESIZE + MOZ_CURSOR_NWSE_RESIZE, + MOZ_CURSOR_NONE }; // create custom pixmap cursor from cursors in nsGTKCursorData.h @@ -458,7 +486,8 @@ static const nsGtkCursor GtkCursors[] = { { moz_row_resize_bits, moz_row_resize_mask_bits, 7, 9 }, { moz_vertical_text_bits, moz_vertical_text_mask_bits, 8, 4 }, { moz_nesw_resize_bits, moz_nesw_resize_mask_bits, 8, 8 }, - { moz_nwse_resize_bits, moz_nwse_resize_mask_bits, 8, 8 } + { moz_nwse_resize_bits, moz_nwse_resize_mask_bits, 8, 8 }, + { moz_none_bits, moz_none_mask_bits, 0, 0 } }; #endif /* nsGtkCursors_h__ */ diff --git a/mozilla/widget/src/gtk2/nsWindow.cpp b/mozilla/widget/src/gtk2/nsWindow.cpp index 06bebcf8a88..fa26aabf349 100644 --- a/mozilla/widget/src/gtk2/nsWindow.cpp +++ b/mozilla/widget/src/gtk2/nsWindow.cpp @@ -4356,6 +4356,9 @@ get_gtk_cursor(nsCursor aCursor) case eCursor_ew_resize: gdkcursor = gdk_cursor_new(GDK_SB_H_DOUBLE_ARROW); break; + case eCursor_none: + newType = MOZ_CURSOR_NONE; + break; default: NS_ASSERTION(aCursor, "Invalid cursor type"); gdkcursor = gdk_cursor_new(GDK_LEFT_PTR); diff --git a/mozilla/widget/src/os2/nsWindow.cpp b/mozilla/widget/src/os2/nsWindow.cpp index ea16535852b..142689a1147 100644 --- a/mozilla/widget/src/os2/nsWindow.cpp +++ b/mozilla/widget/src/os2/nsWindow.cpp @@ -1807,6 +1807,10 @@ NS_METHOD nsWindow::SetCursor(nsCursor aCursor) newPointer = ::WinQuerySysPointer(HWND_DESKTOP, SPTR_SIZEWE, FALSE); break; + case eCursor_none: + newPointer = gPtrArray[IDC_NONE-IDC_BASE]; + break; + default: NS_ASSERTION(0, "Invalid cursor type"); break; diff --git a/mozilla/widget/src/os2/wdgtos2rc.h b/mozilla/widget/src/os2/wdgtos2rc.h index f1fa44db9f3..ba4a63260b7 100644 --- a/mozilla/widget/src/os2/wdgtos2rc.h +++ b/mozilla/widget/src/os2/wdgtos2rc.h @@ -48,11 +48,12 @@ #define IDC_COLRESIZE 4108 #define IDC_ROWRESIZE 4109 #define IDC_VERTICALTEXT 4110 +#define IDC_NONE 4112 /* OS/2 specific */ -#define IDC_ARROWWAIT 4111 -#define IDC_CROSS 4112 -#define IDC_HELP 4113 +#define IDC_ARROWWAIT 4113 +#define IDC_CROSS 4114 +#define IDC_HELP 4115 #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 702e27dae25..7deb2be1a12 100644 --- a/mozilla/widget/src/os2/widget.rc +++ b/mozilla/widget/src/os2/widget.rc @@ -52,6 +52,7 @@ POINTER IDC_VERTICALTEXT res\vertical_text.ptr POINTER IDC_ARROWWAIT res\arrow_wait.ptr POINTER IDC_CROSS res\crosshair.ptr POINTER IDC_HELP res\help.ptr +POINTER IDC_NONE res\help.ptr ICON IDC_DNDURL res\dndurl.ico ICON IDC_DNDTEXT res\dndtext.ico diff --git a/mozilla/widget/src/windows/nsWindow.cpp b/mozilla/widget/src/windows/nsWindow.cpp index 1b490b80e42..8479e50a805 100644 --- a/mozilla/widget/src/windows/nsWindow.cpp +++ b/mozilla/widget/src/windows/nsWindow.cpp @@ -2500,6 +2500,10 @@ NS_METHOD nsWindow::SetCursor(nsCursor aCursor) newCursor = ::LoadCursor(NULL, IDC_SIZEWE); break; + case eCursor_none: + newCursor = ::LoadCursor(nsToolkit::mDllInstance, MAKEINTRESOURCE(IDC_NONE)); + break; + default: NS_ERROR("Invalid cursor type"); break; diff --git a/mozilla/widget/src/windows/resource.h b/mozilla/widget/src/windows/resource.h index 0313be14aa5..09819d053b6 100644 --- a/mozilla/widget/src/windows/resource.h +++ b/mozilla/widget/src/windows/resource.h @@ -45,4 +45,4 @@ #define IDC_ROWRESIZE 4109 #define IDC_VERTICALTEXT 4110 #define IDC_DUMMY_CE_MENUBAR 4111 - +#define IDC_NONE 4112 diff --git a/mozilla/xulrunner/app/splash.rc b/mozilla/xulrunner/app/splash.rc index 02dba1da8a7..3174607dab8 100644 --- a/mozilla/xulrunner/app/splash.rc +++ b/mozilla/xulrunner/app/splash.rc @@ -72,6 +72,7 @@ END #define IDC_COLRESIZE 4108 #define IDC_ROWRESIZE 4109 #define IDC_VERTICALTEXT 4110 +#define IDC_NONE 4112 IDC_GRAB CURSOR DISCARDABLE "..\\..\\widget\\src\\build\\res\\grab.cur" IDC_GRABBING CURSOR DISCARDABLE "..\\..\\widget\\src\\build\\res\\grabbing.cur" @@ -83,5 +84,6 @@ IDC_ZOOMOUT CURSOR DISCARDABLE "..\\..\\widget\\src\\build\\res IDC_COLRESIZE CURSOR DISCARDABLE "..\\..\\widget\\src\\build\\res\\col_resize.cur" IDC_ROWRESIZE CURSOR DISCARDABLE "..\\..\\widget\\src\\build\\res\\row_resize.cur" IDC_VERTICALTEXT CURSOR DISCARDABLE "..\\..\\widget\\src\\build\\res\\vertical_text.cur" +IDC_NONE CURSOR DISCARDABLE "..\\..\\widget\\src\\build\\res\\none.cur" #endif diff --git a/mozilla/xulrunner/app/splashos2.rc b/mozilla/xulrunner/app/splashos2.rc index 6aa82fc21d4..f7938480b72 100644 --- a/mozilla/xulrunner/app/splashos2.rc +++ b/mozilla/xulrunner/app/splashos2.rc @@ -71,6 +71,7 @@ POINTER IDC_ZOOMOUT "..\\..\\widget\\src\\os2\\res\\zoom_out.ptr" POINTER IDC_ARROWWAIT "..\\..\\widget\\src\\os2\\res\\arrow_wait.ptr" POINTER IDC_CROSS "..\\..\\widget\\src\\os2\\res\\crosshair.ptr" POINTER IDC_HELP "..\\..\\widget\\src\\os2\\res\\help.ptr" +POINTER IDC_NONE "..\\..\\widget\\src\\os2\\res\\help.ptr" ICON IDC_DNDURL "..\\..\\widget\\src\\os2\\res\\dndurl.ico" ICON IDC_DNDTEXT "..\\..\\widget\\src\\os2\\res\\dndtext.ico"