removed extranious #include "gtklayout.h"'s and #ifndef GTK_HAVE_FEATURES_1_1_6

in gtklayout.c and nsWidget.h so that we use the gtklayout from gtk 1.1.6 if
available.

widget/src/gtk/gtklayout.c

@@ -7,6 +7,8 @@
  * The coding style should be that of the the GTK core.
  */
 
+#ifndef GTK_HAVE_FEATURES_1_1_6
+
 #include "gtklayout.h"
 #include <gtk/gtksignal.h>
 #include <gdk/gdkx.h>
@@ -1137,3 +1139,6 @@ gtk_layout_gravity_works (void)
   
   return  (y == -20);
 }
+
+#endif
+/* end #ifndef GTK_HAVE_FEATURES_1_1_6 */

widget/src/gtk/nsButton.cpp

@@ -17,7 +17,6 @@
  */
 
 #include <gtk/gtk.h>
-#include "gtklayout.h"
 
 #include "nsButton.h"
 #include "nsToolkit.h"

widget/src/gtk/nsLabel.cpp

@@ -17,7 +17,6 @@
  */
 
 #include <gtk/gtk.h>
-#include "gtklayout.h"
 
 #include "nsLabel.h"
 #include "nsToolkit.h"

widget/src/gtk/nsListBox.cpp

@@ -17,7 +17,6 @@
  */
 
 #include <gtk/gtk.h>
-#include "gtklayout.h"
 
 #include "nsListBox.h"
 #include "nsColor.h"

widget/src/gtk/nsMenuBar.cpp

@@ -17,7 +17,6 @@
  */
 
 #include <gtk/gtk.h>
-#include "gtklayout.h"
 
 #include "nsMenuBar.h"
 #include "nsIMenu.h"

widget/src/gtk/nsWidget.h

@@ -27,8 +27,9 @@
 #include "nsIEventListener.h"
 
 #include <gtk/gtk.h>
+#ifndef GTK_HAVE_FEATURES_1_1_6
 #include "gtklayout.h"
-
+#endif
 /**
  * Base of all GTK native widgets.
  */