X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/91af089567c5e13a408f1c529f6830d12cdc6c4e..f5bed7a885024108682c32c74567cdf7bf2ed13b:/src/gtk/renderer.cpp diff --git a/src/gtk/renderer.cpp b/src/gtk/renderer.cpp index 7c0a375e80..a16251eaf7 100644 --- a/src/gtk/renderer.cpp +++ b/src/gtk/renderer.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: gtk/renderer.cpp +// Name: src/gtk/renderer.cpp // Purpose: implementation of wxRendererNative for wxGTK // Author: Vadim Zeitlin // Modified by: @@ -25,23 +25,17 @@ #endif #include "wx/renderer.h" -#include -#include "wx/gtk/win_gtk.h" -#include "wx/window.h" -#include "wx/dc.h" -#include "wx/dcclient.h" - -#ifdef __WXGTK20__ +#ifndef WX_PRECOMP + #include "wx/window.h" + #include "wx/dc.h" + #include "wx/dcclient.h" #include "wx/settings.h" -#endif // GTK 2.0 - -#ifdef __WXGTK20__ - #define WXUNUSED_IN_GTK1(arg) arg -#else - #define WXUNUSED_IN_GTK1(arg) #endif +#include +#include "wx/gtk/win_gtk.h" + // 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 @@ -60,13 +54,11 @@ 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, @@ -89,18 +81,34 @@ public: const wxRect& rect, int flags = 0); + virtual void DrawCheckBox(wxWindow *win, + wxDC& dc, + const wxRect& rect, + int flags = 0); + + virtual void DrawPushButton(wxWindow *win, + wxDC& dc, + const wxRect& rect, + int flags = 0); + + virtual void DrawItemSelectionRect(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 + // used by DrawHeaderButton and DrawPushButton static GtkWidget *GetButtonWidget(); -#ifdef __WXGTK20__ // used by DrawTreeItemButton() static GtkWidget *GetTreeWidget(); -#endif // GTK+ 2.0 + + // used by DrawCheckBox() + static GtkWidget *GetCheckButtonWidget(); }; // ============================================================================ @@ -137,7 +145,23 @@ wxRendererGTK::GetButtonWidget() return s_button; } -#ifdef __WXGTK20__ +GtkWidget * +wxRendererGTK::GetCheckButtonWidget() +{ + 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_check_button_new(); + gtk_container_add( GTK_CONTAINER(s_window), s_button ); + gtk_widget_realize( s_button ); + } + + return s_button; +} GtkWidget * wxRendererGTK::GetTreeWidget() @@ -157,8 +181,6 @@ wxRendererGTK::GetTreeWidget() return s_tree; } -#endif // GTK+ 2.0 - // ---------------------------------------------------------------------------- // list/tree controls drawing // ---------------------------------------------------------------------------- @@ -176,19 +198,17 @@ wxRendererGTK::DrawHeaderButton(wxWindow *win, ( 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? + // Maybe use code similar as in DrawPushButton below? GTK_PIZZA(win->m_wxwindow)->bin_window, flags & wxCONTROL_DISABLED ? GTK_STATE_INSENSITIVE : GTK_STATE_NORMAL, GTK_SHADOW_OUT, NULL, button, "button", - dc.XLOG2DEV(rect.x) -1, rect.y -1, rect.width +2, rect.height +2 + dc.XLOG2DEV(rect.x), rect.y, rect.width, rect.height ); } -#ifdef __WXGTK20__ - // draw a ">" or "v" button void wxRendererGTK::DrawTreeItemButton(wxWindow* win, @@ -219,23 +239,13 @@ wxRendererGTK::DrawTreeItemButton(wxWindow* win, ); } -#endif // GTK+ 2.0 // ---------------------------------------------------------------------------- // splitter sash drawing // ---------------------------------------------------------------------------- -#ifndef __WXGTK20__ - // 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 - static int GetGtkSplitterFullSize() { -#ifdef __WXGTK20__ static GtkWidget *s_paned = NULL; if (s_paned == NULL) s_paned = gtk_vpaned_new(); @@ -244,9 +254,6 @@ static int GetGtkSplitterFullSize() gtk_widget_style_get (s_paned, "handle_size", &handle_size, NULL); return handle_size; -#else - return SASH_SIZE + SASH_MARGIN; -#endif } wxSplitterRenderParams @@ -257,11 +264,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 ); } @@ -280,7 +283,7 @@ wxRendererGTK::DrawSplitterSash(wxWindow *win, const wxSize& size, wxCoord position, wxOrientation orient, - int WXUNUSED_IN_GTK1(flags)) + int flags) { if ( !win->m_wxwindow->window ) { @@ -350,7 +353,6 @@ wxRendererGTK::DrawSplitterSash(wxWindow *win, ); #endif -#ifdef __WXGTK20__ gtk_paint_handle ( win->m_wxwindow->style, @@ -366,45 +368,6 @@ wxRendererGTK::DrawSplitterSash(wxWindow *win, rect.height, isVert ? GTK_ORIENTATION_VERTICAL : GTK_ORIENTATION_HORIZONTAL ); -#else // GTK+ 1.x - - // leave some margin before sash itself - position += SASH_MARGIN / 2; - - // and finally draw it using GTK paint functions - typedef void (*GtkPaintLineFunc)(GtkStyle *, GdkWindow *, - GtkStateType, - GdkRectangle *, GtkWidget *, - gchar *, - gint, gint, gint); - - GtkPaintLineFunc func = isVert ? gtk_paint_vline : gtk_paint_hline; - - (*func) - ( - win->m_wxwindow->style, - GTK_PIZZA(win->m_wxwindow)->bin_window, - GTK_STATE_NORMAL, - NULL, - win->m_wxwindow, - (char *)"paned", // const_cast - 0, isVert ? size.y : size.x, position + SASH_SIZE / 2 - 1 - ); - - gtk_paint_box - ( - win->m_wxwindow->style, - GTK_PIZZA(win->m_wxwindow)->bin_window, - GTK_STATE_NORMAL, - GTK_SHADOW_OUT, - (GdkRectangle*) NULL, - win->m_wxwindow, - (char *)"paned", // const_cast - isVert ? position : size.x - 2*SASH_SIZE, - isVert ? size.y - 2*SASH_SIZE : position, - SASH_SIZE, SASH_SIZE - ); -#endif // GTK+ 2.x/1.x } void @@ -471,6 +434,54 @@ wxRendererGTK::DrawComboBoxDropButton(wxWindow *win, wxDC& dc, const wxRect& rect, int flags) +{ + DrawPushButton(win,dc,rect,flags); + DrawDropArrow(win,dc,rect); +} + +void +wxRendererGTK::DrawCheckBox(wxWindow *win, + wxDC& dc, + const wxRect& rect, + int flags ) +{ + GtkWidget *button = GetCheckButtonWidget(); + + // for reason why we do this, see DrawDropArrow + wxWindowDC& wdc = (wxWindowDC&)dc; + wxASSERT ( wdc.IsKindOf(CLASSINFO(wxWindowDC)) ); + + GtkStateType state; + + if ( flags & wxCONTROL_PRESSED ) + state = GTK_STATE_ACTIVE; + else if ( flags & wxCONTROL_DISABLED ) + state = GTK_STATE_INSENSITIVE; + else if ( flags & wxCONTROL_CURRENT ) + state = GTK_STATE_PRELIGHT; + else + state = GTK_STATE_NORMAL; + + gtk_paint_check + ( + button->style, + wdc.m_window, + state, + flags & wxCONTROL_CHECKED ? GTK_SHADOW_IN : GTK_SHADOW_OUT, + NULL, + button, + "cellcheck", + dc.LogicalToDeviceX(rect.x)+2, + dc.LogicalToDeviceY(rect.y)+3, + 13, 13 + ); +} + +void +wxRendererGTK::DrawPushButton(wxWindow *win, + wxDC& dc, + const wxRect& rect, + int flags) { GtkWidget *button = GetButtonWidget(); @@ -501,9 +512,43 @@ wxRendererGTK::DrawComboBoxDropButton(wxWindow *win, "button", rect.x, rect.y, rect.width, rect.height ); +} - // draw arrow on button - DrawDropArrow(win,dc,rect,flags); +void +wxRendererGTK::DrawItemSelectionRect(wxWindow *win, + wxDC& dc, + const wxRect& rect, + int flags ) +{ + // for reason why we do this, see DrawDropArrow + wxWindowDC& wdc = (wxWindowDC&)dc; + wxASSERT ( wdc.IsKindOf(CLASSINFO(wxWindowDC)) ); -} + GtkStateType state; + if (flags & wxCONTROL_SELECTED) + { + if (flags & wxCONTROL_FOCUSED) + state = GTK_STATE_SELECTED; + else + state = GTK_STATE_INSENSITIVE; + + gtk_paint_flat_box( win->m_wxwindow->style, + GTK_PIZZA(win->m_wxwindow)->bin_window, + state, + GTK_SHADOW_NONE, + NULL, + win->m_wxwindow, + "treeview", + dc.LogicalToDeviceX(rect.x), + dc.LogicalToDeviceY(rect.y), + rect.width, + rect.height ); + } + if (flags & wxCONTROL_CURRENT) + { + dc.SetPen( *wxBLACK_PEN ); + dc.SetBrush( *wxTRANSPARENT_BRUSH ); + dc.DrawRectangle( rect ); + } +}