Part 1 of a multipart commit

Part 1 of a multipart commit

diff --git a/gtk/gtkcolorsel.c b/gtk/gtkcolorsel.c
index 61f28f8e9d80291727f3c10cd635809886399594..7961fe24b0327fa2762bb53a9a973da9c9d0fe2d 100644 (file)
--- a/gtk/gtkcolorsel.c
+++ b/gtk/gtkcolorsel.c
@@ -29,6 +29,8 @@
 
 #if defined (GDK_WINDOWING_X11)
 #include "x11/gdkx.h"
+#elif defined (GDK_WINDOWING_FB)
+#include "linux-fb/gdkfb.h"
 #endif
 #include "gdk/gdkkeysyms.h"
 #include "gtkcolorsel.h"

diff --git a/gtk/gtkrange.c b/gtk/gtkrange.c
index c884e03fd7d3305f47acd70ad873f92248026834..0ff3a88090907a8b0c8ad75cdf6f2d88ecddc565 100644 (file)
--- a/gtk/gtkrange.c
+++ b/gtk/gtkrange.c
@@ -1494,6 +1494,7 @@ gtk_range_adjustment_value_changed (GtkAdjustment *adjustment,
     {
       gtk_range_slider_update (range);
       gtk_range_clear_background (range);
+      gdk_window_process_updates (range->trough, TRUE);
 
       range->old_value = adjustment->value;
     }

diff --git a/gtk/gtktypeutils.c b/gtk/gtktypeutils.c
index f607c5a217b4612d83e6718cb1a85e991e026cf1..45a999c1d48595bf08f12b845c0b22c1fc5b0058 100644 (file)
--- a/gtk/gtktypeutils.c
+++ b/gtk/gtktypeutils.c
@@ -183,7 +183,7 @@ gtk_type_init (void)
          if (builtin_info[i].parent == G_TYPE_ENUM)
            type_id = g_enum_register_static (builtin_info[i].type_name, builtin_info[i].values);
          else if (builtin_info[i].parent == G_TYPE_FLAGS)
-           type_id = g_flags_register_static (builtin_info[i].type_name, builtin_info[i].values);
+           type_id = g_flags_register_static (builtin_info[i].type_name, (const GFlagsValue *)builtin_info[i].values);
          else if (builtin_info[i].parent == GTK_TYPE_BOXED)
            type_id = g_type_register_static (GTK_TYPE_BOXED, builtin_info[i].type_name, &tinfo);
          else

diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 1be60d5b03f6f95eb190e1fcc1234afc5961038d..24109b8124d93c4c606cea696b309d8d4bbe466e 100644 (file)
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -35,6 +35,8 @@
 #include "win32/gdkwin32.h"
 #elif defined (GDK_WINDOWING_NANOX)
 #include "nanox/gdkprivate-nanox.h"
+#elif defined (GDK_WINDOWING_FB)
+#include "linux-fb/gdkfb.h"
 #endif
 
 #include "gtkprivate.h"