X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/354aa1e366a57d896e2cf0943c687b24e8db688c..5ed3dab2615f9d2214c8e452daf844d65620cbbb:/src/gtk1/window.cpp diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp index 1b7eca62e5..67006b5d8b 100644 --- a/src/gtk1/window.cpp +++ b/src/gtk1/window.cpp @@ -124,9 +124,9 @@ If the m_wxwindow field is set, then all input to this widget is inter- cepted and sent to the wxWindows class. If not, all input to the widget that gets pointed to by m_widget gets intercepted and sent to the class. - + II) - + The design of scrolling in wxWindows is markedly different from that offered by the GTK itself and therefore we cannot simply take it as it is. In GTK, clicking on a scrollbar belonging to scrolled window will inevitably move @@ -136,9 +136,9 @@ memorizes how much it has been scrolled but that wxWindows forgets this so that the two coordinates systems have to be kept in synch. This is done in various places using the pizza->xoffset and pizza->yoffset values. - - III) - + + III) + Singularily the most broken code in GTK is the code that is supposes to inform subwindows (child windows) about new positions. Very often, duplicate events are sent without changes in size or position, equally often no @@ -155,15 +155,15 @@ GTK). IV) - + If someone at some point of time feels the immense desire to have a look at, change or attempt to optimse the Refresh() logic, this person will need an intimate understanding of what a "draw" and what an "expose" events are and what there are used for, in particular when used in connection with GTK's own windowless widgets. Beware. - + V) - + Cursors, too, have been a constant source of pleasure. The main difficulty is that a GdkWindow inherits a cursor if the programmer sets a new cursor for the parent. To prevent this from doing too much harm, I use idle time @@ -171,7 +171,7 @@ and ending with the youngest generation (speaking of parent and child windows). Also don't forget that cursors (like much else) are connected to GdkWindows, not GtkWidgets and that the "window" field of a GtkWidget might very well - point to the GdkWindow of the parent widget (-> "window less widget") and + point to the GdkWindow of the parent widget (-> "window less widget") and that the two obviously have very different meanings. */ @@ -185,7 +185,14 @@ extern bool g_blockEventsOnDrag; extern bool g_blockEventsOnScroll; extern wxCursor g_globalCursor; static wxWindow *g_captureWindow = (wxWindow*) NULL; - wxWindow *g_focusWindow = (wxWindow*) NULL; + +/* extern */ wxWindow *g_focusWindow = (wxWindow*) NULL; + +// if we detect that the app has got/lost the focus, we set this variable to +// either TRUE or FALSE and an activate event will be sent during the next +// OnIdle() call and it is reset to -1: this value means that we shouldn't +// send any activate events at all +static int g_sendActivateEvent = -1; /* hack: we need something to pass to gtk_menu_popup, so we store the time of the last click here */ @@ -216,6 +223,7 @@ static gint gtk_debug_focus_in_callback( GtkWidget *WXUNUSED(widget), void debug_focus_in( GtkWidget* widget, const wxChar* name, const wxChar *window ) { +/* wxString tmp = name; tmp += wxT(" FROM "); tmp += window; @@ -226,6 +234,7 @@ void debug_focus_in( GtkWidget* widget, const wxChar* name, const wxChar *window gtk_signal_connect( GTK_OBJECT(widget), "focus_in_event", GTK_SIGNAL_FUNC(gtk_debug_focus_in_callback), (gpointer)s ); +*/ } #endif // Debug @@ -329,13 +338,13 @@ static void draw_frame( GtkWidget *widget, wxWindow *win ) win->m_width-dw, win->m_height-dh ); return; } - + if (win->HasFlag(wxSIMPLE_BORDER)) { GdkGC *gc; - gc = gdk_gc_new( widget->window ); + gc = gdk_gc_new( widget->window ); gdk_gc_set_foreground( gc, &widget->style->black ); - gdk_draw_rectangle( widget->window, gc, FALSE, + gdk_draw_rectangle( widget->window, gc, FALSE, dx, dy, win->m_width-dw-1, win->m_height-dh-1 ); gdk_gc_unref( gc ); @@ -465,9 +474,9 @@ static long map_to_unmodified_wx_keysym( KeySym keysym ) { if (keysym <= 0xFF) { - guint upper = gdk_keyval_to_upper( keysym ); + guint upper = gdk_keyval_to_upper( (guint)keysym ); keysym = (upper != 0 ? upper : keysym ); /* to be MSW compatible */ - key_code = keysym; + key_code = (guint)keysym; } } } @@ -564,7 +573,7 @@ static long map_to_wx_keysym( KeySym keysym ) { if (keysym <= 0xFF) { - key_code = keysym; + key_code = (guint)keysym; } } } @@ -602,7 +611,7 @@ static void gtk_window_expose_callback( GtkWidget *WXUNUSED(widget), GdkEventExp wxEraseEvent eevent( win->GetId() ); eevent.SetEventObject( win ); win->GetEventHandler()->ProcessEvent(eevent); - + wxPaintEvent event( win->GetId() ); event.SetEventObject( win ); win->GetEventHandler()->ProcessEvent( event ); @@ -614,7 +623,8 @@ static void gtk_window_expose_callback( GtkWidget *WXUNUSED(widget), GdkEventExp // "draw" of m_wxwindow //----------------------------------------------------------------------------- -static void gtk_window_draw_callback( GtkWidget *widget, GdkRectangle *rect, wxWindow *win ) +static void gtk_window_draw_callback( GtkWidget *WXUNUSED(widget), + GdkRectangle *rect, wxWindow *win ) { if (g_isIdle) wxapp_install_idle_handler(); @@ -634,11 +644,11 @@ static void gtk_window_draw_callback( GtkWidget *widget, GdkRectangle *rect, wxW (int)rect->width, (int)rect->height ); */ - + wxEraseEvent eevent( win->GetId() ); eevent.SetEventObject( win ); win->GetEventHandler()->ProcessEvent(eevent); - + wxPaintEvent event( win->GetId() ); event.SetEventObject( win ); win->GetEventHandler()->ProcessEvent( event ); @@ -676,7 +686,7 @@ static gint gtk_window_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_e if (gdk_event->window) gdk_window_get_pointer(gdk_event->window, &x, &y, &state); bool ret = FALSE; - + long key_code = map_to_unmodified_wx_keysym( gdk_event->keyval ); /* sending unknown key events doesn't really make sense */ if (key_code == 0) return FALSE; @@ -707,8 +717,8 @@ static gint gtk_window_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_e ret = ancestor->GetEventHandler()->ProcessEvent( command_event ); break; } - if (ancestor->m_isFrame) - break; + if (ancestor->m_isFrame) + break; ancestor = ancestor->GetParent(); } } @@ -718,7 +728,7 @@ static gint gtk_window_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_e /* Only send wxEVT_CHAR event if not processed yet. Thus, ALT-x will only be sent if it is not in an accelerator table. */ key_code = map_to_wx_keysym( gdk_event->keyval ); - + if ( (!ret) && (key_code != 0)) { @@ -739,9 +749,12 @@ static gint gtk_window_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_e /* win is a control: tab can be propagated up */ if ( (!ret) && ((gdk_event->keyval == GDK_Tab) || (gdk_event->keyval == GDK_ISO_Left_Tab)) && - (win->HasFlag(wxTE_PROCESS_TAB) == 0)) + (!win->HasFlag(wxTE_PROCESS_TAB)) && + (win->GetParent()) && + (win->GetParent()->HasFlag( wxTAB_TRAVERSAL)) ) { wxNavigationKeyEvent new_event; + new_event.SetEventObject( win ); /* GDK reports GDK_ISO_Left_Tab for SHIFT-TAB */ new_event.SetDirection( (gdk_event->keyval == GDK_Tab) ); /* CTRL-TAB changes the (parent) window, i.e. switch notebook page */ @@ -791,29 +804,6 @@ static gint gtk_window_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_e */ #endif -/* - Damn, I forgot why this didn't work, but it didn't work. - - // win is a panel: up can be propagated to the panel - if ((!ret) && (win->m_wxwindow) && (win->m_parent) && (win->m_parent->AcceptsFocus()) && - (gdk_event->keyval == GDK_Up)) - { - win->m_parent->SetFocus(); - ret = TRUE; - } - - // win is a panel: left/right can be propagated to the panel - if ((!ret) && (win->m_wxwindow) && - ((gdk_event->keyval == GDK_Right) || (gdk_event->keyval == GDK_Left) || - (gdk_event->keyval == GDK_Up) || (gdk_event->keyval == GDK_Down))) - { - wxNavigationKeyEvent new_event; - new_event.SetDirection( (gdk_event->keyval == GDK_Right) || (gdk_event->keyval == GDK_Down) ); - new_event.SetCurrentFocus( win ); - ret = win->GetEventHandler()->ProcessEvent( new_event ); - } -*/ - if (ret) { gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "key_press_event" ); @@ -964,23 +954,23 @@ static gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton if (!g_captureWindow) { - int x = event.m_x; - int y = event.m_y; + wxCoord x = event.m_x; + wxCoord y = event.m_y; if (win->m_wxwindow) { GtkPizza *pizza = GTK_PIZZA(win->m_wxwindow); - x += pizza->xoffset; - y += pizza->yoffset; + x += pizza->xoffset; + y += pizza->yoffset; } wxNode *node = win->GetChildren().First(); while (node) { wxWindow *child = (wxWindow*)node->Data(); - + node = node->Next(); - if (!child->IsShown()) - continue; + if (!child->IsShown()) + continue; if (child->m_isStaticBox) { @@ -1091,13 +1081,13 @@ static gint gtk_window_button_release_callback( GtkWidget *widget, GdkEventButto if (!g_captureWindow) { - int x = event.m_x; - int y = event.m_y; + wxCoord x = event.m_x; + wxCoord y = event.m_y; if (win->m_wxwindow) { GtkPizza *pizza = GTK_PIZZA(win->m_wxwindow); - x += pizza->xoffset; - y += pizza->yoffset; + x += pizza->xoffset; + y += pizza->yoffset; } wxNode *node = win->GetChildren().First(); @@ -1106,8 +1096,8 @@ static gint gtk_window_button_release_callback( GtkWidget *widget, GdkEventButto wxWindow *child = (wxWindow*)node->Data(); node = node->Next(); - if (!child->IsShown()) - continue; + if (!child->IsShown()) + continue; if (child->m_isStaticBox) { @@ -1173,7 +1163,7 @@ static gint gtk_window_motion_notify_callback( GtkWidget *widget, GdkEventMotion if (!win->m_hasVMT) return FALSE; if (g_blockEventsOnDrag) return FALSE; if (g_blockEventsOnScroll) return FALSE; - + if (!win->IsOwnGtkWindow( gdk_event->window )) return FALSE; if (gdk_event->is_hint) @@ -1211,13 +1201,13 @@ static gint gtk_window_motion_notify_callback( GtkWidget *widget, GdkEventMotion if (!g_captureWindow) { - int x = event.m_x; - int y = event.m_y; + wxCoord x = event.m_x; + wxCoord y = event.m_y; if (win->m_wxwindow) { GtkPizza *pizza = GTK_PIZZA(win->m_wxwindow); - x += pizza->xoffset; - y += pizza->yoffset; + x += pizza->xoffset; + y += pizza->yoffset; } wxNode *node = win->GetChildren().First(); @@ -1226,8 +1216,8 @@ static gint gtk_window_motion_notify_callback( GtkWidget *widget, GdkEventMotion wxWindow *child = (wxWindow*)node->Data(); node = node->Next(); - if (!child->IsShown()) - continue; + if (!child->IsShown()) + continue; if (child->m_isStaticBox) { @@ -1293,22 +1283,21 @@ static gint gtk_window_focus_in_callback( GtkWidget *widget, GdkEvent *WXUNUSED( if (!win->m_hasVMT) return FALSE; if (g_blockEventsOnDrag) return FALSE; - g_focusWindow = win; - - if (win->m_wxwindow) + switch ( g_sendActivateEvent ) { - if (GTK_WIDGET_CAN_FOCUS(win->m_wxwindow)) - { - GTK_WIDGET_SET_FLAGS (win->m_wxwindow, GTK_HAS_FOCUS); -/* - printf( "SetFocus flag from " ); - if (win->GetClassInfo() && win->GetClassInfo()->GetClassName()) - printf( win->GetClassInfo()->GetClassName() ); - printf( ".\n" ); -*/ - } + case -1: + // we've got focus from outside, synthtize wxActivateEvent + g_sendActivateEvent = 1; + break; + + case 0: + // another our window just lost focus, it was already ours before + // - don't send any wxActivateEvent + g_sendActivateEvent = -1; + break; } + g_focusWindow = win; /* printf( "OnSetFocus from " ); @@ -1319,6 +1308,12 @@ static gint gtk_window_focus_in_callback( GtkWidget *widget, GdkEvent *WXUNUSED( printf( ".\n" ); */ + wxPanel *panel = wxDynamicCast(win->GetParent(), wxPanel); + if (panel) + { + panel->SetLastFocus(win); + } + wxFocusEvent event( wxEVT_SET_FOCUS, win->GetId() ); event.SetEventObject( win ); @@ -1343,11 +1338,12 @@ static gint gtk_window_focus_out_callback( GtkWidget *widget, GdkEvent *WXUNUSED if (!win->m_hasVMT) return FALSE; if (g_blockEventsOnDrag) return FALSE; - if (win->m_wxwindow) - { - if (GTK_WIDGET_CAN_FOCUS(win->m_wxwindow)) - GTK_WIDGET_UNSET_FLAGS (win->m_wxwindow, GTK_HAS_FOCUS); - } + // if the focus goes out of our app alltogether, OnIdle() will send + // wxActivateEvent, otherwise gtk_window_focus_in_callback() will reset + // g_sendActivateEvent to -1 + g_sendActivateEvent = 0; + + g_focusWindow = (wxWindow *)NULL; /* printf( "OnKillFocus from " ); @@ -1472,21 +1468,21 @@ static void gtk_window_vscroll_callback( GtkAdjustment *adjust, wxWindow *win ) if (g_blockEventsOnDrag) return; if (!win->m_hasVMT) return; - + float diff = adjust->value - win->m_oldVerticalPos; if (fabs(diff) < 0.2) return; - + win->m_oldVerticalPos = adjust->value; GtkScrolledWindow *scrolledWindow = GTK_SCROLLED_WINDOW(win->m_widget); GtkRange *range = GTK_RANGE( scrolledWindow->vscrollbar ); - + wxEventType command = wxEVT_SCROLLWIN_THUMBTRACK; if (range->scroll_type == GTK_SCROLL_STEP_BACKWARD) command = wxEVT_SCROLLWIN_LINEUP; else if (range->scroll_type == GTK_SCROLL_STEP_FORWARD) command = wxEVT_SCROLLWIN_LINEDOWN; else if (range->scroll_type == GTK_SCROLL_PAGE_BACKWARD) command = wxEVT_SCROLLWIN_PAGEUP; else if (range->scroll_type == GTK_SCROLL_PAGE_FORWARD) command = wxEVT_SCROLLWIN_PAGEDOWN; - + int value = (int)(adjust->value+0.5); wxScrollWinEvent event( command, value, wxVERTICAL ); @@ -1508,18 +1504,18 @@ static void gtk_window_hscroll_callback( GtkAdjustment *adjust, wxWindow *win ) float diff = adjust->value - win->m_oldHorizontalPos; if (fabs(diff) < 0.2) return; - + win->m_oldHorizontalPos = adjust->value; GtkScrolledWindow *scrolledWindow = GTK_SCROLLED_WINDOW(win->m_widget); GtkRange *range = GTK_RANGE( scrolledWindow->hscrollbar ); - + wxEventType command = wxEVT_SCROLLWIN_THUMBTRACK; if (range->scroll_type == GTK_SCROLL_STEP_BACKWARD) command = wxEVT_SCROLLWIN_LINEUP; else if (range->scroll_type == GTK_SCROLL_STEP_FORWARD) command = wxEVT_SCROLLWIN_LINEDOWN; else if (range->scroll_type == GTK_SCROLL_PAGE_BACKWARD) command = wxEVT_SCROLLWIN_PAGEUP; else if (range->scroll_type == GTK_SCROLL_PAGE_FORWARD) command = wxEVT_SCROLLWIN_PAGEDOWN; - + int value = (int)(adjust->value+0.5); wxScrollWinEvent event( command, value, wxHORIZONTAL ); @@ -1625,7 +1621,7 @@ wxWindow *wxWindowBase::FindFocus() been realized, so we do this directly after realization */ static gint -gtk_window_realized_callback( GtkWidget * WXUNUSED(widget), wxWindow *win ) +gtk_window_realized_callback( GtkWidget *WXUNUSED(m_widget), wxWindow *win ) { if (g_isIdle) wxapp_install_idle_handler(); @@ -1646,6 +1642,97 @@ gtk_window_realized_callback( GtkWidget * WXUNUSED(widget), wxWindow *win ) return FALSE; } +//----------------------------------------------------------------------------- +// "realize" from m_wxwindow +//----------------------------------------------------------------------------- + +/* Initialize XIM support */ + +static gint +gtk_wxwindow_realized_callback( GtkWidget *widget, wxWindow *win ) +{ + if (g_isIdle) + wxapp_install_idle_handler(); + +#ifdef HAVE_XIM + if (win->m_ic) return FALSE; + if (!widget) return FALSE; + if (!gdk_im_ready()) return FALSE; + + win->m_icattr = gdk_ic_attr_new(); + if (!win->m_icattr) return FALSE; + + gint width, height; + GdkEventMask mask; + GdkColormap *colormap; + GdkICAttr *attr = win->m_icattr; + GdkICAttributesType attrmask = GDK_IC_ALL_REQ; + GdkIMStyle style; + GdkIMStyle supported_style = GDK_IM_PREEDIT_NONE | + GDK_IM_PREEDIT_NOTHING | + GDK_IM_PREEDIT_POSITION | + GDK_IM_STATUS_NONE | + GDK_IM_STATUS_NOTHING; + + if (widget->style && widget->style->font->type != GDK_FONT_FONTSET) + supported_style &= ~GDK_IM_PREEDIT_POSITION; + + attr->style = style = gdk_im_decide_style (supported_style); + attr->client_window = widget->window; + + if ((colormap = gtk_widget_get_colormap (widget)) != + gtk_widget_get_default_colormap ()) + { + attrmask |= GDK_IC_PREEDIT_COLORMAP; + attr->preedit_colormap = colormap; + } + + attrmask |= GDK_IC_PREEDIT_FOREGROUND; + attrmask |= GDK_IC_PREEDIT_BACKGROUND; + attr->preedit_foreground = widget->style->fg[GTK_STATE_NORMAL]; + attr->preedit_background = widget->style->base[GTK_STATE_NORMAL]; + + switch (style & GDK_IM_PREEDIT_MASK) + { + case GDK_IM_PREEDIT_POSITION: + if (widget->style && widget->style->font->type != GDK_FONT_FONTSET) + { + g_warning ("over-the-spot style requires fontset"); + break; + } + + gdk_window_get_size (widget->window, &width, &height); + + attrmask |= GDK_IC_PREEDIT_POSITION_REQ; + attr->spot_location.x = 0; + attr->spot_location.y = height; + attr->preedit_area.x = 0; + attr->preedit_area.y = 0; + attr->preedit_area.width = width; + attr->preedit_area.height = height; + attr->preedit_fontset = widget->style->font; + + break; + } + + win->m_ic = gdk_ic_new (attr, attrmask); + + if (win->m_ic == NULL) + g_warning ("Can't create input context."); + else + { + mask = gdk_window_get_events (widget->window); + mask |= gdk_ic_get_events (win->m_ic); + gdk_window_set_events (widget->window, mask); + + if (GTK_WIDGET_HAS_FOCUS(widget)) + gdk_im_begin (win->m_ic, widget->window); + } +#endif + + return FALSE; +} + //----------------------------------------------------------------------------- // InsertChild for wxWindow. //----------------------------------------------------------------------------- @@ -1664,20 +1751,13 @@ static void wxInsertChildInWindow( wxWindow* parent, wxWindow* child ) GtkPizza *pizza = GTK_PIZZA(parent->m_wxwindow); child->m_x += pizza->xoffset; child->m_y += pizza->yoffset; - + gtk_pizza_put( GTK_PIZZA(parent->m_wxwindow), GTK_WIDGET(child->m_widget), child->m_x, child->m_y, child->m_width, child->m_height ); - - if (parent->HasFlag(wxTAB_TRAVERSAL)) - { - /* we now allow a window to get the focus as long as it - doesn't have any children. */ - GTK_WIDGET_UNSET_FLAGS( parent->m_wxwindow, GTK_CAN_FOCUS ); - } } //----------------------------------------------------------------------------- @@ -1714,10 +1794,10 @@ void wxWindow::Init() m_hasVMT = FALSE; m_needParent = TRUE; m_isBeingDeleted = FALSE; - + m_noExpose = FALSE; m_nativeSizeEvent = FALSE; - + m_hasScrolling = FALSE; m_isScrolling = FALSE; @@ -1735,8 +1815,13 @@ void wxWindow::Init() m_isRadioButton = FALSE; m_isFrame = FALSE; m_acceptsFocus = FALSE; - + m_cursor = *wxSTANDARD_CURSOR; + +#ifdef HAVE_XIM + m_ic = (GdkIC*) NULL; + m_icattr = (GdkICAttr*) NULL; +#endif } wxWindow::wxWindow() @@ -1761,7 +1846,7 @@ bool wxWindow::Create( wxWindow *parent, wxWindowID id, !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name )) { wxFAIL_MSG( wxT("wxWindow creation failed") ); - return FALSE; + return FALSE; } m_insertCallback = wxInsertChildInWindow; @@ -1832,18 +1917,8 @@ bool wxWindow::Create( wxWindow *parent, wxWindowID id, } #endif // GTK_MINOR_VERSION - if (HasFlag(wxTAB_TRAVERSAL)) - { - /* we now allow a window to get the focus as long as it - doesn't have any children. */ - GTK_WIDGET_SET_FLAGS( m_wxwindow, GTK_CAN_FOCUS ); - m_acceptsFocus = FALSE; - } - else - { - GTK_WIDGET_SET_FLAGS( m_wxwindow, GTK_CAN_FOCUS ); - m_acceptsFocus = TRUE; - } + GTK_WIDGET_SET_FLAGS( m_wxwindow, GTK_CAN_FOCUS ); + m_acceptsFocus = TRUE; #if (GTK_MINOR_VERSION == 0) // shut the viewport up @@ -1922,6 +1997,13 @@ wxWindow::~wxWindow() if (m_parent) m_parent->RemoveChild( this ); +#ifdef HAVE_XIM + if (m_ic) + gdk_ic_destroy (m_ic); + if (m_icattr) + gdk_ic_attr_destroy (m_icattr); +#endif + if (m_widgetStyle) { gtk_style_unref( m_widgetStyle ); @@ -1956,7 +2038,7 @@ bool wxWindow::PreCreation( wxWindow *parent, const wxPoint &pos, const wxSize m_y = (int)pos.y; /* some reasonable defaults */ - if (!parent) + if (!parent) { if (m_x == -1) { @@ -1969,7 +2051,7 @@ bool wxWindow::PreCreation( wxWindow *parent, const wxPoint &pos, const wxSize if (m_y < 10) m_y = 10; } } - + return TRUE; } @@ -1980,15 +2062,15 @@ void wxWindow::PostCreation() if (m_wxwindow) { if (!m_noExpose) - { + { /* these get reported to wxWindows -> wxPaintEvent */ gtk_signal_connect( GTK_OBJECT(m_wxwindow), "expose_event", GTK_SIGNAL_FUNC(gtk_window_expose_callback), (gpointer)this ); gtk_signal_connect( GTK_OBJECT(m_wxwindow), "draw", GTK_SIGNAL_FUNC(gtk_window_draw_callback), (gpointer)this ); - } - + } + #if (GTK_MINOR_VERSION > 0) /* these are called when the "sunken" or "raised" borders are drawn */ gtk_signal_connect( GTK_OBJECT(m_widget), "expose_event", @@ -1999,15 +2081,42 @@ void wxWindow::PostCreation() #endif } + if (m_wxwindow && m_needParent) + { + gtk_signal_connect( GTK_OBJECT(m_wxwindow), "focus_in_event", + GTK_SIGNAL_FUNC(gtk_window_focus_in_callback), (gpointer)this ); + + gtk_signal_connect( GTK_OBJECT(m_wxwindow), "focus_out_event", + GTK_SIGNAL_FUNC(gtk_window_focus_out_callback), (gpointer)this ); + } + else + { + // For dialogs and frames, we are interested mainly in + // m_widget's focus. + + gtk_signal_connect( GTK_OBJECT(m_widget), "focus_in_event", + GTK_SIGNAL_FUNC(gtk_window_focus_in_callback), (gpointer)this ); + + gtk_signal_connect( GTK_OBJECT(m_widget), "focus_out_event", + GTK_SIGNAL_FUNC(gtk_window_focus_out_callback), (gpointer)this ); + } + GtkWidget *connect_widget = GetConnectWidget(); ConnectWidget( connect_widget ); - /* we cannot set colours, fonts and cursors before the widget has + /* We cannot set colours, fonts and cursors before the widget has been realized, so we do this directly after realization */ gtk_signal_connect( GTK_OBJECT(connect_widget), "realize", GTK_SIGNAL_FUNC(gtk_window_realized_callback), (gpointer) this ); - + + /* Initialize XIM support. */ + if (m_wxwindow) + { + gtk_signal_connect( GTK_OBJECT(m_wxwindow), "realize", + GTK_SIGNAL_FUNC(gtk_wxwindow_realized_callback), (gpointer) this ); + } + m_hasVMT = TRUE; } @@ -2028,12 +2137,6 @@ void wxWindow::ConnectWidget( GtkWidget *widget ) gtk_signal_connect( GTK_OBJECT(widget), "motion_notify_event", GTK_SIGNAL_FUNC(gtk_window_motion_notify_callback), (gpointer)this ); - gtk_signal_connect( GTK_OBJECT(widget), "focus_in_event", - GTK_SIGNAL_FUNC(gtk_window_focus_in_callback), (gpointer)this ); - - gtk_signal_connect( GTK_OBJECT(widget), "focus_out_event", - GTK_SIGNAL_FUNC(gtk_window_focus_out_callback), (gpointer)this ); - gtk_signal_connect( GTK_OBJECT(widget), "enter_notify_event", GTK_SIGNAL_FUNC(gtk_window_enter_callback), (gpointer)this ); @@ -2069,7 +2172,7 @@ void wxWindow::DoSetSize( int x, int y, int width, int height, int sizeFlags ) else { GtkPizza *pizza = GTK_PIZZA(m_parent->m_wxwindow); - + if ((sizeFlags & wxSIZE_ALLOW_MINUS_ONE) == 0) { if (x != -1) m_x = x + pizza->xoffset; @@ -2117,7 +2220,7 @@ void wxWindow::DoSetSize( int x, int y, int width, int height, int sizeFlags ) m_width+2*border, m_height+border+bottom_border ); } - + /* wxPrintf( "OnSize sent from " ); if (GetClassInfo() && GetClassInfo()->GetClassName()) @@ -2137,16 +2240,29 @@ void wxWindow::DoSetSize( int x, int y, int width, int height, int sizeFlags ) void wxWindow::OnInternalIdle() { + if ( g_sendActivateEvent != -1 ) + { + bool activate = g_sendActivateEvent != 0; + + // do it only once + g_sendActivateEvent = -1; + + wxActivateEvent event(wxEVT_ACTIVATE, activate, GetId()); + event.SetEventObject(this); + + (void)GetEventHandler()->ProcessEvent(event); + } + wxCursor cursor = m_cursor; if (g_globalCursor.Ok()) cursor = g_globalCursor; if (cursor.Ok()) { /* I now set the cursor anew in every OnInternalIdle call - as setting the cursor in a parent window also effects the - windows above so that checking for the current cursor is - not possible. */ - + as setting the cursor in a parent window also effects the + windows above so that checking for the current cursor is + not possible. */ + if (m_wxwindow) { GdkWindow *window = GTK_PIZZA(m_wxwindow)->bin_window; @@ -2340,8 +2456,8 @@ void wxWindow::DoGetPosition( int *x, int *y ) const if (m_parent && m_parent->m_wxwindow) { GtkPizza *pizza = GTK_PIZZA(m_parent->m_wxwindow); - dx = pizza->xoffset; - dy = pizza->yoffset; + dx = pizza->xoffset; + dy = pizza->yoffset; } if (x) (*x) = m_x - dx; @@ -2485,28 +2601,17 @@ void wxWindow::GetTextExtent( const wxString& string, void wxWindow::SetFocus() { wxCHECK_RET( (m_widget != NULL), wxT("invalid window") ); - - wxNode *node = m_children.First(); - while (node) - { - wxWindow *child = (wxWindow*) node->Data(); - if (child->AcceptsFocus()) - { - child->SetFocus(); - return; - } - node = node->Next(); - } - + if (m_wxwindow) { - gtk_widget_grab_focus (m_wxwindow); + if (!GTK_WIDGET_HAS_FOCUS (m_wxwindow)) + gtk_widget_grab_focus (m_wxwindow); return; } if (m_widget) { - if (GTK_WIDGET_CAN_FOCUS(m_widget) /*&& !GTK_WIDGET_HAS_FOCUS (connect_widget)*/ ) + if (GTK_WIDGET_CAN_FOCUS(m_widget) && !GTK_WIDGET_HAS_FOCUS (m_widget) ) { gtk_widget_grab_focus (m_widget); } @@ -2516,7 +2621,7 @@ void wxWindow::SetFocus() } else { - // ? + // ? } } } @@ -2558,7 +2663,7 @@ bool wxWindow::Reparent( wxWindowBase *newParentBase ) /* reverse: prevent GTK from deleting the widget arbitrarily */ gtk_widget_unref( m_widget ); - + return TRUE; } @@ -2608,13 +2713,13 @@ void wxWindow::WarpPointer( int x, int y ) /* we provide this function ourselves as it is missing in GDK (top of this file) */ - + GdkWindow *window = (GdkWindow*) NULL; if (m_wxwindow) window = GTK_PIZZA(m_wxwindow)->bin_window; else window = GetConnectWidget()->window; - + if (window) gdk_window_warp_pointer( window, x, y ); } @@ -2645,15 +2750,15 @@ void wxWindow::Refresh( bool eraseBackground, const wxRect *rect ) if (!rect) { if (m_wxwindow) - { - GtkPizza *pizza = GTK_PIZZA(m_wxwindow); - gboolean old_clear = pizza->clear_on_draw; - gtk_pizza_set_clear( pizza, FALSE ); - + { + GtkPizza *pizza = GTK_PIZZA(m_wxwindow); + gboolean old_clear = pizza->clear_on_draw; + gtk_pizza_set_clear( pizza, FALSE ); + gtk_widget_draw( m_wxwindow, (GdkRectangle*) NULL ); - - gtk_pizza_set_clear( pizza, old_clear ); - } + + gtk_pizza_set_clear( pizza, old_clear ); + } else gtk_widget_draw( m_widget, (GdkRectangle*) NULL ); } @@ -2666,15 +2771,15 @@ void wxWindow::Refresh( bool eraseBackground, const wxRect *rect ) gdk_rect.height = rect->height; if (m_wxwindow) - { - GtkPizza *pizza = GTK_PIZZA(m_wxwindow); - gboolean old_clear = pizza->clear_on_draw; - gtk_pizza_set_clear( pizza, FALSE ); - + { + GtkPizza *pizza = GTK_PIZZA(m_wxwindow); + gboolean old_clear = pizza->clear_on_draw; + gtk_pizza_set_clear( pizza, FALSE ); + gtk_widget_draw( m_wxwindow, &gdk_rect ); - - gtk_pizza_set_clear( pizza, old_clear ); - } + + gtk_pizza_set_clear( pizza, old_clear ); + } else gtk_widget_draw( m_widget, &gdk_rect ); } @@ -2723,7 +2828,7 @@ bool wxWindow::SetBackgroundColour( const wxColour &colour ) window = GTK_PIZZA(m_wxwindow)->bin_window; else window = GetConnectWidget()->window; - + if (!window) { // indicate that a new style has been set @@ -2775,7 +2880,7 @@ bool wxWindow::SetForegroundColour( const wxColour &colour ) window = GTK_PIZZA(m_wxwindow)->bin_window; else window = GetConnectWidget()->window; - + if (!window) { // indicate that a new style has been set @@ -2820,7 +2925,7 @@ void wxWindow::SetWidgetStyle() if (m_foregroundColour.Ok()) { - m_foregroundColour.CalcPixel( gdk_window_get_colormap( m_widget->window ) ); + m_foregroundColour.CalcPixel( gtk_widget_get_colormap( m_widget ) ); style->fg[GTK_STATE_NORMAL] = *m_foregroundColour.GetColor(); style->fg[GTK_STATE_PRELIGHT] = *m_foregroundColour.GetColor(); style->fg[GTK_STATE_ACTIVE] = *m_foregroundColour.GetColor(); @@ -2828,7 +2933,7 @@ void wxWindow::SetWidgetStyle() if (m_backgroundColour.Ok()) { - m_backgroundColour.CalcPixel( gdk_window_get_colormap( m_widget->window ) ); + m_backgroundColour.CalcPixel( gtk_widget_get_colormap( m_widget ) ); style->bg[GTK_STATE_NORMAL] = *m_backgroundColour.GetColor(); style->base[GTK_STATE_NORMAL] = *m_backgroundColour.GetColor(); style->bg[GTK_STATE_PRELIGHT] = *m_backgroundColour.GetColor(); @@ -2856,15 +2961,16 @@ static void gtk_pop_hide_callback( GtkWidget *WXUNUSED(widget), bool* is_waiting static void SetInvokingWindow( wxMenu *menu, wxWindow *win ) { menu->SetInvokingWindow( win ); - wxNode *node = menu->GetItems().First(); + wxMenuItemList::Node *node = menu->GetMenuItems().GetFirst(); while (node) { - wxMenuItem *menuitem = (wxMenuItem*)node->Data(); + wxMenuItem *menuitem = node->GetData(); if (menuitem->IsSubMenu()) { SetInvokingWindow( menuitem->GetSubMenu(), win ); } - node = node->Next(); + + node = node->GetNext(); } } @@ -2894,7 +3000,7 @@ bool wxWindow::DoPopupMenu( wxMenu *menu, int x, int y ) gs_pop_y = y; bool is_waiting = TRUE; - + gtk_signal_connect( GTK_OBJECT(menu->m_menu), "hide", GTK_SIGNAL_FUNC(gtk_pop_hide_callback), (gpointer)&is_waiting ); @@ -2907,7 +3013,7 @@ bool wxWindow::DoPopupMenu( wxMenu *menu, int x, int y ) 0, // button used to activate it gs_timeLastClick // the time of activation ); - + while (is_waiting) { while (gtk_events_pending()) @@ -2945,9 +3051,9 @@ GtkWidget* wxWindow::GetConnectWidget() bool wxWindow::IsOwnGtkWindow( GdkWindow *window ) { - if (m_wxwindow) + if (m_wxwindow) return (window == GTK_PIZZA(m_wxwindow)->bin_window); - + return (window == m_widget->window); } @@ -2957,26 +3063,7 @@ bool wxWindow::SetFont( const wxFont &font ) if (!wxWindowBase::SetFont(font)) { - // don't leave if the GTK widget has just - // been realized - if (!m_delayedFont) return FALSE; - } - - GdkWindow *window = (GdkWindow*) NULL; - if (m_wxwindow) - window = GTK_PIZZA(m_wxwindow)->bin_window; - else - window = GetConnectWidget()->window; - - if (!window) - { - // indicate that a new style has been set - // but it couldn't get applied as the - // widget hasn't been realized yet. - m_delayedFont = TRUE; - - // pretend we have done something - return TRUE; + return FALSE; } wxColour sysbg = wxSystemSettings::GetSystemColour( wxSYS_COLOUR_BTNFACE ); @@ -3005,18 +3092,18 @@ void wxWindow::CaptureMouse() window = GTK_PIZZA(m_wxwindow)->bin_window; else window = GetConnectWidget()->window; - + if (!window) return; gdk_pointer_grab( window, FALSE, (GdkEventMask) (GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | - GDK_POINTER_MOTION_HINT_MASK | + GDK_POINTER_MOTION_HINT_MASK | GDK_POINTER_MOTION_MASK), (GdkWindow *) NULL, m_cursor.GetCursor(), - GDK_CURRENT_TIME ); + (guint32)GDK_CURRENT_TIME ); g_captureWindow = this; } @@ -3031,10 +3118,11 @@ void wxWindow::ReleaseMouse() window = GTK_PIZZA(m_wxwindow)->bin_window; else window = GetConnectWidget()->window; - - if (!window) return; - gdk_pointer_ungrab ( GDK_CURRENT_TIME ); + if (!window) + return; + + gdk_pointer_ungrab ( (guint32)GDK_CURRENT_TIME ); g_captureWindow = (wxWindow*) NULL; }