X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/38511687af1f6f5500b66978b3c32d9d72ec4f88..899c6fad2638bb9a0c7554f4a08c6d49ab6bbeb7:/src/gtk/renderer.cpp diff --git a/src/gtk/renderer.cpp b/src/gtk/renderer.cpp index 8b097e5c76..1094858d74 100644 --- a/src/gtk/renderer.cpp +++ b/src/gtk/renderer.cpp @@ -30,6 +30,7 @@ #include "wx/window.h" #include "wx/dc.h" +#include "wx/dcclient.h" #ifdef __WXGTK20__ #include "wx/settings.h" @@ -60,7 +61,7 @@ public: wxDC& dc, const wxRect& rect, int flags = 0); -#endif // GTK 2.0 +#endif // GTK+ 2.0 virtual void DrawSplitterBorder(wxWindow *win, wxDC& dc, @@ -79,6 +80,17 @@ public: 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 }; // ============================================================================ @@ -94,19 +106,16 @@ wxRendererNative& wxRendererNative::GetDefault() } // ---------------------------------------------------------------------------- -// list/tree controls drawing +// helper functions // ---------------------------------------------------------------------------- -void -wxRendererGTK::DrawHeaderButton(wxWindow *win, - wxDC& dc, - const wxRect& rect, - int flags) +GtkWidget * +wxRendererGTK::GetButtonWidget() { - static GtkWidget *s_button = NULL; static GtkWidget *s_window = NULL; - if (s_button == NULL) + + if ( !s_button ) { s_window = gtk_window_new( GTK_WINDOW_POPUP ); gtk_widget_realize( s_window ); @@ -115,14 +124,54 @@ wxRendererGTK::DrawHeaderButton(wxWindow *win, 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 +// ---------------------------------------------------------------------------- + +void +wxRendererGTK::DrawHeaderButton(wxWindow *win, + wxDC& dc, + const wxRect& rect, + int flags) +{ + + 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, + button, "button", dc.XLOG2DEV(rect.x) -1, rect.y -1, rect.width +2, rect.height +2 ); @@ -131,53 +180,30 @@ wxRendererGTK::DrawHeaderButton(wxWindow *win, #ifdef __WXGTK20__ // draw a ">" or "v" button -// -// TODO: replace the code below with gtk_paint_expander() void wxRendererGTK::DrawTreeItemButton(wxWindow* win, wxDC& dc, const wxRect& rect, int flags) { -#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 ); - - // 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; - } + GtkWidget *tree = GetTreeWidget(); - 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 ); + // 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, + GTK_STATE_NORMAL, + 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 @@ -245,12 +271,12 @@ wxRendererGTK::DrawSplitterSash(wxWindow *win, if ( isVert ) { int h = win->GetClientSize().GetHeight(); - + rect.x = position; rect.y = 0; rect.width = SASH_FULL_SIZE; rect.height = h; - + erase_rect.x = position; erase_rect.y = 0; erase_rect.width = SASH_FULL_SIZE; @@ -259,12 +285,12 @@ wxRendererGTK::DrawSplitterSash(wxWindow *win, else // horz { int w = win->GetClientSize().GetWidth(); - + rect.x = 0; rect.y = position; rect.height = SASH_FULL_SIZE; rect.width = w; - + erase_rect.y = position; erase_rect.x = 0; erase_rect.height = SASH_FULL_SIZE; @@ -352,26 +378,37 @@ void wxRendererGTK::DrawComboBoxDropButton(wxWindow *win, const wxRect& rect, int flags) { - dc.SetBrush(wxBrush(win->GetBackgroundColour())); - dc.SetPen(wxPen(win->GetBackgroundColour())); - dc.DrawRectangle(rect); + GtkWidget *button = GetButtonWidget(); - int x = (rect.GetWidth()-9) / 2; - int y = (rect.GetHeight()-10) / 2; + // device context must inherit from wxWindowDC + // (so it must be wxClientDC, wxMemoryDC or wxPaintDC) + wxWindowDC& wdc = (wxWindowDC&)dc; - wxPoint pt[] = - { - wxPoint(x+2, y+3), - wxPoint(x+6, y+3), - wxPoint(x+6, y+6), - wxPoint(x+8, y+6), - wxPoint(x+4, y+10), - wxPoint(x+0, y+6), - wxPoint(x+2, y+6) - }; - dc.SetBrush(wxBrush(win->GetForegroundColour())); - dc.SetPen(wxPen(win->GetForegroundColour())); - dc.DrawLine(x, y, x+9, y); - dc.DrawPolygon(WXSIZEOF(pt), pt, rect.x, rect.y); + // 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 + ); }