Commit 88183b02 authored by pavlov%pavlov.net's avatar pavlov%pavlov.net
Browse files

revert changes to gtklayout. make sure some labels are shown since they are 

inside the mWidget
parent 5e9e3ab9

widget/src/gtk/gtklayout.c

+4 −11
Original line number Diff line number Diff line
@@ -162,16 +162,9 @@ gtk_layout_put (GtkLayout *layout, 


  gtk_widget_size_request (child->widget, &child->requisition);

  

  if (GTK_WIDGET_VISIBLE (layout))

    {

  if (GTK_WIDGET_REALIZED (layout) &&

      !GTK_WIDGET_REALIZED (child_widget))

	gtk_widget_realize (child_widget);

      

      if (GTK_WIDGET_MAPPED (layout) &&

	  !GTK_WIDGET_MAPPED (child_widget))

	gtk_widget_map (child_widget);

    }

    gtk_layout_realize_child (layout, child);



  gtk_layout_position_child (layout, child, TRUE);

}

widget/src/gtk/nsCheckButton.cpp

+2 −1
Original line number Diff line number Diff line
@@ -161,8 +161,9 @@ NS_METHOD nsCheckButton::SetLabel(const nsString& aText) 
    gtk_label_set(GTK_LABEL(mLabel), label);

  } else {

    mLabel = gtk_label_new(label);

    gtk_misc_set_alignment (GTK_MISC (mLabel), 0.0, 0.5);

    gtk_container_add(GTK_CONTAINER(mWidget), mLabel);

    gtk_widget_show(mLabel); /* XXX */

    gtk_widget_show(mLabel);

  }

  NS_FREE_STR_BUF(label);

  return NS_OK;

widget/src/gtk/nsLabel.cpp

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ NS_METHOD nsLabel::CreateNative(GtkWidget *parentWindow) 


  mWidget = gtk_label_new("");

 

//  gtk_misc_set_alignment(GTK_MISC(mWidget), alignment);

  gtk_misc_set_alignment(GTK_MISC(mWidget), 0.0, alignment);



  return NS_OK;

}

widget/src/gtk/nsRadioButton.cpp

+1 −0
Original line number Diff line number Diff line
@@ -158,6 +158,7 @@ NS_METHOD nsRadioButton::SetLabel(const nsString& aText) 
    gtk_label_set(GTK_LABEL(mLabel), label);

  } else {

    mLabel = gtk_label_new(label);

    gtk_misc_set_alignment (GTK_MISC (mLabel), 0.0, 0.5);

    gtk_container_add(GTK_CONTAINER(mWidget), mLabel);

    gtk_widget_show(mLabel); /* XXX */

  }