Enabled the js-console accelerators

This commit is contained in:
kipp%netscape.com 1998-07-21 01:22:52 +00:00
parent 318ff59aac
commit 17550076a8
2 changed files with 10 additions and 19 deletions

View File

@ -24,6 +24,7 @@
#include "nsINetService.h"
#include "nsRepository.h"
#include "nsDocLoader.h"
#include "JSConsole.h"
#include "prprf.h"
#include "plstr.h"
@ -414,6 +415,7 @@ static int gDebugRobotLoads = 5000;
static char gVerifyDir[_MAX_PATH];
static BOOL gVisualDebug = TRUE;
extern JSConsole *gConsole;
extern HANDLE gInstance, gPrevInstance;
extern "C" NS_EXPORT int DebugRobot(
@ -427,16 +429,11 @@ void yieldProc(const char * str)
MSG msg;
while (PeekMessage(&msg, NULL, 0, 0, PM_NOREMOVE)) {
GetMessage(&msg, NULL, 0, 0);
if (
#if 0
!JSConsole::sAccelTable ||
if (!JSConsole::sAccelTable ||
!gConsole ||
!gConsole->GetMainWindow() ||
!TranslateAccelerator(gConsole->GetMainWindow(), JSConsole::sAccelTable, &msg)
#else
1
#endif
) {
!TranslateAccelerator(gConsole->GetMainWindow(),
JSConsole::sAccelTable, &msg)) {
TranslateMessage(&msg);
DispatchMessage(&msg);
/* Pump Netlib... */
@ -741,10 +738,8 @@ nsViewerApp::CreateSiteWalker(nsBrowserWindow* aWindow)
#ifdef XP_PC
#include "jsconsres.h"
#include "JSConsole.h"
static NS_DEFINE_IID(kIScriptContextOwnerIID, NS_ISCRIPTCONTEXTOWNER_IID);
JSConsole *gConsole = NULL;
void DestroyConsole()
{

View File

@ -20,10 +20,12 @@
#include "nsViewerApp.h"
#include "nsBrowserWindow.h"
#include "nsITimer.h"
#include "JSConsole.h"
#include "plevent.h"
extern "C" int NET_PollSockets();
JSConsole *gConsole;
HANDLE gInstance, gPrevInstance;
static nsITimer* gNetTimer;
@ -54,15 +56,11 @@ nsNativeViewerApp::Run()
MSG msg;
PollNet(0, 0);
while (::GetMessage(&msg, NULL, 0, 0)) {
if (
#if 0
!JSConsole::sAccelTable ||
if (!JSConsole::sAccelTable ||
!gConsole ||
!gConsole->GetMainWindow() ||
!TranslateAccelerator(gConsole->GetMainWindow(), JSConsole::sAccelTable, &msg)
#endif
1
) {
!TranslateAccelerator(gConsole->GetMainWindow(),
JSConsole::sAccelTable, &msg)) {
TranslateMessage(&msg);
DispatchMessage(&msg);
NET_PollSockets();
@ -73,8 +71,6 @@ nsNativeViewerApp::Run()
//----------------------------------------------------------------------
//----------------------------------------------------------------------
nsNativeBrowserWindow::nsNativeBrowserWindow()
{
}