AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

More work on GTK 2.0 drawing.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14858 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling 2002-03-29 13:05:21 +00:00
parent e2386592d3
commit 67d7821742
4 changed files with 242 additions and 260 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

226
src/gtk/win_gtk.c
View File

@ -23,6 +23,8 @@
extern "C" { extern "C" {
#endif /* __cplusplus */ #endif /* __cplusplus */
#ifndef __WXGTK20__
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <X11/Xutil.h> #include <X11/Xutil.h>
#include <X11/Xatom.h> #include <X11/Xatom.h>
@ -30,6 +32,8 @@ extern "C" {
#define IS_ONSCREEN(x,y) ((x >= G_MINSHORT) && (x <= G_MAXSHORT) && \ #define IS_ONSCREEN(x,y) ((x >= G_MINSHORT) && (x <= G_MAXSHORT) && \
(y >= G_MINSHORT) && (y <= G_MAXSHORT)) (y >= G_MINSHORT) && (y <= G_MAXSHORT))
#endif
typedef struct _GtkPizzaAdjData GtkPizzaAdjData; typedef struct _GtkPizzaAdjData GtkPizzaAdjData;
struct _GtkPizzaAdjData struct _GtkPizzaAdjData
@ -64,11 +68,12 @@ static void gtk_pizza_forall (GtkContainer *container,
gboolean include_internals, gboolean include_internals,
GtkCallback callback, GtkCallback callback,
gpointer callback_data); gpointer callback_data);
static void gtk_pizza_allocate_child (GtkPizza *pizza,
GtkPizzaChild *child);
static void gtk_pizza_position_child (GtkPizza *pizza, static void gtk_pizza_position_child (GtkPizza *pizza,
GtkPizzaChild *child); GtkPizzaChild *child);
static void gtk_pizza_allocate_child (GtkPizza *pizza, #ifndef __WXGTK20__
GtkPizzaChild *child);
static void gtk_pizza_position_children (GtkPizza *pizza); static void gtk_pizza_position_children (GtkPizza *pizza);
static void gtk_pizza_adjust_allocations_recurse (GtkWidget *widget, static void gtk_pizza_adjust_allocations_recurse (GtkWidget *widget,
@ -76,26 +81,13 @@ static void gtk_pizza_adjust_allocations_recurse (GtkWidget *widget,
static void gtk_pizza_adjust_allocations (GtkPizza *pizza, static void gtk_pizza_adjust_allocations (GtkPizza *pizza,
gint dx, gint dx,
gint dy); gint dy);
/* unused */
#if 0
static void gtk_pizza_expose_area (GtkPizza *pizza,
gint x,
gint y,
gint width,
gint height);
static void gtk_pizza_adjustment_changed (GtkAdjustment *adjustment,
GtkPizza *pizza);
#endif
static GdkFilterReturn gtk_pizza_filter (GdkXEvent *gdk_xevent, static GdkFilterReturn gtk_pizza_filter (GdkXEvent *gdk_xevent,
GdkEvent *event, GdkEvent *event,
gpointer data); gpointer data);
static GdkFilterReturn gtk_pizza_main_filter (GdkXEvent *gdk_xevent, static GdkFilterReturn gtk_pizza_main_filter (GdkXEvent *gdk_xevent,
GdkEvent *event, GdkEvent *event,
gpointer data); gpointer data);
#endif /* __WXGTK20__ */
static GtkType gtk_pizza_child_type (GtkContainer *container); static GtkType gtk_pizza_child_type (GtkContainer *container);
@ -104,7 +96,12 @@ static void gtk_pizza_scroll_set_adjustments (GtkPizza *pizza,
GtkAdjustment *vadj); GtkAdjustment *vadj);
static GtkContainerClass *parent_class = NULL; #ifdef __WXGTK20__
GtkContainerClass *pizza_parent_class = NULL;
#else
static GtkContainerClass *pizza_parent_class = NULL;
#endif
static gboolean gravity_works; static gboolean gravity_works;
guint guint
@ -114,18 +111,35 @@ gtk_pizza_get_type ()
if (!pizza_type) if (!pizza_type)
{ {
#ifdef __WXGTK20__
static const GTypeInfo pizza_info =
{
sizeof (GtkPizzaClass),
NULL, /* base_init */
NULL, /* base_finalize */
(GClassInitFunc) gtk_pizza_class_init,
NULL, /* class_finalize */
NULL, /* class_data */
sizeof (GtkPizza),
16, /* n_preallocs */
(GInstanceInitFunc) gtk_pizza_init,
};
pizza_type = g_type_register_static (GTK_TYPE_CONTAINER, "GtkPizza", &pizza_info, 0);
#else
GtkTypeInfo pizza_info = GtkTypeInfo pizza_info =
{ {
"GtkPizza", "GtkPizza",
sizeof (GtkPizza), sizeof (GtkPizza),
sizeof (GtkPizzaClass), sizeof (GtkPizzaClass),
(GtkClassInitFunc) gtk_pizza_class_init, (GtkClassInitFunc) gtk_pizza_class_init,
(GtkObjectInitFunc) gtk_pizza_init, (GtkObjectInitFunc) gtk_pizza_init,
/* reserved_1 */ NULL, /* reserved_1 */ NULL,
/* reserved_2 */ NULL, /* reserved_2 */ NULL,
(GtkClassInitFunc) NULL, (GtkClassInitFunc) NULL,
}; };
pizza_type = gtk_type_unique (gtk_container_get_type (), &pizza_info); pizza_type = gtk_type_unique (gtk_container_get_type (), &pizza_info);
#endif
} }
return pizza_type; return pizza_type;
@ -141,7 +155,7 @@ gtk_pizza_class_init (GtkPizzaClass *klass)
object_class = (GtkObjectClass*) klass; object_class = (GtkObjectClass*) klass;
widget_class = (GtkWidgetClass*) klass; widget_class = (GtkWidgetClass*) klass;
container_class = (GtkContainerClass*) klass; container_class = (GtkContainerClass*) klass;
parent_class = gtk_type_class (GTK_TYPE_CONTAINER); pizza_parent_class = gtk_type_class (GTK_TYPE_CONTAINER);
widget_class->map = gtk_pizza_map; widget_class->map = gtk_pizza_map;
widget_class->realize = gtk_pizza_realize; widget_class->realize = gtk_pizza_realize;
@ -308,22 +322,7 @@ gtk_pizza_put (GtkPizza *pizza,
GTK_PRIVATE_SET_FLAG (widget, GTK_IS_OFFSCREEN); GTK_PRIVATE_SET_FLAG (widget, GTK_IS_OFFSCREEN);
#endif #endif
/*
if (GTK_WIDGET_REALIZED (pizza))
gtk_widget_realize (widget);
*/
gtk_widget_set_usize (widget, width, height); gtk_widget_set_usize (widget, width, height);
/*
if (GTK_WIDGET_VISIBLE (pizza) && GTK_WIDGET_VISIBLE (widget))
{
if (GTK_WIDGET_MAPPED (pizza))
gtk_widget_map (widget);
gtk_widget_queue_resize (widget);
}
*/
} }
void void
@ -514,7 +513,6 @@ gtk_pizza_realize (GtkWidget *widget)
g_return_if_fail (GTK_IS_PIZZA (widget)); g_return_if_fail (GTK_IS_PIZZA (widget));
pizza = GTK_PIZZA (widget); pizza = GTK_PIZZA (widget);
GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED); GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
attributes.window_type = GDK_WINDOW_CHILD; attributes.window_type = GDK_WINDOW_CHILD;
@ -567,6 +565,9 @@ gtk_pizza_realize (GtkWidget *widget)
attributes.event_mask = gtk_widget_get_events (widget); attributes.event_mask = gtk_widget_get_events (widget);
attributes.event_mask |= GDK_EXPOSURE_MASK | attributes.event_mask |= GDK_EXPOSURE_MASK |
#ifdef __WXGTK20__
GDK_SCROLL_MASK |
#endif
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_POINTER_MOTION_HINT_MASK |
GDK_BUTTON_MOTION_MASK | GDK_BUTTON_MOTION_MASK |
@ -594,9 +595,11 @@ gtk_pizza_realize (GtkWidget *widget)
gdk_window_set_back_pixmap( pizza->bin_window, NULL, FALSE ); gdk_window_set_back_pixmap( pizza->bin_window, NULL, FALSE );
*/ */
#ifndef __WXGTK20__
/* add filters for intercepting visibility and expose events */ /* add filters for intercepting visibility and expose events */
gdk_window_add_filter (widget->window, gtk_pizza_main_filter, pizza); gdk_window_add_filter (widget->window, gtk_pizza_main_filter, pizza);
gdk_window_add_filter (pizza->bin_window, gtk_pizza_filter, pizza); gdk_window_add_filter (pizza->bin_window, gtk_pizza_filter, pizza);
#endif
/* we NEED gravity or we'll give up */ /* we NEED gravity or we'll give up */
gravity_works = gdk_window_set_static_gravities (pizza->bin_window, TRUE); gravity_works = gdk_window_set_static_gravities (pizza->bin_window, TRUE);
@ -626,8 +629,8 @@ gtk_pizza_unrealize (GtkWidget *widget)
gdk_window_destroy (pizza->bin_window); gdk_window_destroy (pizza->bin_window);
pizza->bin_window = NULL; pizza->bin_window = NULL;
if (GTK_WIDGET_CLASS (parent_class)->unrealize) if (GTK_WIDGET_CLASS (pizza_parent_class)->unrealize)
(* GTK_WIDGET_CLASS (parent_class)->unrealize) (widget); (* GTK_WIDGET_CLASS (pizza_parent_class)->unrealize) (widget);
} }
static void static void
@ -766,18 +769,20 @@ gtk_pizza_expose (GtkWidget *widget,
pizza = GTK_PIZZA (widget); pizza = GTK_PIZZA (widget);
#ifdef __WXGTK20__ if (event->window != pizza->bin_window)
return FALSE;
(* GTK_WIDGET_CLASS (parent_class)->expose_event) (widget, event); /* We handle all expose events in window.cpp now. */
#else
/* Sometimes, We handle all expose events in window.cpp now. */
if (pizza->external_expose) if (pizza->external_expose)
return FALSE; return FALSE;
if (event->window != pizza->bin_window) #ifdef __WXGTK20__
return FALSE;
(* GTK_WIDGET_CLASS (pizza_parent_class)->expose_event) (widget, event);
return FALSE;
#else
children = pizza->children; children = pizza->children;
while (children) while (children)
@ -794,9 +799,10 @@ gtk_pizza_expose (GtkWidget *widget,
gtk_widget_event (child->widget, (GdkEvent*) &child_event); gtk_widget_event (child->widget, (GdkEvent*) &child_event);
} }
} }
#endif
return TRUE; return TRUE;
#endif
} }
static void static void
@ -880,46 +886,6 @@ gtk_pizza_forall (GtkContainer *container,
} }
} }
/* Operations on children
*/
static void
gtk_pizza_position_child (GtkPizza *pizza,
GtkPizzaChild *child)
{
gint x;
gint y;
x = child->x - pizza->xoffset;
y = child->y - pizza->yoffset;
if (IS_ONSCREEN (x,y))
{
if (GTK_WIDGET_MAPPED (pizza) &&
GTK_WIDGET_VISIBLE (child->widget))
{
if (!GTK_WIDGET_MAPPED (child->widget))
gtk_widget_map (child->widget);
}
#ifndef __WXGTK20__
if (GTK_WIDGET_IS_OFFSCREEN (child->widget))
GTK_PRIVATE_UNSET_FLAG (child->widget, GTK_IS_OFFSCREEN);
#endif
}
else
{
#ifndef __WXGTK20__
if (!GTK_WIDGET_IS_OFFSCREEN (child->widget))
GTK_PRIVATE_SET_FLAG (child->widget, GTK_IS_OFFSCREEN);
#endif
if (GTK_WIDGET_MAPPED (child->widget))
gtk_widget_unmap (child->widget);
}
}
static void static void
gtk_pizza_allocate_child (GtkPizza *pizza, gtk_pizza_allocate_child (GtkPizza *pizza,
GtkPizzaChild *child) GtkPizzaChild *child)
@ -936,6 +902,42 @@ gtk_pizza_allocate_child (GtkPizza *pizza,
gtk_widget_size_allocate (child->widget, &allocation); gtk_widget_size_allocate (child->widget, &allocation);
} }
static void
gtk_pizza_position_child (GtkPizza *pizza,
GtkPizzaChild *child)
{
gint x;
gint y;
x = child->x - pizza->xoffset;
y = child->y - pizza->yoffset;
#ifndef __WXGTK20__
if (IS_ONSCREEN (x,y))
{
if (GTK_WIDGET_MAPPED (pizza) &&
GTK_WIDGET_VISIBLE (child->widget))
{
if (!GTK_WIDGET_MAPPED (child->widget))
gtk_widget_map (child->widget);
}
if (GTK_WIDGET_IS_OFFSCREEN (child->widget))
GTK_PRIVATE_UNSET_FLAG (child->widget, GTK_IS_OFFSCREEN);
}
else
{
if (!GTK_WIDGET_IS_OFFSCREEN (child->widget))
GTK_PRIVATE_SET_FLAG (child->widget, GTK_IS_OFFSCREEN);
if (GTK_WIDGET_MAPPED (child->widget))
gtk_widget_unmap (child->widget);
}
#endif
}
#ifndef __WXGTK20__
static void static void
gtk_pizza_position_children (GtkPizza *pizza) gtk_pizza_position_children (GtkPizza *pizza)
{ {
@ -998,39 +1000,7 @@ gtk_pizza_adjust_allocations (GtkPizza *pizza,
} }
} }
/* Callbacks */ /* This function is used to find events to process while scrolling */
/* unused */
#if 0
/* Send a synthetic expose event to the widget
*/
static void
gtk_pizza_expose_area (GtkPizza *pizza,
gint x, gint y, gint width, gint height)
{
if (pizza->visibility == GDK_VISIBILITY_UNOBSCURED)
{
GdkEventExpose event;
event.type = GDK_EXPOSE;
event.send_event = TRUE;
event.window = pizza->bin_window;
event.count = 0;
event.area.x = x;
event.area.y = y;
event.area.width = width;
event.area.height = height;
gdk_window_ref (event.window);
gtk_widget_event (GTK_WIDGET (pizza), (GdkEvent *)&event);
gdk_window_unref (event.window);
}
}
#endif /* unused */
/* This function is used to find events to process while scrolling
*/
static Bool static Bool
gtk_pizza_expose_predicate (Display *display, gtk_pizza_expose_predicate (Display *display,
@ -1281,6 +1251,8 @@ gtk_pizza_main_filter (GdkXEvent *gdk_xevent,
return GDK_FILTER_CONTINUE; return GDK_FILTER_CONTINUE;
} }
#endif /* __WXGTK20__ */
#ifdef __cplusplus #ifdef __cplusplus
} }

