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

diff --git a/ChangeLog b/ChangeLog
index a4e94d8c8c05478164606842cf0f081cabe81592..9477a18d4cffab98d963860a822ca9402a138d80 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+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,

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index a4e94d8c8c05478164606842cf0f081cabe81592..9477a18d4cffab98d963860a822ca9402a138d80 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,21 @@
+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,

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index a4e94d8c8c05478164606842cf0f081cabe81592..9477a18d4cffab98d963860a822ca9402a138d80 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,21 @@
+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,

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index a4e94d8c8c05478164606842cf0f081cabe81592..9477a18d4cffab98d963860a822ca9402a138d80 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,21 @@
+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,

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index a4e94d8c8c05478164606842cf0f081cabe81592..9477a18d4cffab98d963860a822ca9402a138d80 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,21 @@
+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,

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index a4e94d8c8c05478164606842cf0f081cabe81592..9477a18d4cffab98d963860a822ca9402a138d80 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,21 @@
+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,

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index a4e94d8c8c05478164606842cf0f081cabe81592..9477a18d4cffab98d963860a822ca9402a138d80 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,21 @@
+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,

diff --git a/gdk/gdk.c b/gdk/gdk.c
index 6e7c4682c4c0f21fb6307b4f621dac7d85172ac7..86c459953497aa84c7895f876212333c16b0327f 100644 (file)
--- a/gdk/gdk.c
+++ b/gdk/gdk.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;

diff --git a/gdk/gdk.def b/gdk/gdk.def
index 1eda8779ea2abc48be7dbab51cc93af90fa1b170..46feae9f04341ea4552e8dfc96aa7ff68eaeed3f 100644 (file)
--- a/gdk/gdk.def
+++ b/gdk/gdk.def
@@ -1,4 +1,5 @@
 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
+

diff --git a/gdk/gdkevents.c b/gdk/gdkevents.c
index 3547ad456e9e9ad93ee21586a35344afef8ec7e4..a7a4b81bd77565eebfcc48e88fd0c50fbba653fe 100644 (file)
--- a/gdk/gdkevents.c
+++ b/gdk/gdkevents.c
@@ -881,7 +881,7 @@ _gdk_event_unqueue (void)
   return event;
 }
 
-void
+static void
 gdk_synthesize_click (GdkEvent *event,
                      gint      nclicks)
 {

diff --git a/gdk/win32/gdkcolor-win32.c b/gdk/win32/gdkcolor-win32.c
index c857f3ebb9db16b3caffccf52f20af2fa34c657a..446e1640d0d27019cb76caa305cb197d4f30bdcf 100644 (file)
--- a/gdk/win32/gdkcolor-win32.c
+++ b/gdk/win32/gdkcolor-win32.c
@@ -1471,7 +1471,7 @@ gdk_colormap_new (GdkVisual *visual,
 
 #define MIN_SYNC_TIME 2
 
-void
+static void
 gdk_colormap_sync (GdkColormap *colormap,
                   gboolean     force)
 {

diff --git a/gdk/win32/gdkdnd-win32.c b/gdk/win32/gdkdnd-win32.c
index d9767f336ffcd6b180f5b5cb4465bb882320e2b2..44fe63da606d052818190999f336881dddc961a7 100644 (file)
--- a/gdk/win32/gdkdnd-win32.c
+++ b/gdk/win32/gdkdnd-win32.c
@@ -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 ();

diff --git a/gdk/win32/gdkdrawable-win32.c b/gdk/win32/gdkdrawable-win32.c
index 44b71f44c69040c8ac3a30a9b07ba9b961dfe984..04c5fe3d938ef01531f33930dd6c5e2bcbf0f8dc 100644 (file)
--- a/gdk/win32/gdkdrawable-win32.c
+++ b/gdk/win32/gdkdrawable-win32.c
@@ -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,

diff --git a/gdk/win32/gdkevents-win32.c b/gdk/win32/gdkevents-win32.c
index d407f4face43a477791fbd0fbe8a096a63a47cc2..a16c1736faeba872a03789cd1485e292bf0ff7f8 100644 (file)
--- a/gdk/win32/gdkevents-win32.c
+++ b/gdk/win32/gdkevents-win32.c
@@ -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);

diff --git a/gdk/win32/gdkfont-win32.c b/gdk/win32/gdkfont-win32.c
index 16056308ff2fc3f72b5fd7cb27f84eb7bdcb7af4..768ffb5cfdc03e38c9dbd39fee890b311e4fa3d5 100644 (file)
--- a/gdk/win32/gdkfont-win32.c
+++ b/gdk/win32/gdkfont-win32.c
@@ -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))

