gtk2 0.90.7-x86-mingw32 → 0.90.8-x86-mingw32
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/ChangeLog +62 -0
- data/ext/gtk2/extconf.rb +2 -2
- data/ext/gtk2/rbgdk.c +30 -61
- data/ext/gtk2/rbgdkatom.c +6 -14
- data/ext/gtk2/rbgdkcairo.c +4 -8
- data/ext/gtk2/rbgdkcolor.c +11 -27
- data/ext/gtk2/rbgdkcolormap.c +8 -16
- data/ext/gtk2/rbgdkcursor.c +5 -12
- data/ext/gtk2/rbgdkdevice.c +16 -32
- data/ext/gtk2/rbgdkdisplay.c +49 -100
- data/ext/gtk2/rbgdkdisplaymanager.c +3 -6
- data/ext/gtk2/rbgdkdragcontext.c +21 -48
- data/ext/gtk2/rbgdkdraw.c +27 -60
- data/ext/gtk2/rbgdkevent.c +51 -113
- data/ext/gtk2/rbgdkgc.c +35 -70
- data/ext/gtk2/rbgdkgeometry.c +24 -50
- data/ext/gtk2/rbgdkimage.c +14 -28
- data/ext/gtk2/rbgdkinput.c +3 -8
- data/ext/gtk2/rbgdkkeymap.c +7 -14
- data/ext/gtk2/rbgdkkeyval.c +9 -18
- data/ext/gtk2/rbgdkpango.c +8 -18
- data/ext/gtk2/rbgdkpangorenderer.c +7 -18
- data/ext/gtk2/rbgdkpixbuf.c +5 -20
- data/ext/gtk2/rbgdkpixmap.c +9 -24
- data/ext/gtk2/rbgdkproperty.c +8 -28
- data/ext/gtk2/rbgdkrectangle.c +12 -24
- data/ext/gtk2/rbgdkregion.c +15 -33
- data/ext/gtk2/rbgdkrgb.c +11 -26
- data/ext/gtk2/rbgdkscreen.c +37 -78
- data/ext/gtk2/rbgdkselection.c +5 -16
- data/ext/gtk2/rbgdkthreads.c +4 -8
- data/ext/gtk2/rbgdktimecoord.c +5 -10
- data/ext/gtk2/rbgdkvisual.c +25 -50
- data/ext/gtk2/rbgdkwindow.c +102 -211
- data/ext/gtk2/rbgdkwindowattr.c +16 -32
- data/ext/gtk2/rbgdkx11.c +5 -12
- data/ext/gtk2/rbgtk.c +9 -10
- data/ext/gtk2/rbgtkaboutdialog.c +5 -12
- data/ext/gtk2/rbgtkaccelerator.c +6 -12
- data/ext/gtk2/rbgtkaccelgroup.c +14 -32
- data/ext/gtk2/rbgtkaccelgroupentry.c +4 -8
- data/ext/gtk2/rbgtkaccelkey.c +7 -14
- data/ext/gtk2/rbgtkaccellabel.c +3 -6
- data/ext/gtk2/rbgtkaccelmap.c +12 -28
- data/ext/gtk2/rbgtkaccessible.c +1 -2
- data/ext/gtk2/rbgtkaction.c +20 -42
- data/ext/gtk2/rbgtkactiongroup.c +15 -39
- data/ext/gtk2/rbgtkadjustment.c +14 -28
- data/ext/gtk2/rbgtkalignment.c +4 -8
- data/ext/gtk2/rbgtkallocation.c +13 -26
- data/ext/gtk2/rbgtkarrow.c +2 -4
- data/ext/gtk2/rbgtkaspectframe.c +2 -4
- data/ext/gtk2/rbgtkassistant.c +23 -47
- data/ext/gtk2/rbgtkbbox.c +2 -4
- data/ext/gtk2/rbgtkbin.c +1 -2
- data/ext/gtk2/rbgtkbindingset.c +8 -18
- data/ext/gtk2/rbgtkborder.c +4 -8
- data/ext/gtk2/rbgtkbox.c +8 -23
- data/ext/gtk2/rbgtkbutton.c +8 -18
- data/ext/gtk2/rbgtkcalendar.c +11 -24
- data/ext/gtk2/rbgtkcelleditable.c +3 -6
- data/ext/gtk2/rbgtkcelllayout.c +9 -22
- data/ext/gtk2/rbgtkcellrenderer.c +8 -19
- data/ext/gtk2/rbgtkcellrendereraccel.c +1 -2
- data/ext/gtk2/rbgtkcellrenderercombo.c +1 -2
- data/ext/gtk2/rbgtkcellrendererpixbuf.c +1 -2
- data/ext/gtk2/rbgtkcellrendererprogress.c +1 -2
- data/ext/gtk2/rbgtkcellrendererspin.c +1 -2
- data/ext/gtk2/rbgtkcellrendererspinner.c +35 -0
- data/ext/gtk2/rbgtkcellrenderertext.c +2 -4
- data/ext/gtk2/rbgtkcellrenderertoggle.c +1 -2
- data/ext/gtk2/rbgtkcellview.c +6 -14
- data/ext/gtk2/rbgtkcheckbutton.c +1 -4
- data/ext/gtk2/rbgtkcheckmenuitem.c +2 -6
- data/ext/gtk2/rbgtkclipboard.c +30 -75
- data/ext/gtk2/rbgtkcolorbutton.c +1 -4
- data/ext/gtk2/rbgtkcolorsel.c +10 -24
- data/ext/gtk2/rbgtkcolorselectiondialog.c +5 -12
- data/ext/gtk2/rbgtkcombo.c +7 -16
- data/ext/gtk2/rbgtkcombobox.c +14 -32
- data/ext/gtk2/rbgtkcomboboxentry.c +1 -4
- data/ext/gtk2/rbgtkcontainer.c +27 -70
- data/ext/gtk2/rbgtkcurve.c +6 -12
- data/ext/gtk2/rbgtkdialog.c +14 -32
- data/ext/gtk2/rbgtkdrag.c +31 -68
- data/ext/gtk2/rbgtkdrawingarea.c +1 -2
- data/ext/gtk2/rbgtkeditable.c +13 -26
- data/ext/gtk2/rbgtkentry.c +7 -14
- data/ext/gtk2/rbgtkentrycompletion.c +10 -23
- data/ext/gtk2/rbgtkeventbox.c +1 -2
- data/ext/gtk2/rbgtkexpander.c +1 -4
- data/ext/gtk2/rbgtkfilechooser.c +30 -60
- data/ext/gtk2/rbgtkfilechooserbutton.c +1 -4
- data/ext/gtk2/rbgtkfilechooserdialog.c +1 -4
- data/ext/gtk2/rbgtkfilechooserwidget.c +1 -4
- data/ext/gtk2/rbgtkfilefilter.c +10 -21
- data/ext/gtk2/rbgtkfilesel.c +14 -30
- data/ext/gtk2/rbgtkfixed.c +5 -10
- data/ext/gtk2/rbgtkfontbutton.c +1 -4
- data/ext/gtk2/rbgtkfontselection.c +1 -2
- data/ext/gtk2/rbgtkfontselectiondialog.c +9 -20
- data/ext/gtk2/rbgtkframe.c +3 -8
- data/ext/gtk2/rbgtkgamma.c +3 -6
- data/ext/gtk2/rbgtkhandlebox.c +2 -4
- data/ext/gtk2/rbgtkhbbox.c +1 -2
- data/ext/gtk2/rbgtkhbox.c +1 -4
- data/ext/gtk2/rbgtkhpaned.c +1 -2
- data/ext/gtk2/rbgtkhruler.c +1 -2
- data/ext/gtk2/rbgtkhscale.c +1 -4
- data/ext/gtk2/rbgtkhscrollbar.c +1 -4
- data/ext/gtk2/rbgtkhseparator.c +1 -2
- data/ext/gtk2/rbgtkiconfactory.c +6 -12
- data/ext/gtk2/rbgtkiconinfo.c +8 -16
- data/ext/gtk2/rbgtkiconset.c +4 -12
- data/ext/gtk2/rbgtkiconsize.c +6 -12
- data/ext/gtk2/rbgtkiconsource.c +17 -34
- data/ext/gtk2/rbgtkicontheme.c +16 -32
- data/ext/gtk2/rbgtkiconview.c +23 -50
- data/ext/gtk2/rbgtkimage.c +3 -10
- data/ext/gtk2/rbgtkimagemenuitem.c +1 -4
- data/ext/gtk2/rbgtkimcontext.c +11 -22
- data/ext/gtk2/rbgtkimcontextsimple.c +2 -4
- data/ext/gtk2/rbgtkimmulticontext.c +2 -4
- data/ext/gtk2/rbgtkinputdialog.c +1 -2
- data/ext/gtk2/rbgtkinvisible.c +3 -8
- data/ext/gtk2/rbgtkitem.c +3 -6
- data/ext/gtk2/rbgtkitemfactory.c +13 -34
- data/ext/gtk2/rbgtklabel.c +10 -26
- data/ext/gtk2/rbgtklayout.c +6 -14
- data/ext/gtk2/rbgtklinkbutton.c +3 -10
- data/ext/gtk2/rbgtkliststore.c +15 -36
- data/ext/gtk2/rbgtkmain.c +32 -68
- data/ext/gtk2/rbgtkmenu.c +21 -46
- data/ext/gtk2/rbgtkmenubar.c +1 -2
- data/ext/gtk2/rbgtkmenuitem.c +12 -26
- data/ext/gtk2/rbgtkmenushell.c +9 -18
- data/ext/gtk2/rbgtkmenutoolbutton.c +2 -8
- data/ext/gtk2/rbgtkmessagedialog.c +4 -10
- data/ext/gtk2/rbgtkmisc.c +4 -8
- data/ext/gtk2/rbgtknotebook.c +53 -79
- data/ext/gtk2/rbgtkobject.c +7 -14
- data/ext/gtk2/rbgtkoptionmenu.c +4 -8
- data/ext/gtk2/rbgtkpaned.c +10 -20
- data/ext/gtk2/rbgtkplug.c +3 -8
- data/ext/gtk2/rbgtkprintsettings.c +1 -4
- data/ext/gtk2/rbgtkprogressbar.c +2 -4
- data/ext/gtk2/rbgtkradioaction.c +4 -8
- data/ext/gtk2/rbgtkradiobutton.c +3 -8
- data/ext/gtk2/rbgtkradiomenuitem.c +4 -10
- data/ext/gtk2/rbgtkradiotoolbutton.c +3 -8
- data/ext/gtk2/rbgtkrange.c +4 -8
- data/ext/gtk2/rbgtkrc.c +16 -34
- data/ext/gtk2/rbgtkrcstyle.c +13 -26
- data/ext/gtk2/rbgtkrecentaction.c +1 -4
- data/ext/gtk2/rbgtkrecentchooser.c +18 -38
- data/ext/gtk2/rbgtkrecentchooserdialog.c +1 -4
- data/ext/gtk2/rbgtkrecentchoosermenu.c +1 -4
- data/ext/gtk2/rbgtkrecentchooserwidget.c +1 -4
- data/ext/gtk2/rbgtkrecentdata.c +7 -14
- data/ext/gtk2/rbgtkrecentfilter.c +14 -29
- data/ext/gtk2/rbgtkrecentfilterinfo.c +11 -22
- data/ext/gtk2/rbgtkrecentinfo.c +21 -42
- data/ext/gtk2/rbgtkrecentmanager.c +11 -24
- data/ext/gtk2/rbgtkruler.c +6 -12
- data/ext/gtk2/rbgtkscale.c +2 -4
- data/ext/gtk2/rbgtkscalebutton.c +6 -14
- data/ext/gtk2/rbgtkscrolledwindow.c +9 -20
- data/ext/gtk2/rbgtkselection.c +10 -22
- data/ext/gtk2/rbgtkselectiondata.c +19 -41
- data/ext/gtk2/rbgtkseparatormenuitem.c +1 -2
- data/ext/gtk2/rbgtkseparatortoolitem.c +1 -2
- data/ext/gtk2/rbgtksettings.c +10 -22
- data/ext/gtk2/rbgtksizegroup.c +4 -8
- data/ext/gtk2/rbgtksocket.c +4 -8
- data/ext/gtk2/rbgtkspinbutton.c +9 -20
- data/ext/gtk2/rbgtkspinner.c +51 -0
- data/ext/gtk2/rbgtkstatusbar.c +7 -14
- data/ext/gtk2/rbgtkstatusicon.c +5 -10
- data/ext/gtk2/rbgtkstock.c +5 -13
- data/ext/gtk2/rbgtkstyle.c +51 -139
- data/ext/gtk2/rbgtktable.c +14 -33
- data/ext/gtk2/rbgtktargetlist.c +9 -18
- data/ext/gtk2/rbgtktearoffmenuitem.c +1 -2
- data/ext/gtk2/rbgtktextappearance.c +11 -22
- data/ext/gtk2/rbgtktextattributes.c +16 -32
- data/ext/gtk2/rbgtktextbuffer.c +69 -162
- data/ext/gtk2/rbgtktextchild.c +3 -8
- data/ext/gtk2/rbgtktextiter.c +34 -81
- data/ext/gtk2/rbgtktextmark.c +7 -14
- data/ext/gtk2/rbgtktexttag.c +4 -10
- data/ext/gtk2/rbgtktexttagtable.c +7 -15
- data/ext/gtk2/rbgtktextview.c +30 -62
- data/ext/gtk2/rbgtktoggleaction.c +4 -8
- data/ext/gtk2/rbgtktogglebutton.c +4 -10
- data/ext/gtk2/rbgtktoggletoolbutton.c +3 -8
- data/ext/gtk2/rbgtktoolbar.c +20 -46
- data/ext/gtk2/rbgtktoolbutton.c +1 -4
- data/ext/gtk2/rbgtktoolitem.c +16 -34
- data/ext/gtk2/rbgtktooltip.c +5 -10
- data/ext/gtk2/rbgtktooltips.c +7 -14
- data/ext/gtk2/rbgtktreeiter.c +14 -29
- data/ext/gtk2/rbgtktreemodel.c +16 -37
- data/ext/gtk2/rbgtktreemodelfilter.c +13 -36
- data/ext/gtk2/rbgtktreemodelsort.c +8 -16
- data/ext/gtk2/rbgtktreepath.c +13 -28
- data/ext/gtk2/rbgtktreerowreference.c +9 -20
- data/ext/gtk2/rbgtktreeselection.c +20 -47
- data/ext/gtk2/rbgtktreesortable.c +7 -18
- data/ext/gtk2/rbgtktreestore.c +17 -40
- data/ext/gtk2/rbgtktreeview.c +58 -138
- data/ext/gtk2/rbgtktreeviewcolumn.c +20 -46
- data/ext/gtk2/rbgtkuimanager.c +12 -26
- data/ext/gtk2/rbgtkvbbox.c +1 -2
- data/ext/gtk2/rbgtkvbox.c +1 -4
- data/ext/gtk2/rbgtkviewport.c +1 -2
- data/ext/gtk2/rbgtkvolumebutton.c +1 -2
- data/ext/gtk2/rbgtkvpaned.c +1 -2
- data/ext/gtk2/rbgtkvruler.c +1 -2
- data/ext/gtk2/rbgtkvscale.c +1 -4
- data/ext/gtk2/rbgtkvscrollbar.c +1 -4
- data/ext/gtk2/rbgtkvseparator.c +1 -2
- data/ext/gtk2/rbgtkwidget.c +126 -264
- data/ext/gtk2/rbgtkwindow.c +69 -142
- data/ext/gtk2/rbgtkwindowgroup.c +3 -6
- data/lib/1.8/gtk2.so +0 -0
- data/lib/1.9/gtk2.so +0 -0
- data/lib/gtk2/base.rb +1 -2
- data/sample/gtk-demo/main.rb +2 -0
- data/sample/gtk-demo/textview.rb +1 -0
- metadata +15 -13
    
        data/ext/gtk2/rbgdkcolor.c
    CHANGED
    
    | @@ -19,9 +19,7 @@ | |
