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

Some unix stuff

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@2035 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
spider 1998-05-20 17:59:52 +00:00
parent c5eba1ff11
commit 83c4fc037c
2 changed files with 53 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mozilla/shell/src/nsShellInstance.cpp
View File

@ -81,6 +81,8 @@ nsresult nsShellInstance::Run()
}
return ((nsresult)msg.wParam);
#elif NS_UNIX
extern XtAppContext app_context ;
XtAppMainLoop(app_context) ;
#else
return NS_OK;
@ -191,7 +193,7 @@ nsIWidget * nsShellInstance::CreateApplicationWindow(const nsRect &aRect,
mApplicationWindow->Create((nsIWidget*)NULL,
aRect,
aHandleEventFunction,
NULL);
nsnull, nsnull, GetNativeInstance());
return (mApplicationWindow);
}
@ -201,6 +203,10 @@ nsresult nsShellInstance::ShowApplicationWindow(PRBool show)
{
mApplicationWindow->Show(show);
#ifdef NS_UNIX
XtRealizeWidget((Widget)GetNativeInstance());
#endif
return NS_OK;
}

76
mozilla/shell/src/unix/main.cpp
View File

@ -28,43 +28,44 @@ extern nsIID kIXPCOMApplicationShellCID ;
static NS_DEFINE_IID(kCShellInstanceIID, NS_ISHELLINSTANCE_IID);
XtAppContext app_context ;
void main(int argc, char **argv)
{
Widget topLevel;
XtAppContext app_context ;
Widget topLevel;
nsresult result = NS_OK ;
nsresult result = NS_OK ;
nsIShellInstance * pShellInstance ;
nsIApplicationShell * pApplicationShell ;
nsIShellInstance * pShellInstance ;
nsIApplicationShell * pApplicationShell ;
XtSetLanguageProc(NULL, NULL, NULL);
XtSetLanguageProc(NULL, NULL, NULL);
topLevel = XtVaAppInitialize(&app_context, "Shell", NULL, 0, &argc, argv, NULL, NULL);
topLevel = XtVaAppInitialize(&app_context, "Shell", NULL, 0, &argc, argv, NULL, NULL);
// Let get a ShellInstance for this Application instance
NSRepository::RegisterFactory(kCShellInstanceIID, SHELL_DLL, PR_FALSE, PR_FALSE);
// Let get a ShellInstance for this Application instance
NSRepository::RegisterFactory(kCShellInstanceIID, SHELL_DLL, PR_FALSE, PR_FALSE);
result = NSRepository::CreateInstance(kCShellInstanceIID,
NULL,
kCShellInstanceIID,
(void **) &pShellInstance) ;
result = NSRepository::CreateInstance(kCShellInstanceIID,
NULL,
kCShellInstanceIID,
(void **) &pShellInstance) ;
if (result != NS_OK)
return ;
if (result != NS_OK)
return ;
// Let's instantiate the Application's Shell
NS_RegisterApplicationShellFactory() ;
// Let's instantiate the Application's Shell
NS_RegisterApplicationShellFactory() ;
result = NSRepository::CreateInstance(kIXPCOMApplicationShellCID,
NULL,
kIXPCOMApplicationShellCID,
(void **) &pApplicationShell) ;
result = NSRepository::CreateInstance(kIXPCOMApplicationShellCID,
NULL,
kIXPCOMApplicationShellCID,
(void **) &pApplicationShell) ;
if (result != NS_OK)
return ;
if (result != NS_OK)
return ;
// Let the the State know who it's Application Instance is
// Let the the State know who it's Application Instance is
pShellInstance->SetNativeInstance((nsNativeApplicationInstance) topLevel);
pShellInstance->SetApplicationShell(pApplicationShell);
@ -72,17 +73,32 @@ void main(int argc, char **argv)
// Application can look up its State
nsApplicationManager::SetShellAssociation(pApplicationShell, pShellInstance);
// Initialize the system
// Initialize the system
pShellInstance->Init();
pApplicationShell->Init();
pApplicationShell->Init();
// Now, let actually start dispatching events.
result = pApplicationShell->Run();
result = pApplicationShell->Run();
// We're done, clean up
nsApplicationManager::DeleteShellAssociation(pApplicationShell, pShellInstance);
nsApplicationManager::DeleteShellAssociation(pApplicationShell, pShellInstance);
// book out of here
return ;
// book out of here
return ;
}