Commit 27401e1e authored by Alexander Larsson's avatar Alexander Larsson Committed by Alexander Larsson

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.
parent 6341c2f9
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.
Fri Sep 7 18:50:59 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwidget.c (gtk_widget_get_default_colormap):
......
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.
Fri Sep 7 18:50:59 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwidget.c (gtk_widget_get_default_colormap):
......
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.
Fri Sep 7 18:50:59 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwidget.c (gtk_widget_get_default_colormap):
......
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.
Fri Sep 7 18:50:59 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwidget.c (gtk_widget_get_default_colormap):
......
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.
Fri Sep 7 18:50:59 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwidget.c (gtk_widget_get_default_colormap):
......
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.
Fri Sep 7 18:50:59 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwidget.c (gtk_widget_get_default_colormap):
......
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.
Fri Sep 7 18:50:59 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwidget.c (gtk_widget_get_default_colormap):
......
......@@ -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)
{
......
......@@ -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;
......
......@@ -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;
......
......@@ -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 }
};
......
......@@ -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>
......
......@@ -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;
......
......@@ -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;
}
......@@ -2650,7 +2650,10 @@ gtk_window_get_position (GtkWindow *window,
if (GTK_WIDGET_MAPPED (widget))
{
gdk_window_get_frame_extents (widget->window, &frame_extents);
if (window->frame)
gdk_window_get_frame_extents (window->frame, &frame_extents);
else
gdk_window_get_frame_extents (widget->window, &frame_extents);
x = frame_extents.x;
y = frame_extents.y;
gtk_window_get_size (window, &w, &h);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment