X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9800347d77319c663d987889967054f91e5898c7..d26cb76b58d53bdd667e706f12442c349ff13bc1:/src/gtk/window.cpp diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp index d6cbbfdc19..759ebc9afe 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 @@ -228,7 +228,7 @@ int g_lastButtonNumber = 0; //----------------------------------------------------------------------------- // the trace mask used for the focus debugging messages -#define TRACE_FOCUS _T("focus") +#define TRACE_FOCUS wxT("focus") //----------------------------------------------------------------------------- // missing gdk functions @@ -383,7 +383,7 @@ inline bool wxIsUpperChar(int code) // set WXTRACE to this to see the key event codes on the console -#define TRACE_KEYS _T("keyevent") +#define TRACE_KEYS wxT("keyevent") // translates an X key symbol to WXK_XXX value // @@ -683,7 +683,6 @@ static void wxFillOtherKeyEventFields(wxKeyEvent& event, 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_scanCode = gdk_event->keyval; event.m_rawCode = (wxUint32) gdk_event->keyval; event.m_rawFlags = 0; #if wxUSE_UNICODE @@ -715,9 +714,9 @@ wxTranslateGTKKeyEventToWx(wxKeyEvent& event, KeySym keysym = gdk_event->keyval; - wxLogTrace(TRACE_KEYS, _T("Key %s event: keysym = %ld"), - event.GetEventType() == wxEVT_KEY_UP ? _T("release") - : _T("press"), + wxLogTrace(TRACE_KEYS, wxT("Key %s event: keysym = %ld"), + event.GetEventType() == wxEVT_KEY_UP ? wxT("release") + : wxT("press"), keysym); long key_code = wxTranslateKeySymToWXKey(keysym, false /* !isChar */); @@ -746,7 +745,7 @@ wxTranslateGTKKeyEventToWx(wxKeyEvent& event, Display *dpy = (Display *)wxGetDisplay(); KeyCode keycode = XKeysymToKeycode(dpy, keysym); - wxLogTrace(TRACE_KEYS, _T("\t-> keycode %d"), keycode); + wxLogTrace(TRACE_KEYS, wxT("\t-> keycode %d"), keycode); KeySym keysymNormalized = XKeycodeToKeysym(dpy, keycode, 0); @@ -785,7 +784,7 @@ wxTranslateGTKKeyEventToWx(wxKeyEvent& event, } } - wxLogTrace(TRACE_KEYS, _T("\t-> wxKeyCode %ld"), key_code); + wxLogTrace(TRACE_KEYS, wxT("\t-> wxKeyCode %ld"), key_code); // sending unknown key events doesn't really make sense if ( !key_code ) @@ -858,7 +857,7 @@ gtk_window_key_press_callback( GtkWidget *WXUNUSED(widget), win->m_imData->lastKeyEvent = NULL; if (intercepted_by_IM) { - wxLogTrace(TRACE_KEYS, _T("Key event intercepted by IM")); + wxLogTrace(TRACE_KEYS, wxT("Key event intercepted by IM")); return TRUE; } } @@ -920,7 +919,7 @@ gtk_window_key_press_callback( GtkWidget *WXUNUSED(widget), if ( key_code ) { - wxLogTrace(TRACE_KEYS, _T("Char event: %ld"), key_code); + wxLogTrace(TRACE_KEYS, wxT("Char event: %ld"), key_code); event.m_keyCode = key_code; @@ -997,7 +996,7 @@ gtk_wxwindow_commit_cb (GtkIMContext * WXUNUSED(context), event.m_uniChar = *pstr; // Backward compatible for ISO-8859-1 event.m_keyCode = *pstr < 256 ? event.m_uniChar : 0; - wxLogTrace(TRACE_KEYS, _T("IM sent character '%c'"), event.m_uniChar); + wxLogTrace(TRACE_KEYS, wxT("IM sent character '%c'"), event.m_uniChar); #else event.m_keyCode = (char)*pstr; #endif // wxUSE_UNICODE @@ -1075,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_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; - 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; @@ -1156,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; @@ -1209,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) @@ -1368,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. @@ -1418,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 ) { @@ -1454,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); @@ -1751,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 @@ -1928,30 +1925,6 @@ void gtk_window_style_set_callback( GtkWidget *WXUNUSED(widget), } // extern "C" -// Helper to suspend colour change event event processing while we change a widget's style -class wxSuspendStyleEvents -{ -public: - 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; -}; - // ---------------------------------------------------------------------------- // this wxWindowBase function is implemented here (in platform-specific file) // because it is static and so couldn't be made virtual @@ -1966,8 +1939,10 @@ wxWindow *wxWindowBase::DoFindFocus() void wxWindowGTK::AddChildGTK(wxWindowGTK* child) { - /* the window might have been scrolled already, do we - have to adapt the position */ + 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; @@ -2000,16 +1975,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_META_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; } @@ -2342,40 +2317,25 @@ void wxWindowGTK::PostCreation() G_CALLBACK(size_allocate), this); } - if (m_wxwindow) - { #if GTK_CHECK_VERSION(2, 8, 0) - if (!gtk_check_version(2,8,0)) + if ( gtk_check_version(2,8,0) == NULL ) + { + // Make sure we can notify the app when mouse capture is lost + if ( m_wxwindow ) { - // Make sure we can notify the app when mouse capture is lost g_signal_connect (m_wxwindow, "grab_broken_event", G_CALLBACK (gtk_window_grab_broken), this); } -#endif - } - if ( connect_widget != m_wxwindow ) - { -#if GTK_CHECK_VERSION(2, 8, 0) - if (!gtk_check_version(2,8,0)) + if ( connect_widget != m_wxwindow ) { - // Make sure we can notify app code when mouse capture is lost g_signal_connect (connect_widget, "grab_broken_event", G_CALLBACK (gtk_window_grab_broken), this); } -#endif } +#endif // GTK+ >= 2.8 -#ifdef GTK_IS_FILE_CHOOSER_BUTTON - if (!gtk_check_version(2,6,0) && GTK_IS_FILE_CHOOSER_BUTTON(m_widget)) - { - // If we connect to the "size_request" signal of a GtkFileChooserButton - // then that control won't be sized properly when placed inside sizers - // (this can be tested removing this elseif and running XRC or WIDGETS samples) - // FIXME: what should be done here ? - } else -#endif - if ( !IsTopLevel() ) // top level windows use their own callback + if ( GTKShouldConnectSizeRequest() ) { // This is needed if we want to add our windows into native // GTK controls, such as the toolbar. With this callback, the @@ -2398,6 +2358,11 @@ void wxWindowGTK::PostCreation() gtk_widget_show( m_widget ); } +gulong wxWindowGTK::GTKConnectWidget(const char *signal, void (*callback)()) +{ + return g_signal_connect(m_widget, signal, callback, this); +} + void wxWindowGTK::ConnectWidget( GtkWidget *widget ) { g_signal_connect (widget, "key_press_event", @@ -2444,7 +2409,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); } @@ -2540,10 +2508,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)) { @@ -2570,7 +2544,7 @@ void wxWindowGTK::OnInternalIdle() GTKHandleDeferredFocusOut(); // Check if we have to show window now - if (GtkShowFromOnIdle()) return; + if (GTKShowFromOnIdle()) return; if ( m_dirtyTabOrder ) { @@ -2578,8 +2552,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()); @@ -2821,29 +2795,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; } @@ -2908,12 +2893,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(); @@ -3151,14 +3136,14 @@ void wxWindowGTK::SetFocus() !GTK_WIDGET_CAN_FOCUS(widget) ) { wxLogTrace(TRACE_FOCUS, - _T("Setting focus to a child of %s(%p, %s)"), + wxT("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)"), + wxT("Setting focus to %s(%p, %s)"), GetClassInfo()->GetClassName(), this, GetLabel().c_str()); gtk_widget_grab_focus(widget); } @@ -3252,7 +3237,7 @@ wxLayoutDirection wxWindowGTK::GTKGetLayout(GtkWidget *widget) /* static */ void wxWindowGTK::GTKSetLayout(GtkWidget *widget, wxLayoutDirection dir) { - wxASSERT_MSG( dir != wxLayout_Default, _T("invalid layout direction") ); + wxASSERT_MSG( dir != wxLayout_Default, wxT("invalid layout direction") ); gtk_widget_set_direction(widget, dir == wxLayout_RightToLeft ? GTK_TEXT_DIR_RTL @@ -3309,14 +3294,14 @@ bool wxWindowGTK::DoNavigateIn(int flags) { if ( flags & wxNavigationKeyEvent::WinChange ) { - wxFAIL_MSG( _T("not implemented") ); + wxFAIL_MSG( wxT("not implemented") ); return false; } else // navigate inside the container { wxWindow *parent = wxGetTopLevelParent((wxWindow *)this); - wxCHECK_MSG( parent, false, _T("every window must have a TLW parent") ); + wxCHECK_MSG( parent, false, wxT("every window must have a TLW parent") ); GtkDirectionType dir; dir = flags & wxNavigationKeyEvent::IsForward ? GTK_DIR_TAB_FORWARD @@ -3458,7 +3443,7 @@ void wxWindowGTK::GTKUpdateCursor() GdkWindow *win = windowsThis[n]; if ( !win ) { - wxFAIL_MSG(_T("NULL window returned by GTKGetWindow()?")); + wxFAIL_MSG(wxT("NULL window returned by GTKGetWindow()?")); continue; } @@ -3494,7 +3479,7 @@ wxWindowGTK::ScrollDir wxWindowGTK::ScrollDirFromRange(GtkRange *range) const return (ScrollDir)dir; } - wxFAIL_MSG( _T("event from unknown scrollbar received") ); + wxFAIL_MSG( wxT("event from unknown scrollbar received") ); return ScrollDir_Max; } @@ -3531,63 +3516,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 (rect) + gtk_widget_queue_draw_area( m_widget, rect->x, rect->y, rect->width, rect->height ); + else + gtk_widget_queue_draw( m_widget ); + } + else { - if (m_wxwindow->window == NULL) return; + // 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(); -} + if (m_widget && m_widget->window) + { + 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); -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 ); + gdk_window_process_updates(m_widget->window, TRUE); - // 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() ) - { - node->GetData()->GtkUpdate(); + // Flush again, but no need to wait for it to finish + gdk_display_flush(display); } } @@ -3596,7 +3576,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) @@ -3642,54 +3621,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() ); @@ -3730,10 +3729,24 @@ void wxWindowGTK::DoSetToolTip( wxToolTip *tip ) wxWindowBase::DoSetToolTip(tip); if (m_tooltip) - m_tooltip->Apply( (wxWindow *)this ); + { + m_tooltip->GTKApply( (wxWindow *)this ); + } + else + { + GtkWidget *w = GetConnectWidget(); + wxToolTip::GTKApply(w, NULL); +#if GTK_CHECK_VERSION(2, 12, 0) + // Just applying NULL doesn't work on 2.12.0, so also use + // gtk_widget_set_has_tooltip. It is part of the new GtkTooltip API + // but seems also to work with the old GtkTooltips. + if (gtk_check_version(2, 12, 0) == NULL) + gtk_widget_set_has_tooltip(w, FALSE); +#endif + } } -void wxWindowGTK::ApplyToolTip( GtkTooltips *tips, const gchar *tip ) +void wxWindowGTK::GTKApplyToolTip( GtkTooltips *tips, const gchar *tip ) { gtk_tooltips_set_tip(tips, GetConnectWidget(), tip, NULL); } @@ -3754,8 +3767,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; } @@ -3777,17 +3789,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 && @@ -3856,9 +3868,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); @@ -3871,19 +3883,37 @@ void wxWindowGTK::ApplyWidgetStyle(bool forceStyle) void wxWindowGTK::DoApplyWidgetStyle(GtkRcStyle *style) { - wxSuspendStyleEvents s(static_cast(this)); + if ( m_wxwindow ) + { + // block the signal temporarily to avoid sending + // wxSysColourChangedEvents when we change the colours ourselves + bool unblock = false; + if ( IsTopLevel() ) + { + unblock = true; + g_signal_handlers_block_by_func( + m_wxwindow, (void *)gtk_window_style_set_callback, this); + } - if (m_wxwindow) gtk_widget_modify_style(m_wxwindow, style); + + if ( unblock ) + { + g_signal_handlers_unblock_by_func( + m_wxwindow, (void *)gtk_window_style_set_callback, this); + } + } else + { gtk_widget_modify_style(m_widget, style); + } } bool wxWindowGTK::SetBackgroundStyle(wxBackgroundStyle style) { wxWindowBase::SetBackgroundStyle(style); - if (style == wxBG_STYLE_CUSTOM) + if ( style == wxBG_STYLE_PAINT ) { GdkWindow *window; if ( m_wxwindow ) @@ -3919,8 +3949,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; } @@ -3969,11 +4000,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") ); @@ -3982,7 +4008,7 @@ bool wxWindowGTK::DoPopupMenu( wxMenu *menu, int x, int y ) SetInvokingWindow( menu, this ); - DoPopupMenuUpdateUI(menu); + menu->UpdateUI(); wxPoint pos; gpointer userdata; @@ -4070,7 +4096,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; } @@ -4085,7 +4111,7 @@ void wxWindowGTK::DoCaptureMouse() else window = GetConnectWidget()->window; - wxCHECK_RET( window, _T("CaptureMouse() failed") ); + wxCHECK_RET( window, wxT("CaptureMouse() failed") ); const wxCursor* cursor = &m_cursor; if (!cursor->Ok()) @@ -4151,7 +4177,7 @@ void wxWindowGTK::SetScrollbar(int orient, { const int dir = ScrollDirFromOrient(orient); GtkRange* const sb = m_scrollBar[dir]; - wxCHECK_RET( sb, _T("this window is not scrollable") ); + wxCHECK_RET( sb, wxT("this window is not scrollable") ); if (range <= 0) { @@ -4180,7 +4206,7 @@ void wxWindowGTK::SetScrollPos(int orient, int pos, bool WXUNUSED(refresh)) { const int dir = ScrollDirFromOrient(orient); GtkRange * const sb = m_scrollBar[dir]; - wxCHECK_RET( sb, _T("this window is not scrollable") ); + wxCHECK_RET( sb, wxT("this window is not scrollable") ); // This check is more than an optimization. Without it, the slider // will not move smoothly while tracking when using wxScrollHelper. @@ -4200,25 +4226,25 @@ void wxWindowGTK::SetScrollPos(int orient, int pos, bool WXUNUSED(refresh)) int wxWindowGTK::GetScrollThumb(int orient) const { GtkRange * const sb = m_scrollBar[ScrollDirFromOrient(orient)]; - wxCHECK_MSG( sb, 0, _T("this window is not scrollable") ); + wxCHECK_MSG( sb, 0, wxT("this window is not scrollable") ); - return int(sb->adjustment->page_size); + return wxRound(sb->adjustment->page_size); } int wxWindowGTK::GetScrollPos( int orient ) const { GtkRange * const sb = m_scrollBar[ScrollDirFromOrient(orient)]; - wxCHECK_MSG( sb, 0, _T("this window is not scrollable") ); + wxCHECK_MSG( sb, 0, wxT("this window is not scrollable") ); - return int(sb->adjustment->value + 0.5); + return wxRound(sb->adjustment->value); } int wxWindowGTK::GetScrollRange( int orient ) const { GtkRange * const sb = m_scrollBar[ScrollDirFromOrient(orient)]; - wxCHECK_MSG( sb, 0, _T("this window is not scrollable") ); + wxCHECK_MSG( sb, 0, wxT("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 @@ -4230,21 +4256,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; } @@ -4311,7 +4337,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 @@ -4322,7 +4348,7 @@ void wxWindowGTK::GtkScrolledWindowSetBorder(GtkWidget* w, int wxstyle) if(wxstyle & wxBORDER_RAISED) gtkstyle = GTK_SHADOW_OUT; - else if (wxstyle & wxBORDER_SUNKEN) + else if ((wxstyle & wxBORDER_SUNKEN) || (wxstyle & wxBORDER_THEME)) gtkstyle = GTK_SHADOW_IN; #if 0 // Now obsolete