Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 03:45:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix the Menubar which wasn't being created

Browse Source
This commit is contained in:
Jerry.Kirk%Nexwarecorp.com 1999-09-10 12:52:35 +00:00
parent 9dcd65881b
commit 8d90b21de0
1 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
webshell/tests/viewer/nsPhMain.cpp
View File

@ -31,6 +31,8 @@
#include <photon/Pg.h>
#include <Pt.h>
#define PRINTF printf
static nsNativeViewerApp* gTheApp;
nsNativeViewerApp::nsNativeViewerApp()
@ -44,7 +46,7 @@ nsNativeViewerApp::~nsNativeViewerApp()
int
nsNativeViewerApp::Run()
{
printf( ">>> nsViewerApp::Run() <<<\n" );
PRINTF( ">>> nsViewerApp::Run() <<<\n" );
OpenWindow();
mAppShell->Run();
return 0;
@ -79,25 +81,17 @@ extern void CreateViewerMenus(PtWidget_t*, void *);
nsresult
nsNativeBrowserWindow::CreateMenuBar(PRInt32 aWidth)
{
nsIMenuBar * menubar = nsnull;
void *PhMenuBar;
PtWidget_t *mMenuBar= nsnull;
void *voidData;
/* Create the MenuBar */
nsComponentManager::CreateInstance( kMenuBarCID, nsnull, kIMenuBarIID, (void**)&menubar );
if( menubar )
voidData = mWindow->GetNativeData(NS_NATIVE_WINDOW);
mMenuBar = PtCreateWidget( PtMenuBar, (PtWidget_t *) voidData , 0, NULL);
if (mMenuBar)
{
menubar->Create( mWindow );
// REVISIT - strange problem here. May be a race condition or a compiler bug.
if( mWindow->SetMenuBar( menubar ) == NS_OK )
{
mWindow->ShowMenuBar( PR_TRUE );
menubar->GetNativeData(PhMenuBar);
::CreateViewerMenus((PtWidget_t *) PhMenuBar,this);
}
::CreateViewerMenus(mMenuBar,this);
}
return NS_OK;
}
@ -106,7 +100,7 @@ nsNativeBrowserWindow::GetMenuBarHeight(PRInt32 * aHeightOut)
{
NS_ASSERTION(nsnull != aHeightOut,"null out param.");
*aHeightOut = 0;
*aHeightOut = 31;
return NS_OK;
}