Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wxScrolledWindow inherits from wxPanel to

Browse Source 
make tab travseral work.
  Work around for GTK scrolledwidget bug.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2573 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
1999-05-26 09:03:25 +00:00
parent 2917e92043
commit 053f9cc122
7 changed files with 628 additions and 587 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/wx/generic/scrolwin.h
View File

@@ -17,10 +17,11 @@
#endif #endif
#include "wx/window.h" #include "wx/window.h"
#include "wx/panel.h"
WXDLLEXPORT_DATA(extern const wxChar*) wxPanelNameStr; WXDLLEXPORT_DATA(extern const wxChar*) wxPanelNameStr;
class WXDLLEXPORT wxScrolledWindow: public wxWindow class WXDLLEXPORT wxScrolledWindow: public wxPanel
{ {
DECLARE_ABSTRACT_CLASS(wxScrolledWindow) DECLARE_ABSTRACT_CLASS(wxScrolledWindow)

19
samples/scroll/scroll.cpp
View File

@@ -19,6 +19,7 @@
#endif #endif
#include "wx/image.h" #include "wx/image.h"
#include "wx/listctrl.h"
// derived classes // derived classes
@@ -97,8 +98,24 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
(void) new wxComboBox( this, -1, "This", wxPoint(10,130), wxDefaultSize, 5, choices ); (void) new wxComboBox( this, -1, "This", wxPoint(10,130), wxDefaultSize, 5, choices );
(void) new wxRadioBox( this, -1, "This", wxPoint(10,200), wxDefaultSize, 5, choices ); (void) new wxRadioBox( this, -1, "This", wxPoint(10,200), wxDefaultSize, 5, choices );
wxListCtrl *m_listCtrl = new wxListCtrl(
this, -1, wxPoint(200, 10), wxSize(180, 120),
wxLC_REPORT | wxSUNKEN_BORDER);
m_listCtrl->InsertColumn(0, "First", wxLIST_FORMAT_LEFT, 90);
m_listCtrl->InsertColumn(1, "Last", wxLIST_FORMAT_LEFT, 90);
for ( int i=0; i < 30; i++)
{
char buf[20];
sprintf(buf, "Item %d", i);
m_listCtrl->InsertItem(i, buf);
}
(void) new wxListBox( this, -1, wxPoint(200,180), wxSize(180,120), 5, choices, wxLB_ALWAYS_SB );
SetBackgroundColour( *wxWHITE ); SetBackgroundColour( "WHEAT" );
} }
MyCanvas::~MyCanvas() MyCanvas::~MyCanvas()

7
src/generic/scrolwin.cpp
View File

