[gtkmm] Fix build with deprecated C API disabled
- From: Daniel Elstner <daniel src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gtkmm] Fix build with deprecated C API disabled
- Date: Fri, 18 Sep 2009 13:11:35 +0000 (UTC)
commit 827ec335117db29290c253803d2aa5507f17d5f1
Author: Daniel Elstner <danielk openismus com>
Date: Fri Sep 18 12:43:09 2009 +0200
Fix build with deprecated C API disabled
* tools/extra_defs_gen/generate_defs_gtk.cc: Undefine the macros
{ATK,GDK,GTK}_DISABLE_DEPRECATED before including the GTK+ headers,
so that all extra defs can be generated even in fatal warnings mode.
* {atk,gdk,gtk}/src/*.hg: For all source files which contain calls
to deprecated functions of the C API, inject an #undef preprocessor
statement before any header includes to make the deprecated API
visible when building gtkmm itself. Mark C++ methods as deprecated
where appropriate, but generally only when a replacement is already
available. Also correct a lot of whitespace errors along the way.
ChangeLog | 14 +++
atk/src/hyperlink.hg | 29 ++----
gdk/src/event.hg | 9 +-
gdk/src/pixbuf.hg | 59 ++++++-----
gdk/src/window.hg | 47 ++++-----
gtk/src/aboutdialog.hg | 29 +++---
gtk/src/action.hg | 42 ++++----
gtk/src/calendar.hg | 33 +++---
gtk/src/cellrenderer.hg | 19 ++--
gtk/src/cellview.hg | 29 +++---
gtk/src/combo.hg | 26 ++---
gtk/src/fileselection.hg | 10 +-
gtk/src/menuitem.hg | 25 ++---
gtk/src/menutoolbutton.hg | 22 ++--
gtk/src/notebook.hg | 42 +++-----
gtk/src/optionmenu.hg | 17 ++--
gtk/src/recentmanager.hg | 17 ++-
gtk/src/scalebutton.hg | 28 +++--
gtk/src/statusicon.hg | 56 +++++-----
gtk/src/toolbar.hg | 37 +++----
gtk/src/toolbutton.hg | 15 +--
gtk/src/toolitem.hg | 22 ++---
gtk/src/tooltip.hg | 1 -
gtk/src/tooltips.hg | 14 ++-
gtk/src/treeview.hg | 119 ++++++++++-----------
gtk/src/treeviewcolumn.hg | 21 ++--
gtk/src/widget.hg | 161 +++++++++++++----------------
tools/extra_defs_gen/generate_defs_gtk.cc | 75 +++++++------
28 files changed, 497 insertions(+), 521 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 0f504ad..60b9ccc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,19 @@
2009-09-18 Daniel Elstner <danielk openismus com>
+ Fix build with deprecated C API disabled
+
+ * tools/extra_defs_gen/generate_defs_gtk.cc: Undefine the macros
+ {ATK,GDK,GTK}_DISABLE_DEPRECATED before including the GTK+ headers,
+ so that all extra defs can be generated even in fatal warnings mode.
+ * {atk,gdk,gtk}/src/*.hg: For all source files which contain calls
+ to deprecated functions of the C API, inject an #undef preprocessor
+ statement before any header includes to make the deprecated API
+ visible when building gtkmm itself. Mark C++ methods as deprecated
+ where appropriate, but generally only when a replacement is already
+ available. Also correct a lot of whitespace errors along the way.
+
+2009-09-18 Daniel Elstner <danielk openismus com>
+
Insert missing Autoconf macro argument separator
* configure.ac (GTKMM_WXXFLAGS): Insert the missing argument
diff --git a/atk/src/hyperlink.hg b/atk/src/hyperlink.hg
index 695052c..79fb6f8 100644
--- a/atk/src/hyperlink.hg
+++ b/atk/src/hyperlink.hg
@@ -1,5 +1,3 @@
-/* $Id: hyperlink.hg,v 1.4 2006/04/12 11:11:24 murrayc Exp $ */
-
/* Copyright (C) 2003 The gtkmm Development Team
*
* This library is free software; you can redistribute it and/or
@@ -17,55 +15,49 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+#m4 _PUSH(SECTION_CC_PRE_INCLUDES)
+#undef ATK_DISABLE_DEPRECATED
+#m4 _POP()
+
#include <atkmm/action.h>
_DEFS(atkmm,atk)
_PINCLUDE(glibmm/private/object_p.h)
_PINCLUDE(atk/atkobject.h)
-
namespace Atk
{
class Object;
-/* An ATK object which encapsulates a link or set of links in a hypertext document.
- * It implements the AtkAction interface.
+/** Encapsulates a link or set of links in a hypertext document.
*/
-class Hyperlink
- : public Glib::Object,
- public Atk::Action
+class Hyperlink : public Glib::Object, public Atk::Action
{
_CLASS_GOBJECT(Hyperlink, AtkHyperlink, ATK_HYPERLINK, Glib::Object, GObject)
_IMPLEMENTS_INTERFACE(Action)
-protected:
-
public:
-
_WRAP_METHOD(Glib::ustring get_uri(int i) const, atk_hyperlink_get_uri)
_WRAP_METHOD(Glib::RefPtr<Atk::Object> get_object(int i), atk_hyperlink_get_object, refreturn)
_WRAP_METHOD(Glib::RefPtr<const Atk::Object> get_object(int i) const, atk_hyperlink_get_object, refreturn, constversion)
-
- _WRAP_METHOD(int get_end_index() const, atk_hyperlink_get_end_index)
+ _WRAP_METHOD(int get_end_index() const, atk_hyperlink_get_end_index)
_WRAP_METHOD(int get_start_index() const, atk_hyperlink_get_start_index)
_WRAP_METHOD(bool is_valid() const, atk_hyperlink_is_valid)
-
_WRAP_METHOD(bool is_inline() const, atk_hyperlink_is_inline)
_WRAP_METHOD(int get_n_anchors() const, atk_hyperlink_get_n_anchors)
- _WRAP_METHOD(bool is_selected_link() const, atk_hyperlink_is_selected_link)
-
+ _WRAP_METHOD(bool is_selected_link() const, atk_hyperlink_is_selected_link, deprecated)
_WRAP_SIGNAL(void link_activated(), "link_activated")
_WRAP_PROPERTY("selected-link", bool)
_WRAP_PROPERTY("number-of-anchors", int)
_WRAP_PROPERTY("end-index", int)
_WRAP_PROPERTY("start-index", int)
-
+
protected:
_WRAP_VFUNC(gchar* get_uri(int i) const, get_uri)
_WRAP_VFUNC(Glib::RefPtr<Atk::Object> get_object(int i), get_object)
@@ -74,8 +66,7 @@ protected:
_WRAP_VFUNC(bool is_valid() const, is_valid)
_WRAP_VFUNC(int get_n_anchors() const, get_n_anchors)
_WRAP_VFUNC(guint link_state() const, link_state)
- _WRAP_VFUNC(bool is_selected_link() const, is_selected_link)
+ _WRAP_VFUNC(bool is_selected_link() const, is_selected_link)
};
} // namespace Atk
-
diff --git a/gdk/src/event.hg b/gdk/src/event.hg
index 1b0bcf6..cb4f69f 100644
--- a/gdk/src/event.hg
+++ b/gdk/src/event.hg
@@ -1,5 +1,3 @@
-/* $Id: event.hg,v 1.4 2006/04/12 11:11:24 murrayc Exp $ */
-
/* Copyright (C) 1998-2002 The gtkmm Development Team
*
* This library is free software; you can redistribute it and/or
@@ -17,6 +15,10 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+#m4 _PUSH(SECTION_CC_PRE_INCLUDES)
+#undef GDK_DISABLE_DEPRECATED
+#m4 _POP()
+
_DEFS(gdkmm,gdk)
_CC_INCLUDE(gdk/gdk.h)
@@ -59,7 +61,8 @@ public:
_WRAP_METHOD(static Event get(), gdk_event_get)
_WRAP_METHOD(static Event peek(), gdk_event_peek)
- _WRAP_METHOD(static Event get_graphics_expose(const Glib::RefPtr<Window>& window), gdk_event_get_graphics_expose)
+ _WRAP_METHOD(static Event get_graphics_expose(const Glib::RefPtr<Window>& window),
+ gdk_event_get_graphics_expose, deprecated)
_WRAP_METHOD(void put(), gdk_event_put)
_WRAP_METHOD(static bool events_pending(), gdk_events_pending)
diff --git a/gdk/src/pixbuf.hg b/gdk/src/pixbuf.hg
index cc71012..2fcf2ef 100644
--- a/gdk/src/pixbuf.hg
+++ b/gdk/src/pixbuf.hg
@@ -1,5 +1,3 @@
-/* $Id: pixbuf.hg,v 1.16 2006/05/11 11:40:23 murrayc Exp $ */
-
/* Copyright (C) 1998-2002 The gtkmm Development Team
*
* This library is free software; you can redistribute it and/or
@@ -17,6 +15,9 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+#m4 _PUSH(SECTION_CC_PRE_INCLUDES)
+#undef GDK_DISABLE_DEPRECATED
+#m4 _POP()
// This is for including the config header before any code (such as
// the #ifndef GDKMM_DISABLE_DEPRECATED in deprecated classes) is generated:
_CONFIGINCLUDE(gdkmmconfig.h)
@@ -59,7 +60,7 @@ struct PixbufFormatTraits
static void release_c_type (CType /* ptr */) { /* Doesn't happen */ }
};
#endif //DOXYGEN_SHOULD_SKIP_THIS
-
+
class Pixbuf : public Glib::Object
{
_CLASS_GOBJECT(Pixbuf, GdkPixbuf, GDK_PIXBUF, Glib::Object, GObject)
@@ -76,9 +77,9 @@ protected:
* representation inside a Pixbuf. In other words, copies
* image data from a server-side drawable to a client-side RGB(A) buffer.
* This allows you to efficiently read individual pixels on the client side.
- *
+ *
* If the drawable @src has no colormap (See Gdk::Drawable::get_colormap()),
- * then a suitable colormap must be specified. Otherwise, you may use the
+ * then a suitable colormap must be specified. Otherwise, you may use the
* constructor that takes no colormap argument.
* Typically a Gdk::Window or a pixmap created by passing a Gdk:Window
* to the Gdk::Pixbuf constructor will already have a colormap associated with
@@ -106,7 +107,7 @@ protected:
* If the window you're obtaining data from is partially obscured by
* other windows, then the contents of the pixbuf areas corresponding
* to the obscured regions are undefined.
- *
+ *
* See alo Gdk::Drawable::get_image().
*
* @param src Source drawable.
@@ -200,9 +201,9 @@ public:
* representation inside a Pixbuf. In other words, copies
* image data from a server-side drawable to a client-side RGB(A) buffer.
* This allows you to efficiently read individual pixels on the client side.
- *
+ *
* If the drawable @src has no colormap (See Gdk::Drawable::get_colormap()),
- * then a suitable colormap must be specified. Otherwise, you may use the
+ * then a suitable colormap must be specified. Otherwise, you may use the
* constructor that takes no colormap argument.
* Typically a Gdk::Window or a pixmap created by passing a Gdk:Window
* to the Gdk::Pixbuf constructor will already have a colormap associated with
@@ -230,7 +231,7 @@ public:
* If the window you're obtaining data from is partially obscured by
* other windows, then the contents of the pixbuf areas corresponding
* to the obscured regions are undefined.
- *
+ *
* See alo Gdk::Drawable::get_image().
*
* @param src Source drawable.
@@ -297,14 +298,14 @@ public:
int src_x, int src_y, int width, int height),
gdk_pixbuf_new_subpixbuf)
- /** Creates a new pixbuf by loading an image from a file. The file format is detected automatically.
+ /** Creates a new pixbuf by loading an image from a file. The file format is detected automatically.
* @param filename The path to the pixbuf file.
- *
+ *
* @throw Glib::FileError
* @throw Gdk::PixbufError
*/
_WRAP_METHOD(static Glib::RefPtr<Pixbuf> create_from_file(const std::string& filename), gdk_pixbuf_new_from_file, errthrow)
-
+
/** Creates a new pixbuf by loading an image from a file. The file format is detected automatically.
* The image will be scaled to fit in the requested size.
* @param filename The path to the pixbuf file.
@@ -414,9 +415,9 @@ public:
_WRAP_METHOD(void fill(guint32 pixel), gdk_pixbuf_fill)
- /** Saves pixbuf to a file in format @a type.
+ /** Saves pixbuf to a file in format @a type.
* By default, "jpeg", "png", "ico" and "bmp" are possible file formats to save in, but more formats may be installed.
- * TThe list of all writable formats can be determined by using Gdk::Pixbuf::get_formats() with
+ * TThe list of all writable formats can be determined by using Gdk::Pixbuf::get_formats() with
* Gdk::PixbufFormat::is_writable().
*
* @param filename The path of the file to be created.
@@ -432,19 +433,19 @@ public:
#endif //GLIBMM_EXCEPTIONS_ENABLED
_IGNORE(gdk_pixbuf_save)
- /** Saves pixbuf to a file in format @a type.
+ /** Saves pixbuf to a file in format @a type.
* By default, "jpeg", "png", "ico" and "bmp" are possible file formats to save in, but more formats may be installed.
- * TThe list of all writable formats can be determined by using Gdk::Pixbuf::get_formats() with
+ * TThe list of all writable formats can be determined by using Gdk::Pixbuf::get_formats() with
* Gdk::PixbufFormat::is_writable().
*
- * The @a option_keys and @option_values, if not empty, should contain pairs of strings that modify the save parameters.
+ * The @a option_keys and @option_values, if not empty, should contain pairs of strings that modify the save parameters.
* For example, "quality", "100".
*
- * Currently only a few parameters exist. JPEG images can be saved with a "quality" parameter;
- * its value should be in the range [0,100]. Text chunks can be attached to PNG images by specifying parameters of the
- * form "tEXt::key", where key is an ASCII string of length 1-79. The values are UTF-8 encoded strings. ICO images can be
- * saved in depth 16, 24, or 32, by using the "depth" parameter. When the ICO saver is given "x_hot" and "y_hot"
- * parameters, it produces a CUR instead of an ICO.
+ * Currently only a few parameters exist. JPEG images can be saved with a "quality" parameter;
+ * its value should be in the range [0,100]. Text chunks can be attached to PNG images by specifying parameters of the
+ * form "tEXt::key", where key is an ASCII string of length 1-79. The values are UTF-8 encoded strings. ICO images can be
+ * saved in depth 16, 24, or 32, by using the "depth" parameter. When the ICO saver is given "x_hot" and "y_hot"
+ * parameters, it produces a CUR instead of an ICO.
*
* @param filename The path of the file to be created.
* @param type The file type.
@@ -465,7 +466,7 @@ public:
#endif //GLIBMM_EXCEPTIONS_ENABLED
_IGNORE(gdk_pixbuf_savev)
-
+
/* TODO:
typedef gboolean (*GdkPixbufSaveFunc) (const gchar *buf,
@@ -476,11 +477,11 @@ typedef gboolean (*GdkPixbufSaveFunc) (const gchar *buf,
gboolean gdk_pixbuf_save_to_callback (GdkPixbuf *pixbuf,
GdkPixbufSaveFunc save_func,
gpointer user_data,
- const char *type,
+ const char *type,
GError **error,
...);
-gboolean gdk_pixbuf_save_to_callbackv (GdkPixbuf *pixbuf,
+gboolean gdk_pixbuf_save_to_callbackv (GdkPixbuf *pixbuf,
GdkPixbufSaveFunc save_func,
gpointer user_data,
const char *type,
@@ -508,7 +509,7 @@ gboolean gdk_pixbuf_save_to_callbackv (GdkPixbuf *pixbuf,
void save_to_buffer(gchar*& buffer, gsize& buffer_size,
const Glib::ustring& type, std::auto_ptr<Glib::Error>& error);
#endif //GLIBMM_EXCEPTIONS_ENABLED
-
+
/* Saves the pixbuf to a new buffer in format @a type.
* Note that the buffer is not nul-terminated and may contain embedded nulls.
* @see save().
@@ -532,8 +533,8 @@ gboolean gdk_pixbuf_save_to_callbackv (GdkPixbuf *pixbuf,
const Glib::StringArrayHandle& option_values, std::auto_ptr<Glib::Error>& error);
#endif //GLIBMM_EXCEPTIONS_ENABLED
_IGNORE(gdk_pixbuf_save_to_bufferv, gdk_pixbuf_save_to_buffer)
-
-
+
+
_WRAP_METHOD(Glib::RefPtr<Gdk::Pixbuf> add_alpha(
bool substitute_color, guint8 r, guint8 g, guint8 b) const,
@@ -591,7 +592,7 @@ gboolean gdk_pixbuf_save_to_callbackv (GdkPixbuf *pixbuf,
int overall_alpha, int check_size,
guint32 color1, guint32 color2) const,
gdk_pixbuf_composite_color_simple)
-
+
_WRAP_METHOD(Glib::RefPtr<Gdk::Pixbuf> rotate_simple(PixbufRotation angle) const, gdk_pixbuf_rotate_simple)
_WRAP_METHOD(Glib::RefPtr<Gdk::Pixbuf> flip(bool horizontal = true) const, gdk_pixbuf_flip)
diff --git a/gdk/src/window.hg b/gdk/src/window.hg
index 1b1321f..cb86d08 100644
--- a/gdk/src/window.hg
+++ b/gdk/src/window.hg
@@ -1,5 +1,3 @@
-/* $Id: window.hg,v 1.23 2006/04/12 11:11:24 murrayc Exp $ */
-
/* Copyright(C) 1998-2002 The gtkmm Development Team
*
* This library is free software; you can redistribute it and/or
@@ -17,6 +15,11 @@
* Software Foundation Inc. 675 Mass Ave Cambridge MA 02139 USA.
*/
+#m4 _PUSH(SECTION_CC_PRE_INCLUDES)
+#undef GDK_DISABLE_DEPRECATED
+#m4 _POP()
+_CONFIGINCLUDE(gdkmmconfig.h)
+
#include <gdkmm/drawable.h>
#include <gdkmm/bitmap.h>
//#include <gdkmm/cursor.h>
@@ -34,7 +37,6 @@ typedef struct _GdkDrawable GdkWindow;
} // extern "C"
#endif /* DOXYGEN_SHOULD_SKIP_THIS */
-
namespace Gdk
{
@@ -50,7 +52,6 @@ _WRAP_ENUM(WindowEdge, GdkWindowEdge)
_WRAP_ENUM(Gravity, GdkGravity)
_WRAP_ENUM(GrabStatus, GdkGrabStatus)
-
class Cursor;
/** A Gdk::Window is a rectangular region on the screen. It's a low-level object, used to implement high-level objects such
@@ -66,7 +67,6 @@ class Window : public Gdk::Drawable
_IGNORE(gdk_window_set_hints, gdk_window_destroy, gdk_window_new, gdk_window_get_deskrelative_origin, gdk_window_get_internal_paint_info)
_IGNORE(gdk_window_destroy_notify, gdk_window_is_destroyed)
-
protected:
Window(const Glib::RefPtr<Window>& parent, GdkWindowAttr* attributes, int attributes_mask);
@@ -90,7 +90,7 @@ public:
_WRAP_METHOD(void restack(const Glib::RefPtr<Window>& sibling, bool above), gdk_window_restack)
- /** Changes the position of this window in the Z-order (stacking order). This
+ /** Changes the position of this window in the Z-order (stacking order). This
* either raises (if @a above is true) or lowers the window.
*
* If this is a toplevel, the window manager may choose to deny the
@@ -110,7 +110,7 @@ public:
//We could wrap these with a Slot instead of a C callback, but these methods are very low-level anyway.
_WRAP_METHOD(void add_filter(GdkFilterFunc function, gpointer data), gdk_window_add_filter)
_WRAP_METHOD(void remove_filter(GdkFilterFunc function, gpointer data), gdk_window_remove_filter)
-
+
_WRAP_METHOD(void scroll(int dx, int dy), gdk_window_scroll)
_WRAP_METHOD(void move_region(const Region& region, int dx, int dy), gdk_window_move_region)
_WRAP_METHOD(bool ensure_native(), gdk_window_ensure_native)
@@ -126,8 +126,7 @@ public:
_WRAP_METHOD(void input_shape_combine_mask(const Glib::RefPtr<Bitmap>& mask, int x, int y), gdk_window_input_shape_combine_mask)
_WRAP_METHOD(void input_shape_combine_region (const Region& shape_region, int offset_x, int offset_y), gdk_window_input_shape_combine_region)
_WRAP_METHOD(void set_child_input_shapes(), gdk_window_set_child_input_shapes)
- _WRAP_METHOD(void merge_child_input_shapes(), gdk_window_merge_child_input_shapes)
-
+ _WRAP_METHOD(void merge_child_input_shapes(), gdk_window_merge_child_input_shapes)
_WRAP_METHOD(bool is_visible() const, gdk_window_is_visible)
_WRAP_METHOD(bool is_viewable() const, gdk_window_is_viewable)
@@ -139,7 +138,7 @@ public:
_WRAP_METHOD(void set_geometry_hints(const Geometry& geometry, WindowHints geom_mask), gdk_window_set_geometry_hints)
_WRAP_METHOD(static void set_sm_client_id(const Glib::ustring& sm_client_id), gdk_set_sm_client_id)
static void unset_sm_client_id();
-
+
//Note: The rectangle parameter was made const in GTK+ 2.16, but we can't change that in our C++ API. TODO: Change it when we can do an ABI break.
#m4 _CONVERSION(`Rectangle&',`const GdkRectangle*',`($3).gobj()')
_WRAP_METHOD(void begin_paint_rect(Rectangle& rectangle), gdk_window_begin_paint_rect)
@@ -165,17 +164,17 @@ public:
#m4 _CONVERSION(const Cursor&,GdkCursor*,const_cast<GdkCursor*>(($3).gobj()))
_WRAP_METHOD(void set_cursor(const Cursor& cursor), gdk_window_set_cursor)
-
+
/** Use the parent window's cursor.
* For top-level windows this means that it will use the default cursor for the ROOT window.
*/
void set_cursor();
- //TODO: GdkCursor is a ref-counted boxed type,
+ //TODO: GdkCursor is a ref-counted boxed type,
//so we could add a copy constructor and then return by value.
- //We would also need a Cursor::operator bool() to check for a null value.
+ //We would also need a Cursor::operator bool() to check for a null value.
//TODO: _WRAP_METHOD(Cursor get_cursor(), gdk_window_get_cursor)
-
+
_WRAP_METHOD(void get_user_data(gpointer* data), gdk_window_get_user_data)
_WRAP_METHOD(void get_geometry(int& x, int& y, int& width, int& height, int& depth) const, gdk_window_get_geometry)
_WRAP_METHOD(void get_position(int& x, int& y) const, gdk_window_get_position)
@@ -189,7 +188,7 @@ public:
_WRAP_METHOD(Glib::RefPtr<const Window> get_parent() const, gdk_window_get_parent, refreturn, constversion)
_WRAP_METHOD(Glib::RefPtr<Window> get_toplevel(), gdk_window_get_toplevel, refreturn)
_WRAP_METHOD(Glib::RefPtr<const Window> get_toplevel() const, gdk_window_get_toplevel, refreturn, constversion)
-
+
_WRAP_METHOD(Glib::ListHandle< Glib::RefPtr<Window> > get_children(), gdk_window_get_children)
_WRAP_METHOD(Glib::ListHandle< Glib::RefPtr<const Window> > get_children() const, gdk_window_get_children)
_IGNORE(gdk_window_peek_children) //gdk_window_peek_children() is the same as gdk_window_get_children() with different memory mangement of the list.
@@ -203,16 +202,17 @@ public:
void unset_icon();
_WRAP_METHOD(void set_icon_name(const Glib::ustring& name), gdk_window_set_icon_name)
- _WRAP_METHOD(void set_group(const Glib::RefPtr<Window>& leader), gdk_window_set_group)
+ _WRAP_METHOD(void set_group(const Glib::RefPtr<Window>& leader), gdk_window_set_group)
_WRAP_METHOD(Glib::RefPtr<Window> get_group(), gdk_window_get_group)
_WRAP_METHOD(Glib::RefPtr<const Window> get_group() const, gdk_window_get_group, constversion)
_WRAP_METHOD(void set_decorations(WMDecoration decorations), gdk_window_set_decorations)
_WRAP_METHOD(bool get_decorations(WMDecoration& decorations) const, gdk_window_get_decorations)
_WRAP_METHOD(void set_functions(WMFunction functions), gdk_window_set_functions)
-
- _WRAP_METHOD(static Glib::ListHandle< Glib::RefPtr<Window> > get_toplevels(), gdk_window_get_toplevels)
-
+
+ _WRAP_METHOD(static Glib::ListHandle< Glib::RefPtr<Window> > get_toplevels(),
+ gdk_window_get_toplevels, deprecated)
+
_WRAP_METHOD(void beep(), gdk_window_beep)
_WRAP_METHOD(void iconify(), gdk_window_iconify)
@@ -237,7 +237,7 @@ public:
_WRAP_METHOD(Region get_update_area(), gdk_window_get_update_area)
//This method should not have a const version - see the docs.
-
+
_WRAP_METHOD(void freeze_updates(), gdk_window_freeze_updates)
_WRAP_METHOD(void thaw_updates(), gdk_window_thaw_updates)
_WRAP_METHOD(static void process_all_updates(), gdk_window_process_all_updates)
@@ -245,7 +245,7 @@ public:
_WRAP_METHOD(static void set_debug_updates(bool setting = true), gdk_window_set_debug_updates)
_WRAP_METHOD(static void constrain_size(const Geometry& geometry, guint flags, int width, int height, int& new_width, int& new_height), gdk_window_constrain_size)
void get_internal_paint_info(Glib::RefPtr<Drawable>& real_drawable, int& x_offset, int& y_offset) const;
-
+
_WRAP_METHOD(void enable_synchronized_configure(), gdk_window_enable_synchronized_configure)
_WRAP_METHOD(void configure_finished(), gdk_window_configure_finished)
@@ -290,7 +290,7 @@ public:
_WRAP_METHOD(void set_opacity(double opacity), gdk_window_set_opacity)
_WRAP_METHOD(void set_accept_focus(bool accept_focus = true), gdk_window_set_accept_focus)
-
+
_WRAP_METHOD(void set_focus_on_map(bool focus_on_map), gdk_window_set_focus_on_map)
_WRAP_METHOD(static Glib::RefPtr<Window> get_default_root_window(), gdk_get_default_root_window)
@@ -309,5 +309,4 @@ GdkWindow *gdk_offscreen_window_get_embedder (GdkWindow *window);
_WRAP_METHOD(void geometry_changed(), gdk_window_geometry_changed)
};
-} /* namespace Gdk */
-
+} // namespace Gdk
diff --git a/gtk/src/aboutdialog.hg b/gtk/src/aboutdialog.hg
index d783d8a..42d0b81 100644
--- a/gtk/src/aboutdialog.hg
+++ b/gtk/src/aboutdialog.hg
@@ -1,7 +1,4 @@
-/* $Id: aboutdialog.hg,v 1.10 2006/07/18 19:49:30 murrayc Exp $ */
-
-/* aboutdialog.h
- *
+/*
* Copyright (C) 2004 The gtkmm Development Team
*
* This library is free software; you can redistribute it and/or
@@ -19,6 +16,11 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+#m4 _PUSH(SECTION_CC_PRE_INCLUDES)
+#undef GTK_DISABLE_DEPRECATED
+#m4 _POP()
+_CONFIGINCLUDE(gtkmmconfig.h)
+
#include <gtkmm/dialog.h>
//#include <glibmm/listhandle.h>
@@ -28,15 +30,15 @@ _PINCLUDE(gtkmm/private/dialog_p.h)
namespace Gtk
{
-/** The AboutDialog offers a simple way to display information about a program like its logo, name, copyright,
- * website and license. It is also possible to give credits to the authors, documenters, translators and artists
- * who have worked on the program. An about dialog is typically opened when the user selects the About option
+/** The AboutDialog offers a simple way to display information about a program like its logo, name, copyright,
+ * website and license. It is also possible to give credits to the authors, documenters, translators and artists
+ * who have worked on the program. An about dialog is typically opened when the user selects the About option
* from the Help menu. All parts of the dialog are optional.
*
- * About dialogs often contain links and email addresses. Gtk::AboutDialog supports this by offering global
- * hooks, which are called when the user clicks on a link or email address, see set_email_hook() and
- * set_url_hook(). Email addresses in the authors, documenters and artists properties are recognized by looking
- * for <user host>, URLs are recognized by looking for http://url, with the URL extending to the next space,
+ * About dialogs often contain links and email addresses. Gtk::AboutDialog supports this by offering global
+ * hooks, which are called when the user clicks on a link or email address, see set_email_hook() and
+ * set_url_hook(). Email addresses in the authors, documenters and artists properties are recognized by looking
+ * for <user host>, URLs are recognized by looking for http://url, with the URL extending to the next space,
* tab or line break.
*
* An AboutDialog looks like this:
@@ -130,9 +132,8 @@ public:
_WRAP_PROPERTY("translator_credits", Glib::StringArrayHandle)
_WRAP_PROPERTY("artists", Glib::StringArrayHandle)
_WRAP_PROPERTY("logo", Glib::RefPtr<Gdk::Pixbuf>)
- _WRAP_PROPERTY("logo_icon_name", Glib::ustring)
- _WRAP_PROPERTY("wrap_license", bool)
+ _WRAP_PROPERTY("logo_icon_name", Glib::ustring)
+ _WRAP_PROPERTY("wrap_license", bool)
};
} // namespace Gtk
-
diff --git a/gtk/src/action.hg b/gtk/src/action.hg
index 0e2366d..2b5eb78 100644
--- a/gtk/src/action.hg
+++ b/gtk/src/action.hg
@@ -1,5 +1,3 @@
-/* $Id: action.hg,v 1.19 2006/05/10 20:59:27 murrayc Exp $ */
-
/* Copyright (C) 2003 The gtkmm Development Team
*
* This library is free software; you can redistribute it and/or
@@ -17,6 +15,11 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+#m4 _PUSH(SECTION_CC_PRE_INCLUDES)
+#undef GTK_DISABLE_DEPRECATED
+#m4 _POP()
+_CONFIGINCLUDE(gtkmmconfig.h)
+
#include <gtkmm/widget.h>
#include <gtkmm/accelgroup.h>
#include <gtkmm/stockid.h>
@@ -25,7 +28,6 @@
_DEFS(gtkmm,gtk)
_PINCLUDE(glibmm/private/object_p.h)
-
namespace Gtk
{
@@ -37,12 +39,12 @@ class Image;
/** An action which can be triggered by a menu or toolbar item.
*
- * Actions represent operations that the user can perform, along with
- * some information about how it should be presented in the user interface.
- * Each action provides methods to create icons, menu items and toolbar
+ * Actions represent operations that the user can perform, along with
+ * some information about how it should be presented in the user interface.
+ * Each action provides methods to create icons, menu items and toolbar
* items representing itself.
*
- * As well as the callback that is called when the action is activated,
+ * As well as the callback that is called when the action is activated,
* the following is also associated with the action:
*
* - a name (not translated, for path lookup)
@@ -57,18 +59,18 @@ class Image;
* - visible (shown/hidden)
* - sensitive (enabled/disabled)
*
- * Apart from regular actions, there are toggle actions,
- * which can be toggled between two states and radio actions,
- * of which only one in a group can be in the "active" state.
+ * Apart from regular actions, there are toggle actions,
+ * which can be toggled between two states and radio actions,
+ * of which only one in a group can be in the "active" state.
* Other actions can be implemented as Gtk::Action subclasses.
- *
- * Each action can have one or more proxy menu item, toolbar button or other proxy widgets.
+ *
+ * Each action can have one or more proxy menu item, toolbar button or other proxy widgets.
* Proxies mirror the state of the action (text label, tooltip, icon, visible, sensitive, etc), and should change when the action's state changes. When the proxy is activated, it should activate its action.
*/
class Action : public Glib::Object
{
_CLASS_GOBJECT(Action, GtkAction, GTK_ACTION, Glib::Object, GObject)
-
+
protected:
/** Creates an empty action. */
_CTOR_DEFAULT
@@ -156,8 +158,8 @@ public:
_WRAP_METHOD(MenuItem* create_menu_item(), gtk_action_create_menu_item)
_WRAP_METHOD(ToolItem* create_tool_item(), gtk_action_create_tool_item)
_WRAP_METHOD(Menu* create_menu(), gtk_action_create_menu)
- _WRAP_METHOD(void connect_proxy(Widget& proxy), gtk_action_connect_proxy)
- _WRAP_METHOD(void disconnect_proxy(Widget& proxy), gtk_action_disconnect_proxy)
+ _WRAP_METHOD(void connect_proxy(Widget& proxy), gtk_action_connect_proxy, deprecated)
+ _WRAP_METHOD(void disconnect_proxy(Widget& proxy), gtk_action_disconnect_proxy, deprecated)
#m4 dnl // This isn't in convert_gtk.m4, and the default behaviour is wrong.
#m4 _CONVERSION(`GSList*', `Glib::SListHandle<Widget*>', `$2($3, Glib::OWNERSHIP_NONE)')
@@ -168,12 +170,12 @@ public:
_WRAP_METHOD(void connect_accelerator(), gtk_action_connect_accelerator)
_WRAP_METHOD(void disconnect_accelerator(), gtk_action_disconnect_accelerator)
-
+
_WRAP_METHOD(Glib::ustring get_accel_path() const, gtk_action_get_accel_path)
/// For instance, void on_activate();
typedef sigc::slot<void> SlotActivate;
-
+
/** The "activate" signal is emitted when the action is activated.
*/
_WRAP_SIGNAL(void activate(), "activate")
@@ -224,13 +226,12 @@ public:
_WRAP_PROPERTY("visible", bool)
_WRAP_PROPERTY("action_group", Glib::RefPtr<ActionGroup>)
-
protected:
- //For use by child actions:
+ //For use by child actions:
_WRAP_METHOD(void block_activate_from(Widget& proxy), gtk_action_block_activate_from, deprecated "Activatables are now responsible for activating the action directly so this doesnt apply anymore")
_WRAP_METHOD(void unblock_activate_from(Widget& proxy), gtk_action_unblock_activate_from, deprecated "Activatables are now responsible for activating the action directly so this doesnt apply anymore")
-protected:
+protected:
//Widget-creation routines:
_WRAP_VFUNC(Widget* create_menu_item(), "create_menu_item")
_WRAP_VFUNC(Widget* create_tool_item(), "create_tool_item")
@@ -239,4 +240,3 @@ protected:
};
} // namespace Gtk
-
diff --git a/gtk/src/calendar.hg b/gtk/src/calendar.hg
index 6f77e02..c8205d0 100644
--- a/gtk/src/calendar.hg
+++ b/gtk/src/calendar.hg
@@ -1,7 +1,4 @@
-/* $Id: calendar.hg,v 1.6 2006/02/25 12:38:11 murrayc Exp $ */
-
-/* calendar.h
- *
+/*
* Copyright (C) 1998-2002 The gtkmm Development Team
*
* This library is free software; you can redistribute it and/or
@@ -19,12 +16,16 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+#m4 _PUSH(SECTION_CC_PRE_INCLUDES)
+#undef GTK_DISABLE_DEPRECATED
+#m4 _POP()
+_CONFIGINCLUDE(gtkmmconfig.h)
+
#include <gtkmm/widget.h>
#include <glibmm/date.h>
_DEFS(gtkmm,gtk)
_PINCLUDE(gtkmm/private/widget_p.h)
-
namespace Gtk
{
@@ -57,14 +58,15 @@ class Calendar : public Widget
_CLASS_GTKOBJECT(Calendar,GtkCalendar,GTK_CALENDAR,Gtk::Widget,GtkWidget)
public:
_CTOR_DEFAULT
-
+
_WRAP_METHOD(int select_month(guint month, guint year), gtk_calendar_select_month)
_WRAP_METHOD(void select_day(guint day), gtk_calendar_select_day)
_WRAP_METHOD(int mark_day(guint day), gtk_calendar_mark_day)
_WRAP_METHOD(int unmark_day(guint day), gtk_calendar_unmark_day)
_WRAP_METHOD(void clear_marks(), gtk_calendar_clear_marks)
- _WRAP_METHOD(void display_options(CalendarDisplayOptions flags), gtk_calendar_display_options, deprecated)
+ _WRAP_METHOD(void display_options(CalendarDisplayOptions flags),
+ gtk_calendar_display_options, deprecated)
_WRAP_METHOD(void set_display_options(CalendarDisplayOptions flags), gtk_calendar_set_display_options)
_WRAP_METHOD(CalendarDisplayOptions get_display_options() const, gtk_calendar_get_display_options)
@@ -76,9 +78,9 @@ public:
* @param date Referenz to set the date
*/
void get_date(Glib::Date& date) const;
-
- /** For instance,
+ /** Detail markup handler.
+ * For instance,
* @code
* Glib::ustring on_calendar_details(guint year, guint month, guint day);
* @endcode
@@ -96,7 +98,6 @@ public:
*/
typedef sigc::slot<Glib::ustring, guint, guint, guint> SlotDetails;
-
/** Installs a function which provides Pango markup with detail information
* for each day. Examples for such details are holidays or appointments. That
* information is shown below each day when show-details is set.
@@ -113,15 +114,15 @@ public:
*/
void set_detail_func(const SlotDetails& slot);
_IGNORE(gtk_calendar_set_detail_func)
-
+
_WRAP_METHOD(void set_detail_width_chars(int chars), gtk_calendar_set_detail_width_chars)
_WRAP_METHOD(void set_detail_height_rows(int rows), gtk_calendar_set_detail_height_rows)
-
+
_WRAP_METHOD(int get_detail_width_chars() const, gtk_calendar_get_detail_width_chars)
_WRAP_METHOD(int get_detail_height_rows() const, gtk_calendar_get_detail_height_rows)
- _WRAP_METHOD(void freeze(), gtk_calendar_freeze)
- _WRAP_METHOD(void thaw(), gtk_calendar_thaw)
+ _WRAP_METHOD(void freeze(), gtk_calendar_freeze, deprecated)
+ _WRAP_METHOD(void thaw(), gtk_calendar_thaw, deprecated)
_WRAP_SIGNAL(void month_changed(), "month_changed")
_WRAP_SIGNAL(void day_selected(), "day_selected")
@@ -141,8 +142,6 @@ public:
_WRAP_PROPERTY("show-details", bool)
_WRAP_PROPERTY("detail-width-chars", int)
_WRAP_PROPERTY("detail-height-rows", int)
-
};
-} /* namespace Gtk */
-
+} // namespace Gtk
diff --git a/gtk/src/cellrenderer.hg b/gtk/src/cellrenderer.hg
index 0d2decf..8e0df05 100644
--- a/gtk/src/cellrenderer.hg
+++ b/gtk/src/cellrenderer.hg
@@ -1,5 +1,3 @@
-/* $Id: cellrenderer.hg,v 1.22 2006/05/10 20:59:27 murrayc Exp $ */
-
/* Copyright (C) 1998-2002 The gtkmm Development Team
*
* This library is free software; you can redistribute it and/or
@@ -17,6 +15,11 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+#m4 _PUSH(SECTION_CC_PRE_INCLUDES)
+#undef GTK_DISABLE_DEPRECATED
+#m4 _POP()
+_CONFIGINCLUDE(gtkmmconfig.h)
+
#include <gtkmm/object.h>
#include <gtkmm/widget.h>
#include <gtkmm/celleditable.h>
@@ -25,7 +28,6 @@ _DEFS(gtkmm,gtk)
_PH_INCLUDE(gtkmm/private/object_p.h)
_PH_INCLUDE(gtk/gtk.h)
-
namespace Gtk
{
@@ -117,12 +119,12 @@ public:
/** This signal is emitted when the user cancels the process of editing a
* cell. For example, an editable cell renderer could be written to cancel
- * editing when the user presses Escape.
+ * editing when the user presses Escape.
*
- * @see editing_canceled()
+ * @see editing_canceled()
*/
_WRAP_SIGNAL(void editing_canceled(), editing_canceled)
-
+
#m4 _CONVERSION(`const char*',`const Glib::ustring&',__GCHARP_TO_USTRING)
//We use no_default_handler for this, because we can not add a new vfunc to 2.5 without breaking ABI.
@@ -160,7 +162,7 @@ public:
_WRAP_PROPERTY("is-expander", bool)
_WRAP_PROPERTY("is-expanded", bool)
_WRAP_PROPERTY("cell-background", Glib::ustring)
- _WRAP_PROPERTY("cell-background-gdk", Gdk::Color)
+ _WRAP_PROPERTY("cell-background-gdk", Gdk::Color)
_WRAP_PROPERTY("cell-background-set", bool)
protected:
@@ -187,7 +189,7 @@ protected:
const Gdk::Rectangle* cell_area,
int* x_offset, int* y_offset,
int* width, int* height) const, get_size)
-
+
#m4begin
dnl This extra conversion does the extra reference, often needed by code for vfuncs and signal.
_CONVERSION(`GdkDrawable*',`const Glib::RefPtr<Gdk::Drawable>&', `Glib::wrap($3, true)')
@@ -219,4 +221,3 @@ _CONVERSION(`GdkDrawable*',`const Glib::RefPtr<Gdk::Drawable>&', `Glib::wrap($3,
};
} // namespace Gtk
-
diff --git a/gtk/src/cellview.hg b/gtk/src/cellview.hg
index 12da7d3..65bc4c6 100644
--- a/gtk/src/cellview.hg
+++ b/gtk/src/cellview.hg
@@ -1,7 +1,4 @@
-/* $Id: cellview.hg,v 1.6 2005/02/13 20:48:35 murrayc Exp $ */
-
-/* cellview.h
- *
+/*
* Copyright (C) 2004 The gtkmm Development Team
*
* This library is free software; you can redistribute it and/or
@@ -19,6 +16,10 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+#m4 _PUSH(SECTION_CC_PRE_INCLUDES)
+#undef GTK_DISABLE_DEPRECATED
+#m4 _POP()
+_CONFIGINCLUDE(gtkmmconfig.h)
#include <gtkmm/widget.h>
#include <gtkmm/celllayout.h>
@@ -30,12 +31,11 @@
_DEFS(gtkmm,gtk)
_PINCLUDE(gtkmm/private/widget_p.h)
-
namespace Gtk
{
/** A widget displaying a single row of a TreeModel.
- * A CellView displays a single row of a TreeModel, using cell renderers just like TreeView. CellView doesn't support some of the more
+ * A CellView displays a single row of a TreeModel, using cell renderers just like TreeView. CellView doesn't support some of the more
* complex features of GtkTreeView, like cell editing and drag and drop.
*
* @ingroup Widgets
@@ -46,11 +46,11 @@ class CellView :
{
_CLASS_GTKOBJECT(CellView, GtkCellView, GTK_CELL_VIEW, Gtk::Widget, GtkWidget)
_IMPLEMENTS_INTERFACE(CellLayout)
-
+
public:
_CTOR_DEFAULT()
-
- /** Creates a new CellView widget, adds a CellRendererText to it, and makes it show the text.
+
+ /** Creates a new CellView widget, adds a CellRendererText to it, and makes it show the text.
* Optionally, the text can be marked up with the Pango text markup language.
*
* @param text The text to display in the cell view
@@ -58,7 +58,7 @@ public:
*/
explicit CellView(const Glib::ustring& text, bool use_markup = false);
_IGNORE(gtk_cell_view_new_with_text, gtk_cell_view_new_with_markup)
-
+
/** Creates a new CellView widget, adds a CellRendererPixbuf to it, and makes it show the pixbuf.
*
* @param pixbuf The image to display in the cell view
@@ -89,8 +89,10 @@ public:
_WRAP_METHOD(void set_background_color(const Gdk::Color& color), gtk_cell_view_set_background_color)
- _WRAP_METHOD(Glib::ListHandle<CellRenderer*> get_cell_renderers(), gtk_cell_view_get_cell_renderers)
- _WRAP_METHOD(Glib::ListHandle<const CellRenderer*> get_cell_renderers() const, gtk_cell_view_get_cell_renderers)
+ _WRAP_METHOD(Glib::ListHandle<CellRenderer*> get_cell_renderers(),
+ gtk_cell_view_get_cell_renderers, deprecated)
+ _WRAP_METHOD(Glib::ListHandle<const CellRenderer*> get_cell_renderers() const,
+ gtk_cell_view_get_cell_renderers, deprecated)
_WRAP_PROPERTY("background", Glib::ustring)
_WRAP_PROPERTY("background-gdk", Gdk::Color)
@@ -99,6 +101,3 @@ public:
};
} // namespace Gtk
-
-
-
diff --git a/gtk/src/combo.hg b/gtk/src/combo.hg
index eca6a4f..b7e8daf 100644
--- a/gtk/src/combo.hg
+++ b/gtk/src/combo.hg
@@ -1,7 +1,4 @@
-/* $Id: combo.hg,v 1.7 2005/11/29 16:38:10 murrayc Exp $ */
-
-/* combo.h
- *
+/*
* Copyright (C) 1998-2002 The gtkmm Development Team
*
* This library is free software; you can redistribute it and/or
@@ -19,6 +16,9 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+#m4 _PUSH(SECTION_CC_PRE_INCLUDES)
+#undef GTK_DISABLE_DEPRECATED
+#m4 _POP()
// This is for including the config header before any code (such as
// the #ifndef GTKMM_DISABLE_DEPRECATED in deprecated classes) is generated:
_CONFIGINCLUDE(gtkmmconfig.h)
@@ -36,12 +36,11 @@ _PINCLUDE(gtkmm/private/item_p.h)
namespace Gtk
{
-
/** An item in a ComboDropDownList.
- *
+ *
* Items in a ComboDropDownList inherit Item. Two signals are added.
*
- * @deprecated Use the ComboBox widget instead.
+ * @deprecated Use the ComboBox widget instead.
*/
class ComboDropDownItem : public Gtk::Item
{
@@ -56,7 +55,6 @@ public:
_WRAP_SIGNAL(void scroll_vertical(ScrollType scroll_type, float position), "scroll-vertical")
};
-
namespace ComboDropDown_Helpers
{
@@ -70,11 +68,10 @@ typedef Gtk::ComboDropDownItem Element;
} /* namespace ComboDropDown_Helpers */
-
class Combo;
/** The dropdown list of a Combo.
- *
+ *
* A combo is a compound widget which crosses a text entry area and a pull
* down list. The dropdown list is implemented with the deprecated GtkList
* widget on the gtk+ side. ComboDropDown is a thin wrapper around GtkList
@@ -123,7 +120,7 @@ class ScrolledWindow;
class Window;
/** A text entry field with a dropdown list.
- *
+ *
* A combo is a compound widget which crosses a text entry area and a pull
* down list. It may allow text entry or it may just allow list
* values depending on the settings.
@@ -139,7 +136,7 @@ class Combo : public HBox
public:
_CTOR_DEFAULT
-
+
/** Allow direct text entry
* Whether the text in the entry must be or not be in the list.
*
@@ -197,7 +194,4 @@ public:
_WRAP_PROPERTY("value-in-list", bool)
};
-
-} /* namespace Gtk */
-
-
+} // namespace Gtk
diff --git a/gtk/src/fileselection.hg b/gtk/src/fileselection.hg
index 26fbe60..cef642f 100644
--- a/gtk/src/fileselection.hg
+++ b/gtk/src/fileselection.hg
@@ -1,8 +1,4 @@
-/* $Id: fileselection.hg,v 1.4 2005/11/29 16:38:10 murrayc Exp $ */
-
-
-/* fileselection.h
- *
+/*
* Copyright (C) 1998-2002 The gtkmm Development Team
*
* This library is free software; you can redistribute it and/or
@@ -20,6 +16,9 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+#m4 _PUSH(SECTION_CC_PRE_INCLUDES)
+#undef GTK_DISABLE_DEPRECATED
+#m4 _POP()
// This is for including the config header before any code (such as
// the #ifndef GTKMM_DISABLE_DEPRECATED in deprecated classes) is generated:
_CONFIGINCLUDE(gtkmmconfig.h)
@@ -100,4 +99,3 @@ public:
};
} // namespace Gtk
-
diff --git a/gtk/src/menuitem.hg b/gtk/src/menuitem.hg
index 55cbe54..6667b94 100644
--- a/gtk/src/menuitem.hg
+++ b/gtk/src/menuitem.hg
@@ -1,8 +1,4 @@
-/* $Id: menuitem.hg,v 1.6 2006/04/12 11:11:25 murrayc Exp $ */
-
-
-/* menuitem.h
- *
+/*
* Copyright (C) 1998-2002 The gtkmm Development Team
*
* This library is free software; you can redistribute it and/or
@@ -19,14 +15,18 @@
* License along with this library; if not, write to the Free
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-
+
+#m4 _PUSH(SECTION_CC_PRE_INCLUDES)
+#undef GTK_DISABLE_DEPRECATED
+#m4 _POP()
+_CONFIGINCLUDE(gtkmmconfig.h)
+
#include <gtkmm/item.h>
#include <gtkmm/accelkey.h>
#include <gtkmm/accellabel.h>
_DEFS(gtkmm,gtk)
_PINCLUDE(gtkmm/private/item_p.h)
-
namespace Gtk
{
@@ -45,7 +45,6 @@ class MenuItem : public Item
{
_CLASS_GTKOBJECT(MenuItem,GtkMenuItem,GTK_MENU_ITEM,Gtk::Item,GtkItem)
public:
-
/// Create an empty menu item
_CTOR_DEFAULT
@@ -56,11 +55,12 @@ public:
explicit MenuItem(const Glib::ustring& label, bool mnemonic = false);
_WRAP_METHOD(void set_submenu(Menu& submenu), gtk_menu_item_set_submenu)
+ //void unset_submenu(); // TODO: new API, implement after freeze
_WRAP_METHOD(Menu* get_submenu(), gtk_menu_item_get_submenu)
_WRAP_METHOD(const Menu* get_submenu() const, gtk_menu_item_get_submenu, constversion)
bool has_submenu() const;
- _WRAP_METHOD(void remove_submenu(), gtk_menu_item_remove_submenu)
+ _WRAP_METHOD(void remove_submenu(), gtk_menu_item_remove_submenu, deprecated)
_WRAP_METHOD(void select(), gtk_menu_item_select)
_WRAP_METHOD(void deselect(), gtk_menu_item_deselect)
_WRAP_METHOD(void activate(), gtk_menu_item_activate)
@@ -89,20 +89,15 @@ public:
_WRAP_PROPERTY("label", Glib::ustring)
_WRAP_PROPERTY("use-underline", bool)
-
protected:
-
void add_accel_label(const Glib::ustring& label, bool mnemonic = true);
-
void set_accel_key(const AccelKey& accel_key);
private:
-
friend class Menu_Helpers::Element;
//This data is set by MenuElem, and will be used in on_realize(), in the call to add_accelerator().
AccelKey accel_key_;
};
-} /* namespace Gtk */
-
+} // namespace Gtk
diff --git a/gtk/src/menutoolbutton.hg b/gtk/src/menutoolbutton.hg
index d8f6c50..f5c34e6 100644
--- a/gtk/src/menutoolbutton.hg
+++ b/gtk/src/menutoolbutton.hg
@@ -1,7 +1,4 @@
-/* $Id: menutoolbutton.hg,v 1.2 2006/04/12 11:11:25 murrayc Exp $ */
-
-/* box.h
- *
+/*
* Copyright (C) 2003 The gtkmm Development Team
*
* This library is free software; you can redistribute it and/or
@@ -19,6 +16,11 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+#m4 _PUSH(SECTION_CC_PRE_INCLUDES)
+#undef GTK_DISABLE_DEPRECATED
+#m4 _POP()
+_CONFIGINCLUDE(gtkmmconfig.h)
+
#include <gtkmm/toolbutton.h>
#include <gtkmm/menu.h>
#include <gtkmm/tooltips.h>
@@ -26,7 +28,6 @@
_DEFS(gtkmm,gtk)
_PINCLUDE(gtkmm/private/toolbutton_p.h)
-
namespace Gtk
{
@@ -38,20 +39,20 @@ namespace Gtk
class MenuToolButton : public ToolButton
{
_CLASS_GTKOBJECT(MenuToolButton, GtkMenuToolButton, GTK_MENU_TOOL_BUTTON, Gtk::ToolButton, GtkToolButton)
-public:
+public:
/** Creates a new MenuToolButton.
*/
_CTOR_DEFAULT()
-
+
/** Creates a new MenuToolButton from a StockID.
*
* The MenuToolButton will be created according to the @a stock_id properties.
- *
+ *
* @param stock_id The StockID which determines the look of the MenuToolButton.
*/
_WRAP_CTOR(MenuToolButton(const Gtk::StockID& stock_id), gtk_toggle_tool_button_new_from_stock)
-
+
/** Creates a new MenuToolButton with a label.
*
* The MenuToolButton will have the label @a label.
@@ -59,7 +60,7 @@ public:
* @param label The string used to display the label for this MenuToolButton.
*/
explicit MenuToolButton(const Glib::ustring& label);
-
+
/** Creates a new MenuToolButton with an image.
*
* The MenuToolButton will have the label @a label and an image widget @a icon_widget.
@@ -83,4 +84,3 @@ public:
};
} // namespace Gtk
-
diff --git a/gtk/src/notebook.hg b/gtk/src/notebook.hg
index 64c048c..d9109a2 100644
--- a/gtk/src/notebook.hg
+++ b/gtk/src/notebook.hg
@@ -1,7 +1,4 @@
-/* $Id: notebook.hg,v 1.14 2006/07/05 16:59:28 murrayc Exp $ */
-
-/* notebook.h
- *
+/*
* Copyright (C) 1998-2002 The gtkmm Development Team
*
* This library is free software; you can redistribute it and/or
@@ -19,6 +16,11 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+#m4 _PUSH(SECTION_CC_PRE_INCLUDES)
+#undef GTK_DISABLE_DEPRECATED
+#m4 _POP()
+_CONFIGINCLUDE(gtkmmconfig.h)
+
#include <gtkmm/container.h>
#include <gtkmm/label.h>
//#include <gtk/gtknotebook.h>
@@ -41,7 +43,6 @@ namespace Gtk
_CC_INCLUDE(gtk/gtk.h)
_WRAP_ENUM(NotebookTab, GtkNotebookTab)
-
class Notebook;
namespace Notebook_Helpers
@@ -108,7 +109,6 @@ inline bool operator==(const PageIterator& lhs, const PageIterator& rhs)
inline bool operator!=(const PageIterator& lhs, const PageIterator& rhs)
{ return !lhs.equal(rhs); }
-
// Page is the output class
class Page : public PageIterator
{
@@ -132,7 +132,6 @@ public:
void set_tab_label_packing(bool expand, bool fill, PackType pack_type);
};
-
// Element is the input class
class PageList;
@@ -269,12 +268,12 @@ protected:
GtkNotebook* gparent_;
};
-} /* Notebook_Helpers */
+} // Notebook_Helpers
/** Container which shows one of its children at a time, in tabbed windows.
*
* The Gtk::Notebook widget is a Gtk::Container whose children are pages that
- * can be switched between using tab labels along one edge.
+ * can be switched between using tab labels along one edge.
*
* You can use the PageList returned by pages() as any normal STL container
* to manipulate the pages.
@@ -289,6 +288,7 @@ class Notebook : public Container
{
_CLASS_GTKOBJECT(Notebook,GtkNotebook,GTK_NOTEBOOK,Gtk::Container,GtkContainer)
_IGNORE(gtk_notebook_set_homogeneous_tabs, gtk_notebook_set_tab_border, gtk_notebook_set_tab_hborder, gtk_notebook_set_tab_vborder)
+
public:
typedef Notebook_Helpers::PageList PageList;
@@ -300,7 +300,7 @@ public:
int prepend_page(Widget& child, const Glib::ustring& tab_label, bool use_mnemonic = false);
_WRAP_METHOD(int prepend_page(Widget& child, Widget& tab_label, Widget& menu_label), gtk_notebook_prepend_page_menu)
//Ignore the possible-0 menu_label version of this method. It would have the same signature as another method.
-
+
int prepend_page(Widget& child, const Glib::ustring& tab_label, const Glib::ustring& menu_label, bool use_mnemonic);
_WRAP_METHOD(int append_page(Widget& child, Widget& tab_label), gtk_notebook_append_page)
@@ -309,16 +309,16 @@ public:
_WRAP_METHOD(int append_page(Widget& child, Widget& tab_label, Widget& menu_label), gtk_notebook_append_page_menu)
//Ignore the possible-0 menu_label version of this method. It would have the same signature as another method.
-
+
int append_page(Widget& child, const Glib::ustring& tab_label, const Glib::ustring& menu_label, bool use_mnemonic = false);
_WRAP_METHOD(int insert_page(Widget& child, Widget& tab_label, int position), gtk_notebook_insert_page)
int insert_page(Widget& child, int position);
-
+
int insert_page(Widget& child, const Glib::ustring& tab_label, int position, bool use_mnemonic = false);
_WRAP_METHOD(int insert_page(Widget& child, Widget& tab_label, Widget& menu_label, int position), gtk_notebook_insert_page_menu)
//Ignore the possible-0 menu_label version of this method. It would have the same signature as another method.
-
+
int insert_page(Widget& child, const Glib::ustring& tab_label, const Glib::ustring& menu_label, int position, bool use_mnemonic = false);
_WRAP_METHOD(void remove_page(int page_num = 0), gtk_notebook_remove_page)
@@ -370,7 +370,6 @@ public:
_WRAP_METHOD(void popup_disable(), gtk_notebook_popup_disable)
-
_WRAP_METHOD(Widget* get_tab_label(Widget& child), gtk_notebook_get_tab_label)
_WRAP_METHOD(const Widget* get_tab_label(Widget& child) const, gtk_notebook_get_tab_label, constversion)
_WRAP_METHOD(void set_tab_label(Widget& child, Widget& tab_label), gtk_notebook_set_tab_label)
@@ -391,7 +390,6 @@ public:
_WRAP_METHOD(bool get_tab_detachable(Widget& child) const, gtk_notebook_get_tab_detachable)
_WRAP_METHOD(void set_tab_detachable(Widget& child, bool detachable = true), gtk_notebook_set_tab_detachable)
-
PageList::iterator get_current();
PageList& pages();
@@ -402,7 +400,6 @@ public:
_WRAP_SIGNAL(void page_removed(Widget* page, guint page_num), "page_removed", no_default_handler)
_WRAP_SIGNAL(void page_added(Widget* page, guint page_num), "page_added", no_default_handler)
-
//Key-binding signals:
_IGNORE_SIGNAL("move_focus_out")
_IGNORE_SIGNAL("select_page")
@@ -413,7 +410,6 @@ public:
//This doesn't seem generally useful:
_IGNORE_SIGNAL("create-window")
-
_WRAP_PROPERTY("tab-pos", PositionType)
_WRAP_PROPERTY("show-tabs", bool)
_WRAP_PROPERTY("show-border", bool)
@@ -431,7 +427,6 @@ protected:
#endif /* DOXYGEN_SHOULD_SKIP_THIS */
};
-
#ifndef DOXYGEN_SHOULD_SKIP_THIS
namespace Notebook_Helpers
@@ -440,20 +435,19 @@ namespace Notebook_Helpers
/**** PageIterator **************************************************/
inline
-PageIterator::reference PageIterator::operator*() const
-{
+PageIterator::reference PageIterator::operator*() const
+{
return static_cast<const Page&>(*this);
}
inline
PageIterator::pointer PageIterator::operator->() const
-{
+{
return static_cast<const Page*>(this);
}
-} /* Notebook_Helpers */
+} // namespace Notebook_Helpers
#endif /* DOXYGEN_SHOULD_SKIP_THIS */
-} /* namespace Gtk */
-
+} // namespace Gtk
diff --git a/gtk/src/optionmenu.hg b/gtk/src/optionmenu.hg
index d70a70a..4816b5d 100644
--- a/gtk/src/optionmenu.hg
+++ b/gtk/src/optionmenu.hg
@@ -1,7 +1,4 @@
-/* $Id: optionmenu.hg,v 1.6 2006/04/12 11:11:25 murrayc Exp $ */
-
-/* optionmenu.h
- *
+/*
* Copyright (C) 1998-2002 The gtkmm Development Team
*
* This library is free software; you can redistribute it and/or
@@ -19,6 +16,9 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+#m4 _PUSH(SECTION_CC_PRE_INCLUDES)
+#undef GTK_DISABLE_DEPRECATED
+#m4 _POP()
// This is for including the config header before any code (such as
// the #ifndef GTKMM_DISABLE_DEPRECATED in deprecated classes) is generated:
_CONFIGINCLUDE(gtkmmconfig.h)
@@ -37,7 +37,7 @@ class Menu;
* A Gtk::OptionMenu is a widget that allows the user to choose from a list
* of valid choices. The Gtk::OptionMenu displays the selected choice. When
* activated the GtkOptionMenu displays a popup Gtk::Menu which allows the
- * user to make a new choice.
+ * user to make a new choice.
*
* @deprecated Use the ComboBox widget instead.
*/
@@ -49,7 +49,7 @@ public:
OptionMenu();
_CUSTOM_DTOR()
-
+
_WRAP_METHOD(void set_menu(Menu& menu), gtk_option_menu_set_menu)
_WRAP_METHOD(Menu* get_menu(), gtk_option_menu_get_menu)
_WRAP_METHOD(const Menu* get_menu() const, gtk_option_menu_get_menu, constversion)
@@ -57,11 +57,10 @@ public:
_WRAP_METHOD(int get_history() const, gtk_option_menu_get_history)
_WRAP_METHOD(void set_history(guint index), gtk_option_menu_set_history)
- _WRAP_SIGNAL(void changed(), "changed")
+ _WRAP_SIGNAL(void changed(), "changed")
private:
void init_accels_handler_();
};
-} /* namespace Gtk */
-
+} // namespace Gtk
diff --git a/gtk/src/recentmanager.hg b/gtk/src/recentmanager.hg
index 6ad8e47..93cdba1 100644
--- a/gtk/src/recentmanager.hg
+++ b/gtk/src/recentmanager.hg
@@ -15,6 +15,11 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+#m4 _PUSH(SECTION_CC_PRE_INCLUDES)
+#undef GTK_DISABLE_DEPRECATED
+#m4 _POP()
+_CONFIGINCLUDE(gtkmmconfig.h)
+
#include <gdkmm/screen.h>
#include <gdkmm/pixbuf.h>
@@ -68,8 +73,8 @@ protected:
public:
_WRAP_CREATE()
- _WRAP_METHOD(static Glib::RefPtr<RecentManager> get_default(), gtk_recent_manager_get_default, refreturn)
- _WRAP_METHOD(static Glib::RefPtr<RecentManager> get_for_screen(const Glib::RefPtr<Gdk::Screen>& screen), gtk_recent_manager_get_for_screen, refreturn)
+ _WRAP_METHOD(static Glib::RefPtr<RecentManager> get_default(), gtk_recent_manager_get_default, refreturn, deprecated)
+ _WRAP_METHOD(static Glib::RefPtr<RecentManager> get_for_screen(const Glib::RefPtr<Gdk::Screen>& screen), gtk_recent_manager_get_for_screen, refreturn, deprecated)
/** Meta-data passed to add_item(). You should
* use RecentManager::Data if you want to control the meta-data associated
@@ -85,18 +90,18 @@ public:
* - is_private: whether the file should be displayed only by the applications that have registered it
*/
class Data
- {
+ {
public:
Glib::ustring display_name;
Glib::ustring description;
-
+
Glib::ustring mime_type;
-
+
Glib::ustring app_name;
Glib::ustring app_exec;
std::vector<Glib::ustring> groups;
-
+
bool is_private;
};
diff --git a/gtk/src/scalebutton.hg b/gtk/src/scalebutton.hg
index 3777ecd..c191037 100644
--- a/gtk/src/scalebutton.hg
+++ b/gtk/src/scalebutton.hg
@@ -1,7 +1,4 @@
-/* $Id: scalebutton.hg,v 1.5 2005/11/30 14:10:49 murrayc Exp $ */
-
-/* scalebutton.h
- *
+/*
* Copyright (C) 2007 The gtkmm Development Team
*
* This library is free software; you can redistribute it and/or
@@ -19,13 +16,17 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+#m4 _PUSH(SECTION_CC_PRE_INCLUDES)
+#undef GTK_DISABLE_DEPRECATED
+#m4 _POP()
+_CONFIGINCLUDE(gtkmmconfig.h)
+
#include <gtkmm/button.h>
#include <gtkmm/adjustment.h>
#include <gtkmm/enums.h>
_DEFS(gtkmm,gtk)
_PINCLUDE(gtkmm/private/button_p.h)
-
namespace Gtk
{
@@ -33,28 +34,35 @@ namespace Gtk
/** A button which pops up a scale widget.
*
- * This kind of widget is commonly used for volume controls in multimedia
- * applications, and there is a Gtk::VolumeButton subclass that is tailored
+ * This kind of widget is commonly used for volume controls in multimedia
+ * applications, and there is a Gtk::VolumeButton subclass that is tailored
* for this use case.
- *
+ *
* @ingroup Widgets
* @newin{2,12}
*/
class ScaleButton : public Button
{
_CLASS_GTKOBJECT(ScaleButton, GtkScaleButton, GTK_SCALE_BUTTON, Gtk::Button, GtkButton)
+
public:
-
_WRAP_CTOR(ScaleButton(IconSize size, double min, double max, double step, const Glib::StringArrayHandle& icons), gtk_scale_button_new)
_WRAP_METHOD(void set_icons(const Glib::StringArrayHandle& icons), gtk_scale_button_set_icons)
_WRAP_METHOD(double get_value() const, gtk_scale_button_get_value)
_WRAP_METHOD(void set_value(double value), gtk_scale_button_set_value)
+
+ // TODO: The overload makes no sense, as the same type is returned
+ // by both methods. Also, the refreturn looks fishy to me.
_WRAP_METHOD(Gtk::Adjustment* get_adjustment(), gtk_scale_button_get_adjustment, refreturn)
_WRAP_METHOD(Gtk::Adjustment* get_adjustment() const, gtk_scale_button_get_adjustment, constversion)
+
_WRAP_METHOD(void set_adjustment(Gtk::Adjustment& adjustment), gtk_scale_button_set_adjustment)
+
+ // TODO: Should be deprecated, but we have no replacement yet.
_WRAP_METHOD(Orientation get_orientation(), gtk_scale_button_get_orientation)
_WRAP_METHOD(void set_orientation(Orientation orientation), gtk_scale_button_set_orientation)
+
_WRAP_METHOD(Widget* get_plus_button(), gtk_scale_button_get_plus_button)
_WRAP_METHOD(const Widget* get_plus_button() const, gtk_scale_button_get_plus_button, constversion)
_WRAP_METHOD(Widget* get_minus_button(), gtk_scale_button_get_minus_button)
@@ -74,6 +82,4 @@ public:
_WRAP_PROPERTY("orientation", Orientation)
};
-
} // namespace Gtk
-
diff --git a/gtk/src/statusicon.hg b/gtk/src/statusicon.hg
index b58930d..c0e5add 100644
--- a/gtk/src/statusicon.hg
+++ b/gtk/src/statusicon.hg
@@ -1,5 +1,3 @@
-/* $Id: statusicon.hg,v 1.6 2006/07/05 16:59:28 murrayc Exp $ */
-
/* Copyright (C) 2005 The gtkmm Development Team
*
* This library is free software; you can redistribute it and/or
@@ -17,11 +15,15 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+#m4 _PUSH(SECTION_CC_PRE_INCLUDES)
+#undef GTK_DISABLE_DEPRECATED
+#m4 _POP()
+_CONFIGINCLUDE(gtkmmconfig.h)
_DEFS(gtkmm,gtk)
_PINCLUDE(glibmm/private/object_p.h)
-#include <gtkmm/image.h> //For ImageType.
+#include <gtkmm/image.h>
#include <gtkmm/stockid.h>
#include <gtkmm/menu.h>
#include <gdkmm/pixbuf.h>
@@ -29,24 +31,23 @@ _PINCLUDE(glibmm/private/object_p.h)
#include <gtkmm/object.h>
#include <gtkmm/tooltip.h>
-
namespace Gtk
{
-/** The "system tray" or notification area is normally used for transient icons that indicate some
- * special state. For example, a system tray icon might appear to tell the user that they have new
- * mail, or have an incoming instant message, or something along those lines. The basic idea is
+/** The "system tray" or notification area is normally used for transient icons that indicate some
+ * special state. For example, a system tray icon might appear to tell the user that they have new
+ * mail, or have an incoming instant message, or something along those lines. The basic idea is
* that creating an icon in the notification area is less annoying than popping up a dialog.
*
- * A StatusIcon object can be used to display an icon in a "system tray". The icon can have a
- * tooltip, and the user can interact with it by activating it or popping up a context menu.
- * Critical information should not solely be displayed in a StatusIcon, since it may not be
- * visible (e.g. when the user doesn't have a notification area on his panel). This can be checked
+ * A StatusIcon object can be used to display an icon in a "system tray". The icon can have a
+ * tooltip, and the user can interact with it by activating it or popping up a context menu.
+ * Critical information should not solely be displayed in a StatusIcon, since it may not be
+ * visible (e.g. when the user doesn't have a notification area on his panel). This can be checked
* with is_embedded().
*
- * On X11, the implementation follows the freedesktop.org "System Tray" specification.
- * Implementations of the "tray" side of this specification can be found e.g. in the GNOME and KDE
- * panel applications.
+ * On X11, the implementation follows the freedesktop.org "System Tray" specification.
+ * Implementations of the "tray" side of this specification can be found e.g. in the GNOME and KDE
+ * panel applications.
*
* @newin{2,10}
*/
@@ -69,10 +70,10 @@ public:
_WRAP_CREATE(const StockID& stock_id)
_WRAP_CREATE(const Glib::ustring& icon_name)
- /** Creates a status icon displaying the file @a filename.
- * The image will be scaled down to fit in the available
+ /** Creates a status icon displaying the file @a filename.
+ * The image will be scaled down to fit in the available
* space in the notification area, if necessary.
- *
+ *
* @param filename A filename.
* @result A new StatusIcon
*
@@ -104,7 +105,8 @@ public:
_WRAP_METHOD(Glib::RefPtr<Gdk::Screen> get_screen(), gtk_status_icon_get_screen, refreturn)
_WRAP_METHOD(Glib::RefPtr<const Gdk::Screen> get_screen() const, gtk_status_icon_get_screen, refreturn, constversion)
- _WRAP_METHOD(void set_tooltip(const Glib::ustring& tooltip_text), gtk_status_icon_set_tooltip)
+ _WRAP_METHOD(void set_tooltip(const Glib::ustring& tooltip_text),
+ gtk_status_icon_set_tooltip, deprecated)
_WRAP_METHOD(void set_visible(bool visible = true), gtk_status_icon_set_visible)
_WRAP_METHOD(bool get_visible() const, gtk_status_icon_get_visible)
@@ -113,10 +115,10 @@ public:
_WRAP_METHOD(bool is_embedded() const, gtk_status_icon_is_embedded)
- /** Displays a menu aligned to the status icon, and makes it available for selection.
+ /** Displays a menu aligned to the status icon, and makes it available for selection.
* Applications can use this function to display context-sensitive menus.
*
- * This is equivalent to the gtk_status_icon_position_menu() helper callback in GTK+,
+ * This is equivalent to the gtk_status_icon_position_menu() helper callback in GTK+,
* which can be provided to gtk_menu_popup().
*
* See Gtk::Menu::popup() for more details.
@@ -130,25 +132,24 @@ public:
void popup_menu_at_position(Menu& menu, guint button, guint32 activate_time);
_IGNORE(gtk_status_icon_position_menu)
//Note that gtk_status_icon_position_menu() is meant to be used as a helpful callback when calling gtk_menu_popup().
- //We make it easier by just providing a popup method that uses it.
-
+ //We make it easier by just providing a popup method that uses it.
//In gtk_status_icon_get_geometry(), any of the parameters may be NULL,
//but we don't need 6 different overloads, with different parameters.
//But we can add some if there are common cases.
/** Obtains information about the location of the status icon
- * on screen. This information can be used to e.g. position
- * popups like notification bubbles.
- * See popup_menu_at_position() for a more convenient
+ * on screen. This information can be used to e.g. position
+ * popups like notification bubbles.
+ * See popup_menu_at_position() for a more convenient
* alternative for positioning menus.
*
- * Note that some platforms do not allow GTK+ to provide
+ * Note that some platforms do not allow GTK+ to provide
* this information.
*
* @param screen: The screen.
* @param area The area occupied by the status icon.
- * @param orientation The orientation of the panel in which the status icon is embedded. A panel
+ * @param orientation The orientation of the panel in which the status icon is embedded. A panel
* at the top or bottom of the screen is horizontal, a panel at the left or right is vertical.
* @result true if the location information has been filled in.
*
@@ -192,4 +193,3 @@ public:
};
} // namespace Gtk
-
diff --git a/gtk/src/toolbar.hg b/gtk/src/toolbar.hg
index 50db7af..b5070b7 100644
--- a/gtk/src/toolbar.hg
+++ b/gtk/src/toolbar.hg
@@ -1,5 +1,3 @@
-/* $Id: toolbar.hg,v 1.19 2006/04/12 11:11:25 murrayc Exp $ */
-
/* Copyright (C) 1998-2002 The gtkmm Development Team
*
* This library is free software; you can redistribute it and/or
@@ -17,6 +15,9 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+#m4 _PUSH(SECTION_CC_PRE_INCLUDES)
+#undef GTK_DISABLE_DEPRECATED
+#m4 _POP()
// This is for including the config header before any code (such as
// the #ifndef GTKMM_DISABLE_DEPRECATED in deprecated classes) is generated:
_CONFIGINCLUDE(gtkmmconfig.h)
@@ -31,7 +32,6 @@ _CONFIGINCLUDE(gtkmmconfig.h)
_DEFS(gtkmm,gtk)
_PINCLUDE(gtkmm/private/container_p.h)
-
namespace Gtk
{
@@ -50,15 +50,15 @@ public:
_WRAP_METHOD(void insert(ToolItem& item, int pos), gtk_toolbar_insert)
void insert(ToolButton& item, int pos, const sigc::slot<void>& clicked_slot);
void insert(ToggleToolButton& item, int pos, const sigc::slot<void>& toggled_slot);
-
+
void append(ToolItem& item);
void append(ToolButton& item, const sigc::slot<void>& clicked_slot);
void append(ToggleToolButton& item, const sigc::slot<void>& toggled_slot);
-
+
void prepend(ToolItem& item);
void prepend(ToolButton& item, const sigc::slot<void>& clicked_slot);
void prepend(ToggleToolButton& item, const sigc::slot<void>& toggled_slot);
-
+
_WRAP_METHOD(int get_item_index(const ToolItem& item) const, gtk_toolbar_get_item_index)
_WRAP_METHOD(int get_n_items() const, gtk_toolbar_get_n_items)
_WRAP_METHOD(ToolItem* get_nth_item(int n), gtk_toolbar_get_nth_item)
@@ -66,10 +66,9 @@ public:
_WRAP_METHOD(bool get_show_arrow() const, gtk_toolbar_get_show_arrow)
_WRAP_METHOD(void set_show_arrow(bool show_arrow = true), gtk_toolbar_set_show_arrow)
-
/* Style methods */
- //TODO: Probably remove these when we derive from ToolShell, which has the same methods:
+ // TODO: Remove these when we derive from ToolShell, which has the same methods:
_WRAP_METHOD(void set_orientation(Orientation orientation), gtk_toolbar_set_orientation)
_WRAP_METHOD(Orientation get_orientation() const, gtk_toolbar_get_orientation)
@@ -80,14 +79,14 @@ public:
_WRAP_METHOD(bool get_tooltips() const, gtk_toolbar_get_tooltips, deprecated "Use The toolkit-wide Gtk::Settings::property_gtk_enable_tooltips instead")
_WRAP_METHOD(void unset_toolbar_style(), gtk_toolbar_unset_style)
-
- //Note that gtk_toolbar_set_icon_size() and gtk_toolbar_unset_icon_size() were
+
+ //Note that gtk_toolbar_set_icon_size() and gtk_toolbar_unset_icon_size() were
//deprecated sometime before GTK+ 2.4, but were undeprecated in GTK+ 2.12.
_WRAP_METHOD(void set_icon_size(IconSize icon_size), gtk_toolbar_set_icon_size)
_WRAP_METHOD(void unset_icon_size(), gtk_toolbar_unset_icon_size)
_WRAP_METHOD(IconSize get_icon_size() const, gtk_toolbar_get_icon_size)
-
+
_WRAP_METHOD(ReliefStyle get_relief_style() const, gtk_toolbar_get_relief_style)
_WRAP_METHOD(int get_drop_index(int x, int y) const, gtk_toolbar_get_drop_index)
_WRAP_METHOD(void set_drop_highlight_item(ToolItem& tool_item, int index), gtk_toolbar_set_drop_highlight_item)
@@ -98,13 +97,13 @@ public:
* @param orientation The new Orientation of the toolbar.
*/
_WRAP_SIGNAL(void orientation_changed(Orientation orientation), "orientation_changed")
-
- /** Emitted when the style of the toolbar changes.
- *
+
+ /** Emitted when the style of the toolbar changes.
+ *
* @param @style The new ToolbarStyle of the toolbar.
*/
_WRAP_SIGNAL(void toolbar_style_changed(ToolbarStyle style), "style_changed")
-
+
/** Emitted when the user right-clicks the toolbar or uses the
* keybinding to display a popup menu.
*
@@ -120,16 +119,16 @@ public:
* @resultt true if the signal was handled, false if not.
*/
_WRAP_SIGNAL(bool popup_context_menu(int x, int y, int button_number), "popup_context_menu")
-
+
_IGNORE_SIGNAL("move_focus")
_IGNORE_SIGNAL("focus_home_or_end")
#ifndef GTKMM_DISABLE_DEPRECATED
//This was called get_tooltips_object() to avoid a clash with get_tooltips(), which just says whether they are enabled.
- ///@deprecated Use the Gtk::Tooltip API instead.
+ ///@deprecated Use the Gtk::Tooltip API instead.
Tooltips* get_tooltips_object() const;
#endif //GTKMM_DISABLE_DEPRECATED
-
+
//This is probably the same as Container::children().size(), which is deprecated anyway?
//_MEMBER_GET(num_children, num_children, int, gint)
@@ -149,7 +148,7 @@ public:
gtk_toolbar_append_space, gtk_toolbar_prepend_space, gtk_toolbar_insert_space, gtk_toolbar_remove_space
gtk_toolbar_append_element, gtk_toolbar_prepend_element, gtk_toolbar_insert_element,
gtk_toolbar_append_widget, gtk_toolbar_prepend_widget, gtk_toolbar_insert_widget)
-
+
_WRAP_PROPERTY("orientation", Orientation)
_WRAP_PROPERTY("toolbar_style", ToolbarStyle)
_WRAP_PROPERTY("show_arrow", bool)
diff --git a/gtk/src/toolbutton.hg b/gtk/src/toolbutton.hg
index 153c1ca..ec56e9c 100644
--- a/gtk/src/toolbutton.hg
+++ b/gtk/src/toolbutton.hg
@@ -1,7 +1,4 @@
-/* $Id: toolbutton.hg,v 1.10 2006/04/12 11:11:25 murrayc Exp $ */
-
-/* box.h
- *
+/*
* Copyright (C) 2003 The gtkmm Development Team
*
* This library is free software; you can redistribute it and/or
@@ -23,14 +20,13 @@
_DEFS(gtkmm,gtk)
_PINCLUDE(gtkmm/private/toolitem_p.h)
-
namespace Gtk
{
// TODO: Inherit/Implement Activatable when we can break ABI.
/** A Gtk::ToolItem subclass that displays buttons.
- *
+ *
* A ToolButton is are Gtk::ToolItem containing a button.
* @ingroup Widgets
*/
@@ -42,11 +38,11 @@ public:
/** Creates a new ToolButton.
*/
_CTOR_DEFAULT()
-
+
/** Creates a new ToolButton from a StockID.
*
* The ToolButton will be created according to the @a stock_id properties.
- *
+ *
* @param stock_id The StockID which determines the look of the ToolButton.
*/
_WRAP_CTOR(ToolButton(const Gtk::StockID& stock_id), gtk_tool_button_new_from_stock)
@@ -93,8 +89,7 @@ public:
_WRAP_PROPERTY("use_underline", bool)
_WRAP_PROPERTY("label_widget", Gtk::Widget*)
_WRAP_PROPERTY("stock_id", Glib::ustring)
- _WRAP_PROPERTY("icon_widget", Gtk::Widget)
+ _WRAP_PROPERTY("icon_widget", Gtk::Widget)
};
} // namespace Gtk
-
diff --git a/gtk/src/toolitem.hg b/gtk/src/toolitem.hg
index f7e2bca..ede226d 100644
--- a/gtk/src/toolitem.hg
+++ b/gtk/src/toolitem.hg
@@ -1,7 +1,4 @@
-/* $Id: toolitem.hg,v 1.14 2006/04/12 11:11:25 murrayc Exp $ */
-
-/* box.h
- *
+/*
* Copyright (C) 1998-2002 The gtkmm Development Team
*
* This library is free software; you can redistribute it and/or
@@ -19,6 +16,9 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+#m4 _PUSH(SECTION_CC_PRE_INCLUDES)
+#undef GTK_DISABLE_DEPRECATED
+#m4 _POP()
// This is for including the config header before any code (such as
// the #ifndef GTKMM_DISABLE_DEPRECATED in deprecated classes) is generated:
_CONFIGINCLUDE(gtkmmconfig.h)
@@ -28,12 +28,10 @@ _CONFIGINCLUDE(gtkmmconfig.h)
_DEFS(gtkmm,gtk)
_PINCLUDE(gtkmm/private/bin_p.h)
-
namespace Gtk
{
-/**
- *
+/**
* @ingroup Widgets
*/
class ToolItem : public Bin
@@ -52,7 +50,7 @@ public:
_WRAP_METHOD(void set_tooltip_text(const Glib::ustring& text), gtk_tool_item_set_tooltip_text)
_WRAP_METHOD(void set_tooltip_markup(const Glib::ustring& markup), gtk_tool_item_set_tooltip_markup)
-
+
_WRAP_METHOD(void set_use_drag_window(bool use_drag_window = true), gtk_tool_item_set_use_drag_window)
_WRAP_METHOD(bool get_use_drag_window() const, gtk_tool_item_get_use_drag_window)
@@ -79,7 +77,7 @@ public:
_WRAP_METHOD(void rebuild_menu(), gtk_tool_item_rebuild_menu)
_WRAP_METHOD(void toolbar_reconfigured(), gtk_tool_item_toolbar_reconfigured)
-
+
//TODO: This suggests calling set_proxy_menu_item() with NULL. but the function asserts against that.
/** This signal is emitted when the toolbar needs information from @tool_item
* about whether the item should appear in the toolbar overflow menu. In
@@ -90,7 +88,7 @@ public:
* in the overflow menu
* </listitem>
* <listitem> call set_proxy_menu_item() with a new menu
- * item and return true, or
+ * item and return true, or
* </listitem>
* <listitem> return false to indicate that the signal was not
* handled by the item. This means that
@@ -107,7 +105,7 @@ public:
* @result true if the signal was handled, false if not
*/
_WRAP_SIGNAL(bool create_menu_proxy(), create_menu_proxy)
-
+
/** This signal is emitted when some property of the toolbar that the
* item is a child of changes. For custom subclasses of ToolItem,
* the default handler of this signal use the functions
@@ -140,11 +138,9 @@ public:
//_WRAP_SIGNAL(bool set_tooltip(Tooltips* tooltips, const Glib::ustring& tip_text, const Glib::ustring& tip_private), set_tooltip, no_default_handler, deprecated) //TODO: Implement deprecated for _WRAP_SIGNAL() to avoid hand-coding this:
#endif //GTKMM_DISABLE_DEPRECATED
-
_WRAP_PROPERTY("visible_horizontal", bool)
_WRAP_PROPERTY("visible_vertical", bool)
_WRAP_PROPERTY("is_important", bool)
};
} // namespace Gtk
-
diff --git a/gtk/src/tooltip.hg b/gtk/src/tooltip.hg
index 299814d..e2868e9 100644
--- a/gtk/src/tooltip.hg
+++ b/gtk/src/tooltip.hg
@@ -77,7 +77,6 @@ protected:
_CLASS_GOBJECT(Tooltip, GtkTooltip, GTK_TOOLTIP, Glib::Object, GObject)
public:
-
_WRAP_METHOD(void set_markup(const Glib::ustring& markup), gtk_tooltip_set_markup)
_WRAP_METHOD(void set_text(const Glib::ustring& markup), gtk_tooltip_set_text)
_WRAP_METHOD(void set_icon(const Glib::RefPtr<Gdk::Pixbuf>& pixbuf), gtk_tooltip_set_icon)
diff --git a/gtk/src/tooltips.hg b/gtk/src/tooltips.hg
index cf152c0..a3e0f7b 100644
--- a/gtk/src/tooltips.hg
+++ b/gtk/src/tooltips.hg
@@ -1,5 +1,3 @@
-/* $Id: tooltips.hg,v 1.1 2003/01/21 13:40:46 murrayc Exp $ */
-
/* Copyright (C) 1998-2002 The gtkmm Development Team
*
* This library is free software; you can redistribute it and/or
@@ -17,6 +15,9 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+#m4 _PUSH(SECTION_CC_PRE_INCLUDES)
+#undef GTK_DISABLE_DEPRECATED
+#m4 _POP()
// This is for including the config header before any code (such as
// the #ifndef GTKMM_DISABLE_DEPRECATED in deprecated classes) is generated:
_CONFIGINCLUDE(gtkmmconfig.h)
@@ -26,7 +27,9 @@ _CONFIGINCLUDE(gtkmmconfig.h)
_DEFS(gtkmm,gtk)
_PINCLUDE(gtkmm/private/object_p.h)
-typedef struct _GtkTooltipsData GtkTooltipsData;
+#ifndef DOXYGEN_SHOULD_SKIP_THIS
+extern "C" { typedef struct _GtkTooltipsData GtkTooltipsData; }
+#endif
namespace Gtk
{
@@ -36,11 +39,11 @@ class Widget;
/** Tooltips are the messages that appear next to a widget when the mouse
* pointer is held over it for a short amount of time. They are especially
* helpful for adding more verbose descriptions of things such as buttons
- * in a toolbar.
+ * in a toolbar.
*
* This widget holds tooltips for other widgets. You should only need one
* Tooltip widget for all widgets you wish to add tips to.
- *
+ *
* @deprecated Use the Gtk::Tooltip API instead.
*/
class Tooltips : public Object
@@ -66,4 +69,3 @@ public:
};
} //namespace Gtk
-
diff --git a/gtk/src/treeview.hg b/gtk/src/treeview.hg
index 08ba0eb..409fd1c 100644
--- a/gtk/src/treeview.hg
+++ b/gtk/src/treeview.hg
@@ -1,5 +1,3 @@
-/* $Id: treeview.hg,v 1.45 2006/06/20 18:46:59 murrayc Exp $ */
-
/* Copyright(C) 2002 The gtkmm Development Team
*
* This library is free software; you can redistribute it and/or
@@ -17,6 +15,9 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+#m4 _PUSH(SECTION_CC_PRE_INCLUDES)
+#undef GTK_DISABLE_DEPRECATED
+#m4 _POP()
// This is for including the config header before any code (such as
// the #ifndef GTKMM_DISABLE_DEPRECATED in deprecated classes) is generated:
_CONFIGINCLUDE(gtkmmconfig.h)
@@ -70,7 +71,7 @@ namespace TreeView_Private
void _auto_store_on_cellrenderer_text_edited_string(const Glib::ustring& path_string, const Glib::ustring& new_text, int model_column, const Glib::RefPtr<Gtk::TreeModel>& model);
template <class ColumnType> inline
- void _auto_store_on_cellrenderer_text_edited_numerical(const Glib::ustring& path_string, const Glib::ustring& new_text, int model_column, const Glib::RefPtr<Gtk::TreeModel>& model);
+ void _auto_store_on_cellrenderer_text_edited_numerical(const Glib::ustring& path_string, const Glib::ustring& new_text, int model_column, const Glib::RefPtr<Gtk::TreeModel>& model);
template <class ColumnType> inline
void _auto_cell_data_func(Gtk::CellRenderer* cell, const Gtk::TreeModel::iterator& iter, int model_column, const Glib::ustring& format);
@@ -107,7 +108,7 @@ public:
/** A visible column in a Gtk::TreeView widget.
*/
typedef TreeViewColumn Column;
-
+
/** A selection object for Gtk::TreeView.
*/
typedef TreeSelection Selection;
@@ -123,7 +124,7 @@ public:
_WRAP_METHOD(Glib::RefPtr<TreeModel> get_model(), gtk_tree_view_get_model, refreturn)
_WRAP_METHOD(Glib::RefPtr<const TreeModel> get_model() const, gtk_tree_view_get_model, refreturn)
_WRAP_METHOD(void set_model(const Glib::RefPtr<TreeModel>& model), gtk_tree_view_set_model)
-
+
/** Remove the model from the TreeView.
*
* @see set_model().
@@ -131,27 +132,27 @@ public:
* @newin{2,8}
*/
void unset_model();
-
+
_WRAP_METHOD(Glib::RefPtr<TreeSelection> get_selection(), gtk_tree_view_get_selection, refreturn)
_WRAP_METHOD(Glib::RefPtr<const TreeSelection> get_selection() const, gtk_tree_view_get_selection, refreturn, constversion)
_WRAP_METHOD(Adjustment* get_hadjustment(), gtk_tree_view_get_hadjustment)
_WRAP_METHOD(const Adjustment* get_hadjustment() const, gtk_tree_view_get_hadjustment, constversion)
_WRAP_METHOD(void set_hadjustment(Adjustment& adjustment), gtk_tree_view_set_hadjustment)
-
+
/** This method removes the hadjustment.
* @see set_hadjustment().
*/
void unset_hadjustment();
-
+
_WRAP_METHOD(Adjustment* get_vadjustment(), gtk_tree_view_get_vadjustment)
_WRAP_METHOD(const Adjustment* get_vadjustment() const, gtk_tree_view_get_vadjustment, constversion)
_WRAP_METHOD(void set_vadjustment(Adjustment& adjustment), gtk_tree_view_set_vadjustment)
-
+
/** This method removes the vadjustment.
* @see set_vadjustment().
*/
void unset_vadjustment();
-
+
_WRAP_METHOD(bool get_headers_visible() const, gtk_tree_view_get_headers_visible)
_WRAP_METHOD(void set_headers_visible(bool headers_visible = true), gtk_tree_view_set_headers_visible)
_WRAP_METHOD(void columns_autosize(), gtk_tree_view_columns_autosize)
@@ -165,15 +166,15 @@ public:
/** Appends a View column with the appropriate CellRenderer for the Model column.
*
* The CellRenderer can only be created automatically for some basic
- * column types, such as Glib::ustring, int, double, bool, and Gdk::Pixbuf.
+ * column types, such as Glib::ustring, int, double, bool, and Gdk::Pixbuf.
* If the type is not supported then the following warning will be shown:
* GLib-GObject-WARNING **: unable to set property `text' of type
* `gchararray' from value of type `glibmm__CustomBoxed_t'.
*
- * If the default formatting is not sufficient, or the numeric type is
- * not supported, then you could use append_column_numeric(). Or you
+ * If the default formatting is not sufficient, or the numeric type is
+ * not supported, then you could use append_column_numeric(). Or you
* could create the TreeView::Column and/or CellRenderer
- * manually and use TreeViewColumn::set_cell_data_func() to provide a callback
+ * manually and use TreeViewColumn::set_cell_data_func() to provide a callback
* that converts the model value into a string representation with .
*
* @param title The text to be used in the title header of this column.
@@ -184,7 +185,7 @@ public:
int append_column(const Glib::ustring& title, const TreeModelColumn<ColumnType>& model_column);
/** Like append_column(), but only for numeric types, which will be displayed in the specified format.
- * This convenience template uses TreeView::Column::set_cell_data_func(), so the numeric formatting will
+ * This convenience template uses TreeView::Column::set_cell_data_func(), so the numeric formatting will
* be deactivated if you specify your own cell_data callback by calling set_cell_data_func() again.
*
* @param title The text to be used in the title header of this column.
@@ -194,7 +195,7 @@ public:
*/
template <class ColumnType> inline
int append_column_numeric(const Glib::ustring& title, const TreeModelColumn<ColumnType>& model_column, const Glib::ustring& format);
-
+
//TODO: danielk suggested use of Glib::Value to simplify/improve this.
/** Appends a View column with the appropriate CellRenderer for the Model
* column. The compiler will attempt to instantiate appropriate template
@@ -213,7 +214,7 @@ public:
int append_column_editable(const Glib::ustring& title, const TreeModelColumn<ColumnType>& model_column);
/** Like append_column_editable(), but only for numeric types, which will be displayed in the specified format.
- * This convenience template uses TreeView::Column::set_cell_data_func(), so the numeric formatting will
+ * This convenience template uses TreeView::Column::set_cell_data_func(), so the numeric formatting will
* be deactivated if you specify your own cell_data callback by calling set_cell_data_func() again.
*
* Note that the user's input will be interpreted as decimal (base 10), regardless of the @a format.
@@ -226,7 +227,7 @@ public:
template <class ColumnType> inline
int append_column_numeric_editable(const Glib::ustring& title, const TreeModelColumn<ColumnType>& model_column, const Glib::ustring& format);
-
+
/// Creates a View column containing the CellRenderer, and appends it.
int append_column(const Glib::ustring& title, CellRenderer& cell);
@@ -274,11 +275,11 @@ public:
int insert_column_editable(const Glib::ustring& title, const TreeModelColumn<ColumnType>& model_column, int position);
typedef TreeViewColumn::SlotCellData SlotCellData;
-
+
/**
* Inserts a new column into the TreeView with the given cell
* renderer and a SlotCellData to set cell renderer attributes
- * (normally using data from the model).
+ * (normally using data from the model).
*
* @param position Position to insert, -1 for append
* @param title column title
@@ -316,7 +317,7 @@ public:
_WRAP_METHOD(Glib::ListHandle<TreeViewColumn*> get_columns(), gtk_tree_view_get_columns)
_WRAP_METHOD(Glib::ListHandle<const TreeViewColumn*> get_columns() const, gtk_tree_view_get_columns)
-
+
_WRAP_METHOD(void move_column_after(TreeViewColumn& column, TreeViewColumn& base_column), gtk_tree_view_move_column_after)
/** This method moves column to the first position in the view.
@@ -324,14 +325,14 @@ public:
* @param column The view column that will be moved
*/
void move_column_to_start(TreeViewColumn& column);
-
+
_WRAP_METHOD(void set_expander_column(TreeViewColumn& column), gtk_tree_view_set_expander_column)
-
+
/** This method resets the expander arrow to the default - the first visible column.
- * @see set_expander_column().
+ * @see set_expander_column().
*/
void reset_expander_column();
-
+
_WRAP_METHOD(TreeViewColumn* get_expander_column(), gtk_tree_view_get_expander_column)
_WRAP_METHOD(const TreeViewColumn* get_expander_column() const, gtk_tree_view_get_expander_column, constversion)
@@ -362,7 +363,7 @@ public:
* allowing all columns to be dropped everywhere.
*/
void unset_column_drag_function();
-
+
_WRAP_METHOD(void scroll_to_point(int tree_x, int tree_y), gtk_tree_view_scroll_to_point)
/** Moves the alignments of tree view to the position specified by @a column and @a path.
@@ -460,7 +461,7 @@ public:
/** Calls the callback slot on all expanded rows.
* @param slot A callback function to be called.
- */
+ */
void map_expanded_rows(const SlotMapping& slot);
_IGNORE(gtk_tree_view_map_expanded_rows)
@@ -470,10 +471,10 @@ public:
//TODO: Add set_cursor(path, ModelColumnBase&, start_editing)?
_WRAP_METHOD(void set_cursor(const TreeModel::Path& path, TreeViewColumn& focus_column, bool start_editing = false), gtk_tree_view_set_cursor)
-
+
_WRAP_METHOD(void set_cursor(const TreeModel::Path& path, TreeViewColumn& focus_column, CellRenderer& focus_cell, bool start_editing = false), gtk_tree_view_set_cursor_on_cell)
-
+
/** Sets the current keyboard focus to be at path , and selects it.
* This is useful when you want to focus the user's attention on a particular row.
* This function is often followed by Gtk::widget::grab_focus(tree_view)
@@ -565,10 +566,10 @@ public:
_WRAP_METHOD(void get_visible_rect(Gdk::Rectangle& visible_rect) const, gtk_tree_view_get_visible_rect)
_WRAP_METHOD(void widget_to_tree_coords(int wx, int wy, int& tx, int& ty), gtk_tree_view_widget_to_tree_coords, deprecated "Use the const version")
- _WRAP_METHOD(void widget_to_tree_coords(int wx, int wy, int& tx, int& ty) const, gtk_tree_view_widget_to_tree_coords)
+ _WRAP_METHOD(void widget_to_tree_coords(int wx, int wy, int& tx, int& ty) const, gtk_tree_view_widget_to_tree_coords, deprecated)
_WRAP_METHOD(void tree_to_widget_coords(int tx, int ty, int& wx, int& wy), gtk_tree_view_tree_to_widget_coords, deprecated "Use the const version.")
- _WRAP_METHOD(void tree_to_widget_coords(int tx, int ty, int& wx, int& wy) const, gtk_tree_view_tree_to_widget_coords)
+ _WRAP_METHOD(void tree_to_widget_coords(int tx, int ty, int& wx, int& wy) const, gtk_tree_view_tree_to_widget_coords, deprecated)
bool get_visible_range(TreeModel::Path& start_path, TreeModel::Path& end_path) const;
_IGNORE(gtk_tree_view_get_visible_range)
@@ -595,22 +596,22 @@ public:
* @param actions The bitmask of possible actions for a drag from this widget.
*/
void enable_model_drag_source(Gdk::ModifierType start_button_mask = Gdk::MODIFIER_MASK,
- Gdk::DragAction actions = Gdk::ACTION_COPY | Gdk::ACTION_MOVE);
+ Gdk::DragAction actions = Gdk::ACTION_COPY | Gdk::ACTION_MOVE);
_IGNORE(gtk_tree_view_enable_model_drag_dest)
-
+
/** Turns the TreeView into a drop destination for automatic DND.
*
* @param targets The table of targets that the drag will support.
* @param actions The bitmask of possible actions for a drag from this widget.
- */
+ */
void enable_model_drag_dest(const ArrayHandle_TargetEntry& targets, Gdk::DragAction actions = Gdk::ACTION_COPY | Gdk::ACTION_MOVE);
/** Turns the TreeView into a drop destination for automatic DND. This uses the default
* "GTK_TREE_MODEL_ROW" target, which the TreeView can handle automatically.
*
* @param actions The bitmask of possible actions for a drag from this widget.
- */
+ */
void enable_model_drag_dest(Gdk::DragAction actions = Gdk::ACTION_COPY | Gdk::ACTION_MOVE);
/** Undoes the effect of enable_model_drag_source()
@@ -630,7 +631,7 @@ public:
* @param pos Specifies whether to drop before, after or into the row
*/
_WRAP_METHOD(void set_drag_dest_row(const TreeModel::Path& path, TreeViewDropPosition pos), gtk_tree_view_set_drag_dest_row)
-
+
/** Gets information about the row that is highlighted for feedback.
*
* @param path Return location for the path of the highlighted row
@@ -660,7 +661,7 @@ public:
typedef sigc::slot<bool, const Glib::RefPtr<TreeModel>&, int, const Glib::ustring&, const TreeModel::iterator&> SlotSearchEqual;
//SlotSearchEqual get_search_equal_func();
_IGNORE(gtk_tree_view_get_search_equal_func)
-
+
/** Sets the compare function for the interactive search capabilities.
*
* @param slot The compare function to use during the search
@@ -701,7 +702,7 @@ public:
* void on_row_separator(const Gtk::TreeModel& model, const Gtk::TreeModel::iterator& iter);
*/
typedef sigc::slot<bool, const Glib::RefPtr<TreeModel>&, const TreeModel::iterator&> SlotRowSeparator;
-
+
void set_row_separator_func(const SlotRowSeparator& slot);
_IGNORE(gtk_tree_view_set_row_separator_func, gtk_tree_view_get_row_separator_func)
@@ -829,7 +830,7 @@ _CONVERSION(`GtkTreeIter*',`const TreeModel::iterator&',`TreeModel::iterator(gtk
/// Get the treeview's model, but actually get the child model if it's a TreeModelFilter.
Glib::RefPtr<Gtk::TreeModel> _get_base_model();
-
+
protected:
#ifndef DOXYGEN_SHOULD_SKIP_THIS
@@ -873,13 +874,13 @@ template <class ColumnType> inline
int TreeView::append_column_numeric(const Glib::ustring& title, const TreeModelColumn<ColumnType>& model_column, const Glib::ustring& format)
{
TreeViewColumn* const pViewColumn = Gtk::manage( new TreeViewColumn(title) );
-
+
//Use a CellRendererText:
- //We don't use TreeView::Column::append_column(model_column) to generate an appropriate CellRenderer,
+ //We don't use TreeView::Column::append_column(model_column) to generate an appropriate CellRenderer,
//because that uses set_renderer(), which renders the model value using the automatic glib "transformations" (number-string conversions). As well as being unnecessary here, those automatic conversions can't handle all numeric types.
CellRenderer* pCellRenderer = manage( new CellRendererText() );
pViewColumn->pack_start(*pCellRenderer);
-
+
//Some compilers don't like us to give the pointer to a template function directly to sigc::ptr_fun():
typedef void (*type_fptr)(Gtk::CellRenderer* cell, const Gtk::TreeModel::iterator& iter, int model_column, const Glib::ustring& format);
@@ -891,7 +892,7 @@ int TreeView::append_column_numeric(const Glib::ustring& title, const TreeModelC
sigc::bind<-1>( sigc::ptr_fun(fptr), format),
model_column.index()
);
-
+
pViewColumn->set_cell_data_func(*pCellRenderer, slot);
return append_column(*pViewColumn);
@@ -903,7 +904,7 @@ template <class ColumnType> inline
int TreeView::append_column_numeric_editable(const Glib::ustring& title, const TreeModelColumn<ColumnType>& model_column, const Glib::ustring& format)
{
int cols_count = append_column_numeric(title, model_column, format);
-
+
//connect signal handlers for auto-storing of edited cell data
//Note: This will only work for base-10 (decimal) formatted numbers:
CellRenderer *const cell = get_column_cell_renderer(cols_count - 1);
@@ -911,7 +912,7 @@ int TreeView::append_column_numeric_editable(const Glib::ustring& title, const T
{
TreeView_Private::_connect_auto_store_editable_signal_handler<ColumnType>(this, cell, model_column);
}
-
+
return cols_count;
}
@@ -981,14 +982,14 @@ void _connect_auto_store_editable_signal_handler(Gtk::TreeView* this_p, Gtk::Cel
//Connect to the appropriate signal, sending the model_column too
- sigc::slot<void, const Glib::ustring&, int> slot_temp =
+ sigc::slot<void, const Glib::ustring&, int> slot_temp =
sigc::bind<-1>(
- sigc::mem_fun(*this_p, &Gtk::TreeView::_auto_store_on_cellrenderer_toggle_edited_with_model),
+ sigc::mem_fun(*this_p, &Gtk::TreeView::_auto_store_on_cellrenderer_toggle_edited_with_model),
this_p->_get_base_model()
);
pCellToggle->signal_toggled().connect(
- sigc::bind<-1>(
+ sigc::bind<-1>(
slot_temp,
model_column.index()
)
@@ -1020,7 +1021,7 @@ void _connect_auto_store_editable_signal_handler(Gtk::TreeView* this_p, Gtk::Cel
//We use bind<-1> twice here, instead of using bind() once, because some compilers need the extra hint.
pCellText->signal_edited().connect(
sigc::bind<-1>(
- sigc::bind<-1>(
+ sigc::bind<-1>(
sigc::ptr_fun(fptr),
this_p->_get_base_model() ),
model_column.index()
@@ -1052,13 +1053,13 @@ void _connect_auto_store_editable_signal_handler(Gtk::TreeView* this_p, Gtk::Cel
//We use bind<-1> twice here, instead of using bind() once, because some compilers need the extra hint.
pCellText->signal_edited().connect(
sigc::bind<-1>(
- sigc::bind<-1>(
+ sigc::bind<-1>(
sigc::ptr_fun(fptr),
this_p->_get_base_model() ),
model_column.index()
)
);
-
+
}
}
@@ -1084,13 +1085,13 @@ void _connect_auto_store_editable_signal_handler(Gtk::TreeView* this_p, Gtk::Cel
//We use bind<-1> twice here, instead of using bind() once, because some compilers need the extra hint.
pCellText->signal_edited().connect(
sigc::bind<-1>(
- sigc::bind<-1>(
+ sigc::bind<-1>(
sigc::ptr_fun(fptr),
this_p->_get_base_model() ),
model_column.index()
)
);
-
+
}
}
@@ -1116,13 +1117,13 @@ void _connect_auto_store_editable_signal_handler(Gtk::TreeView* this_p, Gtk::Cel
//We use bind<-1> twice here, instead of using bind() once, because some compilers need the extra hint.
pCellText->signal_edited().connect(
sigc::bind<-1>(
- sigc::bind<-1>(
+ sigc::bind<-1>(
sigc::ptr_fun(fptr),
this_p->_get_base_model() ),
model_column.index()
)
);
-
+
}
}
@@ -1148,7 +1149,7 @@ void _connect_auto_store_editable_signal_handler(Gtk::TreeView* this_p, Gtk::Cel
//We use bind<-1> twice here, instead of using bind() once, because some compilers need the extra hint.
pCellText->signal_edited().connect(
sigc::bind<-1>(
- sigc::bind<-1>(
+ sigc::bind<-1>(
sigc::ptr_fun(fptr),
this_p->_get_base_model() ),
model_column.index()
@@ -1179,7 +1180,7 @@ void _connect_auto_store_editable_signal_handler(Gtk::TreeView* this_p, Gtk::Cel
//We use bind<-1> twice here, instead of using bind() once, because some compilers need the extra hint.
pCellText->signal_edited().connect(
sigc::bind<-1>(
- sigc::bind<-1>(
+ sigc::bind<-1>(
sigc::ptr_fun(fptr),
this_p->_get_base_model() ),
model_column.index()
@@ -1234,8 +1235,6 @@ void _connect_auto_store_editable_signal_handler(Gtk::TreeView* this_p, Gtk::Cel
model_column.index()
)
);
-
-
}
}
@@ -1323,6 +1322,4 @@ void _auto_cell_data_func(Gtk::CellRenderer* cell, const Gtk::TreeModel::iterato
} // namespace TreeView_Private
#endif //DOXYGEN_SHOULD_SKIP_THIS
-
} // namespace Gtk
-
diff --git a/gtk/src/treeviewcolumn.hg b/gtk/src/treeviewcolumn.hg
index e7983ad..8a003a4 100644
--- a/gtk/src/treeviewcolumn.hg
+++ b/gtk/src/treeviewcolumn.hg
@@ -1,5 +1,3 @@
-/* $Id: treeviewcolumn.hg,v 1.16 2006/07/08 16:31:38 murrayc Exp $ */
-
/* Copyright(C) 2002 The gtkmm Development Team
*
* This library is free software; you can redistribute it and/or
@@ -17,6 +15,9 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+#m4 _PUSH(SECTION_CC_PRE_INCLUDES)
+#undef GTK_DISABLE_DEPRECATED
+#m4 _POP()
// This is for including the config header before any code (such as
// the #ifndef GTKMM_DISABLE_DEPRECATED in deprecated classes) is generated:
_CONFIGINCLUDE(gtkmmconfig.h)
@@ -31,16 +32,14 @@ _CONFIGINCLUDE(gtkmmconfig.h)
_DEFS(gtkmm,gtk)
_PINCLUDE(gtkmm/private/object_p.h)
-
namespace Gtk
{
_CC_INCLUDE(gtk/gtk.h)
_WRAP_ENUM(TreeViewColumnSizing, GtkTreeViewColumnSizing)
-
-// We use GTKMM_API here because gcc needs the extra help on win32 , even
-// when using --export-all and auto-import.
+// We use GTKMM_API here because gcc needs the extra help on win32 , even
+// when using --export-all and auto-import.
// See http://bugzilla.gnome.org/show_bug.cgi?id=309030.
//TODO: This should derive+implement from CellLayout when we can break ABI.
@@ -112,6 +111,8 @@ public:
*/
const CellRenderer* get_first_cell_renderer() const;
+ // TODO: Should be deprecated, but we cannot derive from CellLayout
+ // without breaking API and ABI.
_WRAP_METHOD(Glib::ListHandle<CellRenderer*> get_cell_renderers(), gtk_tree_view_column_get_cell_renderers)
_WRAP_METHOD(Glib::ListHandle<const CellRenderer*> get_cell_renderers() const, gtk_tree_view_column_get_cell_renderers)
@@ -150,11 +151,11 @@ public:
*
* @param cell_renderer A Gtk::CellRenderer
* @param slot The callback slot to use. Create this with sigc::mem_fun(), or sigc::ptr_fun().
- */
+ */
void set_cell_data_func(CellRenderer& cell_renderer, const SlotCellData& slot);
/** Removes a previously set callback slot. See set_cell_data_func().
- */
+ */
void unset_cell_data_func(CellRenderer& cell_renderer);
_WRAP_METHOD(void clear_attributes(CellRenderer& cell_renderer), gtk_tree_view_column_clear_attributes)
@@ -281,7 +282,6 @@ void TreeViewColumn::pack_end(const TreeModelColumn<T_ModelColumnType>& column,
set_renderer(*pCellRenderer, column);
}
-
template <class T_ModelColumnType> inline
TreeViewColumn::TreeViewColumn(const Glib::ustring& title,
const TreeModelColumn<T_ModelColumnType>& column)
@@ -292,9 +292,6 @@ TreeViewColumn::TreeViewColumn(const Glib::ustring& title,
pack_start(column, true /* expand */);
}
-
-
#endif /* DOXYGEN_SHOULD_SKIP_THIS */
} // namespace Gtk
-
diff --git a/gtk/src/widget.hg b/gtk/src/widget.hg
index 41ac60c..623231e 100644
--- a/gtk/src/widget.hg
+++ b/gtk/src/widget.hg
@@ -1,5 +1,3 @@
-/* $Id: widget.hg,v 1.48 2006/09/19 20:08:42 murrayc Exp $ */
-
/* Copyright (C) 2002, 2003 The gtkmm Development Team
*
* This library is free software; you can redistribute it and/or
@@ -16,11 +14,15 @@
* License along with this library; if not, write to the Free
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-
+
+#m4 _PUSH(SECTION_CC_PRE_INCLUDES)
+#undef GTK_DISABLE_DEPRECATED
+#m4 _POP()
+_CONFIGINCLUDE(gtkmmconfig.h)
+
#include <pangomm/context.h>
#include <pangomm/layout.h>
-#include <gtkmmconfig.h> //For GTKMM_ATKMM_ENABLED
#ifdef GTKMM_ATKMM_ENABLED
#include <atkmm/object.h>
#include <atkmm/implementor.h>
@@ -50,7 +52,6 @@ extern "C"
{
typedef struct _GtkTargetEntry GtkTargetEntry;
}
-
#endif /* DOXYGEN_SHOULD_SKIP_THIS */
namespace Gtk
@@ -77,8 +78,6 @@ typedef GtkRequisition Requisition;
// a typedef of GdkRectangle.
typedef Gdk::Rectangle Allocation;
-
-
/** @defgroup Widgets Widgets
*/
@@ -126,7 +125,6 @@ public:
_WRAP_METHOD(void hide_all(), gtk_widget_hide_all)
-
/* QUEUE DRAWS */
_WRAP_METHOD(void queue_draw(), gtk_widget_queue_draw)
@@ -137,15 +135,15 @@ public:
* subclass. Obtains the preferred size of a widget. The container
* uses this information to arrange its child widgets and decide what
* size allocations to give them with size_allocate().
- *
+ *
* You can also call this function from an application, with some
* caveats. Most notably, getting a size request requires the widget
* to be associated with a screen, because font information may be
* needed. Multihead-aware applications should keep this in mind.
- *
+ *
* Also remember that the size request is not necessarily the size
* a widget will actually be allocated.
- *
+ *
* See also get_child_requisition().
* @result A Gtk::Requisition.
*/
@@ -169,7 +167,7 @@ public:
//GList* gtk_widget_list_accel_closures();
//TODO: Or maybe it is useless: gboolean gtk_widget_can_activate_accel(GtkWidget *widget, guint signal_id)
-
+
_WRAP_METHOD(bool mnemonic_activate(bool group_cycling), gtk_widget_mnemonic_activate)
_IGNORE(gtk_widget_can_activate_accel)
@@ -301,7 +299,7 @@ public:
_WRAP_METHOD(Glib::RefPtr<Gdk::Window> get_root_window(), gtk_widget_get_root_window, refreturn)
_WRAP_METHOD(Glib::RefPtr<const Gdk::Window> get_root_window() const, gtk_widget_get_root_window, refreturn, constversion)
-
+
_WRAP_METHOD(Glib::RefPtr<Settings> get_settings(), gtk_widget_get_settings, refreturn)
_WRAP_METHOD(Glib::RefPtr<Clipboard> get_clipboard(const Glib::ustring& selection), gtk_widget_get_clipboard, refreturn)
@@ -325,7 +323,7 @@ public:
* The returned pixmap can be empty.
*
* @result A Gdk::Pixmap snapshot of the widget
- *
+ *
* @newin{2,14}
*/
Glib::RefPtr<Gdk::Pixmap> get_snapshot() const;
@@ -401,7 +399,7 @@ public:
/** Sets the cursor color to use in a widget, overriding the
* cursor_color and secondary_cursor_color
- * style properties. All other style values are left untouched.
+ * style properties. All other style values are left untouched.
* See also modify_style().
* See also unset_cursor().
*
@@ -411,7 +409,7 @@ public:
* @newin{2,12}
*/
_WRAP_METHOD(void modify_cursor(const Gdk::Color& primary, const Gdk::Color& secondary), gtk_widget_modify_cursor)
-
+
/// See modify_cursor().
void unset_cursor();
@@ -425,7 +423,7 @@ public:
* All other style values are left untouched. See also modify_style().
*/
void unset_fg(StateType state);
-
+
/** Undo the effect of previous calls to modify_bg() for a particular state.
* All other style values are left untouched. See also modify_style().
*/
@@ -462,7 +460,6 @@ public:
_WRAP_METHOD(void reset_rc_styles(),gtk_widget_reset_rc_styles)
-
// PUSH/POP - these are used to create widgets. Hidden arguments to override the defaults.
_WRAP_METHOD(static void push_colormap(const Glib::RefPtr<const Gdk::Colormap>& cmap), gtk_widget_push_colormap)
_WRAP_METHOD(static void pop_colormap(), gtk_widget_pop_colormap)
@@ -470,7 +467,6 @@ public:
_WRAP_METHOD(static void push_composite_child(), gtk_widget_push_composite_child)
_WRAP_METHOD(static void pop_composite_child(), gtk_widget_pop_composite_child)
-
/* DEFAULTS */
_WRAP_METHOD(static void set_default_colormap(const Glib::RefPtr<const Gdk::Colormap>& colormap), gtk_widget_set_default_colormap)
@@ -478,7 +474,6 @@ public:
_WRAP_METHOD(static Glib::RefPtr<Gdk::Colormap> get_default_colormap(), gtk_widget_get_default_colormap, refreturn)
_WRAP_METHOD(static Glib::RefPtr<Gdk::Visual> get_default_visual(), gtk_widget_get_default_visual, refreturn)
-
/* Directionality of Text */
_WRAP_METHOD(void set_direction(TextDirection dir), gtk_widget_set_direction)
@@ -488,15 +483,13 @@ public:
_WRAP_METHOD(static void set_default_direction(TextDirection dir), gtk_widget_set_default_direction)
_WRAP_METHOD(static TextDirection get_default_direction(), gtk_widget_get_default_direction)
-
/* Shape masking */
_WRAP_METHOD(void shape_combine_mask(const Glib::RefPtr<const Gdk::Bitmap>& shape_mask, int offset_x, int offset_y), gtk_widget_shape_combine_mask)
void unset_shape_combine_mask();
_WRAP_METHOD(void input_shape_combine_mask(const Glib::RefPtr<const Gdk::Bitmap>& shape_mask, int offset_x, int offset_y), gtk_widget_input_shape_combine_mask)
void unset_input_shape_combine_mask();
-
- // must be realized
+ // must be realized
_WRAP_METHOD(void reset_shapes(),gtk_widget_reset_shapes)
/* Paths */
@@ -509,11 +502,10 @@ public:
_WRAP_METHOD(Glib::ListHandle<const Widget*> list_mnemonic_labels() const, gtk_widget_list_mnemonic_labels)
_WRAP_METHOD(void add_mnemonic_label(Widget& label), gtk_widget_add_mnemonic_label)
_WRAP_METHOD(void remove_mnemonic_label(Widget& label), gtk_widget_remove_mnemonic_label)
-
//TODO: Should drag_get_data() be const?
- _WRAP_METHOD(void drag_get_data(const Glib::RefPtr<Gdk::DragContext>& context, Glib::ustring& target, guint32 time), gtk_drag_get_data, deprecated "Use the version with the const target parameter.")
- _WRAP_METHOD(void drag_get_data(const Glib::RefPtr<Gdk::DragContext>& context, const Glib::ustring& target, guint32 time), gtk_drag_get_data)
+ _WRAP_METHOD(void drag_get_data(const Glib::RefPtr<Gdk::DragContext>& context, Glib::ustring& target, guint32 time), gtk_drag_get_data, deprecated "Use the version with the const target parameter.")
+ _WRAP_METHOD(void drag_get_data(const Glib::RefPtr<Gdk::DragContext>& context, const Glib::ustring& target, guint32 time), gtk_drag_get_data)
_WRAP_METHOD(void drag_highlight(), gtk_drag_highlight)
_WRAP_METHOD(void drag_unhighlight(), gtk_drag_unhighlight)
@@ -531,10 +523,10 @@ public:
_WRAP_METHOD(Glib::RefPtr<const TargetList> drag_dest_get_target_list() const, gtk_drag_dest_get_target_list, refreturn, constversion)
_WRAP_METHOD(void drag_dest_set_target_list(const Glib::RefPtr<TargetList>& target_list), gtk_drag_dest_set_target_list)
- _WRAP_METHOD(void drag_dest_add_text_targets(), gtk_drag_dest_add_text_targets)
+ _WRAP_METHOD(void drag_dest_add_text_targets(), gtk_drag_dest_add_text_targets)
_WRAP_METHOD(void drag_dest_add_image_targets(), gtk_drag_dest_add_image_targets)
_WRAP_METHOD(void drag_dest_add_uri_targets(), gtk_drag_dest_add_uri_targets)
-
+
void drag_source_set(const ArrayHandle_TargetEntry& targets, Gdk::ModifierType start_button_mask = Gdk::MODIFIER_MASK, Gdk::DragAction actions = Gdk::ACTION_COPY);
_IGNORE(gtk_drag_source_set)
@@ -548,7 +540,7 @@ public:
_WRAP_METHOD(void drag_source_add_text_targets(), gtk_drag_source_add_text_targets)
_WRAP_METHOD(void drag_source_add_uri_targets(), gtk_drag_source_add_uri_targets)
_WRAP_METHOD(void drag_source_add_image_targets(), gtk_drag_source_add_image_targets)
-
+
_WRAP_METHOD(Glib::RefPtr<Gdk::DragContext> drag_begin(const Glib::RefPtr<TargetList>& targets, Gdk::DragAction actions, int button, GdkEvent* event), gtk_drag_begin, refreturn)
_WRAP_METHOD(bool drag_check_threshold(int start_x, int start_y, int current_x, int current_y), gtk_drag_check_threshold)
_IGNORE(_gtk_drag_source_handle_event, _gtk_drag_dest_handle_event)
@@ -556,8 +548,6 @@ public:
//These should be a method of Gdk::DragContext, but gdkmm can't depend on gtkmm.
static Widget* drag_get_source_widget(const Glib::RefPtr<Gdk::DragContext>& context);
void drag_set_as_icon(const Glib::RefPtr<Gdk::DragContext>& context, int hot_x, int hot_y);
-
-
_WRAP_METHOD(void queue_resize_no_redraw(), gtk_widget_queue_resize_no_redraw)
_WRAP_METHOD(bool get_no_show_all() const, gtk_widget_get_no_show_all)
@@ -586,7 +576,7 @@ public:
_WRAP_METHOD(Glib::ustring get_tooltip_markup() const, gtk_widget_get_tooltip_markup)
_WRAP_METHOD(void set_has_tooltip(bool has_tooltip = TRUE), gtk_widget_set_has_tooltip)
_WRAP_METHOD(bool get_has_tooltip() const, gtk_widget_get_has_tooltip)
-
+
/* FLAGS */
//: Returns property {flags.nowindow}.
@@ -606,7 +596,7 @@ _DEPRECATE_IFDEF_START
/** @deprecated: Use get_is_drawable() instead.
*/
bool is_drawable() const;
-
+
/** @deprecated: Use get_visible() instead.
*/
bool is_visible() const;
@@ -647,7 +637,7 @@ _DEPRECATE_IFDEF_END
_WRAP_METHOD(bool is_composited() const, gtk_widget_is_composited)
- //From gtkaction.h:
+ // TODO: Deprecated, but we cannot replace them without breaking API and ABI.
_WRAP_METHOD(Glib::RefPtr<Action> get_action(), gtk_widget_get_action, refreturn)
_WRAP_METHOD(Glib::RefPtr<const Action> get_action() const, gtk_widget_get_action, refreturn, constversion)
@@ -667,8 +657,8 @@ _DEPRECATE_IFDEF_END
//: Emitted on realization of a widget.
//- See {flags.realized}. This is also responsible for
- //- setting {flags.realized} when it is done. Therefore,
- //- when overriding the impl method, you should call the
+ //- setting {flags.realized} when it is done. Therefore,
+ //- when overriding the impl method, you should call the
//- default realize method.
_WRAP_SIGNAL(void realize(),"realize")
@@ -680,29 +670,29 @@ _DEPRECATE_IFDEF_END
_WRAP_SIGNAL(void size_allocate(Allocation& allocation), "size_allocate")
// Changed signals -- inform widget of internal changes.
-// We rename parent_set => parent_changed
-// and style_set => style_changed
+// We rename parent_set => parent_changed
+// and style_set => style_changed
// to avoid confusion with set_parent and set_style.
_WRAP_SIGNAL(void state_changed(Gtk::StateType previous_state), "state_changed")
//: Informs objects that their parent changed.
- //- The widget passed is the former parent, which may be 0 if
+ //- The widget passed is the former parent, which may be 0 if
//- there was no parent. (was parent_set in GTK+)
_WRAP_SIGNAL(void parent_changed(Widget* previous_parent), "parent_set")
_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
+//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
+ /** 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.
+ * @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")
@@ -710,8 +700,8 @@ _DEPRECATE_IFDEF_END
_WRAP_SIGNAL(void grab_notify(bool was_grabbed), "grab_notify")
- /** The ::child-notify signal is emitted for each child property that has
- * changed on an object. The signal's detail holds the property name.
+ /** The ::child-notify signal is emitted for each child property that has
+ * changed on an object. The signal's detail holds the property name.
*
* @param pspec The GParamSpec of the changed child property.
*/
@@ -741,7 +731,7 @@ _DEPRECATE_IFDEF_END
* hides the window.
*
* @param event the event which triggered this signal.
- * @result true to stop other handlers from being invoked for the event,
+ * @result true to stop other handlers from being invoked for the event,
* or false to propagate the event. further.
*/
_WRAP_SIGNAL(bool delete_event(GdkEventAny* event), "delete_event")
@@ -765,12 +755,12 @@ dnl
//: Event triggered by window requiring a refresh.
//- Expose events cover a rectangular area that was covered
//- or obscured by another window. That area is now exposed
- //- and thus is needs to be redrawn.
+ //- and thus is needs to be redrawn.
//-
//- If the application is not capable of redrawing sections
//- it should watch the count field and only draw on the last
- //- even indicated. This is important for things such as
- //- Gtk::DrawingArea.
+ //- even indicated. This is important for things such as
+ //- Gtk::DrawingArea.
_WRAP_SIGNAL(bool expose_event(GdkEventExpose* event), "expose_event")
//: Event triggered by a key press will widget has focus.
@@ -784,7 +774,7 @@ dnl
//: Event triggered by pointer leaving widget area.
_WRAP_SIGNAL(bool leave_notify_event(GdkEventCrossing* event), "leave_notify_event")
-
+
//: Event triggered by a window resizing.
_WRAP_SIGNAL(bool configure_event(GdkEventConfigure* event), "configure_event")
_WRAP_SIGNAL(bool focus_in_event(GdkEventFocus* event), "focus_in_event")
@@ -806,19 +796,19 @@ dnl
//so that we can write special code to wrap the non-const SelectionData& output parameters:
_WRAP_SIGNAL(void selection_get(SelectionData& selection_data, guint info, guint time), "selection_get", custom_c_callback)
_WRAP_SIGNAL(void selection_received(const SelectionData& selection_data, guint time), "selection_received")
-
+
#m4 _CONVERSION(`GdkDragContext*',`const Glib::RefPtr<Gdk::DragContext>&',Glib::wrap($3, true))
- /** The drag_begin signal is emitted on the drag source when a drag is started.
+ /** The drag_begin signal is emitted on the drag source when a drag is started.
* A typical reason to connect to this signal is to set up a custom drag icon with
* drag_source_set_icon().
*
* @param context the drag context
*/
_WRAP_SIGNAL(void drag_begin(const Glib::RefPtr<Gdk::DragContext>& context), "drag_begin")
-
- /** The drag_end signal is emitted on the drag source when a drag is finished.
- * A typical reason to connect to this signal is to undo things done in the drag-begin
+
+ /** The drag_end signal is emitted on the drag source when a drag is finished.
+ * A typical reason to connect to this signal is to undo things done in the drag-begin
* signal handler.
*
* @param context the drag context.
@@ -827,7 +817,7 @@ dnl
/** The drag_data_get signal is emitted on the drag source when the drop site requests
* the data which is dragged. It is the responsibility of the signal handler to fill @a data
- * with the data in the format which is indicated by @a info. See SelectionData::set() and
+ * with the data in the format which is indicated by @a info. See SelectionData::set() and
* SelectionData::set_text().
*
* @param context: the drag context.
@@ -836,42 +826,42 @@ dnl
* @param time the timestamp at which the data was requested.
*/
_WRAP_SIGNAL(void drag_data_get(const Glib::RefPtr<Gdk::DragContext>& context, SelectionData& selection_data, guint info, guint time), "drag_data_get", custom_c_callback)
-
+
/** The drag_data_delete signal is emitted on the drag source when a drag with the action
* Gdk::ACTION_MOVE is successfully completed. The signal handler is responsible for deleting
* the data that has been dropped. What "delete" means, depends on the context of the drag
- * operation.
+ * operation.
*
* @param context the drag context.
*/
_WRAP_SIGNAL(void drag_data_delete(const Glib::RefPtr<Gdk::DragContext>& context), "drag_data_delete")
_WRAP_SIGNAL(bool drag_failed(const Glib::RefPtr<Gdk::DragContext>& context, DragResult result), "drag_failed", no_default_handler)
-
+
/** The drag_leave signal is emitted on the drop site when the cursor leaves the widget.
- * A typical reason to connect to this signal is to undo things done in the drag_motion signal handler,
+ * A typical reason to connect to this signal is to undo things done in the drag_motion signal handler,
* e.g. undo highlighting with drag_unhighlight().
*
* @param context the drag context.
* @param time the timestamp of the motion event.
*/
_WRAP_SIGNAL(void drag_leave(const Glib::RefPtr<Gdk::DragContext>& context, guint time), "drag_leave")
-
+
/** The drag_motion signal is emitted on the drop site when the user moves the cursor over
- * the widget during a drag. The signal handler must determine whether the cursor position is in
+ * the widget during a drag. The signal handler must determine whether the cursor position is in
* a drop zone or not. If it is not in a drop zone, it returns false and no further processing is
* necessary. Otherwise, the handler returns true. In this case, the handler is responsible for
* providing the necessary information for displaying feedback to the user, by calling
* drag_status(). If the decision whether the drop will be accepted or rejected can't be made
- * based solely on the cursor position and the type of the data, the handler may inspect the dragged
- * data by calling drag_get_data() and defer the drag_status() call to the drag_data_received
- * handler.
+ * based solely on the cursor position and the type of the data, the handler may inspect the dragged
+ * data by calling drag_get_data() and defer the drag_status() call to the drag_data_received
+ * handler.
*
* Note that there is no drag_enter signal. The drag receiver has to keep track of whether
* he has received any drag_motion signals since the last drag_leave and if not, treat the
- * drag_motion signal as an "enter" signal. Upon an "enter", the handler will typically highlight
+ * drag_motion signal as an "enter" signal. Upon an "enter", the handler will typically highlight
* the drop site with drag_highlight().
- *
+ *
* @param context the drag context.
* @param x the x coordinate of the current cursor position.
* @param y the y coordinate of the current cursor position.
@@ -879,14 +869,14 @@ dnl
* @result whether the cursor position is in a drop zone.
*/
_WRAP_SIGNAL(bool drag_motion(const Glib::RefPtr<Gdk::DragContext>& context, int x, int y, guint time), "drag_motion")
-
+
/** The drag_drop signal is emitted on the drop site when the user drops the data
- * onto the widget. The signal handler must determine whether the cursor position is in
- * a drop zone or not. If it is not in a drop zone, it returns false and no further
- * processing is necessary. Otherwise, the handler returns true. In this case, the handler
+ * onto the widget. The signal handler must determine whether the cursor position is in
+ * a drop zone or not. If it is not in a drop zone, it returns false and no further
+ * processing is necessary. Otherwise, the handler returns true. In this case, the handler
* must ensure that gtk_drag_finish() is called to let the source know that the drop is done.
* The call to gtk_drag_finish() can be done either directly or in a drag_data_received handler
- * which gets triggered by calling drop_get_data() to receive the data for one or more of the
+ * which gets triggered by calling drop_get_data() to receive the data for one or more of the
* supported targets.
*
* @param context the drag context.
@@ -896,17 +886,16 @@ dnl
* @result whether the cursor position is in a drop zone
*/
_WRAP_SIGNAL(bool drag_drop(const Glib::RefPtr<Gdk::DragContext>& context, int x, int y, guint time), "drag_drop")
-
-
- /** The drag_data_received signal is emitted on the drop site when the dragged data has been
- * received. If the data was received in order to determine whether the drop will be accepted,
- * the handler is expected to call drag_status() and <emphasis>not</emphasis> finish the drag.
- * If the data was received in response to a drag_drop signal (and this is the last target to be
- * received), the handler for this signal is expected to process the received data and then call
- * drag_finish(), setting the @a success parameter depending on whether the data was processed
+
+ /** The drag_data_received signal is emitted on the drop site when the dragged data has been
+ * received. If the data was received in order to determine whether the drop will be accepted,
+ * the handler is expected to call drag_status() and <emphasis>not</emphasis> finish the drag.
+ * If the data was received in response to a drag_drop signal (and this is the last target to be
+ * received), the handler for this signal is expected to process the received data and then call
+ * drag_finish(), setting the @a success parameter depending on whether the data was processed
* successfully.
*
- * The handler may inspect and modify @drag_context->action before calling gtk_drag_finish(),
+ * The handler may inspect and modify @drag_context->action before calling gtk_drag_finish(),
* e.g. to implement %Gdk::ACTION_ASK.
*
* @param drag_context the drag context
@@ -923,14 +912,14 @@ dnl
/** @deprecated This should never have been in the API. It was never meaningful.
*/
_WRAP_SIGNAL(Glib::RefPtr<Atk::Object> get_accessible(), "get_accessible", ifdef GTKMM_ATKMM_ENABLED, refreturn, deprecated)
-
+
_WRAP_SIGNAL(void screen_changed(const Glib::RefPtr<Gdk::Screen>& previous_screen), "screen_changed")
_WRAP_SIGNAL(void composited_changed(), "composited_changed", no_default_handler)
-//TODO: The signal_id is very C-like here:
+//TODO: The signal_id is very C-like here:
//_WRAP_SIGNAL(bool can_activate_accel(guint signal_id), "can_activate_accel")
-
+
_WRAP_SIGNAL(bool popup_menu(), "popup_menu", no_default_handler) //Note that popup-menu is a keybinding signal, but is really meant to be wrapped.
//Keybinding signals:
@@ -1016,7 +1005,6 @@ dnl
};
-
#ifndef DOXYGEN_SHOULD_SKIP_THIS
//The parameter name is "the_property_name" to avoid a warning because there is a method with the "property_name" name.
@@ -1034,4 +1022,3 @@ void Widget::get_style_property(const Glib::ustring& the_property_name, Property
#endif /* DOXYGEN_SHOULD_SKIP_THIS */
} // namespace Gtk
-
diff --git a/tools/extra_defs_gen/generate_defs_gtk.cc b/tools/extra_defs_gen/generate_defs_gtk.cc
index b1ff175..553d080 100644
--- a/tools/extra_defs_gen/generate_defs_gtk.cc
+++ b/tools/extra_defs_gen/generate_defs_gtk.cc
@@ -1,7 +1,4 @@
-/* $Id$ */
-
-/* generate_defs_gtk.cc
- *
+/*
* Copyright (C) 2001 The Free Software Foundation
*
* This library is free software; you can redistribute it and/or
@@ -19,16 +16,24 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include "glibmm_generate_extra_defs/generate_extra_defs.h"
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+// We always need to generate the .defs for all types because the code
+// using deprecated API is generated unconditionally and only disabled
+// at compile time.
+#undef ATK_DISABLE_DEPRECATED
+#undef GDK_DISABLE_DEPRECATED
+#undef GTK_DISABLE_DEPRECATED
+
+#include <glibmm_generate_extra_defs/generate_extra_defs.h>
#include <gdk/gdk.h>
#include <gtk/gtk.h>
+#ifndef G_OS_WIN32
+# include <gtk/gtkunixprint.h>
+#endif
-#if !defined(G_OS_WIN32)
-#include <gtk/gtkunixprint.h>
-#endif /* G_OS_WIN32 */
-
-
-int main (int argc, char *argv[])
+int main(int argc, char** argv)
{
gtk_init(&argc, &argv);
@@ -68,7 +73,7 @@ int main (int argc, char *argv[])
<< get_defs( GDK_TYPE_SCREEN )
<< get_defs( GDK_TYPE_VISUAL )
<< get_defs( GDK_TYPE_WINDOW )
-
+
<< get_defs( GTK_TYPE_ABOUT_DIALOG )
<< get_defs( GTK_TYPE_ACCEL_GROUP )
<< get_defs( GTK_TYPE_ACCEL_LABEL )
@@ -93,17 +98,17 @@ int main (int argc, char *argv[])
<< get_defs( GTK_TYPE_CELL_RENDERER )
<< get_defs( GTK_TYPE_CELL_RENDERER_ACCEL )
<< get_defs( GTK_TYPE_CELL_RENDERER_COMBO )
- << get_defs( GTK_TYPE_CELL_RENDERER_PROGRESS )
+ << get_defs( GTK_TYPE_CELL_RENDERER_PROGRESS )
<< get_defs( GTK_TYPE_CELL_RENDERER_TEXT )
<< get_defs( GTK_TYPE_CELL_RENDERER_TOGGLE )
<< get_defs( GTK_TYPE_CELL_RENDERER_PIXBUF )
<< get_defs( GTK_TYPE_CELL_RENDERER_PROGRESS )
- << get_defs( GTK_TYPE_CELL_RENDERER_SPIN )
- << get_defs( GTK_TYPE_CLIPBOARD )
- << get_defs( GTK_TYPE_COLOR_BUTTON )
+ << get_defs( GTK_TYPE_CELL_RENDERER_SPIN )
+ << get_defs( GTK_TYPE_CLIPBOARD )
+ << get_defs( GTK_TYPE_COLOR_BUTTON )
<< get_defs( GTK_TYPE_COLOR_SELECTION )
<< get_defs( GTK_TYPE_COMBO ) /* Deprecated */
- << get_defs( GTK_TYPE_COMBO_BOX )
+ << get_defs( GTK_TYPE_COMBO_BOX )
<< get_defs( GTK_TYPE_CONTAINER )
<< get_defs( GTK_TYPE_CTREE ) /* Deprecated */
<< get_defs( GTK_TYPE_CELL_VIEW )
@@ -116,12 +121,12 @@ int main (int argc, char *argv[])
<< get_defs( GTK_TYPE_EVENT_BOX )
<< get_defs( GTK_TYPE_EXPANDER )
<< get_defs( GTK_TYPE_FILE_FILTER )
- << get_defs( GTK_TYPE_FILE_CHOOSER_BUTTON )
+ << get_defs( GTK_TYPE_FILE_CHOOSER_BUTTON )
<< get_defs( GTK_TYPE_FILE_CHOOSER_DIALOG )
- << get_defs( GTK_TYPE_FILE_CHOOSER_WIDGET )
+ << get_defs( GTK_TYPE_FILE_CHOOSER_WIDGET )
<< get_defs( GTK_TYPE_FILE_SELECTION ) /* Deprecated */
<< get_defs( GTK_TYPE_FIXED )
- << get_defs( GTK_TYPE_FONT_BUTTON )
+ << get_defs( GTK_TYPE_FONT_BUTTON )
<< get_defs( GTK_TYPE_FONT_SELECTION )
<< get_defs( GTK_TYPE_FONT_SELECTION_DIALOG )
<< get_defs( GTK_TYPE_FRAME )
@@ -143,13 +148,13 @@ int main (int argc, char *argv[])
<< get_defs( GTK_TYPE_MENU_BAR )
<< get_defs( GTK_TYPE_MENU_ITEM )
<< get_defs( GTK_TYPE_MENU_SHELL )
- << get_defs( GTK_TYPE_MENU_TOOL_BUTTON )
- << get_defs( GTK_TYPE_MESSAGE_DIALOG )
+ << get_defs( GTK_TYPE_MENU_TOOL_BUTTON )
+ << get_defs( GTK_TYPE_MESSAGE_DIALOG )
<< get_defs( GTK_TYPE_MISC )
<< get_defs( GTK_TYPE_NOTEBOOK )
<< get_defs( GTK_TYPE_OBJECT )
<< get_defs( GTK_TYPE_OPTION_MENU )
- << get_defs( GTK_TYPE_ORIENTABLE )
+ << get_defs( GTK_TYPE_ORIENTABLE )
<< get_defs( GTK_TYPE_PANED )
<< get_defs( GTK_TYPE_PIXMAP )
#if !defined(G_OS_WIN32)
@@ -157,20 +162,20 @@ int main (int argc, char *argv[])
#endif /* G_OS_WIN32 */
<< get_defs( GTK_TYPE_PREVIEW )
#if !defined(G_OS_WIN32)
- << get_defs( GTK_TYPE_PRINTER )
- << get_defs( GTK_TYPE_PRINT_JOB )
+ << get_defs( GTK_TYPE_PRINTER )
+ << get_defs( GTK_TYPE_PRINT_JOB )
#endif /* G_OS_WIN32 */
- << get_defs( GTK_TYPE_PRINT_OPERATION )
- << get_defs( GTK_TYPE_PRINT_OPERATION_PREVIEW )
+ << get_defs( GTK_TYPE_PRINT_OPERATION )
+ << get_defs( GTK_TYPE_PRINT_OPERATION_PREVIEW )
#if !defined(G_OS_WIN32)
- << get_defs( GTK_TYPE_PAGE_SETUP_UNIX_DIALOG )
- << get_defs( GTK_TYPE_PRINT_UNIX_DIALOG )
+ << get_defs( GTK_TYPE_PAGE_SETUP_UNIX_DIALOG )
+ << get_defs( GTK_TYPE_PRINT_UNIX_DIALOG )
#endif /* G_OS_WIN32 */
<< get_defs( GTK_TYPE_PROGRESS )
<< get_defs( GTK_TYPE_PROGRESS_BAR )
<< get_defs( GTK_TYPE_RADIO_BUTTON )
<< get_defs( GTK_TYPE_RADIO_TOOL_BUTTON )
- << get_defs( GTK_TYPE_RADIO_ACTION )
+ << get_defs( GTK_TYPE_RADIO_ACTION )
<< get_defs( GTK_TYPE_RADIO_MENU_ITEM )
<< get_defs( GTK_TYPE_RANGE )
<< get_defs( GTK_TYPE_RECENT_ACTION )
@@ -201,19 +206,19 @@ int main (int argc, char *argv[])
<< get_defs( GTK_TYPE_TOGGLE_BUTTON )
<< get_defs( GTK_TYPE_TOOLBAR )
<< get_defs( GTK_TYPE_TOOL_ITEM )
- << get_defs( GTK_TYPE_TOOL_BUTTON )
+ << get_defs( GTK_TYPE_TOOL_BUTTON )
<< get_defs( GTK_TYPE_TEXT_BUFFER )
<< get_defs( GTK_TYPE_TEXT_MARK )
<< get_defs( GTK_TYPE_TEXT_TAG )
<< get_defs( GTK_TYPE_TEXT_TAG_TABLE )
<< get_defs( GTK_TYPE_TEXT_VIEW )
- << get_defs( GTK_TYPE_TOGGLE_ACTION )
- << get_defs( GTK_TYPE_TOGGLE_TOOL_BUTTON )
+ << get_defs( GTK_TYPE_TOGGLE_ACTION )
+ << get_defs( GTK_TYPE_TOGGLE_TOOL_BUTTON )
<< get_defs( GTK_TYPE_TOOLTIP )
<< get_defs( GTK_TYPE_TOOLTIPS )
<< get_defs( GTK_TYPE_TREE_SELECTION )
- << get_defs( GTK_TYPE_TREE_MODEL )
- << get_defs( GTK_TYPE_TREE_MODEL_FILTER )
+ << get_defs( GTK_TYPE_TREE_MODEL )
+ << get_defs( GTK_TYPE_TREE_MODEL_FILTER )
<< get_defs( GTK_TYPE_TREE_STORE )
<< get_defs( GTK_TYPE_TREE_VIEW )
<< get_defs( GTK_TYPE_TREE_VIEW_COLUMN )
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
