X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b22bb1a015c4cc734e55bdfcebabc99da24e185e..52147d1c4bb54b904253e388da76747e459157c0:/src/gtk/window.cpp diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp index 72073cf314..b72018c1df 100644 --- a/src/gtk/window.cpp +++ b/src/gtk/window.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: src/gtk/window.cpp -// Purpose: +// Purpose: wxWindowGTK implementation // Author: Robert Roebling // Id: $Id$ // Copyright: (c) 1998 Robert Roebling, Julian Smart @@ -40,6 +40,29 @@ #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 //----------------------------------------------------------------------------- @@ -182,7 +205,7 @@ extern wxCursor g_globalCursor; // mouse capture state: the window which has it and if the mouse is currently // inside it -static wxWindowGTK *g_captureWindow = (wxWindowGTK*) NULL; +static wxWindowGTK *g_captureWindow = NULL; static bool g_captureWindowHasMouse = false; // The window that currently has focus: @@ -197,7 +220,7 @@ static wxWindowGTK *gs_deferredFocusOut = NULL; // global variables because GTK+ DnD want to have the // mouse event that caused it -GdkEvent *g_lastMouseEvent = (GdkEvent*) NULL; +GdkEvent *g_lastMouseEvent = NULL; int g_lastButtonNumber = 0; //----------------------------------------------------------------------------- @@ -234,11 +257,11 @@ gdk_window_warp_pointer (GdkWindow *window, // "size_request" of m_widget //----------------------------------------------------------------------------- -// make it extern because wxStaticText needs to disconnect this one extern "C" { -void wxgtk_window_size_request_callback(GtkWidget * WXUNUSED(widget), - GtkRequisition *requisition, - wxWindow * win) +static void +wxgtk_window_size_request_callback(GtkWidget * WXUNUSED(widget), + GtkRequisition *requisition, + wxWindow * win) { int w, h; win->GetSize( &w, &h ); @@ -272,38 +295,31 @@ gtk_window_expose_callback( GtkWidget* widget, } } +#ifndef __WXUNIVERSAL__ //----------------------------------------------------------------------------- -// "expose_event" from m_widget, for drawing border +// "expose_event" from m_wxwindow->parent, for drawing border //----------------------------------------------------------------------------- -#ifndef __WXUNIVERSAL__ - -GtkWidget* GetEntryWidget(); - extern "C" { static gboolean expose_event_border(GtkWidget* widget, GdkEventExpose* gdk_event, wxWindow* win) { - // if this event is not for the GdkWindow the border is drawn on - if (win->m_wxwindow == win->m_widget && gdk_event->window == widget->window) + if (gdk_event->window != widget->window) + return false; + + const GtkAllocation& alloc = win->m_wxwindow->allocation; + const int x = alloc.x; + const int y = alloc.y; + const int w = alloc.width; + const int h = alloc.height; + + if (w <= 0 || h <= 0) return false; - int x = 0; - int y = 0; - // GtkScrolledWindow is GTK_NO_WINDOW - if (GTK_WIDGET_NO_WINDOW(widget)) - { - x = widget->allocation.x; - y = widget->allocation.y; - } - int w = win->m_wxwindow->allocation.width; - int h = win->m_wxwindow->allocation.height; 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, x, y, w - 1, h - 1); - g_object_unref(gc); + gdk_draw_rectangle(gdk_event->window, + widget->style->black_gc, false, x, y, w - 1, h - 1); } else { @@ -313,21 +329,39 @@ expose_event_border(GtkWidget* widget, GdkEventExpose* gdk_event, wxWindow* win) // Style detail to use const char* detail; - if (widget == win->m_wxwindow) + if (win->m_widget == win->m_wxwindow) // for non-scrollable wxWindows detail = "entry"; else // for scrollable ones detail = "viewport"; - GtkWidget* styleWidget = GetEntryWidget(); gtk_paint_shadow( - styleWidget->style, gdk_event->window, GTK_STATE_NORMAL, - shadow, NULL, styleWidget, detail, x, y, w, h); + win->m_wxwindow->style, gdk_event->window, GTK_STATE_NORMAL, + shadow, NULL, wxGTKPrivate::GetEntryWidget(), detail, x, y, w, h); } + return false; +} +} + +//----------------------------------------------------------------------------- +// "parent_set" from m_wxwindow +//----------------------------------------------------------------------------- - // no further painting is needed for border-only GdkWindow - return win->m_wxwindow == win->m_widget; +extern "C" { +static void +parent_set(GtkWidget* widget, GtkObject* old_parent, wxWindow* win) +{ + if (old_parent) + { + g_signal_handlers_disconnect_by_func( + old_parent, (void*)expose_event_border, win); + } + if (widget->parent) + { + g_signal_connect_after(widget->parent, "expose_event", + G_CALLBACK(expose_event_border), win); + } } } #endif // !__WXUNIVERSAL__ @@ -648,8 +682,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_scanCode = gdk_event->keyval; + event.m_metaDown = (gdk_event->state & GDK_META_MASK) != 0; event.m_rawCode = (wxUint32) gdk_event->keyval; event.m_rawFlags = 0; #if wxUSE_UNICODE @@ -790,7 +823,7 @@ 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 ) { @@ -799,12 +832,6 @@ gtk_window_key_press_callback( GtkWidget *widget, 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; @@ -1047,15 +1074,15 @@ template void InitMouseEvent(wxWindowGTK *win, T *gdk_event) { event.SetTimestamp( gdk_event->time ); - 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_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; - event.m_aux1Down = gdk_event->state & GDK_BUTTON4_MASK; - event.m_aux2Down = gdk_event->state & GDK_BUTTON5_MASK; + 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_META_MASK) != 0; + event.m_leftDown = (gdk_event->state & GDK_BUTTON1_MASK) != 0; + event.m_middleDown = (gdk_event->state & GDK_BUTTON2_MASK) != 0; + event.m_rightDown = (gdk_event->state & GDK_BUTTON3_MASK) != 0; + event.m_aux1Down = (gdk_event->state & GDK_BUTTON4_MASK) != 0; + event.m_aux2Down = (gdk_event->state & GDK_BUTTON5_MASK) != 0; wxPoint pt = win->GetClientAreaOrigin(); event.m_x = (wxCoord)gdk_event->x - pt.x; @@ -1128,7 +1155,7 @@ wxWindowGTK *FindWindowForMouseEvent(wxWindowGTK *win, wxCoord& x, wxCoord& y) if (!child->IsShown()) continue; - if (child->IsTransparentForMouse()) + if (child->GTKIsTransparentForMouse()) { // wxStaticBox is transparent in the box itself int xx1 = child->m_x; @@ -1154,7 +1181,7 @@ wxWindowGTK *FindWindowForMouseEvent(wxWindowGTK *win, wxCoord& x, wxCoord& y) } else { - if ((child->m_wxwindow == (GtkWidget*) NULL) && + if ((child->m_wxwindow == NULL) && (child->m_x <= xx) && (child->m_y <= yy) && (child->m_x+child->m_width >= xx) && @@ -1181,6 +1208,11 @@ bool wxWindowGTK::GTKProcessEvent(wxEvent& event) const return HandleWindowEvent(event); } +bool wxWindowGTK::GTKShouldIgnoreEvent() const +{ + return !m_hasVMT || g_blockEventsOnDrag; +} + int wxWindowGTK::GTKCallbackCommonPrologue(GdkEventAny *event) const { if (!m_hasVMT) @@ -1340,10 +1372,6 @@ gtk_window_button_press_callback( GtkWidget *widget, AdjustEventButtonState(event); - // wxListBox actually gets mouse events from the item, so we need to give it - // a chance to correct this - win->FixUpMouseEvent(widget, event.m_x, event.m_y); - // find the correct window to send the event to: it may be a different one // from the one which got it at GTK+ level because some controls don't have // their own X window and thus cannot get any events. @@ -1390,7 +1418,7 @@ gtk_window_button_press_callback( GtkWidget *widget, //----------------------------------------------------------------------------- static gboolean -gtk_window_button_release_callback( GtkWidget *widget, +gtk_window_button_release_callback( GtkWidget *WXUNUSED(widget), GdkEventButton *gdk_event, wxWindowGTK *win ) { @@ -1426,9 +1454,6 @@ gtk_window_button_release_callback( GtkWidget *widget, AdjustEventButtonState(event); - // same wxListBox hack as above - win->FixUpMouseEvent(widget, event.m_x, event.m_y); - if ( !g_captureWindow ) win = FindWindowForMouseEvent(win, event.m_x, event.m_y); @@ -1519,6 +1544,38 @@ gtk_window_motion_notify_callback( GtkWidget * WXUNUSED(widget), // "scroll_event" (mouse wheel event) //----------------------------------------------------------------------------- +static gboolean +window_scroll_event_hscrollbar(GtkWidget*, GdkEventScroll* gdk_event, wxWindow* win) +{ + if (gdk_event->direction != GDK_SCROLL_LEFT && + gdk_event->direction != GDK_SCROLL_RIGHT) + { + return false; + } + + wxMouseEvent event(wxEVT_MOUSEWHEEL); + InitMouseEvent(win, event, gdk_event); + + GtkRange *range = win->m_scrollBar[wxWindow::ScrollDir_Horz]; + if (!range) return FALSE; + + if (range && GTK_WIDGET_VISIBLE (range)) + { + GtkAdjustment *adj = range->adjustment; + gdouble delta = adj->step_increment * 3; + if (gdk_event->direction == GDK_SCROLL_LEFT) + delta = -delta; + + gdouble new_value = CLAMP (adj->value + delta, adj->lower, adj->upper - adj->page_size); + + gtk_adjustment_set_value (adj, new_value); + + return TRUE; + } + + return FALSE; +} + static gboolean window_scroll_event(GtkWidget*, GdkEventScroll* gdk_event, wxWindow* win) { @@ -1539,7 +1596,27 @@ window_scroll_event(GtkWidget*, GdkEventScroll* gdk_event, wxWindow* win) else event.m_wheelRotation = -120; - return win->GTKProcessEvent(event); + if (win->GTKProcessEvent(event)) + return TRUE; + + GtkRange *range = win->m_scrollBar[wxWindow::ScrollDir_Vert]; + if (!range) return FALSE; + + if (range && GTK_WIDGET_VISIBLE (range)) + { + GtkAdjustment *adj = range->adjustment; + gdouble delta = adj->step_increment * 3; + if (gdk_event->direction == GDK_SCROLL_UP) + delta = -delta; + + gdouble new_value = CLAMP (adj->value + delta, adj->lower, adj->upper - adj->page_size); + + gtk_adjustment_set_value (adj, new_value); + + return TRUE; + } + + return FALSE; } //----------------------------------------------------------------------------- @@ -1671,7 +1748,7 @@ gtk_window_leave_callback( GtkWidget *widget, static void gtk_scrollbar_value_changed(GtkRange* range, wxWindow* win) { - wxEventType eventType = win->GetScrollEventType(range); + wxEventType eventType = win->GTKGetScrollEventType(range); if (eventType != wxEVT_NULL) { // Convert scroll event type to scrollwin event type @@ -1756,7 +1833,7 @@ gtk_window_realized_callback(GtkWidget* widget, wxWindow* win) gtk_im_context_set_client_window( win->m_imData->context, widget->window); } - + // We cannot set colours and fonts before the widget // been realized, so we do this directly after realization // or otherwise in idle time @@ -1881,32 +1958,23 @@ wxWindow *wxWindowBase::DoFindFocus() { wxWindowGTK *focus = gs_pendingFocus ? gs_pendingFocus : gs_currentFocus; // the cast is necessary when we compile in wxUniversal mode - return wx_static_cast(wxWindow*, focus); + return static_cast(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); + wxASSERT_MSG(m_wxwindow, "Cannot add a child to a window without a client area"); + + // the window might have been scrolled already, we + // have to adapt the position + 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); } //----------------------------------------------------------------------------- @@ -1931,16 +1999,16 @@ wxMouseState wxGetMouseState() ms.SetX(x); ms.SetY(y); - ms.SetLeftDown(mask & GDK_BUTTON1_MASK); - ms.SetMiddleDown(mask & GDK_BUTTON2_MASK); - ms.SetRightDown(mask & GDK_BUTTON3_MASK); - ms.SetAux1Down(mask & GDK_BUTTON4_MASK); - ms.SetAux2Down(mask & GDK_BUTTON5_MASK); + ms.SetLeftDown((mask & GDK_BUTTON1_MASK) != 0); + ms.SetMiddleDown((mask & GDK_BUTTON2_MASK) != 0); + ms.SetRightDown((mask & GDK_BUTTON3_MASK) != 0); + ms.SetAux1Down((mask & GDK_BUTTON4_MASK) != 0); + ms.SetAux2Down((mask & GDK_BUTTON5_MASK) != 0); - 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.SetControlDown((mask & GDK_CONTROL_MASK) != 0); + ms.SetShiftDown((mask & GDK_SHIFT_MASK) != 0); + ms.SetAltDown((mask & GDK_MOD1_MASK) != 0); + ms.SetMetaDown((mask & GDK_META_MASK) != 0); return ms; } @@ -1960,9 +2028,9 @@ wxMouseState wxGetMouseState() void wxWindowGTK::Init() { // GTK specific - m_widget = (GtkWidget *) NULL; - m_wxwindow = (GtkWidget *) NULL; - m_focusWidget = (GtkWidget *) NULL; + m_widget = NULL; + m_wxwindow = NULL; + m_focusWidget = NULL; // position/size m_x = 0; @@ -1971,9 +2039,8 @@ void wxWindowGTK::Init() m_height = 0; m_hasVMT = false; - m_isBeingDeleted = false; - m_showOnIdle= false; + m_showOnIdle = false; m_noExpose = false; m_nativeSizeEvent = false; @@ -1991,8 +2058,6 @@ void wxWindowGTK::Init() m_oldClientWidth = m_oldClientHeight = 0; - m_insertCallback = wxInsertChildInWindow; - m_clipPaintRegion = false; m_needsStyleChange = false; @@ -2029,6 +2094,7 @@ bool wxWindowGTK::Create( wxWindow *parent, { // Get default border wxBorder border = GetBorder(style); + style &= ~wxBORDER_MASK; style |= border; @@ -2039,19 +2105,29 @@ bool wxWindowGTK::Create( wxWindow *parent, return false; } + // We should accept the native look +#if 0 + GtkScrolledWindowClass *scroll_class = GTK_SCROLLED_WINDOW_CLASS( GTK_OBJECT_GET_CLASS(m_widget) ); + scroll_class->scrollbar_spacing = 0; +#endif + - m_wxwindow = wxPizza::New(m_windowStyle); + m_wxwindow = wxPizza::New(m_windowStyle,this); +#ifndef __WXUNIVERSAL__ + if (HasFlag(wxPizza::BORDER_STYLES)) + { + g_signal_connect(m_wxwindow, "parent_set", + G_CALLBACK(parent_set), this); + } +#endif if (!HasFlag(wxHSCROLL) && !HasFlag(wxVSCROLL)) m_widget = m_wxwindow; else { - m_widget = gtk_scrolled_window_new( (GtkAdjustment *) NULL, (GtkAdjustment *) NULL ); + m_widget = gtk_scrolled_window_new( NULL, NULL ); GtkScrolledWindow *scrolledWindow = GTK_SCROLLED_WINDOW(m_widget); - GtkScrolledWindowClass *scroll_class = GTK_SCROLLED_WINDOW_CLASS( GTK_OBJECT_GET_CLASS(m_widget) ); - scroll_class->scrollbar_spacing = 0; - // There is a conflict with default bindings at GTK+ // level between scrolled windows and notebooks both of which want to use // Ctrl-PageUp/Down: scrolled windows for scrolling in the horizontal @@ -2110,6 +2186,7 @@ bool wxWindowGTK::Create( wxWindow *parent, gtk_widget_show( m_wxwindow ); } + g_object_ref(m_widget); if (m_parent) m_parent->DoAddChild( this ); @@ -2135,7 +2212,6 @@ wxWindowGTK::~wxWindowGTK() if ( gs_deferredFocusOut == this ) gs_deferredFocusOut = NULL; - m_isBeingDeleted = true; m_hasVMT = false; // destroy children before destroying this window itself @@ -2159,17 +2235,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 ) @@ -2215,15 +2291,6 @@ void wxWindowGTK::PostCreation() g_signal_connect (m_imData->context, "commit", G_CALLBACK (gtk_wxwindow_commit_cb), this); - - // border drawing -#ifndef __WXUNIVERSAL__ - if (HasFlag(wxPizza::BORDER_STYLES)) - { - g_signal_connect(m_widget, "expose_event", - G_CALLBACK(expose_event_border), this); - } -#endif } // focus handling @@ -2342,8 +2409,16 @@ void wxWindowGTK::ConnectWidget( GtkWidget *widget ) G_CALLBACK (gtk_window_button_release_callback), this); g_signal_connect (widget, "motion_notify_event", G_CALLBACK (gtk_window_motion_notify_callback), this); + g_signal_connect (widget, "scroll_event", G_CALLBACK (window_scroll_event), this); + if (m_scrollBar[ScrollDir_Horz]) + g_signal_connect (m_scrollBar[ScrollDir_Horz], "scroll_event", + G_CALLBACK (window_scroll_event_hscrollbar), this); + if (m_scrollBar[ScrollDir_Vert]) + g_signal_connect (m_scrollBar[ScrollDir_Vert], "scroll_event", + G_CALLBACK (window_scroll_event), this); + g_signal_connect (widget, "popup_menu", G_CALLBACK (wxgtk_window_popup_menu_callback), this); g_signal_connect (widget, "enter_notify_event", @@ -2368,7 +2443,10 @@ bool wxWindowGTK::Destroy() void wxWindowGTK::DoMoveWindow(int x, int y, int width, int height) { gtk_widget_set_size_request(m_widget, width, height); + // inform the parent to perform the move + wxASSERT_MSG(m_parent && m_parent->m_wxwindow, + "the parent window has no client area?"); WX_PIZZA(m_parent->m_wxwindow)->move(m_widget, x, y); } @@ -2464,10 +2542,16 @@ void wxWindowGTK::DoSetSize( int x, int y, int width, int height, int sizeFlags event.SetEventObject( this ); HandleWindowEvent( event ); } + } else + if (sizeFlags & wxSIZE_FORCE_EVENT) + { + wxSizeEvent event( wxSize(m_width,m_height), GetId() ); + event.SetEventObject( this ); + HandleWindowEvent( event ); } } -bool wxWindowGTK::GtkShowFromOnIdle() +bool wxWindowGTK::GTKShowFromOnIdle() { if (IsShown() && m_showOnIdle && !GTK_WIDGET_VISIBLE (m_widget)) { @@ -2494,7 +2578,7 @@ void wxWindowGTK::OnInternalIdle() GTKHandleDeferredFocusOut(); // Check if we have to show window now - if (GtkShowFromOnIdle()) return; + if (GTKShowFromOnIdle()) return; if ( m_dirtyTabOrder ) { @@ -2502,8 +2586,8 @@ void wxWindowGTK::OnInternalIdle() RealizeTabOrder(); } - // Update style if the window was not yet realized - // and SetBackgroundStyle(wxBG_STYLE_CUSTOM) was called + // Update style if the window was not yet realized when + // SetBackgroundStyle() was called if (m_needsStyleChange) { SetBackgroundStyle(GetBackgroundStyle()); @@ -2570,21 +2654,50 @@ void wxWindowGTK::DoGetClientSize( int *width, int *height ) const int w = m_width; int h = m_height; - if (m_wxwindow) + if ( m_wxwindow ) { // if window is scrollable, account for scrollbars - for (int i = 0; i < 2 && m_scrollBar[i]; i++) + if ( GTK_IS_SCROLLED_WINDOW(m_widget) ) { - GtkRequisition req; - GtkAdjustment* adj = gtk_range_get_adjustment(m_scrollBar[i]); - // if scrollbar enabled - if (adj->upper > adj->page_size) + GtkPolicyType policy[ScrollDir_Max]; + gtk_scrolled_window_get_policy(GTK_SCROLLED_WINDOW(m_widget), + &policy[ScrollDir_Horz], + &policy[ScrollDir_Vert]); + + for ( int i = 0; i < ScrollDir_Max; i++ ) { - gtk_widget_size_request(GTK_WIDGET(m_scrollBar[i]), &req); + // don't account for the scrollbars we don't have + GtkRange * const range = m_scrollBar[i]; + if ( !range ) + continue; + + // nor for the ones we have but don't current show + switch ( policy[i] ) + { + case GTK_POLICY_NEVER: + // never shown so doesn't take any place + continue; + + case GTK_POLICY_ALWAYS: + // no checks necessary + break; + + case GTK_POLICY_AUTOMATIC: + // may be shown or not, check + GtkAdjustment *adj = gtk_range_get_adjustment(range); + if ( adj->upper <= adj->page_size ) + continue; + } + + GtkScrolledWindowClass *scroll_class = + GTK_SCROLLED_WINDOW_CLASS( GTK_OBJECT_GET_CLASS(m_widget) ); + + GtkRequisition req; + gtk_widget_size_request(GTK_WIDGET(range), &req); if (i == ScrollDir_Horz) - h -= req.height; + h -= req.height + scroll_class->scrollbar_spacing; else - w -= req.width; + w -= req.width + scroll_class->scrollbar_spacing; } } @@ -2618,7 +2731,7 @@ void wxWindowGTK::DoGetPosition( int *x, int *y ) const if (m_x == -1 && m_y == -1) { - GdkWindow *source = (GdkWindow *) NULL; + GdkWindow *source = NULL; if (m_wxwindow) source = m_wxwindow->window; else @@ -2633,8 +2746,8 @@ void wxWindowGTK::DoGetPosition( int *x, int *y ) const if (m_parent) m_parent->ScreenToClient(&org_x, &org_y); - wx_const_cast(wxWindowGTK*, this)->m_x = org_x; - wx_const_cast(wxWindowGTK*, this)->m_y = org_y; + const_cast(this)->m_x = org_x; + const_cast(this)->m_y = org_y; } } @@ -2648,7 +2761,7 @@ void wxWindowGTK::DoClientToScreen( int *x, int *y ) const if (!m_widget->window) return; - GdkWindow *source = (GdkWindow *) NULL; + GdkWindow *source = NULL; if (m_wxwindow) source = m_wxwindow->window; else @@ -2685,7 +2798,7 @@ void wxWindowGTK::DoScreenToClient( int *x, int *y ) const if (!m_widget->window) return; - GdkWindow *source = (GdkWindow *) NULL; + GdkWindow *source = NULL; if (m_wxwindow) source = m_wxwindow->window; else @@ -2716,29 +2829,40 @@ void wxWindowGTK::DoScreenToClient( int *x, int *y ) const bool wxWindowGTK::Show( bool show ) { - wxCHECK_MSG( (m_widget != NULL), false, wxT("invalid window") ); - - if (!wxWindowBase::Show(show)) + if ( !wxWindowBase::Show(show) ) { // nothing to do return false; } - if (show && m_showOnIdle) + // notice that we may call Hide() before the window is created and this is + // actually useful to create it hidden initially -- but we can't call + // Show() before it is created + if ( !m_widget ) { - // deferred + wxASSERT_MSG( !show, "can't show invalid window" ); + return true; } - else + + if ( show ) { - if (show) - gtk_widget_show(m_widget); - else - gtk_widget_hide(m_widget); - wxShowEvent eventShow(GetId(), show); - eventShow.SetEventObject(this); - HandleWindowEvent(eventShow); + if ( m_showOnIdle ) + { + // defer until later + return true; + } + + gtk_widget_show(m_widget); + } + else // hide + { + gtk_widget_hide(m_widget); } + wxShowEvent eventShow(GetId(), show); + eventShow.SetEventObject(this); + HandleWindowEvent(eventShow); + return true; } @@ -2803,12 +2927,12 @@ int wxWindowGTK::GetCharWidth() const return (int) PANGO_PIXELS(rect.width); } -void wxWindowGTK::GetTextExtent( const wxString& string, - int *x, - int *y, - int *descent, - int *externalLeading, - const wxFont *theFont ) const +void wxWindowGTK::DoGetTextExtent( const wxString& string, + int *x, + int *y, + int *descent, + int *externalLeading, + const wxFont *theFont ) const { wxFont fontToUse = theFont ? *theFont : GetFont(); @@ -2858,6 +2982,17 @@ void wxWindowGTK::GetTextExtent( const wxString& string, g_object_unref (layout); } +void wxWindowGTK::GTKDisableFocusOutEvent() +{ + g_signal_handlers_block_by_func( m_focusWidget, + (gpointer) gtk_window_focus_out_callback, this); +} + +void wxWindowGTK::GTKEnableFocusOutEvent() +{ + g_signal_handlers_unblock_by_func( m_focusWidget, + (gpointer) gtk_window_focus_out_callback, this); +} bool wxWindowGTK::GTKHandleFocusIn() { @@ -3078,13 +3213,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) ); @@ -3095,14 +3225,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; @@ -3117,7 +3243,7 @@ void wxWindowGTK::DoAddChild(wxWindowGTK *child) AddChild( child ); /* insert GTK representation */ - (*m_insertCallback)(this, child); + AddChildGTK(child); } void wxWindowGTK::AddChild(wxWindowBase *child) @@ -3368,7 +3494,7 @@ void wxWindowGTK::WarpPointer( int x, int y ) // We provide this function ourselves as it is // missing in GDK (top of this file). - GdkWindow *window = (GdkWindow*) NULL; + GdkWindow *window = NULL; if (m_wxwindow) window = m_wxwindow->window; else @@ -3424,63 +3550,58 @@ bool wxWindowGTK::ScrollPages(int pages) void wxWindowGTK::Refresh(bool WXUNUSED(eraseBackground), const wxRect *rect) { - if (!m_widget) - return; - if (!m_widget->window) + if ( !m_widget ) + { + // it is valid to call Refresh() for a window which hasn't been created + // yet, it simply doesn't do anything in this case return; + } - if (m_wxwindow) + if (!m_wxwindow) { - if (m_wxwindow->window == NULL) return; + if (rect) + gtk_widget_queue_draw_area( m_widget, rect->x, rect->y, rect->width, rect->height ); + else + gtk_widget_queue_draw( m_widget ); + } + else + { + // Just return if the widget or one of its ancestors isn't mapped + GtkWidget *w; + for (w = m_wxwindow; w != NULL; w = w->parent) + if (!GTK_WIDGET_MAPPED (w)) + return; - GdkRectangle gdk_rect, - *p; if (rect) { - gdk_rect.x = rect->x; - gdk_rect.y = rect->y; - gdk_rect.width = rect->width; - gdk_rect.height = rect->height; + int x = rect->x; if (GetLayoutDirection() == wxLayout_RightToLeft) - gdk_rect.x = GetClientSize().x - gdk_rect.x - gdk_rect.width; - - p = &gdk_rect; - } - else // invalidate everything - { - p = NULL; + x = GetClientSize().x - x - rect->width; + GdkRectangle r; + r.x = rect->x; + r.y = rect->y; + r.width = rect->width; + r.height = rect->height; + gdk_window_invalidate_rect( m_wxwindow->window, &r, TRUE ); } - - gdk_window_invalidate_rect(m_wxwindow->window, p, true); + else + gdk_window_invalidate_rect( m_wxwindow->window, NULL, TRUE ); } } void wxWindowGTK::Update() { - GtkUpdate(); - - // when we call Update() we really want to update the window immediately on - // screen, even if it means flushing the entire queue and hence slowing down - // everything -- but it should still be done, it's just that Update() should - // be called very rarely - gdk_flush(); -} - -void wxWindowGTK::GtkUpdate() -{ - if (m_wxwindow && m_wxwindow->window) - gdk_window_process_updates(m_wxwindow->window, false); - if (m_widget && m_widget->window && (m_wxwindow != m_widget)) - gdk_window_process_updates( m_widget->window, FALSE ); - - // for consistency with other platforms (and also because it's convenient - // to be able to update an entire TLW by calling Update() only once), we - // should also update all our children here - for ( wxWindowList::compatibility_iterator node = GetChildren().GetFirst(); - node; - node = node->GetNext() ) + if (m_widget && m_widget->window) { - node->GetData()->GtkUpdate(); + GdkDisplay* display = gtk_widget_get_display(m_widget); + // Flush everything out to the server, and wait for it to finish. + // This ensures nothing will overwrite the drawing we are about to do. + gdk_display_sync(display); + + gdk_window_process_updates(m_widget->window, TRUE); + + // Flush again, but no need to wait for it to finish + gdk_display_flush(display); } } @@ -3489,7 +3610,6 @@ bool wxWindowGTK::DoIsExposed( int x, int y ) const return m_updateRegion.Contains(x, y) != wxOutRegion; } - bool wxWindowGTK::DoIsExposed( int x, int y, int w, int h ) const { if (GetLayoutDirection() == wxLayout_RightToLeft) @@ -3535,54 +3655,74 @@ void wxWindowGTK::GtkSendPaintEvents() } } - if (GetThemeEnabled() && (GetBackgroundStyle() == wxBG_STYLE_SYSTEM)) + switch ( GetBackgroundStyle() ) { - // find ancestor from which to steal background - wxWindow *parent = wxGetTopLevelParent((wxWindow *)this); - if (!parent) - parent = (wxWindow*)this; - - if (GTK_WIDGET_MAPPED(parent->m_widget)) - { - wxRegionIterator upd( m_nativeUpdateRegion ); - while (upd) + case wxBG_STYLE_ERASE: { - GdkRectangle rect; - rect.x = upd.GetX(); - rect.y = upd.GetY(); - rect.width = upd.GetWidth(); - rect.height = upd.GetHeight(); - - gtk_paint_flat_box( parent->m_widget->style, - m_wxwindow->window, - (GtkStateType)GTK_WIDGET_STATE(m_wxwindow), - GTK_SHADOW_NONE, - &rect, - parent->m_widget, - (char *)"base", - 0, 0, -1, -1 ); - - ++upd; + wxWindowDC dc( (wxWindow*)this ); + dc.SetDeviceClippingRegion( m_updateRegion ); + + // Work around gtk-qt <= 0.60 bug whereby the window colour + // remains grey + if ( UseBgCol() && + wxSystemOptions:: + GetOptionInt("gtk.window.force-background-colour") ) + { + dc.SetBackground(GetBackgroundColour()); + dc.Clear(); + } + + wxEraseEvent erase_event( GetId(), &dc ); + erase_event.SetEventObject( this ); + + if ( HandleWindowEvent(erase_event) ) + { + // background erased, don't do it again + break; + } } - } - } - else - { - wxWindowDC dc( (wxWindow*)this ); - dc.SetDeviceClippingRegion( m_updateRegion ); + // fall through - // Work around gtk-qt <= 0.60 bug whereby the window colour - // remains grey - if (GetBackgroundStyle() == wxBG_STYLE_COLOUR && GetBackgroundColour().Ok() && wxSystemOptions::GetOptionInt(wxT("gtk.window.force-background-colour")) == 1) - { - dc.SetBackground(wxBrush(GetBackgroundColour())); - dc.Clear(); - } + case wxBG_STYLE_SYSTEM: + if ( GetThemeEnabled() ) + { + // find ancestor from which to steal background + wxWindow *parent = wxGetTopLevelParent((wxWindow *)this); + if (!parent) + parent = (wxWindow*)this; - wxEraseEvent erase_event( GetId(), &dc ); - erase_event.SetEventObject( this ); + if (GTK_WIDGET_MAPPED(parent->m_widget)) + { + wxRegionIterator upd( m_nativeUpdateRegion ); + while (upd) + { + GdkRectangle rect; + rect.x = upd.GetX(); + rect.y = upd.GetY(); + rect.width = upd.GetWidth(); + rect.height = upd.GetHeight(); + + gtk_paint_flat_box( parent->m_widget->style, + m_wxwindow->window, + (GtkStateType)GTK_WIDGET_STATE(m_wxwindow), + GTK_SHADOW_NONE, + &rect, + parent->m_widget, + (char *)"base", + 0, 0, -1, -1 ); + + ++upd; + } + } + } + break; + + case wxBG_STYLE_PAINT: + // nothing to do: window will be painted over in EVT_PAINT + break; - HandleWindowEvent(erase_event); + default: + wxFAIL_MSG( "unsupported background style" ); } wxNcPaintEvent nc_paint_event( GetId() ); @@ -3623,10 +3763,10 @@ void wxWindowGTK::DoSetToolTip( wxToolTip *tip ) wxWindowBase::DoSetToolTip(tip); if (m_tooltip) - m_tooltip->Apply( (wxWindow *)this ); + m_tooltip->GTKApply( (wxWindow *)this ); } -void wxWindowGTK::ApplyToolTip( GtkTooltips *tips, const gchar *tip ) +void wxWindowGTK::GTKApplyToolTip( GtkTooltips *tips, const gchar *tip ) { gtk_tooltips_set_tip(tips, GetConnectWidget(), tip, NULL); } @@ -3647,8 +3787,7 @@ bool wxWindowGTK::SetBackgroundColour( const wxColour &colour ) // apply style change (forceStyle=true so that new style is applied // even if the bg colour changed from valid to wxNullColour) - if (GetBackgroundStyle() != wxBG_STYLE_CUSTOM) - ApplyWidgetStyle(true); + GTKApplyWidgetStyle(true); return true; } @@ -3670,17 +3809,17 @@ bool wxWindowGTK::SetForegroundColour( const wxColour &colour ) // apply style change (forceStyle=true so that new style is applied // even if the bg colour changed from valid to wxNullColour): - ApplyWidgetStyle(true); + GTKApplyWidgetStyle(true); return true; } -PangoContext *wxWindowGTK::GtkGetPangoDefaultContext() +PangoContext *wxWindowGTK::GTKGetPangoDefaultContext() { return gtk_widget_get_pango_context( m_widget ); } -GtkRcStyle *wxWindowGTK::CreateWidgetStyle(bool forceStyle) +GtkRcStyle *wxWindowGTK::GTKCreateWidgetStyle(bool forceStyle) { // do we need to apply any changes at all? if ( !forceStyle && @@ -3749,9 +3888,9 @@ GtkRcStyle *wxWindowGTK::CreateWidgetStyle(bool forceStyle) return style; } -void wxWindowGTK::ApplyWidgetStyle(bool forceStyle) +void wxWindowGTK::GTKApplyWidgetStyle(bool forceStyle) { - GtkRcStyle *style = CreateWidgetStyle(forceStyle); + GtkRcStyle *style = GTKCreateWidgetStyle(forceStyle); if ( style ) { DoApplyWidgetStyle(style); @@ -3776,7 +3915,7 @@ bool wxWindowGTK::SetBackgroundStyle(wxBackgroundStyle style) { wxWindowBase::SetBackgroundStyle(style); - if (style == wxBG_STYLE_CUSTOM) + if ( style == wxBG_STYLE_PAINT ) { GdkWindow *window; if ( m_wxwindow ) @@ -3812,8 +3951,9 @@ bool wxWindowGTK::SetBackgroundStyle(wxBackgroundStyle style) { // apply style change (forceStyle=true so that new style is applied // even if the bg colour changed from valid to wxNullColour): - ApplyWidgetStyle(true); + GTKApplyWidgetStyle(true); } + return true; } @@ -3862,11 +4002,6 @@ void wxPopupMenuPositionCallback( GtkMenu *menu, } } -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") ); @@ -3875,7 +4010,7 @@ bool wxWindowGTK::DoPopupMenu( wxMenu *menu, int x, int y ) SetInvokingWindow( menu, this ); - DoPopupMenuUpdateUI(menu); + menu->UpdateUI(); wxPoint pos; gpointer userdata; @@ -3896,8 +4031,8 @@ bool wxWindowGTK::DoPopupMenu( wxMenu *menu, int x, int y ) menu->m_popupShown = true; gtk_menu_popup( GTK_MENU(menu->m_menu), - (GtkWidget *) NULL, // parent menu shell - (GtkWidget *) NULL, // parent menu item + NULL, // parent menu shell + NULL, // parent menu item posfunc, // function to position it userdata, // client data 0, // button used to activate it @@ -3922,12 +4057,12 @@ void wxWindowGTK::SetDropTarget( wxDropTarget *dropTarget ) GtkWidget *dnd_widget = GetConnectWidget(); - if (m_dropTarget) m_dropTarget->UnregisterWidget( dnd_widget ); + if (m_dropTarget) m_dropTarget->GtkUnregisterWidget( dnd_widget ); if (m_dropTarget) delete m_dropTarget; m_dropTarget = dropTarget; - if (m_dropTarget) m_dropTarget->RegisterWidget( dnd_widget ); + if (m_dropTarget) m_dropTarget->GtkRegisterWidget( dnd_widget ); } #endif // wxUSE_DRAG_AND_DROP @@ -3963,7 +4098,7 @@ bool wxWindowGTK::SetFont( const wxFont &font ) // apply style change (forceStyle=true so that new style is applied // even if the font changed from valid to wxNullFont): - ApplyWidgetStyle(true); + GTKApplyWidgetStyle(true); return true; } @@ -3972,7 +4107,7 @@ void wxWindowGTK::DoCaptureMouse() { wxCHECK_RET( m_widget != NULL, wxT("invalid window") ); - GdkWindow *window = (GdkWindow*) NULL; + GdkWindow *window = NULL; if (m_wxwindow) window = m_wxwindow->window; else @@ -3990,7 +4125,7 @@ void wxWindowGTK::DoCaptureMouse() GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_POINTER_MOTION_MASK), - (GdkWindow *) NULL, + NULL, cursor->GetCursor(), (guint32)GDK_CURRENT_TIME ); g_captureWindow = this; @@ -4003,9 +4138,9 @@ void wxWindowGTK::DoReleaseMouse() wxCHECK_RET( g_captureWindow, wxT("can't release mouse - not captured") ); - g_captureWindow = (wxWindowGTK*) NULL; + g_captureWindow = NULL; - GdkWindow *window = (GdkWindow*) NULL; + GdkWindow *window = NULL; if (m_wxwindow) window = m_wxwindow->window; else @@ -4095,7 +4230,7 @@ int wxWindowGTK::GetScrollThumb(int orient) const GtkRange * const sb = m_scrollBar[ScrollDirFromOrient(orient)]; wxCHECK_MSG( sb, 0, _T("this window is not scrollable") ); - return int(sb->adjustment->page_size); + return wxRound(sb->adjustment->page_size); } int wxWindowGTK::GetScrollPos( int orient ) const @@ -4103,7 +4238,7 @@ int wxWindowGTK::GetScrollPos( int orient ) const GtkRange * const sb = m_scrollBar[ScrollDirFromOrient(orient)]; wxCHECK_MSG( sb, 0, _T("this window is not scrollable") ); - return int(sb->adjustment->value + 0.5); + return wxRound(sb->adjustment->value); } int wxWindowGTK::GetScrollRange( int orient ) const @@ -4111,7 +4246,7 @@ int wxWindowGTK::GetScrollRange( int orient ) const GtkRange * const sb = m_scrollBar[ScrollDirFromOrient(orient)]; wxCHECK_MSG( sb, 0, _T("this window is not scrollable") ); - return int(sb->adjustment->upper); + return wxRound(sb->adjustment->upper); } // Determine if increment is the same as +/-x, allowing for some small @@ -4123,21 +4258,21 @@ static inline bool IsScrollIncrement(double increment, double x) return fabs(increment - fabs(x)) < tolerance; } -wxEventType wxWindowGTK::GetScrollEventType(GtkRange* range) +wxEventType wxWindowGTK::GTKGetScrollEventType(GtkRange* range) { wxASSERT(range == m_scrollBar[0] || range == m_scrollBar[1]); const int barIndex = range == m_scrollBar[1]; GtkAdjustment* adj = range->adjustment; - const int value = int(adj->value + 0.5); + const int value = wxRound(adj->value); // save previous position const double oldPos = m_scrollPos[barIndex]; // update current position m_scrollPos[barIndex] = adj->value; // If event should be ignored, or integral position has not changed - if (!m_hasVMT || g_blockEventsOnDrag || value == int(oldPos + 0.5)) + if (!m_hasVMT || g_blockEventsOnDrag || value == wxRound(oldPos)) { return wxEVT_NULL; } @@ -4204,7 +4339,7 @@ void wxWindowGTK::ScrollWindow( int dx, int dy, const wxRect* WXUNUSED(rect) ) #endif // wxUSE_CARET } -void wxWindowGTK::GtkScrolledWindowSetBorder(GtkWidget* w, int wxstyle) +void wxWindowGTK::GTKScrolledWindowSetBorder(GtkWidget* w, int wxstyle) { //RN: Note that static controls usually have no border on gtk, so maybe //it makes sense to treat that as simply no border at the wx level