X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..964f23b70eb72fe6f35b6cfe0b5642408239b4d6:/src/gtk/renderer.cpp diff --git a/src/gtk/renderer.cpp b/src/gtk/renderer.cpp index ca775301d3..e950dbe248 100644 --- a/src/gtk/renderer.cpp +++ b/src/gtk/renderer.cpp @@ -6,7 +6,7 @@ // Created: 20.07.2003 // RCS-ID: $Id$ // Copyright: (c) 2003 Vadim Zeitlin -// License: wxWidgets licence +// License: wxWindows licence /////////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -24,15 +24,13 @@ #pragma hdrstop #endif -#ifndef WX_PRECOMP -#endif // WX_PRECOMP - +#include "wx/renderer.h" #include #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" @@ -51,6 +49,10 @@ class WXDLLEXPORT wxRendererGTK : public wxDelegateRendererNative { public: + + // used by DrawHeaderButton and DrawComboBoxDropButton + void PrepareButtonDraw(); + // draw the header control button (used by wxListCtrl) virtual void DrawHeaderButton(wxWindow *win, wxDC& dc, @@ -76,6 +78,11 @@ public: wxOrientation orient, int flags = 0); + virtual void DrawComboBoxDropButton(wxWindow *win, + wxDC& dc, + const wxRect& rect, + int flags = 0); + virtual wxSplitterRenderParams GetSplitterParams(const wxWindow *win); }; @@ -91,6 +98,27 @@ wxRendererNative& wxRendererNative::GetDefault() return s_rendererGTK; } +// ---------------------------------------------------------------------------- +// common code +// ---------------------------------------------------------------------------- + +static GtkWidget *gs_button = NULL; +static GtkWidget *gs_window = NULL; + +void +wxRendererGTK::PrepareButtonDraw() +{ + // prepares gs_button and gs_window which are used when + // drawing button based elements. + wxASSERT ( !gs_button ); + + gs_window = gtk_window_new( GTK_WINDOW_POPUP ); + gtk_widget_realize( gs_window ); + gs_button = gtk_button_new(); + gtk_container_add( GTK_CONTAINER(gs_window), gs_button ); + gtk_widget_realize( gs_button ); +} + // ---------------------------------------------------------------------------- // list/tree controls drawing // ---------------------------------------------------------------------------- @@ -102,25 +130,19 @@ wxRendererGTK::DrawHeaderButton(wxWindow *win, 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 ); - } + if (gs_button == NULL) + PrepareButtonDraw(); gtk_paint_box ( - s_button->style, + gs_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, + gs_button, "button", dc.XLOG2DEV(rect.x) -1, rect.y -1, rect.width +2, rect.height +2 ); @@ -130,13 +152,11 @@ wxRendererGTK::DrawHeaderButton(wxWindow *win, // draw a ">" or "v" button // -// TODO: isn't there a GTK function to draw it? +// TODO: replace the code below with gtk_paint_expander() void wxRendererGTK::DrawTreeItemButton(wxWindow* win, wxDC& dc, const wxRect& rect, int flags) { -#if 1 - #define PM_SIZE 8 GtkPizza *pizza = GTK_PIZZA( win->m_wxwindow ); @@ -146,7 +166,6 @@ wxRendererGTK::DrawTreeItemButton(wxWindow* win, y = dc.LogicalToDeviceY( y ); x = dc.LogicalToDeviceX( x ); -#if 1 // This draws the GTK+ 2.2.4 triangle x--; GdkPoint points[3]; @@ -176,57 +195,6 @@ wxRendererGTK::DrawTreeItemButton(wxWindow* win, 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); - 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); -#endif } #endif // GTK 2.0 @@ -285,7 +253,7 @@ wxRendererGTK::DrawSplitterSash(wxWindow *win, { if ( !win->m_wxwindow->window ) { - // VZ: this happens on startup -- why? + // window not realized yet return; } @@ -296,12 +264,12 @@ wxRendererGTK::DrawSplitterSash(wxWindow *win, GdkRectangle erase_rect; if ( isVert ) { - int h = win->GetClientSize().GetHeight(); + int h = win->GetClientSize().GetHeight(); rect.x = position; - rect.y = h/2 - 14/2; + rect.y = 0; rect.width = SASH_FULL_SIZE; - rect.height = 14; + rect.height = h; erase_rect.x = position; erase_rect.y = 0; @@ -310,12 +278,12 @@ wxRendererGTK::DrawSplitterSash(wxWindow *win, } else // horz { - int w = win->GetClientSize().GetWidth(); + int w = win->GetClientSize().GetWidth(); - rect.x = w/2 - 14/2; + rect.x = 0; rect.y = position; rect.height = SASH_FULL_SIZE; - rect.width = 14; + rect.width = w; erase_rect.y = position; erase_rect.x = 0; @@ -399,3 +367,68 @@ wxRendererGTK::DrawSplitterSash(wxWindow *win, #endif // GTK+ 2.x/1.x } +void wxRendererGTK::DrawComboBoxDropButton(wxWindow *win, + wxDC& dc, + const wxRect& rect, + int flags) +{ + if (gs_button == NULL) + PrepareButtonDraw(); + + // 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 = GTK_STATE_NORMAL; + GtkShadowType shadow = GTK_SHADOW_OUT; + + if ( flags & wxCONTROL_PRESSED ) + shadow = GTK_SHADOW_IN; + else if ( flags & wxCONTROL_CURRENT ) + state = GTK_STATE_PRELIGHT; + else if ( flags & wxCONTROL_DISABLED ) + state = GTK_STATE_INSENSITIVE; + + gtk_paint_box + ( + gs_button->style, + //GTK_PIZZA(wdc->m_window)->bin_window, + wdc.m_window, + state, + shadow, + NULL, + gs_button, + "button", + dc.XLOG2DEV(rect.x), rect.y, rect.width, rect.height + ); + + // draw arrow on button + + int arr_wid = rect.width/2; + int arr_hei = rect.height/2; + arr_wid += arr_wid & 1; + arr_hei += arr_hei & 1; + + gtk_paint_arrow + ( + gs_button->style, + //GTK_PIZZA(wdc->m_window)->bin_window, + wdc.m_window, + state, + shadow, + NULL, + gs_button, + "arrow", + GTK_ARROW_DOWN, + TRUE, + dc.XLOG2DEV(rect.x) + (rect.width/2-arr_wid/2) + 1, + rect.y + (rect.height/2-arr_hei/2) + 1, + arr_wid, + arr_hei + ); + +} +