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

parent_class variable was GtkObjectClass instead of GObjectClass

Browse Source 
2002-02-24  Havoc Pennington  <hp@pobox.com>

	* gtk/gtktextbuffer.c (parent_class): parent_class variable was
	GtkObjectClass instead of GObjectClass

	* gtk/gtktextview.c (widget_to_buffer): fix this the way
	buffer_to_widget was fixed, to avoid duplicating
	the code that computes text_window->allocation.x/y
This commit is contained in:
Havoc Pennington
2002-02-25 02:47:19 +00:00
committed by Havoc Pennington
parent 8ae6ab42b6
commit 0ca2aa50c6
9 changed files with 69 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2002-02-24 Havoc Pennington <hp@pobox.com>
* gtk/gtktextbuffer.c (parent_class): parent_class variable was
GtkObjectClass instead of GObjectClass
* gtk/gtktextview.c (widget_to_buffer): fix this the way
buffer_to_widget was fixed, to avoid duplicating
the code that computes text_window->allocation.x/y
Sun Feb 24 21:18:20 2002 Owen Taylor <otaylor@redhat.com> Sun Feb 24 21:18:20 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtksocket.c (gtk_socket_end_embedding): Fix * gtk/gtksocket.c (gtk_socket_end_embedding): Fix

9
ChangeLog.pre-2-0
View File

@ -1,3 +1,12 @@
2002-02-24 Havoc Pennington <hp@pobox.com>
* gtk/gtktextbuffer.c (parent_class): parent_class variable was
GtkObjectClass instead of GObjectClass
* gtk/gtktextview.c (widget_to_buffer): fix this the way
buffer_to_widget was fixed, to avoid duplicating
the code that computes text_window->allocation.x/y
Sun Feb 24 21:18:20 2002 Owen Taylor <otaylor@redhat.com> Sun Feb 24 21:18:20 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtksocket.c (gtk_socket_end_embedding): Fix * gtk/gtksocket.c (gtk_socket_end_embedding): Fix

9
ChangeLog.pre-2-10
View File

@ -1,3 +1,12 @@
2002-02-24 Havoc Pennington <hp@pobox.com>
* gtk/gtktextbuffer.c (parent_class): parent_class variable was
GtkObjectClass instead of GObjectClass
* gtk/gtktextview.c (widget_to_buffer): fix this the way
buffer_to_widget was fixed, to avoid duplicating
the code that computes text_window->allocation.x/y
Sun Feb 24 21:18:20 2002 Owen Taylor <otaylor@redhat.com> Sun Feb 24 21:18:20 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtksocket.c (gtk_socket_end_embedding): Fix * gtk/gtksocket.c (gtk_socket_end_embedding): Fix

9
ChangeLog.pre-2-2
View File

@ -1,3 +1,12 @@
2002-02-24 Havoc Pennington <hp@pobox.com>
* gtk/gtktextbuffer.c (parent_class): parent_class variable was
GtkObjectClass instead of GObjectClass
* gtk/gtktextview.c (widget_to_buffer): fix this the way
buffer_to_widget was fixed, to avoid duplicating
the code that computes text_window->allocation.x/y
Sun Feb 24 21:18:20 2002 Owen Taylor <otaylor@redhat.com> Sun Feb 24 21:18:20 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtksocket.c (gtk_socket_end_embedding): Fix * gtk/gtksocket.c (gtk_socket_end_embedding): Fix

9
ChangeLog.pre-2-4
View File

@ -1,3 +1,12 @@
2002-02-24 Havoc Pennington <hp@pobox.com>
* gtk/gtktextbuffer.c (parent_class): parent_class variable was
GtkObjectClass instead of GObjectClass
* gtk/gtktextview.c (widget_to_buffer): fix this the way
buffer_to_widget was fixed, to avoid duplicating
the code that computes text_window->allocation.x/y
Sun Feb 24 21:18:20 2002 Owen Taylor <otaylor@redhat.com> Sun Feb 24 21:18:20 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtksocket.c (gtk_socket_end_embedding): Fix * gtk/gtksocket.c (gtk_socket_end_embedding): Fix

9
ChangeLog.pre-2-6
View File

@ -1,3 +1,12 @@
2002-02-24 Havoc Pennington <hp@pobox.com>
* gtk/gtktextbuffer.c (parent_class): parent_class variable was
GtkObjectClass instead of GObjectClass
* gtk/gtktextview.c (widget_to_buffer): fix this the way
buffer_to_widget was fixed, to avoid duplicating
the code that computes text_window->allocation.x/y
Sun Feb 24 21:18:20 2002 Owen Taylor <otaylor@redhat.com> Sun Feb 24 21:18:20 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtksocket.c (gtk_socket_end_embedding): Fix * gtk/gtksocket.c (gtk_socket_end_embedding): Fix

9
ChangeLog.pre-2-8
View File

@ -1,3 +1,12 @@
2002-02-24 Havoc Pennington <hp@pobox.com>
* gtk/gtktextbuffer.c (parent_class): parent_class variable was
GtkObjectClass instead of GObjectClass
* gtk/gtktextview.c (widget_to_buffer): fix this the way
buffer_to_widget was fixed, to avoid duplicating
the code that computes text_window->allocation.x/y
Sun Feb 24 21:18:20 2002 Owen Taylor <otaylor@redhat.com> Sun Feb 24 21:18:20 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtksocket.c (gtk_socket_end_embedding): Fix * gtk/gtksocket.c (gtk_socket_end_embedding): Fix

2
gtk/gtktextbuffer.c
View File

@ -113,7 +113,7 @@ static void remove_all_clipboard_contents_buffers (GtkTextBuffer *buffer);
static void remove_all_selection_clipboards (GtkTextBuffer *buffer); static void remove_all_selection_clipboards (GtkTextBuffer *buffer);
static void update_selection_clipboards (GtkTextBuffer *buffer); static void update_selection_clipboards (GtkTextBuffer *buffer);
static GtkObjectClass *parent_class = NULL; static GObjectClass *parent_class = NULL;
static guint signals[LAST_SIGNAL] = { 0 }; static guint signals[LAST_SIGNAL] = { 0 };
GType GType

27
gtk/gtktextview.c
View File

@ -6844,34 +6844,17 @@ widget_to_buffer (GtkTextView *text_view,
gint widget_y, gint widget_y,
gint *buffer_x, gint *buffer_x,
gint *buffer_y) gint *buffer_y)
{ {
gint focus_edge_width;
gboolean interior_focus;
gint focus_width;
gint border_width = GTK_CONTAINER (text_view)->border_width;
gtk_widget_style_get (GTK_WIDGET (text_view),
"interior_focus", &interior_focus,
"focus_line_width", &focus_width,
NULL);
if (interior_focus)
focus_edge_width = 0;
else
focus_edge_width = focus_width;
if (buffer_x) if (buffer_x)
{ {
*buffer_x = widget_x - focus_edge_width - border_width + text_view->xoffset; *buffer_x = widget_x + text_view->xoffset;
if (text_view->left_window) *buffer_x -= text_view->text_window->allocation.x;
*buffer_x -= text_view->left_window->allocation.width;
} }
if (buffer_y) if (buffer_y)
{ {
*buffer_y = widget_y - focus_edge_width - border_width + text_view->yoffset; *buffer_y = widget_y + text_view->yoffset;
if (text_view->top_window) *buffer_y -= text_view->text_window->allocation.y;
*buffer_y -= text_view->top_window->allocation.height;
} }
} }