зеркало из https://github.com/mozilla/gecko-dev.git
r=mkaply, sr=mkaply (OS/2 only) OS/2 changes from threading checkin - build bustage After this change, OS/2 appears to work...
This commit is contained in:
Родитель
f85c82b173
Коммит
25cc486141
|
@ -41,7 +41,7 @@
|
||||||
#include "nsToolkit.h"
|
#include "nsToolkit.h"
|
||||||
#include "nsThreadUtils.h"
|
#include "nsThreadUtils.h"
|
||||||
|
|
||||||
static UINT sMsgId = WM_USER + 0x77;
|
static UINT sMsgId;
|
||||||
|
|
||||||
//-------------------------------------------------------------------------
|
//-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
@ -69,10 +69,11 @@ nsAppShell::~nsAppShell()
|
||||||
nsresult
|
nsresult
|
||||||
nsAppShell::Init()
|
nsAppShell::Init()
|
||||||
{
|
{
|
||||||
// if (!sMsgId)
|
if (!sMsgId) {
|
||||||
// sMsgId = RegisterWindowMessage("nsAppShell:EventID");
|
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,
|
mEventWnd = ::WinCreateWindow(HWND_DESKTOP,
|
||||||
"nsAppShell:EventWindowClass",
|
"nsAppShell:EventWindowClass",
|
||||||
"nsAppShell:EventWindow",
|
"nsAppShell:EventWindow",
|
||||||
|
@ -82,7 +83,6 @@ nsAppShell::Init()
|
||||||
HWND_DESKTOP,
|
HWND_DESKTOP,
|
||||||
HWND_BOTTOM,
|
HWND_BOTTOM,
|
||||||
0, 0, 0);
|
0, 0, 0);
|
||||||
printf("hwnd = %d\n", mEventWnd);
|
|
||||||
NS_ENSURE_STATE(mEventWnd);
|
NS_ENSURE_STATE(mEventWnd);
|
||||||
|
|
||||||
return nsBaseAppShell::Init();
|
return nsBaseAppShell::Init();
|
||||||
|
|
|
@ -63,6 +63,7 @@
|
||||||
|
|
||||||
// class definition headers
|
// class definition headers
|
||||||
#include "nsAppShell.h"
|
#include "nsAppShell.h"
|
||||||
|
#include "nsAppShellSingleton.h"
|
||||||
#include "nsBidiKeyboard.h"
|
#include "nsBidiKeyboard.h"
|
||||||
#include "nsWindow.h"
|
#include "nsWindow.h"
|
||||||
#include "nsDragService.h"
|
#include "nsDragService.h"
|
||||||
|
@ -94,7 +95,6 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsWindow)
|
||||||
NS_GENERIC_FACTORY_CONSTRUCTOR(nsClipboard)
|
NS_GENERIC_FACTORY_CONSTRUCTOR(nsClipboard)
|
||||||
NS_GENERIC_FACTORY_CONSTRUCTOR(nsClipboardHelper)
|
NS_GENERIC_FACTORY_CONSTRUCTOR(nsClipboardHelper)
|
||||||
NS_GENERIC_FACTORY_CONSTRUCTOR(nsFilePicker)
|
NS_GENERIC_FACTORY_CONSTRUCTOR(nsFilePicker)
|
||||||
NS_GENERIC_FACTORY_CONSTRUCTOR(nsAppShell)
|
|
||||||
NS_GENERIC_FACTORY_CONSTRUCTOR(nsFrameWindow)
|
NS_GENERIC_FACTORY_CONSTRUCTOR(nsFrameWindow)
|
||||||
NS_GENERIC_FACTORY_CONSTRUCTOR(nsLookAndFeel)
|
NS_GENERIC_FACTORY_CONSTRUCTOR(nsLookAndFeel)
|
||||||
NS_GENERIC_FACTORY_CONSTRUCTOR(nsSound)
|
NS_GENERIC_FACTORY_CONSTRUCTOR(nsSound)
|
||||||
|
@ -200,8 +200,10 @@ nsWidgetOS2ModuleDtor(nsIModule *self)
|
||||||
{
|
{
|
||||||
nsWindow::ReleaseGlobals();
|
nsWindow::ReleaseGlobals();
|
||||||
nsFilePicker::ReleaseGlobals();
|
nsFilePicker::ReleaseGlobals();
|
||||||
|
nsAppShellShutdown(self);
|
||||||
}
|
}
|
||||||
|
|
||||||
NS_IMPL_NSGETMODULE_WITH_DTOR(nsWidgetOS2Module,
|
NS_IMPL_NSGETMODULE_WITH_CTOR_DTOR(nsWidgetOS2Module,
|
||||||
components,
|
components,
|
||||||
nsWidgetOS2ModuleDtor)
|
nsAppShellInit,
|
||||||
|
nsWidgetOS2ModuleDtor)
|
||||||
|
|
Загрузка…
Ссылка в новой задаче