25
src/gtk/window.cpp
View File

@ -385,7 +385,6 @@ static wxWindowGTK* wxGetTopLevelParent(wxWindowGTK *win)
return p; return p;
} }
static void draw_frame( GtkWidget *widget, wxWindowGTK *win ) static void draw_frame( GtkWidget *widget, wxWindowGTK *win )
{ {
// wxUniversal widgets draw the borders and scrollbars themselves // wxUniversal widgets draw the borders and scrollbars themselves
@ -488,11 +487,15 @@ gint gtk_window_own_expose_callback( GtkWidget *widget, GdkEventExpose *gdk_even
// "draw" of m_widget // "draw" of m_widget
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#ifndef __WXGTK20__
static void gtk_window_own_draw_callback( GtkWidget *widget, GdkRectangle *WXUNUSED(rect), wxWindowGTK *win ) static void gtk_window_own_draw_callback( GtkWidget *widget, GdkRectangle *WXUNUSED(rect), wxWindowGTK *win )
{ {
draw_frame( widget, win ); draw_frame( widget, win );
} }
#endif
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// key code mapping routines // key code mapping routines
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@ -766,6 +769,10 @@ static void gtk_window_size_request_callback( GtkWidget *widget, GtkRequisition
// "expose_event" of m_wxwindow // "expose_event" of m_wxwindow
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#ifdef __WXGTK20__
extern GtkContainerClass *pizza_parent_class;
#endif
static int gtk_window_expose_callback( GtkWidget *widget, static int gtk_window_expose_callback( GtkWidget *widget,
GdkEventExpose *gdk_event, GdkEventExpose *gdk_event,
wxWindow *win ) wxWindow *win )
@ -817,6 +824,12 @@ static int gtk_window_expose_callback( GtkWidget *widget,
// Actual redrawing takes place in idle time. // Actual redrawing takes place in idle time.
win->Update(); win->Update();
#ifdef __WXGTK20__
(* GTK_WIDGET_CLASS (pizza_parent_class)->expose_event) (widget, gdk_event);
#endif
return TRUE; return TRUE;
} }
@ -848,8 +861,10 @@ gint gtk_window_event_event_callback( GtkWidget *widget,
// "draw" of m_wxwindow // "draw" of m_wxwindow
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#ifndef __WXGTK20__
// This callback is a complete replacement of the gtk_pizza_draw() function, // This callback is a complete replacement of the gtk_pizza_draw() function,
// which disabled. // which is disabled.
static void gtk_window_draw_callback( GtkWidget *widget, static void gtk_window_draw_callback( GtkWidget *widget,
GdkRectangle *rect, GdkRectangle *rect,
@ -934,6 +949,8 @@ static void gtk_window_draw_callback( GtkWidget *widget,
#endif #endif
} }
#endif
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// "key_press_event" from any window // "key_press_event" from any window
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@ -2536,7 +2553,7 @@ void wxWindowGTK::PostCreation()
#endif #endif
} }
// these are called when the "sunken" or "raised" borders are drawn */ // these are called when the "sunken" or "raised" borders are drawn
gtk_signal_connect( GTK_OBJECT(m_widget), "expose_event", gtk_signal_connect( GTK_OBJECT(m_widget), "expose_event",
GTK_SIGNAL_FUNC(gtk_window_own_expose_callback), (gpointer)this ); GTK_SIGNAL_FUNC(gtk_window_own_expose_callback), (gpointer)this );
@ -2704,12 +2721,14 @@ void wxWindowGTK::DoSetSize( int x, int y, int width, int height, int sizeFlags
int border = 0; int border = 0;
int bottom_border = 0; int bottom_border = 0;
#ifndef __WXGTK__
if (GTK_WIDGET_CAN_DEFAULT(m_widget)) if (GTK_WIDGET_CAN_DEFAULT(m_widget))
{ {
/* the default button has a border around it */ /* the default button has a border around it */
border = 6; border = 6;
bottom_border = 5; bottom_border = 5;
} }
#endif
DoMoveWindow( m_x-border, DoMoveWindow( m_x-border,
m_y-border, m_y-border,

226
src/gtk1/win_gtk.c
View File

@ -23,6 +23,8 @@
extern "C" { extern "C" {
#endif /* __cplusplus */ #endif /* __cplusplus */
#ifndef __WXGTK20__
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <X11/Xutil.h> #include <X11/Xutil.h>
#include <X11/Xatom.h> #include <X11/Xatom.h>
@ -30,6 +32,8 @@ extern "C" {
#define IS_ONSCREEN(x,y) ((x >= G_MINSHORT) && (x <= G_MAXSHORT) && \ #define IS_ONSCREEN(x,y) ((x >= G_MINSHORT) && (x <= G_MAXSHORT) && \
(y >= G_MINSHORT) && (y <= G_MAXSHORT)) (y >= G_MINSHORT) && (y <= G_MAXSHORT))
#endif
typedef struct _GtkPizzaAdjData GtkPizzaAdjData; typedef struct _GtkPizzaAdjData GtkPizzaAdjData;
struct _GtkPizzaAdjData struct _GtkPizzaAdjData
@ -64,11 +68,12 @@ static void gtk_pizza_forall (GtkContainer *container,
gboolean include_internals, gboolean include_internals,
GtkCallback callback, GtkCallback callback,
gpointer callback_data); gpointer callback_data);
static void gtk_pizza_allocate_child (GtkPizza *pizza,
GtkPizzaChild *child);
static void gtk_pizza_position_child (GtkPizza *pizza, static void gtk_pizza_position_child (GtkPizza *pizza,
GtkPizzaChild *child); GtkPizzaChild *child);
static void gtk_pizza_allocate_child (GtkPizza *pizza, #ifndef __WXGTK20__
GtkPizzaChild *child);
static void gtk_pizza_position_children (GtkPizza *pizza); static void gtk_pizza_position_children (GtkPizza *pizza);
static void gtk_pizza_adjust_allocations_recurse (GtkWidget *widget, static void gtk_pizza_adjust_allocations_recurse (GtkWidget *widget,
@ -76,26 +81,13 @@ static void gtk_pizza_adjust_allocations_recurse (GtkWidget *widget,
static void gtk_pizza_adjust_allocations (GtkPizza *pizza, static void gtk_pizza_adjust_allocations (GtkPizza *pizza,
gint dx, gint dx,
gint dy); gint dy);
/* unused */
#if 0
static void gtk_pizza_expose_area (GtkPizza *pizza,
gint x,
gint y,
gint width,
gint height);
static void gtk_pizza_adjustment_changed (GtkAdjustment *adjustment,
GtkPizza *pizza);
#endif
static GdkFilterReturn gtk_pizza_filter (GdkXEvent *gdk_xevent, static GdkFilterReturn gtk_pizza_filter (GdkXEvent *gdk_xevent,
GdkEvent *event, GdkEvent *event,
gpointer data); gpointer data);
static GdkFilterReturn gtk_pizza_main_filter (GdkXEvent *gdk_xevent, static GdkFilterReturn gtk_pizza_main_filter (GdkXEvent *gdk_xevent,
GdkEvent *event, GdkEvent *event,
gpointer data); gpointer data);
#endif /* __WXGTK20__ */
static GtkType gtk_pizza_child_type (GtkContainer *container); static GtkType gtk_pizza_child_type (GtkContainer *container);
@ -104,7 +96,12 @@ static void gtk_pizza_scroll_set_adjustments (GtkPizza *pizza,
GtkAdjustment *vadj); GtkAdjustment *vadj);
static GtkContainerClass *parent_class = NULL; #ifdef __WXGTK20__
GtkContainerClass *pizza_parent_class = NULL;
#else
static GtkContainerClass *pizza_parent_class = NULL;
#endif
static gboolean gravity_works; static gboolean gravity_works;
guint guint
@ -114,18 +111,35 @@ gtk_pizza_get_type ()
if (!pizza_type) if (!pizza_type)
{ {
#ifdef __WXGTK20__
static const GTypeInfo pizza_info =
{
sizeof (GtkPizzaClass),
NULL, /* base_init */
NULL, /* base_finalize */
(GClassInitFunc) gtk_pizza_class_init,
NULL, /* class_finalize */
NULL, /* class_data */
sizeof (GtkPizza),
16, /* n_preallocs */
(GInstanceInitFunc) gtk_pizza_init,
};
pizza_type = g_type_register_static (GTK_TYPE_CONTAINER, "GtkPizza", &pizza_info, 0);
#else
GtkTypeInfo pizza_info = GtkTypeInfo pizza_info =
{ {
"GtkPizza", "GtkPizza",
sizeof (GtkPizza), sizeof (GtkPizza),
sizeof (GtkPizzaClass), sizeof (GtkPizzaClass),
(GtkClassInitFunc) gtk_pizza_class_init, (GtkClassInitFunc) gtk_pizza_class_init,
(GtkObjectInitFunc) gtk_pizza_init, (GtkObjectInitFunc) gtk_pizza_init,
/* reserved_1 */ NULL, /* reserved_1 */ NULL,
/* reserved_2 */ NULL, /* reserved_2 */ NULL,
(GtkClassInitFunc) NULL, (GtkClassInitFunc) NULL,
}; };
pizza_type = gtk_type_unique (gtk_container_get_type (), &pizza_info); pizza_type = gtk_type_unique (gtk_container_get_type (), &pizza_info);
#endif
} }
return pizza_type; return pizza_type;
@ -141,7 +155,7 @@ gtk_pizza_class_init (GtkPizzaClass *klass)
object_class = (GtkObjectClass*) klass; object_class = (GtkObjectClass*) klass;
widget_class = (GtkWidgetClass*) klass; widget_class = (GtkWidgetClass*) klass;
container_class = (GtkContainerClass*) klass; container_class = (GtkContainerClass*) klass;
parent_class = gtk_type_class (GTK_TYPE_CONTAINER); pizza_parent_class = gtk_type_class (GTK_TYPE_CONTAINER);
widget_class->map = gtk_pizza_map; widget_class->map = gtk_pizza_map;
widget_class->realize = gtk_pizza_realize; widget_class->realize = gtk_pizza_realize;
@ -308,22 +322,7 @@ gtk_pizza_put (GtkPizza *pizza,
GTK_PRIVATE_SET_FLAG (widget, GTK_IS_OFFSCREEN); GTK_PRIVATE_SET_FLAG (widget, GTK_IS_OFFSCREEN);
#endif #endif
/*
if (GTK_WIDGET_REALIZED (pizza))
gtk_widget_realize (widget);
*/
gtk_widget_set_usize (widget, width, height); gtk_widget_set_usize (widget, width, height);
/*
if (GTK_WIDGET_VISIBLE (pizza) && GTK_WIDGET_VISIBLE (widget))
{
if (GTK_WIDGET_MAPPED (pizza))
gtk_widget_map (widget);
gtk_widget_queue_resize (widget);
}
*/
} }
void void
@ -514,7 +513,6 @@ gtk_pizza_realize (GtkWidget *widget)
g_return_if_fail (GTK_IS_PIZZA (widget)); g_return_if_fail (GTK_IS_PIZZA (widget));
pizza = GTK_PIZZA (widget); pizza = GTK_PIZZA (widget);
GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED); GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
attributes.window_type = GDK_WINDOW_CHILD; attributes.window_type = GDK_WINDOW_CHILD;
@ -567,6 +565,9 @@ gtk_pizza_realize (GtkWidget *widget)
attributes.event_mask = gtk_widget_get_events (widget); attributes.event_mask = gtk_widget_get_events (widget);
attributes.event_mask |= GDK_EXPOSURE_MASK | attributes.event_mask |= GDK_EXPOSURE_MASK |
#ifdef __WXGTK20__
GDK_SCROLL_MASK |
#endif
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_POINTER_MOTION_HINT_MASK |
GDK_BUTTON_MOTION_MASK | GDK_BUTTON_MOTION_MASK |
@ -594,9 +595,11 @@ gtk_pizza_realize (GtkWidget *widget)
gdk_window_set_back_pixmap( pizza->bin_window, NULL, FALSE ); gdk_window_set_back_pixmap( pizza->bin_window, NULL, FALSE );
*/ */
#ifndef __WXGTK20__
/* add filters for intercepting visibility and expose events */ /* add filters for intercepting visibility and expose events */
gdk_window_add_filter (widget->window, gtk_pizza_main_filter, pizza); gdk_window_add_filter (widget->window, gtk_pizza_main_filter, pizza);
gdk_window_add_filter (pizza->bin_window, gtk_pizza_filter, pizza); gdk_window_add_filter (pizza->bin_window, gtk_pizza_filter, pizza);
#endif
/* we NEED gravity or we'll give up */ /* we NEED gravity or we'll give up */
gravity_works = gdk_window_set_static_gravities (pizza->bin_window, TRUE); gravity_works = gdk_window_set_static_gravities (pizza->bin_window, TRUE);
@ -626,8 +629,8 @@ gtk_pizza_unrealize (GtkWidget *widget)
gdk_window_destroy (pizza->bin_window); gdk_window_destroy (pizza->bin_window);
pizza->bin_window = NULL; pizza->bin_window = NULL;
if (GTK_WIDGET_CLASS (parent_class)->unrealize) if (GTK_WIDGET_CLASS (pizza_parent_class)->unrealize)
(* GTK_WIDGET_CLASS (parent_class)->unrealize) (widget); (* GTK_WIDGET_CLASS (pizza_parent_class)->unrealize) (widget);
} }
static void static void
@ -766,18 +769,20 @@ gtk_pizza_expose (GtkWidget *widget,
pizza = GTK_PIZZA (widget); pizza = GTK_PIZZA (widget);
#ifdef __WXGTK20__ if (event->window != pizza->bin_window)
return FALSE;
(* GTK_WIDGET_CLASS (parent_class)->expose_event) (widget, event); /* We handle all expose events in window.cpp now. */
#else
/* Sometimes, We handle all expose events in window.cpp now. */
if (pizza->external_expose) if (pizza->external_expose)
return FALSE; return FALSE;
if (event->window != pizza->bin_window) #ifdef __WXGTK20__
return FALSE;
(* GTK_WIDGET_CLASS (pizza_parent_class)->expose_event) (widget, event);
return FALSE;
#else
children = pizza->children; children = pizza->children;
while (children) while (children)
@ -794,9 +799,10 @@ gtk_pizza_expose (GtkWidget *widget,
gtk_widget_event (child->widget, (GdkEvent*) &child_event); gtk_widget_event (child->widget, (GdkEvent*) &child_event);
} }
} }
#endif
return TRUE; return TRUE;
#endif
} }
static void static void
@ -880,46 +886,6 @@ gtk_pizza_forall (GtkContainer *container,
} }
} }
/* Operations on children
*/
static void
gtk_pizza_position_child (GtkPizza *pizza,
GtkPizzaChild *child)
{
gint x;
gint y;
x = child->x - pizza->xoffset;
y = child->y - pizza->yoffset;
if (IS_ONSCREEN (x,y))
{
if (GTK_WIDGET_MAPPED (pizza) &&
GTK_WIDGET_VISIBLE (child->widget))
{
if (!GTK_WIDGET_MAPPED (child->widget))
gtk_widget_map (child->widget);
}
#ifndef __WXGTK20__
if (GTK_WIDGET_IS_OFFSCREEN (child->widget))
GTK_PRIVATE_UNSET_FLAG (child->widget, GTK_IS_OFFSCREEN);
#endif
}
else
{
#ifndef __WXGTK20__
if (!GTK_WIDGET_IS_OFFSCREEN (child->widget))
GTK_PRIVATE_SET_FLAG (child->widget, GTK_IS_OFFSCREEN);
#endif
if (GTK_WIDGET_MAPPED (child->widget))
gtk_widget_unmap (child->widget);
}
}
static void static void
gtk_pizza_allocate_child (GtkPizza *pizza, gtk_pizza_allocate_child (GtkPizza *pizza,
GtkPizzaChild *child) GtkPizzaChild *child)
@ -936,6 +902,42 @@ gtk_pizza_allocate_child (GtkPizza *pizza,
gtk_widget_size_allocate (child->widget, &allocation); gtk_widget_size_allocate (child->widget, &allocation);
} }
static void
gtk_pizza_position_child (GtkPizza *pizza,
GtkPizzaChild *child)
{
gint x;
gint y;
x = child->x - pizza->xoffset;
y = child->y - pizza->yoffset;
#ifndef __WXGTK20__
if (IS_ONSCREEN (x,y))
{
if (GTK_WIDGET_MAPPED (pizza) &&
GTK_WIDGET_VISIBLE (child->widget))
{
if (!GTK_WIDGET_MAPPED (child->widget))
gtk_widget_map (child->widget);
}
if (GTK_WIDGET_IS_OFFSCREEN (child->widget))
GTK_PRIVATE_UNSET_FLAG (child->widget, GTK_IS_OFFSCREEN);
}
else
{
if (!GTK_WIDGET_IS_OFFSCREEN (child->widget))
GTK_PRIVATE_SET_FLAG (child->widget, GTK_IS_OFFSCREEN);
if (GTK_WIDGET_MAPPED (child->widget))
gtk_widget_unmap (child->widget);
}
#endif
}
#ifndef __WXGTK20__
static void static void
gtk_pizza_position_children (GtkPizza *pizza) gtk_pizza_position_children (GtkPizza *pizza)
{ {
@ -998,39 +1000,7 @@ gtk_pizza_adjust_allocations (GtkPizza *pizza,
} }
} }
/* Callbacks */ /* This function is used to find events to process while scrolling */
/* unused */
#if 0
/* Send a synthetic expose event to the widget
*/
static void
gtk_pizza_expose_area (GtkPizza *pizza,
gint x, gint y, gint width, gint height)
{
if (pizza->visibility == GDK_VISIBILITY_UNOBSCURED)
{
GdkEventExpose event;
event.type = GDK_EXPOSE;
event.send_event = TRUE;
event.window = pizza->bin_window;
event.count = 0;
event.area.x = x;
event.area.y = y;
event.area.width = width;
event.area.height = height;
gdk_window_ref (event.window);
gtk_widget_event (GTK_WIDGET (pizza), (GdkEvent *)&event);
gdk_window_unref (event.window);
}
}
#endif /* unused */
/* This function is used to find events to process while scrolling
*/
static Bool static Bool
gtk_pizza_expose_predicate (Display *display, gtk_pizza_expose_predicate (Display *display,
@ -1281,6 +1251,8 @@ gtk_pizza_main_filter (GdkXEvent *gdk_xevent,
return GDK_FILTER_CONTINUE; return GDK_FILTER_CONTINUE;
} }
#endif /* __WXGTK20__ */
#ifdef __cplusplus #ifdef __cplusplus
} }