diff --git a/gdk/win32/gdkgc-win32.c b/gdk/win32/gdkgc-win32.c
index 6f7ce1dd7d2d14595eba2bf0ff1531ac40170028..f668b8488c2affc02986f90545e7a24a4f3caf39 100644 (file)
--- a/gdk/win32/gdkgc-win32.c
+++ b/gdk/win32/gdkgc-win32.c
@@ -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->hdc, fg) == CLR_INVALID)
     WIN32_GDI_FAILED ("SetTextColor"), *ok = FALSE;
@@ -955,7 +955,7 @@ predraw_set_foreground (GdkGC       *gc,
     WIN32_GDI_FAILED ("SelectObject"), *ok = FALSE;
 }  
 
-void
+static void
 predraw_set_background (GdkGC       *gc,
                        GdkColormap *colormap,
                        gboolean    *ok)
@@ -964,7 +964,7 @@ predraw_set_background (GdkGC       *gc,
 
   if (win32_gc->values_mask & GDK_GC_BACKGROUND)
     {
-      COLORREF bg = gdk_colormap_color (colormap, win32_gc->background);
+      COLORREF bg = _gdk_win32_colormap_color (colormap, win32_gc->background);
 
       if (SetBkColor (win32_gc->hdc, bg) == CLR_INVALID)
         WIN32_GDI_FAILED ("SetBkColor"), *ok = FALSE;

diff --git a/gdk/win32/gdkglobals-win32.c b/gdk/win32/gdkglobals-win32.c
index de5ea06c7b55cca2bcb931ba203f7bf2062f570f..a3643838d113d9bc18fcf5c5a1a587bff7002f57 100644 (file)
--- a/gdk/win32/gdkglobals-win32.c
+++ b/gdk/win32/gdkglobals-win32.c
@@ -38,6 +38,6 @@ UINT            gdk_selection_clear_msg;
 GdkAtom                  gdk_clipboard_atom;
 GdkAtom                  gdk_win32_dropfiles_atom;
 GdkAtom                  gdk_ole2_dnd_atom;
-ATOM              _gdk_selection_property;
+GdkAtom             _gdk_selection_property;
 DWORD            windows_version = 0;
 gint             gdk_input_ignore_wintab = FALSE;

diff --git a/gdk/win32/gdkim-win32.c b/gdk/win32/gdkim-win32.c
index bb9502a80fb32626f3854fe0f05bf577d10eb331..52b70ab68b05a1303a4d7ac692881cafea882109 100644 (file)
--- a/gdk/win32/gdkim-win32.c
+++ b/gdk/win32/gdkim-win32.c
@@ -166,7 +166,7 @@ gdk_wcstombs (const GdkWChar *src)
  */
 
 /* First a helper function for not zero-terminated strings */
-gint
+static gint
 gdk_nmbstowcs (GdkWChar    *dest,
               const gchar *src,
               gint         src_len,
@@ -252,10 +252,10 @@ gdk_mbstowcs (GdkWChar    *dest,
 /* A version that converts to wchar_t wide chars */
 
 gint
-gdk_nmbstowchar_ts (wchar_t     *dest,
-                   const gchar *src,
-                   gint         src_len,
-                   gint         dest_max)
+_gdk_win32_nmbstowchar_ts (wchar_t     *dest,
+                           const gchar *src,
+                           gint         src_len,
+                           gint         dest_max)
 {
   wchar_t *wcp;
   guchar *cp, *end;

diff --git a/gdk/win32/gdkmain-win32.c b/gdk/win32/gdkmain-win32.c
index dcb585686e6cde2b3b9f086216015d1d18655d70..73d5461f1bf939774a3ca9650ca13c785a19fbed 100644 (file)
--- a/gdk/win32/gdkmain-win32.c
+++ b/gdk/win32/gdkmain-win32.c
@@ -95,7 +95,7 @@ _gdk_windowing_init_check (int    argc,
   gdk_win32_dropfiles_atom = gdk_atom_intern ("DROPFILES_DND", FALSE);
   gdk_ole2_dnd_atom = gdk_atom_intern ("OLE2_DND", FALSE);
 
-  gdk_win32_selection_init ();
+  _gdk_win32_selection_init ();
 
   return TRUE;
 }
@@ -243,14 +243,14 @@ gdk_beep (void)
 void
 _gdk_windowing_exit (void)
 {
-  gdk_win32_dnd_exit ();
+  _gdk_win32_dnd_exit ();
   CoUninitialize ();
   DeleteDC (gdk_display_hdc);
   gdk_display_hdc = NULL;
 }
 
 gchar *
-gdk_get_display(void)
+gdk_get_display (void)
 {
   return "Win32";
 }

diff --git a/gdk/win32/gdkpixmap-win32.c b/gdk/win32/gdkpixmap-win32.c
index c6b203b2ec49100ffbab0797561ce7cc14961ab0..1a2f9bba61cf741d1590803396d3cdde6877cafc 100644 (file)
--- a/gdk/win32/gdkpixmap-win32.c
+++ b/gdk/win32/gdkpixmap-win32.c
@@ -46,7 +46,7 @@ static void gdk_pixmap_impl_win32_finalize   (GObject                 *object);
 static gpointer parent_class = NULL;
 
 GType
-gdk_pixmap_impl_win32_get_type (void)
+_gdk_pixmap_impl_win32_get_type (void)
 {
   static GType object_type = 0;
 
@@ -76,7 +76,7 @@ gdk_pixmap_impl_win32_get_type (void)
 GType
 _gdk_pixmap_impl_get_type (void)
 {
-  return gdk_pixmap_impl_win32_get_type ();
+  return _gdk_pixmap_impl_win32_get_type ();
 }
 
 static void

diff --git a/gdk/win32/gdkpixmap-win32.h b/gdk/win32/gdkpixmap-win32.h
index 782d850e3d805a38aed249dc6b310823f27810b9..69114fd4b81a17d4442f675d7fc0c957138c96a1 100644 (file)
--- a/gdk/win32/gdkpixmap-win32.h
+++ b/gdk/win32/gdkpixmap-win32.h
@@ -40,7 +40,7 @@ extern "C" {
 typedef struct _GdkPixmapImplWin32 GdkPixmapImplWin32;
 typedef struct _GdkPixmapImplWin32Class GdkPixmapImplWin32Class;
 
-#define GDK_TYPE_PIXMAP_IMPL_WIN32              (gdk_pixmap_impl_win32_get_type ())
+#define GDK_TYPE_PIXMAP_IMPL_WIN32              (_gdk_pixmap_impl_win32_get_type ())
 #define GDK_PIXMAP_IMPL_WIN32(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_PIXMAP_IMPL_WIN32, GdkPixmapImplWin32))
 #define GDK_PIXMAP_IMPL_WIN32_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_PIXMAP_IMPL_WIN32, GdkPixmapImplWin32Class))
 #define GDK_IS_PIXMAP_IMPL_WIN32(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_PIXMAP_IMPL_WIN32))
@@ -63,8 +63,8 @@ struct _GdkPixmapImplWin32Class
 
 };
 
-GType gdk_pixmap_impl_win32_get_type (void);
- 
+GType _gdk_pixmap_impl_win32_get_type (void);
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */

diff --git a/gdk/win32/gdkprivate-win32.h b/gdk/win32/gdkprivate-win32.h
index 04e5d5701886ab27deb3e29821f90f2e74ac1acf..62bcbd95d0297e57016acd967621c2ff7710cf06 100644 (file)
--- a/gdk/win32/gdkprivate-win32.h
+++ b/gdk/win32/gdkprivate-win32.h
@@ -44,16 +44,16 @@ void _gdk_window_process_expose    (GdkWindow     *window,
                                     GdkRectangle  *area);
 
 /* gdkdrawable-win32.c, background draw helper */
-void gdk_win32_draw_tiles (GdkDrawable *drawable,
-                           GdkGC       *gc,
-                           GdkPixmap   *tile,
-                           gint        x, 
-                           gint        y, 
-                           gint        width, 
-                           gint        height);
+void _gdk_win32_draw_tiles (GdkDrawable *drawable,
+                            GdkGC       *gc,
+                            GdkPixmap   *tile,
+                            gint        x, 
+                            gint        y, 
+                            gint        width, 
+                            gint        height);
 
-void gdk_win32_selection_init (void);
-void gdk_win32_dnd_exit (void);
+void _gdk_win32_selection_init (void);
+void _gdk_win32_dnd_exit (void);
 
 void    gdk_win32_handle_table_insert    (HANDLE   *handle,
                                           gpointer data);
@@ -69,36 +69,34 @@ GdkImage* _gdk_win32_get_image (GdkDrawable    *drawable,
                                gint            width,
                                gint            height);
 
-COLORREF gdk_colormap_color      (GdkColormap        *colormap,
-                                 gulong              pixel);
+COLORREF _gdk_win32_colormap_color      (GdkColormap        *colormap,
+                                         gulong              pixel);
 
 HRGN    BitmapToRegion          (HBITMAP hBmp);
 
 gchar  *gdk_font_full_name_get   (GdkFont *font);
 
-void    gdk_sel_prop_store       (GdkWindow *owner,
-                                 GdkAtom    type,
-                                 gint       format,
-                                 guchar    *data,
-                                 gint       length);
-
-gint    gdk_nmbstowcs            (GdkWChar    *dest,
-                                 const gchar *src,
-                                 gint         src_len,
-                                 gint         dest_max);
-gint    gdk_nmbstowchar_ts       (wchar_t     *dest,
-                                 const gchar *src,
-                                 gint         src_len,
-                                 gint         dest_max);
-
-void    gdk_wchar_text_handle    (GdkFont       *font,
-                                 const wchar_t *wcstr,
-                                 int            wclen,
-                                 void         (*handler)(GdkWin32SingleFont *,
-                                                         const wchar_t *,
-                                                         int,
-                                                         void *),
-                                 void          *arg);
+void    _gdk_selection_property_store (GdkWindow *owner,
+                                       GdkAtom    type,
+                                       gint       format,
+                                       guchar    *data,
+                                       gint       length);
+
+void    _gdk_selection_property_delete (GdkWindow *);
+
+gint    _gdk_win32_nmbstowchar_ts (wchar_t     *dest,
+                                   const gchar *src,
+                                   gint         src_len,
+                                   gint         dest_max);
+
+void    _gdk_wchar_text_handle    (GdkFont       *font,
+                                  const wchar_t *wcstr,
+                                  int            wclen,
+                                  void         (*handler)(GdkWin32SingleFont *,
+                                                          const wchar_t *,
+                                                          int,
+                                                          void *),
+                                  void          *arg);
 
 #ifdef G_ENABLE_DEBUG
 gchar *gdk_win32_color_to_string      (const        GdkColor *color);
@@ -131,7 +129,7 @@ void    gdk_win32_gdi_failed        (const gchar *where,
 #define OTHER_API_FAILED(api) gdk_other_api_failed (__FILE__, __LINE__, api)
 #endif
  
-extern LRESULT CALLBACK gdk_window_procedure (HWND, UINT, WPARAM, LPARAM);
+extern LRESULT CALLBACK _gdk_win32_window_procedure (HWND, UINT, WPARAM, LPARAM);
 
 extern HWND             gdk_root_window;
 extern gboolean                 gdk_event_func_from_window_proc;
@@ -152,7 +150,7 @@ extern DWORD                 windows_version;
 
 extern gint             gdk_input_ignore_wintab;
 
-extern ATOM             _gdk_selection_property;
+extern GdkAtom  _gdk_selection_property;
 
 #define IMAGE_PRIVATE_DATA(image) ((GdkImagePrivateWin32 *) GDK_IMAGE (image)->windowing_data)
 

diff --git a/gdk/win32/gdkproperty-win32.c b/gdk/win32/gdkproperty-win32.c
index 5f7b921967327047277a19f3fe73cc89b569ae8b..7ff826056b5ed0f853622008111dce66a462d504 100644 (file)
--- a/gdk/win32/gdkproperty-win32.c
+++ b/gdk/win32/gdkproperty-win32.c
@@ -222,7 +222,6 @@ gdk_property_delete (GdkWindow *window,
                     GdkAtom    property)
 {
   gchar *prop_name;
-  extern void gdk_selection_property_delete (GdkWindow *);
 
   g_return_if_fail (window != NULL);
   g_return_if_fail (GDK_IS_WINDOW (window));
@@ -235,7 +234,7 @@ gdk_property_delete (GdkWindow *window,
             g_free (prop_name)));
 
   if (property == _gdk_selection_property)
-    gdk_selection_property_delete (window);
+    _gdk_selection_property_delete (window);
   else
     g_warning ("gdk_property_delete: General case not implemented");
 }

diff --git a/gdk/win32/gdkselection-win32.c b/gdk/win32/gdkselection-win32.c
index ad5766c2fdc99f97fdac6d59c924127054a9b39f..d55609f0fea0d6df3531798301e96b7481a870ca 100644 (file)
--- a/gdk/win32/gdkselection-win32.c
+++ b/gdk/win32/gdkselection-win32.c
@@ -49,18 +49,18 @@ typedef struct {
 static GHashTable *sel_prop_table = NULL;
 
 void
-gdk_win32_selection_init (void)
+_gdk_win32_selection_init (void)
 {
   if (sel_prop_table == NULL)
     sel_prop_table = g_hash_table_new (g_int_hash, g_int_equal);
 }
 
 void
-gdk_sel_prop_store (GdkWindow *owner,
-                   GdkAtom    type,
-                   gint       format,
-                   guchar    *data,
-                   gint       length)
+_gdk_selection_property_store (GdkWindow *owner,
+                               GdkAtom    type,
+                               gint       format,
+                               guchar    *data,
+                               gint       length)
 {
   GdkSelProp *prop;
 
@@ -98,7 +98,7 @@ gdk_selection_owner_set (GdkWindow *owner,
     {
       if (!owner)
         return FALSE;
-      gdk_sel_prop_store (owner, selection, 0, 0, 0);
+      _gdk_selection_property_store (owner, selection, 0, 0, 0);
       return TRUE;
     }
 
@@ -142,7 +142,7 @@ gdk_selection_owner_set (GdkWindow *owner,
        * gdk_property_change will be called to store the clipboard data.
        */
       SendMessage (xwindow, gdk_selection_request_msg,
-                  selection, 0);
+                  GPOINTER_TO_UINT (GDK_ATOM_TO_POINTER (selection)), 0);
     }
 
   return TRUE;
@@ -278,7 +278,7 @@ gdk_selection_convert (GdkWindow *requestor,
                  p++;
                }
              *datap++ = '\0';
-             gdk_sel_prop_store (requestor, GDK_TARGET_STRING, 8,
+             _gdk_selection_property_store (requestor, GDK_TARGET_STRING, 8,
                                  data, strlen (data) + 1);
              
              GlobalUnlock (hdata);
@@ -291,7 +291,9 @@ gdk_selection_convert (GdkWindow *requestor,
       /* Send ourselves an ersatz selection notify message so that we actually
        * fetch the data.
        */
-      SendMessage (GDK_WINDOW_HWND (requestor), gdk_selection_notify_msg, selection, target);
+      SendMessage (GDK_WINDOW_HWND (requestor), gdk_selection_notify_msg, 
+                   GPOINTER_TO_UINT (GDK_ATOM_TO_POINTER (selection)), 
+                   GPOINTER_TO_UINT (GDK_ATOM_TO_POINTER (target)));
     }
   else if (selection == gdk_win32_dropfiles_atom)
     {
@@ -308,10 +310,12 @@ gdk_selection_convert (GdkWindow *requestor,
        {
          g_hash_table_remove (sel_prop_table,
                               &GDK_WINDOW_HWND (_gdk_parent_root));
-         gdk_sel_prop_store (requestor, prop->type, prop->format,
+         _gdk_selection_property_store (requestor, prop->type, prop->format,
                              prop->data, prop->length);
          g_free (prop);
-         SendMessage (GDK_WINDOW_HWND (requestor), gdk_selection_notify_msg, selection, target);
+         SendMessage (GDK_WINDOW_HWND (requestor), gdk_selection_notify_msg, 
+                     GPOINTER_TO_UINT (GDK_ATOM_TO_POINTER (selection)), 
+                     GPOINTER_TO_UINT (GDK_ATOM_TO_POINTER (target)));
        }
     }
   else
@@ -356,7 +360,7 @@ gdk_selection_property_get (GdkWindow  *requestor,
 }
 
 void
-gdk_selection_property_delete (GdkWindow *window)
+_gdk_selection_property_delete (GdkWindow *window)
 {
   GdkSelProp *prop;
   
@@ -408,8 +412,8 @@ gdk_selection_send_notify (guint32  requestor,
 
   SendMessage ((HWND) requestor, 
                gdk_selection_clear_msg, 
-               selection, 
-               target);
+               GPOINTER_TO_UINT (GDK_ATOM_TO_POINTER (selection)), 
+               GPOINTER_TO_UINT (GDK_ATOM_TO_POINTER (target)));
 }
 
 gint
@@ -742,7 +746,7 @@ gdk_utf8_to_compound_text (const gchar *str,
          if (encoding)
            *encoding = GDK_NONE;
          if (format)
-           *format = GDK_NONE;
+           *format = GPOINTER_TO_UINT (GDK_ATOM_TO_POINTER (GDK_NONE));
          if (ctext)
            *ctext = NULL;
          if (length)

diff --git a/gdk/win32/gdkwin32.h b/gdk/win32/gdkwin32.h
index 7e8cb20b151d1ed1342ec1e4a12f36d737d19c9b..ef2d905d82e47b6ceda25df6c3541d5dd51168f9 100644 (file)
--- a/gdk/win32/gdkwin32.h
+++ b/gdk/win32/gdkwin32.h
@@ -291,7 +291,7 @@ struct _GdkImagePrivateWin32
 typedef struct _GdkGCWin32      GdkGCWin32;
 typedef struct _GdkGCWin32Class GdkGCWin32Class;
 
-#define GDK_TYPE_GC_WIN32              (gdk_gc_win32_get_type ())
+#define GDK_TYPE_GC_WIN32              (_gdk_gc_win32_get_type ())
 #define GDK_GC_WIN32(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_GC_WIN32, GdkGCWin32))
 #define GDK_GC_WIN32_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_GC_WIN32, GdkGCWin32Class))
 #define GDK_IS_GC_WIN32(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_GC_WIN32))
@@ -340,7 +340,7 @@ struct _GdkGCWin32Class
   GdkGCClass parent_class;
 };
 
-GType gdk_gc_win32_get_type (void);
+GType _gdk_gc_win32_get_type (void);
 
 #undef GDK_ROOT_PARENT /* internal access is direct */
 #define GDK_ROOT_PARENT()             ((GdkWindow *) _gdk_parent_root)

diff --git a/gdk/win32/gdkwindow-win32.c b/gdk/win32/gdkwindow-win32.c
index c0fdf522aaf5285b0f1aac9766d5afd45725f5f1..c3b34d8200cb9ada8b734b065d0a25120ecb5e72 100644 (file)
--- a/gdk/win32/gdkwindow-win32.c
+++ b/gdk/win32/gdkwindow-win32.c
@@ -53,7 +53,7 @@ static void gdk_window_impl_win32_finalize   (GObject                 *object);
 static gpointer parent_class = NULL;
 
 GType
-gdk_window_impl_win32_get_type (void)
+_gdk_window_impl_win32_get_type (void)
 {
   static GType object_type = 0;
 
@@ -83,7 +83,7 @@ gdk_window_impl_win32_get_type (void)
 GType
 _gdk_window_impl_get_type (void)
 {
-  return gdk_window_impl_win32_get_type ();
+  return _gdk_window_impl_win32_get_type ();
 }
 
 static void
@@ -253,7 +253,7 @@ _gdk_windowing_window_init (void)
 /* The Win API function AdjustWindowRect may return negative values
  * resulting in obscured title bars. This helper function is coreccting it.
  */
-BOOL
+static BOOL
 SafeAdjustWindowRectEx (RECT* lpRect,
                        DWORD dwStyle, 
                        BOOL  bMenu, 
@@ -284,7 +284,7 @@ SafeAdjustWindowRectEx (RECT* lpRect,
  *   is ever needed (e.g Dialog specific), every such window should
  *   get its own class
  */
-ATOM
+static ATOM
 RegisterGdkClass (GdkWindowType wtype)
 {
   static ATOM klassTOPLEVEL = 0;
@@ -299,7 +299,7 @@ RegisterGdkClass (GdkWindowType wtype)
   wcl.style = 0; /* DON'T set CS_<H,V>REDRAW. It causes total redraw
                   * on WM_SIZE and WM_MOVE. Flicker, Performance!
                   */
-  wcl.lpfnWndProc = gdk_window_procedure;
+  wcl.lpfnWndProc = _gdk_win32_window_procedure;
   wcl.cbClsExtra = 0;
   wcl.cbWndExtra = 0;
   wcl.hInstance = gdk_app_hmodule;

diff --git a/gdk/win32/gdkwindow-win32.h b/gdk/win32/gdkwindow-win32.h
index ff44d11f52fcafcbc47d428a9ce1d20576141efa..65325aaa5216b89cc1c65cfe1935095e10db1b7c 100644 (file)
--- a/gdk/win32/gdkwindow-win32.h
+++ b/gdk/win32/gdkwindow-win32.h
@@ -58,7 +58,7 @@ struct _GdkWin32PositionInfo
 typedef struct _GdkWindowImplWin32 GdkWindowImplWin32;
 typedef struct _GdkWindowImplWin32Class GdkWindowImplWin32Class;
 
-#define GDK_TYPE_WINDOW_IMPL_WIN32              (gdk_window_impl_win32_get_type ())
+#define GDK_TYPE_WINDOW_IMPL_WIN32              (_gdk_window_impl_win32_get_type ())
 #define GDK_WINDOW_IMPL_WIN32(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_WINDOW_IMPL_WIN32, GdkWindowImplWin32))
 #define GDK_WINDOW_IMPL_WIN32_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_WINDOW_IMPL_WIN32, GdkWindowImplWin32Class))
 #define GDK_IS_WINDOW_IMPL_WIN32(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_WINDOW_IMPL_WIN32))
@@ -97,7 +97,7 @@ struct _GdkWindowImplWin32Class
 
 };
 
-GType gdk_window_impl_win32_get_type (void);
+GType _gdk_window_impl_win32_get_type (void);
 
 #ifdef __cplusplus
 }