← Back to branch summary

~ubuntu-branches/ubuntu/raring/gtkhtml3.14/raring

« back to all changes in this revision

Viewing changes to components/editor/gtkhtml-face-tool-button.c

  • Committer: Bazaar Package Importer
  • Author(s): Didier Roche
  • Date: 2010-05-18 10:07:09 UTC
  • mfrom: (1.6.5 upstream) (27.3.13 experimental)
  • Revision ID: james.westby@ubuntu.com-20100518100709-8nonoc8d5gwckuzn
Tags: 1:3.30.1-1ubuntu1
* Merge from debian experimental. Remaining changes:
  + epoch added by accident in ubuntu
  + debian/control: add Vcs-Bzr
  + debian/*shlib: add epoch

Show diffs side-by-side

added added

removed removed

Lines of Context:
components/editor/gtkhtml-face-tool-button.c
119
119
 
120
120
        gdk_window_get_origin (window, &x, &y);
121
121
 
122
 
        if (GTK_WIDGET_NO_WINDOW (button)) {
 
122
        if (!gtk_widget_get_has_window (GTK_WIDGET (button))) {
123
123
                x += GTK_WIDGET (button)->allocation.x;
124
124
                y += GTK_WIDGET (button)->allocation.y;
125
125
        }
146
146
                                        GdkEventButton *event,
147
147
                                        GtkButton *face_button)
148
148
{
149
 
        if (GTK_WIDGET_STATE (button) != GTK_STATE_NORMAL)
 
149
        GtkStateType state;
 
150
 
 
151
        state = gtk_widget_get_state (GTK_WIDGET (button));
 
152
 
 
153
        if (state != GTK_STATE_NORMAL)
150
154
                gtk_button_clicked (face_button);
151
155
 
152
156
        return FALSE;
324
328
        GdkWindow *window;
325
329
        GdkGrabStatus status;
326
330
 
 
331
#if GTK_CHECK_VERSION(2,19,7)
 
332
        if (!gtk_widget_get_realized (GTK_WIDGET (button)))
 
333
#else
327
334
        if (!GTK_WIDGET_REALIZED (button))
 
335
#endif
328
336
                return;
329
337
 
330
338
        if (button->priv->popup_shown)
366
374
{
367
375
        GtkToggleToolButton *tool_button;
368
376
 
 
377
#if GTK_CHECK_VERSION(2,19,7)
 
378
        if (!gtk_widget_get_realized (GTK_WIDGET (button)))
 
379
#else
369
380
        if (!GTK_WIDGET_REALIZED (button))
 
381
#endif
370
382
                return;
371
383
 
372
384
        if (!button->priv->popup_shown)
522
534
        gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
523
535
        gtk_window_set_type_hint (
524
536
                GTK_WINDOW (window), GDK_WINDOW_TYPE_HINT_COMBO);
525
 
        if (GTK_WIDGET_TOPLEVEL (toplevel)) {
 
537
        if (gtk_widget_is_toplevel (toplevel)) {
526
538
                gtk_window_group_add_window (
527
539
                        gtk_window_get_group (GTK_WINDOW (toplevel)),
528
540
                        GTK_WINDOW (window));