X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6de67633bd522200a78993c8c57a1c983f68e211..451673f7c982d9410c7ef799c6c47c8cacfed1d6:/src/gtk/window.cpp diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp index 21eaaf3f96..08583058e3 100644 --- a/src/gtk/window.cpp +++ b/src/gtk/window.cpp @@ -33,17 +33,36 @@ #include "wx/fontutil.h" #include "wx/sysopt.h" -#ifdef __WXDEBUG__ - #include "wx/thread.h" -#endif - #include #include "wx/gtk/private.h" -#include "wx/gtk/win_gtk.h" +#include "wx/gtk/private/win_gtk.h" #include #include +#if !GTK_CHECK_VERSION(2,10,0) + // GTK+ can reliably detect Meta key state only since 2.10 when + // GDK_META_MASK was introduced -- there wasn't any way to detect it + // in older versions. wxGTK used GDK_MOD2_MASK for this purpose, but + // GDK_MOD2_MASK is documented as: + // + // the fifth modifier key (it depends on the modifier mapping of the X + // server which key is interpreted as this modifier) + // + // In other words, it isn't guaranteed to map to Meta. This is a real + // problem: it is common to map NumLock to it (in fact, it's an exception + // if the X server _doesn't_ use it for NumLock). So the old code caused + // wxKeyEvent::MetaDown() to always return true as long as NumLock was on + // on many systems, which broke all applications using + // wxKeyEvent::GetModifiers() to check modifiers state (see e.g. here: + // http://tinyurl.com/56lsk2). + // + // Because of this, it's better to not detect Meta key state at all than + // to detect it incorrectly. Hence the following #define, which causes + // m_metaDown to be always set to false. + #define GDK_META_MASK 0 +#endif + //----------------------------------------------------------------------------- // documentation on internals //----------------------------------------------------------------------------- @@ -189,39 +208,25 @@ extern wxCursor g_globalCursor; static wxWindowGTK *g_captureWindow = (wxWindowGTK*) NULL; static bool g_captureWindowHasMouse = false; -wxWindowGTK *g_focusWindow = (wxWindowGTK*) NULL; - -// the last window which had the focus - this is normally never NULL (except -// if we never had focus at all) as even when g_focusWindow is NULL it still -// keeps its previous value -wxWindowGTK *g_focusWindowLast = (wxWindowGTK*) NULL; +// The window that currently has focus: +static wxWindowGTK *gs_currentFocus = NULL; +// The window that is scheduled to get focus in the next event loop iteration +// or NULL if there's no pending focus change: +static wxWindowGTK *gs_pendingFocus = NULL; -// If a window get the focus set but has not been realized -// yet, defer setting the focus to idle time. -wxWindowGTK *g_delayedFocus = (wxWindowGTK*) NULL; +// the window that has deferred focus-out event pending, if any (see +// GTKAddDeferredFocusOut() for details) +static wxWindowGTK *gs_deferredFocusOut = NULL; // global variables because GTK+ DnD want to have the // mouse event that caused it GdkEvent *g_lastMouseEvent = (GdkEvent*) NULL; int g_lastButtonNumber = 0; -extern bool g_mainThreadLocked; - //----------------------------------------------------------------------------- // debug //----------------------------------------------------------------------------- -#ifdef __WXDEBUG__ - -#if wxUSE_THREADS -# define DEBUG_MAIN_THREAD if (wxThread::IsMain() && g_mainThreadLocked) printf("gui reentrance"); -#else -# define DEBUG_MAIN_THREAD -#endif -#else -#define DEBUG_MAIN_THREAD -#endif // Debug - // the trace mask used for the focus debugging messages #define TRACE_FOCUS _T("focus") @@ -247,62 +252,6 @@ gdk_window_warp_pointer (GdkWindow *window, } } -//----------------------------------------------------------------------------- -// local code (see below) -//----------------------------------------------------------------------------- - -// returns the child of win which currently has focus or NULL if not found -// -// Note: can't be static, needed by textctrl.cpp. -wxWindow *wxFindFocusedChild(wxWindowGTK *win) -{ - wxWindow *winFocus = wxWindowGTK::FindFocus(); - if ( !winFocus ) - return (wxWindow *)NULL; - - if ( winFocus == win ) - return (wxWindow *)win; - - for ( wxWindowList::compatibility_iterator node = win->GetChildren().GetFirst(); - node; - node = node->GetNext() ) - { - wxWindow *child = wxFindFocusedChild(node->GetData()); - if ( child ) - return child; - } - - return (wxWindow *)NULL; -} - -static void GetScrollbarWidth(GtkWidget* widget, int& w, int& h) -{ - GtkScrolledWindow* scroll_window = GTK_SCROLLED_WINDOW(widget); - GtkScrolledWindowClass* scroll_class = GTK_SCROLLED_WINDOW_CLASS(GTK_OBJECT_GET_CLASS(scroll_window)); - GtkRequisition scroll_req; - - w = 0; - if (scroll_window->vscrollbar_visible) - { - scroll_req.width = 2; - scroll_req.height = 2; - (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(scroll_window->vscrollbar) )->size_request ) - (scroll_window->vscrollbar, &scroll_req ); - w = scroll_req.width + - scroll_class->scrollbar_spacing; - } - - h = 0; - if (scroll_window->hscrollbar_visible) - { - scroll_req.width = 2; - scroll_req.height = 2; - (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(scroll_window->hscrollbar) )->size_request ) - (scroll_window->hscrollbar, &scroll_req ); - h = scroll_req.height + - scroll_class->scrollbar_spacing; - } -} //----------------------------------------------------------------------------- // "size_request" of m_widget @@ -330,75 +279,17 @@ void wxgtk_window_size_request_callback(GtkWidget * WXUNUSED(widget), // "expose_event" of m_wxwindow //----------------------------------------------------------------------------- - -extern GtkWidget *GetEntryWidget(); - extern "C" { static gboolean -gtk_window_expose_callback( GtkWidget *widget, +gtk_window_expose_callback( GtkWidget* widget, GdkEventExpose *gdk_event, wxWindow *win ) { - DEBUG_MAIN_THREAD - - wxPizza *pizza = WX_PIZZA(widget); - GdkWindow *backing_window = pizza->m_backing_window; - - int w = widget->allocation.width; - int h = widget->allocation.height; - - // if this event is for the border-only GdkWindow - if (backing_window && gdk_event->window == pizza->m_backing_window) + if (gdk_event->window == widget->window) { - if (win->HasFlag(wxBORDER_SIMPLE)) - { - GdkGC* gc = gdk_gc_new(gdk_event->window); - gdk_gc_set_foreground(gc, &widget->style->black); - gdk_draw_rectangle(gdk_event->window, gc, false, 0, 0, w - 1, h - 1); - g_object_unref(gc); - } - else - { - GtkShadowType shadow = GTK_SHADOW_IN; - if (win->HasFlag(wxBORDER_RAISED)) - shadow = GTK_SHADOW_OUT; - gtk_paint_shadow( - GetEntryWidget()->style, gdk_event->window, GTK_STATE_NORMAL, - shadow, NULL, GetEntryWidget(), "entry", 0, 0, w, h); - } - - return TRUE; - } - -#if 0 - if (win->GetName()) - { - wxPrintf( wxT("OnExpose from ") ); - if (win->GetClassInfo() && win->GetClassInfo()->GetClassName()) - wxPrintf( win->GetClassInfo()->GetClassName() ); - wxPrintf( wxT(" %d %d %d %d\n"), (int)gdk_event->area.x, - (int)gdk_event->area.y, - (int)gdk_event->area.width, - (int)gdk_event->area.height ); + win->GetUpdateRegion() = wxRegion( gdk_event->region ); + win->GtkSendPaintEvents(); } - - gtk_paint_box - ( - win->m_wxwindow->style, - pizza->bin_window, - GTK_STATE_NORMAL, - GTK_SHADOW_OUT, - (GdkRectangle*) NULL, - win->m_wxwindow, - (char *)"button", // const_cast - 20,20,24,24 - ); -#endif - - win->GetUpdateRegion() = wxRegion( gdk_event->region ); - - win->GtkSendPaintEvents(); - // Let parent window draw window-less widgets return FALSE; } @@ -409,6 +300,7 @@ gtk_window_expose_callback( GtkWidget *widget, //----------------------------------------------------------------------------- #ifndef __WXUNIVERSAL__ + extern "C" { static gboolean expose_event_border(GtkWidget* widget, GdkEventExpose* gdk_event, wxWindow* win) @@ -429,8 +321,7 @@ expose_event_border(GtkWidget* widget, GdkEventExpose* gdk_event, wxWindow* win) int h = win->m_wxwindow->allocation.height; if (win->HasFlag(wxBORDER_SIMPLE)) { - GdkGC* gc; - gc = gdk_gc_new(gdk_event->window); + GdkGC* gc = gdk_gc_new(gdk_event->window); gdk_gc_set_foreground(gc, &widget->style->black); gdk_draw_rectangle(gdk_event->window, gc, false, x, y, w - 1, h - 1); g_object_unref(gc); @@ -440,9 +331,20 @@ expose_event_border(GtkWidget* widget, GdkEventExpose* gdk_event, wxWindow* win) GtkShadowType shadow = GTK_SHADOW_IN; if (win->HasFlag(wxBORDER_RAISED)) shadow = GTK_SHADOW_OUT; + + // Style detail to use + const char* detail; + if (widget == win->m_wxwindow) + // for non-scrollable wxWindows + detail = "entry"; + else + // for scrollable ones + detail = "viewport"; + + GtkWidget* styleWidget = wxGTKPrivate::GetEntryWidget(); gtk_paint_shadow( - GetEntryWidget()->style, gdk_event->window, GTK_STATE_NORMAL, - shadow, NULL, GetEntryWidget(), "viewport", x, y, w, h); + styleWidget->style, gdk_event->window, GTK_STATE_NORMAL, + shadow, NULL, styleWidget, detail, x, y, w, h); } // no further painting is needed for border-only GdkWindow @@ -619,11 +521,11 @@ static long wxTranslateKeySymToWXKey(KeySym keysym, bool isChar) case GDK_KP_7: case GDK_KP_8: case GDK_KP_9: - key_code = (isChar ? '0' : WXK_NUMPAD0) + keysym - GDK_KP_0; + key_code = (isChar ? '0' : int(WXK_NUMPAD0)) + keysym - GDK_KP_0; break; case GDK_KP_Space: - key_code = isChar ? ' ' : WXK_NUMPAD_SPACE; + key_code = isChar ? ' ' : int(WXK_NUMPAD_SPACE); break; case GDK_KP_Tab: @@ -695,32 +597,32 @@ static long wxTranslateKeySymToWXKey(KeySym keysym, bool isChar) break; case GDK_KP_Equal: - key_code = isChar ? '=' : WXK_NUMPAD_EQUAL; + key_code = isChar ? '=' : int(WXK_NUMPAD_EQUAL); break; case GDK_KP_Multiply: - key_code = isChar ? '*' : WXK_NUMPAD_MULTIPLY; + key_code = isChar ? '*' : int(WXK_NUMPAD_MULTIPLY); break; case GDK_KP_Add: - key_code = isChar ? '+' : WXK_NUMPAD_ADD; + key_code = isChar ? '+' : int(WXK_NUMPAD_ADD); break; case GDK_KP_Separator: // FIXME: what is this? - key_code = isChar ? '.' : WXK_NUMPAD_SEPARATOR; + key_code = isChar ? '.' : int(WXK_NUMPAD_SEPARATOR); break; case GDK_KP_Subtract: - key_code = isChar ? '-' : WXK_NUMPAD_SUBTRACT; + key_code = isChar ? '-' : int(WXK_NUMPAD_SUBTRACT); break; case GDK_KP_Decimal: - key_code = isChar ? '.' : WXK_NUMPAD_DECIMAL; + key_code = isChar ? '.' : int(WXK_NUMPAD_DECIMAL); break; case GDK_KP_Divide: - key_code = isChar ? '/' : WXK_NUMPAD_DIVIDE; + key_code = isChar ? '/' : int(WXK_NUMPAD_DIVIDE); break; @@ -767,7 +669,7 @@ static void wxFillOtherKeyEventFields(wxKeyEvent& event, event.m_shiftDown = (gdk_event->state & GDK_SHIFT_MASK) != 0; event.m_controlDown = (gdk_event->state & GDK_CONTROL_MASK) != 0; event.m_altDown = (gdk_event->state & GDK_MOD1_MASK) != 0; - event.m_metaDown = (gdk_event->state & GDK_MOD2_MASK) != 0; + event.m_metaDown = (gdk_event->state & GDK_META_MASK) != 0; event.m_scanCode = gdk_event->keyval; event.m_rawCode = (wxUint32) gdk_event->keyval; event.m_rawFlags = 0; @@ -909,23 +811,15 @@ struct wxGtkIMData extern "C" { static gboolean -gtk_window_key_press_callback( GtkWidget *widget, +gtk_window_key_press_callback( GtkWidget *WXUNUSED(widget), GdkEventKey *gdk_event, wxWindow *win ) { - DEBUG_MAIN_THREAD - if (!win->m_hasVMT) return FALSE; if (g_blockEventsOnDrag) return FALSE; - // GTK+ sends keypress events to the focus widget and then - // to all its parent and grandparent widget. We only want - // the key events from the focus widget. - if (!GTK_WIDGET_HAS_FOCUS(widget)) - return FALSE; - wxKeyEvent event( wxEVT_KEY_DOWN ); bool ret = false; bool return_after_IM = false; @@ -933,7 +827,7 @@ gtk_window_key_press_callback( GtkWidget *widget, if( wxTranslateGTKKeyEventToWx(event, win, gdk_event) ) { // Emit KEY_DOWN event - ret = win->GetEventHandler()->ProcessEvent( event ); + ret = win->HandleWindowEvent( event ); } else { @@ -968,8 +862,18 @@ gtk_window_key_press_callback( GtkWidget *widget, int command = ancestor->GetAcceleratorTable()->GetCommand( event ); if (command != -1) { - wxCommandEvent command_event( wxEVT_COMMAND_MENU_SELECTED, command ); - ret = ancestor->GetEventHandler()->ProcessEvent( command_event ); + wxCommandEvent menu_event( wxEVT_COMMAND_MENU_SELECTED, command ); + ret = ancestor->HandleWindowEvent( menu_event ); + + if ( !ret ) + { + // if the accelerator wasn't handled as menu event, try + // it as button click (for compatibility with other + // platforms): + wxCommandEvent button_event( wxEVT_COMMAND_BUTTON_CLICKED, command ); + ret = ancestor->HandleWindowEvent( button_event ); + } + break; } if (ancestor->IsTopLevel()) @@ -1028,13 +932,13 @@ gtk_window_key_press_callback( GtkWidget *widget, if (parent) { event.SetEventType( wxEVT_CHAR_HOOK ); - ret = parent->GetEventHandler()->ProcessEvent( event ); + ret = parent->HandleWindowEvent( event ); } if (!ret) { event.SetEventType(wxEVT_CHAR); - ret = win->GetEventHandler()->ProcessEvent( event ); + ret = win->HandleWindowEvent( event ); } } } @@ -1104,13 +1008,13 @@ gtk_wxwindow_commit_cb (GtkIMContext * WXUNUSED(context), if (parent) { event.SetEventType( wxEVT_CHAR_HOOK ); - ret = parent->GetEventHandler()->ProcessEvent( event ); + ret = parent->HandleWindowEvent( event ); } if (!ret) { event.SetEventType(wxEVT_CHAR); - ret = window->GetEventHandler()->ProcessEvent( event ); + ret = window->HandleWindowEvent( event ); } } } @@ -1127,8 +1031,6 @@ gtk_window_key_release_callback( GtkWidget * WXUNUSED(widget), GdkEventKey *gdk_event, wxWindowGTK *win ) { - DEBUG_MAIN_THREAD - if (!win->m_hasVMT) return FALSE; @@ -1163,7 +1065,7 @@ template void InitMouseEvent(wxWindowGTK *win, event.m_shiftDown = gdk_event->state & GDK_SHIFT_MASK; event.m_controlDown = gdk_event->state & GDK_CONTROL_MASK; event.m_altDown = gdk_event->state & GDK_MOD1_MASK; - event.m_metaDown = gdk_event->state & GDK_MOD2_MASK; + event.m_metaDown = gdk_event->state & GDK_META_MASK; event.m_leftDown = gdk_event->state & GDK_BUTTON1_MASK; event.m_middleDown = gdk_event->state & GDK_BUTTON2_MASK; event.m_rightDown = gdk_event->state & GDK_BUTTON3_MASK; @@ -1291,13 +1193,11 @@ wxWindowGTK *FindWindowForMouseEvent(wxWindowGTK *win, wxCoord& x, wxCoord& y) bool wxWindowGTK::GTKProcessEvent(wxEvent& event) const { // nothing special at this level - return GetEventHandler()->ProcessEvent(event); + return HandleWindowEvent(event); } int wxWindowGTK::GTKCallbackCommonPrologue(GdkEventAny *event) const { - DEBUG_MAIN_THREAD - if (!m_hasVMT) return FALSE; if (g_blockEventsOnDrag) @@ -1331,21 +1231,6 @@ wxDEFINE_COMMON_PROLOGUE_OVERLOAD(GdkEventCrossing) if ( rc != -1 ) \ return rc -// send the wxChildFocusEvent and wxFocusEvent, common code of -// gtk_window_focus_in_callback() and SetFocus() -static bool DoSendFocusEvents(wxWindow *win) -{ - // Notify the parent keeping track of focus for the kbd navigation - // purposes that we got it. - wxChildFocusEvent eventChildFocus(win); - (void)win->GetEventHandler()->ProcessEvent(eventChildFocus); - - wxFocusEvent eventFocus(wxEVT_SET_FOCUS, win->GetId()); - eventFocus.SetEventObject(win); - - return win->GetEventHandler()->ProcessEvent(eventFocus); -} - // all event handlers must have C linkage as they're called from GTK+ C code extern "C" { @@ -1490,7 +1375,7 @@ gtk_window_button_press_callback( GtkWidget *widget, return TRUE; if ((event_type == wxEVT_LEFT_DOWN) && !win->IsOfStandardClass() && - (g_focusWindow != win) /* && win->IsFocusable() */) + (gs_currentFocus != win) /* && win->IsFocusable() */) { win->SetFocus(); } @@ -1652,8 +1537,6 @@ gtk_window_motion_notify_callback( GtkWidget * WXUNUSED(widget), static gboolean window_scroll_event(GtkWidget*, GdkEventScroll* gdk_event, wxWindow* win) { - DEBUG_MAIN_THREAD - if (gdk_event->direction != GDK_SCROLL_UP && gdk_event->direction != GDK_SCROLL_DOWN) { @@ -1662,6 +1545,8 @@ window_scroll_event(GtkWidget*, GdkEventScroll* gdk_event, wxWindow* win) wxMouseEvent event(wxEVT_MOUSEWHEEL); InitMouseEvent(win, event, gdk_event); + + // FIXME: Get these values from GTK or GDK event.m_linesPerAction = 3; event.m_wheelDelta = 120; if (gdk_event->direction == GDK_SCROLL_UP) @@ -1690,47 +1575,9 @@ static gboolean wxgtk_window_popup_menu_callback(GtkWidget*, wxWindowGTK* win) static gboolean gtk_window_focus_in_callback( GtkWidget * WXUNUSED(widget), GdkEventFocus *WXUNUSED(event), - wxWindow *win ) + wxWindowGTK *win ) { - DEBUG_MAIN_THREAD - - if (win->m_imData) - gtk_im_context_focus_in(win->m_imData->context); - - g_focusWindowLast = - g_focusWindow = win; - - wxLogTrace(TRACE_FOCUS, - _T("%s: focus in"), win->GetName().c_str()); - -#if wxUSE_CARET - // caret needs to be informed about focus change - wxCaret *caret = win->GetCaret(); - if ( caret ) - { - caret->OnSetFocus(); - } -#endif // wxUSE_CARET - - gboolean ret = FALSE; - - // does the window itself think that it has the focus? - if ( !win->m_hasFocus ) - { - // not yet, notify it - win->m_hasFocus = true; - - (void)DoSendFocusEvents(win); - - ret = TRUE; - } - - // Disable default focus handling for custom windows - // since the default GTK+ handler issues a repaint - if (win->m_wxwindow) - return ret; - - return FALSE; + return win->GTKHandleFocusIn(); } //----------------------------------------------------------------------------- @@ -1742,55 +1589,13 @@ gtk_window_focus_out_callback( GtkWidget * WXUNUSED(widget), GdkEventFocus * WXUNUSED(gdk_event), wxWindowGTK *win ) { - DEBUG_MAIN_THREAD - - if (win->m_imData) - gtk_im_context_focus_out(win->m_imData->context); - - wxLogTrace( TRACE_FOCUS, - _T("%s: focus out"), win->GetName().c_str() ); - - - wxWindowGTK *winFocus = wxFindFocusedChild(win); - if ( winFocus ) - win = winFocus; - - g_focusWindow = (wxWindowGTK *)NULL; - -#if wxUSE_CARET - // caret needs to be informed about focus change - wxCaret *caret = win->GetCaret(); - if ( caret ) - { - caret->OnKillFocus(); - } -#endif // wxUSE_CARET - - // don't send the window a kill focus event if it thinks that it doesn't - // have focus already - if ( win->m_hasFocus ) - { - // the event handler might delete the window when it loses focus, so - // check whether this is a custom window before calling it - const bool has_wxwindow = win->m_wxwindow != NULL; - - win->m_hasFocus = false; - - wxFocusEvent event( wxEVT_KILL_FOCUS, win->GetId() ); - event.SetEventObject( win ); - - (void)win->GTKProcessEvent( event ); - - // Disable default focus handling for custom windows - // since the default GTK+ handler issues a repaint - if ( has_wxwindow ) - return TRUE; - } - - // continue with normal processing - return FALSE; + return win->GTKHandleFocusOut(); } +//----------------------------------------------------------------------------- +// "focus" +//----------------------------------------------------------------------------- + static gboolean wx_window_focus_callback(GtkWidget *widget, GtkDirectionType WXUNUSED(direction), @@ -1906,8 +1711,6 @@ gtk_scrollbar_value_changed(GtkRange* range, wxWindow* win) static gboolean gtk_scrollbar_button_press_event(GtkRange*, GdkEventButton*, wxWindow* win) { - DEBUG_MAIN_THREAD - g_blockEventsOnScroll = true; win->m_mouseButtonDown = true; @@ -1941,8 +1744,6 @@ gtk_scrollbar_event_after(GtkRange* range, GdkEvent* event, wxWindow* win) static gboolean gtk_scrollbar_button_release_event(GtkRange* range, GdkEventButton*, wxWindow* win) { - DEBUG_MAIN_THREAD - g_blockEventsOnScroll = false; win->m_mouseButtonDown = false; // If thumb tracking @@ -1965,8 +1766,6 @@ gtk_scrollbar_button_release_event(GtkRange* range, GdkEventButton*, wxWindow* w static void gtk_window_realized_callback(GtkWidget* widget, wxWindow* win) { - DEBUG_MAIN_THREAD - if (win->m_imData) { gtk_im_context_set_client_window( win->m_imData->context, @@ -2038,7 +1837,7 @@ gtk_window_grab_broken( GtkWidget*, { wxMouseCaptureLostEvent evt( win->GetId() ); evt.SetEventObject( win ); - win->GetEventHandler()->ProcessEvent( evt ); + win->HandleWindowEvent( evt ); } return false; } @@ -2053,11 +1852,8 @@ void gtk_window_style_set_callback( GtkWidget *WXUNUSED(widget), GtkStyle *previous_style, wxWindow* win ) { - //wxLogDebug(wxT("gtk_window_style_set_callback")); if (win && previous_style) { - wxString name(win->GetName()); - //wxLogDebug(wxT("gtk_window_style_set_callback %s"), name.c_str()); wxSysColourChangedEvent event; event.SetEventObject(win); @@ -2067,40 +1863,28 @@ void gtk_window_style_set_callback( GtkWidget *WXUNUSED(widget), } // extern "C" -// Connect/disconnect style-set - -void wxConnectStyleSet(wxWindow* win) -{ - if (win->m_wxwindow) - g_signal_connect (win->m_wxwindow, "style_set", - G_CALLBACK (gtk_window_style_set_callback), win); -} - -void wxDisconnectStyleSet(wxWindow* win) -{ - if (win->m_wxwindow) - g_signal_handlers_disconnect_by_func (win->m_wxwindow, - (gpointer) gtk_window_style_set_callback, - win); -} - // Helper to suspend colour change event event processing while we change a widget's style class wxSuspendStyleEvents { public: - wxSuspendStyleEvents(wxWindow* win) - { - m_win = win; - if (win->IsTopLevel()) - wxDisconnectStyleSet(win); - } - ~wxSuspendStyleEvents() - { - if (m_win->IsTopLevel()) - wxConnectStyleSet(m_win); - } + wxSuspendStyleEvents(wxWindow* win) + { + m_win = NULL; + if (win->m_wxwindow && win->IsTopLevel()) + { + m_win = win; + g_signal_handlers_block_by_func( + m_win->m_wxwindow, (void*)gtk_window_style_set_callback, m_win); + } + } + ~wxSuspendStyleEvents() + { + if (m_win) + g_signal_handlers_unblock_by_func( + m_win->m_wxwindow, (void*)gtk_window_style_set_callback, m_win); + } - wxWindow* m_win; + wxWindow* m_win; }; // ---------------------------------------------------------------------------- @@ -2110,33 +1894,23 @@ public: wxWindow *wxWindowBase::DoFindFocus() { + wxWindowGTK *focus = gs_pendingFocus ? gs_pendingFocus : gs_currentFocus; // the cast is necessary when we compile in wxUniversal mode - return (wxWindow *)g_focusWindow; + return wx_static_cast(wxWindow*, focus); } -//----------------------------------------------------------------------------- -// InsertChild for wxWindowGTK. -//----------------------------------------------------------------------------- - -/* Callback for wxWindowGTK. This very strange beast has to be used because - * C++ has no virtual methods in a constructor. We have to emulate a - * virtual function here as wxNotebook requires a different way to insert - * a child in it. I had opted for creating a wxNotebookPage window class - * which would have made this superfluous (such in the MDI window system), - * but no-one was listening to me... */ - -static void wxInsertChildInWindow( wxWindowGTK* parent, wxWindowGTK* child ) +void wxWindowGTK::AddChildGTK(wxWindowGTK* child) { /* the window might have been scrolled already, do we have to adapt the position */ - wxPizza* pizza = WX_PIZZA(parent->m_wxwindow); + wxPizza* pizza = WX_PIZZA(m_wxwindow); child->m_x += pizza->m_scroll_x; child->m_y += pizza->m_scroll_y; gtk_widget_set_size_request( child->m_widget, child->m_width, child->m_height); gtk_fixed_put( - GTK_FIXED(parent->m_wxwindow), child->m_widget, child->m_x, child->m_y); + GTK_FIXED(m_wxwindow), child->m_widget, child->m_x, child->m_y); } //----------------------------------------------------------------------------- @@ -2170,7 +1944,7 @@ wxMouseState wxGetMouseState() ms.SetControlDown(mask & GDK_CONTROL_MASK); ms.SetShiftDown(mask & GDK_SHIFT_MASK); ms.SetAltDown(mask & GDK_MOD1_MASK); - ms.SetMetaDown(mask & GDK_MOD2_MASK); + ms.SetMetaDown(mask & GDK_META_MASK); return ms; } @@ -2208,7 +1982,6 @@ void wxWindowGTK::Init() m_noExpose = false; m_nativeSizeEvent = false; - m_hasScrolling = false; m_isScrolling = false; m_mouseButtonDown = false; @@ -2222,10 +1995,6 @@ void wxWindowGTK::Init() m_oldClientWidth = m_oldClientHeight = 0; - m_insertCallback = wxInsertChildInWindow; - - m_hasFocus = false; - m_clipPaintRegion = false; m_needsStyleChange = false; @@ -2260,6 +2029,11 @@ bool wxWindowGTK::Create( wxWindow *parent, long style, const wxString &name ) { + // Get default border + wxBorder border = GetBorder(style); + style &= ~wxBORDER_MASK; + style |= border; + if (!PreCreation( parent, pos, size ) || !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name )) { @@ -2267,13 +2041,13 @@ bool wxWindowGTK::Create( wxWindow *parent, return false; } + m_wxwindow = wxPizza::New(m_windowStyle); if (!HasFlag(wxHSCROLL) && !HasFlag(wxVSCROLL)) m_widget = m_wxwindow; else { m_widget = gtk_scrolled_window_new( (GtkAdjustment *) NULL, (GtkAdjustment *) NULL ); - gtk_container_set_resize_mode(GTK_CONTAINER(m_widget), GTK_RESIZE_QUEUE); GtkScrolledWindow *scrolledWindow = GTK_SCROLLED_WINDOW(m_widget); @@ -2338,12 +2112,15 @@ bool wxWindowGTK::Create( wxWindow *parent, gtk_widget_show( m_wxwindow ); } + g_object_ref(m_widget); if (m_parent) m_parent->DoAddChild( this ); m_focusWidget = m_wxwindow; + SetCanFocus(AcceptsFocus()); + PostCreation(); return true; @@ -2353,11 +2130,13 @@ wxWindowGTK::~wxWindowGTK() { SendDestroyEvent(); - if (g_focusWindow == this) - g_focusWindow = NULL; + if (gs_currentFocus == this) + gs_currentFocus = NULL; + if (gs_pendingFocus == this) + gs_pendingFocus = NULL; - if ( g_delayedFocus == this ) - g_delayedFocus = NULL; + if ( gs_deferredFocusOut == this ) + gs_deferredFocusOut = NULL; m_isBeingDeleted = true; m_hasVMT = false; @@ -2383,17 +2162,17 @@ wxWindowGTK::~wxWindowGTK() // delete before the widgets to avoid a crash on solaris delete m_imData; - if (m_wxwindow && (m_wxwindow != m_widget)) - { - gtk_widget_destroy( m_wxwindow ); - m_wxwindow = (GtkWidget*) NULL; - } - if (m_widget) { - gtk_widget_destroy( m_widget ); - m_widget = (GtkWidget*) NULL; + // Note that gtk_widget_destroy() does not destroy the widget, it just + // emits the "destroy" signal. The widget is not actually destroyed + // until its reference count drops to zero. + gtk_widget_destroy(m_widget); + // Release our reference, should be the last one + g_object_unref(m_widget); + m_widget = NULL; } + m_wxwindow = NULL; } bool wxWindowGTK::PreCreation( wxWindowGTK *parent, const wxPoint &pos, const wxSize &size ) @@ -2442,7 +2221,7 @@ void wxWindowGTK::PostCreation() // border drawing #ifndef __WXUNIVERSAL__ - if (HasFlag(wxBORDER_SIMPLE | wxBORDER_RAISED | wxBORDER_SUNKEN)) + if (HasFlag(wxPizza::BORDER_STYLES)) { g_signal_connect(m_widget, "expose_event", G_CALLBACK(expose_event_border), this); @@ -2643,8 +2422,6 @@ void wxWindowGTK::DoSetSize( int x, int y, int width, int height, int sizeFlags if (height != -1) m_height = height; - ConstrainSize(); - if (m_parent->m_wxwindow) { wxPizza* pizza = WX_PIZZA(m_parent->m_wxwindow); @@ -2688,7 +2465,7 @@ void wxWindowGTK::DoSetSize( int x, int y, int width, int height, int sizeFlags { wxSizeEvent event( wxSize(m_width,m_height), GetId() ); event.SetEventObject( this ); - GetEventHandler()->ProcessEvent( event ); + HandleWindowEvent( event ); } } } @@ -2706,7 +2483,7 @@ bool wxWindowGTK::GtkShowFromOnIdle() gtk_widget_show( m_widget ); wxShowEvent eventShow(GetId(), true); eventShow.SetEventObject(this); - GetEventHandler()->ProcessEvent(eventShow); + HandleWindowEvent(eventShow); m_showOnIdle = false; return true; } @@ -2716,6 +2493,9 @@ bool wxWindowGTK::GtkShowFromOnIdle() void wxWindowGTK::OnInternalIdle() { + if ( gs_deferredFocusOut ) + GTKHandleDeferredFocusOut(); + // Check if we have to show window now if (GtkShowFromOnIdle()) return; @@ -2765,7 +2545,7 @@ void wxWindowGTK::OnInternalIdle() } } - if (wxUpdateUIEvent::CanUpdate(this) && IsShown()) + if (wxUpdateUIEvent::CanUpdate(this) && IsShownOnScreen()) UpdateWindowUI(wxUPDATE_UI_FROMIDLE); } @@ -2795,19 +2575,27 @@ void wxWindowGTK::DoGetClientSize( int *width, int *height ) const if (m_wxwindow) { - int dw = 0; - int dh = 0; - - if (m_hasScrolling) - GetScrollbarWidth(m_widget, dw, dh); + // if window is scrollable, account for scrollbars + for (int i = 0; i < 2 && m_scrollBar[i]; i++) + { + GtkRequisition req; + GtkAdjustment* adj = gtk_range_get_adjustment(m_scrollBar[i]); + // if scrollbar enabled + if (adj->upper > adj->page_size) + { + gtk_widget_size_request(GTK_WIDGET(m_scrollBar[i]), &req); + if (i == ScrollDir_Horz) + h -= req.height; + else + w -= req.width; + } + } int border_x, border_y; WX_PIZZA(m_wxwindow)->get_border_widths(border_x, border_y); - dw += 2 * border_x; - dh += 2 * border_y; + w -= 2 * border_x; + h -= 2 * border_y; - w -= dw; - h -= dh; if (w < 0) w = 0; if (h < 0) @@ -2939,22 +2727,19 @@ bool wxWindowGTK::Show( bool show ) return false; } - if (show) + if (show && m_showOnIdle) { - if (!m_showOnIdle) - { - gtk_widget_show( m_widget ); - wxShowEvent eventShow(GetId(), show); - eventShow.SetEventObject(this); - GetEventHandler()->ProcessEvent(eventShow); - } + // deferred } else { - gtk_widget_hide( m_widget ); + if (show) + gtk_widget_show(m_widget); + else + gtk_widget_hide(m_widget); wxShowEvent eventShow(GetId(), show); eventShow.SetEventObject(this); - GetEventHandler()->ProcessEvent(eventShow); + HandleWindowEvent(eventShow); } return true; @@ -3076,90 +2861,193 @@ void wxWindowGTK::GetTextExtent( const wxString& string, g_object_unref (layout); } -bool wxWindowGTK::GTKSetDelayedFocusIfNeeded() + +bool wxWindowGTK::GTKHandleFocusIn() { - if ( g_delayedFocus == this ) + // Disable default focus handling for custom windows since the default GTK+ + // handler issues a repaint + const bool retval = m_wxwindow ? true : false; + + + // NB: if there's still unprocessed deferred focus-out event (see + // GTKHandleFocusOut() for explanation), we need to process it first so + // that the order of focus events -- focus-out first, then focus-in + // elsewhere -- is preserved + if ( gs_deferredFocusOut ) { - if ( GTK_WIDGET_REALIZED(m_widget) ) + if ( GTKNeedsToFilterSameWindowFocus() && + gs_deferredFocusOut == this ) { - gtk_widget_grab_focus(m_widget); - g_delayedFocus = NULL; - - return true; + // GTK+ focus changed from this wxWindow back to itself, so don't + // emit any events at all + wxLogTrace(TRACE_FOCUS, + "filtered out spurious focus change within %s(%p, %s)", + GetClassInfo()->GetClassName(), this, GetLabel()); + gs_deferredFocusOut = NULL; + return retval; } + + // otherwise we need to send focus-out first + wxASSERT_MSG ( gs_deferredFocusOut != this, + "GTKHandleFocusIn(GTKFocus_Normal) called even though focus changed back to itself - derived class should handle this" ); + GTKHandleDeferredFocusOut(); } - return false; + + wxLogTrace(TRACE_FOCUS, + "handling focus_in event for %s(%p, %s)", + GetClassInfo()->GetClassName(), this, GetLabel()); + + if (m_imData) + gtk_im_context_focus_in(m_imData->context); + + gs_currentFocus = this; + gs_pendingFocus = NULL; + +#if wxUSE_CARET + // caret needs to be informed about focus change + wxCaret *caret = GetCaret(); + if ( caret ) + { + caret->OnSetFocus(); + } +#endif // wxUSE_CARET + + // Notify the parent keeping track of focus for the kbd navigation + // purposes that we got it. + wxChildFocusEvent eventChildFocus(static_cast(this)); + GTKProcessEvent(eventChildFocus); + + wxFocusEvent eventFocus(wxEVT_SET_FOCUS, GetId()); + eventFocus.SetEventObject(this); + GTKProcessEvent(eventFocus); + + return retval; } -void wxWindowGTK::SetFocus() +bool wxWindowGTK::GTKHandleFocusOut() { - wxCHECK_RET( m_widget != NULL, wxT("invalid window") ); - if ( m_hasFocus ) + // Disable default focus handling for custom windows since the default GTK+ + // handler issues a repaint + const bool retval = m_wxwindow ? true : false; + + + // NB: If a control is composed of several GtkWidgets and when focus + // changes from one of them to another within the same wxWindow, we get + // a focus-out event followed by focus-in for another GtkWidget owned + // by the same wx control. We don't want to generate two spurious + // wxEVT_SET_FOCUS events in this case, so we defer sending wx events + // from GTKHandleFocusOut() until we know for sure it's not coming back + // (i.e. in GTKHandleFocusIn() or at idle time). + if ( GTKNeedsToFilterSameWindowFocus() ) { - // don't do anything if we already have focus - return; + wxASSERT_MSG( gs_deferredFocusOut == NULL, + "deferred focus out event already pending" ); + wxLogTrace(TRACE_FOCUS, + "deferring focus_out event for %s(%p, %s)", + GetClassInfo()->GetClassName(), this, GetLabel()); + gs_deferredFocusOut = this; + return retval; } - if (m_wxwindow) + GTKHandleFocusOutNoDeferring(); + + return retval; +} + +void wxWindowGTK::GTKHandleFocusOutNoDeferring() +{ + wxLogTrace(TRACE_FOCUS, + "handling focus_out event for %s(%p, %s)", + GetClassInfo()->GetClassName(), this, GetLabel()); + + if (m_imData) + gtk_im_context_focus_out(m_imData->context); + + if ( gs_currentFocus != this ) { - // wxWindow::SetFocus() should really set the focus to - // this control, whatever the flags are - if (!GTK_WIDGET_CAN_FOCUS(m_wxwindow)) - GTK_WIDGET_SET_FLAGS(m_wxwindow, GTK_CAN_FOCUS); + // Something is terribly wrong, gs_currentFocus is out of sync with the + // real focus. We will reset it to NULL anyway, because after this + // focus-out event is handled, one of the following with happen: + // + // * either focus will go out of the app altogether, in which case + // gs_currentFocus _should_ be NULL + // + // * or it goes to another control, in which case focus-in event will + // follow immediately and it will set gs_currentFocus to the right + // value + wxLogDebug("window %s(%p, %s) lost focus even though it didn't have it", + GetClassInfo()->GetClassName(), this, GetLabel()); + } + gs_currentFocus = NULL; - if (!GTK_WIDGET_HAS_FOCUS (m_wxwindow)) - { - gtk_widget_grab_focus (m_wxwindow); - } +#if wxUSE_CARET + // caret needs to be informed about focus change + wxCaret *caret = GetCaret(); + if ( caret ) + { + caret->OnKillFocus(); } - else +#endif // wxUSE_CARET + + wxFocusEvent event( wxEVT_KILL_FOCUS, GetId() ); + event.SetEventObject( this ); + GTKProcessEvent( event ); +} + +/*static*/ +void wxWindowGTK::GTKHandleDeferredFocusOut() +{ + // NB: See GTKHandleFocusOut() for explanation. This function is called + // from either GTKHandleFocusIn() or OnInternalIdle() to process + // deferred event. + if ( gs_deferredFocusOut ) { - // wxWindow::SetFocus() should really set the focus to - // this control, whatever the flags are - if (!GTK_WIDGET_CAN_FOCUS(m_widget)) - GTK_WIDGET_SET_FLAGS(m_widget, GTK_CAN_FOCUS); + wxWindowGTK *win = gs_deferredFocusOut; + gs_deferredFocusOut = NULL; - if (GTK_IS_CONTAINER(m_widget)) - { - if (GTK_IS_RADIO_BUTTON(m_widget)) - { - gtk_widget_grab_focus (m_widget); - return; - } + wxLogTrace(TRACE_FOCUS, + "processing deferred focus_out event for %s(%p, %s)", + win->GetClassInfo()->GetClassName(), win, win->GetLabel()); - gtk_widget_child_focus( m_widget, GTK_DIR_TAB_FORWARD ); - } - else - if (GTK_WIDGET_CAN_FOCUS(m_widget) && !GTK_WIDGET_HAS_FOCUS (m_widget) ) - { + win->GTKHandleFocusOutNoDeferring(); + } +} - if (!GTK_WIDGET_REALIZED(m_widget)) - { - // we can't set the focus to the widget now so we remember that - // it should be focused and will do it later, during the idle - // time, as soon as we can - wxLogTrace(TRACE_FOCUS, - _T("Delaying setting focus to %s(%s)"), - GetClassInfo()->GetClassName(), GetLabel().c_str()); - - g_delayedFocus = this; - } - else - { - wxLogTrace(TRACE_FOCUS, - _T("Setting focus to %s(%s)"), - GetClassInfo()->GetClassName(), GetLabel().c_str()); +void wxWindowGTK::SetFocus() +{ + wxCHECK_RET( m_widget != NULL, wxT("invalid window") ); - gtk_widget_grab_focus (m_widget); - } - } - else - { - wxLogTrace(TRACE_FOCUS, - _T("Can't set focus to %s(%s)"), - GetClassInfo()->GetClassName(), GetLabel().c_str()); - } + // Setting "physical" focus is not immediate in GTK+ and while + // gtk_widget_is_focus ("determines if the widget is the focus widget + // within its toplevel", i.e. returns true for one widget per TLW, not + // globally) returns true immediately after grabbing focus, + // GTK_WIDGET_HAS_FOCUS (which returns true only for the one widget that + // has focus at the moment) takes affect only after the window is shown + // (if it was hidden at the moment of the call) or at the next event loop + // iteration. + // + // Because we want to FindFocus() call immediately following + // foo->SetFocus() to return foo, we have to keep track of "pending" focus + // ourselves. + gs_pendingFocus = this; + + GtkWidget *widget = m_wxwindow ? m_wxwindow : m_focusWidget; + + if ( GTK_IS_CONTAINER(widget) && + !GTK_WIDGET_CAN_FOCUS(widget) ) + { + wxLogTrace(TRACE_FOCUS, + _T("Setting focus to a child of %s(%p, %s)"), + GetClassInfo()->GetClassName(), this, GetLabel().c_str()); + gtk_widget_child_focus(widget, GTK_DIR_TAB_FORWARD); + } + else + { + wxLogTrace(TRACE_FOCUS, + _T("Setting focus to %s(%p, %s)"), + GetClassInfo()->GetClassName(), this, GetLabel().c_str()); + gtk_widget_grab_focus(widget); } } @@ -3193,13 +3081,8 @@ bool wxWindowGTK::Reparent( wxWindowBase *newParentBase ) wxASSERT( GTK_IS_WIDGET(m_widget) ); - /* prevent GTK from deleting the widget arbitrarily */ - gtk_widget_ref( m_widget ); - if (oldParent) - { gtk_container_remove( GTK_CONTAINER(m_widget->parent), m_widget ); - } wxASSERT( GTK_IS_WIDGET(m_widget) ); @@ -3210,14 +3093,10 @@ bool wxWindowGTK::Reparent( wxWindowBase *newParentBase ) m_showOnIdle = true; gtk_widget_hide( m_widget ); } - /* insert GTK representation */ - (*(newParent->m_insertCallback))(newParent, this); + newParent->AddChildGTK(this); } - /* reverse: prevent GTK from deleting the widget arbitrarily */ - gtk_widget_unref( m_widget ); - SetLayoutDirection(wxLayout_Default); return true; @@ -3232,7 +3111,7 @@ void wxWindowGTK::DoAddChild(wxWindowGTK *child) AddChild( child ); /* insert GTK representation */ - (*m_insertCallback)(this, child); + AddChildGTK(child); } void wxWindowGTK::AddChild(wxWindowBase *child) @@ -3306,7 +3185,7 @@ wxWindowGTK::AdjustForLayoutDirection(wxCoord x, return x; } -void wxWindowGTK::DoMoveInTabOrder(wxWindow *win, MoveKind move) +void wxWindowGTK::DoMoveInTabOrder(wxWindow *win, WindowOrder move) { wxWindowBase::DoMoveInTabOrder(win, move); m_dirtyTabOrder = true; @@ -3684,7 +3563,7 @@ void wxWindowGTK::GtkSendPaintEvents() else { wxWindowDC dc( (wxWindow*)this ); - dc.SetClippingRegion( m_updateRegion ); + dc.SetDeviceClippingRegion( m_updateRegion ); // Work around gtk-qt <= 0.60 bug whereby the window colour // remains grey @@ -3697,16 +3576,16 @@ void wxWindowGTK::GtkSendPaintEvents() wxEraseEvent erase_event( GetId(), &dc ); erase_event.SetEventObject( this ); - GetEventHandler()->ProcessEvent(erase_event); + HandleWindowEvent(erase_event); } - + wxNcPaintEvent nc_paint_event( GetId() ); nc_paint_event.SetEventObject( this ); - GetEventHandler()->ProcessEvent( nc_paint_event ); - + HandleWindowEvent( nc_paint_event ); + wxPaintEvent paint_event( GetId() ); paint_event.SetEventObject( this ); - GetEventHandler()->ProcessEvent( paint_event ); + HandleWindowEvent( paint_event ); m_clipPaintRegion = false; @@ -3932,6 +3811,103 @@ bool wxWindowGTK::SetBackgroundStyle(wxBackgroundStyle style) return true; } +// ---------------------------------------------------------------------------- +// Pop-up menu stuff +// ---------------------------------------------------------------------------- + +#if wxUSE_MENUS_NATIVE + +static void SetInvokingWindow( wxMenu *menu, wxWindow* win ) +{ + menu->SetInvokingWindow( win ); + + wxMenuItemList::compatibility_iterator node = menu->GetMenuItems().GetFirst(); + while (node) + { + wxMenuItem *menuitem = node->GetData(); + if (menuitem->IsSubMenu()) + { + SetInvokingWindow( menuitem->GetSubMenu(), win ); + } + + node = node->GetNext(); + } +} + +extern "C" { +static +void wxPopupMenuPositionCallback( GtkMenu *menu, + gint *x, gint *y, + gboolean * WXUNUSED(whatever), + gpointer user_data ) +{ + // ensure that the menu appears entirely on screen + GtkRequisition req; + gtk_widget_get_child_requisition(GTK_WIDGET(menu), &req); + + wxSize sizeScreen = wxGetDisplaySize(); + wxPoint *pos = (wxPoint*)user_data; + + gint xmax = sizeScreen.x - req.width, + ymax = sizeScreen.y - req.height; + + *x = pos->x < xmax ? pos->x : xmax; + *y = pos->y < ymax ? pos->y : ymax; +} +} + +void wxWindowGTK::DoPopupMenuUpdateUI(wxMenu* menu) +{ + menu->UpdateUI(); +} + +bool wxWindowGTK::DoPopupMenu( wxMenu *menu, int x, int y ) +{ + wxCHECK_MSG( m_widget != NULL, false, wxT("invalid window") ); + + wxCHECK_MSG( menu != NULL, false, wxT("invalid popup-menu") ); + + SetInvokingWindow( menu, this ); + + DoPopupMenuUpdateUI(menu); + + wxPoint pos; + gpointer userdata; + GtkMenuPositionFunc posfunc; + if ( x == -1 && y == -1 ) + { + // use GTK's default positioning algorithm + userdata = NULL; + posfunc = NULL; + } + else + { + pos = ClientToScreen(wxPoint(x, y)); + userdata = &pos; + posfunc = wxPopupMenuPositionCallback; + } + + menu->m_popupShown = true; + gtk_menu_popup( + GTK_MENU(menu->m_menu), + (GtkWidget *) NULL, // parent menu shell + (GtkWidget *) NULL, // parent menu item + posfunc, // function to position it + userdata, // client data + 0, // button used to activate it + gtk_get_current_event_time() + ); + + while (menu->m_popupShown) + { + gtk_main_iteration(); + } + + return true; +} + +#endif // wxUSE_MENUS_NATIVE + #if wxUSE_DRAG_AND_DROP void wxWindowGTK::SetDropTarget( wxDropTarget *dropTarget ) @@ -4040,7 +4016,7 @@ void wxWindowGTK::GTKReleaseMouseAndNotify() DoReleaseMouse(); wxMouseCaptureLostEvent evt(GetId()); evt.SetEventObject( this ); - GetEventHandler()->ProcessEvent( evt ); + HandleWindowEvent( evt ); } /* static */ @@ -4064,11 +4040,7 @@ void wxWindowGTK::SetScrollbar(int orient, GtkRange* const sb = m_scrollBar[dir]; wxCHECK_RET( sb, _T("this window is not scrollable") ); - if (range > 0) - { - m_hasScrolling = true; - } - else + if (range <= 0) { // GtkRange requires upper > lower range = @@ -4147,8 +4119,6 @@ static inline bool IsScrollIncrement(double increment, double x) wxEventType wxWindowGTK::GetScrollEventType(GtkRange* range) { - DEBUG_MAIN_THREAD - wxASSERT(range == m_scrollBar[0] || range == m_scrollBar[1]); const int barIndex = range == m_scrollBar[1]; @@ -4299,21 +4269,92 @@ wxPoint wxGetMousePosition() } -// Needed for implementing e.g. combobox on wxGTK within a modal dialog. -void wxAddGrab(wxWindow* window) +GdkWindow* wxWindowGTK::GTKGetDrawingWindow() const { - gtk_grab_add( (GtkWidget*) window->GetHandle() ); + GdkWindow* window = NULL; + if (m_wxwindow) + window = m_wxwindow->window; + return window; } -void wxRemoveGrab(wxWindow* window) +// ---------------------------------------------------------------------------- +// freeze/thaw +// ---------------------------------------------------------------------------- + +extern "C" +{ + +// this is called if we attempted to freeze unrealized widget when it finally +// is realized (and so can be frozen): +static void wx_frozen_widget_realize(GtkWidget* w, void* WXUNUSED(data)) { - gtk_grab_remove( (GtkWidget*) window->GetHandle() ); + wxASSERT( w && !GTK_WIDGET_NO_WINDOW(w) ); + wxASSERT( GTK_WIDGET_REALIZED(w) ); + + g_signal_handlers_disconnect_by_func + ( + w, + (void*)wx_frozen_widget_realize, + NULL + ); + + gdk_window_freeze_updates(w->window); } -GdkWindow* wxWindowGTK::GTKGetDrawingWindow() const +} // extern "C" + +void wxWindowGTK::GTKFreezeWidget(GtkWidget *w) { - GdkWindow* window = NULL; - if (m_wxwindow) - window = m_wxwindow->window; - return window; + if ( !w || GTK_WIDGET_NO_WINDOW(w) ) + return; // window-less widget, cannot be frozen + + if ( !GTK_WIDGET_REALIZED(w) ) + { + // we can't thaw unrealized widgets because they don't have GdkWindow, + // so set it up to be done immediately after realization: + g_signal_connect_after + ( + w, + "realize", + G_CALLBACK(wx_frozen_widget_realize), + NULL + ); + return; + } + + gdk_window_freeze_updates(w->window); +} + +void wxWindowGTK::GTKThawWidget(GtkWidget *w) +{ + if ( !w || GTK_WIDGET_NO_WINDOW(w) ) + return; // window-less widget, cannot be frozen + + if ( !GTK_WIDGET_REALIZED(w) ) + { + // the widget wasn't realized yet, no need to thaw + g_signal_handlers_disconnect_by_func + ( + w, + (void*)wx_frozen_widget_realize, + NULL + ); + return; + } + + gdk_window_thaw_updates(w->window); +} + +void wxWindowGTK::DoFreeze() +{ + GTKFreezeWidget(m_widget); + if ( m_wxwindow && m_widget != m_wxwindow ) + GTKFreezeWidget(m_wxwindow); +} + +void wxWindowGTK::DoThaw() +{ + GTKThawWidget(m_widget); + if ( m_wxwindow && m_widget != m_wxwindow ) + GTKThawWidget(m_wxwindow); }