Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Spanked to get most of the menus working again

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@6030 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
kipp%netscape.com
1998-07-21 00:48:35 +00:00
parent a5f64bdca9
commit c3fd39a44f
11 changed files with 803 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

99
mozilla/webshell/tests/viewer/nsWinMain.cpp
View File

@@ -24,7 +24,7 @@
extern "C" int NET_PollSockets();
static HANDLE gInstance, gPrevInstance;
HANDLE gInstance, gPrevInstance;
static nsITimer* gNetTimer;
nsNativeViewerApp::nsNativeViewerApp()
@@ -35,6 +35,44 @@ nsNativeViewerApp::~nsNativeViewerApp()
{
}
static void
PollNet(nsITimer *aTimer, void *aClosure)
{
NET_PollSockets();
NS_IF_RELEASE(gNetTimer);
if (NS_OK == NS_NewTimer(&gNetTimer)) {
gNetTimer->Init(PollNet, nsnull, 1000 / 50);
}
}
int
nsNativeViewerApp::Run()
{
OpenWindow();
// Process messages
MSG msg;
PollNet(0, 0);
while (::GetMessage(&msg, NULL, 0, 0)) {
if (
#if 0
!JSConsole::sAccelTable ||
!gConsole ||
!gConsole->GetMainWindow() ||
!TranslateAccelerator(gConsole->GetMainWindow(), JSConsole::sAccelTable, &msg)
#endif
1
) {
TranslateMessage(&msg);
DispatchMessage(&msg);
NET_PollSockets();
}
}
return msg.wParam;
}
//----------------------------------------------------------------------
//----------------------------------------------------------------------
nsNativeBrowserWindow::nsNativeBrowserWindow()
@@ -66,69 +104,26 @@ nsNativeBrowserWindow::DispatchMenuItem(PRInt32 aID)
//----------------------------------------------------------------------
static void
PollNet(nsITimer *aTimer, void *aClosure)
{
NET_PollSockets();
NS_IF_RELEASE(gNetTimer);
if (NS_OK == NS_NewTimer(&gNetTimer)) {
gNetTimer->Init(PollNet, nsnull, 1000 / 50);
}
}
static int
RunViewer(HANDLE instance, HANDLE prevInstance, int nCmdShow,
nsViewerApp* app)
{
gInstance = instance;
gPrevInstance = prevInstance;
app->OpenWindow();
// SetViewer(aViewer);
// nsIWidget *mainWindow = nsnull;
// nsDocLoader* dl = aViewer->SetupViewer(&mainWindow, 0, 0);
// Process messages
MSG msg;
PollNet(0, 0);
while (::GetMessage(&msg, NULL, 0, 0)) {
if (
#if 0
!JSConsole::sAccelTable ||
!gConsole ||
!gConsole->GetMainWindow() ||
!TranslateAccelerator(gConsole->GetMainWindow(), JSConsole::sAccelTable, &msg)
#endif
1
) {
TranslateMessage(&msg);
DispatchMessage(&msg);
NET_PollSockets();
}
}
// aViewer->CleanupViewer(dl);
return msg.wParam;
}
void main(int argc, char **argv)
int main(int argc, char **argv)
{
PL_InitializeEventsLib("");
nsViewerApp* app = new nsNativeViewerApp();
app->Initialize(argc, argv);
RunViewer(GetModuleHandle(NULL), NULL, SW_SHOW, app);
app->Run();
delete app;
return 0;
}
int PASCAL
WinMain(HANDLE instance, HANDLE prevInstance, LPSTR cmdParam, int nCmdShow)
{
gInstance = instance;
gPrevInstance = prevInstance;
PL_InitializeEventsLib("");
nsViewerApp* app = new nsNativeViewerApp();
app->Initialize(0, nsnull);
int rv = RunViewer(instance, prevInstance, nCmdShow, app);
int result = app->Run();
delete app;
return rv;
return result;
}