wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Add nsAppShell empty implementation

Browse Source 
Disable qt3support
This commit is contained in:
romaxa@romaxa.research.nokia.com 2008-04-19 18:05:49 +03:00
parent f98baada0a
commit 11fd09a312
2 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
widget/src/qt/Makefile.in
View File

@ -65,6 +65,7 @@ REQUIRES = xpcom \
$(NULL) $(NULL)
CPPSRCS = \ CPPSRCS = \
nsAppShell.cpp \
nsWidgetFactory.cpp \ nsWidgetFactory.cpp \
nsToolkit.cpp \ nsToolkit.cpp \
$(NULL) $(NULL)
@ -77,6 +78,7 @@ EXTRA_DSO_LDOPTS = \
-lthebes \ -lthebes \
$(LCMS_LIBS) \ $(LCMS_LIBS) \
$(MOZ_JS_LIBS) \ $(MOZ_JS_LIBS) \
$(MOZ_QT_LDFLAGS) \
$(NULL) $(NULL)
@ -107,9 +109,9 @@ ifndef GNU_CC
DEFINES += -D_TIME_H=1 DEFINES += -D_TIME_H=1
endif endif
endif endif
LOCAL_INCLUDES = \ LOCAL_INCLUDES += \
-I$(srcdir)/../xpwidgets \ -I$(topsrcdir)/widget/src/xpwidgets \
-I$(srcdir) \ -I$(srcdir) \
$(NULL) $(NULL)

22
widget/src/qt/nsWidgetFactory.cpp
View File

@ -41,14 +41,17 @@
#include "nsIGenericFactory.h" #include "nsIGenericFactory.h"
#include "nsIModule.h" #include "nsIModule.h"
// #include "nsCOMPtr.h"
// #include "nsWidgetsCID.h" #include "nsCOMPtr.h"
#include "nsWidgetsCID.h"
#include "nsAppShell.h"
// #include "nsIComponentRegistrar.h" // #include "nsIComponentRegistrar.h"
// #include "nsComponentManagerUtils.h" // #include "nsComponentManagerUtils.h"
// #include "nsAutoPtr.h" // #include "nsAutoPtr.h"
// //
// #include "nsWindow.h" // #include "nsWindow.h"
// #include "nsAppShell.h"
// #include "nsToolkit.h" // #include "nsToolkit.h"
// #include "nsLookAndFeel.h" // #include "nsLookAndFeel.h"
// #include "nsTransferable.h" // #include "nsTransferable.h"
@ -70,13 +73,16 @@
// //
// #include "nsBidiKeyboard.h" // #include "nsBidiKeyboard.h"
// #include "nsNativeThemeQt.h" // #include "nsNativeThemeQt.h"
NS_GENERIC_FACTORY_CONSTRUCTOR(nsAppShell)
/* /*
static NS_DEFINE_CID(kNativeScrollCID, NS_NATIVESCROLLBAR_CID); static NS_DEFINE_CID(kNativeScrollCID, NS_NATIVESCROLLBAR_CID);
NS_GENERIC_FACTORY_CONSTRUCTOR(nsWindow) NS_GENERIC_FACTORY_CONSTRUCTOR(nsWindow)
NS_GENERIC_FACTORY_CONSTRUCTOR(ChildWindow) NS_GENERIC_FACTORY_CONSTRUCTOR(ChildWindow)
NS_GENERIC_FACTORY_CONSTRUCTOR(PopupWindow) NS_GENERIC_FACTORY_CONSTRUCTOR(PopupWindow)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsAppShell)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsToolkit) NS_GENERIC_FACTORY_CONSTRUCTOR(nsToolkit)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsLookAndFeel) NS_GENERIC_FACTORY_CONSTRUCTOR(nsLookAndFeel)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsTransferable) NS_GENERIC_FACTORY_CONSTRUCTOR(nsTransferable)
@ -92,6 +98,10 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsNativeThemeQt)
*/ */
static const nsModuleComponentInfo components[] = static const nsModuleComponentInfo components[] =
{ {
{ "Qt AppShell",
NS_APPSHELL_CID,
"@mozilla.org/widget/appshell/qt;1",
nsAppShellConstructor }
/* /*
{ "Qt nsWindow", { "Qt nsWindow",
NS_WINDOW_CID, NS_WINDOW_CID,
@ -109,10 +119,6 @@ static const nsModuleComponentInfo components[] =
NS_NATIVESCROLLBAR_CID, NS_NATIVESCROLLBAR_CID,
"@mozilla.org/widget/nativescrollbar/qt;1", "@mozilla.org/widget/nativescrollbar/qt;1",
nsNativeScrollbarConstructor}, nsNativeScrollbarConstructor},
{ "Qt AppShell",
NS_APPSHELL_CID,
"@mozilla.org/widget/appshell/qt;1",
nsAppShellConstructor },
{ "Qt Toolkit", { "Qt Toolkit",
NS_TOOLKIT_CID, NS_TOOLKIT_CID,
"@mozilla.org/widget/toolkit/qt;1", "@mozilla.org/widget/toolkit/qt;1",