gEDA-cvs: pcb.git: branch: master updated (9ad2e6ef8da1118911462daf29778dbaf5216312)

[git@xxxxxxxxxx]

The branch, master has been updated
       via  9ad2e6ef8da1118911462daf29778dbaf5216312 (commit)
      from  718b9c34a4c2e4070436cf8abf756f22c5c74cec (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


=========
 Summary
=========

 src/hid/gtk/gui-drc-window.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)


=================
 Commit Messages
=================

commit 9ad2e6ef8da1118911462daf29778dbaf5216312
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>

    hid/gtk: Use gtk_widget_get_style() accessor, rather than direct access
    
    In GTK3.0, direct access to widget->style will be impossible.
    
    Swap out the GTK_WIDGET_STATE() macro for gtk_widget_get_state(), which
    does not directly access the GSeal'd member widget->state.

:100644 100644 e7f5c46... 4ab38b1... M	src/hid/gtk/gui-drc-window.c

=========
 Changes
=========

commit 9ad2e6ef8da1118911462daf29778dbaf5216312
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>

    hid/gtk: Use gtk_widget_get_style() accessor, rather than direct access
    
    In GTK3.0, direct access to widget->style will be impossible.
    
    Swap out the GTK_WIDGET_STATE() macro for gtk_widget_get_state(), which
    does not directly access the GSeal'd member widget->state.

diff --git a/src/hid/gtk/gui-drc-window.c b/src/hid/gtk/gui-drc-window.c
index e7f5c46..4ab38b1 100644
--- a/src/hid/gtk/gui-drc-window.c
+++ b/src/hid/gtk/gui-drc-window.c
@@ -719,6 +719,7 @@ ghid_violation_renderer_render (GtkCellRenderer      *cell,
 				GtkCellRendererState  flags)
 {
   GdkDrawable *mydrawable;
+  GtkStyle *style = gtk_widget_get_style (widget);
   GhidViolationRenderer *renderer = GHID_VIOLATION_RENDERER (cell);
   GhidDrcViolation *violation = renderer->violation;
   int pixmap_size = VIOLATION_PIXMAP_PIXEL_SIZE - 2 * VIOLATION_PIXMAP_PIXEL_BORDER;
@@ -751,7 +752,7 @@ ghid_violation_renderer_render (GtkCellRenderer      *cell,
 
   mydrawable = GDK_DRAWABLE (violation->pixmap);
 
-  gdk_draw_drawable (window, widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
+  gdk_draw_drawable (window, style->fg_gc[gtk_widget_get_state (widget)],
 		     mydrawable, 0, 0,
 		     cell_area->x + cell_area->width + VIOLATION_PIXMAP_PIXEL_BORDER,
 		     cell_area->y + VIOLATION_PIXMAP_PIXEL_BORDER, -1, -1);




_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs