Remove qt toolkit support from the tree.
Use the QT_LAST_RITES tag to pull the last known "good" tree to continue work on the port. Bug #178987 r=bryner
This commit is contained in:
seawood%netscape.com
Родитель
b623f344d3
Коммит
abe8eafe58
|
|
@ -140,7 +140,6 @@ gfx/src/gtk/Makefile
|
|||
gfx/src/ps/Makefile
|
||||
gfx/src/photon/Makefile
|
||||
gfx/src/mac/Makefile
|
||||
gfx/src/qt/Makefile
|
||||
gfx/src/xlib/Makefile
|
||||
gfx/src/os2/Makefile
|
||||
gfx/src/xlibrgb/Makefile
|
||||
|
|
@ -522,7 +521,6 @@ webshell/tests/viewer/Makefile
|
|||
webshell/tests/viewer/public/Makefile
|
||||
webshell/tests/viewer/unix/Makefile
|
||||
webshell/tests/viewer/unix/gtk/Makefile
|
||||
webshell/tests/viewer/unix/qt/Makefile
|
||||
webshell/tests/viewer/unix/xlib/Makefile
|
||||
"
|
||||
|
||||
|
|
@ -542,7 +540,6 @@ widget/src/cocoa/Makefile
|
|||
widget/src/xlib/Makefile
|
||||
widget/src/os2/Makefile
|
||||
widget/src/os2/tests/Makefile
|
||||
widget/src/qt/Makefile
|
||||
widget/src/windows/Makefile
|
||||
widget/src/windows/expose/Makefile
|
||||
widget/src/windows/expose/ISimpleDOMNode/Makefile
|
||||
|
|
|
|||
|
|
@ -326,7 +326,6 @@ MOZ_TOOLKIT_REGISTRY_CFLAGS = \
|
|||
MOZ_ENABLE_GTK = @MOZ_ENABLE_GTK@
|
||||
MOZ_ENABLE_GTK2 = @MOZ_ENABLE_GTK2@
|
||||
MOZ_ENABLE_XLIB = @MOZ_ENABLE_XLIB@
|
||||
MOZ_ENABLE_QT = @MOZ_ENABLE_QT@
|
||||
MOZ_ENABLE_PHOTON = @MOZ_ENABLE_PHOTON@
|
||||
MOZ_ENABLE_COCOA = @MOZ_ENABLE_COCOA@
|
||||
MOZ_ENABLE_XREMOTE = @MOZ_ENABLE_XREMOTE@
|
||||
|
|
@ -340,9 +339,6 @@ MOZ_GTK2_LIBS = @MOZ_GTK2_LIBS@
|
|||
MOZ_XLIB_CFLAGS = @MOZ_XLIB_CFLAGS@
|
||||
MOZ_XLIB_LDFLAGS = @MOZ_XLIB_LDFLAGS@
|
||||
|
||||
MOZ_QT_CFLAGS = @MOZ_QT_CFLAGS@
|
||||
MOZ_QT_LDFLAGS = @MOZ_QT_LDFLAGS@
|
||||
|
||||
MOZ_XPRINT_CFLAGS = @MOZ_XPRINT_CFLAGS@
|
||||
MOZ_XPRINT_LDFLAGS = @MOZ_XPRINT_LDFLAGS@
|
||||
MOZ_ENABLE_XPRINT = @MOZ_ENABLE_XPRINT@
|
||||
|
|
|
|||
102
configure.in
102
configure.in
|
|
@ -87,8 +87,6 @@ GLIB_VERSION=1.2.0
|
|||
GTK_VERSION=1.2.0
|
||||
LIBIDL_VERSION=0.6.3
|
||||
PERL_VERSION=5.004
|
||||
QT_VERSION=2.2.0
|
||||
QT_VERSION_NUM=220
|
||||
LIBART_VERSION=2.3.4
|
||||
GTK2_VERSION=1.3.7
|
||||
|
||||
|
|
@ -676,11 +674,6 @@ if test "$GNU_CXX"; then
|
|||
# Turn on GNU specific features
|
||||
_WARNINGS_CXXFLAGS="${_WARNINGS_CXXFLAGS} -Wall -Wconversion -Wpointer-arith -Wcast-align -Woverloaded-virtual -Wsynth -Wno-ctor-dtor-privacy"
|
||||
|
||||
dnl The following warning breaks Qt
|
||||
if test ! "$QTDIR"; then
|
||||
_WARNINGS_CXXFLAGS="${_WARNINGS_CXXFLAGS}"
|
||||
fi
|
||||
|
||||
_DEFINES_CXXFLAGS='-DMOZILLA_CLIENT -include $(DEPTH)/mozilla-config.h'
|
||||
_USE_CPP_INCLUDE_FLAG=1
|
||||
else
|
||||
|
|
@ -2972,7 +2965,6 @@ MOZ_ARG_HEADER(Toolkit Options)
|
|||
[ _DEFAULT_TOOLKIT=$_PLATFORM_DEFAULT_TOOLKIT])
|
||||
|
||||
if test "$_DEFAULT_TOOLKIT" = "gtk" \
|
||||
-o "$_DEFAULT_TOOLKIT" = "qt" \
|
||||
-o "$_DEFAULT_TOOLKIT" = "gtk2" \
|
||||
-o "$_DEFAULT_TOOLKIT" = "xlib" \
|
||||
-o "$_DEFAULT_TOOLKIT" = "os2" \
|
||||
|
|
@ -2987,7 +2979,7 @@ MOZ_ARG_HEADER(Toolkit Options)
|
|||
MOZ_WIDGET_TOOLKIT=`echo "$_DEFAULT_TOOLKIT" | sed -e "s/,.*$//"`
|
||||
else
|
||||
if test "$no_x" != "yes"; then
|
||||
AC_MSG_ERROR([Toolkit must be xlib, gtk, gtk2 or qt.])
|
||||
AC_MSG_ERROR([Toolkit must be xlib, gtk or gtk2.])
|
||||
else
|
||||
AC_MSG_ERROR([Toolkit must be $_PLATFORM_DEFAULT_TOOLKIT.])
|
||||
fi
|
||||
|
|
@ -3011,14 +3003,6 @@ if test "$no_x" != "yes"; then
|
|||
MOZ_ENABLE_XLIB=1,
|
||||
MOZ_ENABLE_XLIB= )
|
||||
|
||||
dnl ========================================================
|
||||
dnl = Qt support hackery =
|
||||
dnl ========================================================
|
||||
MOZ_ARG_ENABLE_BOOL(toolkit-qt,
|
||||
[ --enable-toolkit-qt Enable Qt Toolkit support ],
|
||||
MOZ_ENABLE_QT=1,
|
||||
MOZ_ENABLE_QT= )
|
||||
|
||||
fi # !no_x
|
||||
|
||||
AC_DEFINE_UNQUOTED(MOZ_DEFAULT_TOOLKIT,"$MOZ_WIDGET_TOOLKIT")
|
||||
|
|
@ -3052,14 +3036,6 @@ xlib)
|
|||
AC_DEFINE(MOZ_WIDGET_XLIB)
|
||||
;;
|
||||
|
||||
qt)
|
||||
MOZ_ENABLE_QT=1
|
||||
MOZ_ENABLE_XREMOTE=1
|
||||
TK_CFLAGS='$(MOZ_QT_CFLAGS)'
|
||||
TK_LIBS='$(MOZ_QT_LDFLAGS)'
|
||||
AC_DEFINE(MOZ_WIDGET_QT)
|
||||
;;
|
||||
|
||||
photon)
|
||||
MOZ_ENABLE_PHOTON=1
|
||||
AC_DEFINE(MOZ_WIDGET_PHOTON)
|
||||
|
|
@ -3117,77 +3093,6 @@ then
|
|||
MOZ_XLIB_LDFLAGS="$MOZ_XLIB_LDFLAGS $XEXT_LIBS $X11_LIBS"
|
||||
fi
|
||||
|
||||
if test "$MOZ_ENABLE_QT"
|
||||
then
|
||||
MOZ_ARG_WITH_STRING(qtdir,
|
||||
[ --with-qtdir=\$dir Specify Qt directory ],
|
||||
[ QTDIR=$withval])
|
||||
|
||||
if test -z "$QTDIR"; then
|
||||
QTDIR="/usr"
|
||||
fi
|
||||
QTINCDIR="/include/qt"
|
||||
if test ! -d "$QTDIR$QTINCDIR"; then
|
||||
QTINCDIR="/include/X11/qt"
|
||||
fi
|
||||
if test ! -d "$QTDIR$QTINCDIR"; then
|
||||
QTINCDIR="/include"
|
||||
fi
|
||||
|
||||
if test -x "$QTDIR/bin/moc"; then
|
||||
HOST_MOC="$QTDIR/bin/moc"
|
||||
else
|
||||
AC_CHECK_PROGS(HOST_MOC, moc, "")
|
||||
fi
|
||||
if test -z "$HOST_MOC"; then
|
||||
AC_MSG_ERROR([no acceptable moc preprocessor found])
|
||||
fi
|
||||
MOC=$HOST_MOC
|
||||
|
||||
QT_CFLAGS="-I${QTDIR}${QTINCDIR} -DQT_GENUINE_STR -DQT_NO_STL"
|
||||
if test -z "$MOZ_DEBUG"; then
|
||||
QT_CFLAGS="$QT_CFLAGS -DQT_NO_DEBUG -DNO_DEBUG"
|
||||
fi
|
||||
_SAVE_LDFLAGS=$LDFLAGS
|
||||
QT_LDFLAGS=-L${QTDIR}/lib
|
||||
LDFLAGS="$LDFLAGS $QT_LDFLAGS"
|
||||
AC_LANG_SAVE
|
||||
AC_LANG_CPLUSPLUS
|
||||
AC_CHECK_LIB(qt, main, QT_LIB=-lqt,
|
||||
AC_CHECK_LIB(qt-mt, main, QT_LIB=-lqt-mt,
|
||||
AC_MSG_ERROR([Cannot find QT libraries.])))
|
||||
LDFLAGS=$_SAVE_LDFLAGS
|
||||
QT_LIBS="-L/usr/X11R6/lib $QT_LDFLAGS $QT_LIB -lXext -lX11"
|
||||
dnl AM_PATH_QT($QT_VERSION,,
|
||||
dnl AC_MSG_ERROR(Test for QT failed.))
|
||||
|
||||
MOZ_QT_LDFLAGS=$QT_LIBS
|
||||
MOZ_QT_CFLAGS=$QT_CFLAGS
|
||||
|
||||
_SAVE_CXXFLAGS=$CXXFLAGS
|
||||
_SAVE_LIBS=$LIBS
|
||||
|
||||
CXXFLAGS="$CXXFLAGS $QT_CFLAGS"
|
||||
LIBS="$LIBS $QT_LIBS"
|
||||
|
||||
AC_MSG_CHECKING(Qt - version >= $QT_VERSION)
|
||||
AC_TRY_COMPILE([#include <qglobal.h>],
|
||||
[
|
||||
#if (QT_VERSION < $QT_VERSION_NUM)
|
||||
#error "QT_VERSION too old"
|
||||
#endif
|
||||
],result="yes",result="no")
|
||||
|
||||
AC_MSG_RESULT("$result")
|
||||
if test "$result" = "no"; then
|
||||
AC_MSG_ERROR([Qt Mozilla requires at least version $QT_VERSION of Qt])
|
||||
fi
|
||||
CXXFLAGS=$_SAVE_CXXFLAGS
|
||||
LIBS=$_SAVE_LIBS
|
||||
|
||||
AC_LANG_RESTORE
|
||||
fi
|
||||
|
||||
AC_SUBST(MOZ_DEFAULT_TOOLKIT)
|
||||
|
||||
AC_SUBST(GTK_CONFIG)
|
||||
|
|
@ -3197,7 +3102,6 @@ AC_SUBST(TK_LIBS)
|
|||
AC_SUBST(MOZ_ENABLE_GTK)
|
||||
AC_SUBST(MOZ_ENABLE_XLIB)
|
||||
AC_SUBST(MOZ_ENABLE_GTK2)
|
||||
AC_SUBST(MOZ_ENABLE_QT)
|
||||
AC_SUBST(MOZ_ENABLE_PHOTON)
|
||||
AC_SUBST(MOZ_ENABLE_COCOA)
|
||||
AC_SUBST(MOZ_ENABLE_XREMOTE)
|
||||
|
|
@ -3207,12 +3111,10 @@ AC_SUBST(MOZ_GTK2_CFLAGS)
|
|||
AC_SUBST(MOZ_GTK2_LIBS)
|
||||
AC_SUBST(MOZ_XLIB_CFLAGS)
|
||||
AC_SUBST(MOZ_XLIB_LDFLAGS)
|
||||
AC_SUBST(MOZ_QT_CFLAGS)
|
||||
AC_SUBST(MOZ_QT_LDFLAGS)
|
||||
|
||||
AC_SUBST(MOC)
|
||||
|
||||
if test "$MOZ_ENABLE_GTK" || test "$MOZ_ENABLE_QT" \
|
||||
if test "$MOZ_ENABLE_GTK" \
|
||||
|| test "$MOZ_ENABLE_XLIB" \
|
||||
|| test "$MOZ_ENABLE_GTK2"
|
||||
then
|
||||
|
|
|
|||
|
|
@ -71,9 +71,6 @@ endif
|
|||
ifdef MOZ_ENABLE_GTK2
|
||||
DIRS += gtk
|
||||
endif
|
||||
ifdef MOZ_ENABLE_QT
|
||||
DIRS += qt
|
||||
endif
|
||||
ifdef MOZ_ENABLE_XLIB
|
||||
DIRS += xlib
|
||||
endif
|
||||
|
|
|
|||
|
|
@ -155,9 +155,3 @@ CFLAGS += $(TK_CFLAGS)
|
|||
endif #MOZ_MONOLITHIC_TOOLKIT
|
||||
endif #MOZ_ENABLE_XLIB
|
||||
|
||||
ifdef MOZ_ENABLE_QT
|
||||
EXTRA_DSO_LDOPTS += $(MOZ_QT_LDFLAGS)
|
||||
CXXFLAGS += $(MOZ_QT_CFLAGS)
|
||||
CFLAGS += $(MOZ_QT_CFLAGS)
|
||||
endif #MOZ_ENABLE_QT
|
||||
|
||||
|
|
|
|||
|
|
@ -41,11 +41,6 @@
|
|||
|
||||
#include "nscore.h"
|
||||
#include "nsPluginHostImpl.h"
|
||||
#ifdef MOZ_WIDGET_QT
|
||||
#undef CursorShape /*X.h defines it as 0,
|
||||
qnamespace.h makes an enum type by that name
|
||||
*/
|
||||
#endif
|
||||
#include <stdio.h>
|
||||
#include "prio.h"
|
||||
#include "prmem.h"
|
||||
|
|
@ -171,8 +166,6 @@
|
|||
#ifdef XP_UNIX
|
||||
#if defined(MOZ_WIDGET_GTK) || defined (MOZ_WIDGET_GTK2)
|
||||
#include <gdk/gdkx.h> // for GDK_DISPLAY()
|
||||
#elif defined(MOZ_WIDGET_QT)
|
||||
#include <qwindowdefs.h> // for qt_xdisplay()
|
||||
#elif defined(MOZ_WIDGET_XLIB)
|
||||
#include "xlibrgb.h" // for xlib_rgb_get_display()
|
||||
#endif
|
||||
|
|
@ -2653,8 +2646,6 @@ NS_IMETHODIMP nsPluginHostImpl::GetValue(nsPluginManagerVariable aVariable, void
|
|||
Display** value = NS_REINTERPRET_CAST(Display**, aValue);
|
||||
#if defined(MOZ_WIDGET_GTK) || defined (MOZ_WIDGET_GTK2)
|
||||
*value = GDK_DISPLAY();
|
||||
#elif defined(MOZ_WIDGET_QT)
|
||||
*value = qt_xdisplay();
|
||||
#elif defined(MOZ_WIDGET_XLIB)
|
||||
*value = xxlib_rgb_get_display(xxlib_find_handle(XXLIBRGB_DEFAULT_HANDLE));
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -1,8 +0,0 @@
|
|||
Makefile
|
||||
viewer
|
||||
viewer_gtk
|
||||
viewer_xlib
|
||||
viewer_qt
|
||||
viewer_motif
|
||||
|
||||
|
||||
|
|
@ -155,7 +155,6 @@ LIBS = \
|
|||
$(PROFILER_LIBS) \
|
||||
$(NULL)
|
||||
|
||||
QT_LIBS = unix/qt/libviewer_qt_s.a $(XP_LIBS) $(MOZ_QT_LDFLAGS)
|
||||
XLIB_LIBS = unix/xlib/libviewer_xlib_s.a $(XP_LIBS) $(MOZ_XLIB_LDFLAGS)
|
||||
GTK_LIBS = unix/gtk/libviewer_gtk_s.a -lgtksuperwin $(XP_LIBS) $(MOZ_GTK_LDFLAGS)
|
||||
|
||||
|
|
@ -189,7 +188,6 @@ ifneq ($(OS_ARCH),WINNT)
|
|||
EXTRA_LIBS += -L$(DEPTH)/dist/lib/components
|
||||
endif # !WINNT
|
||||
EXTRA_LIBS += $(EXTRA_DSO_LIBS) $(STATIC_EXTRA_LIBS)
|
||||
QT_LIBS += $(EXTRA_LIBS)
|
||||
XLIB_LIBS += $(EXTRA_LIBS)
|
||||
GTK_LIBS += $(EXTRA_LIBS)
|
||||
DEFINES += $(STATIC_DEFINES)
|
||||
|
|
@ -216,7 +214,7 @@ ifeq ($(OS_ARCH),WINNT)
|
|||
DEFINES += -DUSE_LOCAL_WIDGETS
|
||||
endif
|
||||
|
||||
GARBAGE += $(PROGRAM)_gtk $(PROGRAM)_qt $(PROGRAM)_xlib
|
||||
GARBAGE += $(PROGRAM)_gtk $(PROGRAM)_xlib
|
||||
|
||||
ifeq ($(OS_ARCH),WINNT)
|
||||
OS_LIBS += shell32.lib ole32.lib oleaut32.lib oleacc.lib \
|
||||
|
|
@ -238,9 +236,6 @@ endif
|
|||
unix/gtk/libviewer_gtk_s.a:
|
||||
@$(MAKE) -C $(@D) $(@F)
|
||||
|
||||
unix/qt/libviewer_qt_s.a:
|
||||
@$(MAKE) -C $(@D) $(@F)
|
||||
|
||||
unix/xlib/libviewer_xlib_s.a:
|
||||
@$(MAKE) -C $(@D) $(@F)
|
||||
|
||||
|
|
@ -250,12 +245,6 @@ ifdef ENABLE_STRIP
|
|||
$(STRIP) $@
|
||||
endif
|
||||
|
||||
$(PROGRAM)_qt: $(PROGOBJS) $(EXTRA_DEPS) Makefile Makefile.in unix/qt/libviewer_qt_s.a
|
||||
$(CCC) $(CXXFLAGS) -o $@ $(PROGOBJS) $(LDFLAGS) $(LIBS_DIR) $(QT_LIBS) $(OS_LIBS) $(PROFILER_LIBS)
|
||||
ifdef ENABLE_STRIP
|
||||
$(STRIP) $@
|
||||
endif
|
||||
|
||||
$(PROGRAM)_xlib: $(PROGOBJS) $(EXTRA_DEPS) Makefile Makefile.in unix/xlib/libviewer_xlib_s.a
|
||||
$(CCC) $(CXXFLAGS) -o $@ $(PROGOBJS) $(LDFLAGS) $(LIBS_DIR) $(XLIB_LIBS) $(OS_LIBS) $(PROFILER_LIBS)
|
||||
ifdef ENABLE_STRIP
|
||||
|
|
@ -267,11 +256,6 @@ libs:: $(PROGRAM)_gtk
|
|||
$(INSTALL) -m 555 $< $(DIST)/bin
|
||||
endif
|
||||
|
||||
ifdef MOZ_ENABLE_QT
|
||||
libs:: $(PROGRAM)_qt
|
||||
$(INSTALL) -m 555 $< $(DIST)/bin
|
||||
endif
|
||||
|
||||
ifdef MOZ_ENABLE_XLIB
|
||||
libs:: $(PROGRAM)_xlib
|
||||
$(INSTALL) -m 555 $< $(DIST)/bin
|
||||
|
|
|
|||
|
|
@ -62,10 +62,6 @@ DIRS += xlibxtbin
|
|||
DIRS += xlib
|
||||
endif
|
||||
|
||||
ifdef MOZ_ENABLE_QT
|
||||
DIRS += qt
|
||||
endif
|
||||
|
||||
ifdef MOZ_ENABLE_PHOTON
|
||||
DIRS += photon
|
||||
endif
|
||||
|
|
|
|||
|
|
@ -1,46 +0,0 @@
|
|||
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
|
||||
*
|
||||
* The contents of this file are subject to the Mozilla Public
|
||||
* License Version 1.1 (the "License"); you may not use this file
|
||||
* except in compliance with the License. You may obtain a copy of
|
||||
* the License at http://www.mozilla.org/MPL/
|
||||
*
|
||||
* Software distributed under the License is distributed on an "AS
|
||||
* IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
|
||||
* implied. See the License for the specific language governing
|
||||
* rights and limitations under the License.
|
||||
*
|
||||
* The Original Code is IBM code.
|
||||
*
|
||||
* The Initial Developer of the Original Code is IBM.
|
||||
* Portions created by IBM are
|
||||
* Copyright (C) International Business Machines
|
||||
* Corporation, 2000. All Rights Reserved.
|
||||
*
|
||||
* Contributor(s): Simon Montagu
|
||||
*/
|
||||
|
||||
#include "nsBidiKeyboard.h"
|
||||
|
||||
NS_IMPL_ISUPPORTS1(nsBidiKeyboard, nsIBidiKeyboard)
|
||||
|
||||
nsBidiKeyboard::nsBidiKeyboard() : nsIBidiKeyboard()
|
||||
{
|
||||
}
|
||||
|
||||
nsBidiKeyboard::~nsBidiKeyboard()
|
||||
{
|
||||
}
|
||||
|
||||
NS_IMETHODIMP nsBidiKeyboard::IsLangRTL(PRBool *aIsRTL)
|
||||
{
|
||||
*aIsRTL = PR_FALSE;
|
||||
// XXX Insert platform specific code to determine keyboard direction
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
NS_IMETHODIMP nsBidiKeyboard::SetLangFromBidiLevel(PRUint8 aLevel)
|
||||
{
|
||||
// XXX Insert platform specific code to set keyboard language
|
||||
return NS_OK;
|
||||
}
|
||||
|
|
@ -1,39 +0,0 @@
|
|||
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
|
||||
*
|
||||
* The contents of this file are subject to the Mozilla Public
|
||||
* License Version 1.1 (the "License"); you may not use this file
|
||||
* except in compliance with the License. You may obtain a copy of
|
||||
* the License at http://www.mozilla.org/MPL/
|
||||
*
|
||||
* Software distributed under the License is distributed on an "AS
|
||||
* IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
|
||||
* implied. See the License for the specific language governing
|
||||
* rights and limitations under the License.
|
||||
*
|
||||
* The Original Code is IBM code.
|
||||
*
|
||||
* The Initial Developer of the Original Code is IBM.
|
||||
* Portions created by IBM are
|
||||
* Copyright (C) International Business Machines
|
||||
* Corporation, 2000. All Rights Reserved.
|
||||
*
|
||||
* Contributor(s): Simon Montagu
|
||||
*/
|
||||
|
||||
#ifndef __nsBidiKeyboard
|
||||
#define __nsBidiKeyboard
|
||||
#include "nsIBidiKeyboard.h"
|
||||
|
||||
class nsBidiKeyboard : public nsIBidiKeyboard
|
||||
{
|
||||
public:
|
||||
NS_DECL_ISUPPORTS
|
||||
NS_DECL_NSIBIDIKEYBOARD
|
||||
|
||||
nsBidiKeyboard();
|
||||
virtual ~nsBidiKeyboard();
|
||||
/* additional members */
|
||||
};
|
||||
|
||||
|
||||
#endif // __nsBidiKeyboard
|
||||
|
|
@ -1,89 +0,0 @@
|
|||
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
||||
/* ***** BEGIN LICENSE BLOCK *****
|
||||
* Version: NPL 1.1/GPL 2.0/LGPL 2.1
|
||||
*
|
||||
* The contents of this file are subject to the Netscape Public License
|
||||
* Version 1.1 (the "License"); you may not use this file except in
|
||||
* compliance with the License. You may obtain a copy of the License at
|
||||
* http://www.mozilla.org/NPL/
|
||||
*
|
||||
* Software distributed under the License is distributed on an "AS IS" basis,
|
||||
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
||||
* for the specific language governing rights and limitations under the
|
||||
* License.
|
||||
*
|
||||
* The Original Code is mozilla.org code.
|
||||
*
|
||||
* The Initial Developer of the Original Code is
|
||||
* Netscape Communications Corporation.
|
||||
* Portions created by the Initial Developer are Copyright (C) 1998
|
||||
* the Initial Developer. All Rights Reserved.
|
||||
*
|
||||
* Contributor(s):
|
||||
* Denis Issoupov <denis@macadamian.com>
|
||||
*
|
||||
* Alternatively, the contents of this file may be used under the terms of
|
||||
* either the GNU General Public License Version 2 or later (the "GPL"), or
|
||||
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
||||
* in which case the provisions of the GPL or the LGPL are applicable instead
|
||||
* of those above. If you wish to allow use of your version of this file only
|
||||
* under the terms of either the GPL or the LGPL, and not to allow others to
|
||||
* use your version of this file under the terms of the NPL, indicate your
|
||||
* decision by deleting the provisions above and replace them with the notice
|
||||
* and other provisions required by the GPL or the LGPL. If you do not delete
|
||||
* the provisions above, a recipient may use your version of this file under
|
||||
* the terms of any one of the NPL, the GPL or the LGPL.
|
||||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
#ifndef nsDragService_h__
|
||||
#define nsDragService_h__
|
||||
|
||||
#include "nsBaseDragService.h"
|
||||
#include "nsClipboard.h"
|
||||
#include "nsIDragSessionQt.h"
|
||||
|
||||
#include <qwidget.h>
|
||||
#include <qdragobject.h>
|
||||
|
||||
//----------------------------------------------------------
|
||||
/* Native Qt DragService wrapper */
|
||||
class nsDragService : public nsBaseDragService, public nsIDragSessionQt
|
||||
{
|
||||
public:
|
||||
nsDragService();
|
||||
virtual ~nsDragService();
|
||||
|
||||
//nsISupports
|
||||
NS_DECL_ISUPPORTS_INHERITED
|
||||
|
||||
//nsIDragService
|
||||
NS_IMETHOD InvokeDragSession(nsIDOMNode *aDOMNode,
|
||||
nsISupportsArray *anArrayTransferables,
|
||||
nsIScriptableRegion *aRegion,
|
||||
PRUint32 aActionType);
|
||||
NS_IMETHOD StartDragSession();
|
||||
NS_IMETHOD EndDragSession();
|
||||
|
||||
// nsIDragSession
|
||||
NS_IMETHOD SetCanDrop(PRBool aCanDrop);
|
||||
NS_IMETHOD GetCanDrop(PRBool *aCanDrop);
|
||||
NS_IMETHOD GetNumDropItems(PRUint32 *aNumItems);
|
||||
NS_IMETHOD GetData(nsITransferable *aTransferable,PRUint32 aItemIndex);
|
||||
NS_IMETHOD IsDataFlavorSupported(const char *aDataFlavor,PRBool *_retval);
|
||||
|
||||
// nsIDragSessionQt
|
||||
NS_IMETHOD SetDragReference(QMimeSource* aDragRef);
|
||||
|
||||
protected:
|
||||
QDragObject *RegisterDragFlavors(nsITransferable* transferable);
|
||||
|
||||
private:
|
||||
// the source of our drags
|
||||
QWidget *mHiddenWidget;
|
||||
QDragObject *mDragObject;
|
||||
|
||||
// our source data items
|
||||
nsCOMPtr<nsISupportsArray> mSourceDataItems;
|
||||
};
|
||||
|
||||
#endif // nsDragService_h__
|
||||
|
|
@ -1,61 +0,0 @@
|
|||
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
||||
/* ***** BEGIN LICENSE BLOCK *****
|
||||
* Version: NPL 1.1/GPL 2.0/LGPL 2.1
|
||||
*
|
||||
* The contents of this file are subject to the Netscape Public License
|
||||
* Version 1.1 (the "License"); you may not use this file except in
|
||||
* compliance with the License. You may obtain a copy of the License at
|
||||
* http://www.mozilla.org/NPL/
|
||||
*
|
||||
* Software distributed under the License is distributed on an "AS IS" basis,
|
||||
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
||||
* for the specific language governing rights and limitations under the
|
||||
* License.
|
||||
*
|
||||
* The Original Code is mozilla.org code.
|
||||
*
|
||||
* The Initial Developer of the Original Code is
|
||||
* Netscape Communications Corporation.
|
||||
* Portions created by the Initial Developer are Copyright (C) 1998
|
||||
* the Initial Developer. All Rights Reserved.
|
||||
*
|
||||
* Contributor(s):
|
||||
* Denis Issoupov <denis@macadamian.com>
|
||||
*
|
||||
* Alternatively, the contents of this file may be used under the terms of
|
||||
* either the GNU General Public License Version 2 or later (the "GPL"), or
|
||||
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
||||
* in which case the provisions of the GPL or the LGPL are applicable instead
|
||||
* of those above. If you wish to allow use of your version of this file only
|
||||
* under the terms of either the GPL or the LGPL, and not to allow others to
|
||||
* use your version of this file under the terms of the NPL, indicate your
|
||||
* decision by deleting the provisions above and replace them with the notice
|
||||
* and other provisions required by the GPL or the LGPL. If you do not delete
|
||||
* the provisions above, a recipient may use your version of this file under
|
||||
* the terms of any one of the NPL, the GPL or the LGPL.
|
||||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
#ifndef nsIDragSessionQt_h__
|
||||
#define nsIDragSessionQt_h__
|
||||
|
||||
#include "nsISupports.h"
|
||||
#include <qdragobject.h>
|
||||
|
||||
#define NS_IDRAGSESSIONQT_IID \
|
||||
{ 0x36c4c381, 0x09e3, 0x11d4, { 0xb0, 0x33, 0xa4, 0x20, 0xf4, 0x2c, 0xfd, 0x7c } };
|
||||
|
||||
class nsIDragSessionQt : public nsISupports
|
||||
{
|
||||
public:
|
||||
NS_DEFINE_STATIC_IID_ACCESSOR(NS_IDRAGSESSIONQT_IID)
|
||||
|
||||
/**
|
||||
* Since the drag may originate in an external application, we need some
|
||||
* way of communicating the QDragObject to the session so it can use it
|
||||
* when filling in data requests.
|
||||
*
|
||||
*/
|
||||
NS_IMETHOD SetDragReference(QMimeSource* aDragRef) = 0;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
|
@ -1,58 +0,0 @@
|
|||
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
||||
/* ***** BEGIN LICENSE BLOCK *****
|
||||
* Version: NPL 1.1/GPL 2.0/LGPL 2.1
|
||||
*
|
||||
* The contents of this file are subject to the Netscape Public License
|
||||
* Version 1.1 (the "License"); you may not use this file except in
|
||||
* compliance with the License. You may obtain a copy of the License at
|
||||
* http://www.mozilla.org/NPL/
|
||||
*
|
||||
* Software distributed under the License is distributed on an "AS IS" basis,
|
||||
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
||||
* for the specific language governing rights and limitations under the
|
||||
* License.
|
||||
*
|
||||
* The Original Code is mozilla.org code.
|
||||
*
|
||||
* The Initial Developer of the Original Code is
|
||||
* Netscape Communications Corporation.
|
||||
* Portions created by the Initial Developer are Copyright (C) 1998
|
||||
* the Initial Developer. All Rights Reserved.
|
||||
*
|
||||
* Contributor(s):
|
||||
* John C. Griggs <johng@corel.com>
|
||||
*
|
||||
* Alternatively, the contents of this file may be used under the terms of
|
||||
* either the GNU General Public License Version 2 or later (the "GPL"), or
|
||||
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
||||
* in which case the provisions of the GPL or the LGPL are applicable instead
|
||||
* of those above. If you wish to allow use of your version of this file only
|
||||
* under the terms of either the GPL or the LGPL, and not to allow others to
|
||||
* use your version of this file under the terms of the NPL, indicate your
|
||||
* decision by deleting the provisions above and replace them with the notice
|
||||
* and other provisions required by the GPL or the LGPL. If you do not delete
|
||||
* the provisions above, a recipient may use your version of this file under
|
||||
* the terms of any one of the NPL, the GPL or the LGPL.
|
||||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
#ifndef nsToolkit_h__
|
||||
#define nsToolkit_h__
|
||||
|
||||
#include "nsIToolkit.h"
|
||||
|
||||
/**
|
||||
* Wrapper around the thread running the message pump.
|
||||
* The toolkit abstraction is necessary because the message pump must
|
||||
* execute within the same thread that created the widget under Win32.
|
||||
*/
|
||||
class nsToolkit : public nsIToolkit
|
||||
{
|
||||
public:
|
||||
nsToolkit();
|
||||
virtual ~nsToolkit();
|
||||
|
||||
NS_DECL_ISUPPORTS
|
||||
NS_IMETHOD Init(PRThread *aThread);
|
||||
};
|
||||
|
||||
#endif // nsToolkit_h__
|
||||
Загрузка…
Ссылка в новой задаче