Removed unused function.

2001-09-07  Alex Larsson  <alexl@redhat.com>

	* gdk/linux-fb/gdkcolor-fb.c:
	Removed unused function.

	* gdk/linux-fb/gdkdrawable-fb2.c
	* gdk/linux-fb/gdkfont-fb.c:
	Use PangoLanguage functions.

	* gdk/linux-fb/gdkinput.c:
	* gdk/linux-fb/gdkselection-fb.c:
	Fix const warnings.

	* gdk/linux-fb/gdkwindow-fb.c:
	Fix warning. Implement gdk_window_set_icon_list() and
	gdk_window_get_frame_extents(). (No icon support yet though.)

	* gtk/gtkwindow.c (gtk_window_get_position):
	If window->frame is set get the extents of it instead.

7 files changed, 27 insertions, 15 deletions

diff --git a/gdk/linux-fb/gdkcolor-fb.c b/gdk/linux-fb/gdkcolor-fb.c
index e720058ca..57428bfea 100644
--- a/gdk/linux-fb/gdkcolor-fb.c
+++ b/gdk/linux-fb/gdkcolor-fb.c
@@ -201,15 +201,6 @@ gdk_colormap_new (GdkVisual *visual,
   return colormap;
 }
 
-#define MIN_SYNC_TIME 2
-
-static void
-gdk_colormap_sync (GdkColormap *colormap,
-		   gboolean     force)
-{
-  
-}		   
-
 GdkColormap*
 gdk_colormap_get_system (void)
 {
diff --git a/gdk/linux-fb/gdkdrawable-fb2.c b/gdk/linux-fb/gdkdrawable-fb2.c
index 0fa7cc834..fcca45bf0 100644
--- a/gdk/linux-fb/gdkdrawable-fb2.c
+++ b/gdk/linux-fb/gdkdrawable-fb2.c
@@ -866,7 +866,7 @@ gdk_fb_draw_text(GdkDrawable    *drawable,
     {
       gunichar wc = g_utf8_get_char (p);
       p = g_utf8_next_char (p);
-      shaper = pango_font_find_shaper (private->pango_font, "fr", wc);
+      shaper = pango_font_find_shaper (private->pango_font, pango_language_from_string ("fr"), wc);
       if (shaper != last_shaper)
 	{
 	  analysis.shape_engine = shaper;
diff --git a/gdk/linux-fb/gdkfont-fb.c b/gdk/linux-fb/gdkfont-fb.c
index ebd4bec06..4d18b3c8a 100644
--- a/gdk/linux-fb/gdkfont-fb.c
+++ b/gdk/linux-fb/gdkfont-fb.c
@@ -345,7 +345,7 @@ gdk_text_extents (GdkFont     *font,
     {
       gunichar wc = g_utf8_get_char (p);
       p = g_utf8_next_char (p);
-      shaper = pango_font_find_shaper (private->pango_font, "fr", wc);
+      shaper = pango_font_find_shaper (private->pango_font, pango_language_from_string ("fr"), wc);
       if (shaper != last_shaper)
 	{
 	  analysis.shape_engine = shaper;
diff --git a/gdk/linux-fb/gdkinput.c b/gdk/linux-fb/gdkinput.c
index d8015430a..48053ddbb 100644
--- a/gdk/linux-fb/gdkinput.c
+++ b/gdk/linux-fb/gdkinput.c
@@ -32,7 +32,7 @@
 #include "gdkprivate.h"
 #include "gdkinputprivate.h"
 
-static const GdkDeviceAxis gdk_input_core_axes[] = {
+static GdkDeviceAxis gdk_input_core_axes[] = {
   { GDK_AXIS_X, 0, 0 },
   { GDK_AXIS_Y, 0, 0 }
 };
diff --git a/gdk/linux-fb/gdkkeyboard-fb.c b/gdk/linux-fb/gdkkeyboard-fb.c
index 2aebfff76..1f7d75dcb 100644
--- a/gdk/linux-fb/gdkkeyboard-fb.c
+++ b/gdk/linux-fb/gdkkeyboard-fb.c
@@ -22,6 +22,7 @@
 #include "gdkkeysyms.h"
 #include "gdkprivate-fb.h"
 #include <stdlib.h>
+#include <unistd.h>
 #include <string.h>
 #include <ctype.h>
 #include <termios.h>
diff --git a/gdk/linux-fb/gdkselection-fb.c b/gdk/linux-fb/gdkselection-fb.c
index 22956c788..8a4b253dd 100644
--- a/gdk/linux-fb/gdkselection-fb.c
+++ b/gdk/linux-fb/gdkselection-fb.c
@@ -407,7 +407,7 @@ gdk_text_property_to_utf8_list (GdkAtom        encoding,
       gchar **local_list;
       gint local_count;
       gint i;
-      gchar *charset = NULL;
+      const gchar *charset = NULL;
       gboolean need_conversion = !g_get_charset (&charset);
       gint count = 0;
       GError *error = NULL;
diff --git a/gdk/linux-fb/gdkwindow-fb.c b/gdk/linux-fb/gdkwindow-fb.c
index 3557bee26..a5a997d7e 100644
--- a/gdk/linux-fb/gdkwindow-fb.c
+++ b/gdk/linux-fb/gdkwindow-fb.c
@@ -2175,8 +2175,6 @@ void
 gdk_window_set_type_hint (GdkWindow        *window,
 			  GdkWindowTypeHint hint)
 {
-  GdkAtom atom;
-  
   g_return_if_fail (window != NULL);
   g_return_if_fail (GDK_IS_WINDOW (window));
 }
@@ -2209,3 +2207,25 @@ gdk_window_begin_move_drag (GdkWindow *window,
 {
   g_return_if_fail (GDK_IS_WINDOW (window));
 }
+
+void
+gdk_window_set_icon_list (GdkWindow *window,
+			  GList     *pixbufs)
+{
+  /* We don't support icons right now */
+}
+
+/* No need to care about frames. Decoration is done by GtkWindow */
+void
+gdk_window_get_frame_extents (GdkWindow    *window,
+                              GdkRectangle *rect)
+{
+  g_return_val_if_fail (window != NULL, 0);
+  
+  rect->x = GDK_DRAWABLE_IMPL_FBDATA (window)->abs_x;
+  rect->y = GDK_DRAWABLE_IMPL_FBDATA (window)->abs_y;
+  rect->width = GDK_DRAWABLE_IMPL_FBDATA (window)->width;
+  rect->height = GDK_DRAWABLE_IMPL_FBDATA (window)->height;
+
+  return TRUE;
+}