Bug 471877 - Cleanup GTK includes; r+sr=roc

2025-02-03 12:35:58 +00:00 · 2009-01-03 08:37:52 +01:00 · 2009-01-03 08:37:52 +01:00 · 880d20fa55
commit 880d20fa55
parent 081dcf1186
26 changed files with 28 additions and 47 deletions
--- a/gfx/thebes/src/gfxPangoFonts.cpp
+++ b/gfx/thebes/src/gfxPangoFonts.cpp
@ -68,7 +68,7 @@
 #include <pango/pangofc-fontmap.h>

 #ifdef MOZ_WIDGET_GTK2
-#include <gdk/gdkscreen.h>
+#include <gdk/gdk.h>
 #endif

 #include <math.h>
--- a/layout/generic/nsObjectFrame.cpp
+++ b/layout/generic/nsObjectFrame.cpp
@ -167,7 +167,7 @@ enum { XKeyPress = KeyPress };
 #undef KeyPress
 #endif
 #ifdef MOZ_WIDGET_GTK2
-#include <gdk/gdkwindow.h>
+#include <gdk/gdk.h>
 #include <gdk/gdkx.h>
 #endif
 #endif
--- a/toolkit/components/remote/nsGTKRemoteService.cpp
+++ b/toolkit/components/remote/nsGTKRemoteService.cpp
@ -43,8 +43,7 @@

 #include <X11/Xatom.h> // for XA_STRING
 #include <stdlib.h>
-#include <gtk/gtkinvisible.h> // For some reason GTK+ doesn't include this file
-                              // automatically from gtk.h
+#include <gtk/gtk.h>
 #include <gdk/gdk.h>
 #include <gdk/gdkx.h>

--- a/widget/src/gtk2/gtkdrawing.h
+++ b/widget/src/gtk2/gtkdrawing.h
@ -49,7 +49,7 @@
 #define _GTK_DRAWING_H_

 #include <gdk/gdk.h>
