[gtkmm] Regenerate gtk_signals.defs.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtkmm] Regenerate gtk_signals.defs.
- Date: Tue, 7 Dec 2010 12:21:18 +0000 (UTC)
commit 42fee8dc69bca5261f95dfbdb32e382190cce225
Author: Murray Cumming <murrayc murrayc com>
Date: Tue Dec 7 09:51:27 2010 +0100
Regenerate gtk_signals.defs.
* gtk/src/gtk_signals.defs: Regenerated with extra_defs_gen.
* gtk/src/gtk_signals.defs.patch: Updated this patch so it is easier to
make the manual changes next time.
* gtk/src/widget.hg: Removed the style_changed signal because the underlying
style-set signal uses GtkStyle, which is deprecated.
ChangeLog | 10 +
demos/gtk-demo/example_colorsel.cc | 12 +-
demos/pixbuf-demo.cc | 1 -
gdk/src/rgba.ccg | 80 +++--
gdk/src/rgba.hg | 24 ++-
gtk/src/gtk_signals.defs | 580 ++++++++++-----------------------
gtk/src/gtk_signals.defs.patch | 650 ++++++++++--------------------------
gtk/src/widget.hg | 13 +-
8 files changed, 430 insertions(+), 940 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 632898c..475a8b1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
2010-12-07 Murray Cumming <murrayc murrayc com>
+ Regenerate gtk_signals.defs.
+
+ * gtk/src/gtk_signals.defs: Regenerated with extra_defs_gen.
+ * gtk/src/gtk_signals.defs.patch: Updated this patch so it is easier to
+ make the manual changes next time.
+ * gtk/src/widget.hg: Removed the style_changed signal because the underlying
+ style-set signal uses GtkStyle, which is deprecated.
+
+2010-12-07 Murray Cumming <murrayc murrayc com>
+
Remove includes of style.h and rc.h.
* gtk/src/iconinfo.hg:
diff --git a/demos/gtk-demo/example_colorsel.cc b/demos/gtk-demo/example_colorsel.cc
index db67a69..7fd9a7e 100644
--- a/demos/gtk-demo/example_colorsel.cc
+++ b/demos/gtk-demo/example_colorsel.cc
@@ -22,7 +22,7 @@ protected:
Gtk::Frame m_Frame;
Gtk::DrawingArea m_DrawingArea;
Gtk::Button m_Button;
- Gdk::Color m_Color;
+ Gdk::RGBA m_Color;
Gtk::Alignment m_Alignment;
};
@@ -58,7 +58,7 @@ Example_ColorSel::Example_ColorSel()
m_DrawingArea.modify_bg_pixmap(Gtk::STATE_NORMAL, "<none>");
// set the color
- m_Color.set_rgb(0, 0, 65535);
+ m_Color.set_rgba(0, 0, 1, 1);
m_DrawingArea.modify_bg(Gtk::STATE_NORMAL, m_Color);
m_Frame.add(m_DrawingArea);
@@ -83,17 +83,17 @@ void Example_ColorSel::on_button_clicked()
Gtk::ColorSelection *const pColorSel = dialog.get_color_selection();
- pColorSel->set_previous_color(m_Color);
- pColorSel->set_current_color(m_Color);
+ pColorSel->set_previous_rgba(m_Color);
+ pColorSel->set_current_rgba(m_Color);
pColorSel->set_has_palette();
const int response = dialog.run();
if(response == Gtk::RESPONSE_OK)
{
- m_Color = pColorSel->get_current_color();
+ m_Color = pColorSel->get_current_rgba();
- m_DrawingArea.modify_bg(Gtk::STATE_NORMAL, m_Color);
+ m_DrawingArea.override_background_color(Gtk::STATE_NORMAL, m_Color);
}
}
diff --git a/demos/pixbuf-demo.cc b/demos/pixbuf-demo.cc
index 34275c1..8b3e431 100644
--- a/demos/pixbuf-demo.cc
+++ b/demos/pixbuf-demo.cc
@@ -34,7 +34,6 @@
#include <gdkmm/rectangle.h>
#include <gtkmm/drawingarea.h>
#include <gtkmm/main.h>
-#include <gtkmm/style.h>
#include <gtkmm/window.h>
#include <gdkmm/general.h>
diff --git a/gdk/src/rgba.ccg b/gdk/src/rgba.ccg
index 6d72b13..2db4430 100644
--- a/gdk/src/rgba.ccg
+++ b/gdk/src/rgba.ccg
@@ -22,6 +22,8 @@
namespace Gdk
{
+ const double MULTIPLIER = 65535.0;
+
RGBA::RGBA()
{
GdkRGBA tmp = { 0, 0, 0, 0, };
@@ -36,28 +38,32 @@ RGBA::RGBA(const Glib::ustring& value)
set(value);
}
-void RGBA::set_grey(gushort value)
+void RGBA::set_grey(gushort value, gushort alpha)
{
- gobject_->red = gobject_->green = gobject_->blue = value;
+ gobject_->red = gobject_->green = gobject_->blue = (value / MULTIPLIER);
+ gobject_->alpha = alpha / MULTIPLIER;
}
-void RGBA::set_grey_p(double g)
+void RGBA::set_grey_p(double g, double alpha)
{
- gobject_->red = gobject_->green = gobject_->blue = (gushort)(g * 65535.0);
+ gobject_->red = gobject_->green = gobject_->blue = g;
+ gobject_->alpha = alpha;
}
-void RGBA::set_rgb(gushort red_, gushort green_, gushort blue_)
+void RGBA::set_rgba(gushort red_, gushort green_, gushort blue_, gushort alpha_)
{
- gobject_->red = red_;
- gobject_->green = green_;
- gobject_->blue = blue_;
+ gobject_->red = red_ / MULTIPLIER;
+ gobject_->green = green_/ MULTIPLIER;
+ gobject_->blue = blue_ / MULTIPLIER;
+ gobject_->alpha = alpha_/ MULTIPLIER;
}
-void RGBA::set_rgb_p(double red_, double green_, double blue_)
+void RGBA::set_rgba_p(double red_, double green_, double blue_, double alpha_)
{
- gobject_->red = (gushort)(red_ * 65535.0);
- gobject_->green = (gushort)(green_ * 65535.0);
- gobject_->blue = (gushort)(blue_ * 65535.0);
+ gobject_->red = red_;
+ gobject_->green = green_;
+ gobject_->blue = blue_;
+ gobject_->alpha = alpha_;
}
void RGBA::set_hsv(double h, double s, double v)
@@ -73,22 +79,22 @@ void RGBA::set_hsv(double h, double s, double v)
switch(i)
{
case 0:
- set_rgb_p(v, t, p);
+ set_rgba_p(v, t, p);
break;
case 1:
- set_rgb_p(q, v, p);
+ set_rgba_p(q, v, p);
break;
case 2:
- set_rgb_p(p, v, t);
+ set_rgba_p(p, v, t);
break;
case 3:
- set_rgb_p(p, q, v);
+ set_rgba_p(p, q, v);
break;
case 4:
- set_rgb_p(t, p, v);
+ set_rgba_p(t, p, v);
break;
default:
- set_rgb_p(v, p, q);
+ set_rgba_p(v, p, q);
}
}
@@ -132,54 +138,72 @@ void RGBA::set_hsl(double h, double s, double l)
else if (tb < 2.0/3.0)
b = t1+(t2-t1)*(2.0/3.0 - tb) * 6.0;
- set_rgb_p(r, g, b);
+ set_rgba_p(r, g, b);
}
}
gushort RGBA::get_red() const
{
- return gobject_->red;
+ return gobject_->red * MULTIPLIER;
}
gushort RGBA::get_green() const
{
- return gobject_->green;
+ return gobject_->green * MULTIPLIER;
}
+
gushort RGBA::get_blue() const
{
- return gobject_->blue;
+ return gobject_->blue * MULTIPLIER;
+}
+
+gushort RGBA::get_alpha() const
+{
+ return gobject_->alpha * MULTIPLIER;
}
void RGBA::set_red(gushort value)
{
- gobject_->red = value;
+ gobject_->red = value / MULTIPLIER;
}
void RGBA::set_green(gushort value)
{
- gobject_->green = value;
+ gobject_->green = value / MULTIPLIER;
}
void RGBA::set_blue(gushort value)
{
- gobject_->blue = value;
+ gobject_->blue = value / MULTIPLIER;
+}
+
+void RGBA::set_alpha(gushort value)
+{
+ gobject_->alpha = value / MULTIPLIER;
}
+
double RGBA::get_red_p() const
{
- return gobject_->red / 65535.0;
+ return gobject_->red;
}
double RGBA::get_green_p() const
{
- return gobject_->green / 65535.0;
+ return gobject_->green;
}
double RGBA::get_blue_p() const
{
- return gobject_->blue / 65535.0;
+ return gobject_->blue;
}
+double RGBA::get_alpha_p() const
+{
+ return gobject_->alpha;
+}
+
+
} //namespace Gdk
diff --git a/gdk/src/rgba.hg b/gdk/src/rgba.hg
index 4b15422..3f5f585 100644
--- a/gdk/src/rgba.hg
+++ b/gdk/src/rgba.hg
@@ -47,23 +47,24 @@ public:
/** Set a grey color, by using the same value for all color components.
* @param value The value to be used for the red, green, and blue components.
*/
- void set_grey(gushort value);
- void set_grey_p(double g);
+ void set_grey(gushort value, gushort alpha = 1);
+ void set_grey_p(double g, double alpha = 65535.0);
/** Set the color, by specifying red, green, and blue color component values.
* @param red_ The red component of the color.
* @param green_ The green component of the color.
* @param blue_ The blue component of the color.
*/
- void set_rgb(gushort red_, gushort green_, gushort blue_);
+ void set_rgba(gushort red_, gushort green_, gushort blue_, gushort alpha_ = 65535.0);
/** Set the color, by specifying red, green, and blue color component values, as percentages.
* @param red_ The red component of the color, as a percentage.
* @param green_ The green component of the color, as a percentage.
* @param blue_ The blue component of the color, as a percentage.
*/
- void set_rgb_p(double red_, double green_, double blue_);
+ void set_rgba_p(double red_, double green_, double blue_, double alpha_ = 1);
+ //TODO: Add alpha parameter?
void set_hsv(double h, double s, double v);
void set_hsl(double h, double s, double l);
@@ -83,6 +84,11 @@ public:
* @result The blue component of the color.
*/
gushort get_blue() const;
+
+ /** Get the alpha component of the color.
+ * @result The alpha component of the color.
+ */
+ gushort get_alpha() const;
/** Set the red component of the color.
* @param value The red component of the color.
@@ -98,6 +104,11 @@ public:
* @param value The blue component of the color.
*/
void set_blue(gushort value);
+
+ /** Set the alpha component of the color.
+ * @param value The alpha component of the color.
+ */
+ void set_alpha(gushort value);
/** Get the red component of the color, as a percentage.
@@ -114,6 +125,11 @@ public:
* @result The blue component of the color, as a percentage.
*/
double get_blue_p() const;
+
+ /** Get the alpha component of the color, as a percentage.
+ * @result The alpha component of the color, as a percentage.
+ */
+ double get_alpha_p() const;
_WRAP_METHOD(Glib::ustring to_string() const, gdk_rgba_to_string)
diff --git a/gtk/src/gtk_signals.defs b/gtk/src/gtk_signals.defs
index c7e06b7..c9433b5 100644
--- a/gtk/src/gtk_signals.defs
+++ b/gtk/src/gtk_signals.defs
@@ -37,8 +37,6 @@
(construct-only #f)
)
-;; From GdkDrawable
-
;; From GdkPixbuf
(define-property colorspace
@@ -14161,7 +14159,7 @@
(parameters
'("const-gchar*" "p0")
'("gint" "p1")
- '("gint*" "p2")
+ '("gpointer" "p2")
)
)
@@ -22449,7 +22447,16 @@
(define-property hadjustment
(of-object "GtkIconView")
(prop-type "GParamObject")
- (docs "Horizontal adjustment that is shared between scrollable widget and it's controller")
+ (docs "Horizontal adjustment that is shared between the scrollable widget and its controller")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property hscroll-policy
+ (of-object "GtkIconView")
+ (prop-type "GParamEnum")
+ (docs "How the size of the content should be determined")
(readable #t)
(writable #t)
(construct-only #f)
@@ -22458,7 +22465,16 @@
(define-property vadjustment
(of-object "GtkIconView")
(prop-type "GParamObject")
- (docs "Vertical adjustment that is shared between scrollable widget and it's controller")
+ (docs "Vertical adjustment that is shared between the scrollable widget and its controller")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property vscroll-policy
+ (of-object "GtkIconView")
+ (prop-type "GParamEnum")
+ (docs "How the size of the content should be determined")
(readable #t)
(writable #t)
(construct-only #f)
@@ -23502,7 +23518,16 @@
(define-property hadjustment
(of-object "GtkLayout")
(prop-type "GParamObject")
- (docs "Horizontal adjustment that is shared between scrollable widget and it's controller")
+ (docs "Horizontal adjustment that is shared between the scrollable widget and its controller")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property hscroll-policy
+ (of-object "GtkLayout")
+ (prop-type "GParamEnum")
+ (docs "How the size of the content should be determined")
(readable #t)
(writable #t)
(construct-only #f)
@@ -23511,7 +23536,16 @@
(define-property vadjustment
(of-object "GtkLayout")
(prop-type "GParamObject")
- (docs "Vertical adjustment that is shared between scrollable widget and it's controller")
+ (docs "Vertical adjustment that is shared between the scrollable widget and its controller")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property vscroll-policy
+ (of-object "GtkLayout")
+ (prop-type "GParamEnum")
+ (docs "How the size of the content should be determined")
(readable #t)
(writable #t)
(construct-only #f)
@@ -25168,7 +25202,7 @@
(return-type "void")
(when "first")
(parameters
- '("gint*" "p0")
+ '("int*" "p0")
)
)
@@ -35261,377 +35295,6 @@
(construct-only #f)
)
-;; From GtkRuler
-
-(define-property orientation
- (of-object "GtkRuler")
- (prop-type "GParamEnum")
- (docs "The orientation of the orientable")
- (readable #t)
- (writable #t)
- (construct-only #f)
-)
-
-(define-property name
- (of-object "GtkRuler")
- (prop-type "GParamString")
- (docs "The name of the widget")
- (readable #t)
- (writable #t)
- (construct-only #f)
-)
-
-(define-property parent
- (of-object "GtkRuler")
- (prop-type "GParamObject")
- (docs "The parent widget of this widget. Must be a Container widget")
- (readable #t)
- (writable #t)
- (construct-only #f)
-)
-
-(define-property width-request
- (of-object "GtkRuler")
- (prop-type "GParamInt")
- (docs "Override for width request of the widget, or -1 if natural request should be used")
- (readable #t)
- (writable #t)
- (construct-only #f)
-)
-
-(define-property height-request
- (of-object "GtkRuler")
- (prop-type "GParamInt")
- (docs "Override for height request of the widget, or -1 if natural request should be used")
- (readable #t)
- (writable #t)
- (construct-only #f)
-)
-
-(define-property visible
- (of-object "GtkRuler")
- (prop-type "GParamBoolean")
- (docs "Whether the widget is visible")
- (readable #t)
- (writable #t)
- (construct-only #f)
-)
-
-(define-property sensitive
- (of-object "GtkRuler")
- (prop-type "GParamBoolean")
- (docs "Whether the widget responds to input")
- (readable #t)
- (writable #t)
- (construct-only #f)
-)
-
-(define-property app-paintable
- (of-object "GtkRuler")
- (prop-type "GParamBoolean")
- (docs "Whether the application will paint directly on the widget")
- (readable #t)
- (writable #t)
- (construct-only #f)
-)
-
-(define-property can-focus
- (of-object "GtkRuler")
- (prop-type "GParamBoolean")
- (docs "Whether the widget can accept the input focus")
- (readable #t)
- (writable #t)
- (construct-only #f)
-)
-
-(define-property has-focus
- (of-object "GtkRuler")
- (prop-type "GParamBoolean")
- (docs "Whether the widget has the input focus")
- (readable #t)
- (writable #t)
- (construct-only #f)
-)
-
-(define-property is-focus
- (of-object "GtkRuler")
- (prop-type "GParamBoolean")
- (docs "Whether the widget is the focus widget within the toplevel")
- (readable #t)
- (writable #t)
- (construct-only #f)
-)
-
-(define-property can-default
- (of-object "GtkRuler")
- (prop-type "GParamBoolean")
- (docs "Whether the widget can be the default widget")
- (readable #t)
- (writable #t)
- (construct-only #f)
-)
-
-(define-property has-default
- (of-object "GtkRuler")
- (prop-type "GParamBoolean")
- (docs "Whether the widget is the default widget")
- (readable #t)
- (writable #t)
- (construct-only #f)
-)
-
-(define-property receives-default
- (of-object "GtkRuler")
- (prop-type "GParamBoolean")
- (docs "If TRUE, the widget will receive the default action when it is focused")
- (readable #t)
- (writable #t)
- (construct-only #f)
-)
-
-(define-property composite-child
- (of-object "GtkRuler")
- (prop-type "GParamBoolean")
- (docs "Whether the widget is part of a composite widget")
- (readable #t)
- (writable #f)
- (construct-only #f)
-)
-
-(define-property style
- (of-object "GtkRuler")
- (prop-type "GParamObject")
- (docs "The style of the widget, which contains information about how it will look (colors etc)")
- (readable #t)
- (writable #t)
- (construct-only #f)
-)
-
-(define-property events
- (of-object "GtkRuler")
- (prop-type "GParamFlags")
- (docs "The event mask that decides what kind of GdkEvents this widget gets")
- (readable #t)
- (writable #t)
- (construct-only #f)
-)
-
-(define-property extension-events
- (of-object "GtkRuler")
- (prop-type "GParamEnum")
- (docs "The mask that decides what kind of extension events this widget gets")
- (readable #t)
- (writable #t)
- (construct-only #f)
-)
-
-(define-property no-show-all
- (of-object "GtkRuler")
- (prop-type "GParamBoolean")
- (docs "Whether gtk_widget_show_all() should not affect this widget")
- (readable #t)
- (writable #t)
- (construct-only #f)
-)
-
-(define-property has-tooltip
- (of-object "GtkRuler")
- (prop-type "GParamBoolean")
- (docs "Whether this widget has a tooltip")
- (readable #t)
- (writable #t)
- (construct-only #f)
-)
-
-(define-property tooltip-markup
- (of-object "GtkRuler")
- (prop-type "GParamString")
- (docs "The contents of the tooltip for this widget")
- (readable #t)
- (writable #t)
- (construct-only #f)
-)
-
-(define-property tooltip-text
- (of-object "GtkRuler")
- (prop-type "GParamString")
- (docs "The contents of the tooltip for this widget")
- (readable #t)
- (writable #t)
- (construct-only #f)
-)
-
-(define-property window
- (of-object "GtkRuler")
- (prop-type "GParamObject")
- (docs "The widget's window if it is realized")
- (readable #t)
- (writable #f)
- (construct-only #f)
-)
-
-(define-property double-buffered
- (of-object "GtkRuler")
- (prop-type "GParamBoolean")
- (docs "Whether the widget is double buffered")
- (readable #t)
- (writable #t)
- (construct-only #f)
-)
-
-(define-property halign
- (of-object "GtkRuler")
- (prop-type "GParamEnum")
- (docs "How to position in extra horizontal space")
- (readable #t)
- (writable #t)
- (construct-only #f)
-)
-
-(define-property valign
- (of-object "GtkRuler")
- (prop-type "GParamEnum")
- (docs "How to position in extra vertical space")
- (readable #t)
- (writable #t)
- (construct-only #f)
-)
-
-(define-property margin-left
- (of-object "GtkRuler")
- (prop-type "GParamInt")
- (docs "Pixels of extra space on the left side")
- (readable #t)
- (writable #t)
- (construct-only #f)
-)
-
-(define-property margin-right
- (of-object "GtkRuler")
- (prop-type "GParamInt")
- (docs "Pixels of extra space on the right side")
- (readable #t)
- (writable #t)
- (construct-only #f)
-)
-
-(define-property margin-top
- (of-object "GtkRuler")
- (prop-type "GParamInt")
- (docs "Pixels of extra space on the top side")
- (readable #t)
- (writable #t)
- (construct-only #f)
-)
-
-(define-property margin-bottom
- (of-object "GtkRuler")
- (prop-type "GParamInt")
- (docs "Pixels of extra space on the bottom side")
- (readable #t)
- (writable #t)
- (construct-only #f)
-)
-
-(define-property margin
- (of-object "GtkRuler")
- (prop-type "GParamInt")
- (docs "Pixels of extra space on all four sides")
- (readable #t)
- (writable #t)
- (construct-only #f)
-)
-
-(define-property hexpand
- (of-object "GtkRuler")
- (prop-type "GParamBoolean")
- (docs "Whether widget wants more horizontal space")
- (readable #t)
- (writable #t)
- (construct-only #f)
-)
-
-(define-property vexpand
- (of-object "GtkRuler")
- (prop-type "GParamBoolean")
- (docs "Whether widget wants more vertical space")
- (readable #t)
- (writable #t)
- (construct-only #f)
-)
-
-(define-property hexpand-set
- (of-object "GtkRuler")
- (prop-type "GParamBoolean")
- (docs "Whether to use the hexpand property")
- (readable #t)
- (writable #t)
- (construct-only #f)
-)
-
-(define-property vexpand-set
- (of-object "GtkRuler")
- (prop-type "GParamBoolean")
- (docs "Whether to use the vexpand property")
- (readable #t)
- (writable #t)
- (construct-only #f)
-)
-
-(define-property expand
- (of-object "GtkRuler")
- (prop-type "GParamBoolean")
- (docs "Whether widget wants to expand in both directions")
- (readable #t)
- (writable #t)
- (construct-only #f)
-)
-
-(define-property lower
- (of-object "GtkRuler")
- (prop-type "GParamDouble")
- (docs "Lower limit of ruler")
- (readable #t)
- (writable #t)
- (construct-only #f)
-)
-
-(define-property upper
- (of-object "GtkRuler")
- (prop-type "GParamDouble")
- (docs "Upper limit of ruler")
- (readable #t)
- (writable #t)
- (construct-only #f)
-)
-
-(define-property position
- (of-object "GtkRuler")
- (prop-type "GParamDouble")
- (docs "Position of mark on the ruler")
- (readable #t)
- (writable #t)
- (construct-only #f)
-)
-
-(define-property max-size
- (of-object "GtkRuler")
- (prop-type "GParamDouble")
- (docs "Maximum size of the ruler")
- (readable #t)
- (writable #t)
- (construct-only #f)
-)
-
-(define-property metric
- (of-object "GtkRuler")
- (prop-type "GParamEnum")
- (docs "The metric used for the ruler")
- (readable #t)
- (writable #t)
- (construct-only #f)
-)
-
;; From GtkScale
(define-signal format-value
@@ -36068,19 +35731,19 @@
;; From GtkScaleButton
-(define-signal value-changed
+(define-signal popup
(of-object "GtkScaleButton")
(return-type "void")
(when "last")
- (parameters
- '("gdouble" "p0")
- )
)
-(define-signal popup
+(define-signal value-changed
(of-object "GtkScaleButton")
(return-type "void")
(when "last")
+ (parameters
+ '("gdouble" "p0")
+ )
)
(define-signal popdown
@@ -36580,7 +36243,16 @@
(define-property hadjustment
(of-object "GtkScrollable")
(prop-type "GParamObject")
- (docs "Horizontal adjustment that is shared between scrollable widget and it's controller")
+ (docs "Horizontal adjustment that is shared between the scrollable widget and its controller")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property hscroll-policy
+ (of-object "GtkScrollable")
+ (prop-type "GParamEnum")
+ (docs "How the size of the content should be determined")
(readable #t)
(writable #t)
(construct-only #f)
@@ -36589,7 +36261,16 @@
(define-property vadjustment
(of-object "GtkScrollable")
(prop-type "GParamObject")
- (docs "Vertical adjustment that is shared between scrollable widget and it's controller")
+ (docs "Vertical adjustment that is shared between the scrollable widget and its controller")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property vscroll-policy
+ (of-object "GtkScrollable")
+ (prop-type "GParamEnum")
+ (docs "How the size of the content should be determined")
(readable #t)
(writable #t)
(construct-only #f)
@@ -38283,7 +37964,7 @@
(define-property gtk-icon-sizes
(of-object "GtkSettings")
(prop-type "GParamString")
- (docs "List of icon sizes (gtk-menu=16,16:gtk-button=20,20...")
+ (docs "List of icon sizes: gtk-menu=16,16:gtk-button=20,20...")
(readable #t)
(writable #t)
(construct-only #f)
@@ -40895,6 +40576,15 @@
(when "first")
)
+(define-property context
+ (of-object "GtkStyle")
+ (prop-type "GParamObject")
+ (docs "GtkStyleContext to get style from")
+ (readable #t)
+ (writable #t)
+ (construct-only #t)
+)
+
;; From GtkSwitch
(define-property related-action
@@ -43733,7 +43423,16 @@
(define-property hadjustment
(of-object "GtkToolPalette")
(prop-type "GParamObject")
- (docs "Horizontal adjustment that is shared between scrollable widget and it's controller")
+ (docs "Horizontal adjustment that is shared between the scrollable widget and its controller")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property hscroll-policy
+ (of-object "GtkToolPalette")
+ (prop-type "GParamEnum")
+ (docs "How the size of the content should be determined")
(readable #t)
(writable #t)
(construct-only #f)
@@ -43751,7 +43450,16 @@
(define-property vadjustment
(of-object "GtkToolPalette")
(prop-type "GParamObject")
- (docs "Vertical adjustment that is shared between scrollable widget and it's controller")
+ (docs "Vertical adjustment that is shared between the scrollable widget and its controller")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property vscroll-policy
+ (of-object "GtkToolPalette")
+ (prop-type "GParamEnum")
+ (docs "How the size of the content should be determined")
(readable #t)
(writable #t)
(construct-only #f)
@@ -45472,7 +45180,16 @@
(define-property hadjustment
(of-object "GtkTextView")
(prop-type "GParamObject")
- (docs "Horizontal adjustment that is shared between scrollable widget and it's controller")
+ (docs "Horizontal adjustment that is shared between the scrollable widget and its controller")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property hscroll-policy
+ (of-object "GtkTextView")
+ (prop-type "GParamEnum")
+ (docs "How the size of the content should be determined")
(readable #t)
(writable #t)
(construct-only #f)
@@ -45481,7 +45198,16 @@
(define-property vadjustment
(of-object "GtkTextView")
(prop-type "GParamObject")
- (docs "Vertical adjustment that is shared between scrollable widget and it's controller")
+ (docs "Vertical adjustment that is shared between the scrollable widget and its controller")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property vscroll-policy
+ (of-object "GtkTextView")
+ (prop-type "GParamEnum")
+ (docs "How the size of the content should be determined")
(readable #t)
(writable #t)
(construct-only #f)
@@ -46830,7 +46556,16 @@
(define-property hadjustment
(of-object "GtkTreeView")
(prop-type "GParamObject")
- (docs "Horizontal adjustment that is shared between scrollable widget and it's controller")
+ (docs "Horizontal adjustment that is shared between the scrollable widget and its controller")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property hscroll-policy
+ (of-object "GtkTreeView")
+ (prop-type "GParamEnum")
+ (docs "How the size of the content should be determined")
(readable #t)
(writable #t)
(construct-only #f)
@@ -46839,7 +46574,16 @@
(define-property vadjustment
(of-object "GtkTreeView")
(prop-type "GParamObject")
- (docs "Vertical adjustment that is shared between scrollable widget and it's controller")
+ (docs "Vertical adjustment that is shared between the scrollable widget and its controller")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property vscroll-policy
+ (of-object "GtkTreeView")
+ (prop-type "GParamEnum")
+ (docs "How the size of the content should be determined")
(readable #t)
(writable #t)
(construct-only #f)
@@ -47579,7 +47323,16 @@
(define-property hadjustment
(of-object "GtkViewport")
(prop-type "GParamObject")
- (docs "Horizontal adjustment that is shared between scrollable widget and it's controller")
+ (docs "Horizontal adjustment that is shared between the scrollable widget and its controller")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property hscroll-policy
+ (of-object "GtkViewport")
+ (prop-type "GParamEnum")
+ (docs "How the size of the content should be determined")
(readable #t)
(writable #t)
(construct-only #f)
@@ -47588,7 +47341,16 @@
(define-property vadjustment
(of-object "GtkViewport")
(prop-type "GParamObject")
- (docs "Vertical adjustment that is shared between scrollable widget and it's controller")
+ (docs "Vertical adjustment that is shared between the scrollable widget and its controller")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
+(define-property vscroll-policy
+ (of-object "GtkViewport")
+ (prop-type "GParamEnum")
+ (docs "How the size of the content should be determined")
(readable #t)
(writable #t)
(construct-only #f)
@@ -48483,30 +48245,30 @@
(when "last")
)
-(define-signal size-request
+(define-signal size-allocate
(of-object "GtkWidget")
(return-type "void")
(when "first")
(parameters
- '("GtkRequisition*" "p0")
+ '("GdkRectangle*" "p0")
)
)
-(define-signal size-allocate
+(define-signal state-changed
(of-object "GtkWidget")
(return-type "void")
(when "first")
(parameters
- '("GdkRectangle*" "p0")
+ '("GtkStateType" "p0")
)
)
-(define-signal state-changed
+(define-signal state-flags-changed
(of-object "GtkWidget")
(return-type "void")
(when "first")
(parameters
- '("GtkStateType" "p0")
+ '("GtkStateFlags" "p0")
)
)
@@ -48537,6 +48299,12 @@
)
)
+(define-signal style-updated
+ (of-object "GtkWidget")
+ (return-type "void")
+ (when "first")
+)
+
(define-signal direction-changed
(of-object "GtkWidget")
(return-type "void")
@@ -48958,15 +48726,6 @@
)
)
-(define-signal no-expose-event
- (of-object "GtkWidget")
- (return-type "gboolean")
- (when "last")
- (parameters
- '("GdkEventAny*" "p0")
- )
-)
-
(define-signal window-state-event
(of-object "GtkWidget")
(return-type "gboolean")
@@ -50009,3 +49768,4 @@
(writable #t)
(construct-only #f)
)
+
diff --git a/gtk/src/gtk_signals.defs.patch b/gtk/src/gtk_signals.defs.patch
index a052535..859af6f 100644
--- a/gtk/src/gtk_signals.defs.patch
+++ b/gtk/src/gtk_signals.defs.patch
@@ -1,144 +1,8 @@
---- gtk_signals.defs 2009-01-16 14:07:55.000000000 +0100
-+++ gtk_signals.defs.new 2009-01-16 13:47:41.000000000 +0100
-@@ -5173,21 +5173,21 @@
- (prop-type "GParamBoolean")
- (docs "If the toggle button should be pressed in or not")
- (readable #t)
- (writable #t)
- (construct-only #f)
- )
-
- (define-property inconsistent
- (of-object "GtkCheckButton")
- (prop-type "GParamBoolean")
-- (docs "If the toggle button is in an "in between" state")
-+ (docs "If the toggle button is in an in between state")
- (readable #t)
- (writable #t)
- (construct-only #f)
- )
-
- (define-property draw-indicator
- (of-object "GtkCheckButton")
- (prop-type "GParamBoolean")
- (docs "If the toggle part of the button is displayed")
- (readable #t)
-@@ -5487,21 +5487,21 @@
- (prop-type "GParamBoolean")
- (docs "Whether the menu item is checked")
- (readable #t)
- (writable #t)
- (construct-only #f)
- )
-
- (define-property inconsistent
- (of-object "GtkCheckMenuItem")
- (prop-type "GParamBoolean")
-- (docs "Whether to display an "inconsistent" state")
-+ (docs "Whether to display an inconsistent state")
- (readable #t)
- (writable #t)
- (construct-only #f)
- )
-
- (define-property draw-as-radio
- (of-object "GtkCheckMenuItem")
- (prop-type "GParamBoolean")
- (docs "Whether the menu item looks like a radio menu item")
- (readable #t)
-@@ -6383,21 +6383,21 @@
- (prop-type "GParamBoxed")
- (docs "Foreground color as a GdkColor")
- (readable #t)
- (writable #t)
- (construct-only #f)
- )
-
- (define-property font
- (of-object "GtkCellRendererAccel")
- (prop-type "GParamString")
-- (docs "Font description as a string, e.g. "Sans Italic 12"")
-+ (docs "Font description as a string, e.g. Sans Italic 12")
- (readable #t)
- (writable #t)
- (construct-only #f)
- )
-
- (define-property font-desc
- (of-object "GtkCellRendererAccel")
- (prop-type "GParamBoxed")
- (docs "Font description as a PangoFontDescription struct")
- (readable #t)
-@@ -6971,21 +6971,21 @@
- (prop-type "GParamBoxed")
- (docs "Foreground color as a GdkColor")
- (readable #t)
- (writable #t)
- (construct-only #f)
- )
-
- (define-property font
- (of-object "GtkCellRendererCombo")
- (prop-type "GParamString")
-- (docs "Font description as a string, e.g. "Sans Italic 12"")
-+ (docs "Font description as a string, e.g. Sans Italic 12")
- (readable #t)
- (writable #t)
- (construct-only #f)
- )
-
- (define-property font-desc
- (of-object "GtkCellRendererCombo")
- (prop-type "GParamBoxed")
- (docs "Font description as a PangoFontDescription struct")
- (readable #t)
-@@ -7750,21 +7750,21 @@
- (prop-type "GParamBoxed")
- (docs "Foreground color as a GdkColor")
- (readable #t)
- (writable #t)
- (construct-only #f)
- )
-
- (define-property font
- (of-object "GtkCellRendererText")
- (prop-type "GParamString")
-- (docs "Font description as a string, e.g. "Sans Italic 12"")
-+ (docs "Font description as a string, e.g. Sans Italic 12")
- (readable #t)
- (writable #t)
- (construct-only #f)
- )
-
- (define-property font-desc
- (of-object "GtkCellRendererText")
- (prop-type "GParamBoxed")
- (docs "Font description as a PangoFontDescription struct")
- (readable #t)
-@@ -8919,21 +8919,21 @@
- (prop-type "GParamBoxed")
- (docs "Foreground color as a GdkColor")
- (readable #t)
- (writable #t)
- (construct-only #f)
- )
-
- (define-property font
- (of-object "GtkCellRendererSpin")
- (prop-type "GParamString")
-- (docs "Font description as a string, e.g. "Sans Italic 12"")
-+ (docs "Font description as a string, e.g. Sans Italic 12")
- (readable #t)
- (writable #t)
- (construct-only #f)
- )
-
- (define-property font-desc
- (of-object "GtkCellRendererSpin")
- (prop-type "GParamBoxed")
- (docs "Font description as a PangoFontDescription struct")
- (readable #t)
-@@ -9247,21 +9247,21 @@
+diff --git a/gtk/src/gtk_signals.defs b/gtk/src/gtk_signals.defs
+index adacfa9..c9433b5 100644
+--- a/gtk/src/gtk_signals.defs
++++ b/gtk/src/gtk_signals.defs
+@@ -10358,21 +10358,21 @@
(construct-only #f)
)
@@ -161,53 +25,41 @@
(return-type "void")
(when "first")
)
-@@ -12843,21 +12843,21 @@
- (prop-type "GParamInt")
- (docs "Maximum number of characters for this entry. Zero if no maximum")
- (readable #t)
- (writable #t)
- (construct-only #f)
+@@ -14258,31 +14258,31 @@
+ '("const-gchar*" "p0")
+ )
)
- (define-property visibility
+ (define-signal icon-press
(of-object "GtkEntry")
- (prop-type "GParamBoolean")
-- (docs "FALSE displays the "invisible char" instead of the actual text (password mode)")
-+ (docs "FALSE displays the invisible char instead of the actual text (password mode)")
- (readable #t)
- (writable #t)
- (construct-only #f)
+ (return-type "void")
+ (when "last")
+ (parameters
+ '("GtkEntryIconPosition" "p0")
+- '("GdkEvent*" "p1")
++ '("const-GdkEventButton*" "p1")
+ )
)
- (define-property has-frame
+ (define-signal icon-release
(of-object "GtkEntry")
- (prop-type "GParamBoolean")
- (docs "FALSE removes outside bevel from entry")
- (readable #t)
-@@ -12870,21 +12870,21 @@
- (prop-type "GParamBoxed")
- (docs "Border between text and frame. Overrides the inner-border style property")
- (readable #t)
- (writable #t)
- (construct-only #f)
+ (return-type "void")
+ (when "last")
+ (parameters
+ '("GtkEntryIconPosition" "p0")
+- '("GdkEvent*" "p1")
++ '("const-GdkEventButton*" "p1")
+ )
)
- (define-property invisible-char
+ (define-property editing-canceled
(of-object "GtkEntry")
- (prop-type "GParamUnichar")
-- (docs "The character to use when masking entry contents (in "password mode")")
-+ (docs "The character to use when masking entry contents (in password mode)")
+ (prop-type "GParamBoolean")
+ (docs "Indicates that editing has been canceled")
(readable #t)
(writable #t)
(construct-only #f)
- )
-
- (define-property activates-default
- (of-object "GtkEntry")
- (prop-type "GParamBoolean")
- (docs "Whether to activate the default widget (such as the default button in a dialog) when Enter is pressed")
- (readable #t)
-@@ -21696,21 +21696,21 @@
+@@ -25195,21 +25195,21 @@
(of-object "GtkMenuItem")
(return-type "void")
(when "first")
@@ -230,63 +82,7 @@
(parameters
'("gint" "p0")
)
-@@ -23440,21 +23440,21 @@
- (parameters
- '("GtkDirectionType" "p0")
- )
- )
-
- (define-signal switch-page
- (of-object "GtkNotebook")
- (return-type "void")
- (when "last")
- (parameters
-- '("gpointer" "p0")
-+ '("GtkNotebookPage*" "p0")
- '("guint" "p1")
- )
- )
-
- (define-signal focus-tab
- (of-object "GtkNotebook")
- (return-type "gboolean")
- (when "last")
- (parameters
- '("GtkNotebookTab" "p0")
-@@ -24525,30 +24525,30 @@
- (prop-type "GParamBoolean")
- (docs "TRUE if the Position property should be used")
- (readable #t)
- (writable #t)
- (construct-only #f)
- )
-
- (define-property min-position
- (of-object "GtkPaned")
- (prop-type "GParamInt")
-- (docs "Smallest possible value for the "position" property")
-+ (docs "Smallest possible value for the position property")
- (readable #t)
- (writable #f)
- (construct-only #f)
- )
-
- (define-property max-position
- (of-object "GtkPaned")
- (prop-type "GParamInt")
-- (docs "Largest possible value for the "position" property")
-+ (docs "Largest possible value for the position property")
- (readable #t)
- (writable #f)
- (construct-only #f)
- )
-
- ;; From GtkPixmap
-
- (define-property user-data
- (of-object "GtkPixmap")
- (prop-type "GParamPointer")
-@@ -25745,21 +25745,21 @@
+@@ -29960,21 +29960,21 @@
)
(define-signal status-changed
@@ -302,63 +98,17 @@
(when "last")
)
- (define-signal custom-widget-apply
+ (define-signal update-custom-widget
(of-object "GtkPrintOperation")
(return-type "void")
(when "last")
(parameters
'("GtkWidget*" "p0")
- )
-@@ -27861,21 +27861,21 @@
- (prop-type "GParamBoolean")
- (docs "If the toggle button should be pressed in or not")
- (readable #t)
- (writable #t)
- (construct-only #f)
- )
-
- (define-property inconsistent
- (of-object "GtkRadioButton")
- (prop-type "GParamBoolean")
-- (docs "If the toggle button is in an "in between" state")
-+ (docs "If the toggle button is in an in between state")
+ '("GtkPageSetup*" "p1")
+@@ -35292,21 +35292,21 @@
+ (docs "The size of the recently used resources list")
(readable #t)
- (writable #t)
- (construct-only #f)
- )
-
- (define-property draw-indicator
- (of-object "GtkRadioButton")
- (prop-type "GParamBoolean")
- (docs "If the toggle part of the button is displayed")
- (readable #t)
-@@ -28710,21 +28710,21 @@
- (prop-type "GParamBoolean")
- (docs "Whether the menu item is checked")
- (readable #t)
- (writable #t)
- (construct-only #f)
- )
-
- (define-property inconsistent
- (of-object "GtkRadioMenuItem")
- (prop-type "GParamBoolean")
-- (docs "Whether to display an "inconsistent" state")
-+ (docs "Whether to display an inconsistent state")
- (readable #t)
- (writable #t)
- (construct-only #f)
- )
-
- (define-property draw-as-radio
- (of-object "GtkRadioMenuItem")
- (prop-type "GParamBoolean")
- (docs "Whether the menu item looks like a radio menu item")
- (readable #t)
-@@ -30471,21 +30471,21 @@
- (docs "The metric used for the ruler")
- (readable #t)
- (writable #t)
+ (writable #f)
(construct-only #f)
)
@@ -378,40 +128,7 @@
(of-object "GtkScale")
(prop-type "GParamEnum")
(docs "The orientation of the orientable")
-@@ -31760,30 +31760,30 @@
- (prop-type "GParamEnum")
- (docs "When the vertical scrollbar is displayed")
- (readable #t)
- (writable #t)
- (construct-only #f)
- )
-
- (define-property window-placement
- (of-object "GtkScrolledWindow")
- (prop-type "GParamEnum")
-- (docs "Where the contents are located with respect to the scrollbars. This property only takes effect if "window-placement-set" is TRUE.")
-+ (docs "Where the contents are located with respect to the scrollbars. This property only takes effect if window-placement-set is TRUE.")
- (readable #t)
- (writable #t)
- (construct-only #f)
- )
-
- (define-property window-placement-set
- (of-object "GtkScrolledWindow")
- (prop-type "GParamBoolean")
-- (docs "Whether "window-placement" should be used to determine the location of the contents with respect to the scrollbars.")
-+ (docs "Whether window-placement should be used to determine the location of the contents with respect to the scrollbars.")
- (readable #t)
- (writable #t)
- (construct-only #f)
- )
-
- (define-property shadow-type
- (of-object "GtkScrolledWindow")
- (prop-type "GParamEnum")
- (docs "Style of bevel around the contents")
- (readable #t)
-@@ -32396,21 +32396,21 @@
+@@ -37957,21 +37957,21 @@
(prop-type "GParamString")
(docs "Name of default font to use")
(readable #t)
@@ -434,7 +151,7 @@
(prop-type "GParamString")
(docs "List of currently active GTK modules")
(readable #t)
-@@ -33079,21 +33079,21 @@
+@@ -39173,21 +39173,21 @@
(of-object "GtkSpinButton")
(return-type "void")
(when "last")
@@ -457,53 +174,50 @@
)
(define-signal wrapped
-@@ -33350,21 +33350,21 @@
- (prop-type "GParamInt")
- (docs "Maximum number of characters for this entry. Zero if no maximum")
- (readable #t)
- (writable #t)
- (construct-only #f)
+@@ -40370,39 +40370,39 @@
+ (parameters
+ '("gint" "p0")
+ )
)
- (define-property visibility
- (of-object "GtkSpinButton")
- (prop-type "GParamBoolean")
-- (docs "FALSE displays the "invisible char" instead of the actual text (password mode)")
-+ (docs "FALSE displays the invisible char instead of the actual text (password mode)")
- (readable #t)
- (writable #t)
- (construct-only #f)
+ (define-signal button-press-event
+ (of-object "GtkStatusIcon")
+ (return-type "gboolean")
+ (when "last")
+ (parameters
+- '("GdkEvent*" "p0")
++ '("GdkEventButton*" "p0")
+ )
)
- (define-property has-frame
- (of-object "GtkSpinButton")
- (prop-type "GParamBoolean")
- (docs "FALSE removes outside bevel from entry")
- (readable #t)
-@@ -33377,21 +33377,21 @@
- (prop-type "GParamBoxed")
- (docs "Border between text and frame. Overrides the inner-border style property")
- (readable #t)
- (writable #t)
- (construct-only #f)
+ (define-signal button-release-event
+ (of-object "GtkStatusIcon")
+ (return-type "gboolean")
+ (when "last")
+ (parameters
+- '("GdkEvent*" "p0")
++ '("GdkEventButton*" "p0")
+ )
)
- (define-property invisible-char
- (of-object "GtkSpinButton")
- (prop-type "GParamUnichar")
-- (docs "The character to use when masking entry contents (in "password mode")")
-+ (docs "The character to use when masking entry contents (in password mode)")
- (readable #t)
- (writable #t)
- (construct-only #f)
+ (define-signal scroll-event
+ (of-object "GtkStatusIcon")
+ (return-type "gboolean")
+ (when "last")
+ (parameters
+- '("GdkEvent*" "p0")
++ '("GdkEventScroll*" "p0")
+ )
)
- (define-property activates-default
- (of-object "GtkSpinButton")
- (prop-type "GParamBoolean")
- (docs "Whether to activate the default widget (such as the default button in a dialog) when Enter is pressed")
- (readable #t)
-@@ -34055,21 +34055,21 @@
+ (define-signal query-tooltip
+ (of-object "GtkStatusIcon")
+ (return-type "gboolean")
+ (when "last")
+ (parameters
+ '("gint" "p0")
+ '("gint" "p1")
+@@ -40410,21 +40410,21 @@
'("GtkTooltip*" "p3")
)
)
@@ -526,76 +240,112 @@
)
(define-property pixbuf
-@@ -35589,21 +35589,21 @@
- (prop-type "GParamBoolean")
- (docs "If the toggle button should be pressed in or not")
- (readable #t)
- (writable #t)
- (construct-only #f)
+@@ -44336,53 +44336,53 @@
+ (of-object "GtkTextBuffer")
+ (return-type "void")
+ (when "last")
)
- (define-property inconsistent
- (of-object "GtkToggleButton")
- (prop-type "GParamBoolean")
-- (docs "If the toggle button is in an "in between" state")
-+ (docs "If the toggle button is in an in between state")
- (readable #t)
- (writable #t)
- (construct-only #f)
+ (define-signal mark-set
+ (of-object "GtkTextBuffer")
+ (return-type "void")
+ (when "last")
+ (parameters
+- '("GtkTextIter*" "p0")
++ '("const-GtkTextIter*" "p0")
+ '("GtkTextMark*" "p1")
+ )
)
- (define-property draw-indicator
- (of-object "GtkToggleButton")
- (prop-type "GParamBoolean")
- (docs "If the toggle part of the button is displayed")
- (readable #t)
-@@ -36811,21 +36811,21 @@
- (prop-type "GParamObject")
- (docs "Bitmap to use as a mask when drawing the text foreground")
- (readable #t)
- (writable #t)
- (construct-only #f)
+ (define-signal mark-deleted
+ (of-object "GtkTextBuffer")
+ (return-type "void")
+ (when "last")
+ (parameters
+ '("GtkTextMark*" "p0")
+ )
+ )
+
+ (define-signal apply-tag
+ (of-object "GtkTextBuffer")
+ (return-type "void")
+ (when "last")
+ (parameters
+ '("GtkTextTag*" "p0")
+- '("GtkTextIter*" "p1")
+- '("GtkTextIter*" "p2")
++ '("const-GtkTextIter*" "p1")
++ '("const-GtkTextIter*" "p2")
+ )
+ )
+
+ (define-signal remove-tag
+ (of-object "GtkTextBuffer")
+ (return-type "void")
+ (when "last")
+ (parameters
+ '("GtkTextTag*" "p0")
+- '("GtkTextIter*" "p1")
+- '("GtkTextIter*" "p2")
++ '("const-GtkTextIter*" "p1")
++ '("const-GtkTextIter*" "p2")
+ )
)
- (define-property font
+ (define-signal begin-user-action
+ (of-object "GtkTextBuffer")
+ (return-type "void")
+ (when "last")
+ )
+
+ (define-signal end-user-action
+@@ -44476,21 +44476,21 @@
+
+ ;; From GtkTextTag
+
+ (define-signal event
(of-object "GtkTextTag")
- (prop-type "GParamString")
-- (docs "Font description as a string, e.g. "Sans Italic 12"")
-+ (docs "Font description as a string, e.g. Sans Italic 12")
- (readable #t)
- (writable #t)
- (construct-only #f)
+ (return-type "gboolean")
+ (when "last")
+ (parameters
+ '("GObject*" "p0")
+ '("GdkEvent*" "p1")
+- '("GtkTextIter*" "p2")
++ '("const-GtkTextIter*" "p2")
+ )
)
- (define-property font-desc
+ (define-property name
(of-object "GtkTextTag")
- (prop-type "GParamBoxed")
- (docs "Font description as a PangoFontDescription struct")
+ (prop-type "GParamString")
+ (docs "Name used to refer to the text tag. NULL for anonymous tags")
(readable #t)
-@@ -39853,21 +39853,21 @@
- (parameters
- '("GtkRequisition*" "p0")
+ (writable #t)
+ (construct-only #t)
+@@ -46369,21 +46369,21 @@
)
)
- (define-signal size-allocate
- (of-object "GtkWidget")
+ (define-signal rows-reordered
+ (of-object "GtkTreeModel")
(return-type "void")
(when "first")
(parameters
-- '("GdkRectangle*" "p0")
-+ '("GtkAllocation*" "p0")
+ '("GtkTreePath*" "p0")
+ '("GtkTreeIter*" "p1")
+- '("gpointer" "p2")
++ '("gint*" "p2")
)
)
- (define-signal state-changed
- (of-object "GtkWidget")
+ ;; From GtkTreeSelection
+
+ (define-signal changed
+ (of-object "GtkTreeSelection")
(return-type "void")
(when "first")
- (parameters
- '("GtkStateType" "p0")
- )
-@@ -39916,21 +39916,21 @@
+ )
+@@ -48321,30 +48321,30 @@
(parameters
'("gboolean" "p0")
)
@@ -611,6 +361,16 @@
)
)
+ (define-signal draw
+ (of-object "GtkWidget")
+ (return-type "gboolean")
+ (when "last")
+ (parameters
+- '("CairoContext*" "p0")
++ '("cairo_t*" "p0")
+ )
+ )
+
(define-signal mnemonic-activate
(of-object "GtkWidget")
(return-type "gboolean")
@@ -618,7 +378,7 @@
(parameters
'("gboolean" "p0")
)
-@@ -39976,201 +39976,201 @@
+@@ -48399,183 +48399,183 @@
(parameters
'("GdkEvent*" "p0")
)
@@ -664,15 +424,6 @@
)
)
- (define-signal keynav-failed
- (of-object "GtkWidget")
- (return-type "gboolean")
- (when "last")
- (parameters
- '("GtkDirectionType" "p0")
- )
- )
-
(define-signal delete-event
(of-object "GtkWidget")
(return-type "gboolean")
@@ -693,16 +444,6 @@
)
)
- (define-signal expose-event
- (of-object "GtkWidget")
- (return-type "gboolean")
- (when "last")
- (parameters
-- '("GdkEvent*" "p0")
-+ '("GdkEventExpose*" "p0")
- )
- )
-
(define-signal key-press-event
(of-object "GtkWidget")
(return-type "gboolean")
@@ -840,7 +581,7 @@
(parameters
'("GtkSelectionData*" "p0")
'("guint" "p1")
-@@ -40186,30 +40186,30 @@
+@@ -48591,30 +48591,30 @@
'("guint" "p1")
'("guint" "p2")
)
@@ -873,7 +614,7 @@
(parameters
'("GdkDragContext*" "p0")
'("guint" "p1")
-@@ -40301,66 +40301,75 @@
+@@ -48706,57 +48706,57 @@
'("guint" "p4")
'("guint" "p5")
)
@@ -899,16 +640,6 @@
)
)
- (define-signal no-expose-event
- (of-object "GtkWidget")
- (return-type "gboolean")
- (when "last")
- (parameters
-- '("GdkEvent*" "p0")
-+ '("GdkEventAny*" "p0")
- )
- )
-
(define-signal window-state-event
(of-object "GtkWidget")
(return-type "gboolean")
@@ -924,19 +655,11 @@
(return-type "gboolean")
(when "last")
(parameters
- '("GdkEvent*" "p0")
+- '("GdkEvent*" "p0")
++ '("GdkEventExpose*" "p0")
)
)
-+(define-signal damage-event
-+ (of-object "GtkWidget")
-+ (return-type "gboolean")
-+ (when "last")
-+ (parameters
-+ '("GdkEventExpose*" "p0")
-+ )
-+)
-+
(define-signal grab-broken-event
(of-object "GtkWidget")
(return-type "gboolean")
@@ -954,34 +677,3 @@
(parameters
'("gint" "p0")
'("gint" "p1")
-@@ -40608,20 +40617,30 @@
-
- (define-property window
- (of-object "GtkWidget")
- (prop-type "GParamObject")
- (docs "The widget's window if it is realized")
- (readable #t)
- (writable #f)
- (construct-only #f)
- )
-
-+(define-property window
-+ (of-object "GtkWidget")
-+ (prop-type "GParamObject")
-+ (docs "The widget's window if it is realized")
-+ (readable #t)
-+ (writable #f)
-+ (construct-only #f)
-+)
-+
-+
- ;; From GtkWindow
-
- (define-signal set-focus
- (of-object "GtkWindow")
- (return-type "void")
- (when "last")
- (parameters
- '("GtkWidget*" "p0")
- )
- )
diff --git a/gtk/src/widget.hg b/gtk/src/widget.hg
index 3f5af72..2aa1efb 100644
--- a/gtk/src/widget.hg
+++ b/gtk/src/widget.hg
@@ -545,18 +545,7 @@ public:
_WRAP_SIGNAL(void hierarchy_changed(Widget* previous_toplevel), "hierarchy_changed")
-//Note: We use Gtk::Style instead of Style here, to fix a build problem on MacOS X
-//that we don't fully understand. See bug #493057.
-#m4 _CONVERSION(`GtkStyle*',`const Glib::RefPtr<Gtk::Style>&',`Glib::wrap($3, true)')
-#m4 _CONVERSION(`const Glib::RefPtr<Gtk::Style>&',`GtkStyle*',__CONVERT_REFPTR_TO_P)
- /** The style-set signal is emitted when a new style has been set
- * on a widget. Note that style-modifying functions like
- * modify_base() also cause this signal to be emitted.
- *
- * @param previous_style the previous style, or an empty RefPtr if the widget
- * just got its initial style.
- */
- _WRAP_SIGNAL(void style_changed(const Glib::RefPtr<Gtk::Style>& previous_style), "style_set")
+ _IGNORE_SIGNAL("style_set") //uses deprecated GtkStyle.
_WRAP_SIGNAL(void direction_changed(TextDirection direction), "direction_changed")
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
