callisto-debian/gtk2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add last argument to t_type_register_static call.

Browse Source 
2000-11-02  Alexander Larsson  <alexl@redhat.com>

	* gdk/linux-fb/gdkcolor-fb.c, gdk/linux-fb/gdkdnd-fb.c,
	gdk/linux-fb/gdkgc-fb.c, gdk/linux-fb/gdkpango-fb.c,
	gdk/linux-fb/gdkpixmap-fb.c, gdk/linux-fb/gdkwindow-fb.c:
	Add last argument to t_type_register_static call.

	* gdk/linux-fb/gdkdrawable-fb2.c:
	Add last argument to t_type_register_static call.
	export the get_image drawable virtual function.

	* gdk/linux-fb/gdkimage-fb.c:
	Add last argument to t_type_register_static call.
	rename gtk_image_get to _gdk_fb_get_image and
	export it for use by gdkdrawable-fb2.

	* gdk/linux-fb/gdkprivate-fb.h:
	export _gdk_fb_get_image.

	* gdk/linux-fb/gdkselection-fb.c:
	Add new api call stubs.

	* gtk/Makefile.am:
	Missing ( in linux-fb part.

	* modules/linux-fb/Makefile.am:
	Must link with gdk_pixbuf or get unresolved symbol.
This commit is contained in:
Alexander Larsson
2000-11-02 15:38:04 +00:00
committed by Alexander Larsson
parent 820e79a467
commit 214c61d575
19 changed files with 298 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
ChangeLog
View File

@ -1,3 +1,31 @@
2000-11-02 Alexander Larsson <alexl@redhat.com>
* gdk/linux-fb/gdkcolor-fb.c, gdk/linux-fb/gdkdnd-fb.c,
gdk/linux-fb/gdkgc-fb.c, gdk/linux-fb/gdkpango-fb.c,
gdk/linux-fb/gdkpixmap-fb.c, gdk/linux-fb/gdkwindow-fb.c:
Add last argument to t_type_register_static call.
* gdk/linux-fb/gdkdrawable-fb2.c:
Add last argument to t_type_register_static call.
export the get_image drawable virtual function.
* gdk/linux-fb/gdkimage-fb.c:
Add last argument to t_type_register_static call.
rename gtk_image_get to _gdk_fb_get_image and
export it for use by gdkdrawable-fb2.
* gdk/linux-fb/gdkprivate-fb.h:
export _gdk_fb_get_image.
* gdk/linux-fb/gdkselection-fb.c:
Add new api call stubs.
* gtk/Makefile.am:
Missing ( in linux-fb part.
* modules/linux-fb/Makefile.am:
Must link with gdk_pixbuf or get unresolved symbol.
2000-11-01 Havoc Pennington <hp@pobox.com> 2000-11-01 Havoc Pennington <hp@pobox.com>
* gtk/gtktextbuffer.c (gtk_text_buffer_class_init): Use * gtk/gtktextbuffer.c (gtk_text_buffer_class_init): Use

28
ChangeLog.pre-2-0
View File

@ -1,3 +1,31 @@
2000-11-02 Alexander Larsson <alexl@redhat.com>
* gdk/linux-fb/gdkcolor-fb.c, gdk/linux-fb/gdkdnd-fb.c,
gdk/linux-fb/gdkgc-fb.c, gdk/linux-fb/gdkpango-fb.c,
gdk/linux-fb/gdkpixmap-fb.c, gdk/linux-fb/gdkwindow-fb.c:
Add last argument to t_type_register_static call.
* gdk/linux-fb/gdkdrawable-fb2.c:
Add last argument to t_type_register_static call.
export the get_image drawable virtual function.
* gdk/linux-fb/gdkimage-fb.c:
Add last argument to t_type_register_static call.
rename gtk_image_get to _gdk_fb_get_image and
export it for use by gdkdrawable-fb2.
* gdk/linux-fb/gdkprivate-fb.h:
export _gdk_fb_get_image.
* gdk/linux-fb/gdkselection-fb.c:
Add new api call stubs.
* gtk/Makefile.am:
Missing ( in linux-fb part.
* modules/linux-fb/Makefile.am:
Must link with gdk_pixbuf or get unresolved symbol.
2000-11-01 Havoc Pennington <hp@pobox.com> 2000-11-01 Havoc Pennington <hp@pobox.com>
* gtk/gtktextbuffer.c (gtk_text_buffer_class_init): Use * gtk/gtktextbuffer.c (gtk_text_buffer_class_init): Use

28
ChangeLog.pre-2-10
View File

@ -1,3 +1,31 @@
2000-11-02 Alexander Larsson <alexl@redhat.com>
* gdk/linux-fb/gdkcolor-fb.c, gdk/linux-fb/gdkdnd-fb.c,
gdk/linux-fb/gdkgc-fb.c, gdk/linux-fb/gdkpango-fb.c,
gdk/linux-fb/gdkpixmap-fb.c, gdk/linux-fb/gdkwindow-fb.c:
Add last argument to t_type_register_static call.
* gdk/linux-fb/gdkdrawable-fb2.c:
Add last argument to t_type_register_static call.
export the get_image drawable virtual function.
* gdk/linux-fb/gdkimage-fb.c:
Add last argument to t_type_register_static call.
rename gtk_image_get to _gdk_fb_get_image and
export it for use by gdkdrawable-fb2.
* gdk/linux-fb/gdkprivate-fb.h:
export _gdk_fb_get_image.
* gdk/linux-fb/gdkselection-fb.c:
Add new api call stubs.
* gtk/Makefile.am:
Missing ( in linux-fb part.
* modules/linux-fb/Makefile.am:
Must link with gdk_pixbuf or get unresolved symbol.
2000-11-01 Havoc Pennington <hp@pobox.com> 2000-11-01 Havoc Pennington <hp@pobox.com>
* gtk/gtktextbuffer.c (gtk_text_buffer_class_init): Use * gtk/gtktextbuffer.c (gtk_text_buffer_class_init): Use

28
ChangeLog.pre-2-2
View File

@ -1,3 +1,31 @@
2000-11-02 Alexander Larsson <alexl@redhat.com>
* gdk/linux-fb/gdkcolor-fb.c, gdk/linux-fb/gdkdnd-fb.c,
gdk/linux-fb/gdkgc-fb.c, gdk/linux-fb/gdkpango-fb.c,
gdk/linux-fb/gdkpixmap-fb.c, gdk/linux-fb/gdkwindow-fb.c:
Add last argument to t_type_register_static call.
* gdk/linux-fb/gdkdrawable-fb2.c:
Add last argument to t_type_register_static call.
export the get_image drawable virtual function.
* gdk/linux-fb/gdkimage-fb.c:
Add last argument to t_type_register_static call.
rename gtk_image_get to _gdk_fb_get_image and
export it for use by gdkdrawable-fb2.
* gdk/linux-fb/gdkprivate-fb.h:
export _gdk_fb_get_image.
* gdk/linux-fb/gdkselection-fb.c:
Add new api call stubs.
* gtk/Makefile.am:
Missing ( in linux-fb part.
* modules/linux-fb/Makefile.am:
Must link with gdk_pixbuf or get unresolved symbol.
2000-11-01 Havoc Pennington <hp@pobox.com> 2000-11-01 Havoc Pennington <hp@pobox.com>
* gtk/gtktextbuffer.c (gtk_text_buffer_class_init): Use * gtk/gtktextbuffer.c (gtk_text_buffer_class_init): Use

28
ChangeLog.pre-2-4
View File

@ -1,3 +1,31 @@
2000-11-02 Alexander Larsson <alexl@redhat.com>
* gdk/linux-fb/gdkcolor-fb.c, gdk/linux-fb/gdkdnd-fb.c,
gdk/linux-fb/gdkgc-fb.c, gdk/linux-fb/gdkpango-fb.c,
gdk/linux-fb/gdkpixmap-fb.c, gdk/linux-fb/gdkwindow-fb.c:
Add last argument to t_type_register_static call.
* gdk/linux-fb/gdkdrawable-fb2.c:
Add last argument to t_type_register_static call.
export the get_image drawable virtual function.
* gdk/linux-fb/gdkimage-fb.c:
Add last argument to t_type_register_static call.
rename gtk_image_get to _gdk_fb_get_image and
export it for use by gdkdrawable-fb2.
* gdk/linux-fb/gdkprivate-fb.h:
export _gdk_fb_get_image.
* gdk/linux-fb/gdkselection-fb.c:
Add new api call stubs.
* gtk/Makefile.am:
Missing ( in linux-fb part.
* modules/linux-fb/Makefile.am:
Must link with gdk_pixbuf or get unresolved symbol.
2000-11-01 Havoc Pennington <hp@pobox.com> 2000-11-01 Havoc Pennington <hp@pobox.com>
* gtk/gtktextbuffer.c (gtk_text_buffer_class_init): Use * gtk/gtktextbuffer.c (gtk_text_buffer_class_init): Use

28
ChangeLog.pre-2-6
View File

@ -1,3 +1,31 @@
2000-11-02 Alexander Larsson <alexl@redhat.com>
* gdk/linux-fb/gdkcolor-fb.c, gdk/linux-fb/gdkdnd-fb.c,
gdk/linux-fb/gdkgc-fb.c, gdk/linux-fb/gdkpango-fb.c,
gdk/linux-fb/gdkpixmap-fb.c, gdk/linux-fb/gdkwindow-fb.c:
Add last argument to t_type_register_static call.
* gdk/linux-fb/gdkdrawable-fb2.c:
Add last argument to t_type_register_static call.
export the get_image drawable virtual function.
* gdk/linux-fb/gdkimage-fb.c:
Add last argument to t_type_register_static call.
rename gtk_image_get to _gdk_fb_get_image and
export it for use by gdkdrawable-fb2.
* gdk/linux-fb/gdkprivate-fb.h:
export _gdk_fb_get_image.
* gdk/linux-fb/gdkselection-fb.c:
Add new api call stubs.
* gtk/Makefile.am:
Missing ( in linux-fb part.
* modules/linux-fb/Makefile.am:
Must link with gdk_pixbuf or get unresolved symbol.
2000-11-01 Havoc Pennington <hp@pobox.com> 2000-11-01 Havoc Pennington <hp@pobox.com>
* gtk/gtktextbuffer.c (gtk_text_buffer_class_init): Use * gtk/gtktextbuffer.c (gtk_text_buffer_class_init): Use

28
ChangeLog.pre-2-8
View File

@ -1,3 +1,31 @@
2000-11-02 Alexander Larsson <alexl@redhat.com>
* gdk/linux-fb/gdkcolor-fb.c, gdk/linux-fb/gdkdnd-fb.c,
gdk/linux-fb/gdkgc-fb.c, gdk/linux-fb/gdkpango-fb.c,
gdk/linux-fb/gdkpixmap-fb.c, gdk/linux-fb/gdkwindow-fb.c:
Add last argument to t_type_register_static call.
* gdk/linux-fb/gdkdrawable-fb2.c:
Add last argument to t_type_register_static call.
export the get_image drawable virtual function.
* gdk/linux-fb/gdkimage-fb.c:
Add last argument to t_type_register_static call.
rename gtk_image_get to _gdk_fb_get_image and
export it for use by gdkdrawable-fb2.
* gdk/linux-fb/gdkprivate-fb.h:
export _gdk_fb_get_image.
* gdk/linux-fb/gdkselection-fb.c:
Add new api call stubs.
* gtk/Makefile.am:
Missing ( in linux-fb part.
* modules/linux-fb/Makefile.am:
Must link with gdk_pixbuf or get unresolved symbol.
2000-11-01 Havoc Pennington <hp@pobox.com> 2000-11-01 Havoc Pennington <hp@pobox.com>
* gtk/gtktextbuffer.c (gtk_text_buffer_class_init): Use * gtk/gtktextbuffer.c (gtk_text_buffer_class_init): Use

3
gdk/linux-fb/gdkcolor-fb.c
View File

@ -94,7 +94,8 @@ gdk_colormap_get_type (void)
object_type = g_type_register_static (G_TYPE_OBJECT, object_type = g_type_register_static (G_TYPE_OBJECT,
"GdkColormap", "GdkColormap",
&object_info); &object_info,
0);
} }
return object_type; return object_type;

3
gdk/linux-fb/gdkdnd-fb.c
View File

@ -117,7 +117,8 @@ gdk_drag_context_get_type (void)
object_type = g_type_register_static (G_TYPE_OBJECT, object_type = g_type_register_static (G_TYPE_OBJECT,
"GdkDragContext", "GdkDragContext",
&object_info); &object_info,
0);
} }
return object_type; return object_type;

5
gdk/linux-fb/gdkdrawable-fb2.c
View File

@ -127,6 +127,8 @@ gdk_drawable_impl_fb_class_init (GdkDrawableFBClass *klass)
drawable_class->set_colormap = gdk_fb_set_colormap; drawable_class->set_colormap = gdk_fb_set_colormap;
drawable_class->get_colormap = gdk_fb_get_colormap; drawable_class->get_colormap = gdk_fb_get_colormap;
drawable_class->get_size = gdk_fb_get_size; drawable_class->get_size = gdk_fb_get_size;
drawable_class->get_image = _gdk_fb_get_image;
} }
GType GType
@ -151,7 +153,8 @@ gdk_drawable_impl_fb_get_type (void)
object_type = g_type_register_static (GDK_TYPE_DRAWABLE, object_type = g_type_register_static (GDK_TYPE_DRAWABLE,
"GdkDrawableFB", "GdkDrawableFB",
&object_info); &object_info,
0);
} }
return object_type; return object_type;

