[gtk+/client-side-decorations: 17/92] remove gtkwindow-decorate.[ch]



commit 8f7bcc1a449bd7a30e98f63d73533bb089beeec4
Author: Cody Russell <crussell canonical com>
Date:   Thu May 21 11:49:27 2009 +0200

    remove gtkwindow-decorate.[ch]

 gtk/Makefile.am          |    2 -
 gtk/gtkwindow-decorate.c | 1015 ----------------------------------------------
 gtk/gtkwindow-decorate.h |   42 --
 gtk/gtkwindow.c          |   17 +-
 4 files changed, 1 insertions(+), 1075 deletions(-)
---
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index e05129f..b13b5a1 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -407,7 +407,6 @@ gtk_private_h_sources =		\
 	gtktoolpaletteprivate.h	\
 	gtktreedatalist.h	\
 	gtktreeprivate.h	\
-	gtkwindow-decorate.h	\
 	$(gtk_clipboard_dnd_h_sources)
 
 # GTK+ C sources to build the library from
@@ -627,7 +626,6 @@ gtk_base_c_sources =            \
 	gtkvscrollbar.c		\
 	gtkvseparator.c		\
 	gtkwidget.c		\
-	gtkwindow-decorate.c    \
 	gtkwindow.c		\
 	$(gtk_clipboard_dnd_c_sources)
 
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index c6879b0..2fb8c1e 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -1545,7 +1545,6 @@ gtk_window_set_title (GtkWindow   *window,
     {
       gdk_window_set_title (GTK_WIDGET (window)->window, window->title);
 
-      gtk_decorated_window_set_title (window, title);
       gtk_label_set_text (GTK_LABEL (priv->title_label), title);
     }
 
@@ -4718,11 +4717,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.
@@ -7103,16 +7097,7 @@ gtk_window_set_frame_dimensions (GtkWindow *window,
   window->frame_right = right;
   window->frame_bottom = bottom;
 
-  if (gtk_widget_get_realized (widget) && window->frame)
-    {
-      gint width = widget->allocation.width + left + right;
-      gint height = widget->allocation.height + top + bottom;
-      gdk_window_resize (window->frame, width, height);
-      gtk_decorated_window_move_resize_window (window,
-					       left, top,
-					       widget->allocation.width,
-					       widget->allocation.height);
-    }
+  gtk_widget_queue_resize (GTK_WIDGET (window));
 }
 
 /**



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