diff --git a/mozilla/browser/app/Makefile.in b/mozilla/browser/app/Makefile.in index 84505eeb6db..487a59f6a45 100644 --- a/mozilla/browser/app/Makefile.in +++ b/mozilla/browser/app/Makefile.in @@ -130,7 +130,7 @@ LIBS += \ $(NULL) # Add explicit X11 dependency when building against X11 toolkits -ifneq (,$(filter gtk gtk2 xlib,$(MOZ_WIDGET_TOOLKIT))) +ifneq (,$(filter gtk2,$(MOZ_WIDGET_TOOLKIT))) LIBS += $(XLDFLAGS) $(XLIBS) ifdef MOZ_ENABLE_CAIRO_GFX LIBS += $(ZLIB_LIBS) @@ -288,7 +288,7 @@ GARBAGE += $(addprefix $(DIST)/bin/defaults/pref/, firefox.js) endif -ifneq (,$(filter gtk gtk2,$(MOZ_WIDGET_TOOLKIT))) +ifneq (,$(filter gtk2,$(MOZ_WIDGET_TOOLKIT))) ICON_FILES = \ $(DIST)/branding/mozicon128.png \ @@ -328,7 +328,7 @@ ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT))) cp $(srcdir)/macbuild/disk.icns $(DIST)/branding/disk.icns cp $(srcdir)/macbuild/license.r $(DIST)/branding/license.r endif -ifneq (,$(filter gtk gtk2,$(MOZ_WIDGET_TOOLKIT))) +ifneq (,$(filter gtk2,$(MOZ_WIDGET_TOOLKIT))) cp $(srcdir)/mozicon128.png $(DIST)/branding/mozicon128.png cp $(srcdir)/mozicon16.xpm $(DIST)/branding/mozicon16.xpm cp $(srcdir)/mozicon50.xpm $(DIST)/branding/mozicon50.xpm diff --git a/mozilla/browser/base/content/browser.js b/mozilla/browser/base/content/browser.js index 4bba83606de..4195e6295ec 100644 --- a/mozilla/browser/base/content/browser.js +++ b/mozilla/browser/base/content/browser.js @@ -868,9 +868,6 @@ function BrowserStartup() if ((screen.availWidth / 2) >= 800) defaultWidth = (screen.availWidth / 2) - 20; defaultHeight = screen.availHeight - 10; -#ifdef MOZ_WIDGET_GTK -#define USE_HEIGHT_ADJUST -#endif #ifdef MOZ_WIDGET_GTK2 #define USE_HEIGHT_ADJUST #endif diff --git a/mozilla/browser/branding/unofficial/Makefile.in b/mozilla/browser/branding/unofficial/Makefile.in index f80437bc2b2..c19936e91c7 100644 --- a/mozilla/browser/branding/unofficial/Makefile.in +++ b/mozilla/browser/branding/unofficial/Makefile.in @@ -31,7 +31,7 @@ BROWSER_APP_FILES = \ export:: $(NSINSTALL) -D $(DIST)/branding cp $(addprefix $(srcdir)/, $(BROWSER_APP_FILES)) $(DIST)/branding/ -ifneq (,$(filter gtk gtk2,$(MOZ_WIDGET_TOOLKIT))) +ifneq (,$(filter gtk2,$(MOZ_WIDGET_TOOLKIT))) cp $(srcdir)/document.png $(DIST)/branding/document.png $(NSINSTALL) -D $(DIST)/install cp $(srcdir)/header.png $(DIST)/install/header.png diff --git a/mozilla/config/autoconf.mk.in b/mozilla/config/autoconf.mk.in index 3eb96b28451..8be6e6f7207 100644 --- a/mozilla/config/autoconf.mk.in +++ b/mozilla/config/autoconf.mk.in @@ -456,17 +456,12 @@ CAIRO_FT_CFLAGS = @CAIRO_FT_CFLAGS@ MOZ_ENABLE_CAIRO_GFX = @MOZ_ENABLE_CAIRO_GFX@ MOZ_ENABLE_CAIRO_FT = @MOZ_ENABLE_CAIRO_FT@ MOZ_ENABLE_GLITZ = @MOZ_ENABLE_GLITZ@ -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@ -MOZ_GTK_CFLAGS = @MOZ_GTK_CFLAGS@ -MOZ_GTK_LDFLAGS = @MOZ_GTK_LDFLAGS@ - MOZ_GTK2_CFLAGS = @MOZ_GTK2_CFLAGS@ MOZ_GTK2_LIBS = @MOZ_GTK2_LIBS@ @@ -474,9 +469,6 @@ MOZ_DBUS_GLIB_CFLAGS = @MOZ_DBUS_GLIB_CFLAGS@ MOZ_DBUS_GLIB_LIBS = @MOZ_DBUS_GLIB_LIBS@ MOZ_ENABLE_DBUS = @MOZ_ENABLE_DBUS@ -MOZ_XLIB_CFLAGS = @MOZ_XLIB_CFLAGS@ -MOZ_XLIB_LDFLAGS = @MOZ_XLIB_LDFLAGS@ - MOZ_QT_CFLAGS = @MOZ_QT_CFLAGS@ MOZ_QT_LDFLAGS = @MOZ_QT_LDFLAGS@ diff --git a/mozilla/config/config.mk b/mozilla/config/config.mk index e4d6c415be8..a7cccba8bd4 100644 --- a/mozilla/config/config.mk +++ b/mozilla/config/config.mk @@ -474,7 +474,7 @@ ifeq ($(OS_TARGET),WIN95) MAKE_JARS_FLAGS += -l endif -ifneq (,$(filter gtk gtk2 xlib,$(MOZ_WIDGET_TOOLKIT))) +ifneq (,$(filter gtk2,$(MOZ_WIDGET_TOOLKIT))) MAKE_JARS_FLAGS += -x endif diff --git a/mozilla/config/rules.mk b/mozilla/config/rules.mk index 5d993edbd8a..6f938a9ffeb 100644 --- a/mozilla/config/rules.mk +++ b/mozilla/config/rules.mk @@ -1859,12 +1859,12 @@ _JAR_REGCHROME_DISABLE_JAR=0 endif REGCHROME = $(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/add-chrome.pl \ - $(if $(filter gtk gtk2 xlib,$(MOZ_WIDGET_TOOLKIT)),-x) \ + $(if $(filter gtk2,$(MOZ_WIDGET_TOOLKIT)),-x) \ $(if $(CROSS_COMPILE),-o $(OS_ARCH)) $(FINAL_TARGET)/chrome/installed-chrome.txt \ $(_JAR_REGCHROME_DISABLE_JAR) REGCHROME_INSTALL = $(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/add-chrome.pl \ - $(if $(filter gtk gtk2 xlib,$(MOZ_WIDGET_TOOLKIT)),-x) \ + $(if $(filter gtk2,$(MOZ_WIDGET_TOOLKIT)),-x) \ $(if $(CROSS_COMPILE),-o $(OS_ARCH)) $(DESTDIR)$(mozappdir)/chrome/installed-chrome.txt \ $(_JAR_REGCHROME_DISABLE_JAR) diff --git a/mozilla/config/static-config.mk b/mozilla/config/static-config.mk index 3cd7dfcaf5c..8d3efe1b956 100644 --- a/mozilla/config/static-config.mk +++ b/mozilla/config/static-config.mk @@ -97,16 +97,10 @@ ifdef MOZ_ENABLE_XINERAMA STATIC_EXTRA_LIBS += $(MOZ_XINERAMA_LIBS) endif -ifneq (,$(MOZ_ENABLE_GTK)$(MOZ_ENABLE_GTK2)$(MOZ_ENABLE_XLIB)) +ifneq (,$(MOZ_ENABLE_GTK2)) STATIC_EXTRA_LIBS += $(XLDFLAGS) $(XT_LIBS) endif -ifeq ($(MOZ_WIDGET_TOOLKIT),xlib) -STATIC_EXTRA_LIBS += \ - $(MOZ_XIE_LIBS) \ - $(NULL) -endif - ifdef MOZ_ENABLE_XPRINT STATIC_EXTRA_LIBS += $(MOZ_XPRINT_LDFLAGS) endif diff --git a/mozilla/configure.in b/mozilla/configure.in index ec00b2aa85e..eecc3fa1abb 100644 --- a/mozilla/configure.in +++ b/mozilla/configure.in @@ -4615,16 +4615,6 @@ cairo-os2) TK_LIBS='$(MOZ_CAIRO_LIBS)' ;; -cairo-xlib) - MOZ_WIDGET_TOOLKIT=xlib - MOZ_GFX_TOOLKIT=cairo - MOZ_ENABLE_CAIRO_GFX=1 - MOZ_ENABLE_XLIB=1 - TK_CFLAGS='$(MOZ_XLIB_CFLAGS) $(MOZ_CAIRO_FLAGS)' - TK_LIBS='$(MOZ_XLIB_LDFLAGS) $(MOZ_CAIRO_LIBS)' - AC_DEFINE(MOZ_WIDGET_XLIB) - ;; - cairo-mac|cairo-cocoa) if test "$MOZ_WIDGET_TOOLKIT" = "cairo-cocoa"; then MOZ_WIDGET_TOOLKIT=cocoa @@ -4651,27 +4641,11 @@ if test "$MOZ_ENABLE_XREMOTE"; then fi if test "$COMPILE_ENVIRONMENT"; then -if test "$MOZ_ENABLE_GTK" -then - AM_PATH_GTK($GTK_VERSION,, - AC_MSG_ERROR(Test for GTK failed.)) - - MOZ_GTK_LDFLAGS=$GTK_LIBS - MOZ_GTK_CFLAGS=$GTK_CFLAGS -fi - if test "$MOZ_ENABLE_GTK2" then PKG_CHECK_MODULES(MOZ_GTK2, gtk+-2.0 >= 1.3.7 gdk-x11-2.0 glib-2.0 gobject-2.0) fi -if test "$MOZ_ENABLE_XLIB" -then - MOZ_XLIB_CFLAGS="$X_CFLAGS" - MOZ_XLIB_LDFLAGS="$XLDFLAGS" - MOZ_XLIB_LDFLAGS="$MOZ_XLIB_LDFLAGS $XEXT_LIBS $X11_LIBS" -fi - if test "$MOZ_ENABLE_QT" then MOZ_ARG_WITH_STRING(qtdir, @@ -4783,8 +4757,6 @@ AC_SUBST(GTK_CONFIG) AC_SUBST(TK_CFLAGS) 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) @@ -4792,12 +4764,8 @@ AC_SUBST(MOZ_ENABLE_COCOA) AC_SUBST(MOZ_ENABLE_CAIRO_GFX) AC_SUBST(MOZ_ENABLE_GLITZ) AC_SUBST(MOZ_ENABLE_XREMOTE) -AC_SUBST(MOZ_GTK_CFLAGS) -AC_SUBST(MOZ_GTK_LDFLAGS) 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) @@ -4809,9 +4777,7 @@ then AC_DEFINE(MOZ_CAIRO_GFX) fi -if test "$MOZ_ENABLE_GTK" \ -|| test "$MOZ_ENABLE_QT" \ -|| test "$MOZ_ENABLE_XLIB" \ +if test "$MOZ_ENABLE_QT" \ || test "$MOZ_ENABLE_GTK2" then AC_DEFINE(MOZ_X11) @@ -5237,9 +5203,8 @@ dnl = those converters are not built on other platforms/toolkits. dnl = (see bug 180851) dnl ======================================================== -if (test "$MOZ_ENABLE_GTK" || test "$MOZ_ENABLE_GTK2") \ +if test "$MOZ_ENABLE_GTK2" \ && test "$MOZ_ENABLE_COREXFONTS" \ -|| test "$MOZ_ENABLE_XLIB" \ || test "$MOZ_ENABLE_XPRINT" then AC_DEFINE(MOZ_EXTRA_X11CONVERTERS) @@ -7039,9 +7004,6 @@ then if test "$MOZ_ENABLE_GTK2"; then PKG_CHECK_MODULES(LIBIDL, libIDL-2.0 >= 0.8.0 glib-2.0 gobject-2.0, _LIBIDL_FOUND=1,_LIBIDL_FOUND=) fi - if test "$MOZ_ENABLE_GTK"; then - AM_PATH_LIBIDL($LIBIDL_VERSION,_LIBIDL_FOUND=1) - fi dnl if no gtk/libIDL1 or gtk2/libIDL2 combination was found, fall back dnl to either libIDL1 or libIDL2. if test -z "$_LIBIDL_FOUND"; then diff --git a/mozilla/embedding/browser/gtk/src/EmbedEventListener.cpp b/mozilla/embedding/browser/gtk/src/EmbedEventListener.cpp index 55fcc9ba4f0..36b59550cc6 100644 --- a/mozilla/embedding/browser/gtk/src/EmbedEventListener.cpp +++ b/mozilla/embedding/browser/gtk/src/EmbedEventListener.cpp @@ -89,9 +89,7 @@ EmbedEventListener::Init(EmbedPrivate *aOwner) mOwner = aOwner; mCtxInfo = nsnull; mClickCount = 1; -#ifdef MOZ_WIDGET_GTK2 mCtxInfo = new EmbedContextMenuInfo(aOwner); -#endif mOwner->mNeedFav = PR_TRUE; return NS_OK; } @@ -163,7 +161,7 @@ EmbedEventListener::HandleEvent(nsIDOMEvent* aDOMEvent) { nsString eventType; aDOMEvent->GetType(eventType); -#ifdef MOZ_WIDGET_GTK2 + if (eventType.EqualsLiteral("focus")) if (mCtxInfo->GetFormControlType(aDOMEvent)) { if (mCtxInfo->mEmbedCtxType & GTK_MOZ_EMBED_CTX_INPUT) { @@ -177,7 +175,6 @@ EmbedEventListener::HandleEvent(nsIDOMEvent* aDOMEvent) } } } -#endif if (eventType.EqualsLiteral("DOMLinkAdded")) { @@ -341,9 +338,7 @@ EmbedEventListener::MouseDown(nsIDOMEvent* aDOMEvent) } // handling event internally. -#ifdef MOZ_WIDGET_GTK2 HandleSelection(mouseEvent); -#endif return NS_OK; } @@ -539,10 +534,8 @@ EmbedEventListener::MouseMove(nsIDOMEvent* aDOMEvent) (void *)mouseEvent, &return_val); if (!return_val) { sIsScrolling = PR_TRUE; -#ifdef MOZ_WIDGET_GTK2 if (mCtxInfo) rv = mCtxInfo->GetElementForScroll(aDOMEvent); -#endif } else { sMPressed = PR_FALSE; sIsScrolling = PR_FALSE; @@ -552,7 +545,6 @@ EmbedEventListener::MouseMove(nsIDOMEvent* aDOMEvent) { if (sLongPressTimer) g_source_remove(sLongPressTimer); -#ifdef MOZ_WIDGET_GTK2 if (mCtxInfo->mNSHHTMLElementSc) { PRInt32 x, y; mCtxInfo->mNSHHTMLElementSc->GetScrollTop(&y); @@ -560,9 +552,7 @@ EmbedEventListener::MouseMove(nsIDOMEvent* aDOMEvent) #ifdef MOZ_SCROLL_TOP_LEFT_HACK rv = mCtxInfo->mNSHHTMLElementSc->ScrollTopLeft(y - subY, x - subX); #endif - } else -#endif - { + } else { rv = NS_ERROR_UNEXPECTED; } if (rv == NS_ERROR_UNEXPECTED) { @@ -592,7 +582,7 @@ EmbedEventListener::Focus(nsIDOMEvent* aEvent) { nsString eventType; aEvent->GetType(eventType); -#ifdef MOZ_WIDGET_GTK2 + if (eventType.EqualsLiteral("focus") && mCtxInfo->GetFormControlType(aEvent) && mCtxInfo->mEmbedCtxType & GTK_MOZ_EMBED_CTX_INPUT) { @@ -605,7 +595,6 @@ EmbedEventListener::Focus(nsIDOMEvent* aEvent) aEvent->PreventDefault(); } } -#endif return NS_OK; } @@ -646,7 +635,7 @@ NS_IMETHODIMP EmbedEventListener::HandleSelection(nsIDOMMouseEvent* aDOMMouseEvent) { nsresult rv; -#ifdef MOZ_WIDGET_GTK2 + /* This function gets called everytime that a mousedown or a mouseup * event occurs. */ @@ -729,7 +718,7 @@ EmbedEventListener::HandleSelection(nsIDOMMouseEvent* aDOMMouseEvent) if (mClickCount == 1) mLastSelCon = mCurSelCon; } // mouseup -#endif + return rv; } @@ -763,7 +752,6 @@ EmbedEventListener::GetIOService(nsIIOService **ioService) return rv; } -#ifdef MOZ_WIDGET_GTK2 void EmbedEventListener::GeneratePixBuf() { @@ -799,7 +787,6 @@ EmbedEventListener::GeneratePixBuf() NS_Free(::gFavLocation); gFavLocation = nsnull; } -#endif void EmbedEventListener::GetFaviconFromURI(const char* aURI) @@ -892,9 +879,7 @@ EmbedEventListener::GetFaviconFromURI(const char* aURI) } } else { -#ifdef MOZ_WIDGET_GTK2 GeneratePixBuf(); -#endif } } @@ -906,13 +891,13 @@ EmbedEventListener::OnStateChange(nsIWebProgress *aWebProgress, nsresult aStatus) { /* if (!(aStateFlags & (STATE_STOP | STATE_IS_NETWORK | STATE_IS_DOCUMENT))){*/ -#ifdef MOZ_WIDGET_GTK2 + if (aStateFlags & STATE_STOP) /* FINISH DOWNLOADING */ /* XXX sometimes this==0x0 and it cause crash in GeneratePixBuf, need workaround check for this */ if (NS_SUCCEEDED(aStatus) && this) GeneratePixBuf(); -#endif + return NS_OK; } diff --git a/mozilla/embedding/browser/gtk/src/EmbedPrivate.cpp b/mozilla/embedding/browser/gtk/src/EmbedPrivate.cpp index f6fbb71e26a..8f769bb7572 100644 --- a/mozilla/embedding/browser/gtk/src/EmbedPrivate.cpp +++ b/mozilla/embedding/browser/gtk/src/EmbedPrivate.cpp @@ -89,7 +89,6 @@ #include "EmbedContentListener.h" #include "EmbedEventListener.h" #include "EmbedWindowCreator.h" -#ifdef MOZ_WIDGET_GTK2 #include "GtkPromptService.h" #include "nsICookiePromptService.h" #include "EmbedCertificates.h" @@ -99,9 +98,6 @@ #endif #include "EmbedGlobalHistory.h" #include "EmbedFilePicker.h" -#else -#include "nsNativeCharsetUtils.h" -#endif #ifdef MOZ_ACCESSIBILITY_ATK #include "nsIAccessibilityService.h" @@ -130,7 +126,6 @@ static NS_DEFINE_CID(kCacheServiceCID, NS_CACHESERVICE_CID); static nsICacheService* sCacheService; -#ifdef MOZ_WIDGET_GTK2 static EmbedCommon* sEmbedCommon = nsnull; /* static */ @@ -170,7 +165,6 @@ EmbedCommon::Init(void) mCommon = NULL; return NS_OK; } -#endif PRUint32 EmbedPrivate::sWidgetCount = 0; char *EmbedPrivate::sPath = nsnull; @@ -266,7 +260,6 @@ GTKEmbedDirectoryProvider::GetFiles(const char *aKey, return dp2->GetFiles(aKey, aResult); } -#ifdef MOZ_WIDGET_GTK2 NS_GENERIC_FACTORY_CONSTRUCTOR(GtkPromptService) NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(EmbedCertificates, Init) NS_GENERIC_FACTORY_CONSTRUCTOR(EmbedDownloadMgr) @@ -393,12 +386,6 @@ static const nsModuleComponentInfo defaultAppComps[] = { const nsModuleComponentInfo *EmbedPrivate::sAppComps = defaultAppComps; int EmbedPrivate::sNumAppComps = sizeof(defaultAppComps) / sizeof(nsModuleComponentInfo); -#else - -const nsModuleComponentInfo *EmbedPrivate::sAppComps = nsnull; -int EmbedPrivate::sNumAppComps = 0; - -#endif EmbedPrivate::EmbedPrivate(void) { @@ -600,7 +587,6 @@ EmbedPrivate::Hide(void) void EmbedPrivate::Resize(PRUint32 aWidth, PRUint32 aHeight) { -#ifdef MOZ_WIDGET_GTK2 PRInt32 sub = 0; PRInt32 diff = 0; @@ -616,16 +602,14 @@ EmbedPrivate::Resize(PRUint32 aWidth, PRUint32 aHeight) } } } -#endif + mWindow->SetDimensions(nsIEmbeddingSiteWindow::DIM_FLAGS_POSITION | nsIEmbeddingSiteWindow::DIM_FLAGS_SIZE_INNER, 0, 0, aWidth, aHeight); -#ifdef MOZ_WIDGET_GTK2 if (sub > 0 && diff >= 0){ SetScrollTop(sub + diff); } -#endif } void @@ -684,15 +668,7 @@ EmbedPrivate::Destroy(void) void EmbedPrivate::SetURI(const char *aURI) { -#ifdef MOZ_WIDGET_GTK - // XXX: Even though NS_CopyNativeToUnicode is not designed for non-filenames, - // we know that it will do "the right thing" on UNIX. - NS_CopyNativeToUnicode(nsDependentCString(aURI), mURI); -#endif - -#ifdef MOZ_WIDGET_GTK2 mURI.Assign(NS_ConvertUTF8toUTF16(aURI)); -#endif } void @@ -848,9 +824,7 @@ EmbedPrivate::PopStartup(void) // shut down XPCOM/Embedding XRE_TermEmbedding(); -#ifdef MOZ_WIDGET_GTK2 EmbedGlobalHistory::DeleteInstance(); -#endif } } @@ -1024,13 +998,11 @@ EmbedPrivate::ContentStateChange(void) AttachListeners(); -#ifdef MOZ_WIDGET_GTK2 #ifdef MOZ_GTKPASSWORD_INTERFACE EmbedPasswordMgr *passwordManager = EmbedPasswordMgr::GetInstance(); if (passwordManager) passwordManager->mFormAttachCount = PR_FALSE; #endif -#endif } void @@ -1063,7 +1035,6 @@ EmbedPrivate::ContentFinishedLoading(void) mWindow->SetVisibility(PR_TRUE); } -#ifdef MOZ_WIDGET_GTK2 #ifdef MOZ_GTKPASSWORD_INTERFACE EmbedPasswordMgr *passwordManager = EmbedPasswordMgr::GetInstance(); if (passwordManager && passwordManager->mFormAttachCount) { @@ -1102,53 +1073,14 @@ EmbedPrivate::ContentFinishedLoading(void) passwordManager->mFormAttachCount = PR_FALSE; } #endif -#endif } -#ifdef MOZ_WIDGET_GTK -// handle focus in and focus out events -void -EmbedPrivate::TopLevelFocusIn(void) -{ - if (mIsDestroyed) - return; - - nsCOMPtr piWin; - GetPIDOMWindow(getter_AddRefs(piWin)); - - if (!piWin) - return; - - nsIFocusController *focusController = piWin->GetRootFocusController(); - if (focusController) - focusController->SetActive(PR_TRUE); -} - -void -EmbedPrivate::TopLevelFocusOut(void) -{ - if (mIsDestroyed) - return; - - nsCOMPtr piWin; - GetPIDOMWindow(getter_AddRefs(piWin)); - - if (!piWin) - return; - - nsIFocusController *focusController = piWin->GetRootFocusController(); - if (focusController) - focusController->SetActive(PR_FALSE); -} -#endif /* MOZ_WIDGET_GTK */ - void EmbedPrivate::ChildFocusIn(void) { if (mIsDestroyed) return; -#ifdef MOZ_WIDGET_GTK2 nsresult rv; nsCOMPtr webBrowser; rv = mWindow->GetWebBrowser(getter_AddRefs(webBrowser)); @@ -1160,17 +1092,6 @@ EmbedPrivate::ChildFocusIn(void) return; webBrowserFocus->Activate(); -#endif /* MOZ_WIDGET_GTK2 */ - -#ifdef MOZ_WIDGET_GTK - nsCOMPtr piWin; - GetPIDOMWindow(getter_AddRefs(piWin)); - - if (!piWin) - return; - - piWin->Activate(); -#endif /* MOZ_WIDGET_GTK */ } void @@ -1179,7 +1100,6 @@ EmbedPrivate::ChildFocusOut(void) if (mIsDestroyed) return; -#ifdef MOZ_WIDGET_GTK2 nsresult rv; nsCOMPtr webBrowser; rv = mWindow->GetWebBrowser(getter_AddRefs(webBrowser)); @@ -1191,23 +1111,6 @@ EmbedPrivate::ChildFocusOut(void) return; webBrowserFocus->Deactivate(); -#endif /* MOZ_WIDGET_GTK2 */ - -#ifdef MOZ_WIDGET_GTK - nsCOMPtr piWin; - GetPIDOMWindow(getter_AddRefs(piWin)); - - if (!piWin) - return; - - piWin->Deactivate(); - - // but the window is still active until the toplevel gets a focus - // out - nsIFocusController *focusController = piWin->GetRootFocusController(); - if (focusController) - focusController->SetActive(PR_TRUE); -#endif /* MOZ_WIDGET_GTK */ } // Get the event listener for the chrome event handler. @@ -1846,7 +1749,6 @@ EmbedPrivate::GetMIMEInfo(const char **aMime, nsIDOMNode *aDOMNode) { NS_ENSURE_ARG_POINTER(aMime); nsresult rv; -#ifdef MOZ_WIDGET_GTK2 if (aDOMNode && mEventListener) { EmbedContextMenuInfo * ctx = mEventListener->GetContextInfo(); if (!ctx) @@ -1857,7 +1759,6 @@ EmbedPrivate::GetMIMEInfo(const char **aMime, nsIDOMNode *aDOMNode) rv = request->GetMimeType((char**)aMime); return rv; } -#endif nsCOMPtr webBrowser; rv = mWindow->GetWebBrowser(getter_AddRefs(webBrowser)); diff --git a/mozilla/embedding/browser/gtk/src/EmbedPrivate.h b/mozilla/embedding/browser/gtk/src/EmbedPrivate.h index 962bf405b3f..ac0248b1d46 100644 --- a/mozilla/embedding/browser/gtk/src/EmbedPrivate.h +++ b/mozilla/embedding/browser/gtk/src/EmbedPrivate.h @@ -143,13 +143,6 @@ class EmbedPrivate { // visibility is set. void ContentFinishedLoading(void); -#ifdef MOZ_WIDGET_GTK - // these let the widget code know when the toplevel window gets and - // looses focus. - void TopLevelFocusIn (void); - void TopLevelFocusOut(void); -#endif - // these are when the widget itself gets focus in and focus out // events void ChildFocusIn (void); diff --git a/mozilla/embedding/browser/gtk/src/EmbedWindow.cpp b/mozilla/embedding/browser/gtk/src/EmbedWindow.cpp index 671984800a9..eefa77de6b1 100644 --- a/mozilla/embedding/browser/gtk/src/EmbedWindow.cpp +++ b/mozilla/embedding/browser/gtk/src/EmbedWindow.cpp @@ -243,15 +243,6 @@ EmbedWindow::ExitModalEventLoop(nsresult aStatus) NS_IMETHODIMP EmbedWindow::FocusNextElement() { -#ifdef MOZ_WIDGET_GTK - GtkWidget* parent = GTK_WIDGET(mOwner->mOwningWidget)->parent; - - if (GTK_IS_CONTAINER(parent)) - gtk_container_focus(GTK_CONTAINER(parent), - GTK_DIR_TAB_FORWARD); -#endif - -#ifdef MOZ_WIDGET_GTK2 GtkWidget *toplevel; toplevel = gtk_widget_get_toplevel(GTK_WIDGET(mOwner->mOwningWidget)); if (!GTK_WIDGET_TOPLEVEL(toplevel)) @@ -259,7 +250,6 @@ EmbedWindow::FocusNextElement() g_signal_emit_by_name(G_OBJECT(toplevel), "move_focus", GTK_DIR_TAB_FORWARD); -#endif return NS_OK; } @@ -267,15 +257,6 @@ EmbedWindow::FocusNextElement() NS_IMETHODIMP EmbedWindow::FocusPrevElement() { -#ifdef MOZ_WIDGET_GTK - GtkWidget* parent = GTK_WIDGET(mOwner->mOwningWidget)->parent; - - if (GTK_IS_CONTAINER(parent)) - gtk_container_focus(GTK_CONTAINER(parent), - GTK_DIR_TAB_BACKWARD); -#endif - -#ifdef MOZ_WIDGET_GTK2 GtkWidget *toplevel; toplevel = gtk_widget_get_toplevel(GTK_WIDGET(mOwner->mOwningWidget)); if (!GTK_WIDGET_TOPLEVEL(toplevel)) @@ -283,7 +264,6 @@ EmbedWindow::FocusPrevElement() g_signal_emit_by_name(G_OBJECT(toplevel), "move_focus", GTK_DIR_TAB_BACKWARD); -#endif return NS_OK; } @@ -409,13 +389,7 @@ EmbedWindow::OnShowTooltip(PRInt32 aXCoords, PRInt32 aYCoords, { nsAutoString tipText(aTipText); -#ifdef MOZ_WIDGET_GTK - const char* tipString = ToNewCString(tipText); -#endif - -#ifdef MOZ_WIDGET_GTK2 const char* tipString = ToNewUTF8String(tipText); -#endif if (sTipWindow) gtk_widget_destroy(sTipWindow); @@ -469,10 +443,6 @@ EmbedWindow::OnShowTooltip(PRInt32 aXCoords, PRInt32 aYCoords, // and show it. gtk_widget_show_all(sTipWindow); -#ifdef MOZ_WIDGET_GTK - gtk_widget_popup(sTipWindow, aXCoords + root_x, aYCoords + root_y); */ -#endif /* MOZ_WIDGET_GTK */ - nsMemory::Free((void*)tipString); return NS_OK; diff --git a/mozilla/embedding/browser/gtk/src/Makefile.in b/mozilla/embedding/browser/gtk/src/Makefile.in index dfb6f39ad4a..846b4982421 100644 --- a/mozilla/embedding/browser/gtk/src/Makefile.in +++ b/mozilla/embedding/browser/gtk/src/Makefile.in @@ -181,7 +181,7 @@ EXPORTS += \ endif ifdef MOZ_GTKEMBED_DYN -ifneq (,$(filter gtk gtk2 qt xlib,$(MOZ_WIDGET_TOOLKIT))) +ifneq (,$(filter gtk2 qt,$(MOZ_WIDGET_TOOLKIT))) EXTRA_DSO_LDOPTS += \ $(DIST)/lib/libxpcomglue_s.$(LIB_SUFFIX) \ $(MOZ_COMPONENT_LIBS) \ @@ -210,8 +210,8 @@ DEFINES += -D_TIME_H=1 endif endif -CXXFLAGS += $(MOZ_GTK_CFLAGS) $(MOZ_GTK2_CFLAGS) -CFLAGS += $(MOZ_GTK_CFLAGS) $(MOZ_GTK2_CFLAGS) +CXXFLAGS += $(MOZ_GTK2_CFLAGS) +CFLAGS += $(MOZ_GTK2_CFLAGS) ifdef MOZ_GNOMEVFS_CFLAGS CXXFLAGS += $(MOZ_GNOMEVFS_CFLAGS) CFLAGS += $(MOZ_GNOMEVFS_CFLAGS) diff --git a/mozilla/embedding/browser/gtk/src/gtkmozembed.h b/mozilla/embedding/browser/gtk/src/gtkmozembed.h index f77509ab0d7..981500fcbe3 100644 --- a/mozilla/embedding/browser/gtk/src/gtkmozembed.h +++ b/mozilla/embedding/browser/gtk/src/gtkmozembed.h @@ -97,9 +97,7 @@ struct _GtkMozHistoryItem long accessed; /** < The last time that the URL was accessed */ }; -#ifdef MOZ_WIDGET_GTK2 #include "gtkmozembed_common.h" -#endif #define GTK_TYPE_MOZ_EMBED (gtk_moz_embed_get_type()) #define GTK_MOZ_EMBED(obj) GTK_CHECK_CAST((obj), GTK_TYPE_MOZ_EMBED, GtkMozEmbed) diff --git a/mozilla/embedding/browser/gtk/src/gtkmozembed2.cpp b/mozilla/embedding/browser/gtk/src/gtkmozembed2.cpp index d583ddeb753..4610453e863 100644 --- a/mozilla/embedding/browser/gtk/src/gtkmozembed2.cpp +++ b/mozilla/embedding/browser/gtk/src/gtkmozembed2.cpp @@ -80,53 +80,11 @@ #include "nsServiceManagerUtils.h" #endif -#ifdef MOZ_WIDGET_GTK2 - #include "gtkmozembedmarshal.h" #define NEW_TOOLKIT_STRING(x) g_strdup(NS_ConvertUTF16toUTF8(x).get()) #define GET_OBJECT_CLASS_TYPE(x) G_OBJECT_CLASS_TYPE(x) -#endif /* MOZ_WIDGET_GTK2 */ - -#ifdef MOZ_WIDGET_GTK - -// so we can get callbacks from the mozarea -#include - -// so we get the right marshaler for gtk 1.2 -#define gtkmozembed_VOID__INT_UINT \ - gtk_marshal_NONE__INT_INT -#define gtkmozembed_VOID__STRING_INT_INT \ - gtk_marshal_NONE__POINTER_INT_INT -#define gtkmozembed_VOID__STRING_INT_UINT \ - gtk_marshal_NONE__POINTER_INT_INT -#define gtkmozembed_VOID__POINTER_INT_POINTER \ - gtk_marshal_NONE__POINTER_INT_POINTER -#define gtkmozembed_BOOL__STRING \ - gtk_marshal_BOOL__POINTER -#define gtkmozembed_VOID__STRING_STRING \ - gtk_marshal_NONE__STRING_STRING -#define gtkmozembed_VOID__STRING_STRING_STRING_POINTER \ - gtk_marshal_NONE__STRING_STRING_STRING_POINTER -#define gtkmozembed_BOOL__STRING_STRING \ - gtk_marshal_BOOL__STRING_STRING -#define gtkmozembed_BOOL__STRING_STRING_STRING_POINTER \ - gtk_marshal_BOOL__STRING_STRING_STRING_POINTER -#define gtkmozembed_INT__STRING_STRING_UINT_STRING_STRING_STRING_STRING_POINTER \ - gtk_marshal_INT__STRING_STRING_UINT_STRING_STRING_STRING_STRING_POINTER -#define gtkmozembed_BOOL__STRING_STRING_POINTER_STRING_POINTER \ - gtk_marshal_BOOL__STRING_STRING_POINTER_STRING_POINTER - -#define gtkmozembed_BOOL__STRING_STRING_POINTER_INT \ - gtk_marshal_BOOL__STRING_STRING_POINTER_INT -#define G_SIGNAL_TYPE_STATIC_SCOPE 0 - -#define NEW_TOOLKIT_STRING(x) g_strdup(NS_LossyConvertUTF16toASCII(x).get()) -#define GET_OBJECT_CLASS_TYPE(x) (GTK_OBJECT_CLASS(x)->type) - -#endif /* MOZ_WIDGET_GTK */ - class nsIDirectoryServiceProvider; // class and instance initialization @@ -173,20 +131,6 @@ handle_child_focus_out(GtkWidget *aWidget, GdkEventFocus *aGdkFocusEvent, GtkMozEmbed *aEmbed); -#ifdef MOZ_WIDGET_GTK -// signal handlers for tracking the focus in and and focus out events -// on the toplevel window. - -static void -handle_toplevel_focus_in(GtkMozArea *aArea, - GtkMozEmbed *aEmbed); - -static void -handle_toplevel_focus_out(GtkMozArea *aArea, - GtkMozEmbed *aEmbed); - -#endif /* MOZ_WIDGET_GTK */ - // globals for this type of widget static GtkBinClass *embed_parent_class; @@ -489,7 +433,6 @@ gtk_moz_embed_class_init(GtkMozEmbedClass *klass) GTK_SIGNAL_OFFSET(GtkMozEmbedClass, dom_focus_out), gtk_marshal_BOOL__POINTER, GTK_TYPE_BOOL, 1, GTK_TYPE_POINTER); -#ifdef MOZ_WIDGET_GTK2 moz_embed_signals[ALERT] = gtk_signal_new("alert", GTK_RUN_FIRST, @@ -647,13 +590,6 @@ gtk_moz_embed_class_init(GtkMozEmbedClass *klass) 2, GTK_TYPE_STRING, GTK_TYPE_STRING); -#endif - -#ifdef MOZ_WIDGET_GTK - gtk_object_class_add_signals(object_class, moz_embed_signals, - EMBED_LAST_SIGNAL); -#endif /* MOZ_WIDGET_GTK */ - } static void @@ -664,9 +600,7 @@ gtk_moz_embed_init(GtkMozEmbed *embed) embed->common = NULL; gtk_widget_set_name(GTK_WIDGET(embed), "gtkmozembed"); -#ifdef MOZ_WIDGET_GTK2 GTK_WIDGET_UNSET_FLAGS(GTK_WIDGET(embed), GTK_NO_WINDOW); -#endif } GtkWidget * @@ -766,22 +700,6 @@ gtk_moz_embed_realize(GtkWidget *widget) GTK_SIGNAL_FUNC(handle_child_focus_in), embed, GTK_OBJECT(child_widget)); - -#ifdef MOZ_WIDGET_GTK - // connect to the toplevel focus out events for the child - GtkMozArea *mozarea = GTK_MOZAREA(child_widget); - gtk_signal_connect_while_alive(GTK_OBJECT(mozarea), - "toplevel_focus_in", - GTK_SIGNAL_FUNC(handle_toplevel_focus_in), - embed, - GTK_OBJECT(mozarea)); - - gtk_signal_connect_while_alive(GTK_OBJECT(mozarea), - "toplevel_focus_out", - GTK_SIGNAL_FUNC(handle_toplevel_focus_out), - embed, - GTK_OBJECT(mozarea)); -#endif /* MOZ_WIDGET_GTK */ } static void @@ -908,28 +826,6 @@ handle_child_focus_out(GtkWidget *aWidget, return PR_FALSE; } -#ifdef MOZ_WIDGET_GTK -void -handle_toplevel_focus_in(GtkMozArea *aArea, - GtkMozEmbed *aEmbed) -{ - EmbedPrivate *embedPrivate; - embedPrivate = (EmbedPrivate *)aEmbed->data; - - embedPrivate->TopLevelFocusIn(); -} - -void -handle_toplevel_focus_out(GtkMozArea *aArea, - GtkMozEmbed *aEmbed) -{ - EmbedPrivate *embedPrivate; - embedPrivate = (EmbedPrivate *)aEmbed->data; - - embedPrivate->TopLevelFocusOut(); -} -#endif /* MOZ_WIDGET_GTK */ - // Widget methods void @@ -1387,11 +1283,6 @@ gtk_moz_embed_single_class_init(GtkMozEmbedSingleClass *klass) GTK_TYPE_NONE, 2, GTK_TYPE_POINTER, GTK_TYPE_UINT); - -#ifdef MOZ_WIDGET_GTK - gtk_object_class_add_signals(object_class, moz_embed_single_signals, - SINGLE_LAST_SIGNAL); -#endif /* MOZ_WIDGET_GTK */ } static void @@ -1527,7 +1418,6 @@ gtk_moz_embed_get_context_info(GtkMozEmbed *embed, gpointer event, gpointer *nod gint *x, gint *y, gint *docindex, const gchar **url, const gchar **objurl, const gchar **docurl) { -#ifdef MOZ_WIDGET_GTK2 EmbedPrivate *embedPrivate; g_return_val_if_fail(embed != NULL, GTK_MOZ_EMBED_CTX_NONE); g_return_val_if_fail(GTK_IS_MOZ_EMBED(embed), GTK_MOZ_EMBED_CTX_NONE); @@ -1569,7 +1459,7 @@ gtk_moz_embed_get_context_info(GtkMozEmbed *embed, gpointer event, gpointer *nod *node = ctx_menu->mEventNode; return ctx_menu->mEmbedCtxType; } -#endif + return 0; } @@ -1580,14 +1470,13 @@ gtk_moz_embed_get_selection(GtkMozEmbed *embed) g_return_val_if_fail(embed != NULL, NULL); g_return_val_if_fail(GTK_IS_MOZ_EMBED(embed), NULL); embedPrivate = (EmbedPrivate *)embed->data; -#ifdef MOZ_WIDGET_GTK2 if (embedPrivate->mEventListener) { EmbedContextMenuInfo * ctx_menu = embedPrivate->mEventListener->GetContextInfo(); if (!ctx_menu) return NULL; return ctx_menu->GetSelectedText(); } -#endif + return NULL; } gboolean @@ -1697,8 +1586,6 @@ gtk_moz_embed_get_doc_info(GtkMozEmbed *embed, gpointer node, gint docindex, if (!embedPrivate || !embedPrivate->mEventListener) return FALSE; -#ifdef MOZ_WIDGET_GTK2 - if (file_type) { embedPrivate->GetMIMEInfo(file_type, (nsIDOMNode*)node); } @@ -1724,7 +1611,6 @@ gtk_moz_embed_get_doc_info(GtkMozEmbed *embed, gpointer node, gint docindex, rv = descriptor->GetDataSize(file_size); } } -#endif return TRUE; } diff --git a/mozilla/embedding/browser/gtk/src/gtkmozembed_common.cpp b/mozilla/embedding/browser/gtk/src/gtkmozembed_common.cpp index 464a50234f8..b3ad0dcf0a7 100644 --- a/mozilla/embedding/browser/gtk/src/gtkmozembed_common.cpp +++ b/mozilla/embedding/browser/gtk/src/gtkmozembed_common.cpp @@ -89,35 +89,10 @@ #include "nsICacheService.h" #include "nsICache.h" -#ifdef MOZ_WIDGET_GTK2 #include "gtkmozembedmarshal.h" #define NEW_TOOLKIT_STRING(x) g_strdup(NS_ConvertUTF16toUTF8(x).get()) #define GET_TOOLKIT_STRING(x) NS_ConvertUTF16toUTF8(x).get() #define GET_OBJECT_CLASS_TYPE(x) G_OBJECT_CLASS_TYPE(x) -#endif /* MOZ_WIDGET_GTK2 */ - -#ifdef MOZ_WIDGET_GTK -// so we can get callbacks from the mozarea -#include -// so we get the right marshaler for gtk 1.2 -#define gtkmozembed_VOID__INT_UINT \ - gtk_marshal_NONE__INT_INT -#define gtkmozembed_VOID__STRING_INT_INT \ - gtk_marshal_NONE__POINTER_INT_INT -#define gtkmozembed_VOID__STRING_INT_UINT \ - gtk_marshal_NONE__POINTER_INT_INT -#define gtkmozembed_VOID__POINTER_INT_POINTER \ - gtk_marshal_NONE__POINTER_INT_POINTER -#define gtkmozembed_BOOL__STRING \ - gtk_marshal_BOOL__POINTER -#define gtkmozembed_VOID__INT_INT_BOOLEAN \ - gtk_marshal_NONE__INT_INT_BOOLEAN - -#define G_SIGNAL_TYPE_STATIC_SCOPE 0 -#define NEW_TOOLKIT_STRING(x) g_strdup(NS_LossyConvertUTF16toASCII(x).get()) -#define GET_TOOLKIT_STRING(x) NS_LossyConvertUTF16toASCII(x).get() -#define GET_OBJECT_CLASS_TYPE(x) (GTK_OBJECT_CLASS(x)->type) -#endif /* MOZ_WIDGET_GTK */ #define UNACCEPTABLE_CRASHY_GLIB_ALLOCATION(newed) PR_BEGIN_MACRO \ /* OOPS this code is using a glib allocation function which \ @@ -297,10 +272,6 @@ gtk_moz_embed_common_class_init(GtkMozEmbedCommonClass *klass) G_TYPE_INT, G_TYPE_INT, G_TYPE_INT, G_TYPE_INT); */ -#ifdef MOZ_WIDGET_GTK - gtk_object_class_add_signals(object_class, moz_embed_common_signals, - COMMON_LAST_SIGNAL); -#endif /* MOZ_WIDGET_GTK */ } static void diff --git a/mozilla/embedding/browser/gtk/src/gtkmozembed_download.cpp b/mozilla/embedding/browser/gtk/src/gtkmozembed_download.cpp index fc34d6ca12c..5e34c0c3f63 100644 --- a/mozilla/embedding/browser/gtk/src/gtkmozembed_download.cpp +++ b/mozilla/embedding/browser/gtk/src/gtkmozembed_download.cpp @@ -57,34 +57,10 @@ #include "nsStringAPI.h" #endif -#ifdef MOZ_WIDGET_GTK2 #include "gtkmozembedmarshal.h" #define NEW_TOOLKIT_STRING(x) g_strdup(NS_ConvertUTF16toUTF8(x).get()) #define GET_TOOLKIT_STRING(x) NS_ConvertUTF16toUTF8(x).get() #define GET_OBJECT_CLASS_TYPE(x) G_OBJECT_CLASS_TYPE(x) -#endif /* MOZ_WIDGET_GTK2 */ - -#ifdef MOZ_WIDGET_GTK -// so we can get callbacks from the mozarea -#include -// so we get the right marshaler for gtk 1.2 -#define gtkmozembed_VOID__INT_UINT \ - gtk_marshal_NONE__INT_INT -#define gtkmozembed_VOID__STRING_INT_INT \ - gtk_marshal_NONE__POINTER_INT_INT -#define gtkmozembed_VOID__STRING_INT_UINT \ - gtk_marshal_NONE__POINTER_INT_INT -#define gtkmozembed_VOID__POINTER_INT_POINTER \ - gtk_marshal_NONE__POINTER_INT_POINTER -#define gtkmozembed_BOOL__STRING \ - gtk_marshal_BOOL__POINTER -#define gtkmozembed_VOID__INT_INT_BOOLEAN \ - gtk_marshal_NONE__INT_INT_BOOLEAN -#define G_SIGNAL_TYPE_STATIC_SCOPE 0 -#define NEW_TOOLKIT_STRING(x) g_strdup(NS_LossyConvertUTF16toASCII(x).get()) -#define GET_TOOLKIT_STRING(x) NS_LossyConvertUTF16toASCII(x).get() -#define GET_OBJECT_CLASS_TYPE(x) (GTK_OBJECT_CLASS(x)->type) -#endif /* MOZ_WIDGET_GTK */ static void gtk_moz_embed_download_set_latest_object(GtkObject *o); static GtkObject *latest_download_object = nsnull; @@ -172,11 +148,6 @@ gtk_moz_embed_download_class_init(GtkMozEmbedDownloadClass *klass) G_TYPE_ULONG, G_TYPE_ULONG, G_TYPE_ULONG); - -#ifdef MOZ_WIDGET_GTK - gtk_object_class_add_signals(object_class, moz_embed_download_signals, - DOWNLOAD_LAST_SIGNAL); -#endif /* MOZ_WIDGET_GTK */ } static void diff --git a/mozilla/embedding/browser/gtk/src/gtkmozembed_glue.cpp b/mozilla/embedding/browser/gtk/src/gtkmozembed_glue.cpp index 86c5ff450ad..00f32a4ff11 100644 --- a/mozilla/embedding/browser/gtk/src/gtkmozembed_glue.cpp +++ b/mozilla/embedding/browser/gtk/src/gtkmozembed_glue.cpp @@ -43,17 +43,14 @@ #include "gtkmozembed.h" #include "gtkmozembed_internal.h" -#ifdef MOZ_WIDGET_GTK2 #include "gtkmozembed_common.h" #include "gtkmozembed_download.h" -#endif #include "nsXPCOMGlue.h" #ifndef XPCOM_GLUE #error This file only makes sense when XPCOM_GLUE is defined. #endif -#ifdef MOZ_WIDGET_GTK2 #define GTKMOZEMBED2_FUNCTIONS \ GTKF(gtk_moz_embed_download_get_type) \ GTKF(gtk_moz_embed_download_new) \ @@ -80,8 +77,6 @@ GTKF(gtk_moz_embed_shistory_goto_index) \ GTKF(gtk_moz_embed_get_server_cert) \ GTKF(gtk_moz_embed_get_nsIWebBrowser) -#else -#define GTKMOZEMBED2_FUNCTIONS #endif #define GTKMOZEMBED_FUNCTIONS \ diff --git a/mozilla/embedding/browser/gtk/tests/Makefile.in b/mozilla/embedding/browser/gtk/tests/Makefile.in index d681ee923d2..9eb984a45aa 100644 --- a/mozilla/embedding/browser/gtk/tests/Makefile.in +++ b/mozilla/embedding/browser/gtk/tests/Makefile.in @@ -62,12 +62,6 @@ ifdef ENABLE_GNOME CPPSRCS += TestGtkEmbedMDI.cpp endif -ifdef MOZ_ENABLE_GTK -LIBS += \ - -lgtksuperwin \ - $(NULL) -endif - ifdef MOZ_ENABLE_GTK2 LIBS += \ $(XLDFLAGS) \ @@ -83,7 +77,7 @@ LIBS += $(XPCOM_STANDALONE_GLUE_LDOPTS) DEFINES += -DXPCOM_GLUE -CXXFLAGS += $(MOZ_GTK_CFLAGS) $(MOZ_GTK2_CFLAGS) +CXXFLAGS += $(MOZ_GTK2_CFLAGS) ifdef ENABLE_GNOME CXXFLAGS += `gnome-config --cflags gnomeui` diff --git a/mozilla/embedding/browser/gtk/tests/TestGtkEmbed.cpp b/mozilla/embedding/browser/gtk/tests/TestGtkEmbed.cpp index ddcc73ffcfe..9f07c5f5f88 100644 --- a/mozilla/embedding/browser/gtk/tests/TestGtkEmbed.cpp +++ b/mozilla/embedding/browser/gtk/tests/TestGtkEmbed.cpp @@ -354,18 +354,11 @@ new_gtk_browser(guint32 chromeMask) FALSE, // fill 0); // padding // new horiz toolbar with buttons + icons -#ifdef MOZ_WIDGET_GTK - browser->toolbar = gtk_toolbar_new(GTK_ORIENTATION_HORIZONTAL, - GTK_TOOLBAR_BOTH); -#endif /* MOZ_WIDGET_GTK */ - -#ifdef MOZ_WIDGET_GTK2 browser->toolbar = gtk_toolbar_new(); gtk_toolbar_set_orientation(GTK_TOOLBAR(browser->toolbar), GTK_ORIENTATION_HORIZONTAL); gtk_toolbar_set_style(GTK_TOOLBAR(browser->toolbar), GTK_TOOLBAR_BOTH); -#endif /* MOZ_WIDGET_GTK2 */ // add it to the hbox gtk_box_pack_start(GTK_BOX(browser->toolbarHBox), browser->toolbar, diff --git a/mozilla/embedding/components/build/Makefile.in b/mozilla/embedding/components/build/Makefile.in index 4aa9d22c80f..2fa0d52df80 100644 --- a/mozilla/embedding/components/build/Makefile.in +++ b/mozilla/embedding/components/build/Makefile.in @@ -122,7 +122,7 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),os2) LOCAL_INCLUDES += -I$(srcdir)/../printingui/src/os2 endif -ifneq (,$(filter gtk gtk2 xlib beos photon qt, $(MOZ_WIDGET_TOOLKIT))) +ifneq (,$(filter gtk2 beos photon qt, $(MOZ_WIDGET_TOOLKIT))) LOCAL_INCLUDES += -I$(srcdir)/../printingui/src/unixshared endif diff --git a/mozilla/embedding/components/printingui/src/Makefile.in b/mozilla/embedding/components/printingui/src/Makefile.in index 9eab9250831..cacbed8a855 100644 --- a/mozilla/embedding/components/printingui/src/Makefile.in +++ b/mozilla/embedding/components/printingui/src/Makefile.in @@ -42,7 +42,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -ifneq (,$(filter gtk gtk2 xlib photon qt beos,$(MOZ_WIDGET_TOOLKIT))) +ifneq (,$(filter gtk2 photon qt beos,$(MOZ_WIDGET_TOOLKIT))) PLATFORM_DIR += unixshared endif diff --git a/mozilla/gfx/src/Makefile.in b/mozilla/gfx/src/Makefile.in index b54fa31e8a6..ce0cd7c5d81 100644 --- a/mozilla/gfx/src/Makefile.in +++ b/mozilla/gfx/src/Makefile.in @@ -75,7 +75,7 @@ endif endif # Build xlibrgb only for X toolkits and/or Xprint -ifneq (,$(filter xlib,$(MOZ_WIDGET_TOOLKIT))$(MOZ_ENABLE_XLIB)$(MOZ_ENABLE_XPRINT)) +ifneq (,$(MOZ_ENABLE_XPRINT)) DIRS += xlibrgb endif @@ -86,18 +86,12 @@ endif ifdef MOZ_ENABLE_CAIRO_GFX DIRS += thebes else - ifdef MOZ_ENABLE_GTK - DIRS += gtk - endif ifdef MOZ_ENABLE_GTK2 DIRS += gtk endif ifdef MOZ_ENABLE_QT DIRS += qt endif - ifdef MOZ_ENABLE_XLIB - DIRS += xlib - endif ifdef MOZ_ENABLE_PHOTON DIRS += photon endif @@ -126,7 +120,7 @@ ifeq (,$(filter windows,$(MOZ_WIDGET_TOOLKIT))) REQUIRES += uconv endif -ifneq (,$(filter gtk gtk2 xlib beos windows os2,$(MOZ_WIDGET_TOOLKIT))) +ifneq (,$(filter gtk2 beos windows os2,$(MOZ_WIDGET_TOOLKIT))) CPPSRCS += imgScaler.cpp endif diff --git a/mozilla/gfx/src/gtk/Makefile.in b/mozilla/gfx/src/gtk/Makefile.in index 9871a2f07bc..2658fff1d0c 100644 --- a/mozilla/gfx/src/gtk/Makefile.in +++ b/mozilla/gfx/src/gtk/Makefile.in @@ -118,12 +118,6 @@ CPPSRCS += \ mozilla-decoder.cpp endif -ifdef MOZ_ENABLE_GTK -CPPSRCS += \ - nsRegionGTK.cpp \ - $(NULL) -endif - ifdef MOZ_ENABLE_GTK2 CPPSRCS += \ nsRegionGTK2.cpp \ @@ -145,24 +139,12 @@ ifdef MOZ_ENABLE_XINERAMA GFX_XINERAMA_LIBS += $(MOZ_XINERAMA_LIBS) endif -ifdef MOZ_ENABLE_GTK -EXTRA_DSO_LDOPTS += \ - $(LIBS_DIR) \ - -lgkgfx \ - $(GFX_XINERAMA_LIBS) \ - -lgtksuperwin \ - $(MOZ_COMPONENT_LIBS) \ - $(MOZ_JS_LIBS) \ - $(MOZ_UNICHARUTIL_LIBS) \ - $(NULL) -endif - ifdef MOZ_ENABLE_XFT EXTRA_DSO_LDOPTS += $(FT2_LIBS) libs:: fontEncoding.properties pangoFontEncoding.properties $(INSTALL) $^ $(DIST)/bin/res/fonts - + install:: fontEncoding.properties pangoFontEncoding.properties $(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/res/fonts endif @@ -182,9 +164,9 @@ ifdef MOZ_ENABLE_PANGO EXTRA_DSO_LDOPTS += $(MOZ_PANGO_LIBS) endif -EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(MOZ_GTK_LDFLAGS) $(MOZ_XFT_LIBS) $(MOZ_GTK2_LIBS) -CXXFLAGS += $(MOZ_GTK_CFLAGS) $(MOZ_GTK2_CFLAGS) -CFLAGS += $(MOZ_GTK_CFLAGS) $(MOZ_GTK2_CFLAGS) +EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(MOZ_XFT_LIBS) $(MOZ_GTK2_LIBS) +CXXFLAGS += $(MOZ_GTK2_CFLAGS) +CFLAGS += $(MOZ_GTK2_CFLAGS) ifeq ($(OS_ARCH), SunOS) ifndef GNU_CC diff --git a/mozilla/gfx/src/gtk/nsDeviceContextGTK.cpp b/mozilla/gfx/src/gtk/nsDeviceContextGTK.cpp index 336e0ceea58..ebe79b18573 100644 --- a/mozilla/gfx/src/gtk/nsDeviceContextGTK.cpp +++ b/mozilla/gfx/src/gtk/nsDeviceContextGTK.cpp @@ -61,10 +61,6 @@ #include #include -#ifdef MOZ_WIDGET_GTK -#include "gdksuperwin.h" -#endif /* MOZ_WIDGET_GTK */ - #ifdef MOZ_WIDGET_GTK2 #include #include @@ -88,11 +84,6 @@ static PRInt32 GetOSDPI(void); #define GDK_DEFAULT_FONT1 "-*-helvetica-medium-r-*--*-120-*-*-*-*-iso8859-1" #define GDK_DEFAULT_FONT2 "-*-fixed-medium-r-*-*-*-120-*-*-*-*-*-*" -#ifdef MOZ_WIDGET_GTK -// this is specific to gtk 1.2 -extern NS_IMPORT_(GdkFont *) default_font; -#endif /* MOZ_WIDGET_GTK */ - /** * A singleton instance of nsSystemFontsGTK is created by the first * device context and destroyed by the module destructor. @@ -180,25 +171,6 @@ NS_IMETHODIMP nsDeviceContextGTK::Init(nsNativeWidget aNativeWidget) return NS_ERROR_FAILURE; } -#ifdef MOZ_WIDGET_GTK - - if (aNativeWidget) { - // superwin? - if (GDK_IS_SUPERWIN(aNativeWidget)) { - mDeviceWindow = GDK_SUPERWIN(aNativeWidget)->shell_window; - } - // gtk widget? - else if (GTK_IS_WIDGET(aNativeWidget)) { - mDeviceWindow = GTK_WIDGET(aNativeWidget)->window; - } - // must be a bin_window - else { - mDeviceWindow = NS_STATIC_CAST(GdkWindow *, aNativeWidget); - } - } - -#endif /* MOZ_WIDGET_GTK */ - #ifdef MOZ_WIDGET_GTK2 if (aNativeWidget) { @@ -757,7 +729,7 @@ ListFontProps(XFontStruct *aFont, Display *aDisplay) } #endif -#if defined(MOZ_ENABLE_COREXFONTS) || defined(MOZ_WIDGET_GTK) +#if defined(MOZ_ENABLE_COREXFONTS) #define LOCATE_MINUS(pos, str) { \ pos = str.FindChar('-'); \ @@ -798,134 +770,7 @@ AppendFontFFREName(nsString& aString, const char* aXLFDName) aString.AppendWithConversion(nameStr.get()); } -#endif /* MOZ_ENABLE_COREXFONTS || MOZ_WIDGET_GTK*/ - -#ifdef MOZ_WIDGET_GTK -static void -AppendFontName(XFontStruct* aFontStruct, nsString& aString, Display *aDisplay) -{ - unsigned long pr = 0; - // we first append the FFRE name to reconstruct font more faithfully - unsigned long font_atom = gdk_atom_intern("FONT", FALSE); - if (::XGetFontProperty(aFontStruct, font_atom, &pr) && pr) { - char* xlfdName = ::XGetAtomName(aDisplay, pr); - AppendFontFFREName(aString, xlfdName); - ::XFree(xlfdName); - } - - aString.Append(PRUnichar(',')); - - // next, we need to append family name to cover more encodings. - if ((::XGetFontProperty(aFontStruct, XA_FAMILY_NAME, &pr) || - ::XGetFontProperty(aFontStruct, XA_FULL_NAME, &pr)) && - pr) { - char *fontName = ::XGetAtomName(aDisplay, pr); - aString.AppendWithConversion(fontName); - ::XFree(fontName); - } -} - -static PRUint16 -GetFontWeight(XFontStruct* aFontStruct, Display *aDisplay) -{ - PRUint16 weight = NS_FONT_WEIGHT_NORMAL; - - // WEIGHT_NAME seems more reliable than WEIGHT, where 10 can mean - // anything. Check both, and make it bold if either says so. - unsigned long pr = 0; - Atom weightName = ::XInternAtom(aDisplay, "WEIGHT_NAME", True); - if (weightName != None) { - if (::XGetFontProperty(aFontStruct, weightName, &pr) && pr) { - char *weightString = ::XGetAtomName(aDisplay, pr); - if (nsCRT::strcasecmp(weightString, "bold") == 0) - weight = NS_FONT_WEIGHT_BOLD; - ::XFree(weightString); - } - } - - pr = 0; - if (::XGetFontProperty(aFontStruct, XA_WEIGHT, &pr) && pr > 10 ) - weight = NS_FONT_WEIGHT_BOLD; - - return weight; -} - -static nscoord -GetFontSize(XFontStruct *aFontStruct, float aPixelsToTwips) -{ - unsigned long pr = 0; - Atom pixelSizeAtom = ::XInternAtom(GDK_DISPLAY(), "PIXEL_SIZE", 0); - if (!::XGetFontProperty(aFontStruct, pixelSizeAtom, &pr) || !pr) - return DEFAULT_TWIP_FONT_SIZE; - return NSIntPixelsToTwips(pr, aPixelsToTwips); -} - -nsresult -nsSystemFontsGTK::GetSystemFontInfo(GtkWidget *aWidget, nsFont* aFont, - float aPixelsToTwips) const -{ - GtkStyle *style = gtk_widget_get_style(aWidget); - - GdkFont *theFont = style->font; - - aFont->style = NS_FONT_STYLE_NORMAL; - aFont->weight = NS_FONT_WEIGHT_NORMAL; - aFont->decorations = NS_FONT_DECORATION_NONE; - - // do we have the default_font defined by GTK/GDK then - // we use it, if not then we load helvetica, if not then - // we load fixed font else we error out. - if (!theFont) - theFont = default_font; // GTK default font - - if (!theFont) - theFont = ::gdk_font_load( GDK_DEFAULT_FONT1 ); - - if (!theFont) - theFont = ::gdk_font_load( GDK_DEFAULT_FONT2 ); - - if (!theFont) - return NS_ERROR_FAILURE; - - Display *fontDisplay = GDK_FONT_XDISPLAY(theFont); - if (theFont->type == GDK_FONT_FONT) { - XFontStruct *fontStruct = - NS_STATIC_CAST(XFontStruct*, GDK_FONT_XFONT(theFont)); - - aFont->name.Truncate(); - AppendFontName(fontStruct, aFont->name, fontDisplay); - aFont->weight = GetFontWeight(fontStruct, fontDisplay); - aFont->size = GetFontSize(fontStruct, aPixelsToTwips); - } else { - NS_ASSERTION(theFont->type == GDK_FONT_FONTSET, - "theFont->type can only have two values"); - - XFontSet fontSet = NS_REINTERPRET_CAST(XFontSet, GDK_FONT_XFONT(theFont)); - XFontStruct **fontStructs; - char **fontNames; - int numFonts = ::XFontsOfFontSet(fontSet, &fontStructs, &fontNames); - if (numFonts == 0) - return NS_ERROR_FAILURE; - - // Use the weight and size from the first font, but append all - // the names. - aFont->weight = GetFontWeight(*fontStructs, fontDisplay); - aFont->size = GetFontSize(*fontStructs, aPixelsToTwips); - nsString& fontName = aFont->name; - fontName.Truncate(); - for (;;) { - // we need to append FFRE name instead of family name in this case - AppendFontFFREName(fontName, *fontNames); - ++fontNames; - --numFonts; - if (numFonts == 0) - break; - fontName.Append(PRUnichar(',')); - } - } - return NS_OK; -} -#endif /* MOZ_WIDGET_GTK */ +#endif /* MOZ_ENABLE_COREXFONTS */ #ifdef MOZ_WIDGET_GTK2 @@ -990,27 +835,6 @@ nsSystemFontsGTK::GetSystemFontInfo(GtkWidget *aWidget, nsFont* aFont, } #endif /* MOZ_WIDGET_GTK2 */ -#ifdef MOZ_WIDGET_GTK -/* static */ -PRInt32 -GetOSDPI(void) -{ - -#ifdef MOZ_ENABLE_XFT - // try to get it from xft - if (NS_IsXftEnabled()) { - PRInt32 xftdpi = GetXftDPI(); - if (xftdpi) - return xftdpi; - } -#endif /* MOZ_ENABLE_XFT */ - - // Set OSVal to what the operating system thinks the logical resolution is. - float screenWidthIn = float(::gdk_screen_width_mm()) / 25.4f; - return NSToCoordRound(float(::gdk_screen_width()) / screenWidthIn); -} -#endif /* MOZ_WIDGET_GTK */ - #ifdef MOZ_WIDGET_GTK2 /* static */ PRInt32 diff --git a/mozilla/gfx/src/gtk/nsDrawingSurfaceGTK.cpp b/mozilla/gfx/src/gtk/nsDrawingSurfaceGTK.cpp index b3681f8c12b..a81b45f7a4d 100644 --- a/mozilla/gfx/src/gtk/nsDrawingSurfaceGTK.cpp +++ b/mozilla/gfx/src/gtk/nsDrawingSurfaceGTK.cpp @@ -272,11 +272,6 @@ nsresult nsDrawingSurfaceGTK :: Init(GdkDrawable *aDrawable, GdkGC *aGC) mGC = gdk_gc_ref(aGC); mPixmap = aDrawable; -#ifdef MOZ_WIDGET_GTK - mWidth = ((GdkWindowPrivate*)aDrawable)->width; - mHeight = ((GdkWindowPrivate*)aDrawable)->height; -#endif /* MOZ_WIDGET_GTK */ - #ifdef MOZ_WIDGET_GTK2 gint width = 0; gint height = 0; diff --git a/mozilla/gfx/src/gtk/nsFontMetricsXft.cpp b/mozilla/gfx/src/gtk/nsFontMetricsXft.cpp index ae793703a6c..7cf666cf3bb 100644 --- a/mozilla/gfx/src/gtk/nsFontMetricsXft.cpp +++ b/mozilla/gfx/src/gtk/nsFontMetricsXft.cpp @@ -1532,11 +1532,6 @@ nsFontMetricsXft::PrepareToDraw(nsRenderingContextGTK *aContext, GdkRegion *rgn = nsnull; clipRegion->GetNativeRegion((void *&)rgn); -#ifdef MOZ_WIDGET_GTK - GdkRegionPrivate *priv = (GdkRegionPrivate *)rgn; - XftDrawSetClip(*aDraw, priv->xregion); -#endif - #ifdef MOZ_WIDGET_GTK2 GdkRegionSetXftClip(rgn, *aDraw); #endif diff --git a/mozilla/gfx/src/gtk/nsGCCache.cpp b/mozilla/gfx/src/gtk/nsGCCache.cpp index 8c8851268be..6e01fa430e6 100644 --- a/mozilla/gfx/src/gtk/nsGCCache.cpp +++ b/mozilla/gfx/src/gtk/nsGCCache.cpp @@ -135,18 +135,6 @@ nsGCCache::ReportStats() { ); } -#ifdef MOZ_WIDGET_GTK - -GdkRegion * -nsGCCache::gdk_region_copy(GdkRegion *region) -{ - if (!copyRegion) copyRegion = gdk_region_new(); - - return gdk_regions_union(region, copyRegion); -} - -#endif - /* Dispose of entries matching the given flags, compressing the GC cache */ void nsGCCache::Flush(unsigned long flags) { @@ -213,12 +201,7 @@ GdkGC *nsGCCache::GetGC(GdkWindow *window, GdkGCValues *gcv, GdkGCValuesMask fla entry->clipRegion = NULL; //printf("creating new gc=%X\n",entry->gc); } -#ifdef MOZ_WIDGET_GTK - else if ( ((GdkGCPrivate*)entry->gc)->ref_count > 1 ) { -#endif /* MOZ_WIDGET_GTK */ -#ifdef MOZ_WIDGET_GTK2 else if ( G_OBJECT(entry->gc)->ref_count > 1 ) { -#endif /* MOZ_WIDGET_GTK2 */ // Old GC still in use, create new gdk_gc_unref(entry->gc); entry->gc=gdk_gc_new_with_values(window, gcv, flags); @@ -241,8 +224,6 @@ GdkGC *nsGCCache::GetGC(GdkWindow *window, GdkGCValues *gcv, GdkGCValuesMask fla return gdk_gc_ref(entry->gc); } -#ifdef MOZ_WIDGET_GTK2 - void nsGCCache::ReuseGC(GCCacheEntry *entry, GdkGCValues *gcv, GdkGCValuesMask flags) { // We have old GC, reuse it and check what @@ -287,108 +268,3 @@ void nsGCCache::ReuseGC(GCCacheEntry *entry, GdkGCValues *gcv, GdkGCValuesMask f entry->flags = flags; entry->gcv = *gcv; } - -#else /* MOZ_WIDGET_GTK and friends */ - -void nsGCCache::ReuseGC(GCCacheEntry *entry, GdkGCValues *gcv, GdkGCValuesMask flags) -{ - // We have old GC, reuse it and check what - // we have to change - - XGCValues xvalues; - unsigned long xvalues_mask=0; - - if (entry->clipRegion) { - // set it to none here and then set the clip region with - // gdk_gc_set_clip_region in GetGC() - xvalues.clip_mask = None; - xvalues_mask |= GCClipMask; - gdk_region_destroy(entry->clipRegion); - entry->clipRegion = NULL; - } - - if (entry->gcv.foreground.pixel != gcv->foreground.pixel) { - xvalues.foreground = gcv->foreground.pixel; - xvalues_mask |= GCForeground; - } - - if (entry->gcv.function != gcv->function) { - switch (gcv->function) { - case GDK_COPY: - xvalues.function = GXcopy; - break; - case GDK_INVERT: - xvalues.function = GXinvert; - break; - case GDK_XOR: - xvalues.function = GXxor; - break; - case GDK_CLEAR: - xvalues.function = GXclear; - break; - case GDK_AND: - xvalues.function = GXand; - break; - case GDK_AND_REVERSE: - xvalues.function = GXandReverse; - break; - case GDK_AND_INVERT: - xvalues.function = GXandInverted; - break; - case GDK_NOOP: - xvalues.function = GXnoop; - break; - case GDK_OR: - xvalues.function = GXor; - break; - case GDK_EQUIV: - xvalues.function = GXequiv; - break; - case GDK_OR_REVERSE: - xvalues.function = GXorReverse; - break; - case GDK_COPY_INVERT: - xvalues.function = GXcopyInverted; - break; - case GDK_OR_INVERT: - xvalues.function = GXorInverted; - break; - case GDK_NAND: - xvalues.function = GXnand; - break; - case GDK_SET: - xvalues.function = GXset; - break; - } - xvalues_mask |= GCFunction; - } - - if(entry->gcv.font != gcv->font && flags & GDK_GC_FONT) { - xvalues.font = ((XFontStruct *)GDK_FONT_XFONT(gcv->font))->fid; - xvalues_mask |= GCFont; - } - - if (entry->gcv.line_style != gcv->line_style) { - switch (gcv->line_style) { - case GDK_LINE_SOLID: - xvalues.line_style = LineSolid; - break; - case GDK_LINE_ON_OFF_DASH: - xvalues.line_style = LineOnOffDash; - break; - case GDK_LINE_DOUBLE_DASH: - xvalues.line_style = LineDoubleDash; - break; - } - xvalues_mask |= GCLineStyle; - } - - if (xvalues_mask != 0) { - XChangeGC(GDK_GC_XDISPLAY(entry->gc), GDK_GC_XGC(entry->gc), - xvalues_mask, &xvalues); - } - entry->flags = flags; - entry->gcv = *gcv; -} - -#endif /* MOZ_WIDGET_GTK */ diff --git a/mozilla/gfx/src/gtk/nsGCCache.h b/mozilla/gfx/src/gtk/nsGCCache.h index d988d1ea4ec..cb37c1497f4 100644 --- a/mozilla/gfx/src/gtk/nsGCCache.h +++ b/mozilla/gfx/src/gtk/nsGCCache.h @@ -81,9 +81,6 @@ private: PRCList GCFreeList; void free_cache_entry(PRCList *clist); void move_cache_entry(PRCList *clist); -#ifdef MOZ_WIDGET_GTK - static GdkRegion * gdk_region_copy(GdkRegion *region); -#endif static GdkRegion *copyRegion; void ReportStats(); diff --git a/mozilla/gfx/src/gtk/nsGdkUtils.cpp b/mozilla/gfx/src/gtk/nsGdkUtils.cpp index eed0a185ed6..fc3b65d7475 100644 --- a/mozilla/gfx/src/gtk/nsGdkUtils.cpp +++ b/mozilla/gfx/src/gtk/nsGdkUtils.cpp @@ -49,38 +49,17 @@ my_gdk_draw_text(GdkDrawable *drawable, const gchar *text, gint text_length) { -#ifdef MOZ_WIDGET_GTK - GdkWindowPrivate *drawable_private; - GdkFontPrivate *font_private; - GdkGCPrivate *gc_private; -#endif /* MOZ_WIDGET_GTK */ - g_return_if_fail (drawable != NULL); g_return_if_fail (font != NULL); g_return_if_fail (gc != NULL); g_return_if_fail (text != NULL); -#ifdef MOZ_WIDGET_GTK - drawable_private = (GdkWindowPrivate*) drawable; - if (drawable_private->destroyed) - return; - - gc_private = (GdkGCPrivate*) gc; - font_private = (GdkFontPrivate*) font; -#endif /* MOZ_WIDGET_GTK */ -#ifdef MOZ_WIDGET_GTK2 if (GDK_IS_WINDOW(drawable) && GDK_WINDOW_OBJECT(drawable)->destroyed) return; -#endif /* MOZ_WIDGET_GTK2 */ if (font->type == GDK_FONT_FONT) { -#ifdef MOZ_WIDGET_GTK - XFontStruct *xfont = (XFontStruct *) font_private->xfont; -#endif /* MOZ_WIDGET_GTK */ -#ifdef MOZ_WIDGET_GTK2 XFontStruct *xfont = (XFontStruct *) GDK_FONT_XFONT(font); -#endif /* MOZ_WIDGET_GTK2 */ // gdk does this... we don't need it.. // XSetFont(drawable_private->xdisplay, gc_private->xgc, xfont->fid); @@ -91,41 +70,21 @@ my_gdk_draw_text(GdkDrawable *drawable, if ((xfont->min_byte1 == 0) && (xfont->max_byte1 == 0)) { -#ifdef MOZ_WIDGET_GTK - XDrawString (drawable_private->xdisplay, drawable_private->xwindow, - gc_private->xgc, x, y, text, MIN(text_length, 32768)); -#endif /* MOZ_WIDGET_GTK */ -#ifdef MOZ_WIDGET_GTK2 XDrawString (GDK_WINDOW_XDISPLAY(drawable), GDK_DRAWABLE_XID(drawable), GDK_GC_XGC(gc), x, y, text, MIN(text_length, 32768)); -#endif /* MOZ_WIDGET_GTK2 */ } else { -#ifdef MOZ_WIDGET_GTK - XDrawString16 (drawable_private->xdisplay, drawable_private->xwindow, - gc_private->xgc, x, y, (XChar2b *) text, - MIN((text_length / 2), 32768)); -#endif /* MOZ_WIDGET_GTK */ -#ifdef MOZ_WIDGET_GTK2 XDrawString16 (GDK_WINDOW_XDISPLAY(drawable), GDK_DRAWABLE_XID(drawable), GDK_GC_XGC(gc), x, y, (XChar2b *) text, MIN((text_length / 2), 32768)); -#endif /* MOZ_WIDGET_GTK2 */ } } else if (font->type == GDK_FONT_FONTSET) { -#ifdef MOZ_WIDGET_GTK - XFontSet fontset = (XFontSet) font_private->xfont; - XmbDrawString (drawable_private->xdisplay, drawable_private->xwindow, - fontset, gc_private->xgc, x, y, text, text_length); -#endif /* MOZ_WIDGET_GTK */ -#ifdef MOZ_WIDGET_GTK2 XFontSet fontset = (XFontSet) GDK_FONT_XFONT(font); XmbDrawString (GDK_WINDOW_XDISPLAY(drawable), GDK_DRAWABLE_XID(drawable), fontset, GDK_GC_XGC(gc), x, y, text, text_length); -#endif /* MOZ_WIDGET_GTK2 */ } else g_error("undefined font type\n"); diff --git a/mozilla/gfx/src/gtk/nsGfxFactoryGTK.cpp b/mozilla/gfx/src/gtk/nsGfxFactoryGTK.cpp index 60905447a68..cc13e68e447 100644 --- a/mozilla/gfx/src/gtk/nsGfxFactoryGTK.cpp +++ b/mozilla/gfx/src/gtk/nsGfxFactoryGTK.cpp @@ -294,9 +294,6 @@ nsGfxGTKModuleDtor(nsIModule *self) nsDeviceContextGTK::Shutdown(); nsImageGTK::Shutdown(); nsGCCache::Shutdown(); -#ifdef MOZ_WIDGET_GTK - nsRegionGTK::Shutdown(); -#endif } NS_IMPL_NSGETMODULE_WITH_CTOR_DTOR(nsGfxGTKModule, components, diff --git a/mozilla/gfx/src/gtk/nsRegionGTK.h b/mozilla/gfx/src/gtk/nsRegionGTK.h index 84ca4974a0b..e28559dfe88 100644 --- a/mozilla/gfx/src/gtk/nsRegionGTK.h +++ b/mozilla/gfx/src/gtk/nsRegionGTK.h @@ -53,9 +53,6 @@ public: NS_DECL_ISUPPORTS virtual nsresult Init(); -#ifdef MOZ_WIDGET_GTK - static void Shutdown(); -#endif virtual void SetTo(const nsIRegion &aRegion); virtual void SetTo(PRInt32 aX, PRInt32 aY, PRInt32 aWidth, PRInt32 aHeight); @@ -76,18 +73,6 @@ public: NS_IMETHOD GetRegionComplexity(nsRegionComplexity &aComplexity) const; NS_IMETHOD GetNumRects(PRUint32 *aRects) const; -protected: -#ifdef MOZ_WIDGET_GTK - GdkRegion *gdk_region_copy(GdkRegion *region); - GdkRegion *gdk_region_from_rect(PRInt32 aX, PRInt32 aY, - PRInt32 aWidth, PRInt32 aHeight); - -private: - inline GdkRegion *GetCopyRegion(); - inline void SetRegionEmpty(); - - static GdkRegion *copyRegion; -#endif private: GdkRegion *mRegion; diff --git a/mozilla/layout/build/Makefile.in b/mozilla/layout/build/Makefile.in index 1c93c74340c..1546e1a4cde 100644 --- a/mozilla/layout/build/Makefile.in +++ b/mozilla/layout/build/Makefile.in @@ -219,12 +219,6 @@ EXTRA_DSO_LDOPTS = \ $(MOZ_JS_LIBS) \ $(NULL) -ifdef MOZ_ENABLE_XLIB -EXTRA_DSO_LDOPTS += \ - -lxlibrgb \ - $(NULL) -endif - ifdef NS_TRACE_MALLOC EXTRA_DSO_LIBS += tracemalloc endif @@ -253,7 +247,7 @@ EXTRA_DSO_LDOPTS += \ endif # Add explicit X11 dependency when building against X11 toolkits -ifneq (,$(filter gtk gtk2 qt xlib,$(MOZ_WIDGET_TOOLKIT))) +ifneq (,$(filter gtk2 qt,$(MOZ_WIDGET_TOOLKIT))) EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) endif diff --git a/mozilla/layout/generic/nsObjectFrame.cpp b/mozilla/layout/generic/nsObjectFrame.cpp index af1bc887080..553a391b512 100644 --- a/mozilla/layout/generic/nsObjectFrame.cpp +++ b/mozilla/layout/generic/nsObjectFrame.cpp @@ -639,7 +639,7 @@ nsObjectFrame::GetDesiredSize(nsPresContext* aPresContext, aReflowState.mComputedMaxHeight); } -#if defined (MOZ_WIDGET_GTK) || defined (MOZ_WIDGET_GTK2) || defined (MOZ_WIDGET_XLIB) +#if defined (MOZ_WIDGET_GTK2) // We need to make sure that the size of the object frame does not // exceed the maximum size of X coordinates. See bug #225357 for // more information. In theory Gtk2 can handle large coordinates, diff --git a/mozilla/modules/plugin/Makefile.in b/mozilla/modules/plugin/Makefile.in index f3652344b81..5cf0ceedd36 100644 --- a/mozilla/modules/plugin/Makefile.in +++ b/mozilla/modules/plugin/Makefile.in @@ -51,22 +51,13 @@ DIRS += base/src ifndef MINIMO -ifneq (,$(filter gtk gtk2 xlib ,$(MOZ_WIDGET_TOOLKIT))) +ifneq (,$(filter gtk2 ,$(MOZ_WIDGET_TOOLKIT))) TOOL_DIRS += samples/unixprinting endif # These subdirs rely on GTK libraries and header files, it is not # buildable on other non-GTK unix builds -ifdef MOZ_ENABLE_GTK -TOOL_DIRS += samples/default/unix - -ifdef ENABLE_TESTS -TOOL_DIRS += samples/simple -endif - -endif - ifdef MOZ_ENABLE_GTK2 TOOL_DIRS += samples/default/unix endif diff --git a/mozilla/modules/plugin/base/src/Makefile.in b/mozilla/modules/plugin/base/src/Makefile.in index 026a81ebaab..a0ae01e8c71 100644 --- a/mozilla/modules/plugin/base/src/Makefile.in +++ b/mozilla/modules/plugin/base/src/Makefile.in @@ -79,12 +79,9 @@ REQUIRES = xpcom \ locale \ $(NULL) -ifneq (,$(filter gtk gtk2,$(MOZ_WIDGET_TOOLKIT))) +ifneq (,$(filter gtk2,$(MOZ_WIDGET_TOOLKIT))) REQUIRES += gtkxtbin endif -ifeq ($(MOZ_WIDGET_TOOLKIT),xlib) -REQUIRES += xlibxtbin xlibrgb -endif CPPSRCS = \ ns4xPlugin.cpp \ @@ -160,24 +157,12 @@ ifeq ($(OS_ARCH),OS2) ADD_TO_DEF_FILE = cat < $(srcdir)/extradefs.os2 >> $(DEF_FILE) endif -ifdef MOZ_ENABLE_GTK -CXXFLAGS += $(MOZ_GTK_CFLAGS) -CFLAGS += $(MOZ_GTK_CFLAGS) -EXTRA_DSO_LDOPTS += -lgtkxtbin -lgtksuperwin $(XLDFLAGS) $(XT_LIBS) $(MOZ_GTK_LDFLAGS) -endif #MOZ_ENABLE_GTK - ifdef MOZ_ENABLE_GTK2 CXXFLAGS += $(MOZ_GTK2_CFLAGS) CFLAGS += $(MOZ_GTK2_CFLAGS) EXTRA_DSO_LDOPTS += -lgtkxtbin $(XLDFLAGS) $(XT_LIBS) $(MOZ_GTK2_LIBS) $(XLIBS) endif #MOZ_ENABLE_GTK2 -ifdef MOZ_ENABLE_XLIB -EXTRA_DSO_LDOPTS += -lxlibxtbin -lxlibrgb $(XLDFLAGS) $(XT_LIBS) $(XLIBS) -CXXFLAGS += $(MOZ_XLIB_CFLAGS) -CFLAGS += $(MOZ_XLIB_CFLAGS) -endif #MOZ_ENABLE_XLIB - ifdef MOZ_ENABLE_QT EXTRA_DSO_LDOPTS += $(MOZ_QT_LDFLAGS) CXXFLAGS += $(MOZ_QT_CFLAGS) diff --git a/mozilla/modules/plugin/base/src/ns4xPlugin.cpp b/mozilla/modules/plugin/base/src/ns4xPlugin.cpp index 4f98e59a42d..e40bcce5295 100644 --- a/mozilla/modules/plugin/base/src/ns4xPlugin.cpp +++ b/mozilla/modules/plugin/base/src/ns4xPlugin.cpp @@ -74,12 +74,6 @@ #endif //needed for nppdf plugin -#ifdef MOZ_WIDGET_GTK -#include -#include -#include "gtkxtbin.h" -#endif - #ifdef MOZ_WIDGET_GTK2 #include #include @@ -1829,8 +1823,6 @@ _getvalue(NPP npp, NPNVariable variable, void *result) return NPERR_NO_ERROR; } } -#endif -#if defined(MOZ_WIDGET_GTK) || defined(MOZ_WIDGET_GTK2) // adobe nppdf calls XtGetApplicationNameAndClass(display, // &instance, &class) we have to init Xt toolkit before get // XtDisplay just call gtk_xtbin_new(w,0) once @@ -1941,10 +1933,6 @@ _getvalue(NPP npp, NPNVariable variable, void *result) } case NPNVToolkit: { -#ifdef MOZ_WIDGET_GTK - *((NPNToolkitType*)result) = NPNVGtk12; -#endif - #ifdef MOZ_WIDGET_GTK2 *((NPNToolkitType*)result) = NPNVGtk2; #endif diff --git a/mozilla/modules/plugin/base/src/ns4xPluginInstance.cpp b/mozilla/modules/plugin/base/src/ns4xPluginInstance.cpp index f711be69729..fd715315ee6 100644 --- a/mozilla/modules/plugin/base/src/ns4xPluginInstance.cpp +++ b/mozilla/modules/plugin/base/src/ns4xPluginInstance.cpp @@ -59,24 +59,12 @@ #include "nsILegacyPluginWrapperOS2.h" #endif -#ifdef MOZ_WIDGET_GTK -#include -#include -#include "gtkxtbin.h" -#endif - #ifdef MOZ_WIDGET_GTK2 #include #include #include "gtk2xtbin.h" #endif -#ifdef MOZ_WIDGET_XLIB -#include "xlibxtbin.h" -#include "xlibrgb.h" -#endif - - //////////////////////////////////////////////////////////////////////// // CID's && IID's static NS_DEFINE_IID(kCPluginManagerCID, NS_PLUGINMANAGER_CID); // needed for NS_TRY_SAFE_CALL @@ -832,13 +820,9 @@ ns4xPluginInstance::~ns4xPluginInstance(void) { PLUGIN_LOG(PLUGIN_LOG_BASIC, ("ns4xPluginInstance dtor: this=%p\n",this)); -#if defined(MOZ_WIDGET_GTK) || defined (MOZ_WIDGET_GTK2) +#if defined (MOZ_WIDGET_GTK2) if (mXtBin) gtk_widget_destroy(mXtBin); -#elif defined(MOZ_WIDGET_XLIB) - if (mXlibXtBin) { - delete mXlibXtBin; - } #endif // clean the stream list if any @@ -863,10 +847,8 @@ NS_IMETHODIMP ns4xPluginInstance::Initialize(nsIPluginInstancePeer* peer) { PLUGIN_LOG(PLUGIN_LOG_NORMAL, ("ns4xPluginInstance::Initialize this=%p\n",this)); -#if defined (MOZ_WIDGET_GTK) || defined (MOZ_WIDGET_GTK2) +#if defined (MOZ_WIDGET_GTK2) mXtBin = nsnull; -#elif defined(MOZ_WIDGET_XLIB) - mXlibXtBin = nsnull; #endif return InitializePlugin(peer); } @@ -885,21 +867,6 @@ NS_IMETHODIMP ns4xPluginInstance::Start(void) { PLUGIN_LOG(PLUGIN_LOG_NORMAL, ("ns4xPluginInstance::Start this=%p\n",this)); -#ifdef MOZ_WIDGET_XLIB - if (mXlibXtBin == nsnull) - mXlibXtBin = new xtbin(); - - if (mXlibXtBin == nsnull) - return NS_ERROR_OUT_OF_MEMORY; - - if (!mXlibXtBin->xtbin_initialized()) - mXlibXtBin->xtbin_init(); - -#ifdef NS_DEBUG - printf("Made new XtBin: %p, %d\n", mXlibXtBin, mXlibXtBin->xtbin_initialized()); -#endif -#endif - if(mStarted) return NS_OK; else @@ -923,16 +890,11 @@ NS_IMETHODIMP ns4xPluginInstance::Stop(void) } } -#if defined(MOZ_WIDGET_GTK) || defined (MOZ_WIDGET_GTK2) +#if defined (MOZ_WIDGET_GTK2) if (mXtBin) { gtk_widget_destroy(mXtBin); mXtBin = 0; } -#elif defined(MOZ_WIDGET_XLIB) - if (mXlibXtBin) { - mXlibXtBin->xtbin_destroy(); - mXlibXtBin = 0; - } #endif if(!mStarted) @@ -1143,7 +1105,7 @@ NS_IMETHODIMP ns4xPluginInstance::Destroy(void) //////////////////////////////////////////////////////////////////////// NS_IMETHODIMP ns4xPluginInstance::SetWindow(nsPluginWindow* window) { -#if defined(MOZ_WIDGET_GTK) || defined (MOZ_WIDGET_GTK2) || defined(MOZ_WIDGET_XLIB) +#if defined (MOZ_WIDGET_GTK2) NPSetWindowCallbackStruct *ws; #endif @@ -1153,7 +1115,7 @@ NS_IMETHODIMP ns4xPluginInstance::SetWindow(nsPluginWindow* window) NPError error; -#if defined (MOZ_WIDGET_GTK) || defined (MOZ_WIDGET_GTK2) +#if defined (MOZ_WIDGET_GTK2) PRBool isXembed = PR_FALSE; // bug 108337, flash plugin on linux doesn't like window->width <= 0 if ((PRInt32) window->width <= 0 || (PRInt32) window->height <= 0) @@ -1262,69 +1224,6 @@ NS_IMETHODIMP ns4xPluginInstance::SetWindow(nsPluginWindow* window) gtk_xtbin_resize(mXtBin, window->width, window->height); } -#elif defined(MOZ_WIDGET_XLIB) - - - // Allocate and fill out the ws_info data - if (!window->ws_info) { -#ifdef NS_DEBUG - printf("About to create new ws_info...\n"); -#endif - - // allocate a new NPSetWindowCallbackStruct structure at ws_info - window->ws_info = (NPSetWindowCallbackStruct *)PR_MALLOC(sizeof(NPSetWindowCallbackStruct)); - - if (!window->ws_info) - return NS_ERROR_OUT_OF_MEMORY; - - ws = (NPSetWindowCallbackStruct *)window->ws_info; - -#if 1 - /* See comment above in GTK+ port ... */ - if (mXlibXtBin) { - delete mXlibXtBin; - mXlibXtBin = nsnull; - } -#endif - - if (!mXlibXtBin) { - mXlibXtBin = new xtbin(); - // Check to see if creating mXlibXtBin failed for some reason. - // if it did, we can't go any further. - if (!mXlibXtBin) - return NS_ERROR_FAILURE; - } - - if (window->window) { -#ifdef NS_DEBUG - printf("About to create new xtbin of %i X %i from %08x...\n", - window->width, window->height, window->window); -#endif - - mXlibXtBin->xtbin_new((Window)window->window); - mXlibXtBin->xtbin_resize(0, 0, window->width, window->height); -#ifdef NS_DEBUG - printf("About to show xtbin(%p)...\n", mXlibXtBin); fflush(NULL); -#endif - mXlibXtBin->xtbin_realize(); - } - - /* Set window attributes */ - XlibRgbHandle *xlibRgbHandle = xxlib_find_handle(XXLIBRGB_DEFAULT_HANDLE); - Display *xdisplay = xxlib_rgb_get_display(xlibRgbHandle); - - /* Fill in window info structure */ - ws->type = 0; - ws->depth = xxlib_rgb_get_depth(xlibRgbHandle); - ws->display = xdisplay; - ws->visual = xxlib_rgb_get_visual(xlibRgbHandle); - ws->colormap = xxlib_rgb_get_cmap(xlibRgbHandle); - XFlush(ws->display); - } // !window->ws_info - - // And now point the NPWindow structures window - // to the actual X window - window->window = (nsPluginPort *)mXlibXtBin->xtbin_xtwindow(); #endif // MOZ_WIDGET if (fCallbacks->setwindow) { diff --git a/mozilla/modules/plugin/base/src/ns4xPluginInstance.h b/mozilla/modules/plugin/base/src/ns4xPluginInstance.h index a915281b5d3..595b313eb2c 100644 --- a/mozilla/modules/plugin/base/src/ns4xPluginInstance.h +++ b/mozilla/modules/plugin/base/src/ns4xPluginInstance.h @@ -63,10 +63,8 @@ #endif #include "prlink.h" // for PRLibrary -#if defined (MOZ_WIDGET_GTK) || defined (MOZ_WIDGET_GTK2) +#if defined (MOZ_WIDGET_GTK2) #include -#elif defined (MOZ_WIDGET_XLIB) -#include "xlibxtbin.h" #endif //////////////////////////////////////////////////////////////////////// @@ -176,14 +174,12 @@ protected: */ NPPluginFuncs* fCallbacks; -#if defined (MOZ_WIDGET_GTK) || defined (MOZ_WIDGET_GTK2) +#if defined (MOZ_WIDGET_GTK2) /** * Special GtkXtBin widget that encapsulates the Xt toolkit * within a Gtk Application */ GtkWidget *mXtBin; -#elif defined (MOZ_WIDGET_XLIB) - xtbin *mXlibXtBin; #endif /** diff --git a/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp b/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp index 55f3cf6e3c6..7ffb05fecf1 100644 --- a/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp +++ b/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp @@ -174,12 +174,10 @@ #include "nsContentErrors.h" #ifdef XP_UNIX -#if defined(MOZ_WIDGET_GTK) || defined (MOZ_WIDGET_GTK2) +#if defined (MOZ_WIDGET_GTK2) #include // for GDK_DISPLAY() #elif defined(MOZ_WIDGET_QT) #include // for qt_xdisplay() -#elif defined(MOZ_WIDGET_XLIB) -#include "xlibrgb.h" // for xlib_rgb_get_display() #endif #endif @@ -2635,12 +2633,10 @@ NS_IMETHODIMP nsPluginHostImpl::GetValue(nsPluginManagerVariable aVariable, void #if defined(XP_UNIX) && !defined(XP_MACOSX) && defined(MOZ_X11) if (nsPluginManagerVariable_XDisplay == aVariable) { Display** value = NS_REINTERPRET_CAST(Display**, aValue); -#if defined(MOZ_WIDGET_GTK) || defined (MOZ_WIDGET_GTK2) +#if 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 if (!(*value)) { return NS_ERROR_FAILURE; @@ -6800,7 +6796,7 @@ nsresult nsPluginStreamListenerPeer::ServeStreamAsFile(nsIRequest *request, if (owner) { nsPluginWindow *window = nsnull; owner->GetWindow(window); -#if defined (MOZ_WIDGET_GTK) || defined (MOZ_WIDGET_GTK2) +#if defined (MOZ_WIDGET_GTK2) // Should call GetPluginPort() here. // This part is copied from nsPluginInstanceOwner::GetPluginPort(). nsCOMPtr widget; diff --git a/mozilla/modules/plugin/base/src/nsPluginsDirUnix.cpp b/mozilla/modules/plugin/base/src/nsPluginsDirUnix.cpp index 802151ee047..d6ecb6f2c25 100644 --- a/mozilla/modules/plugin/base/src/nsPluginsDirUnix.cpp +++ b/mozilla/modules/plugin/base/src/nsPluginsDirUnix.cpp @@ -83,7 +83,7 @@ #define DEFAULT_X11_PATH "" #endif -#if defined(MOZ_WIDGET_GTK) || defined(MOZ_WIDGET_GTK2) +#if defined(MOZ_WIDGET_GTK2) #define PLUGIN_MAX_LEN_OF_TMP_ARR 512 @@ -248,7 +248,7 @@ static void LoadExtraSharedLibs() } } } -#endif //MOZ_WIDGET_GTK || MOZ_WIDGET_GTK2 +#endif //MOZ_WIDGET_GTK2 @@ -382,7 +382,7 @@ nsresult nsPluginFile::LoadPlugin(PRLibrary* &outLibrary) libSpec.value.pathname = path.get(); -#if defined(MOZ_WIDGET_GTK) || defined(MOZ_WIDGET_GTK2) +#if defined(MOZ_WIDGET_GTK2) /////////////////////////////////////////////////////////// // Normally, Mozilla isn't linked against libXt and libXext @@ -413,7 +413,7 @@ nsresult nsPluginFile::LoadPlugin(PRLibrary* &outLibrary) } #else pLibrary = outLibrary = PR_LoadLibraryWithFlags(libSpec, 0); -#endif // MOZ_WIDGET_GTK || MOZ_WIDGET_GTK2 +#endif // MOZ_WIDGET_GTK2 #ifdef NS_DEBUG printf("LoadPlugin() %s returned %lx\n", diff --git a/mozilla/modules/plugin/samples/default/unix/Makefile.in b/mozilla/modules/plugin/samples/default/unix/Makefile.in index 092f38b1339..728696dadd2 100644 --- a/mozilla/modules/plugin/samples/default/unix/Makefile.in +++ b/mozilla/modules/plugin/samples/default/unix/Makefile.in @@ -71,12 +71,6 @@ include $(topsrcdir)/config/rules.mk EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) $(XT_LIBS) \ $(NULL) -ifdef MOZ_ENABLE_GTK -EXTRA_DSO_LDOPTS += $(MOZ_GTK_LDFLAGS) -CXXFLAGS += $(MOZ_GTK_CFLAGS) -CFLAGS += $(MOZ_GTK_CFLAGS) -endif - ifdef MOZ_ENABLE_GTK2 EXTRA_DSO_LDOPTS += $(MOZ_GTK2_LIBS) $(XLDFLAGS) $(XLIBS) CXXFLAGS += $(MOZ_GTK2_CFLAGS) diff --git a/mozilla/modules/plugin/samples/simple/Makefile.in b/mozilla/modules/plugin/samples/simple/Makefile.in index 88529e295c9..aba72a79b8e 100644 --- a/mozilla/modules/plugin/samples/simple/Makefile.in +++ b/mozilla/modules/plugin/samples/simple/Makefile.in @@ -71,12 +71,11 @@ EXTRA_DSO_LDOPTS += \ -L$(DIST)/lib \ -lgtksuperwin \ $(MOZ_COMPONENT_LIBS) \ - $(MOZ_GTK_LDFLAGS) \ $(NULL) include $(topsrcdir)/config/rules.mk -CXXFLAGS += $(MOZ_TOOLKIT_REGISTRY_CFLAGS) $(MOZ_GTK_CFLAGS) +CXXFLAGS += $(MOZ_TOOLKIT_REGISTRY_CFLAGS) libs:: $(INSTALL) $(srcdir)/samples/embed-test.html $(DIST)/bin/res/samples diff --git a/mozilla/modules/staticmod/Makefile.in b/mozilla/modules/staticmod/Makefile.in index 61064f8d539..39c84a38090 100644 --- a/mozilla/modules/staticmod/Makefile.in +++ b/mozilla/modules/staticmod/Makefile.in @@ -91,7 +91,7 @@ OS_LIBS += $(call EXPAND_LIBNAME, usp10) endif endif -ifneq (,$(MOZ_ENABLE_GTK)$(MOZ_ENABLE_GTK2)$(MOZ_ENABLE_XLIB)) +ifneq (,$(MOZ_ENABLE_GTK2)) OS_LIBS += $(XLDFLAGS) $(XT_LIBS) endif diff --git a/mozilla/other-licenses/branding/firefox/Makefile.in b/mozilla/other-licenses/branding/firefox/Makefile.in index f80437bc2b2..c19936e91c7 100644 --- a/mozilla/other-licenses/branding/firefox/Makefile.in +++ b/mozilla/other-licenses/branding/firefox/Makefile.in @@ -31,7 +31,7 @@ BROWSER_APP_FILES = \ export:: $(NSINSTALL) -D $(DIST)/branding cp $(addprefix $(srcdir)/, $(BROWSER_APP_FILES)) $(DIST)/branding/ -ifneq (,$(filter gtk gtk2,$(MOZ_WIDGET_TOOLKIT))) +ifneq (,$(filter gtk2,$(MOZ_WIDGET_TOOLKIT))) cp $(srcdir)/document.png $(DIST)/branding/document.png $(NSINSTALL) -D $(DIST)/install cp $(srcdir)/header.png $(DIST)/install/header.png diff --git a/mozilla/toolkit/components/alerts/Makefile.in b/mozilla/toolkit/components/alerts/Makefile.in index ef1ac836127..98e74f73837 100644 --- a/mozilla/toolkit/components/alerts/Makefile.in +++ b/mozilla/toolkit/components/alerts/Makefile.in @@ -45,7 +45,7 @@ include $(DEPTH)/config/autoconf.mk DIRS = public -ifneq (,$(filter $(MOZ_WIDGET_TOOLKIT),windows gtk gtk2)) +ifneq (,$(filter $(MOZ_WIDGET_TOOLKIT),windows gtk2)) DIRS += src endif diff --git a/mozilla/toolkit/components/build/Makefile.in b/mozilla/toolkit/components/build/Makefile.in index c66dce36f72..aa93e6dea4a 100644 --- a/mozilla/toolkit/components/build/Makefile.in +++ b/mozilla/toolkit/components/build/Makefile.in @@ -50,7 +50,7 @@ IS_COMPONENT = 1 MODULE_NAME = nsToolkitCompsModule LIBXUL_LIBRARY = 1 -ifneq (,$(filter $(MOZ_WIDGET_TOOLKIT),windows gtk gtk2)) +ifneq (,$(filter $(MOZ_WIDGET_TOOLKIT),windows gtk2)) ALERTS_SERVICE=1 DEFINES += -DALERTS_SERVICE endif diff --git a/mozilla/toolkit/components/remote/Makefile.in b/mozilla/toolkit/components/remote/Makefile.in index e099853b93e..42c772ebaa5 100644 --- a/mozilla/toolkit/components/remote/Makefile.in +++ b/mozilla/toolkit/components/remote/Makefile.in @@ -69,7 +69,7 @@ REQUIRES = \ XPIDLSRCS = nsIRemoteService.idl -ifneq (,$(filter gtk gtk2,$(MOZ_WIDGET_TOOLKIT))) +ifneq (,$(filter gtk2,$(MOZ_WIDGET_TOOLKIT))) CPPSRCS += nsGTKRemoteService.cpp endif @@ -83,7 +83,7 @@ EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) $(TK_LIBS) CXXFLAGS += $(TK_CFLAGS) # Add explicit X11 dependency when building against X11 toolkits -ifneq (,$(filter gtk gtk2 qt xlib,$(MOZ_WIDGET_TOOLKIT))) +ifneq (,$(filter gtk2 qt,$(MOZ_WIDGET_TOOLKIT))) EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) endif diff --git a/mozilla/toolkit/library/Makefile.in b/mozilla/toolkit/library/Makefile.in index 39f826371e2..0c42c06ab42 100644 --- a/mozilla/toolkit/library/Makefile.in +++ b/mozilla/toolkit/library/Makefile.in @@ -77,7 +77,7 @@ CPPSRCS += dlldeps-xul.cpp endif # dependent libraries -ifneq (,$(MOZ_ENABLE_GTK)$(MOZ_ENABLE_GTK2)) +ifneq (,$(MOZ_ENABLE_GTK2)) SHARED_LIBRARY_LIBS += \ $(DEPTH)/embedding/browser/gtk/src/$(LIB_PREFIX)gtkembedmoz.$(LIB_SUFFIX) endif @@ -174,10 +174,6 @@ EXTRA_DSO_LDOPTS += \ $(MOZ_COMPONENT_LIBS) \ $(MOZ_JS_LIBS) \ $(NULL) - -ifdef MOZ_ENABLE_GTK -EXTRA_DSO_LDOPTS += -L$(DIST)/lib -lgtksuperwin -endif endif DEFINES += -DIMPL_XREAPI @@ -199,8 +195,8 @@ ifdef MOZ_ENABLE_XINERAMA EXTRA_DSO_LDOPTS += $(MOZ_XINERAMA_LIBS) endif -ifneq (,$(filter gtk gtk2 qt xlib,$(MOZ_WIDGET_TOOLKIT))) -EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(MOZ_GTK_LDFLAGS) $(MOZ_XFT_LIBS) $(MOZ_GTK2_LIBS) $(XT_LIBS) +ifneq (,$(filter gtk2 qt,$(MOZ_WIDGET_TOOLKIT))) +EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(MOZ_XFT_LIBS) $(MOZ_GTK2_LIBS) $(XT_LIBS) endif ifdef MOZ_ENABLE_XFT diff --git a/mozilla/toolkit/library/libxul-config.mk b/mozilla/toolkit/library/libxul-config.mk index 4007809bf4e..0e86648694a 100644 --- a/mozilla/toolkit/library/libxul-config.mk +++ b/mozilla/toolkit/library/libxul-config.mk @@ -232,7 +232,7 @@ ifdef MOZ_MATHML COMPONENT_LIBS += ucvmath endif -ifneq (,$(filter xlib,$(MOZ_WIDGET_TOOLKIT))$(MOZ_ENABLE_XLIB)$(MOZ_ENABLE_XPRINT)) +ifneq (,$(MOZ_ENABLE_XPRINT)) STATIC_LIBS += xlibrgb endif @@ -242,15 +242,6 @@ STATIC_LIBS += xprintutil COMPONENTS_LIBS += gfxxprint endif -ifdef MOZ_ENABLE_XLIB -STATIC_LIBS += xlibxtbin -endif - -ifdef MOZ_ENABLE_GTK -STATIC_LIBS += gtksuperwin -COMPONENT_LIBS += widget_gtk -endif - ifdef MOZ_ENABLE_GTK2 COMPONENT_LIBS += widget_gtk2 ifdef MOZ_PREF_EXTENSIONS @@ -258,7 +249,7 @@ COMPONENT_LIBS += system-pref endif endif -ifneq (,$(MOZ_ENABLE_GTK)$(MOZ_ENABLE_GTK2)) +ifneq (,$(MOZ_ENABLE_GTK2)) STATIC_LIBS += gtkxtbin endif @@ -298,15 +289,12 @@ else # Platform-specific GFX layer ifeq (qt,$(MOZ_WIDGET_TOOLKIT)) COMPONENT_LIBS += widget_qt endif - ifneq (,$(filter gtk gtk2,$(MOZ_WIDGET_TOOLKIT))) + ifneq (,$(filter gtk2,$(MOZ_WIDGET_TOOLKIT))) COMPONENT_LIBS += gfx_gtk endif ifdef MOZ_ENABLE_QT COMPONENT_LIBS += gfx_qt endif - ifdef MOZ_ENABLE_XLIB - COMPONENT_LIBS += gfx_xlib - endif ifdef MOZ_ENABLE_PHOTON COMPONENT_LIBS += gfx_photon endif @@ -328,9 +316,6 @@ ifeq (qt,$(MOZ_WIDGET_TOOLKIT)) COMPONENT_LIBS += widget_qt endif -ifdef MOZ_ENABLE_XLIB -COMPONENT_LIBS += widget_xlib -endif ifdef MOZ_ENABLE_PHOTON COMPONENT_LIBS += widget_photon endif diff --git a/mozilla/toolkit/library/nsStaticXULComponents.cpp b/mozilla/toolkit/library/nsStaticXULComponents.cpp index 85c11b85aaa..1629fed437d 100644 --- a/mozilla/toolkit/library/nsStaticXULComponents.cpp +++ b/mozilla/toolkit/library/nsStaticXULComponents.cpp @@ -82,12 +82,10 @@ #ifdef MOZ_CAIRO_GFX # define GFX_MODULES MODULE(nsGfxModule) #else -# if defined(MOZ_WIDGET_GTK) || defined(MOZ_WIDGET_GTK2) +# if defined(MOZ_WIDGET_GTK2) # define GFX_MODULES MODULE(nsGfxGTKModule) # elif defined(MOZ_WIDGET_QT) # define GFX_MODULES MODULE(nsGfxQtModule) -# elif defined(MOZ_WIDGET_XLIB) -# define GFX_MODULES MODULE(nsGfxXlibModule) # elif defined(MOZ_WIDGET_PHOTON) # define GFX_MODULES MODULE(nsGfxPhModule) # elif defined(XP_WIN) @@ -111,12 +109,8 @@ # define WIDGET_MODULES MODULE(nsWidgetBeOSModule) #elif defined(XP_OS2) # define WIDGET_MODULES MODULE(nsWidgetOS2Module) -#elif defined(MOZ_WIDGET_GTK) -# define WIDGET_MODULES MODULE(nsWidgetGTKModule) #elif defined(MOZ_WIDGET_GTK2) # define WIDGET_MODULES MODULE(nsWidgetGtk2Module) -#elif defined(MOZ_WIDGET_XLIB) -# define WIDGET_MODULES MODULE(nsWidgetXLIBModule) #elif defined(MOZ_WIDGET_PHOTON) # define WIDGET_MODULES MODULE(nsWidgetPhModule) #elif defined(MOZ_WIDGET_QT) diff --git a/mozilla/toolkit/mozapps/installer/package-name.mk b/mozilla/toolkit/mozapps/installer/package-name.mk index 64779b858f1..fb4b309f9bb 100644 --- a/mozilla/toolkit/mozapps/installer/package-name.mk +++ b/mozilla/toolkit/mozapps/installer/package-name.mk @@ -59,11 +59,6 @@ endif ifeq ($(OS_ARCH),OS2) MOZ_PKG_PLATFORM := os2 endif - -# GTK2 is the default, so we mark gtk1 builds -ifeq ($(MOZ_WIDGET_TOOLKIT),gtk) -MOZ_PKG_PLATFORM := $(MOZ_PKG_PLATFORM)-gtk1 -endif endif #MOZ_PKG_PLATFORM ifdef MOZ_PKG_SPECIAL diff --git a/mozilla/toolkit/toolkit-tiers.mk b/mozilla/toolkit/toolkit-tiers.mk index dc4a4a1269e..7c1e966acd6 100644 --- a/mozilla/toolkit/toolkit-tiers.mk +++ b/mozilla/toolkit/toolkit-tiers.mk @@ -81,14 +81,6 @@ tier_gecko_dirs += \ intl/chardet \ $(NULL) -ifdef MOZ_ENABLE_XLIB -tier_gecko_dirs += gfx/src/xlibrgb widget/src/xlibxtbin -endif - -ifdef MOZ_ENABLE_GTK -tier_gecko_dirs += widget/src/gtksuperwin widget/src/gtkxtbin -endif - ifdef MOZ_ENABLE_GTK2 tier_gecko_dirs += widget/src/gtkxtbin endif @@ -244,7 +236,7 @@ endif ifndef BUILD_STATIC_LIBS ifdef MOZ_XUL_APP -ifneq (,$(MOZ_ENABLE_GTK)$(MOZ_ENABLE_GTK2)) +ifneq (,$(MOZ_ENABLE_GTK2)) tier_toolkit_dirs += embedding/browser/gtk endif endif diff --git a/mozilla/toolkit/xre/nsAppRunner.cpp b/mozilla/toolkit/xre/nsAppRunner.cpp index 0c65ee2916d..839276dafb5 100644 --- a/mozilla/toolkit/xre/nsAppRunner.cpp +++ b/mozilla/toolkit/xre/nsAppRunner.cpp @@ -270,10 +270,8 @@ char **gArgv; static int gRestartArgc; static char **gRestartArgv; -#if defined(MOZ_WIDGET_GTK) || defined(MOZ_WIDGET_GTK2) -#include -#endif //MOZ_WIDGET_GTK || MOZ_WIDGET_GTK2 #if defined(MOZ_WIDGET_GTK2) +#include #include "nsGTKToolkit.h" #endif @@ -1023,31 +1021,6 @@ DumpHelp() printf("Usage: %s [ options ... ] [URL]\n" " where options include:\n\n", gArgv[0]); -#ifdef MOZ_WIDGET_GTK - /* insert gtk options above moz options, like any other gtk app - * - * note: this isn't a very cool way to do things -- i'd rather get - * these straight from a user's gtk version -- but it seems to be - * what most gtk apps do. -dr - */ - printf("GTK options\n" - "\t--gdk-debug=FLAGS\t\tGdk debugging flags to set\n" - "\t--gdk-no-debug=FLAGS\t\tGdk debugging flags to unset\n" - "\t--gtk-debug=FLAGS\t\tGtk+ debugging flags to set\n" - "\t--gtk-no-debug=FLAGS\t\tGtk+ debugging flags to unset\n" - "\t--gtk-module=MODULE\t\tLoad an additional Gtk module\n" - "\t-install\t\tInstall a private colormap\n"); - -#endif /* MOZ_WIDGET_GTK */ -#if MOZ_WIDGET_XLIB - printf("Xlib options\n" - "\t-display=DISPLAY\t\tX display to use\n" - "\t-visual=VISUALID\t\tX visual to use\n" - "\t-install_colormap\t\tInstall own colormap\n" - "\t-sync\t\tMake X calls synchronous\n" - "\t-no-xshm\t\tDon't use X shared memory extension\n"); - -#endif /* MOZ_WIDGET_XLIB */ #ifdef MOZ_X11 printf("X11 options\n" "\t--display=DISPLAY\t\tX display to use\n" @@ -2446,7 +2419,7 @@ XRE_main(int argc, char* argv[], const nsXREAppData* aAppData) return 0; } -#if defined(MOZ_WIDGET_GTK) || defined(MOZ_WIDGET_GTK2) || defined(MOZ_ENABLE_XREMOTE) +#if defined(MOZ_WIDGET_GTK2) || defined(MOZ_ENABLE_XREMOTE) // Stash DESKTOP_STARTUP_ID in malloc'ed memory because gtk_init will clear it. #define HAVE_DESKTOP_STARTUP_ID const char* desktopStartupIDEnv = PR_GetEnv("DESKTOP_STARTUP_ID"); @@ -2456,7 +2429,7 @@ XRE_main(int argc, char* argv[], const nsXREAppData* aAppData) } #endif -#if defined(MOZ_WIDGET_GTK) || defined(MOZ_WIDGET_GTK2) +#if defined(MOZ_WIDGET_GTK2) // setup for private colormap. Ideally we'd like to do this // in nsAppShell::Create, but we need to get in before gtk // has been initialized to make sure everything is running @@ -2464,13 +2437,9 @@ XRE_main(int argc, char* argv[], const nsXREAppData* aAppData) if (CheckArg("install")) gdk_rgb_set_install(TRUE); - // Initialize GTK+1/2 here for splash -#if defined(MOZ_WIDGET_GTK) - gtk_set_locale(); -#endif + // Initialize GTK here for splash gtk_init(&gArgc, &gArgv); -#if defined(MOZ_WIDGET_GTK2) // g_set_application_name () is only defined in glib2.2 and higher. _g_set_application_name_fn _g_set_application_name = (_g_set_application_name_fn)FindFunction("g_set_application_name"); @@ -2482,20 +2451,15 @@ XRE_main(int argc, char* argv[], const nsXREAppData* aAppData) if (_gtk_window_set_auto_startup_notification) { _gtk_window_set_auto_startup_notification(PR_FALSE); } -#endif gtk_widget_set_default_visual(gdk_rgb_get_visual()); gtk_widget_set_default_colormap(gdk_rgb_get_cmap()); -#endif /* MOZ_WIDGET_GTK || MOZ_WIDGET_GTK2 */ +#endif /* MOZ_WIDGET_GTK2 */ #if defined(MOZ_WIDGET_QT) QApplication qapp(argc, argv); #endif - // #if defined(MOZ_WIDGET_XLIB) - // XXXtimeless fix me! How do we get a Display from here to nsAppShell.cpp ? - // #endif - // Call the code to install our handler #ifdef MOZ_JPROF setupProfilingStuff(); diff --git a/mozilla/webshell/public/Makefile.in b/mozilla/webshell/public/Makefile.in index ec935626317..fbec38b1289 100644 --- a/mozilla/webshell/public/Makefile.in +++ b/mozilla/webshell/public/Makefile.in @@ -47,8 +47,6 @@ XPIDL_MODULE = webshell_idls PACKAGE_FILE = webshell.pkg PACKAGE_VARS += \ - MOZ_ENABLE_GTK \ - MOZ_ENABLE_XLIB \ $(NULL) SDK_XPIDLSRCS = \ diff --git a/mozilla/webshell/public/webshell.pkg b/mozilla/webshell/public/webshell.pkg index 8eec8a15d58..dc859585924 100644 --- a/mozilla/webshell/public/webshell.pkg +++ b/mozilla/webshell/public/webshell.pkg @@ -9,10 +9,4 @@ dist/bin/viewer@BINS@ dist/bin/mozilla-viewer.sh #endif #endif -#if MOZ_ENABLE_GTK -dist/bin/viewer_gtk -#endif -#if MOZ_ENABLE_XLIB -dist/bin/viewer_xlib -#endif #endif diff --git a/mozilla/widget/public/Makefile.in b/mozilla/widget/public/Makefile.in index 5d98b89e071..96b35431607 100644 --- a/mozilla/widget/public/Makefile.in +++ b/mozilla/widget/public/Makefile.in @@ -80,11 +80,7 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),beos) EXPORTS += nsIDragSessionBeOS.h endif -ifeq ($(MOZ_WIDGET_TOOLKIT),xlib) -EXPORTS += nsIDragSessionXlib.h -endif - -ifneq (,$(filter gtk gtk2,$(MOZ_WIDGET_TOOLKIT))) +ifneq (,$(filter gtk2,$(MOZ_WIDGET_TOOLKIT))) EXPORTS += nsIDragSessionGTK.h endif diff --git a/mozilla/widget/src/Makefile.in b/mozilla/widget/src/Makefile.in index c22477af680..ea942b2b6b6 100644 --- a/mozilla/widget/src/Makefile.in +++ b/mozilla/widget/src/Makefile.in @@ -46,9 +46,7 @@ MODULE = widget PACKAGE_FILE = widget.pkg PACKAGE_VARS += \ - MOZ_ENABLE_GTK \ MOZ_ENABLE_GTK2 \ - MOZ_ENABLE_XLIB \ MOZ_ENABLE_PHOTON \ MOZ_ENABLE_XREMOTE \ $(NULL) @@ -70,22 +68,11 @@ endif # multiple implementations of widget can be built on the same # source tree. # -ifdef MOZ_ENABLE_GTK -DIRS += gtksuperwin -DIRS += gtkxtbin -DIRS += gtk -endif - ifdef MOZ_ENABLE_GTK2 DIRS += gtk2 DIRS += gtkxtbin endif -ifdef MOZ_ENABLE_XLIB -DIRS += xlibxtbin -DIRS += xlib -endif - ifdef MOZ_ENABLE_QT DIRS += qt endif diff --git a/mozilla/widget/src/gtk2/nsNativeThemeGTK.cpp b/mozilla/widget/src/gtk2/nsNativeThemeGTK.cpp index 0c95918e863..e07c07c8315 100644 --- a/mozilla/widget/src/gtk2/nsNativeThemeGTK.cpp +++ b/mozilla/widget/src/gtk2/nsNativeThemeGTK.cpp @@ -86,16 +86,6 @@ nsNativeThemeGTK::nsNativeThemeGTK() memset(mDisabledWidgetTypes, 0, sizeof(mDisabledWidgetTypes)); memset(mSafeWidgetStates, 0, sizeof(mSafeWidgetStates)); - -#ifdef MOZ_WIDGET_GTK - // Look up the symbol for gtk_style_get_prop_experimental - PRLibrary* gtkLibrary; - PRFuncPtr stylePropFunc = PR_FindFunctionSymbolAndLibrary("gtk_style_get_prop_experimental", >kLibrary); - if (stylePropFunc) { - moz_gtk_enable_style_props((style_prop_t) stylePropFunc); - PR_UnloadLibrary(gtkLibrary); - } -#endif } nsNativeThemeGTK::~nsNativeThemeGTK() { @@ -1032,7 +1022,6 @@ nsNativeThemeGTK::ThemeSupportsWidget(nsPresContext* aPresContext, case NS_THEME_RADIO_CONTAINER: case NS_THEME_CHECKBOX_LABEL: case NS_THEME_RADIO_LABEL: -#ifdef MOZ_WIDGET_GTK2 case NS_THEME_MENUBAR: case NS_THEME_MENUPOPUP: case NS_THEME_MENUITEM: @@ -1042,7 +1031,6 @@ nsNativeThemeGTK::ThemeSupportsWidget(nsPresContext* aPresContext, case NS_THEME_DIALOG: case NS_THEME_DROPDOWN: case NS_THEME_DROPDOWN_TEXT: -#endif return !IsWidgetStyled(aPresContext, aFrame, aWidgetType); } diff --git a/mozilla/widget/src/gtkxtbin/Makefile.in b/mozilla/widget/src/gtkxtbin/Makefile.in index fcf5a16ffc4..8f59796a4aa 100644 --- a/mozilla/widget/src/gtkxtbin/Makefile.in +++ b/mozilla/widget/src/gtkxtbin/Makefile.in @@ -58,14 +58,6 @@ CSRCS = \ EXTRA_DSO_LDOPTS += $(MOZ_GTK2_LIBS) $(XLDFLAGS) $(XT_LIBS) $(XLIBS) endif -ifdef MOZ_ENABLE_GTK -CSRCS = \ - gtkxtbin.c \ - $(NULL) -EXTRA_DSO_LDOPTS += $(MOZ_GTK_LDFLAGS) $(XT_LIBS) -endif - - EXPORTS = gtkxtbin.h gtk2xtbin.h REQUIRES = xpcom @@ -76,10 +68,6 @@ ifdef MOZ_ENABLE_GTK2 CFLAGS += $(MOZ_GTK2_CFLAGS) endif -ifdef MOZ_ENABLE_GTK -CFLAGS += $(MOZ_GTK_CFLAGS) -endif - DEFINES += -D_IMPL_GTKXTBIN_API -DUSE_XIM ifeq ($(OS_ARCH), OpenVMS) diff --git a/mozilla/widget/src/xpwidgets/Makefile.in b/mozilla/widget/src/xpwidgets/Makefile.in index 45687963117..240a4e4c88a 100644 --- a/mozilla/widget/src/xpwidgets/Makefile.in +++ b/mozilla/widget/src/xpwidgets/Makefile.in @@ -94,7 +94,7 @@ CPPSRCS += nsBaseFilePicker.cpp REQUIRES += docshell view intl endif -ifneq (,$(filter gtk gtk2 qt windows mac cocoa,$(MOZ_WIDGET_TOOLKIT))) +ifneq (,$(filter gtk2 qt windows mac cocoa,$(MOZ_WIDGET_TOOLKIT))) CPPSRCS += nsNativeTheme.cpp endif diff --git a/mozilla/xpfe/bootstrap/Makefile.in b/mozilla/xpfe/bootstrap/Makefile.in index ba2c3a0b3ce..8292478bc52 100644 --- a/mozilla/xpfe/bootstrap/Makefile.in +++ b/mozilla/xpfe/bootstrap/Makefile.in @@ -245,14 +245,6 @@ CPPSRCS += nsNativeAppSupportBase.cpp LIBS += $(TK_LIBS) endif -ifeq ($(MOZ_WIDGET_TOOLKIT),gtk) -SPLASH_XPM = $(srcdir)/splash.xpm -CPPSRCS += nsNativeAppSupportGtk.cpp \ - nsNativeAppSupportBase.cpp -DEFINES += -DSPLASH_XPM=\"$(SPLASH_XPM)\" -LIBS += $(MOZ_GTK_LDFLAGS) -endif - ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) SPLASH_XPM = $(srcdir)/splash.xpm CPPSRCS += nsNativeAppSupportGtk.cpp \ @@ -266,7 +258,7 @@ LIBS += $(MOZ_QT_LDFLAGS) endif # Add explicit X11 dependency when building against X11 toolkits -ifneq (,$(filter gtk gtk2 qt xlib,$(MOZ_WIDGET_TOOLKIT))) +ifneq (,$(filter gtk2 qt,$(MOZ_WIDGET_TOOLKIT))) LIBS += $(XLDFLAGS) $(XLIBS) endif @@ -284,7 +276,7 @@ endif ifndef MOZ_SUITE # Suite icons are all contained within /suite/branding -ifneq (,$(filter windows os2 gtk gtk2,$(MOZ_WIDGET_TOOLKIT))) +ifneq (,$(filter windows os2 gtk2,$(MOZ_WIDGET_TOOLKIT))) ifneq (,$(filter windows os2,$(MOZ_WIDGET_TOOLKIT))) ICON_SUFFIX=.ico else @@ -333,10 +325,6 @@ DESKTOP_ICONS += \ $(NULL) endif -ifeq ($(ICON_DIR),gtk) -DESKTOP_ICONS_SMALL=$(patsubst %,%16,$(DESKTOP_ICONS)) -endif - DESKTOP_ICON_FILES = $(addsuffix $(ICON_SUFFIX), $(DESKTOP_ICONS) $(DESKTOP_ICONS_SMALL)) GARBAGE += $(addprefix $(DIST)/bin/chrome/icons/default/,$(DESKTOP_ICON_FILES)) @@ -381,10 +369,6 @@ ifdef BUILD_STATIC_LIBS include $(topsrcdir)/config/static-rules.mk endif -ifeq ($(MOZ_WIDGET_TOOLKIT),gtk) -$(PROGRAM): $(SPLASH_XPM) -endif - ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT))) ifdef BUILD_STATIC_LIBS LIBS += -framework QuickTime -framework IOKit diff --git a/mozilla/xpfe/bootstrap/nsAppRunner.cpp b/mozilla/xpfe/bootstrap/nsAppRunner.cpp index 956704ddcca..7f9d1599773 100644 --- a/mozilla/xpfe/bootstrap/nsAppRunner.cpp +++ b/mozilla/xpfe/bootstrap/nsAppRunner.cpp @@ -290,16 +290,16 @@ static void InitializeMacOSXApp(int argc, char* argv[]) #include #endif /* MOZ_X11 */ -#if defined(MOZ_WIDGET_GTK) || defined(MOZ_WIDGET_GTK2) +#if defined(MOZ_WIDGET_GTK2) #include -#endif //MOZ_WIDGET_GTK || MOZ_WIDGET_GTK2 +#endif #include "nsNativeAppSupport.h" /*********************************************/ // Default implemenations for nativeAppSupport // If your platform implements these functions if def out this code. -#if !defined(MOZ_WIDGET_COCOA) && !defined(MOZ_WIDGET_PHOTON) && !defined( XP_WIN) && !defined(XP_OS2) && !defined(MOZ_WIDGET_GTK) && !defined(MOZ_WIDGET_GTK2) +#if !defined(MOZ_WIDGET_COCOA) && !defined(MOZ_WIDGET_PHOTON) && !defined( XP_WIN) && !defined(XP_OS2) && !defined(MOZ_WIDGET_GTK2) nsresult NS_CreateSplashScreen(nsISplashScreen **aResult) { @@ -334,7 +334,7 @@ PRBool NS_CanRun() // nsISplashScreen will be removed. // -#if !defined(XP_WIN) && !defined(XP_OS2)&& !defined( XP_BEOS ) && !defined(MOZ_WIDGET_GTK) && !defined(MOZ_WIDGET_GTK2) && !defined(XP_MAC) && (!defined(XP_MACOSX) || defined(MOZ_WIDGET_COCOA)) +#if !defined(XP_WIN) && !defined(XP_OS2)&& !defined( XP_BEOS ) && !defined(MOZ_WIDGET_GTK2) && !defined(XP_MAC) && (!defined(XP_MACOSX) || defined(MOZ_WIDGET_COCOA)) nsresult NS_CreateNativeAppSupport(nsINativeAppSupport **aResult) { @@ -1246,32 +1246,6 @@ static void DumpHelp(char *appname) printf("Usage: %s [ options ... ] [URL]\n" " where options include:\n\n", appname); -#ifdef MOZ_WIDGET_GTK - /* insert gtk options above moz options, like any other gtk app - * - * note: this isn't a very cool way to do things -- i'd rather get - * these straight from a user's gtk version -- but it seems to be - * what most gtk apps do. -dr - */ - printf("GTK options\n" - "\t--gdk-debug=FLAGS\t\tGdk debugging flags to set\n" - "\t--gdk-no-debug=FLAGS\t\tGdk debugging flags to unset\n" - "\t--gtk-debug=FLAGS\t\tGtk+ debugging flags to set\n" - "\t--gtk-no-debug=FLAGS\t\tGtk+ debugging flags to unset\n" - "\t--gtk-module=MODULE\t\tLoad an additional Gtk module\n" - "\t-install\t\tInstall a private colormap\n"); - - /* end gtk toolkit options */ -#endif /* MOZ_WIDGET_GTK */ -#if MOZ_WIDGET_XLIB - printf("Xlib options\n" - "\t-display=DISPLAY\t\tX display to use\n" - "\t-visual=VISUALID\t\tX visual to use\n" - "\t-install_colormap\t\tInstall own colormap\n" - "\t-sync\t\tMake X calls synchronous\n" - "\t-no-xshm\t\tDon't use X shared memory extension\n"); - -#endif /* MOZ_WIDGET_XLIB */ #ifdef MOZ_X11 printf("X11 options\n" "\t--display=DISPLAY\t\tX display to use\n" @@ -1576,10 +1550,6 @@ int main(int argc, char* argv[]) argc = NS_TraceMallocStartupArgs(argc, argv); #endif -#if defined(MOZ_WIDGET_GTK) || defined(MOZ_WIDGET_GTK2) || defined(MOZ_X11) - int i; -#endif - #ifdef MOZ_X11 /* Init threadsafe mode of Xlib API on demand * (currently this is only for testing, future builds may use this by @@ -1590,7 +1560,7 @@ int main(int argc, char* argv[]) x11threadsafe = PR_TRUE; else { x11threadsafe = PR_FALSE; - for (i = 1; i < argc; ++i) + for (int i = 1; i < argc; ++i) if (PL_strcmp(argv[i], "-xinitthreads") == 0) { x11threadsafe = PR_TRUE; break; @@ -1604,37 +1574,29 @@ int main(int argc, char* argv[]) } #endif /* MOZ_X11 */ -#if defined(MOZ_WIDGET_GTK) || defined(MOZ_WIDGET_GTK2) +#if defined(MOZ_WIDGET_GTK2) // setup for private colormap. Ideally we'd like to do this // in nsAppShell::Create, but we need to get in before gtk // has been initialized to make sure everything is running // consistently. - for (i=1; i #include -#elif defined (MOZ_WIDGET_GTK) -#include #elif defined (XP_OS2) #define INCL_DOS #define INCL_WIN @@ -56,128 +54,6 @@ extern "C" void ShowOSAlert(const char* aMessage); -#if defined (MOZ_WIDGET_GTK) - -static int sbAlertDone = 0; - -/** - * ns_gtk_alert_OK_callback - * - * Private callback function for the OK button on the alert. - * - * @param aWidget the button widget - * @param aData the alert dialog passed in for destruction - */ -void -ns_gtk_alert_OK_callback(GtkWidget *aWidget, gpointer aData) -{ - GtkWidget *alertDlg = (GtkWidget *) aData; - - if (!alertDlg) - return; - - gtk_widget_destroy(alertDlg); - sbAlertDone = 1; -} - -/** - * NS_gtk_alert - * - * Displays an alert with a message and an OK button in a modal - * dialog that is centered on the screen. Assumes gtk_main has - * been called or explicit event queue flushing is being performed. - * - * @param aMessage [required] the message to display in the alert - * @param aTitle [optional] the alert dialog title; - * passing NULL defaults the title to "" - * @param aOKBtnText [optional] the text on the OK button; - * parametrized for i18n purposes; - * passing NULL defaults the button text to "OK" - * @return int error code returns 0 for SUCCESS; - * returns -1 for param error; - * returns -2 for widget creation error - */ -int -NS_gtk_alert(const char *aMessage, const char *aTitle, const char *aOKBtnText) -{ -#ifdef DEBUG_dbragg - printf ("\n*** Now inside NS_gtk_alert *** \n"); -#endif - - GtkWidget *alertDlg = NULL; - GtkWidget *okBtn = NULL; - GtkWidget *msgLabel = NULL; - GtkWidget *packerLbl = NULL; - GtkWidget *packerBtn = NULL; - const char *okBtnText = aOKBtnText; - const char *title = aTitle; - - if (!aMessage) - return -1; - if (!aOKBtnText) - okBtnText = "OK"; - if (!aTitle) - title = " "; - -#ifdef DEBUG_dbragg - printf("title is: %s\n", title); -#endif - - alertDlg = gtk_dialog_new(); - msgLabel = gtk_label_new(aMessage); - if (msgLabel) - gtk_label_set_line_wrap(GTK_LABEL(msgLabel), TRUE); - okBtn = gtk_button_new_with_label(okBtnText); - packerLbl = gtk_packer_new(); - packerBtn = gtk_packer_new(); - sbAlertDone = 0; - - if (alertDlg && msgLabel && okBtn && packerBtn && packerLbl) - { - // pack widgets in dialog - gtk_packer_set_default_border_width(GTK_PACKER(packerLbl), 20); - gtk_packer_add_defaults(GTK_PACKER(packerLbl), msgLabel, - GTK_SIDE_BOTTOM, GTK_ANCHOR_CENTER, GTK_FILL_X); - gtk_packer_set_default_border_width(GTK_PACKER(packerBtn), 0); - gtk_packer_add_defaults(GTK_PACKER(packerBtn), okBtn, - GTK_SIDE_BOTTOM, GTK_ANCHOR_CENTER, GTK_FILL_Y); - gtk_container_add(GTK_CONTAINER(GTK_DIALOG(alertDlg)->vbox), - packerLbl); - gtk_container_add(GTK_CONTAINER(GTK_DIALOG(alertDlg)->action_area), - packerBtn); - - gtk_window_set_modal(GTK_WINDOW(alertDlg), TRUE); - gtk_window_set_title(GTK_WINDOW(alertDlg), title); - gtk_window_set_position(GTK_WINDOW(alertDlg), GTK_WIN_POS_CENTER); - - // register callback for OK button - gtk_signal_connect(GTK_OBJECT(okBtn), "clicked", - GTK_SIGNAL_FUNC(ns_gtk_alert_OK_callback), alertDlg); - GTK_WIDGET_SET_FLAGS(okBtn, GTK_CAN_DEFAULT); - gtk_widget_grab_default(okBtn); - - // show dialog - gtk_widget_show(msgLabel); - gtk_widget_show(packerLbl); - gtk_widget_show(okBtn); - gtk_widget_show(packerBtn); - gtk_widget_show(alertDlg); - } - else - { - return -2; - } - - while (!sbAlertDone) - { - while (gtk_events_pending()) - gtk_main_iteration(); - } - - return 0; -} -#endif //MOZ_WIDGET_GTK - // The maximum allowed length of aMessage is 255 characters! void ShowOSAlert(const char* aMessage) @@ -198,8 +74,6 @@ printf("\n****Inside ShowOSAlert ***\n"); #elif (XP_MAC) short buttonClicked; StandardAlert(kAlertStopAlert, c2pstr(message_copy), nil, nil, &buttonClicked); -#elif defined (MOZ_WIDGET_GTK) - NS_gtk_alert(message_copy, NULL, "OK"); #elif defined (XP_OS2) /* Set our app to be a PM app before attempting Win calls */ PPIB ppib; diff --git a/mozilla/xpfe/components/alerts/Makefile.in b/mozilla/xpfe/components/alerts/Makefile.in index d5eba3702ba..bcc69405e9a 100644 --- a/mozilla/xpfe/components/alerts/Makefile.in +++ b/mozilla/xpfe/components/alerts/Makefile.in @@ -44,7 +44,7 @@ include $(DEPTH)/config/autoconf.mk DIRS = public -ifneq (,$(filter $(MOZ_WIDGET_TOOLKIT),windows gtk gtk2)) +ifneq (,$(filter $(MOZ_WIDGET_TOOLKIT),windows gtk2)) DIRS += src endif diff --git a/mozilla/xpfe/components/build/Makefile.in b/mozilla/xpfe/components/build/Makefile.in index c6889168c7b..6935ddead0a 100644 --- a/mozilla/xpfe/components/build/Makefile.in +++ b/mozilla/xpfe/components/build/Makefile.in @@ -53,7 +53,7 @@ PACKAGE_FILE = appcomps.pkg PACKAGE_VARS += MOZ_PHOENIX ifndef MOZ_XUL_APP -ifneq (,$(filter $(MOZ_WIDGET_TOOLKIT),windows gtk gtk2)) +ifneq (,$(filter $(MOZ_WIDGET_TOOLKIT),windows gtk2)) ALERTS_SERVICE=1 DEFINES += -DALERTS_SERVICE endif diff --git a/mozilla/xpinstall/wizard/unix/src2/nsComponentsDlg.cpp b/mozilla/xpinstall/wizard/unix/src2/nsComponentsDlg.cpp index 469507e0f2f..34099399bf6 100644 --- a/mozilla/xpinstall/wizard/unix/src2/nsComponentsDlg.cpp +++ b/mozilla/xpinstall/wizard/unix/src2/nsComponentsDlg.cpp @@ -63,14 +63,8 @@ void nsComponentsDlg::Back(GtkWidget *aWidget, gpointer aData) { DUMP("Back"); - if (aData != gCtx->cdlg) return; -#ifdef MOZ_WIDGET_GTK - if (gCtx->bMoving) - { - gCtx->bMoving = FALSE; + if (aData != gCtx->cdlg) return; - } -#endif // hide this notebook page gCtx->cdlg->Hide(); @@ -84,14 +78,8 @@ void nsComponentsDlg::Next(GtkWidget *aWidget, gpointer aData) { DUMP("Next"); - if (aData != gCtx->cdlg) return; -#ifdef MOZ_WIDGET_GTK - if (gCtx->bMoving) - { - gCtx->bMoving = FALSE; + if (aData != gCtx->cdlg) return; - } -#endif if (OK != nsSetupTypeDlg::VerifyDiskSpace()) return; @@ -101,9 +89,6 @@ nsComponentsDlg::Next(GtkWidget *aWidget, gpointer aData) // show the next dlg gCtx->idlg->Show(); -#ifdef MOZ_WIDGET_GTK - gCtx->bMoving = TRUE; -#endif } int diff --git a/mozilla/xpinstall/wizard/unix/src2/nsInstallDlg.cpp b/mozilla/xpinstall/wizard/unix/src2/nsInstallDlg.cpp index 3bcd0c4123a..8a5ced9a84b 100644 --- a/mozilla/xpinstall/wizard/unix/src2/nsInstallDlg.cpp +++ b/mozilla/xpinstall/wizard/unix/src2/nsInstallDlg.cpp @@ -98,14 +98,8 @@ void nsInstallDlg::Back(GtkWidget *aWidget, gpointer aData) { DUMP("Back"); - if (aData != gCtx->idlg) return; -#ifdef MOZ_WIDGET_GTK - if (gCtx->bMoving) - { - gCtx->bMoving = FALSE; + if (aData != gCtx->idlg) return; - } -#endif // hide this notebook page gCtx->idlg->Hide(); @@ -115,9 +109,6 @@ nsInstallDlg::Back(GtkWidget *aWidget, gpointer aData) { gCtx->cdlg->Show(); // only set bMoving for component dlg since setuptype has no "back" -#ifdef MOZ_WIDGET_GTK - gCtx->bMoving = TRUE; -#endif } else { @@ -131,15 +122,8 @@ nsInstallDlg::Next(GtkWidget *aWidget, gpointer aData) DUMP("Next"); GtkWidget *pauseLabel, *resumeLabel; - if (aData != gCtx->idlg) return; -#ifdef MOZ_WIDGET_GTK - if (gCtx->bMoving) - { - gCtx->bMoving = FALSE; - DUMP("Moving done!"); + if (aData != gCtx->idlg) return; - } -#endif // initialize progress bar cleanly if (gCtx->opt->mMode != nsXIOptions::MODE_SILENT) { @@ -205,9 +189,6 @@ nsInstallDlg::Next(GtkWidget *aWidget, gpointer aData) if (gCtx->opt->mMode == nsXIOptions::MODE_DEFAULT) gtk_main_quit(); -#ifdef MOZ_WIDGET_GTK - gCtx->bMoving = TRUE; -#endif return; } diff --git a/mozilla/xpinstall/wizard/unix/src2/nsLicenseDlg.cpp b/mozilla/xpinstall/wizard/unix/src2/nsLicenseDlg.cpp index 4952d29454a..77ec6fe3ee0 100644 --- a/mozilla/xpinstall/wizard/unix/src2/nsLicenseDlg.cpp +++ b/mozilla/xpinstall/wizard/unix/src2/nsLicenseDlg.cpp @@ -55,15 +55,8 @@ void nsLicenseDlg::Back(GtkWidget *aWidget, gpointer aData) { DUMP("Back"); - if (aData != gCtx->ldlg) return; -#ifdef MOZ_WIDGET_GTK - if (gCtx->bMoving) - { - gCtx->bMoving = FALSE; + if (aData != gCtx->ldlg) return; - } -#endif - gtk_main_quit(); return; } @@ -72,23 +65,14 @@ void nsLicenseDlg::Next(GtkWidget *aWidget, gpointer aData) { DUMP("Next"); - if (aData != gCtx->ldlg) return; -#ifdef MOZ_WIDGET_GTK - if (gCtx->bMoving) - { - gCtx->bMoving = FALSE; + if (aData != gCtx->ldlg) return; - } -#endif // hide this notebook page gCtx->ldlg->Hide(); // show the next dlg gCtx->sdlg->Show(); -#ifdef MOZ_WIDGET_GTK - gCtx->bMoving = TRUE; -#endif } int @@ -161,31 +145,7 @@ nsLicenseDlg::Show() goto BAIL; } -#if defined(MOZ_WIDGET_GTK) - // create a new scrollable textarea and add it to the table - GtkWidget *text = gtk_text_new(NULL, NULL); - GdkFont *font = gdk_font_load( LICENSE_FONT ); - gtk_text_set_editable(GTK_TEXT(text), FALSE); - gtk_text_set_word_wrap(GTK_TEXT(text), TRUE); - gtk_text_set_line_wrap(GTK_TEXT(text), TRUE); - gtk_table_attach(GTK_TABLE(mTable), text, 1, 2, 0, 1, - static_cast(GTK_FILL | GTK_EXPAND), - static_cast(GTK_FILL | GTK_EXPAND), - 0, 0); - gtk_text_freeze(GTK_TEXT(text)); - gtk_text_insert (GTK_TEXT(text), font, &text->style->black, NULL, - licenseContents, -1); - gtk_text_thaw(GTK_TEXT(text)); - gtk_widget_show(text); - - // Add a vertical scrollbar to the GtkText widget - GtkWidget *vscrollbar = gtk_vscrollbar_new (GTK_TEXT (text)->vadj); - gtk_table_attach(GTK_TABLE(mTable), vscrollbar, 2, 3, 0, 1, - GTK_FILL, - static_cast(GTK_EXPAND | GTK_SHRINK | GTK_FILL), - 0, 0); - gtk_widget_show(vscrollbar); -#elif defined(MOZ_WIDGET_GTK2) +#if defined(MOZ_WIDGET_GTK2) GtkWidget *text = gtk_scrolled_window_new (NULL, NULL); GtkWidget *textview = gtk_text_view_new(); GtkTextBuffer *textbuffer; diff --git a/mozilla/xpinstall/wizard/unix/src2/nsSetupTypeDlg.cpp b/mozilla/xpinstall/wizard/unix/src2/nsSetupTypeDlg.cpp index ab22d0efbe6..8ab2bdf3a61 100644 --- a/mozilla/xpinstall/wizard/unix/src2/nsSetupTypeDlg.cpp +++ b/mozilla/xpinstall/wizard/unix/src2/nsSetupTypeDlg.cpp @@ -90,14 +90,8 @@ void nsSetupTypeDlg::Next(GtkWidget *aWidget, gpointer aData) { DUMP("Next"); - if (aData && aData != gCtx->sdlg) return; -#ifdef MOZ_WIDGET_GTK - if (gCtx->bMoving) - { - gCtx->bMoving = FALSE; + if (aData && aData != gCtx->sdlg) return; - } -#endif // verify selected destination directory exists if (OK != nsSetupTypeDlg::VerifyDestination()) @@ -140,15 +134,6 @@ nsSetupTypeDlg::Next(GtkWidget *aWidget, gpointer aData) gCtx->idlg->Next((GtkWidget *)NULL, (gpointer) gCtx->idlg); } } - -#ifdef MOZ_WIDGET_GTK - // When Next() is not invoked from a signal handler, the caller passes - // aData as NULL so we know not to do the bMoving hack. - if (aData) - { - gCtx->bMoving = TRUE; - } -#endif } int diff --git a/mozilla/xpinstall/wizard/unix/src2/nsWelcomeDlg.cpp b/mozilla/xpinstall/wizard/unix/src2/nsWelcomeDlg.cpp index 5e888734abd..8a1318727fa 100644 --- a/mozilla/xpinstall/wizard/unix/src2/nsWelcomeDlg.cpp +++ b/mozilla/xpinstall/wizard/unix/src2/nsWelcomeDlg.cpp @@ -57,23 +57,14 @@ void nsWelcomeDlg::Next(GtkWidget *aWidget, gpointer aData) { DUMP("Next"); - if (aData != gCtx->wdlg) return; -#ifdef MOZ_WIDGET_GTK - if (gCtx->bMoving) - { - gCtx->bMoving = FALSE; + if (aData != gCtx->wdlg) return; - } -#endif // hide this notebook page gCtx->wdlg->Hide(); // show the next dlg gCtx->ldlg->Show(); -#ifdef MOZ_WIDGET_GTK - gCtx->bMoving = TRUE; -#endif } int @@ -147,28 +138,7 @@ nsWelcomeDlg::Show() } // create a new scrollable textarea and add it to the table -#if defined(MOZ_WIDGET_GTK) - GtkWidget *text = gtk_text_new(NULL, NULL); - GdkFont *font = gdk_font_load( README_FONT ); - gtk_text_set_editable(GTK_TEXT(text), FALSE); - gtk_table_attach(GTK_TABLE(mTable), text, 1, 2, 0, 1, - static_cast(GTK_FILL | GTK_EXPAND), - static_cast(GTK_FILL | GTK_EXPAND), - 0, 0); - gtk_text_freeze(GTK_TEXT(text)); - gtk_text_insert (GTK_TEXT(text), font, &text->style->black, NULL, - readmeContents, -1); - gtk_text_thaw(GTK_TEXT(text)); - gtk_text_set_word_wrap(GTK_TEXT(text), TRUE); - gtk_widget_show(text); - - // Add a vertical scrollbar to the GtkText widget - GtkWidget *vscrollbar = gtk_vscrollbar_new (GTK_TEXT (text)->vadj); - gtk_table_attach(GTK_TABLE(mTable), vscrollbar, 2, 3, 0, 1, GTK_FILL, - static_cast(GTK_EXPAND | GTK_SHRINK | GTK_FILL), - 0, 0); - gtk_widget_show(vscrollbar); -#elif defined(MOZ_WIDGET_GTK2) +#if defined(MOZ_WIDGET_GTK2) GtkWidget *text = gtk_scrolled_window_new (NULL, NULL); GtkWidget *textview = gtk_text_view_new(); GtkTextBuffer *textbuffer;