X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3203621a926c6cdf393fb6ba0afbd21817dde017..f0eebb39bc6bb54441e695b3c1b1e0bea6ab5c01:/src/gtk1/renderer.cpp diff --git a/src/gtk1/renderer.cpp b/src/gtk1/renderer.cpp index 67768b216c..04d03ae16d 100644 --- a/src/gtk1/renderer.cpp +++ b/src/gtk1/renderer.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: gtk/renderer.cpp +// Name: src/gtk1/renderer.cpp // Purpose: implementation of wxRendererNative for wxGTK // Author: Vadim Zeitlin // Modified by: @@ -25,22 +25,20 @@ #endif #include "wx/renderer.h" -#include -#include "wx/gtk/win_gtk.h" -#include "wx/window.h" -#include "wx/dc.h" -#include "wx/dcclient.h" +#ifndef WX_PRECOMP + #include "wx/window.h" + #include "wx/dc.h" + #include "wx/dcclient.h" +#endif -#ifdef __WXGTK20__ - #include "wx/settings.h" -#endif // GTK 2.0 +#include +#include "wx/gtk1/win_gtk.h" -#ifdef __WXGTK20__ - #define WXUNUSED_IN_GTK1(arg) arg -#else - #define WXUNUSED_IN_GTK1(arg) -#endif +// 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 so USE_ERASE_RECT=0 +#define USE_ERASE_RECT 0 // ---------------------------------------------------------------------------- // wxRendererGTK: our wxRendererNative implementation @@ -55,14 +53,6 @@ public: const wxRect& rect, int flags = 0); -#ifdef __WXGTK20__ - // draw the expanded/collapsed icon for a tree control item - virtual void DrawTreeItemButton(wxWindow *win, - wxDC& dc, - const wxRect& rect, - int flags = 0); -#endif // GTK+ 2.0 - virtual void DrawSplitterBorder(wxWindow *win, wxDC& dc, const wxRect& rect, @@ -91,11 +81,6 @@ private: // used by DrawHeaderButton and DrawComboBoxDropButton static GtkWidget *GetButtonWidget(); - -#ifdef __WXGTK20__ - // used by DrawTreeItemButton() - static GtkWidget *GetTreeWidget(); -#endif // GTK+ 2.0 }; // ============================================================================ @@ -132,28 +117,6 @@ wxRendererGTK::GetButtonWidget() 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 // ---------------------------------------------------------------------------- @@ -182,66 +145,19 @@ wxRendererGTK::DrawHeaderButton(wxWindow *win, ); } -#ifdef __WXGTK20__ - -// draw a ">" or "v" button -void -wxRendererGTK::DrawTreeItemButton(wxWindow* win, - wxDC& dc, const wxRect& rect, int flags) -{ - 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 - // ---------------------------------------------------------------------------- // splitter sash drawing // ---------------------------------------------------------------------------- -#ifndef __WXGTK20__ - // the full sash width (should be even) - static const wxCoord SASH_SIZE = 8; +// the full sash width (should be even) +static const wxCoord SASH_SIZE = 8; - // margin around the sash - static const wxCoord SASH_MARGIN = 2; -#endif // GTK+ 2.x/1.x +// margin around the sash +static const wxCoord SASH_MARGIN = 2; 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 @@ -252,11 +168,7 @@ wxRendererGTK::GetSplitterParams(const wxWindow *WXUNUSED(win)) ( GetGtkSplitterFullSize(), 0, -#ifdef __WXGTK20__ - true // hot sensitive -#else // GTK+ 1.x false // not -#endif // GTK+ 2.x/1.x ); } @@ -275,21 +187,24 @@ wxRendererGTK::DrawSplitterSash(wxWindow *win, const wxSize& size, wxCoord position, wxOrientation orient, - int WXUNUSED_IN_GTK1(flags)) + int WXUNUSED(flags)) { if ( !win->m_wxwindow->window ) { // window not realized yet return; } - + wxCoord full_size = GetGtkSplitterFullSize(); // are we drawing vertical or horizontal splitter? const bool isVert = orient == wxVERTICAL; GdkRectangle rect; +#if USE_ERASE_RECT GdkRectangle erase_rect; +#endif + if ( isVert ) { int h = win->GetClientSize().GetHeight(); @@ -299,10 +214,12 @@ wxRendererGTK::DrawSplitterSash(wxWindow *win, rect.width = full_size; rect.height = h; +#if USE_ERASE_RECT erase_rect.x = position; erase_rect.y = 0; erase_rect.width = full_size; erase_rect.height = h; +#endif } else // horz { @@ -313,17 +230,15 @@ wxRendererGTK::DrawSplitterSash(wxWindow *win, rect.height = full_size; rect.width = w; +#if USE_ERASE_RECT erase_rect.y = position; erase_rect.x = 0; erase_rect.height = full_size; erase_rect.width = w; +#endif } -#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 - +#if USE_ERASE_RECT // we must erase everything first, otherwise the garbage // from the old sash is left when dragging it gtk_paint_flat_box @@ -342,23 +257,6 @@ wxRendererGTK::DrawSplitterSash(wxWindow *win, ); #endif -#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; @@ -396,7 +294,6 @@ wxRendererGTK::DrawSplitterSash(wxWindow *win, isVert ? size.y - 2*SASH_SIZE : position, SASH_SIZE, SASH_SIZE ); -#endif // GTK+ 2.x/1.x } void @@ -412,11 +309,9 @@ wxRendererGTK::DrawDropArrow(wxWindow *win, // work for wxMemoryDC. So that is why we assume wxDC // is wxWindowDC (wxClientDC, wxMemoryDC and wxPaintDC // are derived from it) and use its m_window. - wxWindowDC& wdc = (wxWindowDC&)dc; - - // only doing debug-time checking here (it should - // probably be enough) - wxASSERT ( wdc.IsKindOf(CLASSINFO(wxWindowDC)) ); + GdkWindow* gdk_window = dc.GetGDKWindow(); + wxASSERT_MSG( gdk_window, + wxT("cannot use wxRendererNative on wxDC of this type") ); // draw arrow so that there is even space horizontally // on both sides @@ -443,7 +338,7 @@ wxRendererGTK::DrawDropArrow(wxWindow *win, gtk_paint_arrow ( button->style, - wdc.m_window, + gdk_window, state, flags & wxCONTROL_PRESSED ? GTK_SHADOW_IN : GTK_SHADOW_OUT, NULL, @@ -467,8 +362,9 @@ wxRendererGTK::DrawComboBoxDropButton(wxWindow *win, GtkWidget *button = GetButtonWidget(); // for reason why we do this, see DrawDropArrow - wxWindowDC& wdc = (wxWindowDC&)dc; - wxASSERT ( wdc.IsKindOf(CLASSINFO(wxWindowDC)) ); + GdkWindow* gdk_window = dc.GetGDKWindow(); + wxASSERT_MSG( gdk_window, + wxT("cannot use wxRendererNative on wxDC of this type") ); // draw button GtkStateType state; @@ -485,7 +381,7 @@ wxRendererGTK::DrawComboBoxDropButton(wxWindow *win, gtk_paint_box ( button->style, - wdc.m_window, + gdk_window, state, flags & wxCONTROL_PRESSED ? GTK_SHADOW_IN : GTK_SHADOW_OUT, NULL, @@ -498,4 +394,3 @@ wxRendererGTK::DrawComboBoxDropButton(wxWindow *win, DrawDropArrow(win,dc,rect,flags); } -