///////////////////////////////////////////////////////////////////////////////
-// Name: gtk/renderer.cpp
+// Name: src/gtk/renderer.cpp
// Purpose: implementation of wxRendererNative for wxGTK
// Author: Vadim Zeitlin
// Modified by:
// Created: 20.07.2003
// RCS-ID: $Id$
// Copyright: (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
-// License: wxWindows license
+// License: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
// ============================================================================
#pragma hdrstop
#endif
-#ifndef WX_PRECOMP
-#endif // WX_PRECOMP
-
-#include <gtk/gtk.h>
-#include "wx/gtk/win_gtk.h"
-
-#include "wx/window.h"
-#include "wx/dc.h"
#include "wx/renderer.h"
-#ifdef __WXGTK20__
+#ifndef WX_PRECOMP
+ #include "wx/window.h"
+ #include "wx/dcclient.h"
#include "wx/settings.h"
-#endif // GTK 2.0
+ #include "wx/module.h"
+#endif
+
+#include "wx/gtk/dc.h"
+#include "wx/gtk/private.h"
+
+#include <gtk/gtk.h>
// ----------------------------------------------------------------------------
// wxRendererGTK: our wxRendererNative implementation
{
public:
// draw the header control button (used by wxListCtrl)
- virtual void DrawHeaderButton(wxWindow *win,
+ virtual int DrawHeaderButton(wxWindow *win,
wxDC& dc,
const wxRect& rect,
- int flags = 0);
+ int flags = 0,
+ wxHeaderSortIconType sortArrow = wxHDR_SORT_ICON_NONE,
+ wxHeaderButtonParams* params = NULL);
-#ifdef __WXGTK20__
// draw the expanded/collapsed icon for a tree control item
virtual void DrawTreeItemButton(wxWindow *win,
wxDC& dc,
const wxRect& rect,
int flags = 0);
-#endif // GTK 2.0
virtual void DrawSplitterBorder(wxWindow *win,
wxDC& dc,
- const wxRect& rect) ;
+ const wxRect& rect,
+ int flags = 0);
virtual void DrawSplitterSash(wxWindow *win,
wxDC& dc,
const wxSize& size,
wxCoord position,
- wxOrientation orient);
+ wxOrientation orient,
+ int flags = 0);
+
+ virtual void DrawComboBoxDropButton(wxWindow *win,
+ wxDC& dc,
+ const wxRect& rect,
+ int flags = 0);
+
+ virtual void DrawDropArrow(wxWindow *win,
+ wxDC& dc,
+ const wxRect& rect,
+ int flags = 0);
+
+ virtual void DrawCheckBox(wxWindow *win,
+ wxDC& dc,
+ const wxRect& rect,
+ int flags = 0);
+
+ virtual void DrawPushButton(wxWindow *win,
+ wxDC& dc,
+ const wxRect& rect,
+ int flags = 0);
+
+ virtual void DrawItemSelectionRect(wxWindow *win,
+ wxDC& dc,
+ const wxRect& rect,
+ int flags = 0);
+
+ virtual void DrawChoice(wxWindow* win,
+ wxDC& dc,
+ const wxRect& rect,
+ int flags=0);
+
+ virtual void DrawComboBox(wxWindow* win,
+ wxDC& dc,
+ const wxRect& rect,
+ int flags=0);
+
+ virtual void DrawTextCtrl(wxWindow* win,
+ wxDC& dc,
+ const wxRect& rect,
+ int flags=0);
- virtual wxPoint GetSplitterSashAndBorder(const wxWindow *win);
+ virtual void DrawRadioButton(wxWindow* win,
+ wxDC& dc,
+ const wxRect& rect,
+ int flags=0);
+
+ virtual void DrawFocusRect(wxWindow* win, wxDC& dc, const wxRect& rect, int flags = 0);
+
+ virtual wxSize GetCheckBoxSize(wxWindow *win);
+
+ virtual wxSplitterRenderParams GetSplitterParams(const wxWindow *win);
};
// ============================================================================
// ============================================================================
/* static */
-wxRendererNative& wxRendererNative::Get()
+wxRendererNative& wxRendererNative::GetDefault()
{
static wxRendererGTK s_rendererGTK;
return s_rendererGTK;
}
+static GdkWindow* wxGetGdkWindowForDC(wxDC& dc)
+{
+ GdkWindow* gdk_window = NULL;
+#if wxUSE_NEW_DC
+ wxDCImpl *impl = dc.GetImpl();
+ wxGTKDCImpl *gtk_impl = wxDynamicCast( impl, wxGTKDCImpl );
+ if (gtk_impl)
+ gdk_window = gtk_impl->GetGDKWindow();
+#else
+ gdk_window = dc.GetGDKWindow();
+#endif
+ return gdk_window;
+}
+
// ----------------------------------------------------------------------------
// list/tree controls drawing
// ----------------------------------------------------------------------------
-void
+int
wxRendererGTK::DrawHeaderButton(wxWindow *win,
wxDC& dc,
const wxRect& rect,
- int flags)
+ int flags,
+ wxHeaderSortIconType sortArrow,
+ wxHeaderButtonParams* params)
{
+
+ GtkWidget *button = wxGTKPrivate::GetHeaderButtonWidget();
+
+ GdkWindow* gdk_window = wxGetGdkWindowForDC(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_DISABLED)
+ state = GTK_STATE_INSENSITIVE;
+ else
+ {
+ if (flags & wxCONTROL_CURRENT)
+ state = GTK_STATE_PRELIGHT;
+ }
+
gtk_paint_box
(
- win->m_wxwindow->style,
- GTK_PIZZA(win->m_wxwindow)->bin_window,
- flags & wxCONTROL_DISABLED ? GTK_STATE_INSENSITIVE : GTK_STATE_NORMAL,
+ button->style,
+ gdk_window,
+ state,
GTK_SHADOW_OUT,
- (GdkRectangle*) NULL,
- win->m_wxwindow,
- (char *)"button", // const_cast
- dc.XLOG2DEV(rect.x) - 1, rect.y - 1, rect.width + 2, rect.height + 2
+ NULL,
+ button,
+ "button",
+ dc.LogicalToDeviceX(rect.x) - x_diff, rect.y, rect.width, rect.height
);
-}
-#ifdef __WXGTK20__
+ return DrawHeaderButtonContents(win, dc, rect, flags, sortArrow, params);
+}
// draw a ">" or "v" button
-//
-// TODO: isn't there a GTK function to draw it?
void
-wxRendererGTK::DrawTreeItemButton(wxWindow* WXUNUSED(win),
+wxRendererGTK::DrawTreeItemButton(wxWindow* win,
wxDC& dc, const wxRect& rect, int flags)
{
- dc.SetBrush(wxBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT),
- wxSOLID));
- dc.SetPen(*wxBLACK_PEN);
- wxPoint button[3];
+ GtkWidget *tree = wxGTKPrivate::GetTreeWidget();
- const wxCoord xMiddle = rect.x + rect.width/2;
- const wxCoord yMiddle = rect.y + rect.height/2;
+ GdkWindow* gdk_window = wxGetGdkWindowForDC(dc);
+ wxASSERT_MSG( gdk_window,
+ wxT("cannot use wxRendererNative on wxDC of this type") );
- if ( flags & wxCONTROL_EXPANDED )
- {
- button[0].x = rect.GetLeft();
- button[0].y = yMiddle - 2;
- button[1].x = rect.GetRight();
- button[1].y = yMiddle - 2;
- button[2].x = xMiddle;
- button[2].y = yMiddle + 3;
- }
- else // collapsed
- {
- button[0].y = rect.GetBottom();
- button[0].x = xMiddle - 2;
- button[1].y = rect.GetTop();
- button[1].x = xMiddle - 2;
- button[2].y = yMiddle;
- button[2].x = xMiddle + 3;
- }
+ GtkStateType state;
+ if ( flags & wxCONTROL_CURRENT )
+ state = GTK_STATE_PRELIGHT;
+ else
+ state = GTK_STATE_NORMAL;
- dc.DrawPolygon(3, button);
+ int x_diff = 0;
+ if (win->GetLayoutDirection() == wxLayout_RightToLeft)
+ x_diff = rect.width;
+
+ // VZ: I don't know how to get the size of the expander so as to centre it
+ // in the given rectangle, +2/3 below is just what looks good here...
+ gtk_paint_expander
+ (
+ tree->style,
+ gdk_window,
+ state,
+ NULL,
+ tree,
+ "treeview",
+ dc.LogicalToDeviceX(rect.x) + 6 - x_diff,
+ dc.LogicalToDeviceY(rect.y) + 3,
+ flags & wxCONTROL_EXPANDED ? GTK_EXPANDER_EXPANDED
+ : GTK_EXPANDER_COLLAPSED
+ );
}
-#endif // GTK 2.0
// ----------------------------------------------------------------------------
// splitter sash drawing
// ----------------------------------------------------------------------------
-// the full sash width (should be even)
-static const wxCoord SASH_SIZE = 10;
+static int GetGtkSplitterFullSize(GtkWidget* widget)
+{
+ gint handle_size;
+ gtk_widget_style_get(widget, "handle_size", &handle_size, NULL);
-// margin around the sash
-static const wxCoord SASH_MARGIN = 5;
+ return handle_size;
+}
-wxPoint
-wxRendererGTK::GetSplitterSashAndBorder(const wxWindow * WXUNUSED(win))
+wxSplitterRenderParams
+wxRendererGTK::GetSplitterParams(const wxWindow *WXUNUSED(win))
{
- // we don't draw any border, hence 0 for the second field, but we must
- // leave some margin around the sash
- return wxPoint(SASH_SIZE + SASH_MARGIN, 0);
+ // we don't draw any border, hence 0 for the second field
+ return wxSplitterRenderParams
+ (
+ GetGtkSplitterFullSize(wxGTKPrivate::GetSplitterWidget()),
+ 0,
+ true // hot sensitive
+ );
}
void
wxRendererGTK::DrawSplitterBorder(wxWindow * WXUNUSED(win),
wxDC& WXUNUSED(dc),
- const wxRect& WXUNUSED(rect))
+ const wxRect& WXUNUSED(rect),
+ int WXUNUSED(flags))
{
// nothing to do
}
wxDC& dc,
const wxSize& size,
wxCoord position,
- wxOrientation orient)
+ wxOrientation orient,
+ int flags)
{
if ( !win->m_wxwindow->window )
{
- // VZ: this happens on startup -- why?
+ // window not realized yet
return;
}
+ GdkWindow* gdk_window = wxGetGdkWindowForDC(dc);
+ wxASSERT_MSG( gdk_window,
+ wxT("cannot use wxRendererNative on wxDC of this type") );
+
+ wxCoord full_size = GetGtkSplitterFullSize(wxGTKPrivate::GetSplitterWidget());
+
// are we drawing vertical or horizontal splitter?
const bool isVert = orient == wxVERTICAL;
- // we must erase everything first, otherwise the garbage from the old sash
- // is left when dragging it
- //
- // TODO: is this the right way to draw themed background?
GdkRectangle rect;
+
if ( isVert )
{
rect.x = position;
rect.y = 0;
- rect.width = SASH_SIZE + SASH_MARGIN;
+ rect.width = full_size;
rect.height = size.y;
}
else // horz
{
rect.x = 0;
rect.y = position;
- rect.height = SASH_SIZE + SASH_MARGIN;
+ rect.height = full_size;
rect.width = size.x;
}
- gtk_paint_flat_box
+ int x_diff = 0;
+ if (win->GetLayoutDirection() == wxLayout_RightToLeft)
+ x_diff = rect.width;
+
+ gtk_paint_handle
(
win->m_wxwindow->style,
- GTK_PIZZA(win->m_wxwindow)->bin_window,
- GTK_STATE_NORMAL,
+ gdk_window,
+ flags & wxCONTROL_CURRENT ? GTK_STATE_PRELIGHT : GTK_STATE_NORMAL,
GTK_SHADOW_NONE,
- &rect,
+ NULL /* no clipping */,
win->m_wxwindow,
- (char *)"base", // const_cast
- 0, 0, -1, -1
+ "paned",
+ dc.LogicalToDeviceX(rect.x) - x_diff,
+ dc.LogicalToDeviceY(rect.y),
+ rect.width,
+ rect.height,
+ isVert ? GTK_ORIENTATION_VERTICAL : GTK_ORIENTATION_HORIZONTAL
);
+}
+void
+wxRendererGTK::DrawDropArrow(wxWindow *WXUNUSED(win),
+ wxDC& dc,
+ const wxRect& rect,
+ int flags)
+{
+ GtkWidget *button = wxGTKPrivate::GetButtonWidget();
+
+ // If we give GTK_PIZZA(win->m_wxwindow)->bin_window as
+ // a window for gtk_paint_xxx function, then it won't
+ // work for wxMemoryDC. So that is why we assume wxDC
+ // is wxWindowDC (wxClientDC, wxMemoryDC and wxPaintDC
+ // are derived from it) and use its m_window.
+ GdkWindow* gdk_window = wxGetGdkWindowForDC(dc);
+ wxASSERT_MSG( gdk_window,
+ wxT("cannot use wxRendererNative on wxDC of this type") );
+
+ // draw arrow so that there is even space horizontally
+ // on both sides
+ int arrowX = rect.width/4 + 1;
+ int arrowWidth = rect.width - (arrowX*2);
+
+ // scale arrow's height accoording to the width
+ int arrowHeight = rect.width/3;
+ int arrowY = (rect.height-arrowHeight)/2 +
+ ((rect.height-arrowHeight) & 1);
+
+ GtkStateType state;
+
+ if ( flags & wxCONTROL_PRESSED )
+ state = GTK_STATE_ACTIVE;
+ else if ( flags & wxCONTROL_DISABLED )
+ state = GTK_STATE_INSENSITIVE;
+ else if ( flags & wxCONTROL_CURRENT )
+ state = GTK_STATE_PRELIGHT;
+ else
+ state = GTK_STATE_NORMAL;
+
+ // draw arrow on button
+ gtk_paint_arrow
+ (
+ button->style,
+ gdk_window,
+ state,
+ flags & wxCONTROL_PRESSED ? GTK_SHADOW_IN : GTK_SHADOW_OUT,
+ NULL,
+ button,
+ "arrow",
+ GTK_ARROW_DOWN,
+ FALSE,
+ rect.x + arrowX,
+ rect.y + arrowY,
+ arrowWidth,
+ arrowHeight
+ );
+}
- // leave some margin before sash itself
- position += SASH_MARGIN / 2;
-
- // and finally draw it using GTK paint functions
- typedef void (*GtkPaintLineFunc)(GtkStyle *, GdkWindow *,
- GtkStateType,
- GdkRectangle *, GtkWidget *,
- gchar *, gint, gint, gint);
+void
+wxRendererGTK::DrawComboBoxDropButton(wxWindow *win,
+ wxDC& dc,
+ const wxRect& rect,
+ int flags)
+{
+ DrawPushButton(win,dc,rect,flags);
+ DrawDropArrow(win,dc,rect);
+}
- GtkPaintLineFunc func = isVert ? gtk_paint_vline : gtk_paint_hline;
+wxSize
+wxRendererGTK::GetCheckBoxSize(wxWindow *WXUNUSED(win))
+{
+ gint indicator_size, indicator_spacing;
+ gtk_widget_style_get(wxGTKPrivate::GetCheckButtonWidget(),
+ "indicator_size", &indicator_size,
+ "indicator_spacing", &indicator_spacing,
+ NULL);
+
+ int size = indicator_size + indicator_spacing * 2;
+ return wxSize(size, size);
+}
- (*func)
+void
+wxRendererGTK::DrawCheckBox(wxWindow *WXUNUSED(win),
+ wxDC& dc,
+ const wxRect& rect,
+ int flags )
+{
+ GtkWidget *button = wxGTKPrivate::GetCheckButtonWidget();
+
+ GdkWindow* gdk_window = wxGetGdkWindowForDC(dc);
+ wxASSERT_MSG( gdk_window,
+ wxT("cannot use wxRendererNative on wxDC of this type") );
+
+ gint indicator_size, indicator_spacing;
+ gtk_widget_style_get(button,
+ "indicator_size", &indicator_size,
+ "indicator_spacing", &indicator_spacing,
+ NULL);
+
+ GtkStateType state;
+
+ if ( flags & wxCONTROL_PRESSED )
+ state = GTK_STATE_ACTIVE;
+ else if ( flags & wxCONTROL_DISABLED )
+ state = GTK_STATE_INSENSITIVE;
+ else if ( flags & wxCONTROL_CURRENT )
+ state = GTK_STATE_PRELIGHT;
+ else
+ state = GTK_STATE_NORMAL;
+
+ gtk_paint_check
(
- win->m_wxwindow->style,
- GTK_PIZZA(win->m_wxwindow)->bin_window,
- GTK_STATE_NORMAL,
+ button->style,
+ gdk_window,
+ state,
+ flags & wxCONTROL_CHECKED ? GTK_SHADOW_IN : GTK_SHADOW_OUT,
NULL,
- win->m_wxwindow,
- (char *)"paned", // const_cast
- 0, isVert ? size.y : size.x, position + SASH_SIZE / 2 - 1
+ button,
+ "cellcheck",
+ dc.LogicalToDeviceX(rect.x) + indicator_spacing,
+ dc.LogicalToDeviceY(rect.y) + indicator_spacing,
+ indicator_size, indicator_size
);
+}
+
+void
+wxRendererGTK::DrawPushButton(wxWindow *WXUNUSED(win),
+ wxDC& dc,
+ const wxRect& rect,
+ int flags)
+{
+ GtkWidget *button = wxGTKPrivate::GetButtonWidget();
+
+ GdkWindow* gdk_window = wxGetGdkWindowForDC(dc);
+ wxASSERT_MSG( gdk_window,
+ wxT("cannot use wxRendererNative on wxDC of this type") );
+
+ // draw button
+ GtkStateType state;
+
+ if ( flags & wxCONTROL_PRESSED )
+ state = GTK_STATE_ACTIVE;
+ else if ( flags & wxCONTROL_DISABLED )
+ state = GTK_STATE_INSENSITIVE;
+ else if ( flags & wxCONTROL_CURRENT )
+ state = GTK_STATE_PRELIGHT;
+ else
+ state = GTK_STATE_NORMAL;
gtk_paint_box
(
- win->m_wxwindow->style,
- GTK_PIZZA(win->m_wxwindow)->bin_window,
- GTK_STATE_NORMAL,
+ button->style,
+ gdk_window,
+ state,
+ flags & wxCONTROL_PRESSED ? GTK_SHADOW_IN : GTK_SHADOW_OUT,
+ NULL,
+ button,
+ "button",
+ dc.LogicalToDeviceX(rect.x),
+ dc.LogicalToDeviceY(rect.y),
+ rect.width,
+ rect.height
+ );
+}
+
+void
+wxRendererGTK::DrawItemSelectionRect(wxWindow *win,
+ wxDC& dc,
+ const wxRect& rect,
+ int flags )
+{
+ GdkWindow* gdk_window = wxGetGdkWindowForDC(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;
+ if (flags & wxCONTROL_SELECTED)
+ {
+ // the wxCONTROL_FOCUSED state is deduced
+ // directly from the m_wxwindow by GTK+
+ state = GTK_STATE_SELECTED;
+
+ gtk_paint_flat_box( win->m_widget->style,
+ gdk_window,
+ state,
+ GTK_SHADOW_NONE,
+ NULL,
+ win->m_wxwindow,
+ "cell_even",
+ dc.LogicalToDeviceX(rect.x) - x_diff,
+ dc.LogicalToDeviceY(rect.y),
+ rect.width,
+ rect.height );
+ }
+ else // !wxCONTROL_SELECTED
+ {
+ state = GTK_STATE_NORMAL;
+ }
+
+ if ((flags & wxCONTROL_CURRENT) && (flags & wxCONTROL_FOCUSED))
+ {
+ gtk_paint_focus( win->m_widget->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.
+ NULL,
+ dc.LogicalToDeviceX(rect.x),
+ dc.LogicalToDeviceY(rect.y),
+ rect.width,
+ rect.height );
+ }
+}
+
+void wxRendererGTK::DrawFocusRect(wxWindow* win, wxDC& dc, const wxRect& rect, int flags)
+{
+ GdkWindow* gdk_window = wxGetGdkWindowForDC(dc);
+ wxASSERT_MSG( gdk_window,
+ wxT("cannot use wxRendererNative on wxDC of this type") );
+
+ GtkStateType state;
+ if (flags & wxCONTROL_SELECTED)
+ state = GTK_STATE_SELECTED;
+ else
+ state = GTK_STATE_NORMAL;
+
+ gtk_paint_focus( win->m_widget->style,
+ gdk_window,
+ state,
+ NULL,
+ win->m_wxwindow,
+ NULL,
+ dc.LogicalToDeviceX(rect.x),
+ dc.LogicalToDeviceY(rect.y),
+ rect.width,
+ rect.height );
+}
+
+// Uses the theme to draw the border and fill for something like a wxTextCtrl
+void wxRendererGTK::DrawTextCtrl(wxWindow*, wxDC& dc, const wxRect& rect, int flags)
+{
+ GtkWidget *entry = wxGTKPrivate::GetTextEntryWidget();
+
+ GdkWindow* gdk_window = wxGetGdkWindowForDC(dc);
+
+ GtkStateType state = GTK_STATE_NORMAL;
+ 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_paint_shadow
+ (
+ entry->style,
+ gdk_window,
+ state,
GTK_SHADOW_OUT,
- (GdkRectangle*) NULL,
- win->m_wxwindow,
- (char *)"paned", // const_cast
- isVert ? position : size.x - 2*SASH_SIZE,
- isVert ? size.y - 2*SASH_SIZE : position,
- SASH_SIZE, SASH_SIZE
+ NULL,
+ entry,
+ "entry",
+ dc.LogicalToDeviceX(rect.x),
+ dc.LogicalToDeviceY(rect.y),
+ rect.width,
+ rect.height
+ );
+}
+
+// Draw the equivallent of a wxComboBox
+void wxRendererGTK::DrawComboBox(wxWindow*, wxDC& dc, const wxRect& rect, int flags)
+{
+ GtkWidget *combo = wxGTKPrivate::GetComboBoxWidget();
+
+ GdkWindow* gdk_window = wxGetGdkWindowForDC(dc);
+
+ GtkStateType state = GTK_STATE_NORMAL;
+ 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_paint_shadow
+ (
+ combo->style,
+ gdk_window,
+ state,
+ GTK_SHADOW_OUT,
+ NULL,
+ combo,
+ "combobox",
+ dc.LogicalToDeviceX(rect.x),
+ dc.LogicalToDeviceY(rect.y),
+ rect.width,
+ rect.height
+ );
+
+ wxRect r = rect;
+ int extent = rect.height / 2;
+ r.x += rect.width - extent - extent/2;
+ r.y += extent/2;
+ r.width = extent;
+ r.height = extent;
+
+ gtk_paint_arrow
+ (
+ combo->style,
+ gdk_window,
+ state,
+ GTK_SHADOW_OUT,
+ NULL,
+ combo,
+ "arrow",
+ GTK_ARROW_DOWN,
+ TRUE,
+ dc.LogicalToDeviceX(r.x),
+ dc.LogicalToDeviceY(r.y),
+ r.width,
+ r.height
+ );
+
+ r = rect;
+ r.x += rect.width - 2*extent;
+ r.width = 2;
+
+ gtk_paint_box
+ (
+ combo->style,
+ gdk_window,
+ state,
+ GTK_SHADOW_ETCHED_OUT,
+ NULL,
+ combo,
+ "vseparator",
+ dc.LogicalToDeviceX(r.x),
+ dc.LogicalToDeviceY(r.y+1),
+ r.width,
+ r.height-2
);
}
+
+void wxRendererGTK::DrawChoice(wxWindow* win, wxDC& dc,
+ const wxRect& rect, int flags)
+{
+ DrawComboBox( win, dc, rect, flags );
+}
+
+
+// Draw a themed radio button
+void wxRendererGTK::DrawRadioButton(wxWindow*, wxDC& dc, const wxRect& rect, int flags)
+{
+ GtkWidget *button = wxGTKPrivate::GetRadioButtonWidget();
+
+ GdkWindow* gdk_window = wxGetGdkWindowForDC(dc);
+
+ GtkShadowType shadow_type = GTK_SHADOW_OUT;
+ if ( flags & wxCONTROL_CHECKED )
+ shadow_type = GTK_SHADOW_IN;
+ else if ( flags & wxCONTROL_UNDETERMINED )
+ shadow_type = GTK_SHADOW_ETCHED_IN;
+
+ GtkStateType state = GTK_STATE_NORMAL;
+ if ( flags & wxCONTROL_DISABLED )
+ state = GTK_STATE_INSENSITIVE;
+ if ( flags & wxCONTROL_PRESSED )
+ state = GTK_STATE_ACTIVE;
+/*
+ Don't know when to set this
+ state_type = GTK_STATE_PRELIGHT;
+*/
+
+ gtk_paint_option
+ (
+ button->style,
+ gdk_window,
+ state,
+ shadow_type,
+ NULL,
+ button,
+ "radiobutton",
+ dc.LogicalToDeviceX(rect.x),
+ dc.LogicalToDeviceY(rect.y),
+ rect.width, rect.height
+ );
+}
projects / wxWidgets.git / blobdiff