| 19 19 | 
             
            VALUE rb_cGdkColor = Qnil;
         | 
| 20 20 |  | 
| 21 21 | 
             
            static VALUE
         | 
| 22 | 
            -
            gdkcolor_initialize(self, red, green, blue)
         | 
| 23 | 
            -
                VALUE self;
         | 
| 24 | 
            -
                VALUE red, green, blue;
         | 
| 22 | 
            +
            gdkcolor_initialize(VALUE self, VALUE red, VALUE green, VALUE blue)
         | 
| 25 23 | 
             
            {
         | 
| 26 24 | 
             
                GdkColor c;
         | 
| 27 25 | 
             
                c.pixel = 0;
         | 
| @@ -35,9 +33,7 @@ gdkcolor_initialize(self, red, green, blue) | |
| 35 33 | 
             
            }
         | 
| 36 34 |  | 
| 37 35 | 
             
            static VALUE
         | 
| 38 | 
            -
            gdkcolor_s_parse(self, name)
         | 
| 39 | 
            -
                VALUE self;
         | 
| 40 | 
            -
                VALUE name;
         | 
| 36 | 
            +
            gdkcolor_s_parse(VALUE self, VALUE name)
         | 
| 41 37 | 
             
            {
         | 
| 42 38 | 
             
                GdkColor c;
         | 
| 43 39 | 
             
                if (! gdk_color_parse(RVAL2CSTR(name), &c)) {
         | 
| @@ -47,64 +43,53 @@ gdkcolor_s_parse(self, name) | |
| 47 43 | 
             
            }
         | 
| 48 44 |  | 
| 49 45 | 
             
            static VALUE
         | 
| 50 | 
            -
            gdkcolor_pixel(self)
         | 
| 51 | 
            -
                VALUE self;
         | 
| 46 | 
            +
            gdkcolor_pixel(VALUE self)
         | 
| 52 47 | 
             
            {
         | 
| 53 48 | 
             
                return INT2NUM(_SELF(self)->pixel);
         | 
| 54 49 | 
             
            }
         | 
| 55 50 |  | 
| 56 51 | 
             
            static VALUE
         | 
| 57 | 
            -
            gdkcolor_red(self)
         | 
| 58 | 
            -
                VALUE self;
         | 
| 52 | 
            +
            gdkcolor_red(VALUE self)
         | 
| 59 53 | 
             
            {
         | 
| 60 54 |  | 
| 61 55 | 
             
                return INT2FIX(_SELF(self)->red);
         | 
| 62 56 | 
             
            }
         | 
| 63 57 |  | 
| 64 58 | 
             
            static VALUE
         | 
| 65 | 
            -
            gdkcolor_set_red(self, red)
         | 
| 66 | 
            -
                VALUE self;
         | 
| 67 | 
            -
                VALUE red;
         | 
| 59 | 
            +
            gdkcolor_set_red(VALUE self, VALUE red)
         | 
| 68 60 | 
             
            {
         | 
| 69 61 | 
             
                _SELF(self)->red = NUM2INT(red);
         | 
| 70 62 | 
             
                return self;
         | 
| 71 63 | 
             
            }
         | 
| 72 64 |  | 
| 73 65 | 
             
            static VALUE
         | 
| 74 | 
            -
            gdkcolor_green(self)
         | 
| 75 | 
            -
                VALUE self;
         | 
| 66 | 
            +
            gdkcolor_green(VALUE self)
         | 
| 76 67 | 
             
            {
         | 
| 77 68 | 
             
                return INT2FIX(_SELF(self)->green);
         | 
| 78 69 | 
             
            }
         | 
| 79 70 |  | 
| 80 71 | 
             
            static VALUE
         | 
| 81 | 
            -
            gdkcolor_set_green(self, green)
         | 
| 82 | 
            -
                VALUE self;
         | 
| 83 | 
            -
                VALUE green;
         | 
| 72 | 
            +
            gdkcolor_set_green(VALUE self, VALUE green)
         | 
| 84 73 | 
             
            {
         | 
| 85 74 | 
             
                _SELF(self)->green = NUM2INT(green);
         | 
| 86 75 | 
             
                return self;
         | 
| 87 76 | 
             
            }
         | 
| 88 77 |  | 
| 89 78 | 
             
            static VALUE
         | 
| 90 | 
            -
            gdkcolor_blue(self)
         | 
| 91 | 
            -
                VALUE self;
         | 
| 79 | 
            +
            gdkcolor_blue(VALUE self)
         | 
| 92 80 | 
             
            {
         | 
| 93 81 | 
             
                return INT2FIX(_SELF(self)->blue);
         | 
| 94 82 | 
             
            }
         | 
| 95 83 |  | 
| 96 84 | 
             
            static VALUE
         | 
| 97 | 
            -
            gdkcolor_set_blue(self, blue)
         | 
| 98 | 
            -
                VALUE self;
         | 
| 99 | 
            -
                VALUE blue;
         | 
| 85 | 
            +
            gdkcolor_set_blue(VALUE self, VALUE blue)
         | 
| 100 86 | 
             
            {
         | 
| 101 87 | 
             
                _SELF(self)->blue = NUM2INT(blue);
         | 
| 102 88 | 
             
                return self;
         | 
| 103 89 | 
             
            }
         | 
| 104 90 |  | 
| 105 91 | 
             
            static VALUE
         | 
| 106 | 
            -
            gdkcolor_to_a(self)
         | 
| 107 | 
            -
                VALUE self;
         | 
| 92 | 
            +
            gdkcolor_to_a(VALUE self)
         | 
| 108 93 | 
             
            {
         | 
| 109 94 | 
             
                GdkColor *c = _SELF(self);
         | 
| 110 95 | 
             
                return rb_ary_new3(3, INT2FIX(c->red), 
         | 
| @@ -112,8 +97,7 @@ gdkcolor_to_a(self) | |
| 112 97 | 
             
            }
         | 
| 113 98 |  | 
| 114 99 | 
             
            static VALUE
         | 
| 115 | 
            -
            gdkcolor_equal(self, other)
         | 
| 116 | 
            -
                VALUE self, other;
         | 
| 100 | 
            +
            gdkcolor_equal(VALUE self, VALUE other)
         | 
| 117 101 | 
             
            {
         | 
| 118 102 | 
             
                return CBOOL2RVAL(gdk_color_equal(_SELF(self), _SELF(other)));
         | 
| 119 103 | 
             
            }
         | 
    
        data/ext/gtk2/rbgdkcolormap.c
    CHANGED
    
    | @@ -20,8 +20,7 @@ | |
| 20 20 | 
             
            #define _SELF(self) (GDK_COLORMAP(RVAL2GOBJ(self)))
         | 
| 21 21 |  | 
| 22 22 | 
             
            static VALUE
         | 
| 23 | 
            -
            gdkcmap_initialize(self, visual, allocate)
         | 
| 24 | 
            -
                VALUE self, visual, allocate;
         | 
| 23 | 
            +
            gdkcmap_initialize(VALUE self, VALUE visual, VALUE allocate)
         | 
| 25 24 | 
             
            {
         | 
| 26 25 | 
             
                GdkColormap *cmap  = gdk_colormap_new(GDK_VISUAL(RVAL2GOBJ(visual)),
         | 
| 27 26 | 
             
                                                      RVAL2CBOOL(allocate));
         | 
| @@ -30,8 +29,7 @@ gdkcmap_initialize(self, visual, allocate) | |
| 30 29 | 
             
            }
         | 
| 31 30 |  | 
| 32 31 | 
             
            static VALUE
         | 
| 33 | 
            -
            gdkcmap_s_get_system(self)
         | 
| 34 | 
            -
                VALUE self;
         | 
| 32 | 
            +
            gdkcmap_s_get_system(VALUE self)
         | 
| 35 33 | 
             
            {
         | 
| 36 34 | 
             
                return GOBJ2RVAL(gdk_colormap_get_system());
         | 
| 37 35 | 
             
            }
         | 
| @@ -48,8 +46,7 @@ gint        gdk_colormap_alloc_colors       (GdkColormap *colormap, | |
| 48 46 | 
             
            */
         | 
| 49 47 |  | 
| 50 48 | 
             
            static VALUE
         | 
| 51 | 
            -
            gdkcmap_alloc_color(self, color, writeable, best_match)
         | 
| 52 | 
            -
                VALUE self, color, writeable, best_match;
         | 
| 49 | 
            +
            gdkcmap_alloc_color(VALUE self, VALUE color, VALUE writeable, VALUE best_match)
         | 
| 53 50 | 
             
            {
         | 
| 54 51 | 
             
                gboolean result;
         | 
| 55 52 | 
             
                GdkColor *c = RVAL2GDKCOLOR(color);
         | 
| @@ -61,16 +58,14 @@ gdkcmap_alloc_color(self, color, writeable, best_match) | |
| 61 58 | 
             
            /* Don't implement Gdk::Colormap#free_colors.
         | 
| 62 59 | 
             
               Because it should be pair with Gdk::Colormap#alloc_colors */
         | 
| 63 60 | 
             
            static VALUE
         | 
| 64 | 
            -
            gdkcmap_free_color(self, color)
         | 
| 65 | 
            -
                VALUE self, color;
         | 
| 61 | 
            +
            gdkcmap_free_color(VALUE self, VALUE color)
         | 
| 66 62 | 
             
            {
         | 
| 67 63 | 
             
                gdk_colormap_free_colors(_SELF(self), RVAL2GDKCOLOR(color), 1);
         | 
| 68 64 | 
             
                return self;
         | 
| 69 65 | 
             
            }
         | 
| 70 66 |  | 
| 71 67 | 
             
            static VALUE
         | 
| 72 | 
            -
            gdkcmap_query_color(self, pixel)
         | 
| 73 | 
            -
                VALUE self, pixel;
         | 
| 68 | 
            +
            gdkcmap_query_color(VALUE self, VALUE pixel)
         | 
| 74 69 | 
             
            {
         | 
| 75 70 | 
             
                GdkColor color;
         | 
| 76 71 | 
             
                gdk_colormap_query_color(_SELF(self), NUM2ULONG(pixel), &color);
         | 
| @@ -78,24 +73,21 @@ gdkcmap_query_color(self, pixel) | |
| 78 73 | 
             
            }
         | 
| 79 74 |  | 
| 80 75 | 
             
            static VALUE
         | 
| 81 | 
            -
            gdkcmap_get_visual(self)
         | 
| 82 | 
            -
                VALUE self;
         | 
| 76 | 
            +
            gdkcmap_get_visual(VALUE self)
         | 
| 83 77 | 
             
            {
         | 
| 84 78 | 
             
                return GOBJ2RVAL(gdk_colormap_get_visual(_SELF(self)));
         | 
| 85 79 | 
             
            }
         | 
| 86 80 |  | 
| 87 81 | 
             
            #if GTK_CHECK_VERSION(2,2,0)
         | 
| 88 82 | 
             
            static VALUE
         | 
| 89 | 
            -
            gdkcmap_get_screen(self)
         | 
| 90 | 
            -
                VALUE self;
         | 
| 83 | 
            +
            gdkcmap_get_screen(VALUE self)
         | 
| 91 84 | 
             
            {
         | 
| 92 85 | 
             
                return GOBJ2RVAL(gdk_colormap_get_screen(_SELF(self)));
         | 
| 93 86 | 
             
            }
         | 
| 94 87 | 
             
            #endif
         | 
| 95 88 |  | 
| 96 89 | 
             
            static VALUE
         | 
| 97 | 
            -
            gdkcmap_colors(self)
         | 
| 98 | 
            -
                VALUE self;
         | 
| 90 | 
            +
            gdkcmap_colors(VALUE self)
         | 
| 99 91 | 
             
            {
         | 
| 100 92 | 
             
                GdkColormap *cmap;
         | 
| 101 93 | 
             
                GdkColor *colors;
         | 
    
        data/ext/gtk2/rbgdkcursor.c
    CHANGED
    
    | @@ -12,10 +12,7 @@ | |
| 12 12 | 
             
            #include "global.h"
         | 
| 13 13 |  | 
| 14 14 | 
             
            static VALUE
         | 
| 15 | 
            -
            gdkcursor_initialize(argc, argv, self)
         | 
| 16 | 
            -
                int argc;
         | 
| 17 | 
            -
                VALUE *argv;
         | 
| 18 | 
            -
                VALUE self;
         | 
| 15 | 
            +
            gdkcursor_initialize(int argc, VALUE *argv, VALUE self)
         | 
| 19 16 | 
             
            {
         | 
| 20 17 | 
             
                GdkCursor* cursor = NULL;
         | 
| 21 18 |  | 
| @@ -64,32 +61,28 @@ gdkcursor_initialize(argc, argv, self) | |
| 64 61 |  | 
| 65 62 | 
             
            #if GTK_CHECK_VERSION(2,2,0)
         | 
| 66 63 | 
             
            static VALUE
         | 
| 67 | 
            -
            gdkcursor_get_display(self)
         | 
| 68 | 
            -
                VALUE self;
         | 
| 64 | 
            +
            gdkcursor_get_display(VALUE self)
         | 
| 69 65 | 
             
            {
         | 
| 70 66 | 
             
                return GOBJ2RVAL(gdk_cursor_get_display((GdkCursor*)RVAL2BOXED(self, GDK_TYPE_CURSOR)));
         | 
| 71 67 | 
             
            }
         | 
| 72 68 | 
             
            #endif
         | 
| 73 69 |  | 
| 74 70 | 
             
            static VALUE
         | 
| 75 | 
            -
            gdkcursor_is_pixmap(self)
         | 
| 76 | 
            -
                VALUE self;
         | 
| 71 | 
            +
            gdkcursor_is_pixmap(VALUE self)
         | 
| 77 72 | 
             
            {
         | 
| 78 73 | 
             
                return CBOOL2RVAL(((GdkCursor*)RVAL2BOXED(self, GDK_TYPE_COLOR))->type == 
         | 
| 79 74 | 
             
                                  GDK_CURSOR_IS_PIXMAP);
         | 
| 80 75 | 
             
            }
         | 
| 81 76 |  | 
| 82 77 | 
             
            static VALUE
         | 
| 83 | 
            -
            gdkcursor_cursor_type(self)
         | 
| 84 | 
            -
                VALUE self;
         | 
| 78 | 
            +
            gdkcursor_cursor_type(VALUE self)
         | 
| 85 79 | 
             
            {
         | 
| 86 80 | 
             
                return GENUM2RVAL(((GdkCursor*)RVAL2BOXED(self, GDK_TYPE_CURSOR))->type, GDK_TYPE_CURSOR_TYPE);
         | 
| 87 81 | 
             
            }
         | 
| 88 82 |  | 
| 89 83 | 
             
            #if GTK_CHECK_VERSION(2,8,0)
         | 
| 90 84 | 
             
            static VALUE
         | 
| 91 | 
            -
            gdkcursor_get_image(self)
         | 
| 92 | 
            -
                VALUE self;
         | 
| 85 | 
            +
            gdkcursor_get_image(VALUE self)
         | 
| 93 86 | 
             
            {
         | 
| 94 87 | 
             
                return GOBJ2RVAL(gdk_cursor_get_image((GdkCursor*)RVAL2BOXED(self, GDK_TYPE_CURSOR)));
         | 
| 95 88 | 
             
            }
         | 
    
        data/ext/gtk2/rbgdkdevice.c
    CHANGED
    
    | @@ -15,16 +15,14 @@ | |
| 15 15 |  | 
| 16 16 | 
             
            /* Methods */
         | 
| 17 17 | 
             
            static VALUE
         | 
| 18 | 
            -
            device_s_list(self)
         | 
| 19 | 
            -
                VALUE self;
         | 
| 18 | 
            +
            device_s_list(VALUE self)
         | 
| 20 19 | 
             
            {
         | 
| 21 20 | 
             
                /* Owned by GDK */
         | 
| 22 21 | 
             
                return GLIST2ARY(gdk_devices_list());
         | 
| 23 22 | 
             
            }
         | 
| 24 23 |  | 
| 25 24 | 
             
            static VALUE
         | 
| 26 | 
            -
            device_s_set_extension_events(self, window, mask, mode)
         | 
| 27 | 
            -
                VALUE self, window, mask, mode;
         | 
| 25 | 
            +
            device_s_set_extension_events(VALUE self, VALUE window, VALUE mask, VALUE mode)
         | 
| 28 26 | 
             
            {
         | 
| 29 27 | 
             
                gdk_input_set_extension_events(GDK_WINDOW(RVAL2GOBJ(window)),
         | 
| 30 28 | 
             
                                               NUM2INT(mask), FIX2INT(mode));
         | 
| @@ -33,23 +31,20 @@ device_s_set_extension_events(self, window, mask, mode) | |
| 33 31 |  | 
| 34 32 |  | 
| 35 33 | 
             
            static VALUE
         | 
| 36 | 
            -
            device_set_source(self, source)
         | 
| 37 | 
            -
                VALUE self, source;
         | 
| 34 | 
            +
            device_set_source(VALUE self, VALUE source)
         | 
| 38 35 | 
             
            {
         | 
| 39 36 | 
             
                gdk_device_set_source(_SELF(self), RVAL2GENUM(source, GDK_TYPE_INPUT_SOURCE));
         | 
| 40 37 | 
             
                return self;
         | 
| 41 38 | 
             
            }
         | 
| 42 39 |  | 
| 43 40 | 
             
            static VALUE
         | 
| 44 | 
            -
            device_set_mode(self, mode)
         | 
| 45 | 
            -
                VALUE self, mode;
         | 
| 41 | 
            +
            device_set_mode(VALUE self, VALUE mode)
         | 
| 46 42 | 
             
            {
         | 
| 47 43 | 
             
                return CBOOL2RVAL(gdk_device_set_mode(_SELF(self), RVAL2GENUM(mode, GDK_TYPE_INPUT_MODE)));
         | 
| 48 44 | 
             
            }
         | 
| 49 45 |  | 
| 50 46 | 
             
            static VALUE
         | 
| 51 | 
            -
            device_set_key(self, index, keyval, modifiers)
         | 
| 52 | 
            -
                VALUE self, index, keyval, modifiers;
         | 
| 47 | 
            +
            device_set_key(VALUE self, VALUE index, VALUE keyval, VALUE modifiers)
         | 
| 53 48 | 
             
            {
         | 
| 54 49 | 
             
                gdk_device_set_key(_SELF(self), NUM2UINT(index), NUM2UINT(keyval),
         | 
| 55 50 | 
             
                                   RVAL2GFLAGS(modifiers, GDK_TYPE_MODIFIER_TYPE));
         | 
| @@ -57,8 +52,7 @@ device_set_key(self, index, keyval, modifiers) | |
| 57 52 | 
             
            }
         | 
| 58 53 |  | 
| 59 54 | 
             
            static VALUE
         | 
| 60 | 
            -
            device_set_axis_use(self, index, use)
         | 
| 61 | 
            -
                VALUE self, index, use;
         | 
| 55 | 
            +
            device_set_axis_use(VALUE self, VALUE index, VALUE use)
         | 
| 62 56 | 
             
            {
         | 
| 63 57 | 
             
                gdk_device_set_axis_use(_SELF(self), NUM2UINT(index), 
         | 
| 64 58 | 
             
                                        RVAL2GENUM(use, GDK_TYPE_AXIS_USE));
         | 
| @@ -66,15 +60,13 @@ device_set_axis_use(self, index, use) | |
| 66 60 | 
             
            }
         | 
| 67 61 |  | 
| 68 62 | 
             
            static VALUE
         | 
| 69 | 
            -
            device_s_get_core_pointer(self)
         | 
| 70 | 
            -
                VALUE self;
         | 
| 63 | 
            +
            device_s_get_core_pointer(VALUE self)
         | 
| 71 64 | 
             
            {
         | 
| 72 65 | 
             
                return GOBJ2RVAL(gdk_device_get_core_pointer());
         | 
| 73 66 | 
             
            }
         | 
| 74 67 |  | 
| 75 68 | 
             
            static VALUE
         | 
| 76 | 
            -
            device_get_state(self, window)
         | 
| 77 | 
            -
                VALUE self, window;
         | 
| 69 | 
            +
            device_get_state(VALUE self, VALUE window)
         | 
| 78 70 | 
             
            {
         | 
| 79 71 | 
             
                gdouble axes[2];
         | 
| 80 72 | 
             
                GdkModifierType mask;
         | 
| @@ -86,8 +78,7 @@ device_get_state(self, window) | |
| 86 78 | 
             
            }
         | 
| 87 79 |  | 
| 88 80 | 
             
            static VALUE
         | 
| 89 | 
            -
            device_get_history(self, window, start, stop)
         | 
| 90 | 
            -
                VALUE self, window, start, stop;
         | 
| 81 | 
            +
            device_get_history(VALUE self, VALUE window, VALUE start, VALUE stop)
         | 
| 91 82 | 
             
            {
         | 
| 92 83 | 
             
                gboolean ret;
         | 
| 93 84 | 
             
                GdkTimeCoord** events;
         | 
| @@ -108,8 +99,7 @@ device_get_history(self, window, start, stop) | |
| 108 99 | 
             
            }
         | 
| 109 100 |  | 
| 110 101 | 
             
            static VALUE
         | 
| 111 | 
            -
            device_get_axis(self, axes, use)
         | 
| 112 | 
            -
                VALUE self, axes, use;
         | 
| 102 | 
            +
            device_get_axis(VALUE self, VALUE axes, VALUE use)
         | 
| 113 103 | 
             
            {
         | 
| 114 104 | 
             
                gdouble value;
         | 
| 115 105 | 
             
                gboolean ret;
         | 
| @@ -133,36 +123,31 @@ device_get_axis(self, axes, use) | |
| 133 123 |  | 
| 134 124 | 
             
            /* Accessor */
         | 
| 135 125 | 
             
            static VALUE
         | 
| 136 | 
            -
            device_name(self)
         | 
| 137 | 
            -
                VALUE self;
         | 
| 126 | 
            +
            device_name(VALUE self)
         | 
| 138 127 | 
             
            {
         | 
| 139 128 | 
             
                return CSTR2RVAL(_SELF(self)->name);
         | 
| 140 129 | 
             
            }
         | 
| 141 130 |  | 
| 142 131 | 
             
            static VALUE
         | 
| 143 | 
            -
            device_source(self)
         | 
| 144 | 
            -
                VALUE self;
         | 
| 132 | 
            +
            device_source(VALUE self)
         | 
| 145 133 | 
             
            {
         | 
| 146 134 | 
             
                return GENUM2RVAL(_SELF(self)->source, GDK_TYPE_INPUT_SOURCE);
         | 
| 147 135 | 
             
            }
         | 
| 148 136 |  | 
| 149 137 | 
             
            static VALUE
         | 
| 150 | 
            -
            device_mode(self)
         | 
| 151 | 
            -
                VALUE self;
         | 
| 138 | 
            +
            device_mode(VALUE self)
         | 
| 152 139 | 
             
            {
         | 
| 153 140 | 
             
                return GENUM2RVAL(_SELF(self)->mode, GDK_TYPE_INPUT_MODE);
         | 
| 154 141 | 
             
            }
         | 
| 155 142 |  | 
| 156 143 | 
             
            static VALUE
         | 
| 157 | 
            -
            device_has_cursor(self)
         | 
| 158 | 
            -
                VALUE self;
         | 
| 144 | 
            +
            device_has_cursor(VALUE self)
         | 
| 159 145 | 
             
            {
         | 
| 160 146 | 
             
                return CBOOL2RVAL(_SELF(self)->has_cursor);
         | 
| 161 147 | 
             
            }
         | 
| 162 148 |  | 
| 163 149 | 
             
            static VALUE
         | 
| 164 | 
            -
            device_axes(self)
         | 
| 165 | 
            -
                VALUE self;
         | 
| 150 | 
            +
            device_axes(VALUE self)
         | 
| 166 151 | 
             
            {
         | 
| 167 152 | 
             
                gint i;
         | 
| 168 153 | 
             
                VALUE ary = rb_ary_new();
         | 
| @@ -176,8 +161,7 @@ device_axes(self) | |
| 176 161 | 
             
            }
         | 
| 177 162 |  | 
| 178 163 | 
             
            static VALUE
         | 
| 179 | 
            -
            device_keys(self)
         | 
| 180 | 
            -
                VALUE self;
         | 
| 164 | 
            +
            device_keys(VALUE self)
         | 
| 181 165 | 
             
            {
         | 
| 182 166 | 
             
                gint i;
         | 
| 183 167 | 
             
                VALUE ary = rb_ary_new();
         | 
    
        data/ext/gtk2/rbgdkdisplay.c
    CHANGED
    
    | @@ -16,16 +16,14 @@ | |
| 16 16 |  | 
| 17 17 |  | 
| 18 18 | 
             
            static VALUE
         | 
| 19 | 
            -
            gdkdisplay_close(self)
         | 
| 20 | 
            -
                VALUE self;
         | 
| 19 | 
            +
            gdkdisplay_close(VALUE self)
         | 
| 21 20 | 
             
            {
         | 
| 22 21 | 
             
                gdk_display_close(_SELF(self));
         | 
| 23 22 | 
             
                return self;
         | 
| 24 23 | 
             
            }
         | 
| 25 24 |  | 
| 26 25 | 
             
            static VALUE
         | 
| 27 | 
            -
            gdkdisplay_s_open(self, display_name)
         | 
| 28 | 
            -
                VALUE self, display_name;
         | 
| 26 | 
            +
            gdkdisplay_s_open(VALUE self, VALUE display_name)
         | 
| 29 27 | 
             
            {
         | 
| 30 28 | 
             
                GdkDisplay* gdisplay = gdk_display_open(RVAL2CSTR(display_name));
         | 
| 31 29 | 
             
                if (! gdisplay) {
         | 
| @@ -46,8 +44,7 @@ gdkdisplay_s_open(self, display_name) | |
| 46 44 | 
             
            }
         | 
| 47 45 |  | 
| 48 46 | 
             
            static VALUE
         | 
| 49 | 
            -
            gdkdisplay_s_get_default(self)
         | 
| 50 | 
            -
                VALUE self;
         | 
| 47 | 
            +
            gdkdisplay_s_get_default(VALUE self)
         | 
| 51 48 | 
             
            {
         | 
| 52 49 | 
             
                GdkDisplay* gdisplay = gdk_display_get_default();
         | 
| 53 50 | 
             
                 if (! gdisplay)
         | 
| @@ -58,67 +55,58 @@ gdkdisplay_s_get_default(self) | |
| 58 55 |  | 
| 59 56 |  | 
| 60 57 | 
             
            static VALUE
         | 
| 61 | 
            -
            gdkdisplay_name(self)
         | 
| 62 | 
            -
                VALUE self;
         | 
| 58 | 
            +
            gdkdisplay_name(VALUE self)
         | 
| 63 59 | 
             
            {
         | 
| 64 60 | 
             
                return CSTR2RVAL(gdk_display_get_name(_SELF(self)));
         | 
| 65 61 | 
             
            }
         | 
| 66 62 |  | 
| 67 63 | 
             
            static VALUE
         | 
| 68 | 
            -
            gdkdisplay_n_screens(self)
         | 
| 69 | 
            -
                VALUE self;
         | 
| 64 | 
            +
            gdkdisplay_n_screens(VALUE self)
         | 
| 70 65 | 
             
            {
         | 
| 71 66 | 
             
                return INT2NUM(gdk_display_get_n_screens(_SELF(self)));
         | 
| 72 67 | 
             
            }
         | 
| 73 68 |  | 
| 74 69 | 
             
            static VALUE
         | 
| 75 | 
            -
            gdkdisplay_get_screen(self, num)
         | 
| 76 | 
            -
                VALUE self, num;
         | 
| 70 | 
            +
            gdkdisplay_get_screen(VALUE self, VALUE num)
         | 
| 77 71 | 
             
            {
         | 
| 78 72 | 
             
                return GOBJ2RVAL(gdk_display_get_screen(_SELF(self), NUM2INT(num)));
         | 
| 79 73 | 
             
            }
         | 
| 80 74 |  | 
| 81 75 | 
             
            static VALUE
         | 
| 82 | 
            -
            gdkdisplay_default_screen(self)
         | 
| 83 | 
            -
                VALUE self;
         | 
| 76 | 
            +
            gdkdisplay_default_screen(VALUE self)
         | 
| 84 77 | 
             
            {
         | 
| 85 78 | 
             
                return GOBJ2RVAL(gdk_display_get_default_screen(_SELF(self)));
         | 
| 86 79 | 
             
            }
         | 
| 87 80 |  | 
| 88 81 | 
             
            static VALUE
         | 
| 89 | 
            -
            gdkdisplay_pointer_ungrab(self, time)
         | 
| 90 | 
            -
                VALUE self, time;
         | 
| 82 | 
            +
            gdkdisplay_pointer_ungrab(VALUE self, VALUE time)
         | 
| 91 83 | 
             
            {
         | 
| 92 84 | 
             
                gdk_display_pointer_ungrab(_SELF(self), NUM2ULONG(time));
         | 
| 93 85 | 
             
                return self;
         | 
| 94 86 | 
             
            }
         | 
| 95 87 |  | 
| 96 88 | 
             
            static VALUE
         | 
| 97 | 
            -
            gdkdisplay_keyboard_ungrab(self, time)
         | 
| 98 | 
            -
                VALUE self, time;
         | 
| 89 | 
            +
            gdkdisplay_keyboard_ungrab(VALUE self, VALUE time)
         | 
| 99 90 | 
             
            {
         | 
| 100 91 | 
             
                gdk_display_keyboard_ungrab(_SELF(self), NUM2ULONG(time));
         | 
| 101 92 | 
             
                return self;
         | 
| 102 93 | 
             
            }
         | 
| 103 94 |  | 
| 104 95 | 
             
            static VALUE
         | 
| 105 | 
            -
            gdkdisplay_pointer_grabbed(self)
         | 
| 106 | 
            -
                VALUE self;
         | 
| 96 | 
            +
            gdkdisplay_pointer_grabbed(VALUE self)
         | 
| 107 97 | 
             
            {
         | 
| 108 98 | 
             
                return CBOOL2RVAL(gdk_display_pointer_is_grabbed(_SELF(self)));
         | 
| 109 99 | 
             
            }
         | 
| 110 100 |  | 
| 111 101 | 
             
            static VALUE
         | 
| 112 | 
            -
            gdkdisplay_beep(self)
         | 
| 113 | 
            -
                VALUE self;
         | 
| 102 | 
            +
            gdkdisplay_beep(VALUE self)
         | 
| 114 103 | 
             
            {
         | 
| 115 104 | 
             
                gdk_display_beep(_SELF(self));
         | 
| 116 105 | 
             
                return self;
         | 
| 117 106 | 
             
            }
         | 
| 118 107 |  | 
| 119 108 | 
             
            static VALUE
         | 
| 120 | 
            -
            gdkdisplay_sync(self)
         | 
| 121 | 
            -
                VALUE self;
         | 
| 109 | 
            +
            gdkdisplay_sync(VALUE self)
         | 
| 122 110 | 
             
            {
         | 
| 123 111 | 
             
                gdk_display_sync(_SELF(self));
         | 
| 124 112 | 
             
                return self;
         | 
| @@ -126,8 +114,7 @@ gdkdisplay_sync(self) | |
| 126 114 |  | 
| 127 115 | 
             
            #if GTK_CHECK_VERSION(2,4,0)
         | 
| 128 116 | 
             
            static VALUE
         | 
| 129 | 
            -
            gdkdisplay_flush(self)
         | 
| 130 | 
            -
                VALUE self;
         | 
| 117 | 
            +
            gdkdisplay_flush(VALUE self)
         | 
| 131 118 | 
             
            {
         | 
| 132 119 | 
             
                gdk_display_flush(_SELF(self));
         | 
| 133 120 | 
             
                return self;
         | 
| @@ -135,29 +122,25 @@ gdkdisplay_flush(self) | |
| 135 122 | 
             
            #endif
         | 
| 136 123 |  | 
| 137 124 | 
             
            static VALUE
         | 
| 138 | 
            -
            gdkdisplay_list_devices(self)
         | 
| 139 | 
            -
                VALUE self;
         | 
| 125 | 
            +
            gdkdisplay_list_devices(VALUE self)
         | 
| 140 126 | 
             
            {
         | 
| 141 127 | 
             
                return rbgutil_glist2ary(gdk_display_list_devices(_SELF(self)));
         | 
| 142 128 | 
             
            }
         | 
| 143 129 |  | 
| 144 130 | 
             
            static VALUE
         | 
| 145 | 
            -
            gdkdisplay_get_event(self)
         | 
| 146 | 
            -
                VALUE self;
         | 
| 131 | 
            +
            gdkdisplay_get_event(VALUE self)
         | 
| 147 132 | 
             
            {
         | 
| 148 133 | 
             
                return GEV2RVAL(gdk_display_get_event(_SELF(self)));
         | 
| 149 134 | 
             
            }
         | 
| 150 135 |  | 
| 151 136 | 
             
            static VALUE
         | 
| 152 | 
            -
            gdkdisplay_peek_event(self)
         | 
| 153 | 
            -
                VALUE self;
         | 
| 137 | 
            +
            gdkdisplay_peek_event(VALUE self)
         | 
| 154 138 | 
             
            {
         | 
| 155 139 | 
             
                return GEV2RVAL(gdk_display_peek_event(_SELF(self)));
         | 
| 156 140 | 
             
            }
         | 
| 157 141 |  | 
| 158 142 | 
             
            static VALUE
         | 
| 159 | 
            -
            gdkdisplay_put_event(self, event)
         | 
| 160 | 
            -
                VALUE self, event;
         | 
| 143 | 
            +
            gdkdisplay_put_event(VALUE self, VALUE event)
         | 
| 161 144 | 
             
            {
         | 
| 162 145 | 
             
                gdk_display_put_event(_SELF(self), RVAL2GEV(event));
         | 
| 163 146 | 
             
                return self;
         | 
| @@ -165,10 +148,7 @@ gdkdisplay_put_event(self, event) | |
| 165 148 |  | 
| 166 149 | 
             
            /* Don't implement this.
         | 
| 167 150 | 
             
            static GdkFilterReturn
         | 
| 168 | 
            -
            filter_func(xevent, event, func)
         | 
| 169 | 
            -
                GdkXEvent xevent;
         | 
| 170 | 
            -
                GdkEvent event;
         | 
| 171 | 
            -
                gpointer func;
         | 
| 151 | 
            +
            filter_func(GdkXEvent xevent, GdkEvent event, gpointer func)
         | 
| 172 152 | 
             
            {
         | 
| 173 153 | 
             
                return GENUM2RVAL(rb_funcall((VALUE)func, id_call, 2, 
         | 
| 174 154 | 
             
                                             ????, GEV2RVAL(event)), 
         | 
| @@ -176,8 +156,7 @@ filter_func(xevent, event, func) | |
| 176 156 | 
             
            }
         | 
| 177 157 |  | 
| 178 158 | 
             
            static VALUE
         | 
| 179 | 
            -
            gdkdisplay_add_client_message_filter(self, message_type)
         | 
| 180 | 
            -
                VALUE self, message_type;
         | 
| 159 | 
            +
            gdkdisplay_add_client_message_filter(VALUE self, VALUE message_type)
         | 
| 181 160 | 
             
            {
         | 
| 182 161 | 
             
                VALUE func = RB_BLOCK_PROC();
         | 
| 183 162 | 
             
                G_RELATIVE(self, func);
         | 
| @@ -188,23 +167,20 @@ gdkdisplay_add_client_message_filter(self, message_type) | |
| 188 167 | 
             
            */
         | 
| 189 168 |  | 
| 190 169 | 
             
            static VALUE
         | 
| 191 | 
            -
            gdkdisplay_set_double_click_time(self, msec)
         | 
| 192 | 
            -
                VALUE self, msec;
         | 
| 170 | 
            +
            gdkdisplay_set_double_click_time(VALUE self, VALUE msec)
         | 
| 193 171 | 
             
            {
         | 
| 194 172 | 
             
                gdk_display_set_double_click_time(_SELF(self), NUM2UINT(msec));
         | 
| 195 173 | 
             
                return self;
         | 
| 196 174 | 
             
            }
         | 
| 197 175 |  | 
| 198 176 | 
             
            static VALUE
         | 
| 199 | 
            -
            gdkdisplay_get_double_click_time(self)
         | 
| 200 | 
            -
                VALUE self;
         | 
| 177 | 
            +
            gdkdisplay_get_double_click_time(VALUE self)
         | 
| 201 178 | 
             
            {
         | 
| 202 179 | 
             
                return UINT2NUM(_SELF(self)->double_click_time);
         | 
| 203 180 | 
             
            }
         | 
| 204 181 |  | 
| 205 182 | 
             
            static VALUE
         | 
| 206 | 
            -
            gdkdisplay_get_button_click_time(self)
         | 
| 207 | 
            -
                VALUE self;
         | 
| 183 | 
            +
            gdkdisplay_get_button_click_time(VALUE self)
         | 
| 208 184 | 
             
            {
         | 
| 209 185 | 
             
                return rb_ary_new3(2,
         | 
| 210 186 | 
             
                                   UINT2NUM(_SELF(self)->button_click_time[0]),
         | 
| @@ -212,8 +188,7 @@ gdkdisplay_get_button_click_time(self) | |
| 212 188 | 
             
            }
         | 
| 213 189 |  | 
| 214 190 | 
             
            static VALUE
         | 
| 215 | 
            -
            gdkdisplay_get_button_window(self)
         | 
| 216 | 
            -
                VALUE self;
         | 
| 191 | 
            +
            gdkdisplay_get_button_window(VALUE self)
         | 
| 217 192 | 
             
            {
         | 
| 218 193 | 
             
                return rb_ary_new3(2,
         | 
| 219 194 | 
             
                                   GOBJ2RVAL(_SELF(self)->button_window[0]),
         | 
| @@ -221,8 +196,7 @@ gdkdisplay_get_button_window(self) | |
| 221 196 | 
             
            }
         | 
| 222 197 |  | 
| 223 198 | 
             
            static VALUE
         | 
| 224 | 
            -
            gdkdisplay_get_button_number(self)
         | 
| 225 | 
            -
                VALUE self;
         | 
| 199 | 
            +
            gdkdisplay_get_button_number(VALUE self)
         | 
| 226 200 | 
             
            {
         | 
| 227 201 | 
             
                return rb_ary_new3(2,
         | 
| 228 202 | 
             
                                   INT2NUM(_SELF(self)->button_number[0]),
         | 
| @@ -230,16 +204,14 @@ gdkdisplay_get_button_number(self) | |
| 230 204 | 
             
            }
         | 
| 231 205 |  | 
| 232 206 | 
             
            static VALUE
         | 
| 233 | 
            -
            gdkdisplay_get_closed(self)
         | 
| 234 | 
            -
                VALUE self;
         | 
| 207 | 
            +
            gdkdisplay_get_closed(VALUE self)
         | 
| 235 208 | 
             
            {
         | 
| 236 209 | 
             
                return CBOOL2RVAL(_SELF(self)->closed);
         | 
| 237 210 | 
             
            }
         | 
| 238 211 |  | 
| 239 212 | 
             
            #if GTK_CHECK_VERSION(2,4,0)
         | 
| 240 213 | 
             
            static VALUE
         | 
| 241 | 
            -
            gdkdisplay_get_button_x(self)
         | 
| 242 | 
            -
                VALUE self;
         | 
| 214 | 
            +
            gdkdisplay_get_button_x(VALUE self)
         | 
| 243 215 | 
             
            {
         | 
| 244 216 | 
             
                return rb_ary_new3(2,
         | 
| 245 217 | 
             
                                   INT2NUM(_SELF(self)->button_x[0]),
         | 
| @@ -247,8 +219,7 @@ gdkdisplay_get_button_x(self) | |
| 247 219 | 
             
            }
         | 
| 248 220 |  | 
| 249 221 | 
             
            static VALUE
         | 
| 250 | 
            -
            gdkdisplay_get_button_y(self)
         | 
| 251 | 
            -
                VALUE self;
         | 
| 222 | 
            +
            gdkdisplay_get_button_y(VALUE self)
         | 
| 252 223 | 
             
            {
         | 
| 253 224 | 
             
                return rb_ary_new3(2,
         | 
| 254 225 | 
             
                                   INT2NUM(_SELF(self)->button_y[0]),
         | 
| @@ -256,24 +227,21 @@ gdkdisplay_get_button_y(self) | |
| 256 227 | 
             
            }
         | 
| 257 228 |  | 
| 258 229 | 
             
            static VALUE
         | 
| 259 | 
            -
            gdkdisplay_set_double_click_distance(self, distance)
         | 
| 260 | 
            -
                VALUE self, distance;
         | 
| 230 | 
            +
            gdkdisplay_set_double_click_distance(VALUE self, VALUE distance)
         | 
| 261 231 | 
             
            {
         | 
| 262 232 | 
             
                gdk_display_set_double_click_distance(_SELF(self), NUM2UINT(distance));
         | 
| 263 233 | 
             
                return self;
         | 
| 264 234 | 
             
            }
         | 
| 265 235 |  | 
| 266 236 | 
             
            static VALUE
         | 
| 267 | 
            -
            gdkdisplay_get_double_click_distance(self | 
| 268 | 
            -
                VALUE self;
         | 
| 237 | 
            +
            gdkdisplay_get_double_click_distance(VALUE self)
         | 
| 269 238 | 
             
            {
         | 
| 270 239 | 
             
                return UINT2NUM(_SELF(self)->double_click_distance);
         | 
| 271 240 | 
             
            }
         | 
| 272 241 | 
             
            #endif
         | 
| 273 242 |  | 
| 274 243 | 
             
            static VALUE
         | 
| 275 | 
            -
            gdkdisplay_get_pointer(self)
         | 
| 276 | 
            -
                VALUE self;
         | 
| 244 | 
            +
            gdkdisplay_get_pointer(VALUE self)
         | 
| 277 245 | 
             
            {
         | 
| 278 246 | 
             
                GdkScreen *screen;
         | 
| 279 247 | 
             
                int x,y;
         | 
| @@ -284,8 +252,7 @@ gdkdisplay_get_pointer(self) | |
| 284 252 | 
             
                return rb_ary_new3(4, GOBJ2RVAL(screen), INT2NUM(x), INT2NUM(y), INT2NUM(mask));
         | 
| 285 253 | 
             
            }
         | 
| 286 254 | 
             
            static VALUE
         | 
| 287 | 
            -
            gdkdisplay_get_window_at_pointer(self)
         | 
| 288 | 
            -
                VALUE self;
         | 
| 255 | 
            +
            gdkdisplay_get_window_at_pointer(VALUE self)
         | 
| 289 256 | 
             
            {
         | 
| 290 257 | 
             
                GdkWindow *window;
         | 
| 291 258 | 
             
                int x,y;
         | 
| @@ -303,29 +270,25 @@ GdkDisplayPointerHooks* gdk_display_set_pointer_hooks | |
| 303 270 |  | 
| 304 271 | 
             
            #if GTK_CHECK_VERSION(2,4,0)
         | 
| 305 272 | 
             
            static VALUE
         | 
| 306 | 
            -
            gdkdisplay_supports_cursor_color(self)
         | 
| 307 | 
            -
                VALUE self;
         | 
| 273 | 
            +
            gdkdisplay_supports_cursor_color(VALUE self)
         | 
| 308 274 | 
             
            {
         | 
| 309 275 | 
             
                return CBOOL2RVAL(gdk_display_supports_cursor_color(_SELF(self)));
         | 
| 310 276 | 
             
            }
         | 
| 311 277 |  | 
| 312 278 | 
             
            static VALUE
         | 
| 313 | 
            -
            gdkdisplay_supports_cursor_alpha(self)
         | 
| 314 | 
            -
                VALUE self;
         | 
| 279 | 
            +
            gdkdisplay_supports_cursor_alpha(VALUE self)
         | 
| 315 280 | 
             
            {
         | 
| 316 281 | 
             
                return CBOOL2RVAL(gdk_display_supports_cursor_alpha(_SELF(self)));
         | 
| 317 282 | 
             
            }
         | 
| 318 283 |  | 
| 319 284 | 
             
            static VALUE
         | 
| 320 | 
            -
            gdkdisplay_get_default_cursor_size(self)
         | 
| 321 | 
            -
                VALUE self;
         | 
| 285 | 
            +
            gdkdisplay_get_default_cursor_size(VALUE self)
         | 
| 322 286 | 
             
            {
         | 
| 323 287 | 
             
                return UINT2NUM(gdk_display_get_default_cursor_size(_SELF(self)));
         | 
| 324 288 | 
             
            }
         | 
| 325 289 |  | 
| 326 290 | 
             
            static VALUE
         | 
| 327 | 
            -
            gdkdisplay_get_maximal_cursor_size(self)
         | 
| 328 | 
            -
                VALUE self;
         | 
| 291 | 
            +
            gdkdisplay_get_maximal_cursor_size(VALUE self)
         | 
| 329 292 | 
             
            {
         | 
| 330 293 | 
             
                guint width, height;
         | 
| 331 294 | 
             
                gdk_display_get_maximal_cursor_size(_SELF(self), &width, &height);
         | 
| @@ -333,8 +296,7 @@ gdkdisplay_get_maximal_cursor_size(self) | |
| 333 296 | 
             
            }
         | 
| 334 297 |  | 
| 335 298 | 
             
            static VALUE
         | 
| 336 | 
            -
            gdkdisplay_get_default_group(self)
         | 
| 337 | 
            -
                VALUE self;
         | 
| 299 | 
            +
            gdkdisplay_get_default_group(VALUE self)
         | 
| 338 300 | 
             
            {
         | 
| 339 301 | 
             
                return GOBJ2RVAL(gdk_display_get_default_group(_SELF(self)));
         | 
| 340 302 | 
             
            }
         | 
| @@ -342,30 +304,26 @@ gdkdisplay_get_default_group(self) | |
| 342 304 |  | 
| 343 305 | 
             
            #if GTK_CHECK_VERSION(2,6,0)
         | 
| 344 306 | 
             
            static VALUE
         | 
| 345 | 
            -
            gdkdisplay_supports_selection_notification(self)
         | 
| 346 | 
            -
                VALUE self;
         | 
| 307 | 
            +
            gdkdisplay_supports_selection_notification(VALUE self)
         | 
| 347 308 | 
             
            {
         | 
| 348 309 | 
             
                return CBOOL2RVAL(gdk_display_supports_selection_notification(_SELF(self)));
         | 
| 349 310 | 
             
            }
         | 
| 350 311 |  | 
| 351 312 | 
             
            static VALUE
         | 
| 352 | 
            -
            gdkdisplay_request_selection_notification(self, selection)
         | 
| 353 | 
            -
                VALUE self, selection;
         | 
| 313 | 
            +
            gdkdisplay_request_selection_notification(VALUE self, VALUE selection)
         | 
| 354 314 | 
             
            {
         | 
| 355 315 | 
             
                return CBOOL2RVAL(gdk_display_request_selection_notification(_SELF(self), 
         | 
| 356 316 | 
             
                                                                             RVAL2ATOM(selection)));
         | 
| 357 317 | 
             
            }
         | 
| 358 318 |  | 
| 359 319 | 
             
            static VALUE
         | 
| 360 | 
            -
            gdkdisplay_supports_clipboard_persistence(self)
         | 
| 361 | 
            -
                VALUE self;
         | 
| 320 | 
            +
            gdkdisplay_supports_clipboard_persistence(VALUE self)
         | 
| 362 321 | 
             
            {
         | 
| 363 322 | 
             
                return CBOOL2RVAL(gdk_display_supports_clipboard_persistence(_SELF(self)));
         | 
| 364 323 | 
             
            }
         | 
| 365 324 |  | 
| 366 325 | 
             
            static VALUE
         | 
| 367 | 
            -
            gdkdisplay_store_clipboard(self, clipboard_window, time_, targets)
         | 
| 368 | 
            -
                VALUE self, clipboard_window, time_, targets;
         | 
| 326 | 
            +
            gdkdisplay_store_clipboard(VALUE self, VALUE clipboard_window, VALUE time_, VALUE targets)
         | 
| 369 327 | 
             
            {
         | 
| 370 328 | 
             
                gint i;
         | 
| 371 329 | 
             
                gint n_targets = RARRAY_LEN(targets);
         | 
| @@ -382,16 +340,14 @@ gdkdisplay_store_clipboard(self, clipboard_window, time_, targets) | |
| 382 340 | 
             
            #endif
         | 
| 383 341 |  | 
| 384 342 | 
             
            static VALUE
         | 
| 385 | 
            -
            gdkdisplay_get_core_pointer(self)
         | 
| 386 | 
            -
                VALUE self;
         | 
| 343 | 
            +
            gdkdisplay_get_core_pointer(VALUE self)
         | 
| 387 344 | 
             
            {
         | 
| 388 345 | 
             
                return GOBJ2RVAL(gdk_display_get_core_pointer(_SELF(self)));
         | 
| 389 346 | 
             
            }
         | 
| 390 347 |  | 
| 391 348 | 
             
            #if GTK_CHECK_VERSION(2,8,0)
         | 
| 392 349 | 
             
            static VALUE
         | 
| 393 | 
            -
            gdkdisplay_warp_pointer(self, screen, x, y)
         | 
| 394 | 
            -
                VALUE self, screen, x, y;
         | 
| 350 | 
            +
            gdkdisplay_warp_pointer(VALUE self, VALUE screen, VALUE x, VALUE y)
         | 
| 395 351 | 
             
            {
         | 
| 396 352 | 
             
                gdk_display_warp_pointer(_SELF(self), RVAL2GOBJ(screen), NUM2INT(x), NUM2INT(y));
         | 
| 397 353 | 
             
                return self;
         | 
| @@ -400,23 +356,20 @@ gdkdisplay_warp_pointer(self, screen, x, y) | |
| 400 356 |  | 
| 401 357 | 
             
            #ifdef GDK_WINDOWING_X11
         | 
| 402 358 | 
             
            static VALUE
         | 
| 403 | 
            -
            gdkdisplay_grab(self)
         | 
| 404 | 
            -
                VALUE self;
         | 
| 359 | 
            +
            gdkdisplay_grab(VALUE self)
         | 
| 405 360 | 
             
            {
         | 
| 406 361 | 
             
                gdk_x11_display_grab(_SELF(self));
         | 
| 407 362 | 
             
                return self;
         | 
| 408 363 | 
             
            }
         | 
| 409 364 | 
             
            static VALUE
         | 
| 410 | 
            -
            gdkdisplay_ungrab(self)
         | 
| 411 | 
            -
                VALUE self;
         | 
| 365 | 
            +
            gdkdisplay_ungrab(VALUE self)
         | 
| 412 366 | 
             
            {
         | 
| 413 367 | 
             
                gdk_x11_display_ungrab(_SELF(self));
         | 
| 414 368 | 
             
                return self;
         | 
| 415 369 | 
             
            }
         | 
| 416 370 | 
             
            #if GTK_CHECK_VERSION(2,4,0)
         | 
| 417 371 | 
             
            static VALUE
         | 
| 418 | 
            -
            gdkdisplay_register_standard_event_type(self, event_base, n_events)
         | 
| 419 | 
            -
                VALUE self, event_base, n_events;
         | 
| 372 | 
            +
            gdkdisplay_register_standard_event_type(VALUE self, VALUE event_base, VALUE n_events)
         | 
| 420 373 | 
             
            {
         | 
| 421 374 | 
             
                gdk_x11_register_standard_event_type(_SELF(self),
         | 
| 422 375 | 
             
                                                     NUM2INT(event_base), NUM2INT(n_events));
         | 
| @@ -425,15 +378,13 @@ gdkdisplay_register_standard_event_type(self, event_base, n_events) | |
| 425 378 | 
             
            #endif
         | 
| 426 379 | 
             
            #if GTK_CHECK_VERSION(2,8,0)
         | 
| 427 380 | 
             
            static VALUE
         | 
| 428 | 
            -
            gdkdisplay_get_user_time(self)
         | 
| 429 | 
            -
                VALUE self;
         | 
| 381 | 
            +
            gdkdisplay_get_user_time(VALUE self)
         | 
| 430 382 | 
             
            {
         | 
| 431 383 | 
             
                return UINT2NUM(gdk_x11_display_get_user_time(_SELF(self)));
         | 
| 432 384 | 
             
            }
         | 
| 433 385 |  | 
| 434 386 | 
             
            static VALUE
         | 
| 435 | 
            -
            gdkdisplay_set_cursor_theme(self, theme, size)
         | 
| 436 | 
            -
                VALUE self, theme, size;
         | 
| 387 | 
            +
            gdkdisplay_set_cursor_theme(VALUE self, VALUE theme, VALUE size)
         | 
| 437 388 | 
             
            {
         | 
| 438 389 | 
             
                gdk_x11_display_set_cursor_theme(_SELF(self), RVAL2CSTR(theme), NUM2INT(size));
         | 
| 439 390 | 
             
                return self;
         | 
| @@ -510,15 +461,13 @@ gdkdisplay_get_startup_notification_id(VALUE self) | |
| 510 461 |  | 
| 511 462 | 
             
            #if GTK_CHECK_VERSION(2,10,0)
         | 
| 512 463 | 
             
            static VALUE
         | 
| 513 | 
            -
            gdkdisplay_supports_shapes(self)
         | 
| 514 | 
            -
                VALUE self;
         | 
| 464 | 
            +
            gdkdisplay_supports_shapes(VALUE self)
         | 
| 515 465 | 
             
            {
         | 
| 516 466 | 
             
                return CBOOL2RVAL(gdk_display_supports_shapes(_SELF(self)));
         | 
| 517 467 | 
             
            }
         | 
| 518 468 |  | 
| 519 469 | 
             
            static VALUE
         | 
| 520 | 
            -
            gdkdisplay_supports_input_shapes(self)
         | 
| 521 | 
            -
                VALUE self;
         | 
| 470 | 
            +
            gdkdisplay_supports_input_shapes(VALUE self)
         | 
| 522 471 | 
             
            {
         | 
| 523 472 | 
             
                return CBOOL2RVAL(gdk_display_supports_input_shapes(_SELF(self)));
         | 
| 524 473 | 
             
            }
         |