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

#326273

Browse Source 
r=mkaply, sr=mkaply (OS/2 only)
OS/2 changes from threading checkin - build bustage
After this change, OS/2 appears to work...


git-svn-id: svn://10.0.0.236/trunk@196599 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mkaply%us.ibm.com
2006-05-15 21:22:18 +00:00
parent a149d4574f
commit 321c3e93b1
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mozilla/widget/src/os2/nsAppShell.cpp
View File

@@ -41,7 +41,7 @@
#include "nsToolkit.h"
#include "nsThreadUtils.h"
static UINT sMsgId = WM_USER + 0x77;
static UINT sMsgId;
//-------------------------------------------------------------------------
@@ -69,10 +69,11 @@ nsAppShell::~nsAppShell()
nsresult
nsAppShell::Init()
{
// if (!sMsgId)
// sMsgId = RegisterWindowMessage("nsAppShell:EventID");
if (!sMsgId) {
sMsgId = WinAddAtom( WinQuerySystemAtomTable(), "nsAppShell:EventID");
WinRegisterClass((HAB)0, "nsAppShell:EventWindowClass", EventWindowProc, NULL, 0);
}
WinRegisterClass((HAB)0, "nsAppShell:EventWindowClass", EventWindowProc, NULL, 0);
mEventWnd = ::WinCreateWindow(HWND_DESKTOP,
"nsAppShell:EventWindowClass",
"nsAppShell:EventWindow",
@@ -82,7 +83,6 @@ nsAppShell::Init()
HWND_DESKTOP,
HWND_BOTTOM,
0, 0, 0);
printf("hwnd = %d\n", mEventWnd);
NS_ENSURE_STATE(mEventWnd);
return nsBaseAppShell::Init();

10
mozilla/widget/src/os2/nsWidgetFactory.cpp
View File

@@ -63,6 +63,7 @@
// class definition headers
#include "nsAppShell.h"
#include "nsAppShellSingleton.h"
#include "nsBidiKeyboard.h"
#include "nsWindow.h"
#include "nsDragService.h"
@@ -94,7 +95,6 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsWindow)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsClipboard)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsClipboardHelper)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsFilePicker)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsAppShell)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsFrameWindow)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsLookAndFeel)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsSound)
@@ -200,8 +200,10 @@ nsWidgetOS2ModuleDtor(nsIModule *self)
{
nsWindow::ReleaseGlobals();
nsFilePicker::ReleaseGlobals();
nsAppShellShutdown(self);
}
NS_IMPL_NSGETMODULE_WITH_DTOR(nsWidgetOS2Module,
components,
nsWidgetOS2ModuleDtor)
NS_IMPL_NSGETMODULE_WITH_CTOR_DTOR(nsWidgetOS2Module,
components,
nsAppShellInit,
nsWidgetOS2ModuleDtor)