* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
*
* This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * modify it under the terms of the GNU Lesser General Public
* 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
- * Library General Public License for more details.
+ * Lesser General Public License for more details.
*
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
*/
+
+/*
+ * 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/.
+ */
+
+#include <config.h>
#include "gtkdrawingarea.h"
+#include "gtkintl.h"
+#include "gtkalias.h"
static void gtk_drawing_area_class_init (GtkDrawingAreaClass *klass);
static void gtk_drawing_area_realize (GtkWidget *widget);
static void gtk_drawing_area_size_allocate (GtkWidget *widget,
GtkAllocation *allocation);
+static void gtk_drawing_area_send_configure (GtkDrawingArea *darea);
-guint
-gtk_drawing_area_get_type ()
+GType
+gtk_drawing_area_get_type (void)
{
- static guint drawing_area_type = 0;
+ static GType drawing_area_type = 0;
if (!drawing_area_type)
{
- GtkTypeInfo drawing_area_info =
+ static const GTypeInfo drawing_area_info =
{
- "GtkDrawingArea",
- sizeof (GtkDrawingArea),
sizeof (GtkDrawingAreaClass),
- (GtkClassInitFunc) gtk_drawing_area_class_init,
- (GtkObjectInitFunc) gtk_drawing_area_init,
- (GtkArgSetFunc) NULL,
- (GtkArgGetFunc) NULL,
+ NULL, /* base_init */
+ NULL, /* base_finalize */
+ (GClassInitFunc) gtk_drawing_area_class_init,
+ NULL, /* class_finalize */
+ NULL, /* class_data */
+ sizeof (GtkDrawingArea),
+ 0, /* n_preallocs */
+ (GInstanceInitFunc) gtk_drawing_area_init,
};
- drawing_area_type = gtk_type_unique (gtk_widget_get_type (), &drawing_area_info);
+ drawing_area_type =
+ g_type_register_static (GTK_TYPE_WIDGET, I_("GtkDrawingArea"),
+ &drawing_area_info, 0);
}
return drawing_area_type;
static void
gtk_drawing_area_class_init (GtkDrawingAreaClass *class)
{
- GtkWidgetClass *widget_class;
-
- widget_class = (GtkWidgetClass*) class;
+ GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
widget_class->realize = gtk_drawing_area_realize;
widget_class->size_allocate = gtk_drawing_area_size_allocate;
static void
gtk_drawing_area_init (GtkDrawingArea *darea)
{
- GTK_WIDGET_SET_FLAGS (darea, GTK_BASIC);
+ darea->draw_data = NULL;
}
GtkWidget*
-gtk_drawing_area_new ()
+gtk_drawing_area_new (void)
{
- return GTK_WIDGET (gtk_type_new (gtk_drawing_area_get_type ()));
+ return g_object_new (GTK_TYPE_DRAWING_AREA, NULL);
}
void
gint width,
gint height)
{
- g_return_if_fail (darea != NULL);
g_return_if_fail (GTK_IS_DRAWING_AREA (darea));
GTK_WIDGET (darea)->requisition.width = width;
GTK_WIDGET (darea)->requisition.height = height;
+
+ gtk_widget_queue_resize (GTK_WIDGET (darea));
}
static void
GdkWindowAttr attributes;
gint attributes_mask;
- g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_DRAWING_AREA (widget));
darea = GTK_DRAWING_AREA (widget);
attributes.wclass = GDK_INPUT_OUTPUT;
attributes.visual = gtk_widget_get_visual (widget);
attributes.colormap = gtk_widget_get_colormap (widget);
- attributes.event_mask = gtk_widget_get_events (widget);
+ attributes.event_mask = gtk_widget_get_events (widget) | GDK_EXPOSURE_MASK;
attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP;
- widget->window = gdk_window_new (widget->parent->window, &attributes, attributes_mask);
+ widget->window = gdk_window_new (gtk_widget_get_parent_window (widget), &attributes, attributes_mask);
gdk_window_set_user_data (widget->window, darea);
widget->style = gtk_style_attach (widget->style, widget->window);
gtk_style_set_background (widget->style, widget->window, GTK_STATE_NORMAL);
+
+ gtk_drawing_area_send_configure (GTK_DRAWING_AREA (widget));
}
static void
gtk_drawing_area_size_allocate (GtkWidget *widget,
GtkAllocation *allocation)
{
- GdkEventConfigure event;
-
- g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_DRAWING_AREA (widget));
g_return_if_fail (allocation != NULL);
allocation->x, allocation->y,
allocation->width, allocation->height);
- event.type = GDK_CONFIGURE;
- event.window = widget->window;
- event.x = allocation->x;
- event.y = allocation->y;
- event.width = allocation->width;
- event.height = allocation->height;
-
- gtk_widget_event (widget, (GdkEvent*) &event);
+ gtk_drawing_area_send_configure (GTK_DRAWING_AREA (widget));
}
}
+
+static void
+gtk_drawing_area_send_configure (GtkDrawingArea *darea)
+{
+ GtkWidget *widget;
+ GdkEvent *event = gdk_event_new (GDK_CONFIGURE);
+
+ widget = GTK_WIDGET (darea);
+
+ event->configure.window = g_object_ref (widget->window);
+ event->configure.send_event = TRUE;
+ event->configure.x = widget->allocation.x;
+ event->configure.y = widget->allocation.y;
+ event->configure.width = widget->allocation.width;
+ event->configure.height = widget->allocation.height;
+
+ gtk_widget_event (widget, event);
+ gdk_event_free (event);
+}
+
+#define __GTK_DRAWING_AREA_C__
+#include "gtkaliasdef.c"
projects / ~andy / gtk / blobdiff