// 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 "wx/renderer.h"
#include <gtk/gtk.h>
#include "wx/gtk/win_gtk.h"
#include "wx/window.h"
#include "wx/dc.h"
-#include "wx/renderer.h"
+#include "wx/dcclient.h"
#ifdef __WXGTK20__
#include "wx/settings.h"
wxDC& dc,
const wxRect& rect,
int flags = 0);
-#endif // GTK 2.0
+#endif // GTK+ 2.0
virtual void DrawSplitterBorder(wxWindow *win,
wxDC& dc,
wxOrientation orient,
int flags = 0);
+ virtual void DrawComboBoxDropButton(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 DrawComboBoxDropButton
+ static GtkWidget *GetButtonWidget();
+
+#ifdef __WXGTK20__
+ // used by DrawTreeItemButton()
+ static GtkWidget *GetTreeWidget();
+#endif // GTK+ 2.0
};
// ============================================================================
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;
+}
+
+#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 );
+ }
+
+ return s_tree;
+}
+
+#endif // GTK+ 2.0
+
// ----------------------------------------------------------------------------
// list/tree controls drawing
// ----------------------------------------------------------------------------
int flags)
{
- static GtkWidget *s_button = NULL;
- static GtkWidget *s_window = NULL;
- if (s_button == NULL)
- {
- 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 );
- }
+ GtkWidget *button = GetButtonWidget();
gtk_paint_box
(
- s_button->style,
+ 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,
GTK_SHADOW_OUT,
- NULL,
- s_button,
+ NULL,
+ button,
"button",
dc.XLOG2DEV(rect.x) -1, rect.y -1, rect.width +2, rect.height +2
);
#ifdef __WXGTK20__
// 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];
-
- const wxCoord xMiddle = rect.x + rect.width/2;
- const wxCoord yMiddle = rect.y + rect.height/2;
-
- 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;
- }
-
- dc.DrawPolygon(3, button);
+ GtkWidget *tree = GetTreeWidget();
+
+ GtkStateType state;
+ if ( flags & wxCONTROL_CURRENT )
+ state = GTK_STATE_PRELIGHT;
+ else
+ state = GTK_STATE_NORMAL;
+
+ // 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,
+ state,
+ NULL,
+ tree,
+ "treeview",
+ dc.LogicalToDeviceX(rect.x) + 2,
+ dc.LogicalToDeviceY(rect.y) + 3,
+ flags & wxCONTROL_EXPANDED ? GTK_EXPANDER_EXPANDED
+ : GTK_EXPANDER_COLLAPSED
+ );
}
-#endif // GTK 2.0
+#endif // GTK+ 2.0
// ----------------------------------------------------------------------------
// splitter sash drawing
// ----------------------------------------------------------------------------
-// all this should probably be read from the current theme settings somehow?
-#ifdef __WXGTK20__
- // the full sash size
- static const wxCoord SASH_FULL_SIZE = 5;
-#else // GTK+ 1.x
+#ifndef __WXGTK20__
// the full sash width (should be even)
- static const wxCoord SASH_SIZE = 10;
+ static const wxCoord SASH_SIZE = 8;
// margin around the sash
- static const wxCoord SASH_MARGIN = 5;
-
- // the full sash size
- static const wxCoord SASH_FULL_SIZE = SASH_SIZE + SASH_MARGIN;
+ static const wxCoord SASH_MARGIN = 2;
#endif // GTK+ 2.x/1.x
+static int GetGtkSplitterFullSize()
+{
+#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);
+
+ return handle_size;
+#else
+ return SASH_SIZE + SASH_MARGIN;
+#endif
+}
+
wxSplitterRenderParams
-wxRendererGTK::GetSplitterParams(const wxWindow * WXUNUSED(win))
+wxRendererGTK::GetSplitterParams(const wxWindow *WXUNUSED(win))
{
// we don't draw any border, hence 0 for the second field
return wxSplitterRenderParams
(
- SASH_FULL_SIZE,
+ GetGtkSplitterFullSize(),
0,
#ifdef __WXGTK20__
true // hot sensitive
{
if ( !win->m_wxwindow->window )
{
- // VZ: this happens on startup -- why?
+ // window not realized yet
return;
}
+
+ wxCoord full_size = GetGtkSplitterFullSize();
// 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 = SASH_FULL_SIZE;
- rect.height = size.y;
+ rect.width = full_size;
+ rect.height = h;
+
+ erase_rect.x = position;
+ erase_rect.y = 0;
+ erase_rect.width = full_size;
+ erase_rect.height = h;
}
else // horz
{
+ int w = win->GetClientSize().GetWidth();
+
rect.x = 0;
rect.y = position;
- rect.height = SASH_FULL_SIZE;
- rect.width = size.x;
+ rect.height = full_size;
+ rect.width = w;
+
+ erase_rect.y = position;
+ erase_rect.x = 0;
+ erase_rect.height = full_size;
+ erase_rect.width = w;
}
+#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
+
#ifdef __WXGTK20__
gtk_paint_handle
(
isVert ? GTK_ORIENTATION_VERTICAL : GTK_ORIENTATION_HORIZONTAL
);
#else // GTK+ 1.x
- // 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?
- gtk_paint_flat_box
- (
- win->m_wxwindow->style,
- GTK_PIZZA(win->m_wxwindow)->bin_window,
- GTK_STATE_NORMAL,
- GTK_SHADOW_NONE,
- &rect,
- win->m_wxwindow,
- (char *)"base", // const_cast
- 0, 0, -1, -1
- );
-
// leave some margin before sash itself
position += SASH_MARGIN / 2;
#endif // GTK+ 2.x/1.x
}
+void wxRendererGTK::DrawComboBoxDropButton(wxWindow *win,
+ wxDC& dc,
+ const wxRect& rect,
+ int flags)
+{
+ GtkWidget *button = GetButtonWidget();
+
+ // device context must inherit from wxWindowDC
+ // (so it must be wxClientDC, wxMemoryDC or wxPaintDC)
+ wxWindowDC& wdc = (wxWindowDC&)dc;
+
+ // only doing debug-time checking here (it should probably be enough)
+ wxASSERT ( wdc.IsKindOf(CLASSINFO(wxWindowDC)) );
+
+ GtkStateType state;
+
+ if ( flags & wxCONTROL_CURRENT )
+ state = GTK_STATE_PRELIGHT;
+ else if ( flags & wxCONTROL_DISABLED )
+ state = GTK_STATE_INSENSITIVE;
+ else
+ state = GTK_STATE_NORMAL;
+
+ // draw arrow on button
+ gtk_paint_arrow
+ (
+ button->style,
+ wdc.m_window,
+ state,
+ flags & wxCONTROL_PRESSED ? GTK_SHADOW_IN : GTK_SHADOW_OUT,
+ NULL,
+ button,
+ "arrow",
+ GTK_ARROW_DOWN,
+ FALSE,
+ rect.x + 1, rect.y + 1, rect.width - 2, rect.height - 2
+ );
+}
+
projects / wxWidgets.git / blobdiff