Deprecate gtk_paned_computed_position(). (#97077)

2003-01-31  Matthias Clasen  <maclas@gmx.de>

	* gtk/gtkpaned.h: Deprecate gtk_paned_computed_position(). (#97077)

	* gtk/gtkmain.h: Deprecate the gtk_timeout_*, gtk_idle_*
	and gtk_input_* functions.  (#71596)

	* gtk/gtkentry.c (gtk_entry_move_cursor):
	* gtk/gtklabel.c (gtk_label_move_cursor): Handle
	GTK_MOVEMENT_HORIZONTAL_PAGES in switches.

	* gdk/gdk.h: Deprecate gdk_wcstombs() and gdk_mbstowcs().  (#79803)

	* gtk/gtkitemfactory.h:
	* gtk/gtkitemfactory.c (gtk_item_factory_add_foreign): Deprecate.
	(#69244)

	* gtk/tmpl/gtkmain.sgml: Deprecate the gtk_timeout_*, gtk_idle_*
	and gtk_input_* functions.  (#71596)

diff --git a/ChangeLog b/ChangeLog
index 9ed5f8d1cb5698ec756374f5160ebc06978c704d..003ddd9a0b23f5e0456930358da0d0f7daeb34b8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2003-01-31  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkpaned.h: Deprecate gtk_paned_computed_position(). (#97077)
+
+       * gtk/gtkmain.h: Deprecate the gtk_timeout_*, gtk_idle_*
+       and gtk_input_* functions.  (#71596)
+       
+       * gtk/gtkentry.c (gtk_entry_move_cursor): 
+       * gtk/gtklabel.c (gtk_label_move_cursor): Handle
+       GTK_MOVEMENT_HORIZONTAL_PAGES in switches.
+
+       * gdk/gdk.h: Deprecate gdk_wcstombs() and gdk_mbstowcs().  (#79803)
+
+       * gtk/gtkitemfactory.h: 
+       * gtk/gtkitemfactory.c (gtk_item_factory_add_foreign): Deprecate. 
+       (#69244)
+
 Thu Jan 30 23:48:30 2003  Kristian Rietveld  <kris@gtk.org>
 
        * gtk/gtktreeviewcolumn.c (_gtk_tree_view_column_count_special_cell):

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 9ed5f8d1cb5698ec756374f5160ebc06978c704d..003ddd9a0b23f5e0456930358da0d0f7daeb34b8 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,20 @@
+2003-01-31  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkpaned.h: Deprecate gtk_paned_computed_position(). (#97077)
+
+       * gtk/gtkmain.h: Deprecate the gtk_timeout_*, gtk_idle_*
+       and gtk_input_* functions.  (#71596)
+       
+       * gtk/gtkentry.c (gtk_entry_move_cursor): 
+       * gtk/gtklabel.c (gtk_label_move_cursor): Handle
+       GTK_MOVEMENT_HORIZONTAL_PAGES in switches.
+
+       * gdk/gdk.h: Deprecate gdk_wcstombs() and gdk_mbstowcs().  (#79803)
+
+       * gtk/gtkitemfactory.h: 
+       * gtk/gtkitemfactory.c (gtk_item_factory_add_foreign): Deprecate. 
+       (#69244)
+
 Thu Jan 30 23:48:30 2003  Kristian Rietveld  <kris@gtk.org>
 
        * gtk/gtktreeviewcolumn.c (_gtk_tree_view_column_count_special_cell):

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 9ed5f8d1cb5698ec756374f5160ebc06978c704d..003ddd9a0b23f5e0456930358da0d0f7daeb34b8 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,20 @@
+2003-01-31  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkpaned.h: Deprecate gtk_paned_computed_position(). (#97077)
+
+       * gtk/gtkmain.h: Deprecate the gtk_timeout_*, gtk_idle_*
+       and gtk_input_* functions.  (#71596)
+       
+       * gtk/gtkentry.c (gtk_entry_move_cursor): 
+       * gtk/gtklabel.c (gtk_label_move_cursor): Handle
+       GTK_MOVEMENT_HORIZONTAL_PAGES in switches.
+
+       * gdk/gdk.h: Deprecate gdk_wcstombs() and gdk_mbstowcs().  (#79803)
+
+       * gtk/gtkitemfactory.h: 
+       * gtk/gtkitemfactory.c (gtk_item_factory_add_foreign): Deprecate. 
+       (#69244)
+
 Thu Jan 30 23:48:30 2003  Kristian Rietveld  <kris@gtk.org>
 
        * gtk/gtktreeviewcolumn.c (_gtk_tree_view_column_count_special_cell):

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 9ed5f8d1cb5698ec756374f5160ebc06978c704d..003ddd9a0b23f5e0456930358da0d0f7daeb34b8 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,20 @@
+2003-01-31  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkpaned.h: Deprecate gtk_paned_computed_position(). (#97077)
+
+       * gtk/gtkmain.h: Deprecate the gtk_timeout_*, gtk_idle_*
+       and gtk_input_* functions.  (#71596)
+       
+       * gtk/gtkentry.c (gtk_entry_move_cursor): 
+       * gtk/gtklabel.c (gtk_label_move_cursor): Handle
+       GTK_MOVEMENT_HORIZONTAL_PAGES in switches.
+
+       * gdk/gdk.h: Deprecate gdk_wcstombs() and gdk_mbstowcs().  (#79803)
+
+       * gtk/gtkitemfactory.h: 
+       * gtk/gtkitemfactory.c (gtk_item_factory_add_foreign): Deprecate. 
+       (#69244)
+
 Thu Jan 30 23:48:30 2003  Kristian Rietveld  <kris@gtk.org>
 
        * gtk/gtktreeviewcolumn.c (_gtk_tree_view_column_count_special_cell):

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 9ed5f8d1cb5698ec756374f5160ebc06978c704d..003ddd9a0b23f5e0456930358da0d0f7daeb34b8 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,20 @@
+2003-01-31  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkpaned.h: Deprecate gtk_paned_computed_position(). (#97077)
+
+       * gtk/gtkmain.h: Deprecate the gtk_timeout_*, gtk_idle_*
+       and gtk_input_* functions.  (#71596)
+       
+       * gtk/gtkentry.c (gtk_entry_move_cursor): 
+       * gtk/gtklabel.c (gtk_label_move_cursor): Handle
+       GTK_MOVEMENT_HORIZONTAL_PAGES in switches.
+
+       * gdk/gdk.h: Deprecate gdk_wcstombs() and gdk_mbstowcs().  (#79803)
+
+       * gtk/gtkitemfactory.h: 
+       * gtk/gtkitemfactory.c (gtk_item_factory_add_foreign): Deprecate. 
+       (#69244)
+
 Thu Jan 30 23:48:30 2003  Kristian Rietveld  <kris@gtk.org>
 
        * gtk/gtktreeviewcolumn.c (_gtk_tree_view_column_count_special_cell):

diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index 5674fe774ff758a25f0acc6f04c4d22a63abedfc..0a5653af576c42507b2600b3aaca026f97e57421 100644 (file)
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,3 +1,8 @@
+2003-01-31  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/tmpl/gtkmain.sgml: Deprecate the gtk_timeout_*, gtk_idle_*
+       and gtk_input_* functions.  (#71596)
+
 2003-01-30  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/running.sgml: s/overwrite/override/g  (#104627, Brian Cameron)

diff --git a/docs/reference/gtk/tmpl/gtkmain.sgml b/docs/reference/gtk/tmpl/gtkmain.sgml
index e04b57c7cc739f239b1bb913d0475545f18f97d8..e2b9858505b16d1499f2f27fdb6b2a72dd3290a4 100644 (file)
--- a/docs/reference/gtk/tmpl/gtkmain.sgml
+++ b/docs/reference/gtk/tmpl/gtkmain.sgml
@@ -456,7 +456,7 @@ point the timeout is destroyed and will not be called again.
 @data: The data to pass to the function.
 @destroy: Function to call when the timeout is destroyed or %NULL.
 @Returns: A unique id for the event source.
-
+@Deprecated: Use g_timeout_add_full() instead.
 
 <!-- ##### FUNCTION gtk_timeout_add ##### -->
 <para>
@@ -470,7 +470,7 @@ point the timeout is destroyed and will not be called again.
 @function: The function to call periodically.
 @data: The data to pass to the function.
 @Returns: A unique id for the event source.
-
+@Deprecated: Use g_timeout_add() instead.
 
 <!-- ##### FUNCTION gtk_timeout_remove ##### -->
 <para>
@@ -478,6 +478,7 @@ Removes the given timeout destroying all information about it.
 </para>
 
 @timeout_handler_id: The identifier returned when installing the timeout.
+@Deprecated: Use g_source_remove() instead.
 
 
 <!-- ##### FUNCTION gtk_idle_add ##### -->
@@ -490,6 +491,7 @@ higher priority are to be processed. The default priority is
 @function: The function to call.
 @data: The information to pass to the function.
 @Returns: a unique handle for this registration.
+@Deprecated: Use g_idle_add() instead.
 
 
 <!-- ##### FUNCTION gtk_idle_add_priority ##### -->
@@ -505,7 +507,7 @@ Note that you will interfere with GTK+ if you use a priority above
 @function: The function to call.
 @data: Data to pass to that function.
 @Returns: A unique id for the event source.
-
+@Deprecated: Use g_idle_add_full() instead.
 
 <!-- ##### FUNCTION gtk_idle_add_full ##### -->
 <para>
@@ -522,6 +524,7 @@ Note that you will interfere with GTK+ if you use a priority above
 @data: Data to pass to that function.
 @destroy: Function to call when the timeout is destroyed or %NULL.
 @Returns: A unique id for the event source.
+@Deprecated: Use g_idle_add_full() instead.
 
 
 <!-- ##### FUNCTION gtk_idle_remove ##### -->
@@ -530,6 +533,7 @@ Removes the idle function with the given id.
 </para>
 
 @idle_handler_id: Identifies the idle function to remove.
+@Deprecated: Use g_source_remove() instead.
 
 
 <!-- ##### FUNCTION gtk_idle_remove_by_data ##### -->
@@ -538,6 +542,7 @@ Removes the idle function identified by the user data.
 </para>
 
 @data: remove the idle function which was registered with this user data.
+@Deprecated: Use g_idle_remove_by_data() instead.
 
 
 <!-- ##### FUNCTION gtk_input_add_full ##### -->
@@ -554,7 +559,7 @@ on a file descriptor.
 @destroy: callback function to call with @data when the input
   handler is removed, or %NULL.
 @Returns: A unique id for the event source; to be used with gtk_input_remove().
-
+@Deprecated: Use g_io_watch_full() instead.
 
 <!-- ##### FUNCTION gtk_input_remove ##### -->
 <para>
@@ -562,6 +567,7 @@ Removes the function with the given id.
 </para>
 
 @input_handler_id: Identifies the function to remove.
+@Deprecated: Use g_source_remove() instead.
 
 
 <!-- ##### MACRO GTK_PRIORITY_REDRAW ##### -->

diff --git a/gdk/gdk.h b/gdk/gdk.h
index 80cb257fa1dfc7825b53121a5b2a746b842df13a..44ef60467e4d761f478e64f64443fb60ed65cb6d 100644 (file)
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -149,10 +149,12 @@ GType gdk_rectangle_get_type (void);
 
 /* Conversion functions between wide char and multibyte strings. 
  */
+#ifndef GDK_DISABLE_DEPRECATED
 gchar     *gdk_wcstombs          (const GdkWChar   *src);
 gint       gdk_mbstowcs          (GdkWChar         *dest,
                                  const gchar      *src,
                                  gint              dest_max);
+#endif
 
 /* Miscellaneous */
 #ifndef GDK_MULTIHEAD_SAFE

diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index 9f5f9fa63b501639b44d479e798ce6977e26e1d1..d8f3e93d67771aa22f6f5c85a4854eee4aebb5fd 100644 (file)
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -2075,6 +2075,7 @@ gtk_entry_move_cursor (GtkEntry       *entry,
        case GTK_MOVEMENT_DISPLAY_LINES:
        case GTK_MOVEMENT_PARAGRAPHS:
        case GTK_MOVEMENT_PAGES:
+       case GTK_MOVEMENT_HORIZONTAL_PAGES:
          break;
        }
     }
@@ -2108,6 +2109,7 @@ gtk_entry_move_cursor (GtkEntry       *entry,
        case GTK_MOVEMENT_DISPLAY_LINES:
        case GTK_MOVEMENT_PARAGRAPHS:
        case GTK_MOVEMENT_PAGES:
+       case GTK_MOVEMENT_HORIZONTAL_PAGES:
          break;
        }
     }

diff --git a/gtk/gtkitemfactory.c b/gtk/gtkitemfactory.c
index 0e1ea1247a8eaf9ce49a48729445b0f264577065..b45d35d70de6b1b2119ad0d1569cbe1e55d35d68 100644 (file)
--- a/gtk/gtkitemfactory.c
+++ b/gtk/gtkitemfactory.c
@@ -259,7 +259,9 @@ gtk_item_factory_item_remove_widget (GtkWidget              *widget,
  * This function can be used to make widgets participate in the accel
  * saving/restoring functionality provided by gtk_accel_map_save() and
  * gtk_accel_map_load(), even if they haven't been created by an item
- * factory. The recommended API for this purpose are the functions 
+ * factory. 
+ *
+ * Deprecated: The recommended API for this purpose are the functions 
  * gtk_menu_item_set_accel_path() and gtk_widget_set_accel_path(); don't 
  * use gtk_item_factory_add_foreign() in new code, since it is likely to
  * be removed in the future.

diff --git a/gtk/gtkitemfactory.h b/gtk/gtkitemfactory.h
index b9a05724f6ae50bcede0715c422dacbfbeee128b..538a9534708597a33fb00d07402298db11204d9d 100644 (file)
--- a/gtk/gtkitemfactory.h
+++ b/gtk/gtkitemfactory.h
@@ -148,11 +148,13 @@ void              gtk_item_factory_construct (GtkItemFactory      *ifactory,
      
 /* These functions operate on GtkItemFactoryClass basis.
  */
+#ifndef GTK_DISABLE_DEPRECATED
 void           gtk_item_factory_add_foreign        (GtkWidget      *accel_widget,
                                                     const gchar    *full_path,
                                                     GtkAccelGroup  *accel_group,
                                                     guint           keyval,
                                                     GdkModifierType modifiers);
+#endif
      
 GtkItemFactory*       gtk_item_factory_from_widget      (GtkWidget *widget);
 G_CONST_RETURN gchar* gtk_item_factory_path_from_widget (GtkWidget *widget);

diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index c294c4afcb0716076b8ace0adff23bd47e5d90ee..b45ba9b605e024b2dfa59d9e7626a7ef9bb7036f 100644 (file)
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -1799,7 +1799,7 @@ gtk_label_expose (GtkWidget      *widget,
       label->text && (*label->text != '\0'))
     {
       get_layout_location (label, &x, &y);
-      
+
       gtk_paint_layout (widget->style,
                         widget->window,
                         GTK_WIDGET_STATE (widget),
@@ -3036,6 +3036,7 @@ gtk_label_move_cursor (GtkLabel       *label,
        case GTK_MOVEMENT_DISPLAY_LINES:
        case GTK_MOVEMENT_PARAGRAPHS:
        case GTK_MOVEMENT_PAGES:
+       case GTK_MOVEMENT_HORIZONTAL_PAGES:
          break;
        }
     }
@@ -3070,6 +3071,7 @@ gtk_label_move_cursor (GtkLabel       *label,
        case GTK_MOVEMENT_DISPLAY_LINES:
        case GTK_MOVEMENT_PARAGRAPHS:
        case GTK_MOVEMENT_PAGES:
+       case GTK_MOVEMENT_HORIZONTAL_PAGES:
          break;
        }
     }

diff --git a/gtk/gtkmain.h b/gtk/gtkmain.h
index a89481bd14245b1f3706457098316029c1af9329..c7afed29e56f8e1489954cc3d12d5cd54841b0ec 100644 (file)
--- a/gtk/gtkmain.h
+++ b/gtk/gtkmain.h
@@ -158,6 +158,7 @@ guint          gtk_quit_add_full       (guint              main_level,
                                    GtkDestroyNotify   destroy);
 void      gtk_quit_remove         (guint              quit_handler_id);
 void      gtk_quit_remove_by_data (gpointer           data);
+#if !defined (GTK_DISABLE_DEPRECATED) || defined (GTK_COMPILATION)
 guint     gtk_timeout_add         (guint32            interval,
                                    GtkFunction        function,
                                    gpointer           data);
@@ -187,7 +188,7 @@ guint          gtk_input_add_full      (gint               source,
                                    gpointer           data,
                                    GtkDestroyNotify   destroy);
 void      gtk_input_remove        (guint              input_handler_id);
-
+#endif /* !GTK_DISABLE_DEPRECATED || GTK_COMPILATION */
 
 guint     gtk_key_snooper_install (GtkKeySnoopFunc snooper,
                                    gpointer        func_data);

diff --git a/gtk/gtkpaned.h b/gtk/gtkpaned.h
index 21563e393cdc1973ce537a09e44cdb92ae0cdf6a..ee24b8ce88a0d095e7b561a93a01dc0863943b5b 100644 (file)
--- a/gtk/gtkpaned.h
+++ b/gtk/gtkpaned.h
@@ -124,11 +124,12 @@ void    gtk_paned_set_position    (GtkPaned  *paned,
                                   gint       position);
 
 /* Internal function */
+#if !defined (GTK_DISABLE_DEPRECATED) || defined (GTK_COMPILATION)
 void    gtk_paned_compute_position (GtkPaned  *paned,
                                    gint       allocation,
                                    gint       child1_req,
                                    gint       child2_req);
-
+#endif /* !GTK_DISABLE_DEPRECATED || GTK_COMPILATION */
 #ifndef GTK_DISABLE_DEPRECATED
 #define        gtk_paned_gutter_size(p,s)              (void) 0
 #define        gtk_paned_set_gutter_size(p,s)          (void) 0