@@ -25,15 +25,16 @@
#endif #endif
#include "wx/generic/scrolwin.h" #include "wx/generic/scrolwin.h"
#include "wx/panel.h"
#if !USE_SHARED_LIBRARY #if !USE_SHARED_LIBRARY
BEGIN_EVENT_TABLE(wxScrolledWindow, wxWindow) BEGIN_EVENT_TABLE(wxScrolledWindow, wxPanel)
EVT_SCROLLWIN(wxScrolledWindow::OnScroll) EVT_SCROLLWIN(wxScrolledWindow::OnScroll)
EVT_SIZE(wxScrolledWindow::OnSize) EVT_SIZE(wxScrolledWindow::OnSize)
EVT_PAINT(wxScrolledWindow::OnPaint) EVT_PAINT(wxScrolledWindow::OnPaint)
END_EVENT_TABLE() END_EVENT_TABLE()
IMPLEMENT_DYNAMIC_CLASS(wxScrolledWindow, wxWindow) IMPLEMENT_DYNAMIC_CLASS(wxScrolledWindow, wxPanel)
#endif #endif
#ifdef __WXMSW__ #ifdef __WXMSW__
@@ -80,7 +81,7 @@ bool wxScrolledWindow::Create(wxWindow *parent, wxWindowID id,
m_scaleX = 1.0; m_scaleX = 1.0;
m_scaleY = 1.0; m_scaleY = 1.0;
return wxWindow::Create(parent, id, pos, size, style, name); return wxPanel::Create(parent, id, pos, size, style, name);
} }
/* /*

591
src/gtk/win_gtk.c
View File

@@ -59,76 +59,75 @@ static GtkContainerClass *parent_class = NULL;
guint guint
gtk_myfixed_get_type () gtk_myfixed_get_type ()
{ {
static guint myfixed_type = 0; static guint myfixed_type = 0;
if (!myfixed_type) if (!myfixed_type)
{ {
GtkTypeInfo myfixed_info = GtkTypeInfo myfixed_info =
{ {
"GtkMyFixed", "GtkMyFixed",
sizeof (GtkMyFixed), sizeof (GtkMyFixed),
sizeof (GtkMyFixedClass), sizeof (GtkMyFixedClass),
(GtkClassInitFunc) gtk_myfixed_class_init, (GtkClassInitFunc) gtk_myfixed_class_init,
(GtkObjectInitFunc) gtk_myfixed_init, (GtkObjectInitFunc) gtk_myfixed_init,
#if (GTK_MINOR_VERSION > 0) #if (GTK_MINOR_VERSION > 0)
/* reserved_1 */ NULL, /* reserved_1 */ NULL,
/* reserved_2 */ NULL, /* reserved_2 */ NULL,
(GtkClassInitFunc) NULL, (GtkClassInitFunc) NULL,
#else #else
(GtkArgSetFunc) NULL, (GtkArgSetFunc) NULL,
(GtkArgGetFunc) NULL, (GtkArgGetFunc) NULL,
#endif #endif
}; };
myfixed_type = gtk_type_unique (gtk_container_get_type (), &myfixed_info);
myfixed_type = gtk_type_unique (gtk_container_get_type (), &myfixed_info);
} }
return myfixed_type; return myfixed_type;
} }
static void static void
gtk_myfixed_class_init (GtkMyFixedClass *klass) gtk_myfixed_class_init (GtkMyFixedClass *klass)
{ {
GtkObjectClass *object_class; GtkObjectClass *object_class;
GtkWidgetClass *widget_class; GtkWidgetClass *widget_class;
GtkContainerClass *container_class; GtkContainerClass *container_class;
object_class = (GtkObjectClass*) klass; object_class = (GtkObjectClass*) klass;
widget_class = (GtkWidgetClass*) klass; widget_class = (GtkWidgetClass*) klass;
container_class = (GtkContainerClass*) klass; container_class = (GtkContainerClass*) klass;
#if (GTK_MINOR_VERSION > 0) #if (GTK_MINOR_VERSION > 0)
parent_class = gtk_type_class (GTK_TYPE_CONTAINER); parent_class = gtk_type_class (GTK_TYPE_CONTAINER);
#else #else
parent_class = gtk_type_class (gtk_container_get_type ()); parent_class = gtk_type_class (gtk_container_get_type ());
#endif #endif
widget_class->map = gtk_myfixed_map; widget_class->map = gtk_myfixed_map;
#if (GTK_MINOR_VERSION == 0) #if (GTK_MINOR_VERSION == 0)
widget_class->unmap = gtk_myfixed_unmap; widget_class->unmap = gtk_myfixed_unmap;
#endif #endif
widget_class->realize = gtk_myfixed_realize; widget_class->realize = gtk_myfixed_realize;
widget_class->size_request = gtk_myfixed_size_request; widget_class->size_request = gtk_myfixed_size_request;
widget_class->size_allocate = gtk_myfixed_size_allocate; widget_class->size_allocate = gtk_myfixed_size_allocate;
widget_class->draw = gtk_myfixed_draw; widget_class->draw = gtk_myfixed_draw;
widget_class->expose_event = gtk_myfixed_expose; widget_class->expose_event = gtk_myfixed_expose;
container_class->add = gtk_myfixed_add; container_class->add = gtk_myfixed_add;
container_class->remove = gtk_myfixed_remove; container_class->remove = gtk_myfixed_remove;
#if (GTK_MINOR_VERSION > 0) #if (GTK_MINOR_VERSION > 0)
container_class->forall = gtk_myfixed_foreach; container_class->forall = gtk_myfixed_foreach;
#else #else
container_class->foreach = gtk_myfixed_foreach; container_class->foreach = gtk_myfixed_foreach;
#endif #endif
#if (GTK_MINOR_VERSION > 0) #if (GTK_MINOR_VERSION > 0)
container_class->child_type = gtk_myfixed_child_type; container_class->child_type = gtk_myfixed_child_type;
#endif #endif
#if (GTK_MINOR_VERSION > 0) #if (GTK_MINOR_VERSION > 0)
klass->set_scroll_adjustments = gtk_myfixed_scroll_set_adjustments; klass->set_scroll_adjustments = gtk_myfixed_scroll_set_adjustments;
widget_class->set_scroll_adjustments_signal = widget_class->set_scroll_adjustments_signal =
gtk_signal_new ("set_scroll_adjustments", gtk_signal_new ("set_scroll_adjustments",
GTK_RUN_LAST, GTK_RUN_LAST,
object_class->type, object_class->type,
@@ -142,124 +141,125 @@ gtk_myfixed_class_init (GtkMyFixedClass *klass)
static GtkType static GtkType
gtk_myfixed_child_type (GtkContainer *container) gtk_myfixed_child_type (GtkContainer *container)
{ {
return GTK_TYPE_WIDGET; return GTK_TYPE_WIDGET;
} }
#endif #endif
static void static void
gtk_myfixed_init (GtkMyFixed *myfixed) gtk_myfixed_init (GtkMyFixed *myfixed)
{ {
GTK_WIDGET_UNSET_FLAGS (myfixed, GTK_NO_WINDOW); GTK_WIDGET_UNSET_FLAGS (myfixed, GTK_NO_WINDOW);
#if (GTK_MINOR_VERSION == 0) #if (GTK_MINOR_VERSION == 0)
GTK_WIDGET_SET_FLAGS (myfixed, GTK_BASIC); GTK_WIDGET_SET_FLAGS (myfixed, GTK_BASIC);
#endif #endif
#if (GTK_MINOR_VERSION > 0) #if (GTK_MINOR_VERSION > 0)
myfixed->shadow_type = GTK_SHADOW_NONE; myfixed->shadow_type = GTK_SHADOW_NONE;
#endif #endif
myfixed->children = NULL; myfixed->children = NULL;
} }
GtkWidget* GtkWidget*
gtk_myfixed_new () gtk_myfixed_new ()
{ {
GtkMyFixed *myfixed; GtkMyFixed *myfixed;
myfixed = gtk_type_new (gtk_myfixed_get_type ()); myfixed = gtk_type_new (gtk_myfixed_get_type ());
return GTK_WIDGET (myfixed); return GTK_WIDGET (myfixed);
} }
#if (GTK_MINOR_VERSION > 0) #if (GTK_MINOR_VERSION > 0)
void gtk_myfixed_scroll_set_adjustments (GtkMyFixed *myfixed, void
GtkAdjustment *hadj, gtk_myfixed_scroll_set_adjustments (GtkMyFixed *myfixed,
GtkAdjustment *vadj) GtkAdjustment *hadj,
GtkAdjustment *vadj)
{ {
/* OK, this is embarassing, but this function has to be here */ /* OK, this is embarassing, but this function has to be here */
} }
void void
gtk_myfixed_set_shadow_type (GtkMyFixed *myfixed, gtk_myfixed_set_shadow_type (GtkMyFixed *myfixed,
GtkShadowType type) GtkShadowType type)
{ {
g_return_if_fail (myfixed != NULL); g_return_if_fail (myfixed != NULL);
g_return_if_fail (GTK_IS_MYFIXED (myfixed)); g_return_if_fail (GTK_IS_MYFIXED (myfixed));
if ((GtkShadowType) myfixed->shadow_type != type) if ((GtkShadowType) myfixed->shadow_type != type)
{ {
myfixed->shadow_type = type; myfixed->shadow_type = type;
if (GTK_WIDGET_VISIBLE (myfixed)) if (GTK_WIDGET_VISIBLE (myfixed))
{ {
gtk_widget_size_allocate (GTK_WIDGET (myfixed), &(GTK_WIDGET (myfixed)->allocation)); gtk_widget_size_allocate (GTK_WIDGET (myfixed), &(GTK_WIDGET (myfixed)->allocation));
gtk_widget_queue_draw (GTK_WIDGET (myfixed)); gtk_widget_queue_draw (GTK_WIDGET (myfixed));
} }
} }
} }
#endif #endif
void void
gtk_myfixed_put (GtkMyFixed *myfixed, gtk_myfixed_put (GtkMyFixed *myfixed,
GtkWidget *widget, GtkWidget *widget,
gint16 x, gint16 x,
gint16 y, gint16 y,
gint16 width, gint16 width,
gint16 height) gint16 height)
{ {
GtkMyFixedChild *child_info; GtkMyFixedChild *child_info;
g_return_if_fail (myfixed != NULL); g_return_if_fail (myfixed != NULL);
g_return_if_fail (GTK_IS_MYFIXED (myfixed)); g_return_if_fail (GTK_IS_MYFIXED (myfixed));
g_return_if_fail (widget != NULL); g_return_if_fail (widget != NULL);
child_info = g_new (GtkMyFixedChild, 1); child_info = g_new (GtkMyFixedChild, 1);
child_info->widget = widget; child_info->widget = widget;
child_info->x = x; child_info->x = x;
child_info->y = y; child_info->y = y;
child_info->width = width; child_info->width = width;
child_info->height = height; child_info->height = height;
gtk_widget_set_parent (widget, GTK_WIDGET (myfixed)); gtk_widget_set_parent (widget, GTK_WIDGET (myfixed));
myfixed->children = g_list_append (myfixed->children, child_info); myfixed->children = g_list_append (myfixed->children, child_info);
if (GTK_WIDGET_REALIZED (myfixed)) if (GTK_WIDGET_REALIZED (myfixed))
gtk_widget_realize (widget); gtk_widget_realize (widget);
if (GTK_WIDGET_VISIBLE (myfixed) && GTK_WIDGET_VISIBLE (widget)) if (GTK_WIDGET_VISIBLE (myfixed) && GTK_WIDGET_VISIBLE (widget))
{ {
if (GTK_WIDGET_MAPPED (myfixed)) if (GTK_WIDGET_MAPPED (myfixed))
gtk_widget_map (widget); gtk_widget_map (widget);
gtk_widget_queue_resize (GTK_WIDGET (myfixed)); gtk_widget_queue_resize (GTK_WIDGET (myfixed));
} }
} }
void void
gtk_myfixed_move (GtkMyFixed *myfixed, gtk_myfixed_move (GtkMyFixed *myfixed,
GtkWidget *widget, GtkWidget *widget,
gint16 x, gint16 x,
gint16 y) gint16 y)
{ {
GtkMyFixedChild *child; GtkMyFixedChild *child;
GList *children; GList *children;
g_return_if_fail (myfixed != NULL); g_return_if_fail (myfixed != NULL);
g_return_if_fail (GTK_IS_MYFIXED (myfixed)); g_return_if_fail (GTK_IS_MYFIXED (myfixed));
g_return_if_fail (widget != NULL); g_return_if_fail (widget != NULL);
children = myfixed->children; children = myfixed->children;
while (children) while (children)
{ {
child = children->data; child = children->data;
children = children->next; children = children->next;
if (child->widget == widget) if (child->widget == widget)
{ {
gtk_myfixed_set_size( myfixed, widget, x, y, child->width, child->height ); gtk_myfixed_set_size( myfixed, widget, x, y, child->width, child->height );
break; break;
} }
} }
} }
@@ -270,78 +270,85 @@ gtk_myfixed_resize (GtkMyFixed *myfixed,
gint16 width, gint16 width,
gint16 height) gint16 height)
{ {
GtkMyFixedChild *child; GtkMyFixedChild *child;
GList *children; GList *children;
g_return_if_fail (myfixed != NULL); g_return_if_fail (myfixed != NULL);
g_return_if_fail (GTK_IS_MYFIXED (myfixed)); g_return_if_fail (GTK_IS_MYFIXED (myfixed));
g_return_if_fail (widget != NULL); g_return_if_fail (widget != NULL);
children = myfixed->children; children = myfixed->children;
while (children) while (children)
{ {
child = children->data; child = children->data;
children = children->next; children = children->next;
if (child->widget == widget) if (child->widget == widget)
{ {
gtk_myfixed_set_size( myfixed, widget, child->x, child->y, width, height ); gtk_myfixed_set_size( myfixed, widget, child->x, child->y, width, height );
break; break;
} }
} }
} }
void void
gtk_myfixed_set_size (GtkMyFixed *myfixed, gtk_myfixed_set_size (GtkMyFixed *myfixed,
GtkWidget *widget, GtkWidget *widget,
gint16 x, gint16 x,
gint16 y, gint16 y,
gint16 width, gint16 width,
gint16 height) gint16 height)
{ {
GtkMyFixedChild *child; GtkMyFixedChild *child;
GList *children; GList *children;
GtkAllocation child_allocation; GtkAllocation child_allocation;
g_return_if_fail (myfixed != NULL); g_return_if_fail (myfixed != NULL);
g_return_if_fail (GTK_IS_MYFIXED (myfixed)); g_return_if_fail (GTK_IS_MYFIXED (myfixed));
g_return_if_fail (widget != NULL); g_return_if_fail (widget != NULL);
children = myfixed->children; children = myfixed->children;
while (children) while (children)
{ {
child = children->data; child = children->data;
children = children->next; children = children->next;
if (child->widget == widget) if (child->widget == widget)
{ {
if ((child->x == x) && if ((child->x == x) &&
(child->y == y) && (child->y == y) &&
(child->width == width) && (child->width == width) &&
(child->height == height)) return; (child->height == height)) return;
child->x = x; child->x = x;
child->y = y; child->y = y;
child->width = width; child->width = width;
child->height = height; child->height = height;
if (GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_VISIBLE (myfixed)) if (GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_VISIBLE (myfixed))
{ {
if ((child->width > 1) && (child->height > 1) && (GTK_WIDGET_REALIZED(widget))) if ((child->width > 1) && (child->height > 1) && (GTK_WIDGET_REALIZED(widget)))
{ {
child_allocation.x = child->x; child_allocation.x = child->x;
child_allocation.y = child->y; child_allocation.y = child->y;
child_allocation.width = child->width; child_allocation.width = MAX( child->width, 1 );
child_allocation.height = child->height; child_allocation.height = MAX( child->height, 1 );
gtk_widget_size_allocate (widget, &child_allocation);
} /* work around for GTK bug when moving widgets outside
else the X window -> do NOT move them entirely outside */
{ if (child_allocation.y + child_allocation.height < 0)
gtk_widget_queue_resize (GTK_WIDGET (myfixed)); child_allocation.y = -child_allocation.height;
} if (child_allocation.x + child_allocation.width < 0)
} child_allocation.x = -child_allocation.width;
break; gtk_widget_size_allocate (widget, &child_allocation);
}
else
{
gtk_widget_queue_resize (GTK_WIDGET (myfixed));
}
}
break;
} }
} }
} }
@@ -349,220 +356,224 @@ gtk_myfixed_set_size (GtkMyFixed *myfixed,
static void static void
gtk_myfixed_map (GtkWidget *widget) gtk_myfixed_map (GtkWidget *widget)
{ {
GtkMyFixed *myfixed; GtkMyFixed *myfixed;
GtkMyFixedChild *child; GtkMyFixedChild *child;
GList *children; GList *children;
g_return_if_fail (widget != NULL); g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_MYFIXED (widget)); g_return_if_fail (GTK_IS_MYFIXED (widget));
GTK_WIDGET_SET_FLAGS (widget, GTK_MAPPED); GTK_WIDGET_SET_FLAGS (widget, GTK_MAPPED);
myfixed = GTK_MYFIXED (widget); myfixed = GTK_MYFIXED (widget);
children = myfixed->children; children = myfixed->children;
while (children) while (children)
{ {
child = children->data; child = children->data;
children = children->next; children = children->next;
if (GTK_WIDGET_VISIBLE (child->widget) && if (GTK_WIDGET_VISIBLE (child->widget) && !GTK_WIDGET_MAPPED (child->widget))
!GTK_WIDGET_MAPPED (child->widget)) gtk_widget_map (child->widget);
gtk_widget_map (child->widget);
} }
gdk_window_show (widget->window); gdk_window_show (widget->window);
} }
#if (GTK_MINOR_VERSION == 0) #if (GTK_MINOR_VERSION == 0)
static void static void
gtk_myfixed_unmap (GtkWidget *widget) gtk_myfixed_unmap (GtkWidget *widget)
{ {
g_return_if_fail (widget != NULL); g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_MYFIXED (widget)); g_return_if_fail (GTK_IS_MYFIXED (widget));
GTK_WIDGET_UNSET_FLAGS (widget, GTK_MAPPED); GTK_WIDGET_UNSET_FLAGS (widget, GTK_MAPPED);
} }
#endif #endif
static void static void
gtk_myfixed_realize (GtkWidget *widget) gtk_myfixed_realize (GtkWidget *widget)
{ {
GtkMyFixed *myfixed; GtkMyFixed *myfixed;
GdkWindowAttr attributes; GdkWindowAttr attributes;
gint attributes_mask; gint attributes_mask;
g_return_if_fail (widget != NULL); g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_MYFIXED (widget)); g_return_if_fail (GTK_IS_MYFIXED (widget));
myfixed = GTK_MYFIXED (widget); myfixed = GTK_MYFIXED (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;
#if (GTK_MINOR_VERSION > 0) #if (GTK_MINOR_VERSION > 0)
attributes.x = widget->allocation.x; attributes.x = widget->allocation.x;
attributes.y = widget->allocation.y; attributes.y = widget->allocation.y;
attributes.width = widget->allocation.width; attributes.width = widget->allocation.width;
attributes.height = widget->allocation.height; attributes.height = widget->allocation.height;
if (myfixed->shadow_type != GTK_SHADOW_NONE) if (myfixed->shadow_type != GTK_SHADOW_NONE)
{ {
attributes.x += 2; attributes.x += 2;
attributes.y += 2; attributes.y += 2;
attributes.width -= 4; attributes.width -= 4;
attributes.height -= 4; attributes.height -= 4;
} }
if (attributes.width < 2) attributes.width = 2; if (attributes.width < 2) attributes.width = 2;
if (attributes.height < 2) attributes.height = 2; if (attributes.height < 2) attributes.height = 2;
#else #else
attributes.x = widget->allocation.x; attributes.x = widget->allocation.x;
attributes.y = widget->allocation.y; attributes.y = widget->allocation.y;
attributes.width = 32000; attributes.width = 32000;
attributes.height = 32000; attributes.height = 32000;
#endif #endif
attributes.wclass = GDK_INPUT_OUTPUT; attributes.wclass = GDK_INPUT_OUTPUT;
attributes.visual = gtk_widget_get_visual (widget); attributes.visual = gtk_widget_get_visual (widget);
attributes.colormap = gtk_widget_get_colormap (widget); attributes.colormap = gtk_widget_get_colormap (widget);
attributes.event_mask = gtk_widget_get_events (widget); attributes.event_mask = gtk_widget_get_events (widget);
attributes.event_mask |= attributes.event_mask |=
GDK_EXPOSURE_MASK | GDK_EXPOSURE_MASK |
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 |
GDK_BUTTON1_MOTION_MASK | GDK_BUTTON1_MOTION_MASK |
GDK_BUTTON2_MOTION_MASK | GDK_BUTTON2_MOTION_MASK |
GDK_BUTTON3_MOTION_MASK | GDK_BUTTON3_MOTION_MASK |
GDK_BUTTON_PRESS_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK | GDK_BUTTON_RELEASE_MASK |
GDK_KEY_PRESS_MASK | GDK_KEY_PRESS_MASK |
GDK_KEY_RELEASE_MASK | GDK_KEY_RELEASE_MASK |
GDK_ENTER_NOTIFY_MASK | GDK_ENTER_NOTIFY_MASK |
GDK_LEAVE_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK |
GDK_FOCUS_CHANGE_MASK; GDK_FOCUS_CHANGE_MASK;
attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP;
attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP; widget->window = gdk_window_new( gtk_widget_get_parent_window (widget), &attributes,
attributes_mask);
widget->window = gdk_window_new (gtk_widget_get_parent_window (widget), &attributes, gdk_window_set_user_data (widget->window, widget);
attributes_mask);
gdk_window_set_user_data (widget->window, widget);
widget->style = gtk_style_attach (widget->style, widget->window); widget->style = gtk_style_attach (widget->style, widget->window);
gtk_style_set_background (widget->style, widget->window, GTK_STATE_NORMAL); gtk_style_set_background (widget->style, widget->window, GTK_STATE_NORMAL);
} }
static void static void
gtk_myfixed_size_request (GtkWidget *widget, gtk_myfixed_size_request (GtkWidget *widget,
GtkRequisition *requisition) GtkRequisition *requisition)
{ {
GtkMyFixed *myfixed; GtkMyFixed *myfixed;
GtkMyFixedChild *child; GtkMyFixedChild *child;
GList *children; GList *children;
GtkRequisition child_requisition; GtkRequisition child_requisition;
g_return_if_fail (widget != NULL); g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_MYFIXED (widget)); g_return_if_fail (GTK_IS_MYFIXED (widget));
g_return_if_fail (requisition != NULL); g_return_if_fail (requisition != NULL);
myfixed = GTK_MYFIXED (widget); myfixed = GTK_MYFIXED (widget);
children = myfixed->children; children = myfixed->children;
while (children) while (children)
{ {
child = children->data; child = children->data;
children = children->next; children = children->next;
if (GTK_WIDGET_VISIBLE (child->widget)) if (GTK_WIDGET_VISIBLE (child->widget))
{ {
gtk_widget_size_request (child->widget, &child_requisition); gtk_widget_size_request (child->widget, &child_requisition);
} }
} }
/* request very little, I'm not sure if requesting nothing /* request very little, I'm not sure if requesting nothing
will always have positive effects on stability... */ will always have positive effects on stability... */
requisition->width = 2; requisition->width = 2;
requisition->height = 2; requisition->height = 2;
} }
static void static void
gtk_myfixed_size_allocate (GtkWidget *widget, gtk_myfixed_size_allocate (GtkWidget *widget,
GtkAllocation *allocation) GtkAllocation *allocation)
{ {
GtkMyFixed *myfixed; GtkMyFixed *myfixed;
gint border; gint border;
GtkMyFixedChild *child; GtkMyFixedChild *child;
GtkAllocation child_allocation; GtkAllocation child_allocation;
GList *children; GList *children;
g_return_if_fail (widget != NULL); g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_MYFIXED(widget)); g_return_if_fail (GTK_IS_MYFIXED(widget));
g_return_if_fail (allocation != NULL); g_return_if_fail (allocation != NULL);
myfixed = GTK_MYFIXED (widget); myfixed = GTK_MYFIXED (widget);
widget->allocation = *allocation; widget->allocation = *allocation;
#if (GTK_MINOR_VERSION > 0) #if (GTK_MINOR_VERSION > 0)
if (myfixed->shadow_type == GTK_SHADOW_NONE) if (myfixed->shadow_type == GTK_SHADOW_NONE)
border = 0;
else
border = 2;
#else
border = 0; border = 0;
else
border = 2;
#else
border = 0;
#endif #endif
if (GTK_WIDGET_REALIZED (widget)) if (GTK_WIDGET_REALIZED (widget))
{
gdk_window_move_resize( widget->window,
allocation->x+border, allocation->y+border,
#if (GTK_MINOR_VERSION > 0)
allocation->width-border*2, allocation->height-border*2
#else
32000, 32000
#endif
);
}
children = myfixed->children;
while (children)
{ {
child = children->data; gdk_window_move_resize( widget->window,
children = children->next; allocation->x+border, allocation->y+border,
#if (GTK_MINOR_VERSION > 0)
allocation->width-border*2, allocation->height-border*2
#else
32000, 32000
#endif
);
}
children = myfixed->children;
while (children)
{
child = children->data;
children = children->next;
/* please look at the text in wxWindow::DoSetSize() on why the /* please look at the text in wxWindow::DoSetSize() on why the
test GTK_WIDGET_REALIZED() has to be here */ test GTK_WIDGET_REALIZED() has to be here */
if (GTK_WIDGET_VISIBLE (child->widget)) if (GTK_WIDGET_VISIBLE (child->widget))
{ {
/* /* if (GTK_IS_NOTEBOOK(child->widget) && !GTK_WIDGET_REALIZED(child->widget))
if (GTK_IS_NOTEBOOK(child->widget) && !GTK_WIDGET_REALIZED(child->widget)) {
{ gtk_widget_queue_resize( child->widget );
gtk_widget_queue_resize( child->widget ); }
} else */
else {
*/ child_allocation.x = child->x;
{ child_allocation.y = child->y;
child_allocation.x = child->x; child_allocation.width = MAX( child->width, 1 );
child_allocation.y = child->y; child_allocation.height = MAX( child->height, 1 );
child_allocation.width = child->width;
child_allocation.height = child->height; /* work around for GTK bug when moving widgets outside
gtk_widget_size_allocate (child->widget, &child_allocation); the X window -> do NOT move them entirely outside */
} if (child_allocation.y + child_allocation.height < 0)
} child_allocation.y = -child_allocation.height;
} if (child_allocation.x + child_allocation.width < 0)
child_allocation.x = -child_allocation.width;
gtk_widget_size_allocate (child->widget, &child_allocation);
}
}
}
} }
static void static void
gtk_myfixed_paint (GtkWidget *widget, gtk_myfixed_paint (GtkWidget *widget,
GdkRectangle *area) GdkRectangle *area)
{ {
g_return_if_fail (widget != NULL); g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_MYFIXED (widget)); g_return_if_fail (GTK_IS_MYFIXED (widget));
g_return_if_fail (area != NULL); g_return_if_fail (area != NULL);
if (GTK_WIDGET_DRAWABLE (widget)) if (GTK_WIDGET_DRAWABLE (widget))
gdk_window_clear_area (widget->window, gdk_window_clear_area (widget->window,
area->x, area->y, area->x, area->y,
area->width, area->height); area->width, area->height);
} }
static void static void

