Commit 0c6a8f53 authored by Owen Taylor's avatar Owen Taylor Committed by Owen Taylor

Deprecate gtk_entry_set_editable. (#58768, Vitaly Tishkov)

Sat Oct 20 18:58:25 2001  Owen Taylor  <otaylor@redhat.com>

        * gtk/gtkentry.h: Deprecate gtk_entry_set_editable.
        (#58768, Vitaly Tishkov)

        * gtk/gtkobject.h: Deprecate with abandon.
        (#61942, Vitaly Tishkov, Matthias Clasen)

        * gtk/gtksignal.h: Deprecate everything.

        * gtk/gtkmain.h (GTK_PRIORITY_INTERNAL): Deprecate
        all GTK_PRIORITY_* defines other than GKT_PRIORITY_RESIZE>
        (#61942, Matthias Clasen)

        * gtk/gtkstyle.h: Deprecate gtk_draw_*. (#61140,
        Havoc Pennington)

        * gtk/gtkitemfactory.h: Deprecate compat functions
        for GtkMenuFactory code. (#62071)

        * gdk/gdkdrawable.h: Deprecate gdk_draw_string,
        gdk_draw_text,gdk_draw_text_wc. (#62071)

        * gtk/{gtkentry.c,gtklabel.c,gtkoldeditable.c,gtktextview.c}:
        Use GDK_SELECTION_CLIPBOARD instead of GDK_NONE in calls
        to gtk_clipboard_get().
parent 8937ca26
Sat Oct 20 18:58:25 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkentry.h: Deprecate gtk_entry_set_editable.
(#58768, Vitaly Tishkov)
* gtk/gtkobject.h: Deprecate with abandon.
(#61942, Vitaly Tishkov, Matthias Clasen)
* gtk/gtksignal.h: Deprecate everything.
* gtk/gtkmain.h (GTK_PRIORITY_INTERNAL): Deprecate
all GTK_PRIORITY_* defines other than GKT_PRIORITY_RESIZE>
(#61942, Matthias Clasen)
* gtk/gtkstyle.h: Deprecate gtk_draw_*. (#61140,
Havoc Pennington)
* gtk/gtkitemfactory.h: Deprecate compat functions
for GtkMenuFactory code. (#62071)
* gdk/gdkdrawable.h: Deprecate gdk_draw_string,
gdk_draw_text,gdk_draw_text_wc. (#62071)
Mon Oct 22 10:12:08 2001 Owen Taylor <otaylor@redhat.com>
* gdk/gdk.c docs/Changes-2.0.txt (gdk_threads_init): Don't call
......
Sat Oct 20 18:58:25 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkentry.h: Deprecate gtk_entry_set_editable.
(#58768, Vitaly Tishkov)
* gtk/gtkobject.h: Deprecate with abandon.
(#61942, Vitaly Tishkov, Matthias Clasen)
* gtk/gtksignal.h: Deprecate everything.
* gtk/gtkmain.h (GTK_PRIORITY_INTERNAL): Deprecate
all GTK_PRIORITY_* defines other than GKT_PRIORITY_RESIZE>
(#61942, Matthias Clasen)
* gtk/gtkstyle.h: Deprecate gtk_draw_*. (#61140,
Havoc Pennington)
* gtk/gtkitemfactory.h: Deprecate compat functions
for GtkMenuFactory code. (#62071)
* gdk/gdkdrawable.h: Deprecate gdk_draw_string,
gdk_draw_text,gdk_draw_text_wc. (#62071)
Mon Oct 22 10:12:08 2001 Owen Taylor <otaylor@redhat.com>
* gdk/gdk.c docs/Changes-2.0.txt (gdk_threads_init): Don't call
......
Sat Oct 20 18:58:25 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkentry.h: Deprecate gtk_entry_set_editable.
(#58768, Vitaly Tishkov)
* gtk/gtkobject.h: Deprecate with abandon.
(#61942, Vitaly Tishkov, Matthias Clasen)
* gtk/gtksignal.h: Deprecate everything.
* gtk/gtkmain.h (GTK_PRIORITY_INTERNAL): Deprecate
all GTK_PRIORITY_* defines other than GKT_PRIORITY_RESIZE>
(#61942, Matthias Clasen)
* gtk/gtkstyle.h: Deprecate gtk_draw_*. (#61140,
Havoc Pennington)
* gtk/gtkitemfactory.h: Deprecate compat functions
for GtkMenuFactory code. (#62071)
* gdk/gdkdrawable.h: Deprecate gdk_draw_string,
gdk_draw_text,gdk_draw_text_wc. (#62071)
Mon Oct 22 10:12:08 2001 Owen Taylor <otaylor@redhat.com>
* gdk/gdk.c docs/Changes-2.0.txt (gdk_threads_init): Don't call
......
Sat Oct 20 18:58:25 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkentry.h: Deprecate gtk_entry_set_editable.
(#58768, Vitaly Tishkov)
* gtk/gtkobject.h: Deprecate with abandon.
(#61942, Vitaly Tishkov, Matthias Clasen)
* gtk/gtksignal.h: Deprecate everything.
* gtk/gtkmain.h (GTK_PRIORITY_INTERNAL): Deprecate
all GTK_PRIORITY_* defines other than GKT_PRIORITY_RESIZE>
(#61942, Matthias Clasen)
* gtk/gtkstyle.h: Deprecate gtk_draw_*. (#61140,
Havoc Pennington)
* gtk/gtkitemfactory.h: Deprecate compat functions
for GtkMenuFactory code. (#62071)
* gdk/gdkdrawable.h: Deprecate gdk_draw_string,
gdk_draw_text,gdk_draw_text_wc. (#62071)
Mon Oct 22 10:12:08 2001 Owen Taylor <otaylor@redhat.com>
* gdk/gdk.c docs/Changes-2.0.txt (gdk_threads_init): Don't call
......
Sat Oct 20 18:58:25 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkentry.h: Deprecate gtk_entry_set_editable.
(#58768, Vitaly Tishkov)
* gtk/gtkobject.h: Deprecate with abandon.
(#61942, Vitaly Tishkov, Matthias Clasen)
* gtk/gtksignal.h: Deprecate everything.
* gtk/gtkmain.h (GTK_PRIORITY_INTERNAL): Deprecate
all GTK_PRIORITY_* defines other than GKT_PRIORITY_RESIZE>
(#61942, Matthias Clasen)
* gtk/gtkstyle.h: Deprecate gtk_draw_*. (#61140,
Havoc Pennington)
* gtk/gtkitemfactory.h: Deprecate compat functions
for GtkMenuFactory code. (#62071)
* gdk/gdkdrawable.h: Deprecate gdk_draw_string,
gdk_draw_text,gdk_draw_text_wc. (#62071)
Mon Oct 22 10:12:08 2001 Owen Taylor <otaylor@redhat.com>
* gdk/gdk.c docs/Changes-2.0.txt (gdk_threads_init): Don't call
......
Sat Oct 20 18:58:25 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkentry.h: Deprecate gtk_entry_set_editable.
(#58768, Vitaly Tishkov)
* gtk/gtkobject.h: Deprecate with abandon.
(#61942, Vitaly Tishkov, Matthias Clasen)
* gtk/gtksignal.h: Deprecate everything.
* gtk/gtkmain.h (GTK_PRIORITY_INTERNAL): Deprecate
all GTK_PRIORITY_* defines other than GKT_PRIORITY_RESIZE>
(#61942, Matthias Clasen)
* gtk/gtkstyle.h: Deprecate gtk_draw_*. (#61140,
Havoc Pennington)
* gtk/gtkitemfactory.h: Deprecate compat functions
for GtkMenuFactory code. (#62071)
* gdk/gdkdrawable.h: Deprecate gdk_draw_string,
gdk_draw_text,gdk_draw_text_wc. (#62071)
Mon Oct 22 10:12:08 2001 Owen Taylor <otaylor@redhat.com>
* gdk/gdk.c docs/Changes-2.0.txt (gdk_threads_init): Don't call
......
Sat Oct 20 18:58:25 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkentry.h: Deprecate gtk_entry_set_editable.
(#58768, Vitaly Tishkov)
* gtk/gtkobject.h: Deprecate with abandon.
(#61942, Vitaly Tishkov, Matthias Clasen)
* gtk/gtksignal.h: Deprecate everything.
* gtk/gtkmain.h (GTK_PRIORITY_INTERNAL): Deprecate
all GTK_PRIORITY_* defines other than GKT_PRIORITY_RESIZE>
(#61942, Matthias Clasen)
* gtk/gtkstyle.h: Deprecate gtk_draw_*. (#61140,
Havoc Pennington)
* gtk/gtkitemfactory.h: Deprecate compat functions
for GtkMenuFactory code. (#62071)
* gdk/gdkdrawable.h: Deprecate gdk_draw_string,
gdk_draw_text,gdk_draw_text_wc. (#62071)
Mon Oct 22 10:12:08 2001 Owen Taylor <otaylor@redhat.com>
* gdk/gdk.c docs/Changes-2.0.txt (gdk_threads_init): Don't call
......
......@@ -195,6 +195,7 @@ void gdk_draw_polygon (GdkDrawable *drawable,
gint filled,
GdkPoint *points,
gint npoints);
#ifndef GDK_DISABLE_DEPRECATED
void gdk_draw_string (GdkDrawable *drawable,
GdkFont *font,
GdkGC *gc,
......@@ -215,6 +216,7 @@ void gdk_draw_text_wc (GdkDrawable *drawable,
gint y,
const GdkWChar *text,
gint text_length);
#endif /* GDK_DISABLE_DEPRECATED */
void gdk_draw_drawable (GdkDrawable *drawable,
GdkGC *gc,
GdkDrawable *src,
......
......@@ -2156,7 +2156,7 @@ gtk_entry_copy_clipboard (GtkEntry *entry)
if (gtk_editable_get_selection_bounds (editable, &start, &end))
{
gchar *str = gtk_entry_get_public_chars (entry, start, end);
gtk_clipboard_set_text (gtk_clipboard_get (GDK_NONE), str, -1);
gtk_clipboard_set_text (gtk_clipboard_get (GDK_SELECTION_CLIPBOARD), str, -1);
g_free (str);
}
}
......
......@@ -146,8 +146,6 @@ gboolean gtk_entry_get_visibility (GtkEntry *entry);
void gtk_entry_set_invisible_char (GtkEntry *entry,
gunichar ch);
gunichar gtk_entry_get_invisible_char (GtkEntry *entry);
void gtk_entry_set_editable (GtkEntry *entry,
gboolean editable);
void gtk_entry_set_has_frame (GtkEntry *entry,
gboolean setting);
gboolean gtk_entry_get_has_frame (GtkEntry *entry);
......@@ -189,6 +187,8 @@ void gtk_entry_set_position (GtkEntry *entry,
void gtk_entry_select_region (GtkEntry *entry,
gint start,
gint end);
void gtk_entry_set_editable (GtkEntry *entry,
gboolean editable);
#endif /* GTK_DISABLE_DEPRECATED */
#ifdef __cplusplus
......
......@@ -215,6 +215,7 @@ void gtk_item_factory_set_translate_func (GtkItemFactory *ifactory,
gpointer data,
GtkDestroyNotify notify);
#ifndef GTK_DISABLE_DEPRECATED
/* Compatibility functions for deprecated GtkMenuFactory code
*/
typedef void (*GtkMenuCallback) (GtkWidget *widget,
......@@ -239,7 +240,7 @@ void gtk_item_factory_create_items_ac (GtkItemFactory *ifactory,
GtkItemFactoryEntry *entries,
gpointer callback_data,
guint callback_type);
#endif /* GTK_DISABLE_DEPRECATED */
#ifdef __cplusplus
......
......@@ -3014,7 +3014,7 @@ gtk_label_copy_clipboard (GtkLabel *label)
start = len;
if (start != end)
gtk_clipboard_set_text (gtk_clipboard_get (GDK_NONE),
gtk_clipboard_set_text (gtk_clipboard_get (GDK_SELECTION_CLIPBOARD),
label->text + start, end - start);
}
}
......
......@@ -38,9 +38,13 @@ extern "C" {
/* Priorities for redrawing and resizing
*/
#define GTK_PRIORITY_REDRAW (G_PRIORITY_HIGH_IDLE + 20)
#define GTK_PRIORITY_RESIZE (G_PRIORITY_HIGH_IDLE + 10)
#ifndef GTK_DISABLE_DEPRECATED
/* Use GDK_PRIORITY_REDRAW */
#define GTK_PRIORITY_REDRAW (G_PRIORITY_HIGH_IDLE + 20)
/* Deprecated. Use G_PRIORITY #define's instead
*/
#define GTK_PRIORITY_HIGH G_PRIORITY_HIGH
......@@ -48,6 +52,8 @@ extern "C" {
#define GTK_PRIORITY_DEFAULT G_PRIORITY_DEFAULT_IDLE
#define GTK_PRIORITY_LOW G_PRIORITY_LOW
#endif /* GTK_DISABLE_DEPRECATED */
typedef void (*GtkModuleInitFunc) (gint *argc,
gchar ***argv);
typedef gint (*GtkKeySnoopFunc) (GtkWidget *grab_widget,
......
......@@ -32,11 +32,7 @@
#include <gtk/gtktypeutils.h>
#include <gtk/gtkdebug.h>
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
G_BEGIN_DECLS
/* macros for casting a pointer to a GtkObject or GtkObjectClass pointer,
* and to test whether `object' and `klass' are of type GTK_TYPE_OBJECT.
......@@ -136,17 +132,22 @@ GtkType gtk_object_get_type (void) G_GNUC_CONST;
GtkObject* gtk_object_new (GtkType type,
const gchar *first_property_name,
...);
void gtk_object_sink (GtkObject *object);
void gtk_object_destroy (GtkObject *object);
/****************************************************************/
#ifndef GTK_DISABLE_DEPRECATED
GtkObject* gtk_object_ref (GtkObject *object);
void gtk_object_unref (GtkObject *object);
void gtk_object_sink (GtkObject *object);
void gtk_object_weakref (GtkObject *object,
GtkDestroyNotify notify,
gpointer data);
void gtk_object_weakunref (GtkObject *object,
GtkDestroyNotify notify,
gpointer data);
void gtk_object_destroy (GtkObject *object);
/* Set 'data' to the "object_data" field of the object. The
* data is indexed by the "key". If there is already data
......@@ -203,10 +204,6 @@ void gtk_object_remove_no_notify_by_id (GtkObject *object,
#define gtk_object_data_try_key g_quark_try_string
#define gtk_object_data_force_id g_quark_from_string
/* Non-public methods */
/* GtkArg flag bits for gtk_object_add_arg_type
*/
typedef enum
......@@ -229,10 +226,8 @@ void gtk_object_add_arg_type (const gchar *arg_name,
guint arg_flags,
guint arg_id);
#endif /* GTK_DISABLE_DEPRECATED */
#ifdef __cplusplus
}
#endif /* __cplusplus */
G_END_DECLS
#endif /* __GTK_OBJECT_H__ */
......@@ -792,7 +792,7 @@ gtk_old_editable_real_copy_clipboard (GtkOldEditable *old_editable)
if (text)
{
gtk_clipboard_set_text (gtk_clipboard_get (GDK_NONE), text, -1);
gtk_clipboard_set_text (gtk_clipboard_get (GDK_SELECTION_CLIPBOARD), text, -1);
g_free (text);
}
}
......@@ -802,7 +802,7 @@ static void
gtk_old_editable_real_paste_clipboard (GtkOldEditable *old_editable)
{
g_object_ref (G_OBJECT (old_editable));
gtk_clipboard_request_text (gtk_clipboard_get (GDK_NONE),
gtk_clipboard_request_text (gtk_clipboard_get (GDK_SELECTION_CLIPBOARD),
old_editable_text_received_cb, old_editable);
}
......
......@@ -33,11 +33,9 @@
#include <gtk/gtkmarshal.h>
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
G_BEGIN_DECLS
#ifndef GTK_DISABLE_DEPRECATED
#define gtk_signal_default_marshaller gtk_marshal_VOID__VOID
......@@ -143,10 +141,8 @@ void gtk_signal_compat_matched (GtkObject *object,
GSignalMatchType match,
guint action);
#endif /* GTK_DISABLE_DEPRECATED */
#ifdef __cplusplus
}
#endif /* __cplusplus */
G_END_DECLS
#endif /* __GTK_SIGNAL_H__ */
......@@ -451,6 +451,7 @@ GdkPixbuf* gtk_style_render_icon (GtkStyle *style,
GtkIconSize size,
GtkWidget *widget,
const gchar *detail);
#ifndef GTK_DISABLE_DEPRECATED
void gtk_draw_hline (GtkStyle *style,
GdkWindow *window,
GtkStateType state_type,
......@@ -604,7 +605,6 @@ void gtk_draw_layout (GtkStyle *style,
gint x,
gint y,
PangoLayout *layout);
void gtk_draw_resize_grip (GtkStyle *style,
GdkWindow *window,
GtkStateType state_type,
......@@ -613,6 +613,7 @@ void gtk_draw_resize_grip (GtkStyle *style,
gint y,
gint width,
gint height);
#endif /* GTK_DISABLE_DEPRECATED */
void gtk_paint_hline (GtkStyle *style,
GdkWindow *window,
......
......@@ -4254,7 +4254,7 @@ static void
gtk_text_view_cut_clipboard (GtkTextView *text_view)
{
gtk_text_buffer_cut_clipboard (get_buffer (text_view),
gtk_clipboard_get (GDK_NONE),
gtk_clipboard_get (GDK_SELECTION_CLIPBOARD),
text_view->editable);
DV(g_print (G_STRLOC": scrolling onscreen\n"));
gtk_text_view_scroll_mark_onscreen (text_view,
......@@ -4266,7 +4266,7 @@ static void
gtk_text_view_copy_clipboard (GtkTextView *text_view)
{
gtk_text_buffer_copy_clipboard (get_buffer (text_view),
gtk_clipboard_get (GDK_NONE));
gtk_clipboard_get (GDK_SELECTION_CLIPBOARD));
DV(g_print (G_STRLOC": scrolling onscreen\n"));
gtk_text_view_scroll_mark_onscreen (text_view,
gtk_text_buffer_get_mark (get_buffer (text_view),
......@@ -4277,7 +4277,7 @@ static void
gtk_text_view_paste_clipboard (GtkTextView *text_view)
{
gtk_text_buffer_paste_clipboard (get_buffer (text_view),
gtk_clipboard_get (GDK_NONE),
gtk_clipboard_get (GDK_SELECTION_CLIPBOARD),
NULL,
text_view->editable);
DV(g_print (G_STRLOC": scrolling onscreen\n"));
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment