Commit 93f12bd6 authored by Hans Breuer's avatar Hans Breuer Committed by Hans Breuer

static correct-ness, underscore prefixing of library internal functions

2001-10-28  Hans Breuer  <hans@breuer.org>

	* gdk/gdk.c gdk/gdkevents.c
	  gdk/win32/gdkcolor-win32.c gdk/win32/gdkdnd-win32.c
	  gdk/win32/gdkdrawable-win32.c gdk/win32/gdkevents-win32.c
	  gdk/win32/gdkfont-win32.c gdk/win32/gdkgc-win32.c
	  gdk/win32/gdkim-win32.c gdk/win32/gdkmain-win32.c
	  gdk/win32/gdkprivate-win32.h gdk/win32/gdkproperty-win32.c
	  gdk/win32/gdkselection-win32.c gdk/win32/gdkwin32.h
	  gdk/win32/gdkwindow-win32.c gdk/win32/gdkwindow-win32.h :
	static correct-ness, underscore prefixing of library internal
	functions
	(applied the undisputed and the win32 part. Of the latter
	 I'm probably the one who will change it back again, if Owen
	 decides that the Gdk*Impl types should not be private to Gdk)

	* gdk/gdk.def : added the remaining exported functions
parent a20c8a43
2001-10-28 Hans Breuer <hans@breuer.org>
* gdk/gdk.c gdk/gdkevents.c
gdk/win32/gdkcolor-win32.c gdk/win32/gdkdnd-win32.c
gdk/win32/gdkdrawable-win32.c gdk/win32/gdkevents-win32.c
gdk/win32/gdkfont-win32.c gdk/win32/gdkgc-win32.c
gdk/win32/gdkim-win32.c gdk/win32/gdkmain-win32.c
gdk/win32/gdkprivate-win32.h gdk/win32/gdkproperty-win32.c
gdk/win32/gdkselection-win32.c gdk/win32/gdkwin32.h
gdk/win32/gdkwindow-win32.c gdk/win32/gdkwindow-win32.h :
static correct-ness, underscore prefixing of library internal
functions
(applied the undisputed and the win32 part. Of the latter
I'm probably the one who will change it back again, if Owen
decides that the Gdk*Impl types should not be private to Gdk)
* gdk/gdk.def : added the remaining exported functions
2001-10-28 Matthias Clasen <matthiasc@poet.de>
* gtk/gtkcellrenderertoggle.c, gtk/gtkimcontextsimple.c,
......
2001-10-28 Hans Breuer <hans@breuer.org>
* gdk/gdk.c gdk/gdkevents.c
gdk/win32/gdkcolor-win32.c gdk/win32/gdkdnd-win32.c
gdk/win32/gdkdrawable-win32.c gdk/win32/gdkevents-win32.c
gdk/win32/gdkfont-win32.c gdk/win32/gdkgc-win32.c
gdk/win32/gdkim-win32.c gdk/win32/gdkmain-win32.c
gdk/win32/gdkprivate-win32.h gdk/win32/gdkproperty-win32.c
gdk/win32/gdkselection-win32.c gdk/win32/gdkwin32.h
gdk/win32/gdkwindow-win32.c gdk/win32/gdkwindow-win32.h :
static correct-ness, underscore prefixing of library internal
functions
(applied the undisputed and the win32 part. Of the latter
I'm probably the one who will change it back again, if Owen
decides that the Gdk*Impl types should not be private to Gdk)
* gdk/gdk.def : added the remaining exported functions
2001-10-28 Matthias Clasen <matthiasc@poet.de>
* gtk/gtkcellrenderertoggle.c, gtk/gtkimcontextsimple.c,
......
2001-10-28 Hans Breuer <hans@breuer.org>
* gdk/gdk.c gdk/gdkevents.c
gdk/win32/gdkcolor-win32.c gdk/win32/gdkdnd-win32.c
gdk/win32/gdkdrawable-win32.c gdk/win32/gdkevents-win32.c
gdk/win32/gdkfont-win32.c gdk/win32/gdkgc-win32.c
gdk/win32/gdkim-win32.c gdk/win32/gdkmain-win32.c
gdk/win32/gdkprivate-win32.h gdk/win32/gdkproperty-win32.c
gdk/win32/gdkselection-win32.c gdk/win32/gdkwin32.h
gdk/win32/gdkwindow-win32.c gdk/win32/gdkwindow-win32.h :
static correct-ness, underscore prefixing of library internal
functions
(applied the undisputed and the win32 part. Of the latter
I'm probably the one who will change it back again, if Owen
decides that the Gdk*Impl types should not be private to Gdk)
* gdk/gdk.def : added the remaining exported functions
2001-10-28 Matthias Clasen <matthiasc@poet.de>
* gtk/gtkcellrenderertoggle.c, gtk/gtkimcontextsimple.c,
......
2001-10-28 Hans Breuer <hans@breuer.org>
* gdk/gdk.c gdk/gdkevents.c
gdk/win32/gdkcolor-win32.c gdk/win32/gdkdnd-win32.c
gdk/win32/gdkdrawable-win32.c gdk/win32/gdkevents-win32.c
gdk/win32/gdkfont-win32.c gdk/win32/gdkgc-win32.c
gdk/win32/gdkim-win32.c gdk/win32/gdkmain-win32.c
gdk/win32/gdkprivate-win32.h gdk/win32/gdkproperty-win32.c
gdk/win32/gdkselection-win32.c gdk/win32/gdkwin32.h
gdk/win32/gdkwindow-win32.c gdk/win32/gdkwindow-win32.h :
static correct-ness, underscore prefixing of library internal
functions
(applied the undisputed and the win32 part. Of the latter
I'm probably the one who will change it back again, if Owen
decides that the Gdk*Impl types should not be private to Gdk)
* gdk/gdk.def : added the remaining exported functions
2001-10-28 Matthias Clasen <matthiasc@poet.de>
* gtk/gtkcellrenderertoggle.c, gtk/gtkimcontextsimple.c,
......
2001-10-28 Hans Breuer <hans@breuer.org>
* gdk/gdk.c gdk/gdkevents.c
gdk/win32/gdkcolor-win32.c gdk/win32/gdkdnd-win32.c
gdk/win32/gdkdrawable-win32.c gdk/win32/gdkevents-win32.c
gdk/win32/gdkfont-win32.c gdk/win32/gdkgc-win32.c
gdk/win32/gdkim-win32.c gdk/win32/gdkmain-win32.c
gdk/win32/gdkprivate-win32.h gdk/win32/gdkproperty-win32.c
gdk/win32/gdkselection-win32.c gdk/win32/gdkwin32.h
gdk/win32/gdkwindow-win32.c gdk/win32/gdkwindow-win32.h :
static correct-ness, underscore prefixing of library internal
functions
(applied the undisputed and the win32 part. Of the latter
I'm probably the one who will change it back again, if Owen
decides that the Gdk*Impl types should not be private to Gdk)
* gdk/gdk.def : added the remaining exported functions
2001-10-28 Matthias Clasen <matthiasc@poet.de>
* gtk/gtkcellrenderertoggle.c, gtk/gtkimcontextsimple.c,
......
2001-10-28 Hans Breuer <hans@breuer.org>
* gdk/gdk.c gdk/gdkevents.c
gdk/win32/gdkcolor-win32.c gdk/win32/gdkdnd-win32.c
gdk/win32/gdkdrawable-win32.c gdk/win32/gdkevents-win32.c
gdk/win32/gdkfont-win32.c gdk/win32/gdkgc-win32.c
gdk/win32/gdkim-win32.c gdk/win32/gdkmain-win32.c
gdk/win32/gdkprivate-win32.h gdk/win32/gdkproperty-win32.c
gdk/win32/gdkselection-win32.c gdk/win32/gdkwin32.h
gdk/win32/gdkwindow-win32.c gdk/win32/gdkwindow-win32.h :
static correct-ness, underscore prefixing of library internal
functions
(applied the undisputed and the win32 part. Of the latter
I'm probably the one who will change it back again, if Owen
decides that the Gdk*Impl types should not be private to Gdk)
* gdk/gdk.def : added the remaining exported functions
2001-10-28 Matthias Clasen <matthiasc@poet.de>
* gtk/gtkcellrenderertoggle.c, gtk/gtkimcontextsimple.c,
......
2001-10-28 Hans Breuer <hans@breuer.org>
* gdk/gdk.c gdk/gdkevents.c
gdk/win32/gdkcolor-win32.c gdk/win32/gdkdnd-win32.c
gdk/win32/gdkdrawable-win32.c gdk/win32/gdkevents-win32.c
gdk/win32/gdkfont-win32.c gdk/win32/gdkgc-win32.c
gdk/win32/gdkim-win32.c gdk/win32/gdkmain-win32.c
gdk/win32/gdkprivate-win32.h gdk/win32/gdkproperty-win32.c
gdk/win32/gdkselection-win32.c gdk/win32/gdkwin32.h
gdk/win32/gdkwindow-win32.c gdk/win32/gdkwindow-win32.h :
static correct-ness, underscore prefixing of library internal
functions
(applied the undisputed and the win32 part. Of the latter
I'm probably the one who will change it back again, if Owen
decides that the Gdk*Impl types should not be private to Gdk)
* gdk/gdk.def : added the remaining exported functions
2001-10-28 Matthias Clasen <matthiasc@poet.de>
* gtk/gtkcellrenderertoggle.c, gtk/gtkimcontextsimple.c,
......
......@@ -74,7 +74,7 @@ static const int gdk_ndebug_keys = sizeof(gdk_debug_keys)/sizeof(GDebugKey);
#endif /* G_ENABLE_DEBUG */
GdkArgContext *
static GdkArgContext *
gdk_arg_context_new (gpointer cb_data)
{
GdkArgContext *result = g_new (GdkArgContext, 1);
......@@ -84,20 +84,20 @@ gdk_arg_context_new (gpointer cb_data)
return result;
}
void
static void
gdk_arg_context_destroy (GdkArgContext *context)
{
g_ptr_array_free (context->tables, TRUE);
g_free (context);
}
void
static void
gdk_arg_context_add_table (GdkArgContext *context, GdkArgDesc *table)
{
g_ptr_array_add (context->tables, table);
}
void
static void
gdk_arg_context_parse (GdkArgContext *context, gint *argc, gchar ***argv)
{
int i, j, k;
......
EXPORTS
gdk_add_client_message_filter
gdk_atom_intern
gdk_atom_name
gdk_axis_use_get_type
......@@ -28,6 +29,7 @@ EXPORTS
gdk_colormap_get_system_size
gdk_colormap_get_type
gdk_colormap_get_visual
gdk_colormap_lookup
gdk_colormap_new
gdk_colormap_query_color
gdk_colormap_ref
......@@ -35,8 +37,8 @@ EXPORTS
gdk_colors_alloc
gdk_colors_free
gdk_colors_store
gdk_device_get_core_pointer
gdk_crossing_mode_get_type
gdk_cursor_get_type
gdk_cursor_new
gdk_cursor_new_from_pixmap
gdk_cursor_ref
......@@ -44,8 +46,10 @@ EXPORTS
gdk_cursor_unref
gdk_device_free_history
gdk_device_get_axis
gdk_device_get_core_pointer
gdk_device_get_history
gdk_device_get_state
gdk_device_get_type
gdk_device_set_axis_use
gdk_device_set_key
gdk_device_set_mode
......@@ -73,6 +77,7 @@ EXPORTS
gdk_draw_indexed_image
gdk_draw_layout
gdk_draw_layout_line
gdk_draw_layout_line_with_colors
gdk_draw_layout_with_colors
gdk_draw_line
gdk_draw_lines
......@@ -88,11 +93,14 @@ EXPORTS
gdk_draw_string
gdk_draw_text
gdk_draw_text_wc
gdk_drawable_get_clip_region
gdk_drawable_get_colormap
gdk_drawable_get_data
gdk_drawable_get_depth
gdk_drawable_get_image
gdk_drawable_get_size
gdk_drawable_get_type
gdk_drawable_get_visible_region
gdk_drawable_get_visual
gdk_drawable_impl_win32_get_type
gdk_drawable_ref
......@@ -107,7 +115,9 @@ EXPORTS
gdk_event_free
gdk_event_get
gdk_event_get_axis
gdk_event_get_coords
gdk_event_get_graphics_expose
gdk_event_get_root_coords
gdk_event_get_state
gdk_event_get_time
gdk_event_get_type
......@@ -145,6 +155,7 @@ EXPORTS
gdk_gc_get_values
gdk_gc_new
gdk_gc_new_with_values
gdk_gc_offset
gdk_gc_ref
gdk_gc_set_background
gdk_gc_set_clip_mask
......@@ -165,7 +176,9 @@ EXPORTS
gdk_gc_set_subwindow
gdk_gc_set_tile
gdk_gc_set_ts_origin
gdk_gc_set_values
gdk_gc_unref
gdk_gc_values_mask_get_type
gdk_get_default_root_window
gdk_get_display
gdk_get_program_class
......@@ -174,12 +187,14 @@ EXPORTS
gdk_grab_status_get_type
gdk_gravity_get_type
gdk_image_get
gdk_image_get_colormap
gdk_image_get_pixel
gdk_image_get_type
gdk_image_new
gdk_image_new_bitmap
gdk_image_put_pixel
gdk_image_ref
gdk_image_set_colormap
gdk_image_type_get_type
gdk_image_unref
gdk_init
......@@ -192,6 +207,7 @@ EXPORTS
gdk_input_remove
gdk_input_set_extension_events
gdk_input_source_get_type
gdk_input_window_destroy
gdk_join_style_get_type
gdk_keyboard_grab
gdk_keyboard_ungrab
......@@ -221,7 +237,9 @@ EXPORTS
gdk_pango_context_get
gdk_pango_context_set_colormap
gdk_pango_layout_get_clip_region
gdk_pango_layout_line_get_clip_region
gdk_pixbuf_get_from_drawable
gdk_pixbuf_get_from_image
gdk_pixbuf_render_pixmap_and_mask
gdk_pixbuf_render_pixmap_and_mask_for_colormap
gdk_pixbuf_render_threshold_alpha
......@@ -248,10 +266,12 @@ EXPORTS
gdk_rectangle_get_type
gdk_rectangle_intersect
gdk_rectangle_union
gdk_region_copy
gdk_region_destroy
gdk_region_empty
gdk_region_equal
gdk_region_get_clipbox
gdk_region_get_rectangles
gdk_region_intersect
gdk_region_new
gdk_region_offset
......@@ -260,6 +280,7 @@ EXPORTS
gdk_region_rect_in
gdk_region_rectangle
gdk_region_shrink
gdk_region_spans_intersect_foreach
gdk_region_subtract
gdk_region_union
gdk_region_union_with_rect
......@@ -269,6 +290,7 @@ EXPORTS
gdk_rgb_colormap_ditherable
gdk_rgb_dither_get_type
gdk_rgb_ditherable
gdk_rgb_find_color
gdk_rgb_gc_set_background
gdk_rgb_gc_set_foreground
gdk_rgb_get_colormap
......@@ -290,6 +312,8 @@ EXPORTS
gdk_selection_send_notify
gdk_set_double_click_time
gdk_set_locale
gdk_set_pointer_hooks
gdk_set_program_class
gdk_set_show_events
gdk_set_sm_client_id
gdk_set_use_xshm
......@@ -312,6 +336,7 @@ EXPORTS
gdk_text_width
gdk_text_width_wc
gdk_threads_enter
gdk_threads_init
gdk_threads_leave
gdk_threads_mutex
gdk_unicode_to_keyval
......@@ -326,6 +351,7 @@ EXPORTS
gdk_visual_get_best_with_type
gdk_visual_get_system
gdk_visual_get_type
gdk_visual_lookup
gdk_visual_type_get_type
gdk_wcstombs
gdk_win32_drawable_get_handle
......@@ -357,13 +383,16 @@ EXPORTS
gdk_window_get_events
gdk_window_get_frame_extents
gdk_window_get_geometry
gdk_window_get_internal_paint_info
gdk_window_get_origin
gdk_window_get_parent
gdk_window_get_pointer
gdk_window_get_position
gdk_window_get_root_origin
gdk_window_get_state
gdk_window_get_toplevel
gdk_window_get_toplevels
gdk_window_get_update_area
gdk_window_get_user_data
gdk_window_get_window_type
gdk_window_hide
......@@ -373,6 +402,7 @@ EXPORTS
gdk_window_invalidate_region
gdk_window_is_viewable
gdk_window_is_visible
gdk_window_lookup
gdk_window_lower
gdk_window_maximize
gdk_window_merge_child_shapes
......@@ -414,6 +444,7 @@ EXPORTS
gdk_window_shape_combine_mask
gdk_window_shape_combine_region
gdk_window_show
gdk_window_show_unraised
gdk_window_state_get_type
gdk_window_stick
gdk_window_thaw_updates
......@@ -424,5 +455,4 @@ EXPORTS
gdk_window_withdraw
gdk_wm_decoration_get_type
gdk_wm_function_get_type
gdk_window_lookup
gdk_device_get_type
......@@ -881,7 +881,7 @@ _gdk_event_unqueue (void)
return event;
}
void
static void
gdk_synthesize_click (GdkEvent *event,
gint nclicks)
{
......
......@@ -1471,7 +1471,7 @@ gdk_colormap_new (GdkVisual *visual,
#define MIN_SYNC_TIME 2
void
static void
gdk_colormap_sync (GdkColormap *colormap,
gboolean force)
{
......
......@@ -1007,7 +1007,7 @@ gdk_dropfiles_filter (GdkXEvent *xev,
}
g_string_append (result, "\015\012");
}
gdk_sel_prop_store (_gdk_parent_root, text_uri_list_atom, 8,
_gdk_selection_property_store (_gdk_parent_root, text_uri_list_atom, 8,
result->str, result->len + 1);
DragFinish (hdrop);
......@@ -1050,7 +1050,7 @@ _gdk_dnd_init (void)
}
void
gdk_win32_dnd_exit (void)
_gdk_win32_dnd_exit (void)
{
#ifdef OLE2_DND
OleUninitialize ();
......
......@@ -238,7 +238,7 @@ gdk_win32_draw_rectangle (GdkDrawable *drawable,
&& (gc_private->values_mask & GDK_GC_TILE)
&& (gc_private->values_mask & GDK_GC_FILL))
{
gdk_win32_draw_tiles (drawable, gc, gc_private->tile, x, y, width, height);
_gdk_win32_draw_tiles (drawable, gc, gc_private->tile, x, y, width, height);
return;
}
......@@ -537,15 +537,15 @@ gdk_win32_draw_text (GdkDrawable *drawable,
{
/* For single characters, don't try to interpret as UTF-8. */
wc = (guchar) text[0];
gdk_wchar_text_handle (font, &wc, 1, gdk_draw_text_handler, &arg);
_gdk_wchar_text_handle (font, &wc, 1, gdk_draw_text_handler, &arg);
}
else
{
wcstr = g_new (wchar_t, text_length);
if ((wlen = gdk_nmbstowchar_ts (wcstr, text, text_length, text_length)) == -1)
g_warning ("gdk_win32_draw_text: gdk_nmbstowchar_ts failed");
if ((wlen = _gdk_win32_nmbstowchar_ts (wcstr, text, text_length, text_length)) == -1)
g_warning ("gdk_win32_draw_text: _gdk_win32_nmbstowchar_ts failed");
else
gdk_wchar_text_handle (font, wcstr, wlen, gdk_draw_text_handler, &arg);
_gdk_wchar_text_handle (font, wcstr, wlen, gdk_draw_text_handler, &arg);
g_free (wcstr);
}
......@@ -589,7 +589,7 @@ gdk_win32_draw_text_wc (GdkDrawable *drawable,
else
wcstr = (wchar_t *) text;
gdk_wchar_text_handle (font, wcstr, text_length,
_gdk_wchar_text_handle (font, wcstr, text_length,
gdk_draw_text_handler, &arg);
if (sizeof (wchar_t) != sizeof (GdkWChar))
......@@ -758,7 +758,7 @@ gdk_win32_draw_drawable (GdkDrawable *drawable,
}
void
gdk_win32_draw_tiles (GdkDrawable *drawable,
_gdk_win32_draw_tiles (GdkDrawable *drawable,
GdkGC *gc,
GdkPixmap *tile,
gint x_from,
......@@ -809,7 +809,7 @@ gdk_win32_draw_points (GdkDrawable *drawable,
hdc = gdk_win32_hdc_get (drawable, gc, 0);
fg = gdk_colormap_color (impl->colormap, gc_private->foreground);
fg = _gdk_win32_colormap_color (impl->colormap, gc_private->foreground);
GDK_NOTE (MISC, g_print ("gdk_draw_points: %#x %dx%.06x\n",
(guint) GDK_DRAWABLE_IMPL_WIN32 (drawable)->handle,
......
......@@ -270,19 +270,19 @@ real_window_procedure (HWND hwnd,
}
LRESULT CALLBACK
gdk_window_procedure (HWND hwnd,
UINT message,
WPARAM wparam,
LPARAM lparam)
_gdk_win32_window_procedure (HWND hwnd,
UINT message,
WPARAM wparam,
LPARAM lparam)
{
LRESULT retval;
GDK_NOTE (MISC, g_print ("gdk_window_procedure: %#lx %s\n",
GDK_NOTE (MISC, g_print ("_gdk_win32_window_procedure: %#lx %s\n",
(gulong) hwnd, gdk_win32_message_name (message)));
retval = real_window_procedure (hwnd, message, wparam, lparam);
GDK_NOTE (MISC, g_print ("gdk_window_procedure: %#lx returns %ld\n",
GDK_NOTE (MISC, g_print ("_gdk_win32_window_procedure: %#lx returns %ld\n",
(gulong) hwnd, retval));
return retval;
......@@ -1646,8 +1646,8 @@ gdk_event_translate (GdkEvent *event,
event->selection.type = GDK_SELECTION_NOTIFY;
event->selection.window = window;
event->selection.selection = msg->wParam;
event->selection.target = msg->lParam;
event->selection.selection = GDK_POINTER_TO_ATOM (msg->wParam);
event->selection.target = GDK_POINTER_TO_ATOM (msg->lParam);
event->selection.property = _gdk_selection_property;
event->selection.time = msg->time;
......@@ -1679,8 +1679,8 @@ gdk_event_translate (GdkEvent *event,
event->selection.type = GDK_SELECTION_CLEAR;
event->selection.window = window;
event->selection.selection = msg->wParam;
event->selection.target = msg->lParam;
event->selection.selection = GDK_POINTER_TO_ATOM (msg->wParam);
event->selection.target = GDK_POINTER_TO_ATOM (msg->lParam);
event->selection.time = msg->time;
return_val = !GDK_WINDOW_DESTROYED (window);
......@@ -1753,7 +1753,11 @@ gdk_event_translate (GdkEvent *event,
while (tmp_list)
{
GdkClientFilter *filter = tmp_list->data;
if (filter->type == msg->message)
/* FIXME: under win32 messages are not really atoms
* as the following cast suggest, but the appears to be right
* Haven't found a use case though ...
*/
if (filter->type == GDK_POINTER_TO_ATOM (msg->message))
{
GDK_NOTE (EVENTS, g_print ("client filter matched\n"));
event->any.window = window;
......@@ -1776,7 +1780,8 @@ gdk_event_translate (GdkEvent *event,
return_val = TRUE;
event->client.type = GDK_CLIENT_EVENT;
event->client.window = window;
event->client.message_type = msg->message;
/* FIXME: check if the cast is correct, see above */
event->client.message_type = GDK_POINTER_TO_ATOM (msg->message);
event->client.data_format = 0;
event->client.data.l[0] = msg->wParam;
event->client.data.l[1] = msg->lParam;
......@@ -2589,7 +2594,7 @@ gdk_event_translate (GdkEvent *event,
if (GDK_WINDOW_OBJECT (window)->bg_pixmap == NULL)
{
bg = gdk_colormap_color (GDK_DRAWABLE_IMPL_WIN32 (GDK_WINDOW_OBJECT (window)->impl)->colormap,
bg = _gdk_win32_colormap_color (GDK_DRAWABLE_IMPL_WIN32 (GDK_WINDOW_OBJECT (window)->impl)->colormap,
GDK_WINDOW_OBJECT (window)->bg_color.pixel);
GetClipBox (hdc, &rect);
......
......@@ -1791,7 +1791,7 @@ unicode_classify (wchar_t wc)
}
void
gdk_wchar_text_handle (GdkFont *font,
_gdk_wchar_text_handle (GdkFont *font,
const wchar_t *wcstr,
int wclen,
void (*handler)(GdkWin32SingleFont *,
......@@ -1812,7 +1812,7 @@ gdk_wchar_text_handle (GdkFont *font,
g_assert (private->base.ref_count > 0);
GDK_NOTE (MISC, g_print ("gdk_wchar_text_handle: "));
GDK_NOTE (MISC, g_print ("_gdk_wchar_text_handle: "));
while (wcp < end)
{
......@@ -1901,14 +1901,14 @@ gdk_text_size (GdkFont *font,
/* For single characters, don't try to interpret as UTF-8.
*/
wcstr[0] = (guchar) text[0];
gdk_wchar_text_handle (font, wcstr, 1, gdk_text_size_handler, arg);
_gdk_wchar_text_handle (font, wcstr, 1, gdk_text_size_handler, arg);
}
else
{
if ((wlen = gdk_nmbstowchar_ts (wcstr, text, text_length, text_length)) == -1)
g_warning ("gdk_text_size: gdk_nmbstowchar_ts failed");
if ((wlen = _gdk_win32_nmbstowchar_ts (wcstr, text, text_length, text_length)) == -1)
g_warning ("gdk_text_size: _gdk_win32_nmbstowchar_ts failed");
else
gdk_wchar_text_handle (font, wcstr, wlen, gdk_text_size_handler, arg);
_gdk_wchar_text_handle (font, wcstr, wlen, gdk_text_size_handler, arg);
}
g_free (wcstr);
......@@ -1959,7 +1959,7 @@ gdk_text_width_wc (GdkFont *font,
arg.total.cx = arg.total.cy = 0;
gdk_wchar_text_handle (font, wcstr, text_length,
_gdk_wchar_text_handle (font, wcstr, text_length,
gdk_text_size_handler, &arg);
if (sizeof (wchar_t) != sizeof (GdkWChar))
......@@ -2008,14 +2008,14 @@ gdk_text_extents (GdkFont *font,
if (text_length == 1)
{
wcstr[0] = (guchar) text[0];
gdk_wchar_text_handle (font, wcstr, 1, gdk_text_size_handler, &arg);
_gdk_wchar_text_handle (font, wcstr, 1, gdk_text_size_handler, &arg);
}
else
{
if ((wlen = gdk_nmbstowchar_ts (wcstr, text, text_length, text_length)) == -1)
g_warning ("gdk_text_extents: gdk_nmbstowchar_ts failed");
if ((wlen = _gdk_win32_nmbstowchar_ts (wcstr, text, text_length, text_length)) == -1)
g_warning ("gdk_text_extents: _gdk_win32_nmbstowchar_ts failed");
else
gdk_wchar_text_handle (font, wcstr, wlen, gdk_text_size_handler, &arg);
_gdk_wchar_text_handle (font, wcstr, wlen, gdk_text_size_handler, &arg);
}
g_free (wcstr);
......@@ -2079,7 +2079,7 @@ gdk_text_extents_wc (GdkFont *font,
arg.total.cx = arg.total.cy = 0;
gdk_wchar_text_handle (font, wcstr, text_length,
_gdk_wchar_text_handle (font, wcstr, text_length,
gdk_text_size_handler, &arg);
if (sizeof (wchar_t) != sizeof (GdkWChar))
......
......@@ -51,7 +51,7 @@ static void gdk_gc_win32_finalize (GObject *object);
static gpointer parent_class = NULL;
GType
gdk_gc_win32_get_type (void)
_gdk_gc_win32_get_type (void)
{
static GType object_type = 0;
......@@ -495,7 +495,7 @@ _gdk_win32_gc_new (GdkDrawable *drawable,
*/
g_return_val_if_fail (GDK_IS_DRAWABLE_IMPL_WIN32 (drawable), NULL);
gc = g_object_new (gdk_gc_win32_get_type (), NULL);
gc = g_object_new (_gdk_gc_win32_get_type (), NULL);
win32_gc = GDK_GC_WIN32 (gc);
win32_gc->hdc = NULL;
......@@ -820,8 +820,8 @@ gdk_gc_copy (GdkGC *dst_gc,
static guint bitmask[9] = { 0, 1, 3, 7, 15, 31, 63, 127, 255 };
COLORREF
gdk_colormap_color (GdkColormap *colormap,
gulong pixel)
_gdk_win32_colormap_color (GdkColormap *colormap,
gulong pixel)
{
const GdkVisual *visual;
GdkColormapPrivateWin32 *colormap_private;
......@@ -916,7 +916,7 @@ predraw_set_foreground (GdkGC *gc,
}
}
fg = gdk_colormap_color (colormap, win32_gc->foreground);
fg = _gdk_win32_colormap_color (colormap, win32_gc->foreground);
if (SetTextColor (win32_gc-></