#include "wx/window.h"
#include "wx/dcclient.h"
#include "wx/settings.h"
+ #include "wx/module.h"
#endif
+#include "wx/gtk/dc.h"
+#include "wx/gtk/private.h"
+
#include <gtk/gtk.h>
-#include "wx/gtk/win_gtk.h"
// ----------------------------------------------------------------------------
// wxRendererGTK: our wxRendererNative implementation
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 DrawPushButton and DrawDropArrow
- static GtkWidget *GetButtonWidget();
+ virtual wxSize GetCheckBoxSize(wxWindow *win);
- // used by DrawTreeItemButton()
- static GtkWidget *GetTreeWidget();
-
- // used by DrawCheckBox()
- static GtkWidget *GetCheckButtonWidget();
-
- // Used by DrawHeaderButton
- static GtkWidget *GetHeaderButtonWidget();
+ virtual wxSplitterRenderParams GetSplitterParams(const wxWindow *win);
};
// ============================================================================
return s_rendererGTK;
}
-// ----------------------------------------------------------------------------
-// helper functions
-// ----------------------------------------------------------------------------
-
-GtkWidget *
-wxRendererGTK::GetButtonWidget()
-{
- static GtkWidget *s_button = NULL;
- static GtkWidget *s_window = NULL;
-
- if ( !s_button )
- {
- 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 );
- }
-
- return s_button;
-}
-
-GtkWidget *
-wxRendererGTK::GetCheckButtonWidget()
-{
- static GtkWidget *s_button = NULL;
- static GtkWidget *s_window = NULL;
-
- if ( !s_button )
- {
- s_window = gtk_window_new( GTK_WINDOW_POPUP );
- gtk_widget_realize( s_window );
- s_button = gtk_check_button_new();
- gtk_container_add( GTK_CONTAINER(s_window), s_button );
- gtk_widget_realize( s_button );
- }
-
- return s_button;
-}
-
-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 );
- }
-
- 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
// ----------------------------------------------------------------------------
wxHeaderButtonParams* params)
{
- GtkWidget *button = GetHeaderButtonWidget();
-
+ GtkWidget *button = wxGTKPrivate::GetHeaderButtonWidget();
+
GdkWindow* gdk_window = NULL;
#if wxUSE_NEW_DC
- wxImplDC *impl = dc.GetImpl();
- wxGTKImplDC *gtk_impl = wxDynamicCast( impl, wxGTKImplDC );
+ wxDCImpl *impl = dc.GetImpl();
+ wxGTKDCImpl *gtk_impl = wxDynamicCast( impl, wxGTKDCImpl );
if (gtk_impl)
gdk_window = gtk_impl->GetGDKWindow();
#else
wxRendererGTK::DrawTreeItemButton(wxWindow* win,
wxDC& dc, const wxRect& rect, int flags)
{
- GtkWidget *tree = GetTreeWidget();
+ GtkWidget *tree = wxGTKPrivate::GetTreeWidget();
GdkWindow* gdk_window = NULL;
#if wxUSE_NEW_DC
- wxImplDC *impl = dc.GetImpl();
- wxGTKImplDC *gtk_impl = wxDynamicCast( impl, wxGTKImplDC );
+ wxDCImpl *impl = dc.GetImpl();
+ wxGTKDCImpl *gtk_impl = wxDynamicCast( impl, wxGTKDCImpl );
if (gtk_impl)
gdk_window = gtk_impl->GetGDKWindow();
#else
// splitter sash drawing
// ----------------------------------------------------------------------------
-static int GetGtkSplitterFullSize()
+static int GetGtkSplitterFullSize(GtkWidget* widget)
{
- 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;
}
// we don't draw any border, hence 0 for the second field
return wxSplitterRenderParams
(
- GetGtkSplitterFullSize(),
+ GetGtkSplitterFullSize(wxGTKPrivate::GetSplitterWidget()),
0,
true // hot sensitive
);
GdkWindow* gdk_window = NULL;
#if wxUSE_NEW_DC
- wxImplDC *impl = dc.GetImpl();
- wxGTKImplDC *gtk_impl = wxDynamicCast( impl, wxGTKImplDC );
+ wxDCImpl *impl = dc.GetImpl();
+ wxGTKDCImpl *gtk_impl = wxDynamicCast( impl, wxGTKDCImpl );
if (gtk_impl)
gdk_window = gtk_impl->GetGDKWindow();
#else
wxASSERT_MSG( gdk_window,
wxT("cannot use wxRendererNative on wxDC of this type") );
- wxCoord full_size = GetGtkSplitterFullSize();
+ wxCoord full_size = GetGtkSplitterFullSize(wxGTKPrivate::GetSplitterWidget());
// are we drawing vertical or horizontal splitter?
const bool isVert = orient == wxVERTICAL;
if ( isVert )
{
- int h = win->GetClientSize().GetHeight();
-
rect.x = position;
rect.y = 0;
rect.width = full_size;
- 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;
+ rect.width = size.x;
}
int x_diff = 0;
const wxRect& rect,
int flags)
{
- GtkWidget *button = GetButtonWidget();
+ 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
// are derived from it) and use its m_window.
GdkWindow* gdk_window = NULL;
#if wxUSE_NEW_DC
- wxImplDC *impl = dc.GetImpl();
- wxGTKImplDC *gtk_impl = wxDynamicCast( impl, wxGTKImplDC );
+ wxDCImpl *impl = dc.GetImpl();
+ wxGTKDCImpl *gtk_impl = wxDynamicCast( impl, wxGTKDCImpl );
if (gtk_impl)
gdk_window = gtk_impl->GetGDKWindow();
#else
DrawDropArrow(win,dc,rect);
}
+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 *WXUNUSED(win),
wxDC& dc,
const wxRect& rect,
int flags )
{
- GtkWidget *button = GetCheckButtonWidget();
-
+ GtkWidget *button = wxGTKPrivate::GetCheckButtonWidget();
+
GdkWindow* gdk_window = NULL;
#if wxUSE_NEW_DC
- wxImplDC *impl = dc.GetImpl();
- wxGTKImplDC *gtk_impl = wxDynamicCast( impl, wxGTKImplDC );
+ wxDCImpl *impl = dc.GetImpl();
+ wxGTKDCImpl *gtk_impl = wxDynamicCast( impl, wxGTKDCImpl );
if (gtk_impl)
gdk_window = gtk_impl->GetGDKWindow();
#else
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 )
NULL,
button,
"cellcheck",
- dc.LogicalToDeviceX(rect.x)+2,
- dc.LogicalToDeviceY(rect.y)+3,
- 13, 13
+ dc.LogicalToDeviceX(rect.x) + indicator_spacing,
+ dc.LogicalToDeviceY(rect.y) + indicator_spacing,
+ indicator_size, indicator_size
);
}
const wxRect& rect,
int flags)
{
- GtkWidget *button = GetButtonWidget();
+ GtkWidget *button = wxGTKPrivate::GetButtonWidget();
GdkWindow* gdk_window = NULL;
#if wxUSE_NEW_DC
- wxImplDC *impl = dc.GetImpl();
- wxGTKImplDC *gtk_impl = wxDynamicCast( impl, wxGTKImplDC );
+ wxDCImpl *impl = dc.GetImpl();
+ wxGTKDCImpl *gtk_impl = wxDynamicCast( impl, wxGTKDCImpl );
if (gtk_impl)
gdk_window = gtk_impl->GetGDKWindow();
#else
{
GdkWindow* gdk_window = NULL;
#if wxUSE_NEW_DC
- wxImplDC *impl = dc.GetImpl();
- wxGTKImplDC *gtk_impl = wxDynamicCast( impl, wxGTKImplDC );
+ wxDCImpl *impl = dc.GetImpl();
+ wxGTKDCImpl *gtk_impl = wxDynamicCast( impl, wxGTKDCImpl );
if (gtk_impl)
gdk_window = gtk_impl->GetGDKWindow();
#else
state,
NULL,
win->m_wxwindow,
- "treeview",
+ // 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,
{
GdkWindow* gdk_window = NULL;
#if wxUSE_NEW_DC
- wxImplDC *impl = dc.GetImpl();
- wxGTKImplDC *gtk_impl = wxDynamicCast( impl, wxGTKImplDC );
+ wxDCImpl *impl = dc.GetImpl();
+ wxGTKDCImpl *gtk_impl = wxDynamicCast( impl, wxGTKDCImpl );
if (gtk_impl)
gdk_window = gtk_impl->GetGDKWindow();
#else
projects / wxWidgets.git / blobdiff