#include <gtk/gtk.h>
#include "wx/gtk/win_gtk.h"
-// 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 so USE_ERASE_RECT=0
-#define USE_ERASE_RECT 0
-
// ----------------------------------------------------------------------------
// 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);
// draw the expanded/collapsed icon for a tree control item
virtual void DrawTreeItemButton(wxWindow *win,
const wxRect& rect,
int flags = 0);
+ virtual void DrawFocusRect(wxWindow* win, wxDC& dc, const wxRect& rect, int flags = 0);
+
virtual wxSplitterRenderParams GetSplitterParams(const wxWindow *win);
private:
// FIXME: shouldn't we destroy these windows somewhere?
- // used by DrawHeaderButton and DrawPushButton
+ // used by DrawPushButton and DrawDropArrow
static GtkWidget *GetButtonWidget();
// used by DrawTreeItemButton()
// used by DrawCheckBox()
static GtkWidget *GetCheckButtonWidget();
+
+ // Used by DrawHeaderButton
+ static GtkWidget *GetHeaderButtonWidget();
};
// ============================================================================
return s_tree;
}
+
+// This one just gets the button used by the column header. Although it's
+// still a gtk_button the themes will typically differentiate and draw them
+// differently if the button is in a treeview.
+GtkWidget *
+wxRendererGTK::GetHeaderButtonWidget()
+{
+ static GtkWidget *s_button = NULL;
+
+ if ( !s_button )
+ {
+ // Get the dummy tree widget, give it a column, and then use the
+ // widget in the column header for the rendering code.
+ GtkWidget* treewidget = GetTreeWidget();
+ GtkTreeViewColumn* column = gtk_tree_view_column_new();
+ gtk_tree_view_append_column(GTK_TREE_VIEW(treewidget), column);
+ s_button = column->button;
+ }
+
+ return s_button;
+}
+
// ----------------------------------------------------------------------------
// 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 = GetHeaderButtonWidget();
+
+ GdkWindow* gdk_window = NULL;
+#if wxUSE_NEW_DC
+ wxImplDC *impl = dc.GetImpl();
+ wxGTKImplDC *gtk_impl = wxDynamicCast( impl, wxGTKImplDC );
+ if (gtk_impl)
+ gdk_window = gtk_impl->GetGDKWindow();
+#else
+ gdk_window = dc.GetGDKWindow();
+#endif
+ 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;
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 DrawPushButton below?
- GTK_PIZZA(win->m_wxwindow)->bin_window,
+ gdk_window,
flags & wxCONTROL_DISABLED ? GTK_STATE_INSENSITIVE : GTK_STATE_NORMAL,
GTK_SHADOW_OUT,
NULL,
button,
"button",
- dc.LogicalToDeviceX(rect.x), rect.y, rect.width, rect.height
+ dc.LogicalToDeviceX(rect.x) - x_diff, rect.y, rect.width, rect.height
);
+
+ return DrawHeaderButtonContents(win, dc, rect, flags, sortArrow, params);
}
// draw a ">" or "v" button
{
GtkWidget *tree = GetTreeWidget();
+ GdkWindow* gdk_window = NULL;
+#if wxUSE_NEW_DC
+ wxImplDC *impl = dc.GetImpl();
+ wxGTKImplDC *gtk_impl = wxDynamicCast( impl, wxGTKImplDC );
+ if (gtk_impl)
+ gdk_window = gtk_impl->GetGDKWindow();
+#else
+ gdk_window = dc.GetGDKWindow();
+#endif
+ 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
return;
}
+ GdkWindow* gdk_window = NULL;
+#if wxUSE_NEW_DC
+ wxImplDC *impl = dc.GetImpl();
+ wxGTKImplDC *gtk_impl = wxDynamicCast( impl, wxGTKImplDC );
+ if (gtk_impl)
+ gdk_window = gtk_impl->GetGDKWindow();
+#else
+ gdk_window = dc.GetGDKWindow();
+#endif
+ wxASSERT_MSG( gdk_window,
+ wxT("cannot use wxRendererNative on wxDC of this type") );
+
wxCoord full_size = GetGtkSplitterFullSize();
// are we drawing vertical or horizontal splitter?
const bool isVert = orient == wxVERTICAL;
GdkRectangle rect;
-#if USE_ERASE_RECT
- GdkRectangle erase_rect;
-#endif
if ( isVert )
{
rect.y = 0;
rect.width = full_size;
rect.height = h;
-
-#if USE_ERASE_RECT
- erase_rect.x = position;
- erase_rect.y = 0;
- erase_rect.width = full_size;
- erase_rect.height = h;
-#endif
}
else // horz
{
rect.y = position;
rect.height = full_size;
rect.width = w;
-
-#if USE_ERASE_RECT
- erase_rect.y = position;
- erase_rect.x = 0;
- erase_rect.height = full_size;
- erase_rect.width = w;
-#endif
}
-#if USE_ERASE_RECT
- // 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;
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
}
void
-wxRendererGTK::DrawDropArrow(wxWindow *win,
+wxRendererGTK::DrawDropArrow(wxWindow *WXUNUSED(win),
wxDC& dc,
const wxRect& rect,
int flags)
// 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 = NULL;
+#if wxUSE_NEW_DC
+ wxImplDC *impl = dc.GetImpl();
+ wxGTKImplDC *gtk_impl = wxDynamicCast( impl, wxGTKImplDC );
+ if (gtk_impl)
+ gdk_window = gtk_impl->GetGDKWindow();
+#else
+ gdk_window = dc.GetGDKWindow();
+#endif
+ 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
gtk_paint_arrow
(
button->style,
- wdc.m_window,
+ gdk_window,
state,
flags & wxCONTROL_PRESSED ? GTK_SHADOW_IN : GTK_SHADOW_OUT,
NULL,
}
void
-wxRendererGTK::DrawCheckBox(wxWindow *win,
+wxRendererGTK::DrawCheckBox(wxWindow *WXUNUSED(win),
wxDC& dc,
const wxRect& rect,
int flags )
{
GtkWidget *button = GetCheckButtonWidget();
-
- // for reason why we do this, see DrawDropArrow
- wxWindowDC& wdc = (wxWindowDC&)dc;
- wxASSERT ( wdc.IsKindOf(CLASSINFO(wxWindowDC)) );
+
+ GdkWindow* gdk_window = NULL;
+#if wxUSE_NEW_DC
+ wxImplDC *impl = dc.GetImpl();
+ wxGTKImplDC *gtk_impl = wxDynamicCast( impl, wxGTKImplDC );
+ if (gtk_impl)
+ gdk_window = gtk_impl->GetGDKWindow();
+#else
+ gdk_window = dc.GetGDKWindow();
+#endif
+ wxASSERT_MSG( gdk_window,
+ wxT("cannot use wxRendererNative on wxDC of this type") );
GtkStateType state;
gtk_paint_check
(
button->style,
- wdc.m_window,
+ gdk_window,
state,
flags & wxCONTROL_CHECKED ? GTK_SHADOW_IN : GTK_SHADOW_OUT,
NULL,
}
void
-wxRendererGTK::DrawPushButton(wxWindow *win,
+wxRendererGTK::DrawPushButton(wxWindow *WXUNUSED(win),
wxDC& dc,
const wxRect& rect,
int flags)
{
GtkWidget *button = GetButtonWidget();
- // for reason why we do this, see DrawDropArrow
- wxWindowDC& wdc = (wxWindowDC&)dc;
- wxASSERT ( wdc.IsKindOf(CLASSINFO(wxWindowDC)) );
+ GdkWindow* gdk_window = NULL;
+#if wxUSE_NEW_DC
+ wxImplDC *impl = dc.GetImpl();
+ wxGTKImplDC *gtk_impl = wxDynamicCast( impl, wxGTKImplDC );
+ if (gtk_impl)
+ gdk_window = gtk_impl->GetGDKWindow();
+#else
+ gdk_window = dc.GetGDKWindow();
+#endif
+ wxASSERT_MSG( gdk_window,
+ wxT("cannot use wxRendererNative on wxDC of this type") );
// draw button
GtkStateType state;
gtk_paint_box
(
button->style,
- wdc.m_window,
+ gdk_window,
state,
flags & wxCONTROL_PRESSED ? GTK_SHADOW_IN : GTK_SHADOW_OUT,
NULL,
const wxRect& rect,
int flags )
{
- // for reason why we do this, see DrawDropArrow
- wxWindowDC& wdc = (wxWindowDC&)dc;
- wxASSERT ( wdc.IsKindOf(CLASSINFO(wxWindowDC)) );
+ GdkWindow* gdk_window = NULL;
+#if wxUSE_NEW_DC
+ wxImplDC *impl = dc.GetImpl();
+ wxGTKImplDC *gtk_impl = wxDynamicCast( impl, wxGTKImplDC );
+ if (gtk_impl)
+ gdk_window = gtk_impl->GetGDKWindow();
+#else
+ gdk_window = dc.GetGDKWindow();
+#endif
+ 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)
{
- if (flags & wxCONTROL_FOCUSED)
- state = GTK_STATE_SELECTED;
- else
- state = GTK_STATE_INSENSITIVE;
+ // the wxCONTROL_FOCUSED state is deduced
+ // directly from the m_wxwindow by GTK+
+ state = GTK_STATE_SELECTED;
- gtk_paint_flat_box( win->m_wxwindow->style,
- GTK_PIZZA(win->m_wxwindow)->bin_window,
+ gtk_paint_flat_box( win->m_widget->style,
+ gdk_window,
state,
GTK_SHADOW_NONE,
NULL,
win->m_wxwindow,
- "treeview",
- dc.LogicalToDeviceX(rect.x),
+ "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)
{
- dc.SetPen( *wxBLACK_PEN );
- dc.SetBrush( *wxTRANSPARENT_BRUSH );
- dc.DrawRectangle( rect );
+ gtk_paint_focus( win->m_widget->style,
+ gdk_window,
+ state,
+ NULL,
+ win->m_wxwindow,
+ "treeview",
+ 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 = NULL;
+#if wxUSE_NEW_DC
+ wxImplDC *impl = dc.GetImpl();
+ wxGTKImplDC *gtk_impl = wxDynamicCast( impl, wxGTKImplDC );
+ if (gtk_impl)
+ gdk_window = gtk_impl->GetGDKWindow();
+#else
+ gdk_window = dc.GetGDKWindow();
+#endif
+ 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 );
+}
projects / wxWidgets.git / blobdiff