cleanups

10 files changed, 11 insertions, 24 deletions

diff --git a/src/Makefile.in b/src/Makefile.in
index 4821cb942a4..2dfef64a762 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -343,7 +343,7 @@ base_obj = dispnew.o frame.o scroll.o xdisp.o menu.o $(XMENU_OBJ) window.o \
         syntax.o $(UNEXEC_OBJ) bytecode.o \
         process.o gnutls.o callproc.o \
         region-cache.o sound.o atimer.o \
-        doprnt.o intervals.o textprop.o composite.o  xml.o \
+        doprnt.o intervals.o textprop.o composite.o xml.o \
         xwidget.o \
         $(MSDOS_OBJ) $(MSDOS_X_OBJ) $(NS_OBJ) $(CYGWIN_OBJ) $(FONT_OBJ)
 obj = $(base_obj) $(NS_OBJC_OBJ)
diff --git a/src/dispextern.h b/src/dispextern.h
index b8ef4656220..442839c3cf9 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -437,7 +437,6 @@ struct glyph
     int img_id;
 
     struct xwidget* xwidget;
-
     /* Sub-structure for type == STRETCH_GLYPH.  */
     struct
     {
diff --git a/src/dispnew.c b/src/dispnew.c
index 7b20979e45d..e1311634e2c 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -313,9 +313,8 @@ add_window_display_history (struct window *w, const char *msg, int paused_p)
             ? SSDATA (BVAR (XBUFFER (w->buffer), name))
             : "???"),
            paused_p ? " ***paused***" : "");
-
   strcat (buf, msg);
-}
+
 
 
 /* Add to the redisplay history that frame F has been displayed.
diff --git a/src/emacsgtkfixed.c b/src/emacsgtkfixed.c
index 5a0e57d0146..637903d85b4 100644
--- a/src/emacsgtkfixed.c
+++ b/src/emacsgtkfixed.c
@@ -74,7 +74,7 @@ static void emacs_fixed_gtk_widget_size_allocate (GtkWidget *widget,
   parent_class = g_type_class_peek_parent (klass);
   parent_class->size_allocate (widget, allocation);
 
- 
+
   //then modify allocations
   gtk_container_foreach  (widget,
                           aloc_callback,
diff --git a/src/frame.h b/src/frame.h
index 4b4788b9e74..8dccfb8540a 100644
--- a/src/frame.h
+++ b/src/frame.h
@@ -492,10 +492,6 @@ struct frame
   /* All display backends seem to need these two pixel values. */
   unsigned long background_pixel;
   unsigned long foreground_pixel;
-
-  /* xwidgets need the gtk container to place gtk widgets*/
-  //GtkWidget *gwfixed;
-  void *gwfixed;//JAVE TODO i dont feel like fixing all compilation errors right now
 };
 
 #define FRAME_KBOARD(f) ((f)->terminal->kboard)
diff --git a/src/gtkutil.c b/src/gtkutil.c
index c4b5feb9f25..35b366222de 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -1100,9 +1100,9 @@ xg_create_frame_widgets (FRAME_PTR f)
   whbox = gtk_hbox_new (FALSE, 0);
 
 #ifdef HAVE_GTK3
-  f->gwfixed =   wfixed = emacs_fixed_new (f);
+  wfixed = emacs_fixed_new (f);
 #else
-  f->gwfixed =   wfixed = gtk_fixed_new ();
+  wfixed = gtk_fixed_new ();
 #endif
 
   if (! wtop || ! wvbox || ! whbox || ! wfixed)
diff --git a/src/lisp.h b/src/lisp.h
index 30afc6e484b..623dfabec99 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -389,7 +389,7 @@ enum pvec_type
   PVEC_FONT = 0x200000,
   PVEC_OTHER = 0x400000,
   PVEC_XWIDGET = 0x800000,
-  PVEC_XWIDGET_VIEW = 0x1000000,    
+  PVEC_XWIDGET_VIEW = 0x1000000,
   PVEC_TYPE_MASK = 0x3fffe00
 
 #if 0 /* This is used to make the value of PSEUDOVECTOR_FLAG available to
diff --git a/src/xdisp.c b/src/xdisp.c
index 816c7d36ce3..ecb7007e1f3 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -15483,12 +15483,6 @@ try_window_reusing_current_matrix (struct window *w)
   struct glyph_row *start_row;
   int start_vpos, min_y, max_y;
 
