зеркало из https://github.com/mozilla/gecko-dev.git
Remove -moz-count-* and (unused) eCursor_arrow_* cursors. b=259639 r+sr=dbaron
This commit is contained in:
mats.palmgren%bredband.net
Родитель
bc7e872edd
Коммит
0b0506f06b
|
|
@ -44,14 +44,6 @@ END
|
|||
#include "wdgtos2rc.h"
|
||||
|
||||
POINTER IDC_SELECTANCHOR "..\\..\\widget\\src\\os2\\res\\\select.ptr"
|
||||
POINTER IDC_ARROWNORTH "..\\..\\widget\\src\\os2\\res\\arrow_north.ptr"
|
||||
POINTER IDC_ARROWNORTHPLUS "..\\..\\widget\\src\\os2\\res\\arrow_north_plus.ptr"
|
||||
POINTER IDC_ARROWSOUTH "..\\..\\widget\\src\\os2\\res\\arrow_south.ptr"
|
||||
POINTER IDC_ARROWSOUTHPLUS "..\\..\\widget\\src\\os2\\res\\arrow_south_plus.ptr"
|
||||
POINTER IDC_ARROWWEST "..\\..\\widget\\src\\os2\\res\\arrow_west.ptr"
|
||||
POINTER IDC_ARROWWESTPLUS "..\\..\\widget\\src\\os2\\res\\arrow_west_plus.ptr"
|
||||
POINTER IDC_ARROWEAST "..\\..\\widget\\src\\os2\\res\\arrow_east.ptr"
|
||||
POINTER IDC_ARROWEASTPLUS "..\\..\\widget\\src\\os2\\res\\arrow_east_plus.ptr"
|
||||
POINTER IDC_GRAB "..\\..\\widget\\src\\os2\\res\\grab.ptr"
|
||||
POINTER IDC_GRABBING "..\\..\\widget\\src\\os2\\res\\grabbing.ptr"
|
||||
POINTER IDC_CELL "..\\..\\widget\\src\\os2\\res\\cell.ptr"
|
||||
|
|
|
|||
|
|
@ -2444,15 +2444,6 @@ nsEventStateManager::SetCursor(PRInt32 aCursor, nsIWidget* aWidget, PRBool aLock
|
|||
case NS_STYLE_CURSOR_SPINNING:
|
||||
c = eCursor_spinning;
|
||||
break;
|
||||
case NS_STYLE_CURSOR_COUNT_UP:
|
||||
c = eCursor_count_up;
|
||||
break;
|
||||
case NS_STYLE_CURSOR_COUNT_DOWN:
|
||||
c = eCursor_count_down;
|
||||
break;
|
||||
case NS_STYLE_CURSOR_COUNT_UP_DOWN:
|
||||
c = eCursor_count_up_down;
|
||||
break;
|
||||
case NS_STYLE_CURSOR_MOZ_ZOOM_IN:
|
||||
c = eCursor_zoom_in;
|
||||
break;
|
||||
|
|
|
|||
|
|
@ -85,9 +85,6 @@ CSS_KEY(-moz-cjk-heavenly-stem, _moz_cjk_heavenly_stem)
|
|||
CSS_KEY(-moz-compact, _moz_compact) // Disabled because not supported.
|
||||
CSS_KEY(-moz-context-menu, _moz_context_menu)
|
||||
CSS_KEY(-moz-copy, _moz_copy)
|
||||
CSS_KEY(-moz-count-down, _moz_count_down)
|
||||
CSS_KEY(-moz-count-up-down, _moz_count_up_down)
|
||||
CSS_KEY(-moz-count-up, _moz_count_up)
|
||||
CSS_KEY(-moz-deck, _moz_deck)
|
||||
CSS_KEY(-moz-desktop, _moz_desktop)
|
||||
CSS_KEY(-moz-devanagari, _moz_devanagari)
|
||||
|
|
|
|||
|
|
@ -476,9 +476,6 @@ const PRInt32 nsCSSProps::kCursorKTable[] = {
|
|||
eCSSKeyword__moz_grab, NS_STYLE_CURSOR_GRAB,
|
||||
eCSSKeyword__moz_grabbing, NS_STYLE_CURSOR_GRABBING,
|
||||
eCSSKeyword__moz_spinning, NS_STYLE_CURSOR_SPINNING,
|
||||
eCSSKeyword__moz_count_up, NS_STYLE_CURSOR_COUNT_UP,
|
||||
eCSSKeyword__moz_count_down, NS_STYLE_CURSOR_COUNT_DOWN,
|
||||
eCSSKeyword__moz_count_up_down, NS_STYLE_CURSOR_COUNT_UP_DOWN,
|
||||
eCSSKeyword__moz_zoom_in, NS_STYLE_CURSOR_MOZ_ZOOM_IN,
|
||||
eCSSKeyword__moz_zoom_out, NS_STYLE_CURSOR_MOZ_ZOOM_OUT,
|
||||
-1,-1
|
||||
|
|
|
|||
|
|
@ -5661,12 +5661,6 @@ nsGlobalChromeWindow::SetCursor(const nsAString& aCursor)
|
|||
cursor = NS_STYLE_CURSOR_GRABBING;
|
||||
else if (cursorString.Equals("spinning"))
|
||||
cursor = NS_STYLE_CURSOR_SPINNING;
|
||||
else if (cursorString.Equals("count-up"))
|
||||
cursor = NS_STYLE_CURSOR_COUNT_UP;
|
||||
else if (cursorString.Equals("count-down"))
|
||||
cursor = NS_STYLE_CURSOR_COUNT_DOWN;
|
||||
else if (cursorString.Equals("count-up-down"))
|
||||
cursor = NS_STYLE_CURSOR_COUNT_UP_DOWN;
|
||||
else if (cursorString.Equals("-moz-zoom-in"))
|
||||
cursor = NS_STYLE_CURSOR_MOZ_ZOOM_IN;
|
||||
else if (cursorString.Equals("-moz-zoom-out"))
|
||||
|
|
|
|||
|
|
@ -297,21 +297,18 @@
|
|||
#define NS_STYLE_CURSOR_GRAB 21
|
||||
#define NS_STYLE_CURSOR_GRABBING 22
|
||||
#define NS_STYLE_CURSOR_SPINNING 23
|
||||
#define NS_STYLE_CURSOR_COUNT_UP 24
|
||||
#define NS_STYLE_CURSOR_COUNT_DOWN 25
|
||||
#define NS_STYLE_CURSOR_COUNT_UP_DOWN 26
|
||||
#define NS_STYLE_CURSOR_MOZ_ZOOM_IN 27
|
||||
#define NS_STYLE_CURSOR_MOZ_ZOOM_OUT 28
|
||||
#define NS_STYLE_CURSOR_NOT_ALLOWED 29
|
||||
#define NS_STYLE_CURSOR_COL_RESIZE 30
|
||||
#define NS_STYLE_CURSOR_ROW_RESIZE 31
|
||||
#define NS_STYLE_CURSOR_NO_DROP 32
|
||||
#define NS_STYLE_CURSOR_VERTICAL_TEXT 33
|
||||
#define NS_STYLE_CURSOR_ALL_SCROLL 34
|
||||
#define NS_STYLE_CURSOR_NESW_RESIZE 35
|
||||
#define NS_STYLE_CURSOR_NWSE_RESIZE 36
|
||||
#define NS_STYLE_CURSOR_NS_RESIZE 37
|
||||
#define NS_STYLE_CURSOR_EW_RESIZE 38
|
||||
#define NS_STYLE_CURSOR_MOZ_ZOOM_IN 24
|
||||
#define NS_STYLE_CURSOR_MOZ_ZOOM_OUT 25
|
||||
#define NS_STYLE_CURSOR_NOT_ALLOWED 26
|
||||
#define NS_STYLE_CURSOR_COL_RESIZE 27
|
||||
#define NS_STYLE_CURSOR_ROW_RESIZE 28
|
||||
#define NS_STYLE_CURSOR_NO_DROP 29
|
||||
#define NS_STYLE_CURSOR_VERTICAL_TEXT 30
|
||||
#define NS_STYLE_CURSOR_ALL_SCROLL 31
|
||||
#define NS_STYLE_CURSOR_NESW_RESIZE 32
|
||||
#define NS_STYLE_CURSOR_NWSE_RESIZE 33
|
||||
#define NS_STYLE_CURSOR_NS_RESIZE 34
|
||||
#define NS_STYLE_CURSOR_EW_RESIZE 35
|
||||
|
||||
// See nsStyleDisplay
|
||||
#define NS_STYLE_DIRECTION_LTR 0
|
||||
|
|
|
|||
|
|
@ -297,21 +297,18 @@
|
|||
#define NS_STYLE_CURSOR_GRAB 21
|
||||
#define NS_STYLE_CURSOR_GRABBING 22
|
||||
#define NS_STYLE_CURSOR_SPINNING 23
|
||||
#define NS_STYLE_CURSOR_COUNT_UP 24
|
||||
#define NS_STYLE_CURSOR_COUNT_DOWN 25
|
||||
#define NS_STYLE_CURSOR_COUNT_UP_DOWN 26
|
||||
#define NS_STYLE_CURSOR_MOZ_ZOOM_IN 27
|
||||
#define NS_STYLE_CURSOR_MOZ_ZOOM_OUT 28
|
||||
#define NS_STYLE_CURSOR_NOT_ALLOWED 29
|
||||
#define NS_STYLE_CURSOR_COL_RESIZE 30
|
||||
#define NS_STYLE_CURSOR_ROW_RESIZE 31
|
||||
#define NS_STYLE_CURSOR_NO_DROP 32
|
||||
#define NS_STYLE_CURSOR_VERTICAL_TEXT 33
|
||||
#define NS_STYLE_CURSOR_ALL_SCROLL 34
|
||||
#define NS_STYLE_CURSOR_NESW_RESIZE 35
|
||||
#define NS_STYLE_CURSOR_NWSE_RESIZE 36
|
||||
#define NS_STYLE_CURSOR_NS_RESIZE 37
|
||||
#define NS_STYLE_CURSOR_EW_RESIZE 38
|
||||
#define NS_STYLE_CURSOR_MOZ_ZOOM_IN 24
|
||||
#define NS_STYLE_CURSOR_MOZ_ZOOM_OUT 25
|
||||
#define NS_STYLE_CURSOR_NOT_ALLOWED 26
|
||||
#define NS_STYLE_CURSOR_COL_RESIZE 27
|
||||
#define NS_STYLE_CURSOR_ROW_RESIZE 28
|
||||
#define NS_STYLE_CURSOR_NO_DROP 29
|
||||
#define NS_STYLE_CURSOR_VERTICAL_TEXT 30
|
||||
#define NS_STYLE_CURSOR_ALL_SCROLL 31
|
||||
#define NS_STYLE_CURSOR_NESW_RESIZE 32
|
||||
#define NS_STYLE_CURSOR_NWSE_RESIZE 33
|
||||
#define NS_STYLE_CURSOR_NS_RESIZE 34
|
||||
#define NS_STYLE_CURSOR_EW_RESIZE 35
|
||||
|
||||
// See nsStyleDisplay
|
||||
#define NS_STYLE_DIRECTION_LTR 0
|
||||
|
|
|
|||
|
|
@ -85,9 +85,6 @@ CSS_KEY(-moz-cjk-heavenly-stem, _moz_cjk_heavenly_stem)
|
|||
CSS_KEY(-moz-compact, _moz_compact) // Disabled because not supported.
|
||||
CSS_KEY(-moz-context-menu, _moz_context_menu)
|
||||
CSS_KEY(-moz-copy, _moz_copy)
|
||||
CSS_KEY(-moz-count-down, _moz_count_down)
|
||||
CSS_KEY(-moz-count-up-down, _moz_count_up_down)
|
||||
CSS_KEY(-moz-count-up, _moz_count_up)
|
||||
CSS_KEY(-moz-deck, _moz_deck)
|
||||
CSS_KEY(-moz-desktop, _moz_desktop)
|
||||
CSS_KEY(-moz-devanagari, _moz_devanagari)
|
||||
|
|
|
|||
|
|
@ -476,9 +476,6 @@ const PRInt32 nsCSSProps::kCursorKTable[] = {
|
|||
eCSSKeyword__moz_grab, NS_STYLE_CURSOR_GRAB,
|
||||
eCSSKeyword__moz_grabbing, NS_STYLE_CURSOR_GRABBING,
|
||||
eCSSKeyword__moz_spinning, NS_STYLE_CURSOR_SPINNING,
|
||||
eCSSKeyword__moz_count_up, NS_STYLE_CURSOR_COUNT_UP,
|
||||
eCSSKeyword__moz_count_down, NS_STYLE_CURSOR_COUNT_DOWN,
|
||||
eCSSKeyword__moz_count_up_down, NS_STYLE_CURSOR_COUNT_UP_DOWN,
|
||||
eCSSKeyword__moz_zoom_in, NS_STYLE_CURSOR_MOZ_ZOOM_IN,
|
||||
eCSSKeyword__moz_zoom_out, NS_STYLE_CURSOR_MOZ_ZOOM_OUT,
|
||||
-1,-1
|
||||
|
|
|
|||
|
|
@ -181,17 +181,7 @@ enum nsCursor { ///(normal cursor, usually rendered as an arrow)
|
|||
eCursor_se_resize,
|
||||
eCursor_ne_resize,
|
||||
eCursor_sw_resize,
|
||||
// The _arrow_ ones are not used AFAICT - can be removed?
|
||||
eCursor_arrow_north,
|
||||
eCursor_arrow_north_plus,
|
||||
eCursor_arrow_south,
|
||||
eCursor_arrow_south_plus,
|
||||
eCursor_arrow_west,
|
||||
eCursor_arrow_west_plus,
|
||||
eCursor_arrow_east,
|
||||
eCursor_arrow_east_plus,
|
||||
eCursor_crosshair,
|
||||
//Don't know what 'move' cursor should be. See CSS2.
|
||||
eCursor_move,
|
||||
eCursor_help,
|
||||
eCursor_copy, // CSS3
|
||||
|
|
@ -201,9 +191,6 @@ enum nsCursor { ///(normal cursor, usually rendered as an arrow)
|
|||
eCursor_grab,
|
||||
eCursor_grabbing,
|
||||
eCursor_spinning,
|
||||
eCursor_count_up,
|
||||
eCursor_count_down,
|
||||
eCursor_count_up_down,
|
||||
eCursor_zoom_in,
|
||||
eCursor_zoom_out,
|
||||
eCursor_not_allowed,
|
||||
|
|
|
|||
|
|
@ -169,27 +169,6 @@ static unsigned char cursorCell[] = {16,1,2,2,
|
|||
15,255,63,255,127,255,127,255,63,255,15,255,3,255,1,248
|
||||
};
|
||||
|
||||
static unsigned char cursorCountUp[] = {16,1,2,2,
|
||||
0,0,0,0,56,0,36,0,36,0,19,224,18,92,9,42,
|
||||
8,1,60,33,76,113,66,249,48,1,12,1,2,1,1,0,
|
||||
0,0,0,0,56,0,60,0,60,0,31,224,31,252,15,254,
|
||||
15,255,63,255,127,255,127,255,63,255,15,255,3,255,1,248
|
||||
};
|
||||
|
||||
static unsigned char cursorCountDown[] = {16,1,2,2,
|
||||
0,0,0,0,56,0,36,0,36,0,19,224,18,92,9,42,
|
||||
8,1,60,1,76,1,66,1,48,1,12,249,2,113,1,32,
|
||||
0,0,0,0,56,0,60,0,60,0,31,224,31,252,15,254,
|
||||
15,255,63,255,127,255,127,255,63,255,15,255,3,255,1,248
|
||||
};
|
||||
|
||||
static unsigned char cursorCountUpDown[] = {16,1,2,2,
|
||||
0,0,0,0,56,0,36,0,36,0,19,224,18,92,9,42,
|
||||
8,1,60,33,76,113,66,249,48,1,12,249,2,113,1,32,
|
||||
0,0,0,0,56,0,60,0,60,0,31,224,31,252,15,254,
|
||||
15,255,63,255,127,255,127,255,63,255,15,255,3,255,1,248
|
||||
};
|
||||
|
||||
static unsigned char cursorZoomIn[] = {16,1,5,6,
|
||||
15,128,16,64,32,32,66,16,66,16,79,144,66,16,66,16,
|
||||
32,32,16,112,15,184,0,28,0,14,0,7,0,2,0,0,
|
||||
|
|
|
|||
|
|
@ -92,8 +92,8 @@ static BWindow * gLastActiveWindow = NULL;
|
|||
// BCursor objects can't be created until they are used. Some mozilla utilities,
|
||||
// such as regxpcom, do not create a BApplication object, and therefor fail to run.,
|
||||
// since a BCursor requires a vaild BApplication (see Bug#129964). But, we still want
|
||||
// to cache them for performance. Currently, there are 18 cursors available;
|
||||
static nsVoidArray gCursorArray(18);
|
||||
// to cache them for performance. Currently, there are 17 cursors available;
|
||||
static nsVoidArray gCursorArray(17);
|
||||
// Used in contrain position. Specifies how much of a window must remain on screen
|
||||
#define kWindowPositionSlop 20
|
||||
// BeOS does not provide this information, so we must hard-code it
|
||||
|
|
@ -1320,23 +1320,16 @@ NS_METHOD nsWindow::SetCursor(nsCursor aCursor)
|
|||
gCursorArray.InsertElementAt((void*) new BCursor(cursorLowerLeft),4);
|
||||
gCursorArray.InsertElementAt((void*) new BCursor(cursorUpperLeft),5);
|
||||
gCursorArray.InsertElementAt((void*) new BCursor(cursorLowerRight),6);
|
||||
gCursorArray.InsertElementAt((void*) new BCursor(cursorTop),7);
|
||||
gCursorArray.InsertElementAt((void*) new BCursor(cursorBottom),8);
|
||||
gCursorArray.InsertElementAt((void*) new BCursor(cursorLeft),9);
|
||||
gCursorArray.InsertElementAt((void*) new BCursor(cursorRight),10);
|
||||
gCursorArray.InsertElementAt((void*) new BCursor(cursorCrosshair),11);
|
||||
gCursorArray.InsertElementAt((void*) new BCursor(cursorHelp),12);
|
||||
gCursorArray.InsertElementAt((void*) new BCursor(cursorGrab),13);
|
||||
gCursorArray.InsertElementAt((void*) new BCursor(cursorGrabbing),14);
|
||||
gCursorArray.InsertElementAt((void*) new BCursor(cursorCopy),15);
|
||||
gCursorArray.InsertElementAt((void*) new BCursor(cursorAlias),16);
|
||||
gCursorArray.InsertElementAt((void*) new BCursor(cursorWatch2),17);
|
||||
gCursorArray.InsertElementAt((void*) new BCursor(cursorCell),18);
|
||||
gCursorArray.InsertElementAt((void*) new BCursor(cursorCountUp),19);
|
||||
gCursorArray.InsertElementAt((void*) new BCursor(cursorCountDown),20);
|
||||
gCursorArray.InsertElementAt((void*) new BCursor(cursorCountUpDown),21);
|
||||
gCursorArray.InsertElementAt((void*) new BCursor(cursorZoomIn),22);
|
||||
gCursorArray.InsertElementAt((void*) new BCursor(cursorZoomOut),23);
|
||||
gCursorArray.InsertElementAt((void*) new BCursor(cursorCrosshair),7);
|
||||
gCursorArray.InsertElementAt((void*) new BCursor(cursorHelp),8);
|
||||
gCursorArray.InsertElementAt((void*) new BCursor(cursorGrab),9);
|
||||
gCursorArray.InsertElementAt((void*) new BCursor(cursorGrabbing),10);
|
||||
gCursorArray.InsertElementAt((void*) new BCursor(cursorCopy),11);
|
||||
gCursorArray.InsertElementAt((void*) new BCursor(cursorAlias),12);
|
||||
gCursorArray.InsertElementAt((void*) new BCursor(cursorWatch2),13);
|
||||
gCursorArray.InsertElementAt((void*) new BCursor(cursorCell),14);
|
||||
gCursorArray.InsertElementAt((void*) new BCursor(cursorZoomIn),15);
|
||||
gCursorArray.InsertElementAt((void*) new BCursor(cursorZoomOut),16);
|
||||
}
|
||||
|
||||
switch (aCursor)
|
||||
|
|
@ -1381,40 +1374,20 @@ NS_METHOD nsWindow::SetCursor(nsCursor aCursor)
|
|||
newCursor = (BCursor *)gCursorArray.SafeElementAt(6);
|
||||
break;
|
||||
|
||||
case eCursor_arrow_north:
|
||||
case eCursor_arrow_north_plus:
|
||||
case eCursor_crosshair:
|
||||
newCursor = (BCursor *)gCursorArray.SafeElementAt(7);
|
||||
break;
|
||||
|
||||
case eCursor_arrow_south:
|
||||
case eCursor_arrow_south_plus:
|
||||
case eCursor_help:
|
||||
newCursor = (BCursor *)gCursorArray.SafeElementAt(8);
|
||||
break;
|
||||
|
||||
case eCursor_arrow_east:
|
||||
case eCursor_arrow_east_plus:
|
||||
newCursor = (BCursor *)gCursorArray.SafeElementAt(9);
|
||||
break;
|
||||
|
||||
case eCursor_arrow_west:
|
||||
case eCursor_arrow_west_plus:
|
||||
newCursor = (BCursor *)gCursorArray.SafeElementAt(10);
|
||||
break;
|
||||
|
||||
case eCursor_crosshair:
|
||||
case eCursor_copy:
|
||||
newCursor = (BCursor *)gCursorArray.SafeElementAt(11);
|
||||
break;
|
||||
|
||||
case eCursor_help:
|
||||
newCursor = (BCursor *)gCursorArray.SafeElementAt(12);
|
||||
break;
|
||||
|
||||
case eCursor_copy:
|
||||
newCursor = (BCursor *)gCursorArray.SafeElementAt(15);
|
||||
break;
|
||||
|
||||
case eCursor_alias:
|
||||
newCursor = (BCursor *)gCursorArray.SafeElementAt(16);
|
||||
newCursor = (BCursor *)gCursorArray.SafeElementAt(12);
|
||||
break;
|
||||
|
||||
case eCursor_context_menu:
|
||||
|
|
@ -1422,39 +1395,27 @@ NS_METHOD nsWindow::SetCursor(nsCursor aCursor)
|
|||
break;
|
||||
|
||||
case eCursor_cell:
|
||||
newCursor = (BCursor *)gCursorArray.SafeElementAt(18);
|
||||
newCursor = (BCursor *)gCursorArray.SafeElementAt(14);
|
||||
break;
|
||||
|
||||
case eCursor_grab:
|
||||
newCursor = (BCursor *)gCursorArray.SafeElementAt(13);
|
||||
newCursor = (BCursor *)gCursorArray.SafeElementAt(9);
|
||||
break;
|
||||
|
||||
case eCursor_grabbing:
|
||||
newCursor = (BCursor *)gCursorArray.SafeElementAt(14);
|
||||
newCursor = (BCursor *)gCursorArray.SafeElementAt(10);
|
||||
break;
|
||||
|
||||
case eCursor_spinning:
|
||||
newCursor = (BCursor *)gCursorArray.SafeElementAt(17);
|
||||
newCursor = (BCursor *)gCursorArray.SafeElementAt(13);
|
||||
break;
|
||||
|
||||
case eCursor_count_up:
|
||||
newCursor = (BCursor *)gCursorArray.SafeElementAt(19);
|
||||
break;
|
||||
|
||||
case eCursor_count_down:
|
||||
newCursor = (BCursor *)gCursorArray.SafeElementAt(20);
|
||||
break;
|
||||
|
||||
case eCursor_count_up_down:
|
||||
newCursor = (BCursor *)gCursorArray.SafeElementAt(21);
|
||||
break;
|
||||
|
||||
case eCursor_zoom_in:
|
||||
newCursor = (BCursor *)gCursorArray.SafeElementAt(22);
|
||||
newCursor = (BCursor *)gCursorArray.SafeElementAt(15);
|
||||
break;
|
||||
|
||||
case eCursor_zoom_out:
|
||||
newCursor = (BCursor *)gCursorArray.SafeElementAt(23);
|
||||
newCursor = (BCursor *)gCursorArray.SafeElementAt(16);
|
||||
break;
|
||||
|
||||
case eCursor_not_allowed:
|
||||
|
|
|
|||
|
|
@ -35,12 +35,4 @@
|
|||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
#define IDC_SELECTANCHOR 4100
|
||||
#define IDC_ARROWSOUTH 4101
|
||||
#define IDC_ARROWNORTH 4102
|
||||
#define IDC_ARROWEAST 4103
|
||||
#define IDC_ARROWWEST 4104
|
||||
#define IDC_ARROWSOUTHPLUS 4105
|
||||
#define IDC_ARROWNORTHPLUS 4106
|
||||
#define IDC_ARROWEASTPLUS 4107
|
||||
#define IDC_ARROWWESTPLUS 4108
|
||||
|
||||
|
|
|
|||
Двоичные данные
widget/src/build/res/arrow_east.cur
Двоичные данные
widget/src/build/res/arrow_east.cur
Двоичный файл не отображается.
|
До Ширина: | Высота: | Размер: 326 B |
Двоичные данные
widget/src/build/res/arrow_east_plus.cur
Двоичные данные
widget/src/build/res/arrow_east_plus.cur
Двоичный файл не отображается.
|
До Ширина: | Высота: | Размер: 326 B |
Двоичные данные
widget/src/build/res/arrow_north.cur
Двоичные данные
widget/src/build/res/arrow_north.cur
Двоичный файл не отображается.
|
До Ширина: | Высота: | Размер: 326 B |
Двоичные данные
widget/src/build/res/arrow_north_plus.cur
Двоичные данные
widget/src/build/res/arrow_north_plus.cur
Двоичный файл не отображается.
|
До Ширина: | Высота: | Размер: 326 B |
Двоичные данные
widget/src/build/res/arrow_south.cur
Двоичные данные
widget/src/build/res/arrow_south.cur
Двоичный файл не отображается.
|
До Ширина: | Высота: | Размер: 326 B |
Двоичные данные
widget/src/build/res/arrow_south_plus.cur
Двоичные данные
widget/src/build/res/arrow_south_plus.cur
Двоичный файл не отображается.
|
До Ширина: | Высота: | Размер: 326 B |
Двоичные данные
widget/src/build/res/arrow_west.cur
Двоичные данные
widget/src/build/res/arrow_west.cur
Двоичный файл не отображается.
|
До Ширина: | Высота: | Размер: 326 B |
Двоичные данные
widget/src/build/res/arrow_west_plus.cur
Двоичные данные
widget/src/build/res/arrow_west_plus.cur
Двоичный файл не отображается.
|
До Ширина: | Высота: | Размер: 326 B |
|
|
@ -40,14 +40,6 @@
|
|||
#include <dlgs.h>
|
||||
|
||||
IDC_SELECTANCHOR CURSOR DISCARDABLE "res/select.cur"
|
||||
IDC_ARROWSOUTH CURSOR DISCARDABLE "res/arrow_south.cur"
|
||||
IDC_ARROWNORTH CURSOR DISCARDABLE "res/arrow_north.cur"
|
||||
IDC_ARROWEAST CURSOR DISCARDABLE "res/arrow_east.cur"
|
||||
IDC_ARROWWEST CURSOR DISCARDABLE "res/arrow_west.cur"
|
||||
IDC_ARROWSOUTHPLUS CURSOR DISCARDABLE "res/arrow_south_plus.cur"
|
||||
IDC_ARROWNORTHPLUS CURSOR DISCARDABLE "res/arrow_north_plus.cur"
|
||||
IDC_ARROWEASTPLUS CURSOR DISCARDABLE "res/arrow_east_plus.cur"
|
||||
IDC_ARROWWESTPLUS CURSOR DISCARDABLE "res/arrow_west_plus.cur"
|
||||
IDC_GRAB CURSOR DISCARDABLE "res/grab.cur"
|
||||
IDC_GRABBING CURSOR DISCARDABLE "res/grabbing.cur"
|
||||
IDC_CELL CURSOR DISCARDABLE "res/cell.cur"
|
||||
|
|
|
|||
|
|
@ -153,12 +153,6 @@ static BOOL isPantherOrLater()
|
|||
return [nsCursorManager createNSCursor: @selector(closedHandCursor) orThemeCursor: kThemeClosedHandCursor];
|
||||
case eCursor_spinning:
|
||||
return [nsMacCursor cursorWithResources: 200 lastFrame: 203]; // better than kThemeSpinningCursor
|
||||
case eCursor_count_up:
|
||||
return [nsMacCursor cursorWithThemeCursor: kThemeCountingUpHandCursor];
|
||||
case eCursor_count_down:
|
||||
return [nsMacCursor cursorWithThemeCursor: kThemeCountingDownHandCursor];
|
||||
case eCursor_count_up_down:
|
||||
return [nsMacCursor cursorWithThemeCursor: kThemeCountingUpAndDownHandCursor];
|
||||
case eCursor_zoom_in:
|
||||
return [nsMacCursor cursorWithImageNamed: @"zoomIn" hotSpot: NSMakePoint(6,6)];
|
||||
case eCursor_zoom_out:
|
||||
|
|
@ -171,35 +165,27 @@ static BOOL isPantherOrLater()
|
|||
case eCursor_no_drop:
|
||||
return [nsMacCursor cursorWithThemeCursor: kThemeNotAllowedCursor];
|
||||
|
||||
// Arrow Cursors:
|
||||
// Resize Cursors:
|
||||
//North
|
||||
case eCursor_n_resize:
|
||||
case eCursor_arrow_north:
|
||||
case eCursor_arrow_north_plus:
|
||||
return [nsCursorManager createNSCursor: @selector(resizeUpCursor) orImageCursor: @"arrowN" withHotspot: NSMakePoint(7,7)];
|
||||
//North East
|
||||
case eCursor_ne_resize:
|
||||
return [nsMacCursor cursorWithImageNamed: @"sizeNE" hotSpot: NSMakePoint(8,7)];
|
||||
//East
|
||||
case eCursor_e_resize:
|
||||
case eCursor_arrow_east:
|
||||
case eCursor_arrow_east_plus:
|
||||
return [nsCursorManager createNSCursor: @selector(resizeRightCursor) orThemeCursor: kThemeResizeRightCursor];
|
||||
//South East
|
||||
case eCursor_se_resize:
|
||||
return [nsMacCursor cursorWithImageNamed: @"sizeSE" hotSpot: NSMakePoint(8,8)];
|
||||
//South
|
||||
case eCursor_s_resize:
|
||||
case eCursor_arrow_south:
|
||||
case eCursor_arrow_south_plus:
|
||||
return [nsCursorManager createNSCursor: @selector(resizeDownCursor) orImageCursor: @"arrowS" withHotspot: NSMakePoint(7,7)];
|
||||
//South West
|
||||
case eCursor_sw_resize:
|
||||
return [nsMacCursor cursorWithImageNamed: @"sizeSW" hotSpot: NSMakePoint(6,8)];
|
||||
//West
|
||||
case eCursor_w_resize:
|
||||
case eCursor_arrow_west:
|
||||
case eCursor_arrow_west_plus:
|
||||
return [nsCursorManager createNSCursor: @selector(resizeLeftCursor) orThemeCursor: kThemeResizeLeftCursor];
|
||||
//North West
|
||||
case eCursor_nw_resize:
|
||||
|
|
|
|||
|
|
@ -323,11 +323,6 @@
|
|||
case kThemeWatchCursor:
|
||||
case kThemeSpinningCursor:
|
||||
return 8;
|
||||
case kThemeCountingUpHandCursor:
|
||||
case kThemeCountingDownHandCursor:
|
||||
return 6;
|
||||
case kThemeCountingUpAndDownHandCursor:
|
||||
return 11;
|
||||
default:
|
||||
return 1;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -871,26 +871,6 @@ NS_IMETHODIMP nsWidget::SetCursor(nsCursor aCursor)
|
|||
newCursor = gdk_cursor_new(GDK_BOTTOM_LEFT_CORNER);
|
||||
break;
|
||||
|
||||
case eCursor_arrow_north:
|
||||
case eCursor_arrow_north_plus:
|
||||
newCursor = gdk_cursor_new(GDK_TOP_SIDE);
|
||||
break;
|
||||
|
||||
case eCursor_arrow_south:
|
||||
case eCursor_arrow_south_plus:
|
||||
newCursor = gdk_cursor_new(GDK_BOTTOM_SIDE);
|
||||
break;
|
||||
|
||||
case eCursor_arrow_west:
|
||||
case eCursor_arrow_west_plus:
|
||||
newCursor = gdk_cursor_new(GDK_LEFT_SIDE);
|
||||
break;
|
||||
|
||||
case eCursor_arrow_east:
|
||||
case eCursor_arrow_east_plus:
|
||||
newCursor = gdk_cursor_new(GDK_RIGHT_SIDE);
|
||||
break;
|
||||
|
||||
case eCursor_crosshair:
|
||||
newCursor = gdk_cursor_new(GDK_CROSSHAIR);
|
||||
break;
|
||||
|
|
@ -925,12 +905,6 @@ NS_IMETHODIMP nsWidget::SetCursor(nsCursor aCursor)
|
|||
newCursor = gdk_cursor_new(GDK_EXCHANGE);
|
||||
break;
|
||||
|
||||
case eCursor_count_up:
|
||||
case eCursor_count_down:
|
||||
case eCursor_count_up_down:
|
||||
// XXX: these -moz- cursors need to be implemented
|
||||
break;
|
||||
|
||||
case eCursor_zoom_in:
|
||||
newCursor = gdk_cursor_new(GDK_PLUS);
|
||||
break;
|
||||
|
|
|
|||
|
|
@ -1155,22 +1155,6 @@ GdkCursor *nsWindow::GtkCreateCursor(nsCursor aCursorType)
|
|||
case eCursor_sw_resize:
|
||||
gdkcursor = gdk_cursor_new(GDK_BOTTOM_LEFT_CORNER);
|
||||
break;
|
||||
case eCursor_arrow_north:
|
||||
case eCursor_arrow_north_plus:
|
||||
gdkcursor = gdk_cursor_new(GDK_TOP_SIDE);
|
||||
break;
|
||||
case eCursor_arrow_south:
|
||||
case eCursor_arrow_south_plus:
|
||||
gdkcursor = gdk_cursor_new(GDK_BOTTOM_SIDE);
|
||||
break;
|
||||
case eCursor_arrow_west:
|
||||
case eCursor_arrow_west_plus:
|
||||
gdkcursor = gdk_cursor_new(GDK_LEFT_SIDE);
|
||||
break;
|
||||
case eCursor_arrow_east:
|
||||
case eCursor_arrow_east_plus:
|
||||
gdkcursor = gdk_cursor_new(GDK_RIGHT_SIDE);
|
||||
break;
|
||||
case eCursor_crosshair:
|
||||
gdkcursor = gdk_cursor_new(GDK_CROSSHAIR);
|
||||
break;
|
||||
|
|
@ -1201,12 +1185,6 @@ GdkCursor *nsWindow::GtkCreateCursor(nsCursor aCursorType)
|
|||
case eCursor_spinning:
|
||||
newType = MOZ_CURSOR_SPINNING;
|
||||
break;
|
||||
case eCursor_count_up:
|
||||
case eCursor_count_down:
|
||||
case eCursor_count_up_down:
|
||||
// XXX: these -moz- cursors need to be implemented
|
||||
gdkcursor = gdk_cursor_new(GDK_LEFT_PTR);
|
||||
break;
|
||||
case eCursor_zoom_in:
|
||||
newType = MOZ_CURSOR_ZOOM_IN;
|
||||
break;
|
||||
|
|
|
|||
|
|
@ -3290,22 +3290,6 @@ get_gtk_cursor(nsCursor aCursor)
|
|||
case eCursor_sw_resize:
|
||||
gdkcursor = gdk_cursor_new(GDK_BOTTOM_LEFT_CORNER);
|
||||
break;
|
||||
case eCursor_arrow_north:
|
||||
case eCursor_arrow_north_plus:
|
||||
gdkcursor = gdk_cursor_new(GDK_TOP_SIDE);
|
||||
break;
|
||||
case eCursor_arrow_south:
|
||||
case eCursor_arrow_south_plus:
|
||||
gdkcursor = gdk_cursor_new(GDK_BOTTOM_SIDE);
|
||||
break;
|
||||
case eCursor_arrow_west:
|
||||
case eCursor_arrow_west_plus:
|
||||
gdkcursor = gdk_cursor_new(GDK_LEFT_SIDE);
|
||||
break;
|
||||
case eCursor_arrow_east:
|
||||
case eCursor_arrow_east_plus:
|
||||
gdkcursor = gdk_cursor_new(GDK_RIGHT_SIDE);
|
||||
break;
|
||||
case eCursor_crosshair:
|
||||
gdkcursor = gdk_cursor_new(GDK_CROSSHAIR);
|
||||
break;
|
||||
|
|
@ -3336,12 +3320,6 @@ get_gtk_cursor(nsCursor aCursor)
|
|||
case eCursor_spinning:
|
||||
newType = MOZ_CURSOR_SPINNING;
|
||||
break;
|
||||
case eCursor_count_up:
|
||||
case eCursor_count_down:
|
||||
case eCursor_count_up_down:
|
||||
// XXX: these -moz- cursors need to be implemented
|
||||
gdkcursor = gdk_cursor_new(GDK_LEFT_PTR);
|
||||
break;
|
||||
case eCursor_zoom_in:
|
||||
newType = MOZ_CURSOR_ZOOM_IN;
|
||||
break;
|
||||
|
|
|
|||
|
|
@ -760,9 +760,6 @@ NS_METHOD nsWindow::SetCursor(nsCursor aCursor)
|
|||
case eCursor_grab: cursor = kThemeOpenHandCursor; break;
|
||||
case eCursor_grabbing: cursor = kThemeClosedHandCursor; break;
|
||||
case eCursor_spinning: cursor = kSpinCursorFirstFrame; break; // better than kThemeSpinningCursor
|
||||
case eCursor_count_up: cursor = kThemeCountingUpHandCursor; break;
|
||||
case eCursor_count_down: cursor = kThemeCountingDownHandCursor; break;
|
||||
case eCursor_count_up_down: cursor = kThemeCountingUpAndDownHandCursor; break;
|
||||
case eCursor_zoom_in: cursor = 129; break;
|
||||
case eCursor_zoom_out: cursor = 130; break;
|
||||
case eCursor_not_allowed:
|
||||
|
|
@ -771,19 +768,10 @@ NS_METHOD nsWindow::SetCursor(nsCursor aCursor)
|
|||
case eCursor_row_resize: cursor = 133; break;
|
||||
case eCursor_vertical_text: cursor = 134; break;
|
||||
case eCursor_all_scroll: cursor = kThemeOpenHandCursor; break;
|
||||
//arrows
|
||||
case eCursor_n_resize:
|
||||
case eCursor_arrow_north:
|
||||
case eCursor_arrow_north_plus: cursor = OnPantherOrLater() ? PANTHER_RESIZE_UP_CURSOR : JAGUAR_RESIZE_UP_CURSOR; break;
|
||||
case eCursor_arrow_south:
|
||||
case eCursor_arrow_south_plus:
|
||||
case eCursor_n_resize: cursor = OnPantherOrLater() ? PANTHER_RESIZE_UP_CURSOR : JAGUAR_RESIZE_UP_CURSOR; break;
|
||||
case eCursor_s_resize: cursor = OnPantherOrLater() ? PANTHER_RESIZE_DOWN_CURSOR : JAGUAR_RESIZE_DOWN_CURSOR; break;
|
||||
case eCursor_w_resize:
|
||||
case eCursor_arrow_west:
|
||||
case eCursor_arrow_west_plus: cursor = kThemeResizeLeftCursor; break;
|
||||
case eCursor_e_resize:
|
||||
case eCursor_arrow_east:
|
||||
case eCursor_arrow_east_plus: cursor = kThemeResizeRightCursor; break;
|
||||
case eCursor_w_resize: cursor = kThemeResizeLeftCursor; break;
|
||||
case eCursor_e_resize: cursor = kThemeResizeRightCursor; break;
|
||||
case eCursor_nw_resize: cursor = 137; break;
|
||||
case eCursor_se_resize: cursor = 138; break;
|
||||
case eCursor_ne_resize: cursor = 139; break;
|
||||
|
|
|
|||
|
|
@ -1723,38 +1723,6 @@ NS_METHOD nsWindow::SetCursor(nsCursor aCursor)
|
|||
newPointer = ::WinQuerySysPointer(HWND_DESKTOP, SPTR_SIZENESW, FALSE);
|
||||
break;
|
||||
|
||||
case eCursor_arrow_north:
|
||||
newPointer = gPtrArray[IDC_ARROWNORTH-IDC_BASE];
|
||||
break;
|
||||
|
||||
case eCursor_arrow_north_plus:
|
||||
newPointer = gPtrArray[IDC_ARROWNORTHPLUS-IDC_BASE];
|
||||
break;
|
||||
|
||||
case eCursor_arrow_south:
|
||||
newPointer = gPtrArray[IDC_ARROWSOUTH-IDC_BASE];
|
||||
break;
|
||||
|
||||
case eCursor_arrow_south_plus:
|
||||
newPointer = gPtrArray[IDC_ARROWSOUTHPLUS-IDC_BASE];
|
||||
break;
|
||||
|
||||
case eCursor_arrow_east:
|
||||
newPointer = gPtrArray[IDC_ARROWEAST-IDC_BASE];
|
||||
break;
|
||||
|
||||
case eCursor_arrow_east_plus:
|
||||
newPointer = gPtrArray[IDC_ARROWEASTPLUS-IDC_BASE];
|
||||
break;
|
||||
|
||||
case eCursor_arrow_west:
|
||||
newPointer = gPtrArray[IDC_ARROWWEST-IDC_BASE];
|
||||
break;
|
||||
|
||||
case eCursor_arrow_west_plus:
|
||||
newPointer = gPtrArray[IDC_ARROWWESTPLUS-IDC_BASE];
|
||||
break;
|
||||
|
||||
case eCursor_crosshair:
|
||||
newPointer = gPtrArray[IDC_CROSS-IDC_BASE];
|
||||
break;
|
||||
|
|
@ -1792,9 +1760,6 @@ NS_METHOD nsWindow::SetCursor(nsCursor aCursor)
|
|||
break;
|
||||
|
||||
case eCursor_context_menu:
|
||||
case eCursor_count_up:
|
||||
case eCursor_count_down:
|
||||
case eCursor_count_up_down:
|
||||
// XXX: No suitable cursor, needs implementing
|
||||
break;
|
||||
|
||||
|
|
|
|||
Двоичные данные
widget/src/os2/res/arrow_east.ptr
Двоичные данные
widget/src/os2/res/arrow_east.ptr
Двоичный файл не отображается.
Двоичные данные
widget/src/os2/res/arrow_east_plus.ptr
Двоичные данные
widget/src/os2/res/arrow_east_plus.ptr
Двоичный файл не отображается.
Двоичные данные
widget/src/os2/res/arrow_north.ptr
Двоичные данные
widget/src/os2/res/arrow_north.ptr
Двоичный файл не отображается.
Двоичные данные
widget/src/os2/res/arrow_north_plus.ptr
Двоичные данные
widget/src/os2/res/arrow_north_plus.ptr
Двоичный файл не отображается.
Двоичные данные
widget/src/os2/res/arrow_south.ptr
Двоичные данные
widget/src/os2/res/arrow_south.ptr
Двоичный файл не отображается.
Двоичные данные
widget/src/os2/res/arrow_south_plus.ptr
Двоичные данные
widget/src/os2/res/arrow_south_plus.ptr
Двоичный файл не отображается.
Двоичные данные
widget/src/os2/res/arrow_west.ptr
Двоичные данные
widget/src/os2/res/arrow_west.ptr
Двоичный файл не отображается.
Двоичные данные
widget/src/os2/res/arrow_west_plus.ptr
Двоичные данные
widget/src/os2/res/arrow_west_plus.ptr
Двоичный файл не отображается.
|
|
@ -38,26 +38,18 @@
|
|||
#define IDC_BASE 4100
|
||||
|
||||
#define IDC_SELECTANCHOR 4100
|
||||
#define IDC_ARROWSOUTH 4101
|
||||
#define IDC_ARROWNORTH 4102
|
||||
#define IDC_ARROWEAST 4103
|
||||
#define IDC_ARROWWEST 4104
|
||||
#define IDC_ARROWSOUTHPLUS 4105
|
||||
#define IDC_ARROWNORTHPLUS 4106
|
||||
#define IDC_ARROWEASTPLUS 4107
|
||||
#define IDC_ARROWWESTPLUS 4108
|
||||
#define IDC_GRAB 4109
|
||||
#define IDC_GRABBING 4110
|
||||
#define IDC_CELL 4111
|
||||
#define IDC_COPY 4112
|
||||
#define IDC_ALIAS 4113
|
||||
#define IDC_ZOOMIN 4114
|
||||
#define IDC_ZOOMOUT 4115
|
||||
#define IDC_GRAB 4101
|
||||
#define IDC_GRABBING 4102
|
||||
#define IDC_CELL 4103
|
||||
#define IDC_COPY 4104
|
||||
#define IDC_ALIAS 4105
|
||||
#define IDC_ZOOMIN 4106
|
||||
#define IDC_ZOOMOUT 4107
|
||||
|
||||
/* OS/2 specific */
|
||||
#define IDC_ARROWWAIT 4116
|
||||
#define IDC_CROSS 4117
|
||||
#define IDC_HELP 4118
|
||||
#define IDC_ARROWWAIT 4108
|
||||
#define IDC_CROSS 4109
|
||||
#define IDC_HELP 4110
|
||||
|
||||
#define IDC_COUNT IDC_HELP-IDC_BASE+1
|
||||
|
||||
|
|
|
|||
|
|
@ -38,26 +38,18 @@
|
|||
#define IDC_BASE 4100
|
||||
|
||||
#define IDC_SELECTANCHOR 4100
|
||||
#define IDC_ARROWSOUTH 4101
|
||||
#define IDC_ARROWNORTH 4102
|
||||
#define IDC_ARROWEAST 4103
|
||||
#define IDC_ARROWWEST 4104
|
||||
#define IDC_ARROWSOUTHPLUS 4105
|
||||
#define IDC_ARROWNORTHPLUS 4106
|
||||
#define IDC_ARROWEASTPLUS 4107
|
||||
#define IDC_ARROWWESTPLUS 4108
|
||||
#define IDC_GRAB 4109
|
||||
#define IDC_GRABBING 4110
|
||||
#define IDC_CELL 4111
|
||||
#define IDC_COPY 4112
|
||||
#define IDC_ALIAS 4113
|
||||
#define IDC_ZOOMIN 4114
|
||||
#define IDC_ZOOMOUT 4115
|
||||
#define IDC_GRAB 4101
|
||||
#define IDC_GRABBING 4102
|
||||
#define IDC_CELL 4103
|
||||
#define IDC_COPY 4104
|
||||
#define IDC_ALIAS 4105
|
||||
#define IDC_ZOOMIN 4106
|
||||
#define IDC_ZOOMOUT 4107
|
||||
|
||||
/* OS/2 specific */
|
||||
#define IDC_ARROWWAIT 4116
|
||||
#define IDC_CROSS 4117
|
||||
#define IDC_HELP 4118
|
||||
#define IDC_ARROWWAIT 4108
|
||||
#define IDC_CROSS 4109
|
||||
#define IDC_HELP 4110
|
||||
|
||||
#define IDC_COUNT IDC_HELP-IDC_BASE+1
|
||||
|
||||
|
|
|
|||
|
|
@ -38,14 +38,6 @@
|
|||
#include "wdgtos2rc.h"
|
||||
|
||||
POINTER IDC_SELECTANCHOR res\select.ptr
|
||||
POINTER IDC_ARROWNORTH res\arrow_north.ptr
|
||||
POINTER IDC_ARROWNORTHPLUS res\arrow_north_plus.ptr
|
||||
POINTER IDC_ARROWSOUTH res\arrow_south.ptr
|
||||
POINTER IDC_ARROWSOUTHPLUS res\arrow_south_plus.ptr
|
||||
POINTER IDC_ARROWWEST res\arrow_west.ptr
|
||||
POINTER IDC_ARROWWESTPLUS res\arrow_west_plus.ptr
|
||||
POINTER IDC_ARROWEAST res\arrow_east.ptr
|
||||
POINTER IDC_ARROWEASTPLUS res\arrow_east_plus.ptr
|
||||
POINTER IDC_GRAB res\grab.ptr
|
||||
POINTER IDC_GRABBING res\grabbing.ptr
|
||||
POINTER IDC_CELL res\cell.ptr
|
||||
|
|
|
|||
|
|
@ -468,12 +468,6 @@ NS_METHOD nsWidget::SetCursor( nsCursor aCursor ) {
|
|||
// XXX: No suitable cursor, needs implementing
|
||||
break;
|
||||
|
||||
case eCursor_count_up:
|
||||
case eCursor_count_down:
|
||||
case eCursor_count_up_down:
|
||||
// XXX: No suitable cursor, needs implementing
|
||||
break;
|
||||
|
||||
case eCursor_move:
|
||||
curs = Ph_CURSOR_MOVE;
|
||||
break;
|
||||
|
|
@ -514,27 +508,6 @@ NS_METHOD nsWidget::SetCursor( nsCursor aCursor ) {
|
|||
curs = Ph_CURSOR_DRAG_HORIZONTAL;
|
||||
break;
|
||||
|
||||
// REVISIT - Photon does not have the following cursor types...
|
||||
case eCursor_arrow_north:
|
||||
case eCursor_arrow_north_plus:
|
||||
curs = Ph_CURSOR_DRAG_TOP;
|
||||
break;
|
||||
|
||||
case eCursor_arrow_south:
|
||||
case eCursor_arrow_south_plus:
|
||||
curs = Ph_CURSOR_DRAG_BOTTOM;
|
||||
break;
|
||||
|
||||
case eCursor_arrow_east:
|
||||
case eCursor_arrow_east_plus:
|
||||
curs = Ph_CURSOR_DRAG_RIGHT;
|
||||
break;
|
||||
|
||||
case eCursor_arrow_west:
|
||||
case eCursor_arrow_west_plus:
|
||||
curs = Ph_CURSOR_DRAG_LEFT;
|
||||
break;
|
||||
|
||||
case eCursor_zoom_in:
|
||||
case eCursor_zoom_out:
|
||||
// XXX: No suitable cursor, needs implementing
|
||||
|
|
|
|||
|
|
@ -2437,38 +2437,6 @@ NS_METHOD nsWindow::SetCursor(nsCursor aCursor)
|
|||
newCursor = ::LoadCursor(NULL, IDC_SIZENESW);
|
||||
break;
|
||||
|
||||
case eCursor_arrow_north:
|
||||
newCursor = ::LoadCursor(nsToolkit::mDllInstance, MAKEINTRESOURCE(IDC_ARROWNORTH));
|
||||
break;
|
||||
|
||||
case eCursor_arrow_north_plus:
|
||||
newCursor = ::LoadCursor(nsToolkit::mDllInstance, MAKEINTRESOURCE(IDC_ARROWNORTHPLUS));
|
||||
break;
|
||||
|
||||
case eCursor_arrow_south:
|
||||
newCursor = ::LoadCursor(nsToolkit::mDllInstance, MAKEINTRESOURCE(IDC_ARROWSOUTH));
|
||||
break;
|
||||
|
||||
case eCursor_arrow_south_plus:
|
||||
newCursor = ::LoadCursor(nsToolkit::mDllInstance, MAKEINTRESOURCE(IDC_ARROWSOUTHPLUS));
|
||||
break;
|
||||
|
||||
case eCursor_arrow_east:
|
||||
newCursor = ::LoadCursor(nsToolkit::mDllInstance, MAKEINTRESOURCE(IDC_ARROWEAST));
|
||||
break;
|
||||
|
||||
case eCursor_arrow_east_plus:
|
||||
newCursor = ::LoadCursor(nsToolkit::mDllInstance, MAKEINTRESOURCE(IDC_ARROWEASTPLUS));
|
||||
break;
|
||||
|
||||
case eCursor_arrow_west:
|
||||
newCursor = ::LoadCursor(nsToolkit::mDllInstance, MAKEINTRESOURCE(IDC_ARROWWEST));
|
||||
break;
|
||||
|
||||
case eCursor_arrow_west_plus:
|
||||
newCursor = ::LoadCursor(nsToolkit::mDllInstance, MAKEINTRESOURCE(IDC_ARROWWESTPLUS));
|
||||
break;
|
||||
|
||||
case eCursor_crosshair:
|
||||
newCursor = ::LoadCursor(NULL, IDC_CROSS);
|
||||
break;
|
||||
|
|
@ -2509,12 +2477,6 @@ NS_METHOD nsWindow::SetCursor(nsCursor aCursor)
|
|||
// XXX this CSS3 cursor needs to be implemented
|
||||
break;
|
||||
|
||||
case eCursor_count_up:
|
||||
case eCursor_count_down:
|
||||
case eCursor_count_up_down:
|
||||
// XXX these -moz- cursors needs to be implemented
|
||||
break;
|
||||
|
||||
case eCursor_zoom_in:
|
||||
newCursor = ::LoadCursor(nsToolkit::mDllInstance, MAKEINTRESOURCE(IDC_ZOOMIN));
|
||||
break;
|
||||
|
|
|
|||
|
|
@ -35,21 +35,13 @@
|
|||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
#define IDC_SELECTANCHOR 4100
|
||||
#define IDC_ARROWSOUTH 4101
|
||||
#define IDC_ARROWNORTH 4102
|
||||
#define IDC_ARROWEAST 4103
|
||||
#define IDC_ARROWWEST 4104
|
||||
#define IDC_ARROWSOUTHPLUS 4105
|
||||
#define IDC_ARROWNORTHPLUS 4106
|
||||
#define IDC_ARROWEASTPLUS 4107
|
||||
#define IDC_ARROWWESTPLUS 4108
|
||||
#define IDC_GRAB 4109
|
||||
#define IDC_GRABBING 4110
|
||||
#define IDC_CELL 4111
|
||||
#define IDC_COPY 4112
|
||||
#define IDC_ALIAS 4113
|
||||
#define IDC_ZOOMIN 4114
|
||||
#define IDC_ZOOMOUT 4115
|
||||
#define IDC_COLRESIZE 4116
|
||||
#define IDC_ROWRESIZE 4117
|
||||
#define IDC_VERTICALTEXT 4118
|
||||
#define IDC_GRAB 4101
|
||||
#define IDC_GRABBING 4102
|
||||
#define IDC_CELL 4103
|
||||
#define IDC_COPY 4104
|
||||
#define IDC_ALIAS 4105
|
||||
#define IDC_ZOOMIN 4106
|
||||
#define IDC_ZOOMOUT 4107
|
||||
#define IDC_COLRESIZE 4108
|
||||
#define IDC_ROWRESIZE 4109
|
||||
#define IDC_VERTICALTEXT 4110
|
||||
|
|
|
|||
|
|
@ -1396,22 +1396,6 @@ Cursor nsWidget::XlibCreateCursor(nsCursor aCursorType)
|
|||
case eCursor_sw_resize:
|
||||
xcursor = XCreateFontCursor(mDisplay, XC_bottom_left_corner);
|
||||
break;
|
||||
case eCursor_arrow_south:
|
||||
case eCursor_arrow_south_plus:
|
||||
xcursor = XCreateFontCursor(mDisplay, XC_bottom_side);
|
||||
break;
|
||||
case eCursor_arrow_north:
|
||||
case eCursor_arrow_north_plus:
|
||||
xcursor = XCreateFontCursor(mDisplay, XC_top_side);
|
||||
break;
|
||||
case eCursor_arrow_east:
|
||||
case eCursor_arrow_east_plus:
|
||||
xcursor = XCreateFontCursor(mDisplay, XC_right_side);
|
||||
break;
|
||||
case eCursor_arrow_west:
|
||||
case eCursor_arrow_west_plus:
|
||||
xcursor = XCreateFontCursor(mDisplay, XC_left_side);
|
||||
break;
|
||||
case eCursor_crosshair:
|
||||
xcursor = XCreateFontCursor(mDisplay, XC_crosshair);
|
||||
break;
|
||||
|
|
@ -1442,13 +1426,6 @@ Cursor nsWidget::XlibCreateCursor(nsCursor aCursorType)
|
|||
case eCursor_spinning:
|
||||
newType = XLIB_SPINNING;
|
||||
break;
|
||||
case eCursor_count_up:
|
||||
case eCursor_count_down:
|
||||
case eCursor_count_up_down:
|
||||
// XXX: these -moz- cursors need to be implemented
|
||||
// I simply have no idea how they should look like
|
||||
xcursor = XCreateFontCursor(mDisplay, XC_left_ptr);
|
||||
break;
|
||||
case eCursor_zoom_in:
|
||||
newType = XLIB_ZOOM_IN;
|
||||
break;
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче