X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ab171e95021482a8a0c0e24ebe050fa0181e7af0..9d5507f7a2701395e1d5c121bd877bb9066ee6ea:/src/gtk/renderer.cpp?ds=sidebyside diff --git a/src/gtk/renderer.cpp b/src/gtk/renderer.cpp index 0e945d4d1e..de54e0aea2 100644 --- a/src/gtk/renderer.cpp +++ b/src/gtk/renderer.cpp @@ -30,10 +30,12 @@ #include "wx/window.h" #include "wx/dcclient.h" #include "wx/settings.h" + #include "wx/module.h" #endif +#include "wx/gtk/dc.h" + #include -#include "wx/gtk/win_gtk.h" // ---------------------------------------------------------------------------- // wxRendererGTK: our wxRendererNative implementation @@ -96,9 +98,10 @@ public: virtual wxSplitterRenderParams GetSplitterParams(const wxWindow *win); -private: - // FIXME: shouldn't we destroy these windows somewhere? + class Module; + friend class Module; +private: // used by DrawPushButton and DrawDropArrow static GtkWidget *GetButtonWidget(); @@ -110,12 +113,41 @@ private: // Used by DrawHeaderButton static GtkWidget *GetHeaderButtonWidget(); + + static GtkWidget* GetSplitterWidget(); + + // container for created widgets + static GtkContainer* GetContainer(); + static GtkWidget* ms_container; +}; + +// Module for destroying created widgets +class wxRendererGTK::Module: public wxModule +{ +public: + virtual bool OnInit() + { + return true; + } + virtual void OnExit() + { + if (wxRendererGTK::ms_container) + { + GtkWidget* parent = + gtk_widget_get_parent(wxRendererGTK::ms_container); + gtk_widget_destroy(parent); + } + } + DECLARE_DYNAMIC_CLASS(wxRendererGTK::Module) }; +IMPLEMENT_DYNAMIC_CLASS(wxRendererGTK::Module, wxModule) // ============================================================================ // implementation // ============================================================================ +GtkWidget* wxRendererGTK::ms_container; + /* static */ wxRendererNative& wxRendererNative::GetDefault() { @@ -128,18 +160,26 @@ wxRendererNative& wxRendererNative::GetDefault() // helper functions // ---------------------------------------------------------------------------- +GtkContainer* wxRendererGTK::GetContainer() +{ + if (ms_container == NULL) + { + GtkWidget* window = gtk_window_new(GTK_WINDOW_POPUP); + ms_container = gtk_fixed_new(); + gtk_container_add(GTK_CONTAINER(window), ms_container); + } + return GTK_CONTAINER(ms_container); +} + GtkWidget * wxRendererGTK::GetButtonWidget() { 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_button_new(); - gtk_container_add( GTK_CONTAINER(s_window), s_button ); + gtk_container_add(GetContainer(), s_button); gtk_widget_realize( s_button ); } @@ -150,14 +190,11 @@ 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_container_add(GetContainer(), s_button); gtk_widget_realize( s_button ); } @@ -168,20 +205,34 @@ 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_container_add(GetContainer(), s_tree); gtk_widget_realize( s_tree ); } return s_tree; } +// used elsewhere +GtkWidget *GetEntryWidget() +{ + static GtkWidget *s_entry = NULL; + static GtkWidget *s_window = NULL; + + if ( !s_entry ) + { + s_window = gtk_window_new( GTK_WINDOW_POPUP ); + gtk_widget_realize( s_window ); + s_entry = gtk_entry_new(); + gtk_container_add( GTK_CONTAINER(s_window), s_entry ); + gtk_widget_realize( s_entry ); + } + + return s_entry; +} // This one just gets the button used by the column header. Although it's // still a gtk_button the themes will typically differentiate and draw them @@ -204,6 +255,18 @@ wxRendererGTK::GetHeaderButtonWidget() return s_button; } +GtkWidget* wxRendererGTK::GetSplitterWidget() +{ + static GtkWidget* widget; + if (widget == NULL) + { + widget = gtk_vpaned_new(); + gtk_container_add(GetContainer(), widget); + gtk_widget_realize(widget); + } + return widget; +} + // ---------------------------------------------------------------------------- // list/tree controls drawing // ---------------------------------------------------------------------------- @@ -218,11 +281,11 @@ wxRendererGTK::DrawHeaderButton(wxWindow *win, { GtkWidget *button = GetHeaderButtonWidget(); - + GdkWindow* gdk_window = NULL; #if wxUSE_NEW_DC - wxImplDC *impl = dc.GetImpl(); - wxGTKImplDC *gtk_impl = wxDynamicCast( impl, wxGTKImplDC ); + wxDCImpl *impl = dc.GetImpl(); + wxGTKDCImpl *gtk_impl = wxDynamicCast( impl, wxGTKDCImpl ); if (gtk_impl) gdk_window = gtk_impl->GetGDKWindow(); #else @@ -235,11 +298,20 @@ wxRendererGTK::DrawHeaderButton(wxWindow *win, if (win->GetLayoutDirection() == wxLayout_RightToLeft) x_diff = rect.width; + GtkStateType state = GTK_STATE_NORMAL; + if (flags & wxCONTROL_DISABLED) + state = GTK_STATE_INSENSITIVE; + else + { + if (flags & wxCONTROL_CURRENT) + state = GTK_STATE_PRELIGHT; + } + gtk_paint_box ( button->style, gdk_window, - flags & wxCONTROL_DISABLED ? GTK_STATE_INSENSITIVE : GTK_STATE_NORMAL, + state, GTK_SHADOW_OUT, NULL, button, @@ -259,8 +331,8 @@ wxRendererGTK::DrawTreeItemButton(wxWindow* win, GdkWindow* gdk_window = NULL; #if wxUSE_NEW_DC - wxImplDC *impl = dc.GetImpl(); - wxGTKImplDC *gtk_impl = wxDynamicCast( impl, wxGTKImplDC ); + wxDCImpl *impl = dc.GetImpl(); + wxGTKDCImpl *gtk_impl = wxDynamicCast( impl, wxGTKDCImpl ); if (gtk_impl) gdk_window = gtk_impl->GetGDKWindow(); #else @@ -301,14 +373,10 @@ wxRendererGTK::DrawTreeItemButton(wxWindow* win, // splitter sash drawing // ---------------------------------------------------------------------------- -static int GetGtkSplitterFullSize() +static int GetGtkSplitterFullSize(GtkWidget* widget) { - 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); + gtk_widget_style_get(widget, "handle_size", &handle_size, NULL); return handle_size; } @@ -319,7 +387,7 @@ wxRendererGTK::GetSplitterParams(const wxWindow *WXUNUSED(win)) // we don't draw any border, hence 0 for the second field return wxSplitterRenderParams ( - GetGtkSplitterFullSize(), + GetGtkSplitterFullSize(GetSplitterWidget()), 0, true // hot sensitive ); @@ -350,8 +418,8 @@ wxRendererGTK::DrawSplitterSash(wxWindow *win, GdkWindow* gdk_window = NULL; #if wxUSE_NEW_DC - wxImplDC *impl = dc.GetImpl(); - wxGTKImplDC *gtk_impl = wxDynamicCast( impl, wxGTKImplDC ); + wxDCImpl *impl = dc.GetImpl(); + wxGTKDCImpl *gtk_impl = wxDynamicCast( impl, wxGTKDCImpl ); if (gtk_impl) gdk_window = gtk_impl->GetGDKWindow(); #else @@ -360,7 +428,7 @@ wxRendererGTK::DrawSplitterSash(wxWindow *win, wxASSERT_MSG( gdk_window, wxT("cannot use wxRendererNative on wxDC of this type") ); - wxCoord full_size = GetGtkSplitterFullSize(); + wxCoord full_size = GetGtkSplitterFullSize(GetSplitterWidget()); // are we drawing vertical or horizontal splitter? const bool isVert = orient == wxVERTICAL; @@ -369,21 +437,17 @@ wxRendererGTK::DrawSplitterSash(wxWindow *win, if ( isVert ) { - int h = win->GetClientSize().GetHeight(); - rect.x = position; rect.y = 0; rect.width = full_size; - rect.height = h; + rect.height = size.y; } else // horz { - int w = win->GetClientSize().GetWidth(); - rect.x = 0; rect.y = position; rect.height = full_size; - rect.width = w; + rect.width = size.x; } int x_diff = 0; @@ -422,8 +486,8 @@ wxRendererGTK::DrawDropArrow(wxWindow *WXUNUSED(win), // are derived from it) and use its m_window. GdkWindow* gdk_window = NULL; #if wxUSE_NEW_DC - wxImplDC *impl = dc.GetImpl(); - wxGTKImplDC *gtk_impl = wxDynamicCast( impl, wxGTKImplDC ); + wxDCImpl *impl = dc.GetImpl(); + wxGTKDCImpl *gtk_impl = wxDynamicCast( impl, wxGTKDCImpl ); if (gtk_impl) gdk_window = gtk_impl->GetGDKWindow(); #else @@ -489,11 +553,11 @@ wxRendererGTK::DrawCheckBox(wxWindow *WXUNUSED(win), int flags ) { GtkWidget *button = GetCheckButtonWidget(); - + GdkWindow* gdk_window = NULL; #if wxUSE_NEW_DC - wxImplDC *impl = dc.GetImpl(); - wxGTKImplDC *gtk_impl = wxDynamicCast( impl, wxGTKImplDC ); + wxDCImpl *impl = dc.GetImpl(); + wxGTKDCImpl *gtk_impl = wxDynamicCast( impl, wxGTKDCImpl ); if (gtk_impl) gdk_window = gtk_impl->GetGDKWindow(); #else @@ -538,8 +602,8 @@ wxRendererGTK::DrawPushButton(wxWindow *WXUNUSED(win), GdkWindow* gdk_window = NULL; #if wxUSE_NEW_DC - wxImplDC *impl = dc.GetImpl(); - wxGTKImplDC *gtk_impl = wxDynamicCast( impl, wxGTKImplDC ); + wxDCImpl *impl = dc.GetImpl(); + wxGTKDCImpl *gtk_impl = wxDynamicCast( impl, wxGTKDCImpl ); if (gtk_impl) gdk_window = gtk_impl->GetGDKWindow(); #else @@ -581,8 +645,8 @@ wxRendererGTK::DrawItemSelectionRect(wxWindow *win, { GdkWindow* gdk_window = NULL; #if wxUSE_NEW_DC - wxImplDC *impl = dc.GetImpl(); - wxGTKImplDC *gtk_impl = wxDynamicCast( impl, wxGTKImplDC ); + wxDCImpl *impl = dc.GetImpl(); + wxGTKDCImpl *gtk_impl = wxDynamicCast( impl, wxGTKDCImpl ); if (gtk_impl) gdk_window = gtk_impl->GetGDKWindow(); #else @@ -619,7 +683,7 @@ wxRendererGTK::DrawItemSelectionRect(wxWindow *win, state = GTK_STATE_NORMAL; } - if (flags & wxCONTROL_CURRENT) + if ((flags & wxCONTROL_CURRENT) && (flags & wxCONTROL_FOCUSED)) { gtk_paint_focus( win->m_widget->style, gdk_window, @@ -638,8 +702,8 @@ void wxRendererGTK::DrawFocusRect(wxWindow* win, wxDC& dc, const wxRect& rect, i { GdkWindow* gdk_window = NULL; #if wxUSE_NEW_DC - wxImplDC *impl = dc.GetImpl(); - wxGTKImplDC *gtk_impl = wxDynamicCast( impl, wxGTKImplDC ); + wxDCImpl *impl = dc.GetImpl(); + wxGTKDCImpl *gtk_impl = wxDynamicCast( impl, wxGTKDCImpl ); if (gtk_impl) gdk_window = gtk_impl->GetGDKWindow(); #else