diff options
| author | Owen Taylor <otaylor@redhat.com> | 2000-02-17 22:12:25 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2000-02-17 22:12:25 +0000 |
| commit | ab1deac87fa395332b73daf8e2e4c893e23be3e4 (patch) | |
| tree | 6ecac4c8b00d557df9d0a0a4ee8a9f9c0a80e7dc /gtk/gtkpaned.h | |
| parent | d0f73034cf5e6c5b7f52ce7d31bd3b3d8cca0d4c (diff) | |
| download | gtk+-ab1deac87fa395332b73daf8e2e4c893e23be3e4.tar.gz | |
Add patch from Jonathan Blandford and Anders Carlsson to change the Paned
Thu Feb 17 17:10:12 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gt{h,k,}vpaned.[ch]: Add patch from Jonathan Blandford
and Anders Carlsson to change the Paned widgets so that they
can be dragged from anywhere along the length. Also change
the way that this is drawn to make this apparent.
* gtk/gtkoptionmenu.c (gtk_option_menu_get_history): Apply patch
from George Lebl to check that option_menu->menu is present
before getting history.
Diffstat (limited to 'gtk/gtkpaned.h')
| -rw-r--r-- | gtk/gtkpaned.h | 40 |
1 files changed, 18 insertions, 22 deletions
diff --git a/gtk/gtkpaned.h b/gtk/gtkpaned.h index 6c7cb06785..da0f520afe 100644 --- a/gtk/gtkpaned.h +++ b/gtk/gtkpaned.h @@ -1,3 +1,4 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* GTK - The GIMP Toolkit * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald * @@ -18,7 +19,7 @@ */ /* - * Modified by the GTK+ Team and others 1997-1999. See the AUTHORS + * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with * GTK+ at ftp://ftp.gtk.org/pub/gtk/. @@ -27,11 +28,8 @@ #ifndef __GTK_PANED_H__ #define __GTK_PANED_H__ - -#include <gdk/gdk.h> #include <gtk/gtkcontainer.h> - #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ @@ -45,8 +43,8 @@ extern "C" { #define GTK_PANED_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_PANED, GtkPanedClass)) -typedef struct _GtkPaned GtkPaned; -typedef struct _GtkPanedClass GtkPanedClass; +typedef struct _GtkPaned GtkPaned; +typedef struct _GtkPanedClass GtkPanedClass; struct _GtkPaned { @@ -56,26 +54,28 @@ struct _GtkPaned GtkWidget *child2; GdkWindow *handle; - GdkRectangle groove_rectangle; GdkGC *xor_gc; - + GdkCursorType cursor_type; + /*< public >*/ guint16 handle_size; - guint16 gutter_size; - + /*< private >*/ + guint16 handle_width; + guint16 handle_height; + gint child1_size; gint last_allocation; gint min_position; gint max_position; - + guint position_set : 1; guint in_drag : 1; guint child1_shrink : 1; guint child1_resize : 1; guint child2_shrink : 1; guint child2_resize : 1; - + gint16 handle_xpos; gint16 handle_ypos; }; @@ -101,20 +101,16 @@ void gtk_paned_pack2 (GtkPaned *paned, gboolean shrink); void gtk_paned_set_position (GtkPaned *paned, gint position); -void gtk_paned_set_handle_size (GtkPaned *paned, - guint16 size); -void gtk_paned_set_gutter_size (GtkPaned *paned, - guint16 size); +void gtk_paned_set_handle_size (GtkPaned *paned, + guint16 size); /* Internal function */ -void gtk_paned_compute_position (GtkPaned *paned, - gint allocation, - gint child1_req, - gint child2_req); - +void gtk_paned_compute_position (GtkPaned *paned, + gint allocation, + gint child1_req, + gint child2_req); #ifdef __cplusplus } #endif /* __cplusplus */ - #endif /* __GTK_PANED_H__ */ |