My Pastes
Public Pastes
Layout Width
Share Pastebin
Guest
Public paste!

jjardon

By: a guest | Mar 12th, 2010 | Syntax: None | Size: 4.85 KB | Hits: 38 | Expires: Never
Download | Raw | Embed | Report abuse
Copy text to clipboard
  1. From 7c7f78524dab9de7727c046a050b7c857b194d27 Mon Sep 17 00:00:00 2001
  2. From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
  3. Date: Tue, 9 Mar 2010 18:33:26 +0100
  4. Subject: [PATCH] Deprecate GTK_VISIBLE
  5.  
  6. ---
  7.  gtk/gtkinvisible.c                |    2 +-
  8.  gtk/gtkoffscreenwindow.c          |    4 ++--
  9.  gtk/gtkwidget.c                   |    6 +++---
  10.  gtk/gtkwin32embedwidget.c         |    4 ++--
  11.  gtk/gtkwindow.c                   |    4 ++--
  12.  modules/other/gail/gailmenuitem.c |    4 ++--
  13.  6 files changed, 12 insertions(+), 12 deletions(-)
  14.  
  15. diff --git a/gtk/gtkinvisible.c b/gtk/gtkinvisible.c
  16. index c24487c..2ef07df 100644
  17. --- a/gtk/gtkinvisible.c
  18. +++ b/gtk/gtkinvisible.c
  19.  -252,7 +252,7 @@ gtk_invisible_style_set (GtkWidget *widget,
  20.  static void
  21.  gtk_invisible_show (GtkWidget *widget)
  22.  {
  23. -  GTK_WIDGET_SET_FLAGS (widget, GTK_VISIBLE);
  24. +  gtk_widget_set_visible (widget, TRUE);
  25.    gtk_widget_map (widget);
  26.  }
  27.  
  28. diff --git a/gtk/gtkoffscreenwindow.c b/gtk/gtkoffscreenwindow.c
  29. index 0633a78..2bbd5d9 100644
  30. --- a/gtk/gtkoffscreenwindow.c
  31. +++ b/gtk/gtkoffscreenwindow.c
  32.  -182,7 +182,7 @@ gtk_offscreen_window_show (GtkWidget *widget)
  33.    gboolean need_resize;
  34.    GtkContainer *container;
  35.  
  36. -  GTK_WIDGET_SET_FLAGS (widget, GTK_VISIBLE);
  37. +  gtk_widget_set_visible (widget, TRUE);
  38.  
  39.    container = GTK_CONTAINER (widget);
  40.    need_resize = container->need_resize || !gtk_widget_get_realized (widget);
  41.  -201,7 +201,7 @@ gtk_offscreen_window_show (GtkWidget *widget)
  42.  static void
  43.  gtk_offscreen_window_hide (GtkWidget *widget)
  44.  {
  45. -  GTK_WIDGET_UNSET_FLAGS (widget, GTK_VISIBLE);
  46. +  gtk_widget_set_visible (widget, FALSE);
  47.    gtk_widget_unmap (widget);
  48.  }
  49.  
  50. diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
  51. index 94d78af..b662043 100644
  52. --- a/gtk/gtkwidget.c
  53. +++ b/gtk/gtkwidget.c
  54.  -3193,7 +3193,7 @@ gtk_widget_real_show (GtkWidget *widget)
  55.  {
  56.    if (!gtk_widget_get_visible (widget))
  57.      {
  58. -      GTK_WIDGET_SET_FLAGS (widget, GTK_VISIBLE);
  59. +      GTK_OBJECT_FLAGS (widget) |= GTK_VISIBLE;
  60.  
  61.        if (widget->parent &&
  62.           gtk_widget_get_mapped (widget->parent) &&
  63.  -3279,7 +3279,7 @@ gtk_widget_real_hide (GtkWidget *widget)
  64.  {
  65.    if (gtk_widget_get_visible (widget))
  66.      {
  67. -      GTK_WIDGET_UNSET_FLAGS (widget, GTK_VISIBLE);
  68. +      GTK_OBJECT_FLAGS (widget) &= ~(GTK_VISIBLE);
  69.        
  70.        if (gtk_widget_get_mapped (widget))
  71.         gtk_widget_unmap (widget);
  72.  -8684,7 +8684,7 @@ gtk_widget_dispose (GObject *object)
  73.    else if (gtk_widget_get_visible (widget))
  74.      gtk_widget_hide (widget);
  75.  
  76. -  GTK_WIDGET_UNSET_FLAGS (widget, GTK_VISIBLE);
  77. +  gtk_widget_set_visible (widget, FALSE);
  78.    if (gtk_widget_get_realized (widget))
  79.      gtk_widget_unrealize (widget);
  80.    
  81. diff --git a/gtk/gtkwin32embedwidget.c b/gtk/gtkwin32embedwidget.c
  82. index 2e1a6b1..7562028 100644
  83. --- a/gtk/gtkwin32embedwidget.c
  84. +++ b/gtk/gtkwin32embedwidget.c
  85.  -248,7 +248,7 @@ gtk_win32_embed_widget_realize (GtkWidget *widget)
  86.  static void
  87.  gtk_win32_embed_widget_show (GtkWidget *widget)
  88.  {
  89. -  GTK_WIDGET_SET_FLAGS (widget, GTK_VISIBLE);
  90. +  gtk_widget_set_visible (widget, TRUE);
  91.    
  92.    gtk_widget_realize (widget);
  93.    gtk_container_check_resize (GTK_CONTAINER (widget));
  94.  -258,7 +258,7 @@ gtk_win32_embed_widget_show (GtkWidget *widget)
  95.  static void
  96.  gtk_win32_embed_widget_hide (GtkWidget *widget)
  97.  {
  98. -  GTK_WIDGET_UNSET_FLAGS (widget, GTK_VISIBLE);
  99. +  gtk_widget_set_visible (widget, FALSE);
  100.    gtk_widget_unmap (widget);
  101.  }
  102.  
  103. diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
  104. index 33d5dab..2740b4a 100644
  105. --- a/gtk/gtkwindow.c
  106. +++ b/gtk/gtkwindow.c
  107.  -4472,7 +4472,7 @@ gtk_window_show (GtkWidget *widget)
  108.    GtkContainer *container = GTK_CONTAINER (window);
  109.    gboolean need_resize;
  110.  
  111. -  GTK_WIDGET_SET_FLAGS (widget, GTK_VISIBLE);
  112. +  gtk_widget_set_visible (widget, TRUE);
  113.    
  114.    need_resize = container->need_resize || !gtk_widget_get_realized (widget);
  115.    container->need_resize = FALSE;
  116.  -4553,7 +4553,7 @@ gtk_window_hide (GtkWidget *widget)
  117.  {
  118.    GtkWindow *window = GTK_WINDOW (widget);
  119.  
  120. -  GTK_WIDGET_UNSET_FLAGS (widget, GTK_VISIBLE);
  121. +  gtk_widget_set_visible (widget, FALSE);
  122.    gtk_widget_unmap (widget);
  123.  
  124.    if (window->modal)
  125. diff --git a/modules/other/gail/gailmenuitem.c b/modules/other/gail/gailmenuitem.c
  126. index 2809593..0cfa9f3 100644
  127. --- a/modules/other/gail/gailmenuitem.c
  128. +++ b/modules/other/gail/gailmenuitem.c
  129.  -164,9 +164,9 @@ get_children (GtkWidget *submenu)
  130.         */
  131.        if (!gtk_widget_get_visible (submenu))
  132.          {
  133. -          GTK_WIDGET_SET_FLAGS (submenu, GTK_VISIBLE);
  134. +          gtk_widget_set_visible (submenu, TRUE);
  135.            g_signal_emit_by_name (submenu, "show");
  136. -          GTK_WIDGET_UNSET_FLAGS (submenu, GTK_VISIBLE);
  137. +          gtk_widget_set_visible (submenu, FALSE);
  138.          }
  139.        g_list_free (children);
  140.        children = gtk_container_get_children (GTK_CONTAINER (submenu));
  141. --
  142. 1.7.0
create new paste | create new version of this paste RAW Paste Data