merged with trunk so I can build again...

(bzr r10092.1.36)

1 files changed, 7 insertions, 10 deletions

diff --git a/src/widgets/eek-preview.cpp b/src/widgets/eek-preview.cpp
index 8fefbe75c..d867647ed 100644
--- a/src/widgets/eek-preview.cpp
+++ b/src/widgets/eek-preview.cpp
@@ -1,6 +1,3 @@
-/** @file
- * @brief EEK preview stuff
- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
@@ -192,7 +189,7 @@ static guint eek_preview_signals[LAST_SIGNAL] = { 0 };
 
 gboolean eek_preview_expose_event( GtkWidget* widget, GdkEventExpose* event )
 {
-/*     g_message("Exposed!!!   %s", GTK_WIDGET_HAS_FOCUS(widget) ? "XXX" : "---" ); */
+/*     g_message("Exposed!!!   %s", gtk_widget_has_focus(widget) ? "XXX" : "---" ); */
     gint insetX = 0;
     gint insetY = 0;
 
@@ -218,13 +215,13 @@ gboolean eek_preview_expose_event( GtkWidget* widget, GdkEventExpose* event )
     }
 */
 
-    if ( GTK_WIDGET_DRAWABLE( widget ) ) {
+    if ( gtk_widget_is_drawable( widget ) ) {
         GtkStyle* style = gtk_widget_get_style( widget );
 
         if ( insetX > 0 || insetY > 0 ) {
             gtk_paint_flat_box( style,
                                 widget->window,
-                                (GtkStateType)GTK_WIDGET_STATE(widget),
+                                (GtkStateType)gtk_widget_get_state(widget),
                                 GTK_SHADOW_NONE,
                                 NULL,
                                 widget,
@@ -379,7 +376,7 @@ gboolean eek_preview_expose_event( GtkWidget* widget, GdkEventExpose* event )
         }
 
 
-        if ( GTK_WIDGET_HAS_FOCUS(widget) ) {
+        if ( gtk_widget_has_focus(widget) ) {
             gtk_paint_focus( style,
                              widget->window,
                              GTK_STATE_NORMAL,
@@ -437,7 +434,7 @@ static gboolean eek_preview_button_press_cb( GtkWidget* widget, GdkEventButton*
     if ( gtk_get_event_widget( (GdkEvent*)event ) == widget ) {
         EekPreview* preview = EEK_PREVIEW(widget);
 
-        if ( preview->_takesFocus && !GTK_WIDGET_HAS_FOCUS(widget) ) {
+        if ( preview->_takesFocus && !gtk_widget_has_focus(widget) ) {
             gtk_widget_grab_focus(widget);
         }
 
@@ -684,8 +681,8 @@ void eek_preview_set_details( EekPreview* preview, PreviewStyle prevstyle, ViewT
 static void eek_preview_init( EekPreview *preview )
 {
     GtkWidget* widg = GTK_WIDGET(preview);
-    GTK_WIDGET_SET_FLAGS( widg, GTK_CAN_FOCUS );
-    GTK_WIDGET_SET_FLAGS( widg, GTK_RECEIVES_DEFAULT );
+    gtk_widget_set_can_focus( widg, TRUE );
+    gtk_widget_set_receives_default( widg, TRUE );
 
     gtk_widget_set_sensitive( widg, TRUE );