Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-21 17:59:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

#206909

Browse Source 
r=mkaply, sr=blizzard (OS/2 specific)
OS/2 only - make zoomin/zoomout work
This commit is contained in:
mkaply%us.ibm.com 2003-06-02 20:24:07 +00:00
parent 49b5b5dd59
commit be78b9cae7
3 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
widget/src/os2/nsWindow.cpp
View File

@ -126,7 +126,7 @@ static LONG gLastButtonDown = 0;
////////////////////////////////////////////////////
static PRBool gGlobalsInitialized = PR_FALSE;
static HPOINTER gPtrArray[17];
static HPOINTER gPtrArray[IDC_COUNT];
static PRBool gIsTrackPoint = PR_FALSE;
static PRBool gIsDBCS = PR_FALSE;
@ -188,7 +188,7 @@ nsWindow::nsWindow() : nsBaseWidget()
gGlobalsInitialized = PR_TRUE;
HMODULE hModResources = NULLHANDLE;
DosQueryModFromEIP(&hModResources, NULL, 0, NULL, NULL, (ULONG) &gGlobalsInitialized);
for (int i=0;i<=16;i++ ) {
for (int i = 0; i < IDC_COUNT; i++) {
gPtrArray[i] = ::WinLoadPointer(HWND_DESKTOP, hModResources, IDC_BASE+i);
}
@ -250,7 +250,7 @@ nsWindow::~nsWindow()
/* static */ void
nsWindow::ReleaseGlobals()
{
for (int i=0;i<=16;i++ ) {
for (int i = 0; i < IDC_COUNT; i++) {
WinDestroyPointer(gPtrArray[i]);
}
}
@ -1745,7 +1745,11 @@ NS_METHOD nsWindow::SetCursor(nsCursor aCursor)
break;
case eCursor_zoom_in:
newPointer = gPtrArray[IDC_ZOOMIN-IDC_BASE];
break;
case eCursor_zoom_out:
newPointer = gPtrArray[IDC_ZOOMOUT-IDC_BASE];
break;
default:

14
widget/src/os2/resource.h
View File

@ -36,13 +36,13 @@
#define IDC_CELL 4111
#define IDC_COPY 4112
#define IDC_ALIAS 4113
#define IDC_ZOOMIN 4114
#define IDC_ZOOMOUT 4115
#define IDC_ARROWWAIT 4114
#define IDC_CROSS 4115
#define IDC_HELP 4116
/* OS/2 specific */
#define IDC_ARROWWAIT 4116
#define IDC_CROSS 4117
#define IDC_HELP 4118
// OS2TODO HCT temporary bug fix
#define IDC_COUNT IDC_HELP-IDC_BASE+1
#ifndef FCF_CLOSEBUTTON // defined in the Merlin toolkit
#define FCF_CLOSEBUTTON 0x04000000L
#endif

10
widget/src/os2/widget.rc
View File

@ -22,7 +22,6 @@
#include <os2.h>
#include "resource.h"
/* pointers */
POINTER IDC_SELECTANCHOR res\select.ptr
POINTER IDC_ARROWNORTH res\arrow_north.ptr
POINTER IDC_ARROWNORTHPLUS res\arrow_north_plus.ptr
@ -32,11 +31,14 @@ 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_COPY res\copy.ptr
POINTER IDC_ALIAS res\aliasb.ptr
POINTER IDC_CELL res\cell.ptr
POINTER IDC_GRAB res\grab.ptr
POINTER IDC_GRABBING res\grabbing.ptr
POINTER IDC_CELL res\cell.ptr
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_ARROWWAIT res\arrow_wait.ptr
POINTER IDC_CROSS res\crosshair.ptr
POINTER IDC_HELP res\help.ptr