-#include <gtk/gtkstyle.h>
+#include <gtk/gtk.h>

 #ifdef __cplusplus
 extern "C" {
--- a/widget/src/gtk2/mozcontainer.c
+++ b/widget/src/gtk2/mozcontainer.c
@ -37,7 +37,7 @@
 * ***** END LICENSE BLOCK ***** */

 #include "mozcontainer.h"
-#include <gtk/gtkprivate.h>
+#include <gtk/gtk.h>
 #include <stdio.h>

 #ifdef ACCESSIBILITY
--- a/widget/src/gtk2/mozcontainer.h
+++ b/widget/src/gtk2/mozcontainer.h
@ -39,7 +39,7 @@
 #ifndef __MOZ_CONTAINER_H__
 #define __MOZ_CONTAINER_H__

-#include <gtk/gtkcontainer.h>
+#include <gtk/gtk.h>

 #ifdef __cplusplus
 extern "C" {
--- a/widget/src/gtk2/mozdrawingarea.h
+++ b/widget/src/gtk2/mozdrawingarea.h
@ -39,8 +39,8 @@
 #ifndef __MOZ_DRAWINGAREA_H__
 #define __MOZ_DRAWINGAREA_H__

-#include <gdk/gdkwindow.h>
-#include <gtk/gtkversion.h>
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>
 #include "mozcontainer.h"

 #ifdef __cplusplus
--- a/widget/src/gtk2/nsAccessibilityHelper.h
+++ b/widget/src/gtk2/nsAccessibilityHelper.h
@ -41,7 +41,7 @@
 #ifndef __NS_ACCESSIBILITY_HELPER_H__
 #define __NS_ACCESSIBILITY_HELPER_H__

-#include <gtk/gtkdialog.h>
+#include <gtk/gtk.h>

 // This helper function attach/deattach the AtkObject of the dialog 
 // to Gecko a11y root, before/after calling gtk_dialog_run.
--- a/widget/src/gtk2/nsAppShell.cpp
+++ b/widget/src/gtk2/nsAppShell.cpp
@ -40,7 +40,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <errno.h>
-#include <gdk/gdkwindow.h>
+#include <gdk/gdk.h>
 #include "nsAppShell.h"
 #include "nsWindow.h"
 #include "prlog.h"
--- a/widget/src/gtk2/nsClipboard.cpp
+++ b/widget/src/gtk2/nsClipboard.cpp
@ -48,13 +48,11 @@
 #include "nsImageToPixbuf.h"
 #include "nsStringStream.h"

-#include <gtk/gtkclipboard.h>
-#include <gtk/gtkinvisible.h>
+#include <gtk/gtk.h>

 // For manipulation of the X event queue
 #include <X11/Xlib.h>
 #include <gdk/gdkx.h>
-#include <gtk/gtkmain.h>
 #include <sys/time.h>
 #include <sys/types.h>
 #include <unistd.h>
--- a/widget/src/gtk2/nsClipboard.h
+++ b/widget/src/gtk2/nsClipboard.h
@ -40,7 +40,7 @@
 #define __nsClipboard_h_

 #include "nsIClipboard.h"
-#include <gtk/gtkselection.h>
+#include <gtk/gtk.h>

 class nsClipboard : public nsIClipboard
 {
--- a/widget/src/gtk2/nsDeviceContextSpecG.h
+++ b/widget/src/gtk2/nsDeviceContextSpecG.h
@ -48,8 +48,7 @@
 #include "nsCRT.h" /* should be <limits.h>? */

 #include <gtk/gtk.h>
-#include <gtk/gtkprinter.h>
-#include <gtk/gtkprintjob.h>
+#include <gtk/gtkunixprint.h>

 #define NS_PORTRAIT  0
 #define NS_LANDSCAPE 1
--- a/widget/src/gtk2/nsDragService.cpp
+++ b/widget/src/gtk2/nsDragService.cpp
@ -56,7 +56,7 @@
 #include "nsPrimitiveHelpers.h"
 #include "prtime.h"
 #include "prthread.h"
-#include <gtk/gtkinvisible.h>
+#include <gtk/gtk.h>
 #include <gdk/gdkx.h>
 #include "nsCRT.h"

--- a/widget/src/gtk2/nsFilePicker.cpp
+++ b/widget/src/gtk2/nsFilePicker.cpp
@ -35,14 +35,7 @@
 *
 * ***** END LICENSE BLOCK ***** */

-#include <gtk/gtkwindow.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtkmessagedialog.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtkfilechooser.h>
-#include <gtk/gtkfilechooserdialog.h>
-#include <gtk/gtkmisc.h>
+#include <gtk/gtk.h>

 #include "nsIFileURL.h"
 #include "nsIURI.h"
--- a/widget/src/gtk2/nsFilePicker.h
+++ b/widget/src/gtk2/nsFilePicker.h
@ -38,7 +38,7 @@
 #ifndef nsFilePicker_h__
 #define nsFilePicker_h__

-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>

 #include "nsBaseFilePicker.h"
 #include "nsString.h"
--- a/widget/src/gtk2/nsGtkKeyUtils.cpp
+++ b/widget/src/gtk2/nsGtkKeyUtils.cpp
@ -38,7 +38,7 @@
 * ***** END LICENSE BLOCK ***** */

 #include <gdk/gdkkeysyms.h>
-#include <gdk/gdkevents.h>
+#include <gdk/gdk.h>
 #ifdef MOZ_X11
 #include <gdk/gdkx.h>
 #endif /* MOZ_X11 */
--- a/widget/src/gtk2/nsLookAndFeel.cpp
+++ b/widget/src/gtk2/nsLookAndFeel.cpp
@ -39,7 +39,7 @@
 * ***** END LICENSE BLOCK ***** */

 #include "nsLookAndFeel.h"
-#include <gtk/gtkinvisible.h>
+#include <gtk/gtk.h>

 #include "gtkdrawing.h"

--- a/widget/src/gtk2/nsNativeKeyBindings.cpp
+++ b/widget/src/gtk2/nsNativeKeyBindings.cpp
@ -42,12 +42,9 @@
 #include "nsGtkKeyUtils.h"
 #include "nsGUIEvent.h"

-#include <gtk/gtkentry.h>
-#include <gtk/gtktextview.h>
-#include <gtk/gtkbindings.h>
-#include <gtk/gtkmain.h>
+#include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
-#include <gdk/gdkevents.h>
+#include <gdk/gdk.h>

 static nsINativeKeyBindings::DoCommandCallback gCurrentCallback;
 static void *gCurrentCallbackData;
--- a/widget/src/gtk2/nsNativeKeyBindings.h
+++ b/widget/src/gtk2/nsNativeKeyBindings.h
@ -45,7 +45,7 @@
 #endif

 #include "nsINativeKeyBindings.h"
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>

 enum NativeKeyBindingsType {
  eKeyBindings_Input,
--- a/widget/src/gtk2/nsNativeThemeGTK.h
+++ b/widget/src/gtk2/nsNativeThemeGTK.h
@ -42,7 +42,7 @@
 #include "nsIObserver.h"
 #include "nsNativeTheme.h"

-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 #include "gtkdrawing.h"

 class nsNativeThemeGTK: private nsNativeTheme,
--- a/widget/src/gtk2/nsPrintDialogGTK.cpp
+++ b/widget/src/gtk2/nsPrintDialogGTK.cpp
@ -37,7 +37,7 @@
 * ***** END LICENSE BLOCK ***** */

 #include <gtk/gtk.h>
-#include <gtk/gtkprintunixdialog.h>
+#include <gtk/gtkunixprint.h>
 #include <stdlib.h>

 #include "mozcontainer.h"
--- a/widget/src/gtk2/nsPrintSettingsGTK.h
+++ b/widget/src/gtk2/nsPrintSettingsGTK.h
@ -43,8 +43,7 @@

 extern "C" {
 #include <gtk/gtk.h>
-#include <gtk/gtkprinter.h>
-#include <gtk/gtkprintjob.h>
+#include <gtk/gtkunixprint.h>
 }

 #define NS_PRINTSETTINGSGTK_IID \
--- a/widget/src/gtk2/nsWindow.cpp
+++ b/widget/src/gtk2/nsWindow.cpp
@ -40,7 +40,6 @@

 #ifdef MOZ_PLATFORM_HILDON
 #define MAEMO_CHANGES
-#include <gtk/gtkimcontext.h>
 #endif

 #include "prlink.h"
@ -61,7 +60,7 @@
 #include "nsGtkKeyUtils.h"
 #include "nsGtkCursors.h"

-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 #ifdef MOZ_X11
 #include <gdk/gdkx.h>
 #include <X11/XF86keysym.h>
--- a/widget/src/gtk2/nsWindow.h
+++ b/widget/src/gtk2/nsWindow.h
@ -54,7 +54,7 @@

 #include "nsBaseWidget.h"
 #include "nsGUIEvent.h"
-#include <gdk/gdkevents.h>
+#include <gdk/gdk.h>
 #include <gtk/gtk.h>

 #ifdef MOZ_DFB
@ -64,7 +64,6 @@
 #ifdef MOZ_X11
 #include <gdk/gdkx.h>
 #endif /* MOZ_X11 */
-#include <gtk/gtkwindow.h>

 #ifdef ACCESSIBILITY
 #include "nsIAccessNode.h"
@ -72,7 +71,6 @@
 #endif

 #ifdef USE_XIM
-#include <gtk/gtkimmulticontext.h>
 #include "pldhash.h"
 #endif

--- a/widget/src/gtkxtbin/gtk2xtbin.c
+++ b/widget/src/gtkxtbin/gtk2xtbin.c
@ -44,8 +44,7 @@

 #include "xembed.h"
 #include "gtk2xtbin.h"
-#include <gtk/gtkmain.h>
-#include <gtk/gtkprivate.h>
+#include <gtk/gtk.h>
 #include <gdk/gdkx.h>
 #include <glib.h>
 #include <assert.h>
--- a/widget/src/gtkxtbin/gtk2xtbin.h
+++ b/widget/src/gtkxtbin/gtk2xtbin.h
@ -40,7 +40,7 @@
 #ifndef __GTK_XTBIN_H__
 #define __GTK_XTBIN_H__

-#include <gtk/gtksocket.h>
+#include <gtk/gtk.h>
 #include <X11/Intrinsic.h>
 #include <X11/Xutil.h>
 #include <X11/Xlib.h>