#include "wx/settings.h"
#endif // GTK 2.0
+#ifdef __WXGTK20__
+ #define WXUNUSED_IN_GTK1(arg) arg
+#else
+ #define WXUNUSED_IN_GTK1(arg)
+#endif
+
// ----------------------------------------------------------------------------
// wxRendererGTK: our wxRendererNative implementation
// ----------------------------------------------------------------------------
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 wxPoint GetSplitterSashAndBorder(const wxWindow *win);
+ virtual wxSplitterRenderParams GetSplitterParams(const wxWindow *win);
};
// ============================================================================
// ============================================================================
/* static */
-wxRendererNative& wxRendererNative::Get()
+wxRendererNative& wxRendererNative::GetDefault()
{
static wxRendererGTK s_rendererGTK;
const wxRect& rect,
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 );
+ }
+
gtk_paint_box
(
- win->m_wxwindow->style,
+ s_button->style,
GTK_PIZZA(win->m_wxwindow)->bin_window,
flags & wxCONTROL_DISABLED ? GTK_STATE_INSENSITIVE : GTK_STATE_NORMAL,
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,
+ s_button,
+ "button",
+ dc.XLOG2DEV(rect.x) -1, rect.y -1, rect.width +2, rect.height +2
);
}
//
// 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)
{
+#if 1
+
+#define PM_SIZE 8
+
+ GtkPizza *pizza = GTK_PIZZA( win->m_wxwindow );
+ GtkStyle *style = win->m_widget->style;
+ int x = rect.x;
+ int y = rect.y;
+ y = dc.LogicalToDeviceY( y );
+ x = dc.LogicalToDeviceX( x );
+
+#if 1
+ // This draws the GTK+ 2.2.4 triangle
+ x--;
+ GdkPoint points[3];
+
+ if ( flags & wxCONTROL_EXPANDED )
+ {
+ points[0].x = x;
+ points[0].y = y + (PM_SIZE + 2) / 6;
+ points[1].x = points[0].x + (PM_SIZE + 2);
+ points[1].y = points[0].y;
+ points[2].x = (points[0].x + (PM_SIZE + 2) / 2);
+ points[2].y = y + 2 * (PM_SIZE + 2) / 3;
+ }
+ else
+ {
+ points[0].x = x + ((PM_SIZE + 2) / 6 + 2);
+ points[0].y = y - 1;
+ points[1].x = points[0].x;
+ points[1].y = points[0].y + (PM_SIZE + 2);
+ points[2].x = (points[0].x +
+ (2 * (PM_SIZE + 2) / 3 - 1));
+ points[2].y = points[0].y + (PM_SIZE + 2) / 2;
+ }
+
+ if ( flags & wxCONTROL_CURRENT )
+ gdk_draw_polygon( pizza->bin_window, style->fg_gc[GTK_STATE_PRELIGHT], TRUE, points, 3);
+ else
+ gdk_draw_polygon( pizza->bin_window, style->base_gc[GTK_STATE_NORMAL], TRUE, points, 3);
+ gdk_draw_polygon( pizza->bin_window, style->fg_gc[GTK_STATE_NORMAL], FALSE, points, 3 );
+#else
+ // this draws the GTK+ 2.2.3 tree item square
+ gdk_draw_rectangle( pizza->bin_window,
+ style->base_gc[GTK_STATE_NORMAL], TRUE,
+ x, y, PM_SIZE, PM_SIZE);
+ gdk_draw_rectangle( pizza->bin_window,
+ style->fg_gc[GTK_STATE_NORMAL], FALSE,
+ x, y, PM_SIZE, PM_SIZE);
+
+ gdk_draw_line( pizza->bin_window, style->fg_gc[GTK_STATE_NORMAL],
+ x + 2, y + PM_SIZE / 2, x + PM_SIZE - 2, y + PM_SIZE / 2);
+
+ if ( flags & wxCONTROL_EXPANDED )
+ {
+ gdk_draw_line( pizza->bin_window, style->fg_gc[GTK_STATE_NORMAL],
+ x + PM_SIZE / 2, y + 2,
+ x + PM_SIZE / 2, y + PM_SIZE - 2);
+ }
+#endif
+
+
+#else
dc.SetBrush(wxBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT),
wxSOLID));
dc.SetPen(*wxBLACK_PEN);
}
dc.DrawPolygon(3, button);
+#endif
}
#endif // GTK 2.0
// splitter sash drawing
// ----------------------------------------------------------------------------
-// the full sash width (should be even)
-static const wxCoord SASH_SIZE = 10;
+// 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
+ // the full sash width (should be even)
+ static const wxCoord SASH_SIZE = 8;
+
+ // margin around the sash
+ static const wxCoord SASH_MARGIN = 2;
-// margin around the sash
-static const wxCoord SASH_MARGIN = 5;
+ // the full sash size
+ static const wxCoord SASH_FULL_SIZE = SASH_SIZE + SASH_MARGIN;
+#endif // GTK+ 2.x/1.x
-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
+ (
+ SASH_FULL_SIZE,
+ 0,
+#ifdef __WXGTK20__
+ true // hot sensitive
+#else // GTK+ 1.x
+ false // not
+#endif // GTK+ 2.x/1.x
+ );
}
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 WXUNUSED_IN_GTK1(flags))
{
if ( !win->m_wxwindow->window )
{
// 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;
+ GdkRectangle erase_rect;
if ( isVert )
{
+ int h = win->GetClientSize().GetHeight();
+
rect.x = position;
- rect.y = 0;
- rect.width = SASH_SIZE + SASH_MARGIN;
- rect.height = size.y;
+ rect.y = h/2 - 14/2;
+ rect.width = SASH_FULL_SIZE;
+ rect.height = 14;
+
+ erase_rect.x = position;
+ erase_rect.y = 0;
+ erase_rect.width = SASH_FULL_SIZE;
+ erase_rect.height = h;
}
else // horz
{
- rect.x = 0;
+ int w = win->GetClientSize().GetWidth();
+
+ rect.x = w/2 - 14/2;
rect.y = position;
- rect.height = SASH_SIZE + SASH_MARGIN;
- rect.width = size.x;
+ rect.height = SASH_FULL_SIZE;
+ rect.width = 14;
+
+ erase_rect.y = position;
+ erase_rect.x = 0;
+ erase_rect.height = SASH_FULL_SIZE;
+ erase_rect.width = w;
}
+ // 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,
+ NULL,
win->m_wxwindow,
(char *)"base", // const_cast
- 0, 0, -1, -1
+ erase_rect.x,
+ erase_rect.y,
+ erase_rect.width,
+ erase_rect.height
);
+#ifdef __WXGTK20__
+ gtk_paint_handle
+ (
+ win->m_wxwindow->style,
+ GTK_PIZZA(win->m_wxwindow)->bin_window,
+ flags & wxCONTROL_CURRENT ? GTK_STATE_PRELIGHT : GTK_STATE_NORMAL,
+ GTK_SHADOW_NONE,
+ NULL /* no clipping */,
+ win->m_wxwindow,
+ "paned",
+ rect.x,
+ 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;
typedef void (*GtkPaintLineFunc)(GtkStyle *, GdkWindow *,
GtkStateType,
GdkRectangle *, GtkWidget *,
- gchar *, gint, gint, gint);
+ gchar *,
+ gint, gint, gint);
GtkPaintLineFunc func = isVert ? gtk_paint_vline : gtk_paint_hline;
isVert ? size.y - 2*SASH_SIZE : position,
SASH_SIZE, SASH_SIZE
);
+#endif // GTK+ 2.x/1.x
}
projects / wxWidgets.git / blobdiff