-#if HAVE_XWIDGETS_hhh
-  return 0;
-  //xwidgets doesnt like blit scrolling and stuff, try this for now
-  //should be optimized, perhaps by just inhibiting optimizations of windows containing xwidgets.
-#endif  
-  
 #if GLYPH_DEBUG
   if (inhibit_try_window_reusing)
     return 0;
diff --git a/src/xwidget-attic.c b/src/xwidget-attic.c
index b80b57c8e07..5bbbddc2d57 100644
--- a/src/xwidget-attic.c
+++ b/src/xwidget-attic.c
@@ -44,8 +44,7 @@ xwidget_composite_draw_phantom(struct xwidget* xw,
   /* get our child (in this case, the event box) */
   child = xw->widget; //gtk_bin_get_child (GTK_BIN (widget));
   /* create a cairo context to draw to the emacs window */
-  //  cr = gdk_cairo_create (gtk_widget_get_window (f->gwfixed));//GTK_WIDGET(xw->emacswindow));//xw->widgetwindow));//widget->window);
-  cr = gdk_cairo_create (gtk_widget_get_window (f->gwfixed));//GTK_WIDGET(xw->emacswindow));//));//widget->window);  
+  cr = gdk_cairo_create (gtk_widget_get_window (FRAME_GTK_WIDGET (s->f)));//GTK_WIDGET(xw->emacswindow));//));//widget->window);  
   /* the source data is the (composited) xwidget */
   //cairo_move_to(cr, xw->x, xw->y);
   
diff --git a/src/xwidget.c b/src/xwidget.c
index c75f9bbd83e..bd007aad005 100644
--- a/src/xwidget.c
+++ b/src/xwidget.c
@@ -447,7 +447,7 @@ xwidget_init_view (
   } else if (EQ(xww->type, Qcairo)) {
     //Cairo view
     //uhm cairo is differentish in gtk 3.
-    //gdk_cairo_create (gtk_widget_get_window (f->gwfixed));
+    //gdk_cairo_create (gtk_widget_get_window (FRAME_GTK_WIDGET (s->f)));
 #ifdef HAVE_GOOCANVAS
     xv->widget = goo_canvas_new();
     GooCanvasItem *root, *rect_item, *text_item;
@@ -518,7 +518,7 @@ xwidget_init_view (
   //make container widget 1st, and put the actual widget inside the container
   //later, drawing should crop container window if necessary to handle case where xwidget
   //is partially obscured by other emacs windows
-  xv->emacswindow = GTK_CONTAINER (s->f->gwfixed);
+  xv->emacswindow = GTK_CONTAINER (FRAME_GTK_WIDGET (s->f));
   //xw->widgetwindow = GTK_CONTAINER (gtk_layout_new (NULL, NULL));
   //xw->widgetwindow = GTK_CONTAINER (gtk_offscreen_window_new ());
 
@@ -555,7 +555,7 @@ xwidget_init_view (
 
   gtk_widget_set_size_request (GTK_WIDGET (xv->widget), xww->width, xww->height);
   gtk_widget_set_size_request (GTK_WIDGET (xv->widgetwindow), xww->width, xww->height);
-  gtk_fixed_put (GTK_FIXED (s->f->gwfixed), GTK_WIDGET (xv->widgetwindow), x, y);
+  gtk_fixed_put (GTK_FIXED (FRAME_GTK_WIDGET (s->f)), GTK_WIDGET (xv->widgetwindow), x, y);
   xv->x = x;  xv->y = y;
   gtk_widget_show_all (GTK_WIDGET (xv->widgetwindow));
 
@@ -634,7 +634,7 @@ x_draw_xwidget_glyph_string (struct glyph_string *s)
       if (!xwidget_hidden(xv))  //hidden equals not being seen during redisplay
         {
           //TODO should be possible to use xwidget_show_view here
-          gtk_fixed_move (GTK_FIXED (s->f->gwfixed),
+          gtk_fixed_move (GTK_FIXED (FRAME_GTK_WIDGET (s->f)),
                           GTK_WIDGET (xv->widgetwindow),
                           x + clip_left, y + clip_top);
         }