gtklayout.c needs to be in widgets, not gfx

gfx/src/gtk/Makefile

@@ -32,8 +32,6 @@ LLIBS+=$(DIST)/lib/libxpcom.a $(DIST)/lib/libraptorbase.a $(DIST)/lib/libraptorg
 CPPSRCS=nsDeviceContextGTK.cpp nsFontMetricsGTK.cpp nsGfxFactoryGTK.cpp \
 	nsRenderingContextGTK.cpp nsImageGTK.cpp
 
-CSRCS=gtklayout.c
-
 include $(DEPTH)/config/rules.mk
 
 

gfx/src/gtk/Makefile.in

@@ -38,8 +38,6 @@ LLIBS+=$(DIST)/lib/libxpcom.a $(DIST)/lib/libraptorbase.a $(DIST)/lib/libraptorg
 CPPSRCS=nsDeviceContextGTK.cpp nsFontMetricsGTK.cpp nsGfxFactoryGTK.cpp \
 	nsRenderingContextGTK.cpp nsImageGTK.cpp
 
-CSRCS=gtklayout.c
-
 include $(topsrcdir)/config/rules.mk
 
 

gfx/src/gtk/gtklayout.h

@@ -1,102 +0,0 @@
-/* Copyright Owen Taylor, 1998
- * 
- * This file may be distributed under either the terms of the
- * Netscape Public License, or the GNU Library General Public License
- *
- * Note: No GTK+ or Mozilla code should be added to this file.
- * The coding style should be that of the the GTK core.
- */
-
-#ifndef __GTK_LAYOUT_H
-#define __GTK_LAYOUT_H
-
-#include <gdk/gdk.h>
-#include <gtk/gtkcontainer.h>
-#include <gtk/gtkadjustment.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#define GTK_LAYOUT(obj)          GTK_CHECK_CAST (obj, gtk_layout_get_type (), GtkLayout)
-#define GTK_LAYOUT_CLASS(klass)  GTK_CHECK_CLASS_CAST (klass, gtk_layout_get_type (), GtkLayoutClass)
-#define GTK_IS_LAYOUT(obj)       GTK_CHECK_TYPE (obj, gtk_layout_get_type ())
-
-typedef struct _GtkLayout        GtkLayout;
-typedef struct _GtkLayoutClass   GtkLayoutClass;
-typedef struct _GtkLayoutChild   GtkLayoutChild;
-
-struct _GtkLayoutChild {
-  GtkWidget *widget;
-  GdkWindow *window;	/* For NO_WINDOW widgets */
-  gint x;
-  gint y;
-
-  GtkRequisition requisition;
-};
-
-struct _GtkLayout {
-  GtkContainer container;
-
-  GList *children;
-
-  guint width;
-  guint height;
-
-  guint xoffset;
-  guint yoffset;
-
-  GtkAdjustment *hadjustment;
-  GtkAdjustment *vadjustment;
-  
-  GdkWindow *bin_window;
-
-  GdkVisibilityState visibility;
-  gulong configure_serial;
-  gint scroll_x;
-  gint scroll_y;
-
-  gint frozen : 1;
-};
-
-struct _GtkLayoutClass {
-  GtkContainerClass parent_class;
-};
-
-GtkWidget*     gtk_layout_new             (GtkAdjustment *hadjustment,
-				           GtkAdjustment *vadjustment);
-
-guint          gtk_layout_get_type        (void);
-void           gtk_layout_put             (GtkLayout     *layout, 
-		                           GtkWidget     *widget, 
-		                           gint           x, 
-		                           gint           y);
-  
-void           gtk_layout_move            (GtkLayout     *layout, 
-		                           GtkWidget     *widget, 
-		                           gint           x, 
-		                           gint           y);
-  
-void           gtk_layout_set_size        (GtkLayout     *layout, 
-			                   guint          width,
-			                   guint          height);
-
-/* These disable and enable moving and repainting the scrolling window of the GtkLayout,
- * respectively.  If you want to update the layout's offsets but do not want it to
- * repaint itself, you should use these functions.
- */
-void           gtk_layout_freeze          (GtkLayout     *layout);
-void           gtk_layout_thaw            (GtkLayout     *layout);
-
-GtkAdjustment* gtk_layout_get_hadjustment (GtkLayout     *layout);
-GtkAdjustment* gtk_layout_get_vadjustment (GtkLayout     *layout);
-void           gtk_layout_set_hadjustment (GtkLayout     *layout,
-					   GtkAdjustment *adjustment);
-void           gtk_layout_set_vadjustment (GtkLayout     *layout,
-					   GtkAdjustment *adjustment);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __GTK_LAYOUT_H */