separator: Don't use padding and borders wrongly

[~andy/gtk] / gtk / gtkfixed.c

diff --git a/gtk/gtkfixed.c b/gtk/gtkfixed.c
index e61f03a625595014624c58b3d2360ce61bc7b720..14c35afc84e18048d95cba46ae9b00afb94cf23c 100644 (file)
--- a/gtk/gtkfixed.c
+++ b/gtk/gtkfixed.c
@@ -12,9 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
@@ -381,7 +379,7 @@ gtk_fixed_realize (GtkWidget *widget)
       window = gdk_window_new (gtk_widget_get_parent_window (widget),
                                &attributes, attributes_mask);
       gtk_widget_set_window (widget, window);
-      gdk_window_set_user_data (window, widget);
+      gtk_widget_register_window (widget, window);
 
       gtk_style_context_set_background (gtk_widget_get_style_context (widget),
                                         window);
@@ -526,8 +524,6 @@ gtk_fixed_remove (GtkContainer *container,
 
           break;
         }
-
-      children = children->next;
     }
 }
 
@@ -542,9 +538,11 @@ gtk_fixed_forall (GtkContainer *container,
   GtkFixedChild *child;
   GList *children;
 
-  for (children = priv->children; children; children = children->next)
+  children = priv->children;
+  while (children)
     {
       child = children->data;
+      children = children->next;
 
       (* callback) (child->widget, callback_data);
     }