3
gdk/linux-fb/gdkgc-fb.c
View File

@ -60,7 +60,8 @@ GType gdk_gc_fb_get_type (void)
object_type = g_type_register_static (GDK_TYPE_GC, object_type = g_type_register_static (GDK_TYPE_GC,
"GdkGCFB", "GdkGCFB",
&object_info); &object_info,
0);
} }
return object_type; return object_type;

13
gdk/linux-fb/gdkimage-fb.c
View File

@ -97,7 +97,8 @@ gdk_image_get_type (void)
object_type = g_type_register_static (G_TYPE_OBJECT, object_type = g_type_register_static (G_TYPE_OBJECT,
"GdkImage", "GdkImage",
&object_info); &object_info,
0);
} }
return object_type; return object_type;
@ -150,11 +151,11 @@ gdk_image_new (GdkImageType type,
} }
GdkImage* GdkImage*
gdk_image_get (GdkWindow *window, _gdk_fb_get_image (GdkWindow *window,
gint x, gint x,
gint y, gint y,
gint width, gint width,
gint height) gint height)
{ {
GdkImage *image; GdkImage *image;
GdkImagePrivateFB *private; GdkImagePrivateFB *private;

6
gdk/linux-fb/gdkpango-fb.c
View File

@ -99,7 +99,8 @@ pango_fb_font_map_get_type(void)
object_type = g_type_register_static (PANGO_TYPE_FONT_MAP, object_type = g_type_register_static (PANGO_TYPE_FONT_MAP,
"PangoFBFontMap", "PangoFBFontMap",
&object_info); &object_info,
0);
} }
return object_type; return object_type;
@ -435,7 +436,8 @@ pango_fb_font_get_type (void)
object_type = g_type_register_static (PANGO_TYPE_FONT, object_type = g_type_register_static (PANGO_TYPE_FONT,
"PangoFBFont", "PangoFBFont",
&object_info); &object_info,
0);
} }
return object_type; return object_type;