25
src/gtk1/window.cpp
View File

@ -385,7 +385,6 @@ static wxWindowGTK* wxGetTopLevelParent(wxWindowGTK *win)
return p; return p;
} }
static void draw_frame( GtkWidget *widget, wxWindowGTK *win ) static void draw_frame( GtkWidget *widget, wxWindowGTK *win )
{ {
// wxUniversal widgets draw the borders and scrollbars themselves // wxUniversal widgets draw the borders and scrollbars themselves
@ -488,11 +487,15 @@ gint gtk_window_own_expose_callback( GtkWidget *widget, GdkEventExpose *gdk_even
// "draw" of m_widget // "draw" of m_widget
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#ifndef __WXGTK20__
static void gtk_window_own_draw_callback( GtkWidget *widget, GdkRectangle *WXUNUSED(rect), wxWindowGTK *win ) static void gtk_window_own_draw_callback( GtkWidget *widget, GdkRectangle *WXUNUSED(rect), wxWindowGTK *win )
{ {
draw_frame( widget, win ); draw_frame( widget, win );
} }
#endif
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// key code mapping routines // key code mapping routines
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@ -766,6 +769,10 @@ static void gtk_window_size_request_callback( GtkWidget *widget, GtkRequisition
// "expose_event" of m_wxwindow // "expose_event" of m_wxwindow
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#ifdef __WXGTK20__
extern GtkContainerClass *pizza_parent_class;
#endif
static int gtk_window_expose_callback( GtkWidget *widget, static int gtk_window_expose_callback( GtkWidget *widget,
GdkEventExpose *gdk_event, GdkEventExpose *gdk_event,
wxWindow *win ) wxWindow *win )
@ -817,6 +824,12 @@ static int gtk_window_expose_callback( GtkWidget *widget,
// Actual redrawing takes place in idle time. // Actual redrawing takes place in idle time.
win->Update(); win->Update();
#ifdef __WXGTK20__
(* GTK_WIDGET_CLASS (pizza_parent_class)->expose_event) (widget, gdk_event);
#endif
return TRUE; return TRUE;
} }
@ -848,8 +861,10 @@ gint gtk_window_event_event_callback( GtkWidget *widget,
// "draw" of m_wxwindow // "draw" of m_wxwindow
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#ifndef __WXGTK20__
// This callback is a complete replacement of the gtk_pizza_draw() function, // This callback is a complete replacement of the gtk_pizza_draw() function,
// which disabled. // which is disabled.
static void gtk_window_draw_callback( GtkWidget *widget, static void gtk_window_draw_callback( GtkWidget *widget,
GdkRectangle *rect, GdkRectangle *rect,
@ -934,6 +949,8 @@ static void gtk_window_draw_callback( GtkWidget *widget,
#endif #endif
} }
#endif
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// "key_press_event" from any window // "key_press_event" from any window
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@ -2536,7 +2553,7 @@ void wxWindowGTK::PostCreation()
#endif #endif
} }
// these are called when the "sunken" or "raised" borders are drawn */ // these are called when the "sunken" or "raised" borders are drawn
gtk_signal_connect( GTK_OBJECT(m_widget), "expose_event", gtk_signal_connect( GTK_OBJECT(m_widget), "expose_event",
GTK_SIGNAL_FUNC(gtk_window_own_expose_callback), (gpointer)this ); GTK_SIGNAL_FUNC(gtk_window_own_expose_callback), (gpointer)this );
@ -2704,12 +2721,14 @@ void wxWindowGTK::DoSetSize( int x, int y, int width, int height, int sizeFlags
int border = 0; int border = 0;
int bottom_border = 0; int bottom_border = 0;
#ifndef __WXGTK__
if (GTK_WIDGET_CAN_DEFAULT(m_widget)) if (GTK_WIDGET_CAN_DEFAULT(m_widget))
{ {
/* the default button has a border around it */ /* the default button has a border around it */
border = 6; border = 6;
bottom_border = 5; bottom_border = 5;
} }
#endif
DoMoveWindow( m_x-border, DoMoveWindow( m_x-border,
m_y-border, m_y-border,