X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkstatusbar.c;h=47350376ad2cbe885e0c107f983abb09f326339e;hb=6f1476edd3fbe31259e59ca3f03a01bf0f8ff67b;hp=3a7df1736e707040f2c61399eadfa7be0975698e;hpb=d4b992506ad83a6482f836cb77a24ac24dbecc8e;p=~andy%2Fgtk diff --git a/gtk/gtkstatusbar.c b/gtk/gtkstatusbar.c index 3a7df1736..47350376a 100644 --- a/gtk/gtkstatusbar.c +++ b/gtk/gtkstatusbar.c @@ -13,9 +13,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 . */ /* @@ -27,10 +25,12 @@ #include "config.h" +#include "gtkstatusbar.h" + +#include "gtkboxprivate.h" #include "gtkframe.h" #include "gtklabel.h" #include "gtkmarshalers.h" -#include "gtkstatusbar.h" #include "gtkwindow.h" #include "gtkprivate.h" #include "gtkintl.h" @@ -390,10 +390,10 @@ gtk_statusbar_push (GtkStatusbar *statusbar, /** * gtk_statusbar_pop: - * @statusbar: a #GtkStatusBar + * @statusbar: a #GtkStatusbar * @context_id: a context identifier * - * Removes the first message in the #GtkStatusBar's stack + * Removes the first message in the #GtkStatusbar's stack * with the given context id. * * Note that this may not change the displayed message, if @@ -440,7 +440,7 @@ gtk_statusbar_pop (GtkStatusbar *statusbar, /** * gtk_statusbar_remove: - * @statusbar: a #GtkStatusBar + * @statusbar: a #GtkStatusbar * @context_id: a context identifier * @message_id: a message identifier, as returned by gtk_statusbar_push() * @@ -492,7 +492,7 @@ gtk_statusbar_remove (GtkStatusbar *statusbar, /** * gtk_statusbar_remove_all: - * @statusbar: a #GtkStatusBar + * @statusbar: a #GtkStatusbar * @context_id: a context identifier * * Forces the removal of all messages from a statusbar's @@ -563,7 +563,7 @@ gtk_statusbar_remove_all (GtkStatusbar *statusbar, /** * gtk_statusbar_get_message_area: - * @statusbar: a #GtkStatusBar + * @statusbar: a #GtkStatusbar * * Retrieves the box containing the label widget. * @@ -664,12 +664,7 @@ gtk_statusbar_size_allocate (GtkWidget *widget, gtk_window_resize_grip_is_visible (GTK_WINDOW (window))) { gtk_window_get_resize_grip_area (GTK_WINDOW (window), &rect); - if (gtk_widget_translate_coordinates (gtk_widget_get_parent (widget), - window, - allocation->x, - allocation->y, - &x, - &y)) + if (gtk_widget_translate_coordinates (widget, window, 0, 0, &x, &y)) { translated_rect.x = x; translated_rect.y = y;