3
gdk/linux-fb/gdkpixmap-fb.c
View File

@ -104,7 +104,8 @@ _gdk_pixmap_impl_get_type (void)
object_type = g_type_register_static (gdk_drawable_impl_fb_get_type(), object_type = g_type_register_static (gdk_drawable_impl_fb_get_type(),
"GdkPixmapFB", "GdkPixmapFB",
&object_info); &object_info,
0);
} }
return object_type; return object_type;

8
gdk/linux-fb/gdkprivate-fb.h
View File

@ -202,7 +202,13 @@ void gdk_window_invalidate_region_clear(GdkWindow *window, GdkRegion *region);
void gdk_window_invalidate_rect_clear(GdkWindow *window, GdkRectangle *rect); void gdk_window_invalidate_rect_clear(GdkWindow *window, GdkRectangle *rect);
GdkGC *_gdk_fb_gc_new(GdkDrawable *drawable, GdkGCValues *values, GdkGCValuesMask values_mask); GdkGC *_gdk_fb_gc_new(GdkDrawable *drawable, GdkGCValues *values, GdkGCValuesMask values_mask);
void gdk_fb_drawable_clear(GdkDrawable *drawable); GdkImage*_gdk_fb_get_image (GdkWindow *window,
gint x,
gint y,
gint width,
gint height);
void gdk_fb_drawable_clear (GdkDrawable *drawable);
void gdk_fb_draw_drawable (GdkDrawable *drawable, void gdk_fb_draw_drawable (GdkDrawable *drawable,
GdkGC *gc, GdkGC *gc,
GdkPixmap *src, GdkPixmap *src,

68
gdk/linux-fb/gdkselection-fb.c
View File

@ -102,3 +102,71 @@ gdk_string_to_compound_text (const gchar *str,
void gdk_free_compound_text (guchar *ctext) void gdk_free_compound_text (guchar *ctext)
{ {
} }
/**
* gdk_utf8_to_string_target:
* @str: a UTF-8 string
*
* Convert an UTF-8 string into the best possible representation
* as a STRING. The representation of characters not in STRING
* is not specified; it may be as pseudo-escape sequences
* \x{ABCD}, or it may be in some other form of approximation.
*
* Return value: the newly allocated string, or %NULL if the
* conversion failed. (It should not fail for
* any properly formed UTF-8 string.)
**/
gchar *
gdk_utf8_to_string_target (const gchar *str)
{
return 0;
}
/**
* gdk_utf8_to_compound_text:
* @str: a UTF-8 string
* @encoding: location to store resulting encoding
* @format: location to store format of the result
* @ctext: location to store the data of the result
* @length: location to store the length of the data
* stored in @ctext
*
* Convert from UTF-8 to compound text.
*
* Return value: %TRUE if the conversion succeeded, otherwise
* false.
**/
gboolean
gdk_utf8_to_compound_text (const gchar *str,
GdkAtom *encoding,
gint *format,
guchar **ctext,
gint *length)
{
return 0;
}
/**
* gdk_text_property_to_utf8_list:
* @encoding: an atom representing the encoding of the text
* @format: the format of the property
* @text: the text to convert
* @length: the length of @text, in bytes
* @list: location to store the list of strings or %NULL. The
* list should be freed with g_strfreev().
*
* Convert a text property in the giving encoding to
* a list of UTF-8 strings.
*
* Return value: the number of strings in the resulting
* list.
**/
gint
gdk_text_property_to_utf8_list (GdkAtom encoding,
gint format,
const guchar *text,
gint length,
gchar ***list)
{
return 0;
}

3
gdk/linux-fb/gdkwindow-fb.c
View File

@ -105,7 +105,8 @@ _gdk_window_impl_get_type (void)
object_type = g_type_register_static (gdk_drawable_impl_fb_get_type(), object_type = g_type_register_static (gdk_drawable_impl_fb_get_type(),
"GdkWindowFB", "GdkWindowFB",
&object_info); &object_info,
0);
} }
return object_type; return object_type;

2
gtk/Makefile.am
View File

@ -494,7 +494,7 @@ libgtk_nanox_1_3_la_SOURCES = $(gtk_target_sources)
endif endif
if USE_LINUX_FB if USE_LINUX_FB
libgtk_linux_fb_includedir = $(includedir)/gtk-2.0/gtk libgtk_linux_fb_includedir = $(includedir)/gtk-2.0/gtk
libgtk_linux_fb_include_HEADERS = $gtk_target_headers) libgtk_linux_fb_include_HEADERS = $(gtk_target_headers)
libgtk_linux_fb_1_3_la_SOURCES = $(gtk_target_sources) libgtk_linux_fb_1_3_la_SOURCES = $(gtk_target_sources)
endif endif
EXTRA_LTLIBRARIES = libgtk-x11-1.3.la libgtk-nanox-1.3.la libgtk-linux-fb-1.3.la EXTRA_LTLIBRARIES = libgtk-x11-1.3.la libgtk-nanox-1.3.la libgtk-linux-fb-1.3.la

2
modules/linux-fb/Makefile.am
View File

@ -24,7 +24,7 @@ LDFLAGS = @STRIP_BEGIN@ \
fb_basic_la_SOURCES = basic.c fb_basic_la_SOURCES = basic.c
fb_basic_la_LDFLAGS = -export-dynamic -avoid-version -module fb_basic_la_LDFLAGS = -export-dynamic -avoid-version -module
fb_basic_la_LIBADD = $(PANGO_LIBS) -L$(top_builddir)/gdk/.libs -lgdk-linux-fb-1.3 fb_basic_la_LIBADD = $(PANGO_LIBS) -L$(top_builddir)/gdk/.libs -lgdk-linux-fb-1.3 -lgdk_pixbuf-1.3
if USE_LINUX_FB if USE_LINUX_FB