X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a2ee1945871d7b9d71ec18954ffb2f0f239c2e57..2bc4cc1ead29f6de1f0576a416025edadb13d7cc:/src/gtk/renderer.cpp diff --git a/src/gtk/renderer.cpp b/src/gtk/renderer.cpp index a70d4e35b7..7834a39047 100644 --- a/src/gtk/renderer.cpp +++ b/src/gtk/renderer.cpp @@ -6,7 +6,7 @@ // Created: 20.07.2003 // RCS-ID: $Id$ // Copyright: (c) 2003 Vadim Zeitlin -// License: wxWindows licence +// Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -56,6 +56,8 @@ public: virtual int GetHeaderButtonHeight(wxWindow *win); + virtual int GetHeaderButtonMargin(wxWindow *win); + // draw the expanded/collapsed icon for a tree control item virtual void DrawTreeItemButton(wxWindow *win, @@ -114,7 +116,7 @@ public: const wxRect& rect, int flags=0); - virtual void DrawRadioButton(wxWindow* win, + virtual void DrawRadioBitmap(wxWindow* win, wxDC& dc, const wxRect& rect, int flags=0); @@ -203,7 +205,7 @@ wxRendererGTK::DrawHeaderButton(wxWindow *win, gtk_paint_box ( - button->style, + gtk_widget_get_style(button), gdk_window, state, GTK_SHADOW_OUT, @@ -226,6 +228,12 @@ int wxRendererGTK::GetHeaderButtonHeight(wxWindow *WXUNUSED(win)) return req.height; } +int wxRendererGTK::GetHeaderButtonMargin(wxWindow *WXUNUSED(win)) +{ + wxFAIL_MSG( "GetHeaderButtonMargin() not implemented" ); + return -1; +} + // draw a ">" or "v" button void @@ -252,7 +260,7 @@ wxRendererGTK::DrawTreeItemButton(wxWindow* win, // in the given rectangle, +2/3 below is just what looks good here... gtk_paint_expander ( - tree->style, + gtk_widget_get_style(tree), gdk_window, state, NULL, @@ -307,7 +315,7 @@ wxRendererGTK::DrawSplitterSash(wxWindow* win, wxOrientation orient, int flags) { - if ( !win->m_wxwindow->window ) + if (gtk_widget_get_window(win->m_wxwindow) == NULL) { // window not realized yet return; @@ -345,7 +353,7 @@ wxRendererGTK::DrawSplitterSash(wxWindow* win, gtk_paint_handle ( - win->m_wxwindow->style, + gtk_widget_get_style(win->m_wxwindow), gdk_window, flags & wxCONTROL_CURRENT ? GTK_STATE_PRELIGHT : GTK_STATE_NORMAL, GTK_SHADOW_NONE, @@ -401,7 +409,7 @@ wxRendererGTK::DrawDropArrow(wxWindow* win, // draw arrow on button gtk_paint_arrow ( - button->style, + gtk_widget_get_style(button), gdk_window, state, flags & wxCONTROL_PRESSED ? GTK_SHADOW_IN : GTK_SHADOW_OUT, @@ -469,12 +477,21 @@ wxRendererGTK::DrawCheckBox(wxWindow* win, else state = GTK_STATE_NORMAL; + GtkShadowType shadow_type; + + if ( flags & wxCONTROL_UNDETERMINED ) + shadow_type = GTK_SHADOW_ETCHED_IN; + else if ( flags & wxCONTROL_CHECKED ) + shadow_type = GTK_SHADOW_IN; + else + shadow_type = GTK_SHADOW_OUT; + gtk_paint_check ( - button->style, + gtk_widget_get_style(button), gdk_window, state, - flags & wxCONTROL_CHECKED ? GTK_SHADOW_IN : GTK_SHADOW_OUT, + shadow_type, NULL, button, "cellcheck", @@ -510,7 +527,7 @@ wxRendererGTK::DrawPushButton(wxWindow* win, gtk_paint_box ( - button->style, + gtk_widget_get_style(button), gdk_window, state, flags & wxCONTROL_PRESSED ? GTK_SHADOW_IN : GTK_SHADOW_OUT, @@ -530,27 +547,21 @@ wxRendererGTK::DrawItemSelectionRect(wxWindow* win, const wxRect& rect, int flags ) { - GtkWidget *tree = wxGTKPrivate::GetTreeWidget(); - GdkWindow* gdk_window = wxGetGdkWindowForDC(win, dc); wxASSERT_MSG( gdk_window, wxT("cannot use wxRendererNative on wxDC of this type") ); - int x_diff = 0; - if (win->GetLayoutDirection() == wxLayout_RightToLeft) - x_diff = rect.width; - - GtkStateType state = GTK_STATE_NORMAL; - if (flags & wxCONTROL_SELECTED) { + int x_diff = 0; + if (win->GetLayoutDirection() == wxLayout_RightToLeft) + x_diff = rect.width; + // the wxCONTROL_FOCUSED state is deduced // directly from the m_wxwindow by GTK+ - state = GTK_STATE_SELECTED; - - gtk_paint_flat_box( tree->style, // win->m_widget->style, + gtk_paint_flat_box(gtk_widget_get_style(wxGTKPrivate::GetTreeWidget()), gdk_window, - state, + GTK_STATE_SELECTED, GTK_SHADOW_NONE, NULL, win->m_wxwindow, @@ -560,32 +571,9 @@ wxRendererGTK::DrawItemSelectionRect(wxWindow* win, rect.width, rect.height ); } - else // !wxCONTROL_SELECTED - { - state = GTK_STATE_NORMAL; - } if ((flags & wxCONTROL_CURRENT) && (flags & wxCONTROL_FOCUSED)) - { - if (flags & wxCONTROL_SELECTED) - state = GTK_STATE_SELECTED; - - gtk_paint_focus( tree->style, - gdk_window, - state, - NULL, - win->m_wxwindow, - // Detail "treeview" causes warning with GTK+ 2.12 Clearlooks theme: - // "... no property named `row-ending-details'" - // Using "treeview-middle" would fix the warning, but the right - // edge of the focus rect is not getting erased properly either. - // Better to not specify this detail unless the drawing is fixed. - "", - dc.LogicalToDeviceX(rect.x), - dc.LogicalToDeviceY(rect.y), - rect.width, - rect.height ); - } + DrawFocusRect(win, dc, rect, flags); } void wxRendererGTK::DrawFocusRect(wxWindow* win, wxDC& dc, const wxRect& rect, int flags) @@ -600,7 +588,7 @@ void wxRendererGTK::DrawFocusRect(wxWindow* win, wxDC& dc, const wxRect& rect, i else state = GTK_STATE_NORMAL; - gtk_paint_focus( win->m_widget->style, + gtk_paint_focus( gtk_widget_get_style(win->m_widget), gdk_window, state, NULL, @@ -623,14 +611,11 @@ void wxRendererGTK::DrawTextCtrl(wxWindow* win, wxDC& dc, const wxRect& rect, in if ( flags & wxCONTROL_DISABLED ) state = GTK_STATE_INSENSITIVE; - if (flags & wxCONTROL_CURRENT ) - GTK_WIDGET_SET_FLAGS( entry, GTK_HAS_FOCUS ); - else - GTK_WIDGET_UNSET_FLAGS( entry, GTK_HAS_FOCUS ); + gtk_widget_set_can_focus(entry, (flags & wxCONTROL_CURRENT) != 0); gtk_paint_shadow ( - entry->style, + gtk_widget_get_style(entry), gdk_window, state, GTK_SHADOW_OUT, @@ -644,7 +629,7 @@ void wxRendererGTK::DrawTextCtrl(wxWindow* win, wxDC& dc, const wxRect& rect, in ); } -// Draw the equivallent of a wxComboBox +// Draw the equivalent of a wxComboBox void wxRendererGTK::DrawComboBox(wxWindow* win, wxDC& dc, const wxRect& rect, int flags) { GtkWidget *combo = wxGTKPrivate::GetComboBoxWidget(); @@ -655,14 +640,11 @@ void wxRendererGTK::DrawComboBox(wxWindow* win, wxDC& dc, const wxRect& rect, in if ( flags & wxCONTROL_DISABLED ) state = GTK_STATE_INSENSITIVE; - if (flags & wxCONTROL_CURRENT ) - GTK_WIDGET_SET_FLAGS( combo, GTK_HAS_FOCUS ); - else - GTK_WIDGET_UNSET_FLAGS( combo, GTK_HAS_FOCUS ); + gtk_widget_set_can_focus(combo, (flags & wxCONTROL_CURRENT) != 0); gtk_paint_shadow ( - combo->style, + gtk_widget_get_style(combo), gdk_window, state, GTK_SHADOW_OUT, @@ -684,7 +666,7 @@ void wxRendererGTK::DrawComboBox(wxWindow* win, wxDC& dc, const wxRect& rect, in gtk_paint_arrow ( - combo->style, + gtk_widget_get_style(combo), gdk_window, state, GTK_SHADOW_OUT, @@ -705,7 +687,7 @@ void wxRendererGTK::DrawComboBox(wxWindow* win, wxDC& dc, const wxRect& rect, in gtk_paint_box ( - combo->style, + gtk_widget_get_style(combo), gdk_window, state, GTK_SHADOW_ETCHED_OUT, @@ -728,7 +710,7 @@ void wxRendererGTK::DrawChoice(wxWindow* win, wxDC& dc, // Draw a themed radio button -void wxRendererGTK::DrawRadioButton(wxWindow* win, wxDC& dc, const wxRect& rect, int flags) +void wxRendererGTK::DrawRadioBitmap(wxWindow* win, wxDC& dc, const wxRect& rect, int flags) { GtkWidget *button = wxGTKPrivate::GetRadioButtonWidget(); @@ -752,7 +734,7 @@ void wxRendererGTK::DrawRadioButton(wxWindow* win, wxDC& dc, const wxRect& rect, gtk_paint_option ( - button->style, + gtk_widget_get_style(button), gdk_window, state, shadow_type,