2
src/gtk/window.cpp
View File

@@ -635,7 +635,7 @@ static gint gtk_window_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_e
} }
} }
// win is a control: tab can be propagated up /* win is a control: tab can be propagated up */
if ( (!ret) && if ( (!ret) &&
((gdk_event->keyval == GDK_Tab) || (gdk_event->keyval == GDK_ISO_Left_Tab)) && ((gdk_event->keyval == GDK_Tab) || (gdk_event->keyval == GDK_ISO_Left_Tab)) &&
(win->HasFlag(wxTE_PROCESS_TAB) == 0)) (win->HasFlag(wxTE_PROCESS_TAB) == 0))

591
src/gtk1/win_gtk.c
View File

@@ -59,76 +59,75 @@ static GtkContainerClass *parent_class = NULL;
guint guint
gtk_myfixed_get_type () gtk_myfixed_get_type ()
{ {
static guint myfixed_type = 0; static guint myfixed_type = 0;
if (!myfixed_type) if (!myfixed_type)
{ {
GtkTypeInfo myfixed_info = GtkTypeInfo myfixed_info =
{ {
"GtkMyFixed", "GtkMyFixed",
sizeof (GtkMyFixed), sizeof (GtkMyFixed),
sizeof (GtkMyFixedClass), sizeof (GtkMyFixedClass),
(GtkClassInitFunc) gtk_myfixed_class_init, (GtkClassInitFunc) gtk_myfixed_class_init,
(GtkObjectInitFunc) gtk_myfixed_init, (GtkObjectInitFunc) gtk_myfixed_init,
#if (GTK_MINOR_VERSION > 0) #if (GTK_MINOR_VERSION > 0)
/* reserved_1 */ NULL, /* reserved_1 */ NULL,
/* reserved_2 */ NULL, /* reserved_2 */ NULL,
(GtkClassInitFunc) NULL, (GtkClassInitFunc) NULL,
#else #else
(GtkArgSetFunc) NULL, (GtkArgSetFunc) NULL,
(GtkArgGetFunc) NULL, (GtkArgGetFunc) NULL,
#endif #endif
}; };
myfixed_type = gtk_type_unique (gtk_container_get_type (), &myfixed_info);
myfixed_type = gtk_type_unique (gtk_container_get_type (), &myfixed_info);
} }
return myfixed_type; return myfixed_type;
} }
static void static void
gtk_myfixed_class_init (GtkMyFixedClass *klass) gtk_myfixed_class_init (GtkMyFixedClass *klass)
{ {
GtkObjectClass *object_class; GtkObjectClass *object_class;
GtkWidgetClass *widget_class; GtkWidgetClass *widget_class;
GtkContainerClass *container_class; GtkContainerClass *container_class;
object_class = (GtkObjectClass*) klass; object_class = (GtkObjectClass*) klass;
widget_class = (GtkWidgetClass*) klass; widget_class = (GtkWidgetClass*) klass;
container_class = (GtkContainerClass*) klass; container_class = (GtkContainerClass*) klass;
#if (GTK_MINOR_VERSION > 0) #if (GTK_MINOR_VERSION > 0)
parent_class = gtk_type_class (GTK_TYPE_CONTAINER); parent_class = gtk_type_class (GTK_TYPE_CONTAINER);
#else #else
parent_class = gtk_type_class (gtk_container_get_type ()); parent_class = gtk_type_class (gtk_container_get_type ());
#endif #endif
widget_class->map = gtk_myfixed_map; widget_class->map = gtk_myfixed_map;
#if (GTK_MINOR_VERSION == 0) #if (GTK_MINOR_VERSION == 0)
widget_class->unmap = gtk_myfixed_unmap; widget_class->unmap = gtk_myfixed_unmap;
#endif #endif
widget_class->realize = gtk_myfixed_realize; widget_class->realize = gtk_myfixed_realize;
widget_class->size_request = gtk_myfixed_size_request; widget_class->size_request = gtk_myfixed_size_request;
widget_class->size_allocate = gtk_myfixed_size_allocate; widget_class->size_allocate = gtk_myfixed_size_allocate;
widget_class->draw = gtk_myfixed_draw; widget_class->draw = gtk_myfixed_draw;
widget_class->expose_event = gtk_myfixed_expose; widget_class->expose_event = gtk_myfixed_expose;
container_class->add = gtk_myfixed_add; container_class->add = gtk_myfixed_add;
container_class->remove = gtk_myfixed_remove; container_class->remove = gtk_myfixed_remove;
#if (GTK_MINOR_VERSION > 0) #if (GTK_MINOR_VERSION > 0)
container_class->forall = gtk_myfixed_foreach; container_class->forall = gtk_myfixed_foreach;
#else #else
container_class->foreach = gtk_myfixed_foreach; container_class->foreach = gtk_myfixed_foreach;
#endif #endif
#if (GTK_MINOR_VERSION > 0) #if (GTK_MINOR_VERSION > 0)
container_class->child_type = gtk_myfixed_child_type; container_class->child_type = gtk_myfixed_child_type;
#endif #endif
#if (GTK_MINOR_VERSION > 0) #if (GTK_MINOR_VERSION > 0)
klass->set_scroll_adjustments = gtk_myfixed_scroll_set_adjustments; klass->set_scroll_adjustments = gtk_myfixed_scroll_set_adjustments;
widget_class->set_scroll_adjustments_signal = widget_class->set_scroll_adjustments_signal =
gtk_signal_new ("set_scroll_adjustments", gtk_signal_new ("set_scroll_adjustments",
GTK_RUN_LAST, GTK_RUN_LAST,
object_class->type, object_class->type,
@@ -142,124 +141,125 @@ gtk_myfixed_class_init (GtkMyFixedClass *klass)
static GtkType static GtkType
gtk_myfixed_child_type (GtkContainer *container) gtk_myfixed_child_type (GtkContainer *container)
{ {
return GTK_TYPE_WIDGET; return GTK_TYPE_WIDGET;
} }
#endif #endif
static void static void
gtk_myfixed_init (GtkMyFixed *myfixed) gtk_myfixed_init (GtkMyFixed *myfixed)
{ {
GTK_WIDGET_UNSET_FLAGS (myfixed, GTK_NO_WINDOW); GTK_WIDGET_UNSET_FLAGS (myfixed, GTK_NO_WINDOW);
#if (GTK_MINOR_VERSION == 0) #if (GTK_MINOR_VERSION == 0)
GTK_WIDGET_SET_FLAGS (myfixed, GTK_BASIC); GTK_WIDGET_SET_FLAGS (myfixed, GTK_BASIC);
#endif #endif
#if (GTK_MINOR_VERSION > 0) #if (GTK_MINOR_VERSION > 0)
myfixed->shadow_type = GTK_SHADOW_NONE; myfixed->shadow_type = GTK_SHADOW_NONE;
#endif #endif
myfixed->children = NULL; myfixed->children = NULL;
} }
GtkWidget* GtkWidget*
gtk_myfixed_new () gtk_myfixed_new ()
{ {
GtkMyFixed *myfixed; GtkMyFixed *myfixed;
myfixed = gtk_type_new (gtk_myfixed_get_type ()); myfixed = gtk_type_new (gtk_myfixed_get_type ());
return GTK_WIDGET (myfixed); return GTK_WIDGET (myfixed);
} }
#if (GTK_MINOR_VERSION > 0) #if (GTK_MINOR_VERSION > 0)
void gtk_myfixed_scroll_set_adjustments (GtkMyFixed *myfixed, void
GtkAdjustment *hadj, gtk_myfixed_scroll_set_adjustments (GtkMyFixed *myfixed,
GtkAdjustment *vadj) GtkAdjustment *hadj,
GtkAdjustment *vadj)
{ {
/* OK, this is embarassing, but this function has to be here */ /* OK, this is embarassing, but this function has to be here */
} }
void void
gtk_myfixed_set_shadow_type (GtkMyFixed *myfixed, gtk_myfixed_set_shadow_type (GtkMyFixed *myfixed,
GtkShadowType type) GtkShadowType type)
{ {
g_return_if_fail (myfixed != NULL); g_return_if_fail (myfixed != NULL);
g_return_if_fail (GTK_IS_MYFIXED (myfixed)); g_return_if_fail (GTK_IS_MYFIXED (myfixed));
if ((GtkShadowType) myfixed->shadow_type != type) if ((GtkShadowType) myfixed->shadow_type != type)
{ {
myfixed->shadow_type = type; myfixed->shadow_type = type;
if (GTK_WIDGET_VISIBLE (myfixed)) if (GTK_WIDGET_VISIBLE (myfixed))
{ {
gtk_widget_size_allocate (GTK_WIDGET (myfixed), &(GTK_WIDGET (myfixed)->allocation)); gtk_widget_size_allocate (GTK_WIDGET (myfixed), &(GTK_WIDGET (myfixed)->allocation));
gtk_widget_queue_draw (GTK_WIDGET (myfixed)); gtk_widget_queue_draw (GTK_WIDGET (myfixed));
} }
} }
} }
#endif #endif
void void
gtk_myfixed_put (GtkMyFixed *myfixed, gtk_myfixed_put (GtkMyFixed *myfixed,
GtkWidget *widget, GtkWidget *widget,
gint16 x, gint16 x,
gint16 y, gint16 y,
gint16 width, gint16 width,
gint16 height) gint16 height)
{ {
GtkMyFixedChild *child_info; GtkMyFixedChild *child_info;
g_return_if_fail (myfixed != NULL); g_return_if_fail (myfixed != NULL);
g_return_if_fail (GTK_IS_MYFIXED (myfixed)); g_return_if_fail (GTK_IS_MYFIXED (myfixed));
g_return_if_fail (widget != NULL); g_return_if_fail (widget != NULL);
child_info = g_new (GtkMyFixedChild, 1); child_info = g_new (GtkMyFixedChild, 1);
child_info->widget = widget; child_info->widget = widget;
child_info->x = x; child_info->x = x;
child_info->y = y; child_info->y = y;
child_info->width = width; child_info->width = width;
child_info->height = height; child_info->height = height;
gtk_widget_set_parent (widget, GTK_WIDGET (myfixed)); gtk_widget_set_parent (widget, GTK_WIDGET (myfixed));
myfixed->children = g_list_append (myfixed->children, child_info); myfixed->children = g_list_append (myfixed->children, child_info);
if (GTK_WIDGET_REALIZED (myfixed)) if (GTK_WIDGET_REALIZED (myfixed))
gtk_widget_realize (widget); gtk_widget_realize (widget);
if (GTK_WIDGET_VISIBLE (myfixed) && GTK_WIDGET_VISIBLE (widget)) if (GTK_WIDGET_VISIBLE (myfixed) && GTK_WIDGET_VISIBLE (widget))
{ {
if (GTK_WIDGET_MAPPED (myfixed)) if (GTK_WIDGET_MAPPED (myfixed))
gtk_widget_map (widget); gtk_widget_map (widget);
gtk_widget_queue_resize (GTK_WIDGET (myfixed)); gtk_widget_queue_resize (GTK_WIDGET (myfixed));
} }
} }
void void
gtk_myfixed_move (GtkMyFixed *myfixed, gtk_myfixed_move (GtkMyFixed *myfixed,
GtkWidget *widget, GtkWidget *widget,
gint16 x, gint16 x,
gint16 y) gint16 y)
{ {
GtkMyFixedChild *child; GtkMyFixedChild *child;
GList *children; GList *children;
g_return_if_fail (myfixed != NULL); g_return_if_fail (myfixed != NULL);
g_return_if_fail (GTK_IS_MYFIXED (myfixed)); g_return_if_fail (GTK_IS_MYFIXED (myfixed));
g_return_if_fail (widget != NULL); g_return_if_fail (widget != NULL);
children = myfixed->children; children = myfixed->children;
while (children) while (children)
{ {
child = children->data; child = children->data;
children = children->next; children = children->next;
if (child->widget == widget) if (child->widget == widget)
{ {
gtk_myfixed_set_size( myfixed, widget, x, y, child->width, child->height ); gtk_myfixed_set_size( myfixed, widget, x, y, child->width, child->height );
break; break;
} }
} }
} }
@@ -270,78 +270,85 @@ gtk_myfixed_resize (GtkMyFixed *myfixed,
gint16 width, gint16 width,
gint16 height) gint16 height)
{ {
GtkMyFixedChild *child; GtkMyFixedChild *child;
GList *children; GList *children;
g_return_if_fail (myfixed != NULL); g_return_if_fail (myfixed != NULL);
g_return_if_fail (GTK_IS_MYFIXED (myfixed)); g_return_if_fail (GTK_IS_MYFIXED (myfixed));
g_return_if_fail (widget != NULL); g_return_if_fail (widget != NULL);
children = myfixed->children; children = myfixed->children;
while (children) while (children)
{ {
child = children->data; child = children->data;
children = children->next; children = children->next;
if (child->widget == widget) if (child->widget == widget)
{ {
gtk_myfixed_set_size( myfixed, widget, child->x, child->y, width, height ); gtk_myfixed_set_size( myfixed, widget, child->x, child->y, width, height );
break; break;
} }
} }
} }
void void
gtk_myfixed_set_size (GtkMyFixed *myfixed, gtk_myfixed_set_size (GtkMyFixed *myfixed,
GtkWidget *widget, GtkWidget *widget,
gint16 x, gint16 x,
gint16 y, gint16 y,
gint16 width, gint16 width,
gint16 height) gint16 height)
{ {
GtkMyFixedChild *child; GtkMyFixedChild *child;
GList *children; GList *children;
GtkAllocation child_allocation; GtkAllocation child_allocation;
g_return_if_fail (myfixed != NULL); g_return_if_fail (myfixed != NULL);
g_return_if_fail (GTK_IS_MYFIXED (myfixed)); g_return_if_fail (GTK_IS_MYFIXED (myfixed));
g_return_if_fail (widget != NULL); g_return_if_fail (widget != NULL);
children = myfixed->children; children = myfixed->children;
while (children) while (children)
{ {
child = children->data; child = children->data;
children = children->next; children = children->next;
if (child->widget == widget) if (child->widget == widget)
{ {
if ((child->x == x) && if ((child->x == x) &&
(child->y == y) && (child->y == y) &&
(child->width == width) && (child->width == width) &&
(child->height == height)) return; (child->height == height)) return;
child->x = x; child->x = x;
child->y = y; child->y = y;
child->width = width; child->width = width;
child->height = height; child->height = height;
if (GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_VISIBLE (myfixed)) if (GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_VISIBLE (myfixed))
{ {
if ((child->width > 1) && (child->height > 1) && (GTK_WIDGET_REALIZED(widget))) if ((child->width > 1) && (child->height > 1) && (GTK_WIDGET_REALIZED(widget)))
{ {
child_allocation.x = child->x; child_allocation.x = child->x;
child_allocation.y = child->y; child_allocation.y = child->y;
child_allocation.width = child->width; child_allocation.width = MAX( child->width, 1 );
child_allocation.height = child->height; child_allocation.height = MAX( child->height, 1 );
gtk_widget_size_allocate (widget, &child_allocation);
} /* work around for GTK bug when moving widgets outside
else the X window -> do NOT move them entirely outside */
{ if (child_allocation.y + child_allocation.height < 0)
gtk_widget_queue_resize (GTK_WIDGET (myfixed)); child_allocation.y = -child_allocation.height;
} if (child_allocation.x + child_allocation.width < 0)
} child_allocation.x = -child_allocation.width;
break; gtk_widget_size_allocate (widget, &child_allocation);
}
else
{
gtk_widget_queue_resize (GTK_WIDGET (myfixed));
}
}
break;
} }
} }
} }
@@ -349,220 +356,224 @@ gtk_myfixed_set_size (GtkMyFixed *myfixed,
static void static void
gtk_myfixed_map (GtkWidget *widget) gtk_myfixed_map (GtkWidget *widget)
{ {
GtkMyFixed *myfixed; GtkMyFixed *myfixed;
GtkMyFixedChild *child; GtkMyFixedChild *child;
GList *children; GList *children;
g_return_if_fail (widget != NULL); g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_MYFIXED (widget)); g_return_if_fail (GTK_IS_MYFIXED (widget));
GTK_WIDGET_SET_FLAGS (widget, GTK_MAPPED); GTK_WIDGET_SET_FLAGS (widget, GTK_MAPPED);
myfixed = GTK_MYFIXED (widget); myfixed = GTK_MYFIXED (widget);
children = myfixed->children; children = myfixed->children;
while (children) while (children)
{ {
child = children->data; child = children->data;
children = children->next; children = children->next;
if (GTK_WIDGET_VISIBLE (child->widget) && if (GTK_WIDGET_VISIBLE (child->widget) && !GTK_WIDGET_MAPPED (child->widget))
!GTK_WIDGET_MAPPED (child->widget)) gtk_widget_map (child->widget);
gtk_widget_map (child->widget);
} }
gdk_window_show (widget->window); gdk_window_show (widget->window);
} }
#if (GTK_MINOR_VERSION == 0) #if (GTK_MINOR_VERSION == 0)
static void static void
gtk_myfixed_unmap (GtkWidget *widget) gtk_myfixed_unmap (GtkWidget *widget)
{ {
g_return_if_fail (widget != NULL); g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_MYFIXED (widget)); g_return_if_fail (GTK_IS_MYFIXED (widget));
GTK_WIDGET_UNSET_FLAGS (widget, GTK_MAPPED); GTK_WIDGET_UNSET_FLAGS (widget, GTK_MAPPED);
} }
#endif #endif
static void static void
gtk_myfixed_realize (GtkWidget *widget) gtk_myfixed_realize (GtkWidget *widget)
{ {
GtkMyFixed *myfixed; GtkMyFixed *myfixed;
GdkWindowAttr attributes; GdkWindowAttr attributes;
gint attributes_mask; gint attributes_mask;
g_return_if_fail (widget != NULL); g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_MYFIXED (widget)); g_return_if_fail (GTK_IS_MYFIXED (widget));
myfixed = GTK_MYFIXED (widget); myfixed = GTK_MYFIXED (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;
#if (GTK_MINOR_VERSION > 0) #if (GTK_MINOR_VERSION > 0)
attributes.x = widget->allocation.x; attributes.x = widget->allocation.x;
attributes.y = widget->allocation.y; attributes.y = widget->allocation.y;
attributes.width = widget->allocation.width; attributes.width = widget->allocation.width;
attributes.height = widget->allocation.height; attributes.height = widget->allocation.height;
if (myfixed->shadow_type != GTK_SHADOW_NONE) if (myfixed->shadow_type != GTK_SHADOW_NONE)
{ {
attributes.x += 2; attributes.x += 2;
attributes.y += 2; attributes.y += 2;
attributes.width -= 4; attributes.width -= 4;
attributes.height -= 4; attributes.height -= 4;
} }
if (attributes.width < 2) attributes.width = 2; if (attributes.width < 2) attributes.width = 2;
if (attributes.height < 2) attributes.height = 2; if (attributes.height < 2) attributes.height = 2;
#else #else
attributes.x = widget->allocation.x; attributes.x = widget->allocation.x;
attributes.y = widget->allocation.y; attributes.y = widget->allocation.y;
attributes.width = 32000; attributes.width = 32000;
attributes.height = 32000; attributes.height = 32000;
#endif #endif
attributes.wclass = GDK_INPUT_OUTPUT; attributes.wclass = GDK_INPUT_OUTPUT;
attributes.visual = gtk_widget_get_visual (widget); attributes.visual = gtk_widget_get_visual (widget);
attributes.colormap = gtk_widget_get_colormap (widget); attributes.colormap = gtk_widget_get_colormap (widget);
attributes.event_mask = gtk_widget_get_events (widget); attributes.event_mask = gtk_widget_get_events (widget);
attributes.event_mask |= attributes.event_mask |=
GDK_EXPOSURE_MASK | GDK_EXPOSURE_MASK |
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 |
GDK_BUTTON1_MOTION_MASK | GDK_BUTTON1_MOTION_MASK |
GDK_BUTTON2_MOTION_MASK | GDK_BUTTON2_MOTION_MASK |
GDK_BUTTON3_MOTION_MASK | GDK_BUTTON3_MOTION_MASK |
GDK_BUTTON_PRESS_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK | GDK_BUTTON_RELEASE_MASK |
GDK_KEY_PRESS_MASK | GDK_KEY_PRESS_MASK |
GDK_KEY_RELEASE_MASK | GDK_KEY_RELEASE_MASK |
GDK_ENTER_NOTIFY_MASK | GDK_ENTER_NOTIFY_MASK |
GDK_LEAVE_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK |
GDK_FOCUS_CHANGE_MASK; GDK_FOCUS_CHANGE_MASK;
attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP;
attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP; widget->window = gdk_window_new( gtk_widget_get_parent_window (widget), &attributes,
attributes_mask);
widget->window = gdk_window_new (gtk_widget_get_parent_window (widget), &attributes, gdk_window_set_user_data (widget->window, widget);
attributes_mask);
gdk_window_set_user_data (widget->window, widget);
widget->style = gtk_style_attach (widget->style, widget->window); widget->style = gtk_style_attach (widget->style, widget->window);
gtk_style_set_background (widget->style, widget->window, GTK_STATE_NORMAL); gtk_style_set_background (widget->style, widget->window, GTK_STATE_NORMAL);
} }
static void static void
gtk_myfixed_size_request (GtkWidget *widget, gtk_myfixed_size_request (GtkWidget *widget,
GtkRequisition *requisition) GtkRequisition *requisition)
{ {
GtkMyFixed *myfixed; GtkMyFixed *myfixed;
GtkMyFixedChild *child; GtkMyFixedChild *child;
GList *children; GList *children;
GtkRequisition child_requisition; GtkRequisition child_requisition;
g_return_if_fail (widget != NULL); g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_MYFIXED (widget)); g_return_if_fail (GTK_IS_MYFIXED (widget));
g_return_if_fail (requisition != NULL); g_return_if_fail (requisition != NULL);
myfixed = GTK_MYFIXED (widget); myfixed = GTK_MYFIXED (widget);
children = myfixed->children; children = myfixed->children;
while (children) while (children)
{ {
child = children->data; child = children->data;
children = children->next; children = children->next;
if (GTK_WIDGET_VISIBLE (child->widget)) if (GTK_WIDGET_VISIBLE (child->widget))
{ {
gtk_widget_size_request (child->widget, &child_requisition); gtk_widget_size_request (child->widget, &child_requisition);
} }
} }
/* request very little, I'm not sure if requesting nothing /* request very little, I'm not sure if requesting nothing
will always have positive effects on stability... */ will always have positive effects on stability... */
requisition->width = 2; requisition->width = 2;
requisition->height = 2; requisition->height = 2;
} }
static void static void
gtk_myfixed_size_allocate (GtkWidget *widget, gtk_myfixed_size_allocate (GtkWidget *widget,
GtkAllocation *allocation) GtkAllocation *allocation)
{ {
GtkMyFixed *myfixed; GtkMyFixed *myfixed;
gint border; gint border;
GtkMyFixedChild *child; GtkMyFixedChild *child;
GtkAllocation child_allocation; GtkAllocation child_allocation;
GList *children; GList *children;
g_return_if_fail (widget != NULL); g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_MYFIXED(widget)); g_return_if_fail (GTK_IS_MYFIXED(widget));
g_return_if_fail (allocation != NULL); g_return_if_fail (allocation != NULL);
myfixed = GTK_MYFIXED (widget); myfixed = GTK_MYFIXED (widget);
widget->allocation = *allocation; widget->allocation = *allocation;
#if (GTK_MINOR_VERSION > 0) #if (GTK_MINOR_VERSION > 0)
if (myfixed->shadow_type == GTK_SHADOW_NONE) if (myfixed->shadow_type == GTK_SHADOW_NONE)
border = 0;
else
border = 2;
#else
border = 0; border = 0;
else
border = 2;
#else
border = 0;
#endif #endif
if (GTK_WIDGET_REALIZED (widget)) if (GTK_WIDGET_REALIZED (widget))
{
gdk_window_move_resize( widget->window,
allocation->x+border, allocation->y+border,
#if (GTK_MINOR_VERSION > 0)
allocation->width-border*2, allocation->height-border*2
#else
32000, 32000
#endif
);
}
children = myfixed->children;
while (children)
{ {
child = children->data; gdk_window_move_resize( widget->window,
children = children->next; allocation->x+border, allocation->y+border,
#if (GTK_MINOR_VERSION > 0)
allocation->width-border*2, allocation->height-border*2
#else
32000, 32000
#endif
);
}
children = myfixed->children;
while (children)
{
child = children->data;
children = children->next;
/* please look at the text in wxWindow::DoSetSize() on why the /* please look at the text in wxWindow::DoSetSize() on why the
test GTK_WIDGET_REALIZED() has to be here */ test GTK_WIDGET_REALIZED() has to be here */
if (GTK_WIDGET_VISIBLE (child->widget)) if (GTK_WIDGET_VISIBLE (child->widget))
{ {
/* /* if (GTK_IS_NOTEBOOK(child->widget) && !GTK_WIDGET_REALIZED(child->widget))
if (GTK_IS_NOTEBOOK(child->widget) && !GTK_WIDGET_REALIZED(child->widget)) {
{ gtk_widget_queue_resize( child->widget );
gtk_widget_queue_resize( child->widget ); }
} else */
else {
*/ child_allocation.x = child->x;
{ child_allocation.y = child->y;
child_allocation.x = child->x; child_allocation.width = MAX( child->width, 1 );
child_allocation.y = child->y; child_allocation.height = MAX( child->height, 1 );
child_allocation.width = child->width;
child_allocation.height = child->height; /* work around for GTK bug when moving widgets outside
gtk_widget_size_allocate (child->widget, &child_allocation); the X window -> do NOT move them entirely outside */
} if (child_allocation.y + child_allocation.height < 0)
} child_allocation.y = -child_allocation.height;
} if (child_allocation.x + child_allocation.width < 0)
child_allocation.x = -child_allocation.width;
gtk_widget_size_allocate (child->widget, &child_allocation);
}
}
}
} }
static void static void
gtk_myfixed_paint (GtkWidget *widget, gtk_myfixed_paint (GtkWidget *widget,
GdkRectangle *area) GdkRectangle *area)
{ {
g_return_if_fail (widget != NULL); g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_MYFIXED (widget)); g_return_if_fail (GTK_IS_MYFIXED (widget));
g_return_if_fail (area != NULL); g_return_if_fail (area != NULL);
if (GTK_WIDGET_DRAWABLE (widget)) if (GTK_WIDGET_DRAWABLE (widget))
gdk_window_clear_area (widget->window, gdk_window_clear_area (widget->window,
area->x, area->y, area->x, area->y,
area->width, area->height); area->width, area->height);
} }
static void static void

2
src/gtk1/window.cpp
View File

@@ -635,7 +635,7 @@ static gint gtk_window_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_e
} }
} }
// win is a control: tab can be propagated up /* win is a control: tab can be propagated up */
if ( (!ret) && if ( (!ret) &&
((gdk_event->keyval == GDK_Tab) || (gdk_event->keyval == GDK_ISO_Left_Tab)) && ((gdk_event->keyval == GDK_Tab) || (gdk_event->keyval == GDK_ISO_Left_Tab)) &&
(win->HasFlag(wxTE_PROCESS_TAB) == 0)) (win->HasFlag(wxTE_PROCESS_TAB) == 0))