///////////////////////////////////////////////////////////////////////////////
-// Name: gtk/renderer.cpp
+// Name: src/gtk/renderer.cpp
// Purpose: implementation of wxRendererNative for wxGTK
// Author: Vadim Zeitlin
// Modified by:
#endif
#include "wx/renderer.h"
-#include <gtk/gtk.h>
-#include "wx/gtk/win_gtk.h"
-
-#include "wx/window.h"
-#include "wx/dc.h"
-#include "wx/dcclient.h"
-#ifdef __WXGTK20__
+#ifndef WX_PRECOMP
+ #include "wx/window.h"
+ #include "wx/dcclient.h"
#include "wx/settings.h"
-#endif // GTK 2.0
-
-#ifdef __WXGTK20__
- #define WXUNUSED_IN_GTK1(arg) arg
-#else
- #define WXUNUSED_IN_GTK1(arg)
+ #include "wx/module.h"
#endif
+#include "wx/dcgraph.h"
+#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);
+
+ virtual int GetHeaderButtonHeight(wxWindow *win);
+
-#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,
int flags = 0);
- virtual wxSplitterRenderParams GetSplitterParams(const wxWindow *win);
+ 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);
-private:
- // FIXME: shouldn't we destroy these windows somewhere?
+ virtual void DrawItemSelectionRect(wxWindow *win,
+ wxDC& dc,
+ const wxRect& rect,
+ int flags = 0);
- // used by DrawHeaderButton and DrawComboBoxDropButton
- static GtkWidget *GetButtonWidget();
+ virtual void DrawChoice(wxWindow* win,
+ wxDC& dc,
+ const wxRect& rect,
+ int flags=0);
-#ifdef __WXGTK20__
- // used by DrawTreeItemButton()
- static GtkWidget *GetTreeWidget();
-#endif // GTK+ 2.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 void DrawOptionButton(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);
};
// ============================================================================
return s_rendererGTK;
}
-// ----------------------------------------------------------------------------
-// helper functions
-// ----------------------------------------------------------------------------
-
-GtkWidget *
-wxRendererGTK::GetButtonWidget()
+static GdkWindow* wxGetGdkWindowForDC(wxWindow* win, wxDC& dc)
{
- static GtkWidget *s_button = NULL;
- static GtkWidget *s_window = NULL;
+ GdkWindow* gdk_window = NULL;
- if ( !s_button )
+#if wxUSE_GRAPHICS_CONTEXT
+ if ( dc.IsKindOf( CLASSINFO(wxGCDC) ) )
+ gdk_window = win->GTKGetDrawingWindow();
+ else
+#endif
{
- s_window = gtk_window_new( GTK_WINDOW_POPUP );
- gtk_widget_realize( s_window );
- s_button = gtk_button_new();
- gtk_container_add( GTK_CONTAINER(s_window), s_button );
- gtk_widget_realize( s_button );
+#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 s_button;
-}
-
-#ifdef __WXGTK20__
-
-GtkWidget *
-wxRendererGTK::GetTreeWidget()
-{
- static GtkWidget *s_tree = NULL;
- static GtkWidget *s_window = NULL;
-
- if ( !s_tree )
- {
- s_tree = gtk_tree_view_new();
- s_window = gtk_window_new( GTK_WINDOW_POPUP );
- gtk_widget_realize( s_window );
- gtk_container_add( GTK_CONTAINER(s_window), s_tree );
- gtk_widget_realize( s_tree );
- }
+#if !wxUSE_GRAPHICS_CONTEXT
+ wxUnusedVar(win);
+#endif
- return s_tree;
+ return gdk_window;
}
-#endif // GTK+ 2.0
-
// ----------------------------------------------------------------------------
// 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 = GetButtonWidget();
+ GtkWidget *button = wxGTKPrivate::GetHeaderButtonWidget();
+ if (flags & wxCONTROL_SPECIAL)
+ button = wxGTKPrivate::GetHeaderButtonWidgetFirst();
+ if (flags & wxCONTROL_DIRTY)
+ button = wxGTKPrivate::GetHeaderButtonWidgetLast();
+
+ 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_DISABLED)
+ state = GTK_STATE_INSENSITIVE;
+ else
+ {
+ if (flags & wxCONTROL_CURRENT)
+ state = GTK_STATE_PRELIGHT;
+ }
gtk_paint_box
(
button->style,
- // FIXME: I suppose GTK_PIZZA(win->m_wxwindow)->bin_window doesn't work with wxMemoryDC.
- // Maybe use code similar as in DrawComboBoxDropButton below?
- GTK_PIZZA(win->m_wxwindow)->bin_window,
- flags & wxCONTROL_DISABLED ? GTK_STATE_INSENSITIVE : GTK_STATE_NORMAL,
+ gdk_window,
+ state,
GTK_SHADOW_OUT,
NULL,
button,
"button",
- dc.XLOG2DEV(rect.x) -1, rect.y -1, rect.width +2, rect.height +2
+ dc.LogicalToDeviceX(rect.x) - x_diff, rect.y, rect.width, rect.height
);
+
+ return DrawHeaderButtonContents(win, dc, rect, flags, sortArrow, params);
+}
+
+int wxRendererGTK::GetHeaderButtonHeight(wxWindow *WXUNUSED(win))
+{
+ GtkWidget *button = wxGTKPrivate::GetHeaderButtonWidget();
+
+ GtkRequisition req;
+ GTK_WIDGET_GET_CLASS(button)->size_request(button, &req);
+
+ return req.height;
}
-#ifdef __WXGTK20__
// draw a ">" or "v" button
void
wxRendererGTK::DrawTreeItemButton(wxWindow* win,
wxDC& dc, const wxRect& rect, int flags)
{
- GtkWidget *tree = GetTreeWidget();
+ GtkWidget *tree = wxGTKPrivate::GetTreeWidget();
+
+ GdkWindow* gdk_window = wxGetGdkWindowForDC(win, dc);
+ wxASSERT_MSG( gdk_window,
+ wxT("cannot use wxRendererNative on wxDC of this type") );
GtkStateType state;
if ( flags & wxCONTROL_CURRENT )
state = GTK_STATE_PRELIGHT;
else
state = GTK_STATE_NORMAL;
-
+
+ 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,
- GTK_PIZZA(win->m_wxwindow)->bin_window,
+ gdk_window,
state,
NULL,
tree,
"treeview",
- dc.LogicalToDeviceX(rect.x) + 2,
+ 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
// ----------------------------------------------------------------------------
-#ifndef __WXGTK20__
- // the full sash width (should be even)
- static const wxCoord SASH_SIZE = 8;
-
- // margin around the sash
- static const wxCoord SASH_MARGIN = 2;
-#endif // GTK+ 2.x/1.x
-
-static int GetGtkSplitterFullSize()
+static int GetGtkSplitterFullSize(GtkWidget* widget)
{
-#ifdef __WXGTK20__
- static GtkWidget *s_paned = NULL;
- if (s_paned == NULL)
- s_paned = gtk_vpaned_new();
-
gint handle_size;
- gtk_widget_style_get (s_paned, "handle_size", &handle_size, NULL);
-
+ gtk_widget_style_get(widget, "handle_size", &handle_size, NULL);
+
return handle_size;
-#else
- return SASH_SIZE + SASH_MARGIN;
-#endif
}
wxSplitterRenderParams
// we don't draw any border, hence 0 for the second field
return wxSplitterRenderParams
(
- GetGtkSplitterFullSize(),
+ GetGtkSplitterFullSize(wxGTKPrivate::GetSplitterWidget()),
0,
-#ifdef __WXGTK20__
true // hot sensitive
-#else // GTK+ 1.x
- false // not
-#endif // GTK+ 2.x/1.x
);
}
}
void
-wxRendererGTK::DrawSplitterSash(wxWindow *win,
+wxRendererGTK::DrawSplitterSash(wxWindow* win,
wxDC& dc,
const wxSize& size,
wxCoord position,
wxOrientation orient,
- int WXUNUSED_IN_GTK1(flags))
+ int flags)
{
if ( !win->m_wxwindow->window )
{
// window not realized yet
return;
}
-
- wxCoord full_size = GetGtkSplitterFullSize();
+
+ GdkWindow* gdk_window = wxGetGdkWindowForDC(win, 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;
GdkRectangle rect;
- GdkRectangle erase_rect;
+
if ( isVert )
{
- int h = win->GetClientSize().GetHeight();
-
rect.x = position;
rect.y = 0;
rect.width = full_size;
- rect.height = h;
-
- erase_rect.x = position;
- erase_rect.y = 0;
- erase_rect.width = full_size;
- erase_rect.height = h;
+ rect.height = size.y;
}
else // horz
{
- int w = win->GetClientSize().GetWidth();
-
rect.x = 0;
rect.y = position;
rect.height = full_size;
- rect.width = w;
-
- erase_rect.y = position;
- erase_rect.x = 0;
- erase_rect.height = full_size;
- erase_rect.width = w;
+ rect.width = size.x;
}
-#if 0
- // RR: After a correction to the orientation of the sash
- // this doesn't seem to be required anymore and it
- // seems to confuse some themes
-
- // we must erase everything first, otherwise the garbage
- // from the old sash is left when dragging it
- gtk_paint_flat_box
- (
- win->m_wxwindow->style,
- GTK_PIZZA(win->m_wxwindow)->bin_window,
- GTK_STATE_NORMAL,
- GTK_SHADOW_NONE,
- NULL,
- win->m_wxwindow,
- (char *)"viewportbin", // const_cast
- erase_rect.x,
- erase_rect.y,
- erase_rect.width,
- erase_rect.height
- );
-#endif
+ int x_diff = 0;
+ if (win->GetLayoutDirection() == wxLayout_RightToLeft)
+ x_diff = rect.width;
-#ifdef __WXGTK20__
gtk_paint_handle
(
win->m_wxwindow->style,
- GTK_PIZZA(win->m_wxwindow)->bin_window,
+ gdk_window,
flags & wxCONTROL_CURRENT ? GTK_STATE_PRELIGHT : GTK_STATE_NORMAL,
GTK_SHADOW_NONE,
NULL /* no clipping */,
win->m_wxwindow,
"paned",
- rect.x,
- rect.y,
+ dc.LogicalToDeviceX(rect.x) - x_diff,
+ dc.LogicalToDeviceY(rect.y),
rect.width,
rect.height,
isVert ? GTK_ORIENTATION_VERTICAL : GTK_ORIENTATION_HORIZONTAL
);
-#else // GTK+ 1.x
-
- // 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);
-
- GtkPaintLineFunc func = isVert ? gtk_paint_vline : gtk_paint_hline;
-
- (*func)
- (
- win->m_wxwindow->style,
- GTK_PIZZA(win->m_wxwindow)->bin_window,
- GTK_STATE_NORMAL,
- NULL,
- win->m_wxwindow,
- (char *)"paned", // const_cast
- 0, isVert ? size.y : size.x, position + SASH_SIZE / 2 - 1
- );
-
- gtk_paint_box
- (
- win->m_wxwindow->style,
- GTK_PIZZA(win->m_wxwindow)->bin_window,
- GTK_STATE_NORMAL,
- 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
- );
-#endif // GTK+ 2.x/1.x
}
void
-wxRendererGTK::DrawDropArrow(wxWindow *win,
+wxRendererGTK::DrawDropArrow(wxWindow* win,
wxDC& dc,
const wxRect& rect,
int flags)
{
- GtkWidget *button = GetButtonWidget();
+ GtkWidget *button = wxGTKPrivate::GetButtonWidget();
- // If we give GTK_PIZZA(win->m_wxwindow)->bin_window as
+ // If we give WX_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.
- wxWindowDC& wdc = (wxWindowDC&)dc;
-
- // only doing debug-time checking here (it should
- // probably be enough)
- wxASSERT ( wdc.IsKindOf(CLASSINFO(wxWindowDC)) );
+ GdkWindow* gdk_window = wxGetGdkWindowForDC(win, 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
GtkStateType state;
- if ( flags & wxCONTROL_CURRENT )
- state = GTK_STATE_PRELIGHT;
+ 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_arrow
(
button->style,
- wdc.m_window,
+ gdk_window,
state,
flags & wxCONTROL_PRESSED ? GTK_SHADOW_IN : GTK_SHADOW_OUT,
NULL,
const wxRect& rect,
int flags)
{
- GtkWidget *button = GetButtonWidget();
+ DrawPushButton(win,dc,rect,flags);
+ DrawDropArrow(win,dc,rect);
+}
- // for reason why we do this, see DrawDropArrow
- wxWindowDC& wdc = (wxWindowDC&)dc;
- wxASSERT ( wdc.IsKindOf(CLASSINFO(wxWindowDC)) );
+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);
+}
+
+void
+wxRendererGTK::DrawCheckBox(wxWindow* win,
+ wxDC& dc,
+ const wxRect& rect,
+ int flags )
+{
+ GtkWidget *button = wxGTKPrivate::GetCheckButtonWidget();
+
+ GdkWindow* gdk_window = wxGetGdkWindowForDC(win, 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);
- // draw button
GtkStateType state;
- if ( flags & wxCONTROL_CURRENT )
+ 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
+ (
+ button->style,
+ gdk_window,
+ state,
+ flags & wxCONTROL_CHECKED ? GTK_SHADOW_IN : GTK_SHADOW_OUT,
+ NULL,
+ button,
+ "cellcheck",
+ dc.LogicalToDeviceX(rect.x) + indicator_spacing,
+ dc.LogicalToDeviceY(rect.y) + indicator_spacing,
+ indicator_size, indicator_size
+ );
+}
+
+void
+wxRendererGTK::DrawPushButton(wxWindow* win,
+ wxDC& dc,
+ const wxRect& rect,
+ int flags)
+{
+ GtkWidget *button = wxGTKPrivate::GetButtonWidget();
+
+ GdkWindow* gdk_window = wxGetGdkWindowForDC(win, 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
(
button->style,
- wdc.m_window,
+ gdk_window,
state,
flags & wxCONTROL_PRESSED ? GTK_SHADOW_IN : GTK_SHADOW_OUT,
NULL,
button,
"button",
- rect.x, rect.y, rect.width, rect.height
+ dc.LogicalToDeviceX(rect.x),
+ dc.LogicalToDeviceY(rect.y),
+ rect.width,
+ rect.height
);
+}
- // draw arrow on button
- DrawDropArrow(win,dc,rect,flags);
+void
+wxRendererGTK::DrawItemSelectionRect(wxWindow* win,
+ wxDC& dc,
+ 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)
+ {
+ // 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,
+ 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))
+ {
+ 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 );
+ }
+}
+
+void wxRendererGTK::DrawFocusRect(wxWindow* win, wxDC& dc, const wxRect& rect, int flags)
+{
+ GdkWindow* gdk_window = wxGetGdkWindowForDC(win, 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* win, wxDC& dc, const wxRect& rect, int flags)
+{
+ GtkWidget *entry = wxGTKPrivate::GetTextEntryWidget();
+
+ GdkWindow* gdk_window = wxGetGdkWindowForDC(win, 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,
+ 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* win, wxDC& dc, const wxRect& rect, int flags)
+{
+ GtkWidget *combo = wxGTKPrivate::GetComboBoxWidget();
+
+ GdkWindow* gdk_window = wxGetGdkWindowForDC(win, 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::DrawOptionButton(wxWindow* win, wxDC& dc, const wxRect& rect, int flags)
+{
+ GtkWidget *button = wxGTKPrivate::GetRadioButtonWidget();
+
+ GdkWindow* gdk_window = wxGetGdkWindowForDC(win, 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