← Back to branch summary

~ubuntu-branches/ubuntu/lucid/gtk+2.0/lucid-proposed

« back to all changes in this revision

Viewing changes to gtk/gtkstyle.c

  • Committer: Bazaar Package Importer
  • Author(s): Sebastien Bacher
  • Date: 2010-03-11 18:28:01 UTC
  • mfrom: (1.11.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20100311182801-wqr2drmus369zy6r
Tags: 2.19.7-0ubuntu1
https://launchpad.net/bugs/532947
* New upstream version
  - Bug fixes:
  611707 Move documentation from templates to inline comments
  69872 GTK_WIDGET_SET_FLAGS should be deprecated
  612066 empathy hangs when clicked on information about contact...
         (lp: #532947)
  557420 Some compose sequences don't work anymore...
  569042 gailbooleancell does not seem to attend to changes...
  600992 File chooser reference counting issues
  610905 gtk_drag_source_set need instrospection hint
  611051 Search Entry Clear Icon not accessible
  611217 Incorrect translator comment
  611317 Document targets in drag and drop
  611319 gtk_window_set_transient_for undocumented NULL value for parent
  611658 Update documentation for gtkvscrollbar
  611662 Update documentation for gtkvseparator
  611686 focus_in/focus_out in gailtreeview.c should return FALSE...
  611831 Move documentation to inline comments: GtkVBox
  612119 Do not scroll when middle pasting
  - Translation updates
* debian/patches/071_no_offscreen_widgets_grabbing.patch,
  debian/patches/091_bugzilla_tooltip_refresh.patch:
  - new version update
  - increased the alpha value for tooltips to 85%
* debian/rules:
  - updated the shlibs

Show diffs side-by-side

added added

removed removed

Lines of Context:
gtk/gtkstyle.c
3534
3534
      
3535
3535
      if (state_type == GTK_STATE_SELECTED && detail && strcmp (detail, "paned") == 0)
3536
3536
        {
3537
 
          if (widget && !GTK_WIDGET_HAS_FOCUS (widget))
 
3537
          if (widget && !gtk_widget_has_focus (widget))
3538
3538
            gc = style->base_gc[GTK_STATE_ACTIVE];
3539
3539
        }
3540
3540
 
3548
3548
    }
3549
3549
  else
3550
3550
    gtk_style_apply_default_background (style, window,
3551
 
                                        widget && !GTK_WIDGET_NO_WINDOW (widget),
 
3551
                                        widget && gtk_widget_get_has_window (widget),
3552
3552
                                        state_type, area, x, y, width, height);
3553
3553
 
3554
3554
  if (is_spinbutton_box)
3658
3658
                   !strcmp ("cell_even_ruled_sorted", detail))
3659
3659
            {
3660
3660
              /* This has to be really broken; alex made me do it. -jrb */
3661
 
              if (widget && GTK_WIDGET_HAS_FOCUS (widget))
 
3661
              if (widget && gtk_widget_has_focus (widget))
3662
3662
                gc1 = style->base_gc[state_type];
3663
3663
              else
3664
3664
                gc1 = style->base_gc[GTK_STATE_ACTIVE];
3666
3666
          else if (!strcmp ("cell_odd_ruled", detail) ||
3667
3667
                   !strcmp ("cell_odd_ruled_sorted", detail))
3668
3668
            {
3669
 
              if (widget && GTK_WIDGET_HAS_FOCUS (widget))
 
3669
              if (widget && gtk_widget_has_focus (widget))
3670
3670
                freeme = get_darkened_gc (window, &style->base[state_type], 1);
3671
3671
              else
3672
3672
                freeme = get_darkened_gc (window, &style->base[GTK_STATE_ACTIVE], 1);
3824
3824
    }
3825
3825
  else
3826
3826
    gtk_style_apply_default_background (style, window,
3827
 
                                        widget && !GTK_WIDGET_NO_WINDOW (widget),
 
3827
                                        widget && gtk_widget_get_has_window (widget),
3828
3828
                                        state_type, area, x, y, width, height);
3829
3829
 
3830
3830
 
4360
4360
  GdkGC *gc4 = NULL;
4361
4361
  
4362
4362
  gtk_style_apply_default_background (style, window,
4363
 
                                      widget && !GTK_WIDGET_NO_WINDOW (widget),
 
4363
                                      widget && gtk_widget_get_has_window (widget),
4364
4364
                                      state_type, area, x, y, width, height);
4365
4365
  
4366
4366
  sanitize_size (window, &width, &height);
4576
4576
  GdkGC *gc4 = NULL;
4577
4577
  
4578
4578
  gtk_style_apply_default_background (style, window,
4579
 
                                      widget && !GTK_WIDGET_NO_WINDOW (widget),
 
4579
                                      widget && gtk_widget_get_has_window (widget),
4580
4580
                                      GTK_STATE_NORMAL, area, x, y, width, height);
4581
4581
  
4582
4582
  sanitize_size (window, &width, &height);
4630
4630
        {
4631
4631
        case GTK_POS_TOP:
4632
4632
          gtk_style_apply_default_background (style, window,
4633
 
                                              widget && !GTK_WIDGET_NO_WINDOW (widget),
 
4633
                                              widget && gtk_widget_get_has_window (widget),
4634
4634
                                              state_type, area,
4635
4635
                                              x + style->xthickness, 
4636
4636
                                              y, 
4652
4652
          break;
4653
4653
        case GTK_POS_BOTTOM:
4654
4654
          gtk_style_apply_default_background (style, window,
4655
 
                                              widget && !GTK_WIDGET_NO_WINDOW (widget),
 
4655
                                              widget && gtk_widget_get_has_window (widget),
4656
4656
                                              state_type, area,
4657
4657
                                              x + style->xthickness, 
4658
4658
                                              y + style->ythickness, 
4674
4674
          break;
4675
4675
        case GTK_POS_LEFT:
4676
4676
          gtk_style_apply_default_background (style, window,
4677
 
                                              widget && !GTK_WIDGET_NO_WINDOW (widget),
 
4677
                                              widget && gtk_widget_get_has_window (widget),
4678
4678
                                              state_type, area,
4679
4679
                                              x, 
4680
4680
                                              y + style->ythickness, 
4696
4696
          break;
4697
4697
        case GTK_POS_RIGHT:
4698
4698
          gtk_style_apply_default_background (style, window,
4699
 
                                              widget && !GTK_WIDGET_NO_WINDOW (widget),
 
4699
                                              widget && gtk_widget_get_has_window (widget),
4700
4700
                                              state_type, area,
4701
4701
                                              x + style->xthickness, 
4702
4702
                                              y + style->ythickness, 
4916
4916
      xthick = 0;
4917
4917
      ythick = 0;
4918
4918
 
4919
 
      if (state_type == GTK_STATE_SELECTED && widget && !GTK_WIDGET_HAS_FOCUS (widget))
 
4919
      if (state_type == GTK_STATE_SELECTED && widget && !gtk_widget_has_focus (widget))
4920
4920
        {
4921
4921
          GdkColor unfocused_light;
4922
4922
 
7057
7057
_gtk_widget_get_cursor_gc (GtkWidget *widget)
7058
7058
{
7059
7059
  g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
7060
 
  g_return_val_if_fail (GTK_WIDGET_REALIZED (widget), NULL);
 
7060
  g_return_val_if_fail (gtk_widget_get_realized (widget), NULL);
7061
7061
  return get_insertion_cursor_gc (widget, TRUE);
7062
7062
}
7063
7063