[gtk+] gtk: Remove old DirectFB code for drawing window decorations



commit fc711434bc6c436d996e582e4f0b658eb449acb0
Author: Benjamin Otte <otte redhat com>
Date:   Mon Dec 6 17:20:13 2010 +0100

    gtk: Remove old DirectFB code for drawing window decorations
    
    I'm not sure it'd even compile.

 gtk/Makefile.am          |    2 -
 gtk/gtkwindow-decorate.c |  808 ----------------------------------------------
 gtk/gtkwindow-decorate.h |   41 ---
 gtk/gtkwindow.c          |   18 +-
 4 files changed, 4 insertions(+), 865 deletions(-)
---
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index d95f3de..9fa5059 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -428,7 +428,6 @@ gtk_private_h_sources =		\
 	gtktoolpaletteprivate.h	\
 	gtktreedatalist.h	\
 	gtktreeprivate.h	\
-	gtkwindow-decorate.h	\
 	gtkwidgetprivate.h	\
 	$(gtk_clipboard_dnd_h_sources) \
 	$(gtk_appchooser_impl_h_sources)
@@ -666,7 +665,6 @@ gtk_base_c_sources =            \
 	gtkvseparator.c		\
 	gtkwidget.c		\
 	gtkwidgetpath.c		\
-	gtkwindow-decorate.c	\
 	gtkwindow.c		\
 	$(gtk_clipboard_dnd_c_sources) \
 	$(gtk_appchooser_impl_c_sources)
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 31f46a5..b42f68d 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -37,7 +37,6 @@
 #include "gtkprivate.h"
 #include "gtkrc.h"
 #include "gtkwindow.h"
-#include "gtkwindow-decorate.h"
 #include "gtkbindings.h"
 #include "gtkkeyhash.h"
 #include "gtkmain.h"
@@ -1135,8 +1134,6 @@ gtk_window_init (GtkWindow *window)
   priv->has_user_ref_count = TRUE;
   toplevel_list = g_slist_prepend (toplevel_list, window);
 
-  gtk_decorated_window_init (window);
-
   g_signal_connect (priv->screen, "composited-changed",
 		    G_CALLBACK (gtk_window_on_composited_changed), window);
 }
@@ -1584,8 +1581,6 @@ gtk_window_set_title (GtkWindow   *window,
     {
       gdk_window_set_title (gtk_widget_get_window (widget),
                             priv->title);
-
-      gtk_decorated_window_set_title (window, title);
     }
 
   g_object_notify (G_OBJECT (window), "title");
@@ -4671,11 +4666,6 @@ gtk_window_show (GtkWidget *widget)
 	  was_realized = TRUE;
 	}
 
-      /* Must be done after the windows are realized,
-       * so that the decorations can be read
-       */
-      gtk_decorated_window_calculate_frame_size (window);
-
       /* We only send configure request if we didn't just finish
        * creating the window; if we just created the window
        * then we created it with widget->allocation anyhow.
@@ -7583,10 +7573,10 @@ gtk_window_set_frame_dimensions (GtkWindow *window,
       width = allocation.width + left + right;
       height = allocation.height + top + bottom;
       gdk_window_resize (priv->frame, width, height);
-      gtk_decorated_window_move_resize_window (window,
-					       left, top,
-                                               allocation.width,
-                                               allocation.height);
+      gdk_window_move_resize (gtk_widget_get_window (GTK_WIDGET (window)),
+                              left, top,
+                              allocation.width,
+                              allocation.height);
     }
 }
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]