1997-11-24 22:37:52 +00:00
|
|
|
/* GTK - The GIMP Toolkit
|
|
|
|
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
|
|
|
|
*
|
|
|
|
* This library is free software; you can redistribute it and/or
|
2000-07-26 11:33:08 +00:00
|
|
|
* modify it under the terms of the GNU Lesser General Public
|
1997-11-24 22:37:52 +00:00
|
|
|
* License as published by the Free Software Foundation; either
|
|
|
|
* version 2 of the License, or (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This library is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
2000-07-26 11:33:08 +00:00
|
|
|
* Lesser General Public License for more details.
|
1997-11-24 22:37:52 +00:00
|
|
|
*
|
2000-07-26 11:33:08 +00:00
|
|
|
* You should have received a copy of the GNU Lesser General Public
|
1998-04-13 02:02:47 +00:00
|
|
|
* License along with this library; if not, write to the
|
|
|
|
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
|
|
* Boston, MA 02111-1307, USA.
|
1997-11-24 22:37:52 +00:00
|
|
|
*/
|
1999-02-24 07:37:18 +00:00
|
|
|
|
|
|
|
/*
|
2000-07-26 11:33:08 +00:00
|
|
|
* Modified by the GTK+ Team and others 1997-2000. See the AUTHORS
|
1999-02-24 07:37:18 +00:00
|
|
|
* 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/.
|
|
|
|
*/
|
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
#include "gtklabel.h"
|
|
|
|
#include "gtkmain.h"
|
|
|
|
#include "gtksignal.h"
|
|
|
|
#include "gtktogglebutton.h"
|
|
|
|
|
|
|
|
|
|
|
|
#define DEFAULT_LEFT_POS 4
|
|
|
|
#define DEFAULT_TOP_POS 4
|
|
|
|
#define DEFAULT_SPACING 7
|
|
|
|
|
|
|
|
enum {
|
|
|
|
TOGGLED,
|
|
|
|
LAST_SIGNAL
|
|
|
|
};
|
|
|
|
|
new function gtk_container_child_arg_set, similar to
Wed Jun 24 14:14:32 1998 Tim Janik <timj@gtk.org>
* gtk/gtkcontainer.c: new function gtk_container_child_arg_set, similar
to gtk_container_child_arg_setv, but takes a variable argument list.
new function gtk_container_get_child_arg_type, which is needed by
gtk_object_collect_args.
* gtk/gtkobject.c: changed prototype for gtk_object_collect_args, to
take a function pointer to figure the argument type.
adapted callers to pass gtk_object_get_arg_type.
* gtk/gtkwidget.c: adapted gtk_object_collect_args callers to pass
gtk_object_get_arg_type..
* gtk/gtkpacker.h:
* gtk/gtkpacker.c:
(gtk_packer_reorder_child): new function to change the packing order
of a child.
(gtk_packer_size_request):
(gtk_packer_size_allocate): take container->border_width into acount.
* gtk/gtkpacker.c: implemented widget arguments:
"GtkPacker::spacing", "GtkPacker::border_width", "GtkPacker::pad_x",
"GtkPacker::pad_y", "GtkPacker::ipad_x", "GtkPacker::ipad_y".
implemented child arguments:
"GtkPacker::side", "GtkPacker::anchor", "GtkPacker::expand",
"GtkPacker::fill_x", "GtkPacker::fill_y", "GtkPacker::use_default",
"GtkPacker::border_width", "GtkPacker::pad_x", "GtkPacker::pad_y",
"GtkPacker::ipad_x", "GtkPacker::ipad_y", "GtkPacker::position".
* gtk/gtkmisc.c (gtk_misc_set_arg): for padding args, set the padding,
not the alignment.
* gtk/gtkeventbox.h:
* gtk/gtkeventbox.c: GtkType and macro fixups.
* gtk/testgtk.c (entry_toggle_sensitive): new function to toggle
sensitivity of an entry.
* gtk/gtkstyle.c (gtk_style_new): support normal grey as default color
for insensitive base.
* gtk/gtkentry.c (gtk_entry_realize): set the window backgrounds
widget state dependent.
(gtk_entry_style_set): likewise.
(gtk_entry_state_changed): set background color on state changes.
(gtk_entry_draw_text): for non selected text, use state dependent
colors.
* gtk/gtktogglebutton.c: support for widget arguments
"GtkToggleButton::active" and "GtkToggleButton::draw_indicator".
1998-06-24 12:22:23 +00:00
|
|
|
enum {
|
|
|
|
ARG_0,
|
|
|
|
ARG_ACTIVE,
|
|
|
|
ARG_DRAW_INDICATOR
|
|
|
|
};
|
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
|
|
|
|
static void gtk_toggle_button_class_init (GtkToggleButtonClass *klass);
|
|
|
|
static void gtk_toggle_button_init (GtkToggleButton *toggle_button);
|
1998-11-12 23:38:42 +00:00
|
|
|
static void gtk_toggle_button_paint (GtkWidget *widget,
|
|
|
|
GdkRectangle *area);
|
1999-01-12 15:12:14 +00:00
|
|
|
static void gtk_toggle_button_size_allocate (GtkWidget *widget,
|
|
|
|
GtkAllocation *allocation);
|
1998-11-12 23:38:42 +00:00
|
|
|
static void gtk_toggle_button_draw (GtkWidget *widget,
|
|
|
|
GdkRectangle *area);
|
1999-01-12 15:12:14 +00:00
|
|
|
static gint gtk_toggle_button_expose (GtkWidget *widget,
|
|
|
|
GdkEventExpose *event);
|
1997-11-24 22:37:52 +00:00
|
|
|
static void gtk_toggle_button_pressed (GtkButton *button);
|
|
|
|
static void gtk_toggle_button_released (GtkButton *button);
|
|
|
|
static void gtk_toggle_button_clicked (GtkButton *button);
|
|
|
|
static void gtk_toggle_button_enter (GtkButton *button);
|
|
|
|
static void gtk_toggle_button_leave (GtkButton *button);
|
new function gtk_container_child_arg_set, similar to
Wed Jun 24 14:14:32 1998 Tim Janik <timj@gtk.org>
* gtk/gtkcontainer.c: new function gtk_container_child_arg_set, similar
to gtk_container_child_arg_setv, but takes a variable argument list.
new function gtk_container_get_child_arg_type, which is needed by
gtk_object_collect_args.
* gtk/gtkobject.c: changed prototype for gtk_object_collect_args, to
take a function pointer to figure the argument type.
adapted callers to pass gtk_object_get_arg_type.
* gtk/gtkwidget.c: adapted gtk_object_collect_args callers to pass
gtk_object_get_arg_type..
* gtk/gtkpacker.h:
* gtk/gtkpacker.c:
(gtk_packer_reorder_child): new function to change the packing order
of a child.
(gtk_packer_size_request):
(gtk_packer_size_allocate): take container->border_width into acount.
* gtk/gtkpacker.c: implemented widget arguments:
"GtkPacker::spacing", "GtkPacker::border_width", "GtkPacker::pad_x",
"GtkPacker::pad_y", "GtkPacker::ipad_x", "GtkPacker::ipad_y".
implemented child arguments:
"GtkPacker::side", "GtkPacker::anchor", "GtkPacker::expand",
"GtkPacker::fill_x", "GtkPacker::fill_y", "GtkPacker::use_default",
"GtkPacker::border_width", "GtkPacker::pad_x", "GtkPacker::pad_y",
"GtkPacker::ipad_x", "GtkPacker::ipad_y", "GtkPacker::position".
* gtk/gtkmisc.c (gtk_misc_set_arg): for padding args, set the padding,
not the alignment.
* gtk/gtkeventbox.h:
* gtk/gtkeventbox.c: GtkType and macro fixups.
* gtk/testgtk.c (entry_toggle_sensitive): new function to toggle
sensitivity of an entry.
* gtk/gtkstyle.c (gtk_style_new): support normal grey as default color
for insensitive base.
* gtk/gtkentry.c (gtk_entry_realize): set the window backgrounds
widget state dependent.
(gtk_entry_style_set): likewise.
(gtk_entry_state_changed): set background color on state changes.
(gtk_entry_draw_text): for non selected text, use state dependent
colors.
* gtk/gtktogglebutton.c: support for widget arguments
"GtkToggleButton::active" and "GtkToggleButton::draw_indicator".
1998-06-24 12:22:23 +00:00
|
|
|
static void gtk_toggle_button_set_arg (GtkObject *object,
|
|
|
|
GtkArg *arg,
|
|
|
|
guint arg_id);
|
|
|
|
static void gtk_toggle_button_get_arg (GtkObject *object,
|
|
|
|
GtkArg *arg,
|
|
|
|
guint arg_id);
|
1998-11-06 22:05:02 +00:00
|
|
|
static void gtk_toggle_button_leave (GtkButton *button);
|
|
|
|
static void gtk_toggle_button_realize (GtkWidget *widget);
|
|
|
|
static void gtk_toggle_button_unrealize (GtkWidget *widget);
|
1998-11-13 16:07:04 +00:00
|
|
|
static void gtk_toggle_button_map (GtkWidget *widget);
|
|
|
|
static void gtk_toggle_button_unmap (GtkWidget *widget);
|
1997-11-24 22:37:52 +00:00
|
|
|
|
1998-03-09 15:16:28 +00:00
|
|
|
static guint toggle_button_signals[LAST_SIGNAL] = { 0 };
|
1998-11-06 22:05:02 +00:00
|
|
|
static GtkContainerClass *parent_class = NULL;
|
1997-11-24 22:37:52 +00:00
|
|
|
|
1998-06-16 05:20:05 +00:00
|
|
|
GtkType
|
1998-05-03 22:41:32 +00:00
|
|
|
gtk_toggle_button_get_type (void)
|
1997-11-24 22:37:52 +00:00
|
|
|
{
|
1998-06-16 05:20:05 +00:00
|
|
|
static GtkType toggle_button_type = 0;
|
1997-11-24 22:37:52 +00:00
|
|
|
|
|
|
|
if (!toggle_button_type)
|
|
|
|
{
|
1998-11-30 19:07:15 +00:00
|
|
|
static const GtkTypeInfo toggle_button_info =
|
1997-11-24 22:37:52 +00:00
|
|
|
{
|
|
|
|
"GtkToggleButton",
|
|
|
|
sizeof (GtkToggleButton),
|
|
|
|
sizeof (GtkToggleButtonClass),
|
|
|
|
(GtkClassInitFunc) gtk_toggle_button_class_init,
|
|
|
|
(GtkObjectInitFunc) gtk_toggle_button_init,
|
1998-07-04 15:31:30 +00:00
|
|
|
/* reserved_1 */ NULL,
|
|
|
|
/* reserved_2 */ NULL,
|
1998-06-28 07:46:10 +00:00
|
|
|
(GtkClassInitFunc) NULL,
|
1997-11-24 22:37:52 +00:00
|
|
|
};
|
|
|
|
|
1999-01-11 18:49:54 +00:00
|
|
|
toggle_button_type = gtk_type_unique (GTK_TYPE_BUTTON, &toggle_button_info);
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return toggle_button_type;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gtk_toggle_button_class_init (GtkToggleButtonClass *class)
|
|
|
|
{
|
|
|
|
GtkObjectClass *object_class;
|
|
|
|
GtkWidgetClass *widget_class;
|
|
|
|
GtkContainerClass *container_class;
|
|
|
|
GtkButtonClass *button_class;
|
|
|
|
|
|
|
|
object_class = (GtkObjectClass*) class;
|
|
|
|
widget_class = (GtkWidgetClass*) class;
|
|
|
|
container_class = (GtkContainerClass*) class;
|
|
|
|
button_class = (GtkButtonClass*) class;
|
|
|
|
|
1998-11-06 22:05:02 +00:00
|
|
|
parent_class = gtk_type_class (GTK_TYPE_BUTTON);
|
|
|
|
|
new function gtk_container_child_arg_set, similar to
Wed Jun 24 14:14:32 1998 Tim Janik <timj@gtk.org>
* gtk/gtkcontainer.c: new function gtk_container_child_arg_set, similar
to gtk_container_child_arg_setv, but takes a variable argument list.
new function gtk_container_get_child_arg_type, which is needed by
gtk_object_collect_args.
* gtk/gtkobject.c: changed prototype for gtk_object_collect_args, to
take a function pointer to figure the argument type.
adapted callers to pass gtk_object_get_arg_type.
* gtk/gtkwidget.c: adapted gtk_object_collect_args callers to pass
gtk_object_get_arg_type..
* gtk/gtkpacker.h:
* gtk/gtkpacker.c:
(gtk_packer_reorder_child): new function to change the packing order
of a child.
(gtk_packer_size_request):
(gtk_packer_size_allocate): take container->border_width into acount.
* gtk/gtkpacker.c: implemented widget arguments:
"GtkPacker::spacing", "GtkPacker::border_width", "GtkPacker::pad_x",
"GtkPacker::pad_y", "GtkPacker::ipad_x", "GtkPacker::ipad_y".
implemented child arguments:
"GtkPacker::side", "GtkPacker::anchor", "GtkPacker::expand",
"GtkPacker::fill_x", "GtkPacker::fill_y", "GtkPacker::use_default",
"GtkPacker::border_width", "GtkPacker::pad_x", "GtkPacker::pad_y",
"GtkPacker::ipad_x", "GtkPacker::ipad_y", "GtkPacker::position".
* gtk/gtkmisc.c (gtk_misc_set_arg): for padding args, set the padding,
not the alignment.
* gtk/gtkeventbox.h:
* gtk/gtkeventbox.c: GtkType and macro fixups.
* gtk/testgtk.c (entry_toggle_sensitive): new function to toggle
sensitivity of an entry.
* gtk/gtkstyle.c (gtk_style_new): support normal grey as default color
for insensitive base.
* gtk/gtkentry.c (gtk_entry_realize): set the window backgrounds
widget state dependent.
(gtk_entry_style_set): likewise.
(gtk_entry_state_changed): set background color on state changes.
(gtk_entry_draw_text): for non selected text, use state dependent
colors.
* gtk/gtktogglebutton.c: support for widget arguments
"GtkToggleButton::active" and "GtkToggleButton::draw_indicator".
1998-06-24 12:22:23 +00:00
|
|
|
gtk_object_add_arg_type ("GtkToggleButton::active", GTK_TYPE_BOOL, GTK_ARG_READWRITE, ARG_ACTIVE);
|
|
|
|
gtk_object_add_arg_type ("GtkToggleButton::draw_indicator", GTK_TYPE_BOOL, GTK_ARG_READWRITE, ARG_DRAW_INDICATOR);
|
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
toggle_button_signals[TOGGLED] =
|
|
|
|
gtk_signal_new ("toggled",
|
|
|
|
GTK_RUN_FIRST,
|
documented necessary changes for 1.4 transition.
Fri May 12 17:13:32 2000 Tim Janik <timj@gtk.org>
* docs/Changes-1.4.txt: documented necessary changes for 1.4 transition.
* gtk/gtktext.c: made the adjustments no-construct args, simply
provide default adjustments.
(gtk_text_destroy): release adjustments.
* gtk/gtkprogressbar.c (gtk_progress_bar_class_init): made the
adjustment argument non-construct.
* gtk/gtkprogress.c (gtk_progress_destroy): release adjustment here,
instead of in finalize.
(gtk_progress_get_text_from_value):
(gtk_progress_get_current_text):
(gtk_progress_set_value):
(gtk_progress_get_percentage_from_value):
(gtk_progress_get_current_percentage):
(gtk_progress_set_percentage):
(gtk_progress_configure): ensure an adjustment is present.
Thu May 11 01:24:08 2000 Tim Janik <timj@gtk.org>
* gtk/gtkcolorsel.[hc]:
* gtk/gtkcolorseldialog.[hc]:
* gtk/gtkhsv.[hc]: major code cleanups, destroy handlers need to chain
their parent implementation, use bit fields for boolean values, don't
create unused widgets, usage of glib types, braces go on their own
lines, function argument alignment, #include directives etc. etc. etc..
* gtk/Makefile.am (gtk_public_h_sources): install gtkhsv.h.
Wed May 10 23:29:52 2000 Tim Janik <timj@gtk.org>
* gtk/gtktoolbar.c (gtk_toolbar_destroy): don't unref a NULL tooltips.
* gtk/gtkfilesel.c (gtk_file_selection_destroy): don't free a cmpl_state
of NULL.
* gtk/gtkcombo.c (gtk_combo_item_destroy): don#t keep references
to freed data.
(gtk_combo_destroy): don't keep a pointer to a destroyed window.
* gtk/gtkmenu.c (gtk_menu_init): reset the menu's toplevel pointer
to NULL when the toplevel is getting destroyed.
(gtk_menu_set_tearoff_state): same here for the tearoff_window.
(gtk_menu_destroy):
(gtk_menu_init): store the information of whether we have to
readd the initial child ref_count during destruction in a new
GtkMenu field needs_destruction_ref_count.
* gtk/gtkviewport.c: SHAME! ok this one is tricky, so i note it
here, those reading: learn from my mistake! ;)
in order for set_?adjustment to support a default adjustemnt if
invoked with an adjustment pointer of NULL, the code read (pseudo):
if (v->adjustment) unref (v->adjustment);
if (!adjustment) adjustment = adjustment_new ();
if (v->adjustment != adjustment) v->adjustment = ref (adjustment);
now imagine the first unref to actually free the old adjustment and
adjustment_new() creating a new adjustment from the very same memory
portion. here, the latter comparision will unintendedly fail, and
all hell breaks loose.
(gtk_viewport_set_hadjustment):
(gtk_viewport_set_vadjustment): reset viewport->?adjustment to NULL
after unreferencing it.
* gtk/gtkcontainer.[hc]: removed toplevel registration
functions: gtk_container_register_toplevel(),
gtk_container_unregister_toplevel() and
gtk_container_get_toplevels() which had wrong semantics
anyways: it didn't reference and copy the list.
* gtk/gtkwindow.c: we take over the container toplevel registration
bussiness now. windows are registered across multiple destructions,
untill they are finalized. the initial implicit reference count
users are holding on windows is removed with the first destruction
though.
(gtk_window_init): ref & sink and set has_user_ref_count, got
rid of gtk_container_register_toplevel() call. add window to
toplevel_list.
(gtk_window_destroy): unref the window if has_user_ref_count
is still set, got rid of call to
gtk_container_unregister_toplevel().
(gtk_window_finalize): remove window from toplevel list.
(gtk_window_list_toplevels): new function to return a newly
created list with referenced toplevels.
(gtk_window_read_rcfiles): use gtk_window_list_toplevels().
* gtk/gtkhscale.c (gtk_hscale_class_init): made the GtkRange
adjustment a non-construct arg.
* gtk/gtkvscale.c (gtk_vscale_class_init): likewise.
* gtk/gtkhscrollbar.c (gtk_vscrollbar_class_init): likewise.
* gtk/gtkvscrollbar.c (gtk_vscrollbar_class_init): likewise.
* gtk/gtkrange.c: added some realized checks.
(gtk_range_destroy): get rid of the h/v adjustments in the
destroy handler instead of finalize. remove timer.
(gtk_range_get_adjustment): demand create adjustment.
* gtk/gtkviewport.c: made h/v adjustment non-construct args.
we simply create them on demand now and get rid of them in
the destroy handler.
(gtk_viewport_destroy): get rid of the h/v adjustments in the
destroy handler instead of finalize.
(gtk_viewport_get_hadjustment):
(gtk_viewport_get_vadjustment):
(gtk_viewport_size_allocate): demand create h/v adjustment
if required.
* gtk/gtkwidget.c (gtk_widget_finalize): duplicate part of the
gtk_widget_real_destroy () functionality.
(gtk_widget_real_destroy): reinitialize with a new style, instead
of setting widget->style to NULL.
Fri May 5 13:02:09 2000 Tim Janik <timj@gtk.org>
* gtk/gtkcalendar.c:
* gtk/gtkbutton.c: ported _get_type() implementation over to
GType, either to preserve memchunks allocation facilities,
or because Gtk+ 1.0 GtkTypeInfo was still being used.
* gtk/gtkobject.[hc]: derive from GObject. ported various functions
over. prepare for ::destroy to be emitted multiple times.
removed reference tracer magic. chain into GObjectClass.shutdown()
to emit ::destroy signal.
* gtk/gtksignal.c: removed assumptions about GTK_TYPE_OBJECT being
fundamental.
* gtk/gtkmain.c: removed gtk_object_post_arg_parsing_init()
cludge.
* gtk/gtksocket.c:
* gtk/gtkplug.c:
* gtk/gtklayout.c:
* gtk/gtklabel.c:
* gtk/gtkargcollector.c:
* gtk/gtkarg.c: various fixups to work with GTK_TYPE_OBJECT
not being a fundamental anymore, and to work with the new
type system (nuked fundamental type varargs clutter).
* gtk/*.c: install finalize handlers in the GObjectClass
part of the class structure.
changed direct GTK_OBJECT()->klass accesses to
GTK_*_GET_CLASS().
changed direct object_class->type accesses to GTK_CLASS_TYPE().
* gtktypeutils.[hc]: use the reserved fundamental ids provided by
GType. made most of the GTK_*() type macros and Gtk* typedefs
simple wrappers around macros and types provided by GType.
most notably, a significant portion of the old API vanished:
GTK_TYPE_MAKE(),
GTK_TYPE_SEQNO(),
GTK_TYPE_FLAT_FIRST, GTK_TYPE_FLAT_LAST,
GTK_TYPE_STRUCTURED_FIRST, GTK_TYPE_STRUCTURED_LAST,
GTK_TYPE_ARGS,
GTK_TYPE_CALLBACK,
GTK_TYPE_C_CALLBACK,
GTK_TYPE_FOREIGN,
GtkTypeQuery,
gtk_type_query(),
gtk_type_set_varargs_type(),
gtk_type_get_varargs_type(),
gtk_type_check_object_cast(),
gtk_type_check_class_cast(),
gtk_type_describe_tree(),
gtk_type_describe_heritage(),
gtk_type_free(),
gtk_type_children_types(),
gtk_type_set_chunk_alloc(),
gtk_type_register_enum(),
gtk_type_register_flags(),
gtk_type_parent_class().
replacements, where available are described in ../docs/Changes-1.4.txt.
implemented compatibility functions for the remaining API.
* configure.in: depend on glib 1.3.1, use gobject module.
2000-05-12 15:25:50 +00:00
|
|
|
GTK_CLASS_TYPE (object_class),
|
1997-11-24 22:37:52 +00:00
|
|
|
GTK_SIGNAL_OFFSET (GtkToggleButtonClass, toggled),
|
urg, removed implementation of gtk_marshal_VOID__INT_INT_INT_INT. if
Wed Oct 25 20:47:41 2000 Tim Janik <timj@gtk.org>
* gtk/gdk-pixbuf-loader.c (gdk_pixbuf_loader_class_init): urg, removed
implementation of gtk_marshal_VOID__INT_INT_INT_INT. if people do that,
couldn't they at least give it a non-standard name?
* gtk/gtktextlayout.c: arg! yet another implementation of
gtk_marshal_VOID__INT_INT_INT_INT(), is this a conspiracy?
* gtk/gtktextbuffer.c: gotcha! captured a vagabonding
gtk_marshal_VOID__INT_POINTER_INT() implementation, braught it back
home. now i know this _is_ a conspiracy.
* gtk/gtkwidget.c (gtk_widget_class_init): marshaller fixups for
::state-changed.
* gtk/gtkaccelgroup.c (gtk_accel_group_create_remove):
(gtk_accel_group_create_add): marshaller signature fixups.
* gtk/gtklistitem.c (gtk_list_item_class_init): signal creation fixups,
pass in GTK_TYPE_SCROLL_TYPE instead of GTK_TYPE_ENUM.
* gtk/gtkobject.[hc]: removed GTK_CONNECTED flag, it's not valid
anymore.
Tue Oct 24 23:59:21 2000 Tim Janik <timj@gtk.org>
* docs/reference/Makefile.am: disabled SUBDIRS for the moment, since
due to the signal system changes, it wouldn't build currently. to
be fixed soon.
* docs/Changes-2.0.txt: GtkSignal/GSignal updates.
* gtk/gtkwidget.c: ::direction_changed takes an enum as argument,
so it needs gtk_marshal_VOID__ENUM() instead of
gtk_marshal_NONE__UINT().
* gdk/gdk*.c: adapted type registration functions.
* gtk/gtkbindings.c:
* gtk/gtkaccelgroup.c: operate on GSignalQuery, GtkSignalQuery is
gone.
* gtk/gtkenums.h: define GtkSignalRunType in terms of GSignalType.
* gtk/gtkobject.c:
(gtk_object_destroy):
(gtk_object_shutdown): fixed recursion guards. basically we have to
catch the case where any of GObject.shutdown() or gtk_object_destroy()
is called during ::destroy, and avoid recursion there.
* gtk/gtktypeutils.c:
* gtk/maketypes.awk: awk-script hackup to provide gtk_type_init() with
boxed_copy/boxed_free. this needs a more general solution based on a
publically installed code-generator utility.
* gtk/gtktypeutils.[hc]: compat aliased GTK_TYPE_BOXED to G_TYPE_BOXED,
glib's gobject has support for that now.
define GtkSignalMarshaller in terms of GSignalCMarshaller.
Mon Oct 23 09:36:42 2000 Tim Janik <timj@gtk.org>
* gtk/gtksignal.[hc]:
* gtk/gtkmarshal.[hc]:
* gtk/Makefile.am: generate marshallers with glib-genmarshal and don't
compile gtkmarshal.c on its own anymore, just include it in gtksignal.c.
removed #include <gtkmarshal.h>s all over the place, gtksignal.h takes
care of that.
* *.c: marshaller name fixups.
* gtk/gtkmarshal.list: added a comment briefing the format.
Sun Oct 22 23:14:39 2000 Tim Janik <timj@gtk.org>
* gtk/gtksignal.[hc]: nuked old implementation. we mostly have
compatibility macros here now. more specifically, most of
the API is preserved (yes, _most_, nonwithstanding the
following exceptions listed, the API is stil lHUGE ;)
things that got removed completely:
GtkSignalQuery, gtk_signal_query(), gtk_signal_n_emissions(),
gtk_signal_n_emissions_by_name(), gtk_signal_handlers_destroy(),
gtk_signal_set_funcs(), gtk_signal_handler_pending_by_id(),
gtk_signal_add_emission_hook(), gtk_signal_add_emission_hook_full(),
gtk_signal_remove_emission_hook().
non-functional functions variants:
gtk_signal_add_emission_hook(), gtk_signal_remove_emission_hook().
the GtkCallbackMarshal argument to gtk_signal_connect_full() is
not supported anymore.
(gtk_signal_compat_matched): new internal function to aid
implementation of the compatibility macros, it provides
functionality to block/unblock/disconnect handlers based
on func/data.
* gtk/gtkenums.h: define GtkSignalRunType in terms of GSignalType,
* *.c: adaptions to new type registration API signatures.
Fri Oct 20 15:26:33 2000 Tim Janik <timj@gtk.org>
* gtk/gtktypeutils.[hc]: removed G_TYPE_GTK_POINTER cludge.
2000-10-25 22:34:14 +00:00
|
|
|
gtk_marshal_VOID__VOID,
|
1997-11-24 22:37:52 +00:00
|
|
|
GTK_TYPE_NONE, 0);
|
|
|
|
|
|
|
|
gtk_object_class_add_signals (object_class, toggle_button_signals, LAST_SIGNAL);
|
|
|
|
|
1998-06-28 07:46:10 +00:00
|
|
|
object_class->set_arg = gtk_toggle_button_set_arg;
|
|
|
|
object_class->get_arg = gtk_toggle_button_get_arg;
|
|
|
|
|
1999-01-12 15:12:14 +00:00
|
|
|
widget_class->size_allocate = gtk_toggle_button_size_allocate;
|
1998-11-12 23:38:42 +00:00
|
|
|
widget_class->draw = gtk_toggle_button_draw;
|
1999-01-12 15:12:14 +00:00
|
|
|
widget_class->expose_event = gtk_toggle_button_expose;
|
1998-11-06 22:05:02 +00:00
|
|
|
widget_class->realize = gtk_toggle_button_realize;
|
|
|
|
widget_class->unrealize = gtk_toggle_button_unrealize;
|
1998-11-13 16:07:04 +00:00
|
|
|
widget_class->map = gtk_toggle_button_map;
|
|
|
|
widget_class->unmap = gtk_toggle_button_unmap;
|
1997-11-24 22:37:52 +00:00
|
|
|
|
|
|
|
button_class->pressed = gtk_toggle_button_pressed;
|
|
|
|
button_class->released = gtk_toggle_button_released;
|
|
|
|
button_class->clicked = gtk_toggle_button_clicked;
|
1998-12-19 03:24:15 +00:00
|
|
|
button_class->enter = gtk_toggle_button_enter;
|
|
|
|
button_class->leave = gtk_toggle_button_leave;
|
1997-11-24 22:37:52 +00:00
|
|
|
|
|
|
|
class->toggled = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gtk_toggle_button_init (GtkToggleButton *toggle_button)
|
|
|
|
{
|
|
|
|
toggle_button->active = FALSE;
|
|
|
|
toggle_button->draw_indicator = FALSE;
|
1999-01-12 15:12:14 +00:00
|
|
|
GTK_WIDGET_UNSET_FLAGS (toggle_button, GTK_NO_WINDOW);
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
GtkWidget*
|
1998-05-03 22:41:32 +00:00
|
|
|
gtk_toggle_button_new (void)
|
1997-11-24 22:37:52 +00:00
|
|
|
{
|
|
|
|
return GTK_WIDGET (gtk_type_new (gtk_toggle_button_get_type ()));
|
|
|
|
}
|
|
|
|
|
|
|
|
GtkWidget*
|
|
|
|
gtk_toggle_button_new_with_label (const gchar *label)
|
|
|
|
{
|
|
|
|
GtkWidget *toggle_button;
|
|
|
|
GtkWidget *label_widget;
|
|
|
|
|
|
|
|
toggle_button = gtk_toggle_button_new ();
|
|
|
|
label_widget = gtk_label_new (label);
|
|
|
|
gtk_misc_set_alignment (GTK_MISC (label_widget), 0.5, 0.5);
|
|
|
|
|
|
|
|
gtk_container_add (GTK_CONTAINER (toggle_button), label_widget);
|
|
|
|
gtk_widget_show (label_widget);
|
|
|
|
|
|
|
|
return toggle_button;
|
|
|
|
}
|
|
|
|
|
new function gtk_container_child_arg_set, similar to
Wed Jun 24 14:14:32 1998 Tim Janik <timj@gtk.org>
* gtk/gtkcontainer.c: new function gtk_container_child_arg_set, similar
to gtk_container_child_arg_setv, but takes a variable argument list.
new function gtk_container_get_child_arg_type, which is needed by
gtk_object_collect_args.
* gtk/gtkobject.c: changed prototype for gtk_object_collect_args, to
take a function pointer to figure the argument type.
adapted callers to pass gtk_object_get_arg_type.
* gtk/gtkwidget.c: adapted gtk_object_collect_args callers to pass
gtk_object_get_arg_type..
* gtk/gtkpacker.h:
* gtk/gtkpacker.c:
(gtk_packer_reorder_child): new function to change the packing order
of a child.
(gtk_packer_size_request):
(gtk_packer_size_allocate): take container->border_width into acount.
* gtk/gtkpacker.c: implemented widget arguments:
"GtkPacker::spacing", "GtkPacker::border_width", "GtkPacker::pad_x",
"GtkPacker::pad_y", "GtkPacker::ipad_x", "GtkPacker::ipad_y".
implemented child arguments:
"GtkPacker::side", "GtkPacker::anchor", "GtkPacker::expand",
"GtkPacker::fill_x", "GtkPacker::fill_y", "GtkPacker::use_default",
"GtkPacker::border_width", "GtkPacker::pad_x", "GtkPacker::pad_y",
"GtkPacker::ipad_x", "GtkPacker::ipad_y", "GtkPacker::position".
* gtk/gtkmisc.c (gtk_misc_set_arg): for padding args, set the padding,
not the alignment.
* gtk/gtkeventbox.h:
* gtk/gtkeventbox.c: GtkType and macro fixups.
* gtk/testgtk.c (entry_toggle_sensitive): new function to toggle
sensitivity of an entry.
* gtk/gtkstyle.c (gtk_style_new): support normal grey as default color
for insensitive base.
* gtk/gtkentry.c (gtk_entry_realize): set the window backgrounds
widget state dependent.
(gtk_entry_style_set): likewise.
(gtk_entry_state_changed): set background color on state changes.
(gtk_entry_draw_text): for non selected text, use state dependent
colors.
* gtk/gtktogglebutton.c: support for widget arguments
"GtkToggleButton::active" and "GtkToggleButton::draw_indicator".
1998-06-24 12:22:23 +00:00
|
|
|
static void
|
|
|
|
gtk_toggle_button_set_arg (GtkObject *object,
|
|
|
|
GtkArg *arg,
|
|
|
|
guint arg_id)
|
|
|
|
{
|
|
|
|
GtkToggleButton *tb;
|
|
|
|
|
|
|
|
tb = GTK_TOGGLE_BUTTON (object);
|
|
|
|
|
|
|
|
switch (arg_id)
|
|
|
|
{
|
|
|
|
case ARG_ACTIVE:
|
1999-01-11 18:49:54 +00:00
|
|
|
gtk_toggle_button_set_active (tb, GTK_VALUE_BOOL (*arg));
|
new function gtk_container_child_arg_set, similar to
Wed Jun 24 14:14:32 1998 Tim Janik <timj@gtk.org>
* gtk/gtkcontainer.c: new function gtk_container_child_arg_set, similar
to gtk_container_child_arg_setv, but takes a variable argument list.
new function gtk_container_get_child_arg_type, which is needed by
gtk_object_collect_args.
* gtk/gtkobject.c: changed prototype for gtk_object_collect_args, to
take a function pointer to figure the argument type.
adapted callers to pass gtk_object_get_arg_type.
* gtk/gtkwidget.c: adapted gtk_object_collect_args callers to pass
gtk_object_get_arg_type..
* gtk/gtkpacker.h:
* gtk/gtkpacker.c:
(gtk_packer_reorder_child): new function to change the packing order
of a child.
(gtk_packer_size_request):
(gtk_packer_size_allocate): take container->border_width into acount.
* gtk/gtkpacker.c: implemented widget arguments:
"GtkPacker::spacing", "GtkPacker::border_width", "GtkPacker::pad_x",
"GtkPacker::pad_y", "GtkPacker::ipad_x", "GtkPacker::ipad_y".
implemented child arguments:
"GtkPacker::side", "GtkPacker::anchor", "GtkPacker::expand",
"GtkPacker::fill_x", "GtkPacker::fill_y", "GtkPacker::use_default",
"GtkPacker::border_width", "GtkPacker::pad_x", "GtkPacker::pad_y",
"GtkPacker::ipad_x", "GtkPacker::ipad_y", "GtkPacker::position".
* gtk/gtkmisc.c (gtk_misc_set_arg): for padding args, set the padding,
not the alignment.
* gtk/gtkeventbox.h:
* gtk/gtkeventbox.c: GtkType and macro fixups.
* gtk/testgtk.c (entry_toggle_sensitive): new function to toggle
sensitivity of an entry.
* gtk/gtkstyle.c (gtk_style_new): support normal grey as default color
for insensitive base.
* gtk/gtkentry.c (gtk_entry_realize): set the window backgrounds
widget state dependent.
(gtk_entry_style_set): likewise.
(gtk_entry_state_changed): set background color on state changes.
(gtk_entry_draw_text): for non selected text, use state dependent
colors.
* gtk/gtktogglebutton.c: support for widget arguments
"GtkToggleButton::active" and "GtkToggleButton::draw_indicator".
1998-06-24 12:22:23 +00:00
|
|
|
break;
|
|
|
|
case ARG_DRAW_INDICATOR:
|
|
|
|
gtk_toggle_button_set_mode (tb, GTK_VALUE_BOOL (*arg));
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gtk_toggle_button_get_arg (GtkObject *object,
|
|
|
|
GtkArg *arg,
|
|
|
|
guint arg_id)
|
|
|
|
{
|
|
|
|
GtkToggleButton *tb;
|
|
|
|
|
|
|
|
tb = GTK_TOGGLE_BUTTON (object);
|
|
|
|
|
|
|
|
switch (arg_id)
|
|
|
|
{
|
|
|
|
case ARG_ACTIVE:
|
|
|
|
GTK_VALUE_BOOL (*arg) = tb->active;
|
|
|
|
break;
|
|
|
|
case ARG_DRAW_INDICATOR:
|
|
|
|
GTK_VALUE_BOOL (*arg) = tb->draw_indicator;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
arg->type = GTK_TYPE_INVALID;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
void
|
|
|
|
gtk_toggle_button_set_mode (GtkToggleButton *toggle_button,
|
1999-01-11 18:49:54 +00:00
|
|
|
gboolean draw_indicator)
|
1997-11-24 22:37:52 +00:00
|
|
|
{
|
1999-01-11 18:49:54 +00:00
|
|
|
GtkWidget *widget;
|
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
g_return_if_fail (toggle_button != NULL);
|
|
|
|
g_return_if_fail (GTK_IS_TOGGLE_BUTTON (toggle_button));
|
|
|
|
|
1999-01-11 18:49:54 +00:00
|
|
|
widget = GTK_WIDGET (toggle_button);
|
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
draw_indicator = draw_indicator ? TRUE : FALSE;
|
|
|
|
|
|
|
|
if (toggle_button->draw_indicator != draw_indicator)
|
|
|
|
{
|
1999-01-11 18:49:54 +00:00
|
|
|
if (GTK_WIDGET_REALIZED (toggle_button))
|
1998-11-06 22:05:02 +00:00
|
|
|
{
|
1999-01-11 18:49:54 +00:00
|
|
|
gboolean visible = GTK_WIDGET_VISIBLE (toggle_button);
|
|
|
|
|
|
|
|
if (visible)
|
|
|
|
gtk_widget_hide (widget);
|
|
|
|
|
|
|
|
gtk_widget_unrealize (widget);
|
1998-11-06 22:05:02 +00:00
|
|
|
toggle_button->draw_indicator = draw_indicator;
|
1999-01-12 15:12:14 +00:00
|
|
|
|
|
|
|
if (toggle_button->draw_indicator)
|
|
|
|
GTK_WIDGET_SET_FLAGS (toggle_button, GTK_NO_WINDOW);
|
|
|
|
else
|
|
|
|
GTK_WIDGET_UNSET_FLAGS (toggle_button, GTK_NO_WINDOW);
|
|
|
|
|
1999-01-11 18:49:54 +00:00
|
|
|
gtk_widget_realize (widget);
|
|
|
|
|
|
|
|
if (visible)
|
|
|
|
gtk_widget_show (widget);
|
1998-11-06 22:05:02 +00:00
|
|
|
}
|
|
|
|
else
|
1999-01-12 15:12:14 +00:00
|
|
|
{
|
|
|
|
toggle_button->draw_indicator = draw_indicator;
|
|
|
|
|
|
|
|
if (toggle_button->draw_indicator)
|
|
|
|
GTK_WIDGET_SET_FLAGS (toggle_button, GTK_NO_WINDOW);
|
|
|
|
else
|
|
|
|
GTK_WIDGET_UNSET_FLAGS (toggle_button, GTK_NO_WINDOW);
|
|
|
|
}
|
1997-11-24 22:37:52 +00:00
|
|
|
|
|
|
|
if (GTK_WIDGET_VISIBLE (toggle_button))
|
|
|
|
gtk_widget_queue_resize (GTK_WIDGET (toggle_button));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
1999-01-21 00:37:48 +00:00
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
void
|
1999-01-11 18:49:54 +00:00
|
|
|
gtk_toggle_button_set_active (GtkToggleButton *toggle_button,
|
|
|
|
gboolean is_active)
|
1997-11-24 22:37:52 +00:00
|
|
|
{
|
|
|
|
g_return_if_fail (toggle_button != NULL);
|
|
|
|
g_return_if_fail (GTK_IS_TOGGLE_BUTTON (toggle_button));
|
|
|
|
|
1999-01-11 18:49:54 +00:00
|
|
|
is_active = is_active != 0;
|
|
|
|
|
|
|
|
if (toggle_button->active != is_active)
|
1997-11-24 22:37:52 +00:00
|
|
|
gtk_button_clicked (GTK_BUTTON (toggle_button));
|
|
|
|
}
|
|
|
|
|
1999-01-21 00:37:48 +00:00
|
|
|
|
|
|
|
gboolean
|
|
|
|
gtk_toggle_button_get_active (GtkToggleButton *toggle_button)
|
|
|
|
{
|
|
|
|
g_return_val_if_fail (toggle_button != NULL, FALSE);
|
|
|
|
g_return_val_if_fail (GTK_IS_TOGGLE_BUTTON (toggle_button), FALSE);
|
|
|
|
|
|
|
|
return (toggle_button->active) ? TRUE : FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
void
|
|
|
|
gtk_toggle_button_toggled (GtkToggleButton *toggle_button)
|
|
|
|
{
|
1999-01-11 18:49:54 +00:00
|
|
|
g_return_if_fail (toggle_button != NULL);
|
|
|
|
g_return_if_fail (GTK_IS_TOGGLE_BUTTON (toggle_button));
|
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
gtk_signal_emit (GTK_OBJECT (toggle_button), toggle_button_signals[TOGGLED]);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static void
|
1998-11-12 23:38:42 +00:00
|
|
|
gtk_toggle_button_paint (GtkWidget *widget,
|
|
|
|
GdkRectangle *area)
|
1997-11-24 22:37:52 +00:00
|
|
|
{
|
|
|
|
GtkButton *button;
|
|
|
|
GtkToggleButton *toggle_button;
|
|
|
|
GtkShadowType shadow_type;
|
|
|
|
gint width, height;
|
|
|
|
gint x, y;
|
|
|
|
|
1999-01-12 15:12:14 +00:00
|
|
|
button = GTK_BUTTON (widget);
|
|
|
|
toggle_button = GTK_TOGGLE_BUTTON (widget);
|
|
|
|
|
1998-03-26 21:57:45 +00:00
|
|
|
if (GTK_WIDGET_DRAWABLE (widget))
|
1997-11-24 22:37:52 +00:00
|
|
|
{
|
|
|
|
x = 0;
|
|
|
|
y = 0;
|
1998-03-26 21:57:45 +00:00
|
|
|
width = widget->allocation.width - GTK_CONTAINER (widget)->border_width * 2;
|
|
|
|
height = widget->allocation.height - GTK_CONTAINER (widget)->border_width * 2;
|
1997-11-24 22:37:52 +00:00
|
|
|
|
1998-11-12 23:38:42 +00:00
|
|
|
gdk_window_set_back_pixmap (widget->window, NULL, TRUE);
|
|
|
|
gdk_window_clear_area (widget->window, area->x, area->y, area->width, area->height);
|
|
|
|
|
|
|
|
if (GTK_WIDGET_HAS_DEFAULT (widget) &&
|
|
|
|
GTK_BUTTON (widget)->relief == GTK_RELIEF_NORMAL)
|
|
|
|
{
|
|
|
|
gtk_paint_box (widget->style, widget->window,
|
|
|
|
GTK_STATE_NORMAL, GTK_SHADOW_IN,
|
|
|
|
area, widget, "togglebuttondefault",
|
|
|
|
x, y, width, height);
|
|
|
|
}
|
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
if (GTK_WIDGET_CAN_DEFAULT (widget))
|
|
|
|
{
|
Make this compile without framebuffer enabled
2000-06-20 Havoc Pennington <hp@redhat.com>
* modules/linux-fb/Makefile.am: Make this compile
without framebuffer enabled
* gdk/linux-fb/Makefile.am: Add conditional to not build
framebuffer unless specified in configure
* gdk/gdkdraw.c (gdk_draw_drawable): Fix bug where I was getting
the size of the target instead of source if -1 was passed for
width/height
* gdk/x11/gdkgeometry-x11.c (gdk_window_compute_position): Fix
width/height confusion.
2000-06-19 Havoc Pennington <hp@redhat.com>
* gdk/x11/gdkx.h (GDK_WINDOW_XWINDOW): change this to be
GDK_DRAWABLE_XID. In the future, we probably want to make it
faster with G_DISABLE_CHECKS turned on.
2000-06-14 Havoc Pennington <hp@redhat.com>
* gdk/Makefile.am: add gdkpixmap.c
* gdk/gdk.c: s/gdk_window_init/_gdk_windowing_window_init/
s/gdk_image_init/_gdk_windowing_image_init
* gdk/gdkcolor.c: make ref/unref compat wrappers for GObject
ref/unref
* gdk/gdkcolor.h: make GdkColormap a GObject subclass
* gdk/gdkcompat.h: remove GdkWindowType compat, since
GdkWindowType is now non-deprecated;
change gdk_window_get_type() compat to be
gdk_window_get_window_type().
* gdk/gdkdnd.h: make GdkDragContext a GObject.
* gdk/gdkdraw.c, gdk/gdkdraw.h: Convert GdkDrawable to a pure
virtual GObject. Make all functions call into the vtable.
Move gdk_image_put() guts in here. Remove GdkDrawableType
and gdk_drawable_get_type(), these are now GdkWindow-specific.
draw_image, get_depth, get_size, set_colormap, get_colormap,
get_visual added to the vtable.
* gdk/gdkgc.h, gdk/gdkgc.c: Convert GdkGC to a pure virtual
GObject. Virtualize everything.
(gdk_gc_new_with_values): remove check for destroyed window,
because now GdkWindow::create_gc will check this.
(gdk_gc_set_values): New function to set GC values, this
was already implemented but wasn't in the header
* gdk/gdkimage.h, gdk/gdkimage.c: Convert GdkImage to a GObject.
* gdk/gdkinternals.h: Remove _gdk_window_alloc(), remove
_gdk_window_draw_image(), remove _gdk_windowing_window_class,
remove _gdk_window_class; add _gdk_window_impl_get_type() and
_gdk_pixmap_impl_get_type(). Rename gdk_window_init to
_gdk_windowing_window_init, rename gdk_image_init to
_gdk_windowing_image_init.
* gdk/gdkpango.c: Reflect GObject-ification of PangoContext.
(gdk_draw_layout): Remove check for destroyed window,
because all the drawable methods already check it.
* gdk/gdkpixmap.h, gdk/gdkpixmap.c: Convert GdkPixmap to GObject.
Add gdkpixmap.c which contains implementation of GdkDrawable
virtual table (by chaining to a platform-specific implementation
object).
* gdk/gdkprivate.h: Remove GDK_IS_WINDOW, GDK_IS_PIXMAP,
GDK_DRAWABLE_DESTROYED. Add GDK_WINDOW_DESTROYED. Replace
GDK_DRAWABLE_TYPE with GDK_WINDOW_TYPE. Remove GdkDrawablePrivate,
GdkWindowPrivate, GdkImageClass, GdkImagePrivate, GdkGCPrivate,
GdkColormapPrivate.
* gdk/gdktypes.h: #include <glib-object.h>
* gdk/gdkwindow.h, gdk/gdkwindow.c: Convert GdkWindow to GObject.
Move most functionality to platform-specific implementation
object. GdkWindow itself now handles the backing store, then
chains to the platform-specific implementation.
(gdk_window_get_window_type): return GdkWindowType of the window.
(gdk_window_peek_children): New routine, returns the children of
a GdkWindow
(gdk_window_get_children): Was in X11-specific code and did
XQueryTree. Changed to simply return a copy of window->children;
so it can go in cross-platform code.
* gdk/x11/Makefile.am: fix broken MKINSTALLDIRS path
* gdk/x11/gdkcolor-x11.c: implement X-specific parts of
GdkColormap; just changed to use the new private data instead
of casting to GdkColormapPrivate.
* gdk/x11/gdkcursor-x11.c: added a couple typechecks to
gdk_cursor_new().
* gdk/x11/gdkdnd-x11.c: Change the way we access private fields
(private data member in the GObject).
(xdnd_manager_source_filter): Function had broken
error handling, fix it (use gdk_error_trap_push).
* gdk/x11/gdkdrawable-x11.c: This file now implements
a base class for GdkWindowImplX11/GdkPixmapImplX11. This
base class is purely for the convenience of the X port,
and not part of the interface to cross-platform GDK.
* gdk/x11/gdkevents-x11.c: Reflect various renamings.
* gdk/x11/gdkgc-x11.c: Implement a subclass of GdkGC that's
specific to X, and returned by the create_gc virtual method
of GdkDrawableImplX11.
(gdk_x11_gc_set_dashes): Change this to take an array of gint8
rather than gchar, this was also changed in the GdkGC vtable.
(gdk_x11_gc_values_to_xvalues): If GdkGCValues is NULL, or the
mask is 0, return immediately, instead of checking every flag.
This is faster, and keeps us from segfaulting if values is NULL
and the mask contains some nonzero flags.
* gdk/x11/gdkgeometry-x11.c: deal with all the rearranging of
GdkWindow.
* gdk/x11/gdkglobals-x11.c: change type of grab window, since
GdkWindowPrivate is gone.
* gdk/x11/gdkim-x11.c: rename things that got renamed.
* gdk/x11/gdkimage-x11.c: implement in terms of GObject, and
remove the image_put stuff that got transferred to GdkDrawable.
* gdk/x11/gdkinput.c: renamings
* gdk/x11/gdkmain-x11.c: #include <pango/pangox.h>
* gdk/x11/gdkpixmap-x11.c: GObject conversion
* gdk/x11/gdkprivate-x11.h: indentation fixes
* gdk/x11/gdkproperty-x11.c: renamings
* gdk/x11/gdkselection-x11.c: renamings
* gdk/x11/gdkwindow-x11.c: Restructuring and renaming; this now
implements the platform-specific "impl" object.
Moved gdk_window_get_children to gdk/gdkwindow.c
* gdk/x11/gdkx.h: Remove all the private structs and private datas
that no longer exist. Add declaration of GdkGCX11 object here.
Fix all the macros to still work.
* gtk/gtk-boxed.defs: Remove GtkStyle, GdkColormap, GdkWindow,
GdkDragContext from the boxed types since they are now GObjects.
* gtk/gtkstyle.h, gtk/gtkstyle.c: Converted GtkStyle to a GObject,
moved xthickness/ythickness into the instance. GtkStyleClass
functions are now in the standard vtable for GtkStyle, so you have
to create a GObject subclass to write a theme engine.
(gtk_style_copy): fixed a leaked PangoFontDescription
(gtk_style_init): renamed gtk_style_realize, so gtk_style_init
can be the standard GObject function.
* Throughout GTK:
s/style->klass->[xy]thickness/style->[xy]thickness
s/pango_layout_unref/g_object_unref/
* gtk/gtkrc.h, gtk/gtkrc.c: Converted GtkRcStyle to a GObject.
* gtk/gtksocket.c: Use gdk_window_get_user_data() instead of
accessing GDK internals.
* gtk/gtkwidget.c: Use gdk_window_peek_children() instead of
accessing GDK internals.
2000-06-20 21:04:44 +00:00
|
|
|
x += widget->style->xthickness;
|
|
|
|
y += widget->style->ythickness;
|
1997-11-24 22:37:52 +00:00
|
|
|
width -= 2 * x + DEFAULT_SPACING;
|
|
|
|
height -= 2 * y + DEFAULT_SPACING;
|
|
|
|
x += DEFAULT_LEFT_POS;
|
|
|
|
y += DEFAULT_TOP_POS;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (GTK_WIDGET_HAS_FOCUS (widget))
|
|
|
|
{
|
|
|
|
x += 1;
|
|
|
|
y += 1;
|
|
|
|
width -= 2;
|
|
|
|
height -= 2;
|
|
|
|
}
|
|
|
|
|
1998-11-12 23:38:42 +00:00
|
|
|
if ((GTK_WIDGET_STATE (widget) == GTK_STATE_ACTIVE) ||
|
|
|
|
toggle_button->active)
|
1997-11-24 22:37:52 +00:00
|
|
|
shadow_type = GTK_SHADOW_IN;
|
|
|
|
else
|
|
|
|
shadow_type = GTK_SHADOW_OUT;
|
1999-01-11 18:49:54 +00:00
|
|
|
|
|
|
|
if (button->relief != GTK_RELIEF_NONE ||
|
|
|
|
(GTK_WIDGET_STATE(widget) != GTK_STATE_NORMAL &&
|
|
|
|
GTK_WIDGET_STATE(widget) != GTK_STATE_INSENSITIVE))
|
1998-11-12 23:38:42 +00:00
|
|
|
gtk_paint_box (widget->style, widget->window,
|
|
|
|
GTK_WIDGET_STATE (widget),
|
|
|
|
shadow_type, area, widget, "togglebutton",
|
|
|
|
x, y, width, height);
|
1999-01-11 18:49:54 +00:00
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
if (GTK_WIDGET_HAS_FOCUS (widget))
|
|
|
|
{
|
|
|
|
x -= 1;
|
|
|
|
y -= 1;
|
|
|
|
width += 2;
|
|
|
|
height += 2;
|
|
|
|
|
1998-11-06 22:05:02 +00:00
|
|
|
gtk_paint_focus (widget->style, widget->window,
|
1998-11-12 23:38:42 +00:00
|
|
|
area, widget, "togglebutton",
|
1998-11-06 22:05:02 +00:00
|
|
|
x, y, width - 1, height - 1);
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
1998-11-12 23:38:42 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
1999-01-12 15:12:14 +00:00
|
|
|
static void
|
|
|
|
gtk_toggle_button_size_allocate (GtkWidget *widget,
|
|
|
|
GtkAllocation *allocation)
|
|
|
|
{
|
|
|
|
if (!GTK_WIDGET_NO_WINDOW (widget) &&
|
|
|
|
GTK_WIDGET_CLASS (parent_class)->size_allocate)
|
|
|
|
GTK_WIDGET_CLASS (parent_class)->size_allocate (widget, allocation);
|
|
|
|
}
|
|
|
|
|
|
|
|
static gint
|
|
|
|
gtk_toggle_button_expose (GtkWidget *widget,
|
|
|
|
GdkEventExpose *event)
|
|
|
|
{
|
|
|
|
if (!GTK_WIDGET_NO_WINDOW (widget) &&
|
|
|
|
GTK_WIDGET_CLASS (parent_class)->expose_event)
|
|
|
|
return GTK_WIDGET_CLASS (parent_class)->expose_event (widget, event);
|
|
|
|
else
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
1998-11-12 23:38:42 +00:00
|
|
|
static void
|
|
|
|
gtk_toggle_button_draw (GtkWidget *widget,
|
|
|
|
GdkRectangle *area)
|
|
|
|
{
|
|
|
|
GdkRectangle child_area;
|
|
|
|
GdkRectangle tmp_area;
|
1999-01-11 18:49:54 +00:00
|
|
|
GtkBin *bin;
|
1998-11-12 23:38:42 +00:00
|
|
|
|
|
|
|
g_return_if_fail (widget != NULL);
|
|
|
|
g_return_if_fail (GTK_IS_TOGGLE_BUTTON (widget));
|
|
|
|
g_return_if_fail (area != NULL);
|
|
|
|
|
1999-01-11 18:49:54 +00:00
|
|
|
bin = GTK_BIN (widget);
|
|
|
|
|
1999-01-12 15:12:14 +00:00
|
|
|
if (GTK_WIDGET_DRAWABLE (widget) && !GTK_WIDGET_NO_WINDOW (widget))
|
1998-11-12 23:38:42 +00:00
|
|
|
{
|
|
|
|
tmp_area = *area;
|
1999-01-11 18:49:54 +00:00
|
|
|
tmp_area.x -= GTK_CONTAINER (widget)->border_width;
|
|
|
|
tmp_area.y -= GTK_CONTAINER (widget)->border_width;
|
1998-11-12 23:38:42 +00:00
|
|
|
|
|
|
|
gtk_toggle_button_paint (widget, &tmp_area);
|
|
|
|
|
1999-01-11 18:49:54 +00:00
|
|
|
if (bin->child && gtk_widget_intersect (bin->child, &tmp_area, &child_area))
|
|
|
|
gtk_widget_draw (bin->child, &child_area);
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gtk_toggle_button_pressed (GtkButton *button)
|
|
|
|
{
|
|
|
|
GtkToggleButton *toggle_button;
|
|
|
|
GtkStateType new_state;
|
|
|
|
|
|
|
|
g_return_if_fail (button != NULL);
|
|
|
|
g_return_if_fail (GTK_IS_TOGGLE_BUTTON (button));
|
|
|
|
|
|
|
|
toggle_button = GTK_TOGGLE_BUTTON (button);
|
|
|
|
|
|
|
|
button->button_down = TRUE;
|
|
|
|
|
|
|
|
if (toggle_button->active)
|
|
|
|
new_state = (button->in_button ? GTK_STATE_NORMAL : GTK_STATE_ACTIVE);
|
|
|
|
else
|
|
|
|
new_state = (button->in_button ? GTK_STATE_ACTIVE : GTK_STATE_NORMAL);
|
|
|
|
|
|
|
|
if (GTK_WIDGET_STATE (button) != new_state)
|
1999-01-11 18:49:54 +00:00
|
|
|
gtk_widget_set_state (GTK_WIDGET (button), new_state);
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gtk_toggle_button_released (GtkButton *button)
|
|
|
|
{
|
|
|
|
GtkToggleButton *toggle_button;
|
|
|
|
GtkStateType new_state;
|
|
|
|
|
|
|
|
g_return_if_fail (button != NULL);
|
|
|
|
g_return_if_fail (GTK_IS_TOGGLE_BUTTON (button));
|
|
|
|
|
|
|
|
if (button->button_down)
|
|
|
|
{
|
|
|
|
toggle_button = GTK_TOGGLE_BUTTON (button);
|
|
|
|
|
|
|
|
button->button_down = FALSE;
|
|
|
|
|
|
|
|
if (button->in_button)
|
|
|
|
{
|
|
|
|
gtk_button_clicked (button);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if (toggle_button->active)
|
|
|
|
new_state = (button->in_button ? GTK_STATE_PRELIGHT : GTK_STATE_ACTIVE);
|
|
|
|
else
|
|
|
|
new_state = (button->in_button ? GTK_STATE_PRELIGHT : GTK_STATE_NORMAL);
|
|
|
|
|
|
|
|
if (GTK_WIDGET_STATE (button) != new_state)
|
1999-01-11 18:49:54 +00:00
|
|
|
gtk_widget_set_state (GTK_WIDGET (button), new_state);
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gtk_toggle_button_clicked (GtkButton *button)
|
|
|
|
{
|
|
|
|
GtkToggleButton *toggle_button;
|
|
|
|
GtkStateType new_state;
|
|
|
|
|
|
|
|
g_return_if_fail (button != NULL);
|
|
|
|
g_return_if_fail (GTK_IS_TOGGLE_BUTTON (button));
|
|
|
|
|
|
|
|
toggle_button = GTK_TOGGLE_BUTTON (button);
|
|
|
|
toggle_button->active = !toggle_button->active;
|
|
|
|
|
|
|
|
gtk_toggle_button_toggled (toggle_button);
|
|
|
|
|
|
|
|
if (toggle_button->active)
|
|
|
|
new_state = (button->in_button ? GTK_STATE_PRELIGHT : GTK_STATE_ACTIVE);
|
|
|
|
else
|
|
|
|
new_state = (button->in_button ? GTK_STATE_PRELIGHT : GTK_STATE_NORMAL);
|
|
|
|
|
|
|
|
if (GTK_WIDGET_STATE (button) != new_state)
|
|
|
|
gtk_widget_set_state (GTK_WIDGET (button), new_state);
|
1999-01-11 18:49:54 +00:00
|
|
|
else
|
|
|
|
gtk_widget_queue_draw (GTK_WIDGET (button));
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gtk_toggle_button_enter (GtkButton *button)
|
|
|
|
{
|
|
|
|
GtkToggleButton *toggle_button;
|
|
|
|
GtkStateType new_state;
|
|
|
|
|
|
|
|
g_return_if_fail (button != NULL);
|
|
|
|
g_return_if_fail (GTK_IS_TOGGLE_BUTTON (button));
|
|
|
|
|
|
|
|
toggle_button = GTK_TOGGLE_BUTTON (button);
|
|
|
|
|
|
|
|
if (toggle_button->active)
|
|
|
|
new_state = (button->button_down ? GTK_STATE_NORMAL : GTK_STATE_PRELIGHT);
|
|
|
|
else
|
|
|
|
new_state = (button->button_down ? GTK_STATE_ACTIVE : GTK_STATE_PRELIGHT);
|
|
|
|
|
|
|
|
if (GTK_WIDGET_STATE (button) != new_state)
|
1999-01-11 18:49:54 +00:00
|
|
|
gtk_widget_set_state (GTK_WIDGET (button), new_state);
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gtk_toggle_button_leave (GtkButton *button)
|
|
|
|
{
|
|
|
|
GtkToggleButton *toggle_button;
|
|
|
|
GtkStateType new_state;
|
|
|
|
|
|
|
|
g_return_if_fail (button != NULL);
|
|
|
|
g_return_if_fail (GTK_IS_TOGGLE_BUTTON (button));
|
|
|
|
|
|
|
|
toggle_button = GTK_TOGGLE_BUTTON (button);
|
|
|
|
|
|
|
|
new_state = (toggle_button->active ? GTK_STATE_ACTIVE : GTK_STATE_NORMAL);
|
|
|
|
|
|
|
|
if (GTK_WIDGET_STATE (button) != new_state)
|
1999-01-11 18:49:54 +00:00
|
|
|
gtk_widget_set_state (GTK_WIDGET (button), new_state);
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
1998-11-06 22:05:02 +00:00
|
|
|
|
|
|
|
static void
|
|
|
|
gtk_toggle_button_realize (GtkWidget *widget)
|
|
|
|
{
|
|
|
|
GtkToggleButton *toggle_button;
|
|
|
|
GdkWindowAttr attributes;
|
|
|
|
gint attributes_mask;
|
|
|
|
gint border_width;
|
|
|
|
|
|
|
|
g_return_if_fail (widget != NULL);
|
|
|
|
g_return_if_fail (GTK_IS_TOGGLE_BUTTON (widget));
|
|
|
|
|
|
|
|
toggle_button = GTK_TOGGLE_BUTTON (widget);
|
|
|
|
GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
|
|
|
|
|
|
|
|
border_width = GTK_CONTAINER (widget)->border_width;
|
|
|
|
|
|
|
|
attributes.window_type = GDK_WINDOW_CHILD;
|
|
|
|
attributes.x = widget->allocation.x + border_width;
|
|
|
|
attributes.y = widget->allocation.y + border_width;
|
|
|
|
attributes.width = widget->allocation.width - border_width * 2;
|
|
|
|
attributes.height = widget->allocation.height - border_width * 2;
|
|
|
|
attributes.event_mask = gtk_widget_get_events (widget);
|
|
|
|
attributes.event_mask |= (GDK_EXPOSURE_MASK |
|
|
|
|
GDK_BUTTON_PRESS_MASK |
|
|
|
|
GDK_BUTTON_RELEASE_MASK |
|
|
|
|
GDK_ENTER_NOTIFY_MASK |
|
|
|
|
GDK_LEAVE_NOTIFY_MASK);
|
|
|
|
|
1999-01-12 15:12:14 +00:00
|
|
|
if (GTK_WIDGET_NO_WINDOW (widget))
|
1998-11-06 22:05:02 +00:00
|
|
|
{
|
|
|
|
attributes.wclass = GDK_INPUT_ONLY;
|
|
|
|
attributes_mask = GDK_WA_X | GDK_WA_Y;
|
|
|
|
|
1999-01-11 18:49:54 +00:00
|
|
|
widget->window = gtk_widget_get_parent_window (widget);
|
|
|
|
gdk_window_ref (widget->window);
|
1998-11-06 22:05:02 +00:00
|
|
|
|
1999-01-11 18:49:54 +00:00
|
|
|
toggle_button->event_window = gdk_window_new (gtk_widget_get_parent_window (widget),
|
|
|
|
&attributes, attributes_mask);
|
1998-11-06 22:05:02 +00:00
|
|
|
gdk_window_set_user_data (toggle_button->event_window, toggle_button);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
attributes.wclass = GDK_INPUT_OUTPUT;
|
|
|
|
attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP;
|
|
|
|
attributes.visual = gtk_widget_get_visual (widget);
|
|
|
|
attributes.colormap = gtk_widget_get_colormap (widget);
|
1999-01-11 18:49:54 +00:00
|
|
|
widget->window = gdk_window_new (gtk_widget_get_parent_window (widget),
|
|
|
|
&attributes, attributes_mask);
|
1998-11-06 22:05:02 +00:00
|
|
|
gdk_window_set_user_data (widget->window, toggle_button);
|
|
|
|
}
|
1998-12-07 06:37:27 +00:00
|
|
|
|
1998-11-06 22:05:02 +00:00
|
|
|
widget->style = gtk_style_attach (widget->style, widget->window);
|
1998-12-07 06:37:27 +00:00
|
|
|
|
1999-01-12 15:12:14 +00:00
|
|
|
if (!GTK_WIDGET_NO_WINDOW (widget))
|
1998-12-07 06:37:27 +00:00
|
|
|
gtk_style_set_background (widget->style, widget->window, GTK_STATE_NORMAL);
|
1998-11-06 22:05:02 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gtk_toggle_button_unrealize (GtkWidget *widget)
|
|
|
|
{
|
|
|
|
GtkToggleButton *toggle_button;
|
|
|
|
|
|
|
|
g_return_if_fail (widget != NULL);
|
|
|
|
g_return_if_fail (GTK_IS_TOGGLE_BUTTON (widget));
|
|
|
|
|
|
|
|
toggle_button = GTK_TOGGLE_BUTTON (widget);
|
|
|
|
|
1999-01-12 15:12:14 +00:00
|
|
|
if (GTK_WIDGET_NO_WINDOW (widget))
|
1998-11-06 22:05:02 +00:00
|
|
|
{
|
|
|
|
gdk_window_set_user_data (toggle_button->event_window, NULL);
|
|
|
|
gdk_window_destroy (toggle_button->event_window);
|
|
|
|
toggle_button->event_window = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (GTK_WIDGET_CLASS (parent_class)->unrealize)
|
|
|
|
(* GTK_WIDGET_CLASS (parent_class)->unrealize) (widget);
|
|
|
|
}
|
1998-11-13 16:07:04 +00:00
|
|
|
|
|
|
|
static void
|
|
|
|
gtk_toggle_button_map (GtkWidget *widget)
|
|
|
|
{
|
|
|
|
g_return_if_fail (widget != NULL);
|
|
|
|
g_return_if_fail (GTK_IS_TOGGLE_BUTTON (widget));
|
|
|
|
|
1999-01-12 15:12:14 +00:00
|
|
|
if (GTK_WIDGET_NO_WINDOW (widget))
|
1999-01-11 18:49:54 +00:00
|
|
|
gdk_window_show (GTK_TOGGLE_BUTTON (widget)->event_window);
|
1998-11-13 16:07:04 +00:00
|
|
|
|
|
|
|
GTK_WIDGET_CLASS (parent_class)->map (widget);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gtk_toggle_button_unmap (GtkWidget *widget)
|
|
|
|
{
|
|
|
|
g_return_if_fail (widget != NULL);
|
|
|
|
g_return_if_fail (GTK_IS_TOGGLE_BUTTON (widget));
|
|
|
|
|
1999-01-12 15:12:14 +00:00
|
|
|
if (GTK_WIDGET_NO_WINDOW (widget))
|
1999-01-11 18:49:54 +00:00
|
|
|
gdk_window_hide (GTK_TOGGLE_BUTTON (widget)->event_window);
|
1998-11-13 16:07:04 +00:00
|
|
|
|
|
|
|
GTK_WIDGET_CLASS (parent_class)->unmap (widget);
|
|
|
|
}
|