diff --git a/SConstruct b/SConstruct index 24a88548e4..99bd85264b 100644 --- a/SConstruct +++ b/SConstruct @@ -398,13 +398,14 @@ deps = \ { 'glib-2.0' : '2.10.1', 'gthread-2.0' : '2.10.1', - 'gtk+-2.0' : '2.8.1', + 'gtk+-2.0' : '2.10.0', 'libxml-2.0' : '2.6.0', 'samplerate' : '0.1.0', 'raptor' : '1.4.2', 'lrdf' : '0.4.0', 'jack' : '0.101.1', - 'libgnomecanvas-2.0' : '2.0' + 'libgnomecanvas-2.0' : '2.0', + 'cairo' : '1.2.4' } def DependenciesRequiredMessage(): @@ -481,6 +482,12 @@ libraries['xml'].ParseConfig('pkg-config --cflags --libs libxml-2.0') libraries['xslt'] = LibraryInfo() libraries['xslt'].ParseConfig('pkg-config --cflags --libs libxslt') +libraries['cairo'] = LibraryInfo() +libraries['cairo'].ParseConfig ('pkg-config --cflags --libs cairo') + +libraries['pangocairo'] = LibraryInfo() +libraries['pangocairo'].ParseConfig ('pkg-config --cflags --libs pangocairo') + libraries['glib2'] = LibraryInfo() libraries['glib2'].ParseConfig ('pkg-config --cflags --libs glib-2.0') libraries['glib2'].ParseConfig ('pkg-config --cflags --libs gobject-2.0') @@ -490,6 +497,9 @@ libraries['glib2'].ParseConfig ('pkg-config --cflags --libs gthread-2.0') libraries['gtk2'] = LibraryInfo() libraries['gtk2'].ParseConfig ('pkg-config --cflags --libs gtk+-2.0') +libraries['gtk2-unix-print'] = LibraryInfo() +libraries['gtk2-unix-print'].ParseConfig ('pkg-config --cflags --libs gtk+-unix-print-2.0') + libraries['pango'] = LibraryInfo() libraries['pango'].ParseConfig ('pkg-config --cflags --libs pango') @@ -832,9 +842,6 @@ if env['SYSLIBS']: LIBPATH='#libs/libsndfile', CPPPATH=['#libs/libsndfile', '#libs/libsndfile/src']) -# libraries['libglademm'] = LibraryInfo() -# libraries['libglademm'].ParseConfig ('pkg-config --cflags --libs libglademm-2.4') - # libraries['flowcanvas'] = LibraryInfo(LIBS='flowcanvas', LIBPATH='#/libs/flowcanvas', CPPPATH='#libs/flowcanvas') libraries['soundtouch'] = LibraryInfo() libraries['soundtouch'].ParseConfig ('pkg-config --cflags --libs soundtouch-1.0') @@ -879,6 +886,9 @@ else: libraries['glibmm2'] = LibraryInfo(LIBS='glibmm2', LIBPATH='#libs/glibmm2', CPPPATH='#libs/glibmm2') + libraries['cairomm'] = LibraryInfo(LIBS='cairomm', + LIBPATH='#libs/cairomm', + CPPPATH='#libs/cairomm') libraries['pangomm'] = LibraryInfo(LIBS='pangomm', LIBPATH='#libs/gtkmm2/pango', CPPPATH='#libs/gtkmm2/pango') @@ -901,9 +911,6 @@ else: libraries['sndfile-ardour'] = LibraryInfo(LIBS='libsndfile-ardour', LIBPATH='#libs/libsndfile', CPPPATH=['#libs/libsndfile', '#libs/libsndfile/src']) -# libraries['libglademm'] = LibraryInfo(LIBS='libglademm', -# LIBPATH='#libs/libglademm', -# CPPPATH='#libs/libglademm') libraries['appleutility'] = LibraryInfo(LIBS='libappleutility', LIBPATH='#libs/appleutility', CPPPATH='#libs/appleutility') @@ -932,6 +939,7 @@ else: gtk_subdirs = [ 'libs/glibmm2', + 'libs/cairomm', 'libs/gtkmm2/pango', 'libs/gtkmm2/atk', 'libs/gtkmm2/gdk', diff --git a/gtk2_ardour/SConscript b/gtk2_ardour/SConscript index 5d15980b99..bf97529d49 100644 --- a/gtk2_ardour/SConscript +++ b/gtk2_ardour/SConscript @@ -39,6 +39,7 @@ gtkardour.Merge ([ libraries['flac'], libraries['lrdf'], libraries['glibmm2'], + libraries['cairomm'], libraries['pangomm'], libraries['atkmm'], libraries['gdkmm2'], diff --git a/libs/.cvsignore b/libs/.cvsignore deleted file mode 100644 index e43b0f9889..0000000000 --- a/libs/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -.DS_Store diff --git a/libs/glibmm2/glibmm/Makefile.am b/libs/glibmm2/glibmm/Makefile.am index 00e28cf072..18e22651b3 100644 --- a/libs/glibmm2/glibmm/Makefile.am +++ b/libs/glibmm2/glibmm/Makefile.am @@ -88,8 +88,8 @@ sublib_files_extra_general_h = \ value_custom.h \ wrap.h -files_built_general_cc += value_basictypes.cc -files_built_general_h += signalproxy.h value_basictypes.h +files_built_general_cc = value_basictypes.cc +files_built_general_h = signalproxy.h value_basictypes.h lib_LTLIBRARIES = libglibmm-2.4.la if OS_WIN32 diff --git a/libs/gtkmm2/gtk/SConscript b/libs/gtkmm2/gtk/SConscript index 5104e795f5..4ba028fd6b 100644 --- a/libs/gtkmm2/gtk/SConscript +++ b/libs/gtkmm2/gtk/SConscript @@ -8,7 +8,15 @@ gtkmm2_files = glob.glob('gtkmm/*.cc') Import('env libraries install_prefix') gtkmm2 = env.Copy() -gtkmm2.Merge([libraries['glibmm2'], libraries['gtk2'], libraries['sigc2'], libraries['pangomm'], libraries['atkmm'], libraries['gdkmm2'], libraries['cairomm']]) + +gtkmm2.Merge([ libraries['glibmm2'], + libraries['gtk2'], + libraries['sigc2'], + libraries['pangomm'], + libraries['atkmm'], + libraries['gdkmm2'], + libraries['cairomm'], + libraries['gtk2-unix-print'] ]) libgtkmm2 = gtkmm2.SharedLibrary('gtkmm2', gtkmm2_files) Default(libgtkmm2) diff --git a/libs/gtkmm2ext/SConscript b/libs/gtkmm2ext/SConscript index 579ba5dd8e..3c1b367c8a 100644 --- a/libs/gtkmm2ext/SConscript +++ b/libs/gtkmm2ext/SConscript @@ -15,7 +15,8 @@ gtkmm2ext.Merge ([ libraries['pangomm'], libraries['atkmm'], libraries['gdkmm2'], - libraries['gtkmm2'] + libraries['gtkmm2'], + libraries['cairomm'] ]) # diff --git a/libs/libgnomecanvasmm/.DS_Store b/libs/libgnomecanvasmm/.DS_Store deleted file mode 100644 index 7fc822ba63..0000000000 Binary files a/libs/libgnomecanvasmm/.DS_Store and /dev/null differ diff --git a/libs/libgnomecanvasmm/.cvsignore b/libs/libgnomecanvasmm/.cvsignore deleted file mode 100644 index e5d046710f..0000000000 --- a/libs/libgnomecanvasmm/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -*.dylib diff --git a/libs/libgnomecanvasmm/ChangeLog b/libs/libgnomecanvasmm/ChangeLog index 5de1d36668..0adbf043eb 100644 --- a/libs/libgnomecanvasmm/ChangeLog +++ b/libs/libgnomecanvasmm/ChangeLog @@ -1,3 +1,58 @@ +2.16.0: + +2.14.0: + +2005-12-21 Murray Cumming + + * libgnomecanvas/src/bpath.ccg: + * libgnomecanvas/src/bpath.hg: path property: + Use GnomeCanvasDef* instead of RefPtr, because that + breaks the API less, compared to the previous gpointer. + +2005-12-20 Murray Cumming + + * libgnomecanvas/src/bpath.hg: The path property is + a PathDef, not a gpointer*. This theoretically breaks + API/ABI, but it is useless if we do not change it, + because the type is now checked in the C library. + * libgnomecanvas/src/libgnomecanvas_signals.defs: + Update with h2defs.py, but ignoring API-break-causing + writable/not-writable changes. + Bug #320502 by Pau Fernandez. + +2005-12-06 Jonathon Jongsma + + * configure.in: Look for gmmproc in generic libdir + directory, because that is not always lib/. This + fixes the build on some 64-bit systems. + +2.12.0: + +2005-09-07 Murray Cumming + + * libgnomecanvas/src/canvas.hg: + * libgnomecanvas/src/ellipse.hg: + * libgnomecanvas/src/group.hg: Removed extra ;s that break + the build on SUN Forte CC. + 2.10.0: 2005-02-07 Cedric Gustin diff --git a/libs/libgnomecanvasmm/NEWS b/libs/libgnomecanvasmm/NEWS index f3bf80dcef..1585bcf267 100644 --- a/libs/libgnomecanvasmm/NEWS +++ b/libs/libgnomecanvasmm/NEWS @@ -1,3 +1,23 @@ +2.16.0: + +* Increased version number for GNOME 2.16 + +2.14.0: + +* Increased version number for GNOME 2.14 + +2.12.0: + +API additions compared to 2.10: + +* Added Item::get_parent_group() convenience method. + (Murray Cumming) + +2.11.1: + +* Added Item::get_parent_group() convenience method. + (Murray Cumming) + 2.10.0: * Increased version for GNOME 2.10 release version. diff --git a/libs/libgnomecanvasmm/SConscript b/libs/libgnomecanvasmm/SConscript index 7cab8b707a..64d1862f17 100644 --- a/libs/libgnomecanvasmm/SConscript +++ b/libs/libgnomecanvasmm/SConscript @@ -15,7 +15,8 @@ gnomecanvasmm.Merge([libraries['glibmm2'], libraries['atkmm'], libraries['gdkmm2'], libraries['gtkmm2'], - libraries['libgnomecanvas2'] ]) + libraries['libgnomecanvas2'], + libraries['cairomm'] ]) libgnomecanvasmm = gnomecanvasmm.SharedLibrary('libgnomecanvasmm', gnomecanvasmm_files) Default(libgnomecanvasmm) diff --git a/libs/libgnomecanvasmm/libgnomecanvasmm/.DS_Store b/libs/libgnomecanvasmm/libgnomecanvasmm/.DS_Store deleted file mode 100644 index 693c13e9f3..0000000000 Binary files a/libs/libgnomecanvasmm/libgnomecanvasmm/.DS_Store and /dev/null differ diff --git a/libs/libgnomecanvasmm/libgnomecanvasmm/bpath.cc b/libs/libgnomecanvasmm/libgnomecanvasmm/bpath.cc index 6843922029..0f0651aa15 100644 --- a/libs/libgnomecanvasmm/libgnomecanvasmm/bpath.cc +++ b/libs/libgnomecanvasmm/libgnomecanvasmm/bpath.cc @@ -1,5 +1,6 @@ // Generated by gtkmmproc -- DO NOT MODIFY! + #include #include @@ -38,7 +39,7 @@ Bpath::Bpath(Group& parent) void Bpath::set_bpath(const Glib::RefPtr& path) { - property_bpath ().set_value ((gpointer)path->gobj()); + property_bpath().set_value(path->gobj()); } @@ -46,7 +47,6 @@ void Bpath::set_bpath(const Glib::RefPtr& path) } /* namespace Gnome */ - namespace { } // anonymous namespace @@ -96,8 +96,13 @@ void Bpath_Class::class_init_function(void* g_class, void* class_data) BaseClassType *const klass = static_cast(g_class); CppClassParent::class_init_function(klass, class_data); +#ifdef GLIBMM_VFUNCS_ENABLED +#endif //GLIBMM_VFUNCS_ENABLED } +#ifdef GLIBMM_VFUNCS_ENABLED +#endif //GLIBMM_VFUNCS_ENABLED + Glib::ObjectBase* Bpath_Class::wrap_new(GObject* o) { @@ -138,15 +143,23 @@ GType Bpath::get_base_type() } -Glib::PropertyProxy Bpath::property_bpath() +#ifdef GLIBMM_PROPERTIES_ENABLED +Glib::PropertyProxy Bpath::property_bpath() { - return Glib::PropertyProxy(this, "bpath"); + return Glib::PropertyProxy(this, "bpath"); } +#endif //GLIBMM_PROPERTIES_ENABLED -Glib::PropertyProxy_ReadOnly Bpath::property_bpath() const +#ifdef GLIBMM_PROPERTIES_ENABLED +Glib::PropertyProxy_ReadOnly Bpath::property_bpath() const { - return Glib::PropertyProxy_ReadOnly(this, "bpath"); + return Glib::PropertyProxy_ReadOnly(this, "bpath"); } +#endif //GLIBMM_PROPERTIES_ENABLED + + +#ifdef GLIBMM_VFUNCS_ENABLED +#endif //GLIBMM_VFUNCS_ENABLED } // namespace Canvas diff --git a/libs/libgnomecanvasmm/libgnomecanvasmm/bpath.h b/libs/libgnomecanvasmm/libgnomecanvasmm/bpath.h index 145b087a2e..13447437eb 100644 --- a/libs/libgnomecanvasmm/libgnomecanvasmm/bpath.h +++ b/libs/libgnomecanvasmm/libgnomecanvasmm/bpath.h @@ -3,6 +3,7 @@ #ifndef _LIBGNOMECANVASMM_BPATH_H #define _LIBGNOMECANVASMM_BPATH_H + #include /* $Id$ */ @@ -95,9 +96,13 @@ public: public: //C++ methods used to invoke GTK+ virtual functions: +#ifdef GLIBMM_VFUNCS_ENABLED +#endif //GLIBMM_VFUNCS_ENABLED protected: //GTK+ Virtual Functions (override these to change behaviour): +#ifdef GLIBMM_VFUNCS_ENABLED +#endif //GLIBMM_VFUNCS_ENABLED //Default Signal Handlers:: @@ -107,22 +112,26 @@ private: public: explicit Bpath(Group& parent); - // This property stores a pointer to GnomeCanvasPathDef - /** - * - * You rarely need to use properties because there are get_ and set_ methods for almost all of them. - * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when - * the value of the property changes. - */ - Glib::PropertyProxy property_bpath() ; - + //TODO: Use Glib::RefPtr when we can break ABI: + #ifdef GLIBMM_PROPERTIES_ENABLED /** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ - Glib::PropertyProxy_ReadOnly property_bpath() const; + Glib::PropertyProxy property_bpath() ; +#endif //#GLIBMM_PROPERTIES_ENABLED + +#ifdef GLIBMM_PROPERTIES_ENABLED +/** + * + * You rarely need to use properties because there are get_ and set_ methods for almost all of them. + * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when + * the value of the property changes. + */ + Glib::PropertyProxy_ReadOnly property_bpath() const; +#endif //#GLIBMM_PROPERTIES_ENABLED void set_bpath(const Glib::RefPtr& path); @@ -143,6 +152,8 @@ namespace Glib * @result A C++ instance that wraps this C instance. */ Gnome::Canvas::Bpath* wrap(GnomeCanvasBpath* object, bool take_copy = false); -} +} //namespace Glib + + #endif /* _LIBGNOMECANVASMM_BPATH_H */ diff --git a/libs/libgnomecanvasmm/libgnomecanvasmm/canvas.cc b/libs/libgnomecanvasmm/libgnomecanvasmm/canvas.cc index a02ab3e580..e4f23bac5c 100644 --- a/libs/libgnomecanvasmm/libgnomecanvasmm/canvas.cc +++ b/libs/libgnomecanvasmm/libgnomecanvasmm/canvas.cc @@ -1,5 +1,6 @@ // Generated by gtkmmproc -- DO NOT MODIFY! + #include #include @@ -80,11 +81,10 @@ Art::AffineTrans Canvas::w2c_affine() const } /* namespace Canvas */ } /* namespace Gnome */ - namespace { -void Canvas_signal_draw_background_callback(GnomeCanvas* self, GdkDrawable* p0,gint p1,gint p2,gint p3,gint p4,void* data) +static void Canvas_signal_draw_background_callback(GnomeCanvas* self, GdkDrawable* p0,gint p1,gint p2,gint p3,gint p4,void* data) { using namespace Gnome::Canvas; typedef sigc::slot< void,const Glib::RefPtr&,int,int,int,int > SlotType; @@ -92,8 +92,10 @@ void Canvas_signal_draw_background_callback(GnomeCanvas* self, GdkDrawable* p0,g // Do not try to call a signal on a disassociated wrapper. if(Glib::ObjectBase::_get_current_wrapper((GObject*) self)) { + #ifdef GLIBMM_EXCEPTIONS_ENABLED try { + #endif //GLIBMM_EXCEPTIONS_ENABLED if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data)) (*static_cast(slot))(Glib::wrap(p0, true) , p1 @@ -101,15 +103,17 @@ void Canvas_signal_draw_background_callback(GnomeCanvas* self, GdkDrawable* p0,g , p3 , p4 ); + #ifdef GLIBMM_EXCEPTIONS_ENABLED } catch(...) { Glib::exception_handlers_invoke(); } + #endif //GLIBMM_EXCEPTIONS_ENABLED } } -const Glib::SignalProxyInfo Canvas_signal_draw_background_info = +static const Glib::SignalProxyInfo Canvas_signal_draw_background_info = { "draw_background", (GCallback) &Canvas_signal_draw_background_callback, @@ -117,7 +121,7 @@ const Glib::SignalProxyInfo Canvas_signal_draw_background_info = }; -void Canvas_signal_render_background_callback(GnomeCanvas* self, GnomeCanvasBuf* p0,void* data) +static void Canvas_signal_render_background_callback(GnomeCanvas* self, GnomeCanvasBuf* p0,void* data) { using namespace Gnome::Canvas; typedef sigc::slot< void,GnomeCanvasBuf* > SlotType; @@ -125,19 +129,23 @@ void Canvas_signal_render_background_callback(GnomeCanvas* self, GnomeCanvasBuf* // Do not try to call a signal on a disassociated wrapper. if(Glib::ObjectBase::_get_current_wrapper((GObject*) self)) { + #ifdef GLIBMM_EXCEPTIONS_ENABLED try { + #endif //GLIBMM_EXCEPTIONS_ENABLED if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data)) (*static_cast(slot))(p0); + #ifdef GLIBMM_EXCEPTIONS_ENABLED } catch(...) { Glib::exception_handlers_invoke(); } + #endif //GLIBMM_EXCEPTIONS_ENABLED } } -const Glib::SignalProxyInfo Canvas_signal_render_background_info = +static const Glib::SignalProxyInfo Canvas_signal_render_background_info = { "render_background", (GCallback) &Canvas_signal_render_background_callback, @@ -191,11 +199,14 @@ void Canvas_Class::class_init_function(void* g_class, void* class_data) BaseClassType *const klass = static_cast(g_class); CppClassParent::class_init_function(klass, class_data); +#ifdef GLIBMM_VFUNCS_ENABLED klass->request_update = &request_update_vfunc_callback; +#endif //GLIBMM_VFUNCS_ENABLED klass->draw_background = &draw_background_callback; klass->render_background = &render_background_callback; } +#ifdef GLIBMM_VFUNCS_ENABLED void Canvas_Class::request_update_vfunc_callback(GnomeCanvas* self) { CppObjectType *const obj = dynamic_cast( @@ -208,15 +219,19 @@ void Canvas_Class::request_update_vfunc_callback(GnomeCanvas* self) // being overridden: if(obj && obj->is_derived_()) { + #ifdef GLIBMM_EXCEPTIONS_ENABLED try // Trap C++ exceptions which would normally be lost because this is a C callback. { + #endif //GLIBMM_EXCEPTIONS_ENABLED // Call the virtual member method, which derived classes might override. obj->request_update_vfunc(); + #ifdef GLIBMM_EXCEPTIONS_ENABLED } catch(...) { Glib::exception_handlers_invoke(); } + #endif //GLIBMM_EXCEPTIONS_ENABLED } else { @@ -230,6 +245,7 @@ void Canvas_Class::request_update_vfunc_callback(GnomeCanvas* self) } } +#endif //GLIBMM_VFUNCS_ENABLED void Canvas_Class::draw_background_callback(GnomeCanvas* self, GdkDrawable* p0, gint p1, gint p2, gint p3, gint p4) { @@ -243,8 +259,10 @@ void Canvas_Class::draw_background_callback(GnomeCanvas* self, GdkDrawable* p0, // being overridden: if(obj && obj->is_derived_()) { + #ifdef GLIBMM_EXCEPTIONS_ENABLED try // Trap C++ exceptions which would normally be lost because this is a C callback. { + #endif //GLIBMM_EXCEPTIONS_ENABLED // Call the virtual member method, which derived classes might override. obj->on_draw_background(Glib::wrap(p0, true) , p1 @@ -252,11 +270,13 @@ void Canvas_Class::draw_background_callback(GnomeCanvas* self, GdkDrawable* p0, , p3 , p4 ); + #ifdef GLIBMM_EXCEPTIONS_ENABLED } catch(...) { Glib::exception_handlers_invoke(); } + #endif //GLIBMM_EXCEPTIONS_ENABLED } else { @@ -282,15 +302,19 @@ void Canvas_Class::render_background_callback(GnomeCanvas* self, GnomeCanvasBuf* // being overridden: if(obj && obj->is_derived_()) { + #ifdef GLIBMM_EXCEPTIONS_ENABLED try // Trap C++ exceptions which would normally be lost because this is a C callback. { + #endif //GLIBMM_EXCEPTIONS_ENABLED // Call the virtual member method, which derived classes might override. obj->on_render_background(p0); + #ifdef GLIBMM_EXCEPTIONS_ENABLED } catch(...) { Glib::exception_handlers_invoke(); } + #endif //GLIBMM_EXCEPTIONS_ENABLED } else { @@ -358,17 +382,17 @@ Group* Canvas::root() const void Canvas::set_scroll_region(double x1, double y1, double x2, double y2) { - gnome_canvas_set_scroll_region(gobj(), x1, y1, x2, y2); +gnome_canvas_set_scroll_region(gobj(), x1, y1, x2, y2); } void Canvas::get_scroll_region(double& x1, double& y1, double& x2, double& y2) const { - gnome_canvas_get_scroll_region(const_cast(gobj()), &(x1), &(y1), &(x2), &(y2)); +gnome_canvas_get_scroll_region(const_cast(gobj()), &(x1), &(y1), &(x2), &(y2)); } void Canvas::set_center_scroll_region(bool center) { - gnome_canvas_set_center_scroll_region(gobj(), static_cast(center)); +gnome_canvas_set_center_scroll_region(gobj(), static_cast(center)); } bool Canvas::get_center_scroll_region() const @@ -378,22 +402,22 @@ bool Canvas::get_center_scroll_region() const void Canvas::set_pixels_per_unit(double n) { - gnome_canvas_set_pixels_per_unit(gobj(), n); +gnome_canvas_set_pixels_per_unit(gobj(), n); } void Canvas::scroll_to(int x, int y) { - gnome_canvas_scroll_to(gobj(), x, y); +gnome_canvas_scroll_to(gobj(), x, y); } void Canvas::get_scroll_offsets(int& cx, int& cy) const { - gnome_canvas_get_scroll_offsets(const_cast(gobj()), &cx, &cy); +gnome_canvas_get_scroll_offsets(const_cast(gobj()), &cx, &cy); } void Canvas::update_now() { - gnome_canvas_update_now(gobj()); +gnome_canvas_update_now(gobj()); } Item* Canvas::get_item_at(double x, double y) const @@ -403,37 +427,37 @@ Item* Canvas::get_item_at(double x, double y) const void Canvas::request_redraw(int x1, int y1, int x2, int y2) { - gnome_canvas_request_redraw(gobj(), x1, y1, x2, y2); +gnome_canvas_request_redraw(gobj(), x1, y1, x2, y2); } void Canvas::request_redraw(ArtUta* uta) { - gnome_canvas_request_redraw_uta(gobj(), uta); +gnome_canvas_request_redraw_uta(gobj(), uta); } void Canvas::w2c(double wx, double wy, int& cx, int& cy) const { - gnome_canvas_w2c(const_cast(gobj()), wx, wy, &cx, &cy); +gnome_canvas_w2c(const_cast(gobj()), wx, wy, &cx, &cy); } void Canvas::w2c(double wx, double wy, double& cx, double& cy) const { - gnome_canvas_w2c_d(const_cast(gobj()), wx, wy, &(cx), &(cy)); +gnome_canvas_w2c_d(const_cast(gobj()), wx, wy, &(cx), &(cy)); } void Canvas::c2w(int cx, int cy, double& wx, double& wy) const { - gnome_canvas_c2w(const_cast(gobj()), cx, cy, &(wx), &(wy)); +gnome_canvas_c2w(const_cast(gobj()), cx, cy, &(wx), &(wy)); } void Canvas::window_to_world(double winx, double winy, double& worldx, double& worldy) const { - gnome_canvas_window_to_world(const_cast(gobj()), winx, winy, &(worldx), &(worldy)); +gnome_canvas_window_to_world(const_cast(gobj()), winx, winy, &(worldx), &(worldy)); } void Canvas::world_to_window(double worldx, double worldy, double& winx, double& winy) const { - gnome_canvas_world_to_window(const_cast(gobj()), worldx, worldy, &(winx), &(winy)); +gnome_canvas_world_to_window(const_cast(gobj()), worldx, worldy, &(winx), &(winy)); } gulong Canvas::get_color_pixel(guint rgba) const @@ -443,12 +467,12 @@ gulong Canvas::get_color_pixel(guint rgba) const void Canvas::set_stipple_origin(const Glib::RefPtr& gc) { - gnome_canvas_set_stipple_origin(gobj(), Glib::unwrap(gc)); +gnome_canvas_set_stipple_origin(gobj(), Glib::unwrap(gc)); } void Canvas::set_dither(Gdk::RgbDither dither) { - gnome_canvas_set_dither(gobj(), ((GdkRgbDither)(dither))); +gnome_canvas_set_dither(gobj(), ((GdkRgbDither)(dither))); } Gdk::RgbDither Canvas::get_dither() const @@ -458,19 +482,19 @@ Gdk::RgbDither Canvas::get_dither() const void Canvas::update_svp(ArtSVP** p_svp, ArtSVP* new_svp) { - gnome_canvas_update_svp(gobj(), p_svp, new_svp); +gnome_canvas_update_svp(gobj(), p_svp, new_svp); } void Canvas::update_svp_clip(ArtSVP** p_svp, ArtSVP* new_svp, ArtSVP* clip_svp) { - gnome_canvas_update_svp_clip(gobj(), p_svp, new_svp, clip_svp); +gnome_canvas_update_svp_clip(gobj(), p_svp, new_svp, clip_svp); } -double Canvas::get_pixels_per_unit() const + double Canvas::get_pixels_per_unit() const { return gobj()->pixels_per_unit; } - + Glib::SignalProxy5< void,const Glib::RefPtr&,int,int,int,int > Canvas::signal_draw_background() { @@ -483,15 +507,12 @@ Glib::SignalProxy1< void,GnomeCanvasBuf* > Canvas::signal_render_background() } -Glib::PropertyProxy Canvas::property_aa() -{ - return Glib::PropertyProxy(this, "aa"); -} - +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly Canvas::property_aa() const { return Glib::PropertyProxy_ReadOnly(this, "aa"); } +#endif //GLIBMM_PROPERTIES_ENABLED void Gnome::Canvas::Canvas::on_draw_background(const Glib::RefPtr& drawable, int x, int y, int width, int height) @@ -515,6 +536,7 @@ void Gnome::Canvas::Canvas::on_render_background(GnomeCanvasBuf* buf) } +#ifdef GLIBMM_VFUNCS_ENABLED void Gnome::Canvas::Canvas::request_update_vfunc() { BaseClassType *const base = static_cast( @@ -525,6 +547,8 @@ void Gnome::Canvas::Canvas::request_update_vfunc() (*base->request_update)(gobj()); } +#endif //GLIBMM_VFUNCS_ENABLED + } // namespace Canvas diff --git a/libs/libgnomecanvasmm/libgnomecanvasmm/canvas.h b/libs/libgnomecanvasmm/libgnomecanvasmm/canvas.h index c7ee6e8d71..677736ad10 100644 --- a/libs/libgnomecanvasmm/libgnomecanvasmm/canvas.h +++ b/libs/libgnomecanvasmm/libgnomecanvasmm/canvas.h @@ -3,6 +3,7 @@ #ifndef _LIBGNOMECANVASMM_CANVAS_H #define _LIBGNOMECANVASMM_CANVAS_H + #include // -*- C++ -*- @@ -107,9 +108,13 @@ public: public: //C++ methods used to invoke GTK+ virtual functions: +#ifdef GLIBMM_VFUNCS_ENABLED +#endif //GLIBMM_VFUNCS_ENABLED protected: //GTK+ Virtual Functions (override these to change behaviour): +#ifdef GLIBMM_VFUNCS_ENABLED +#endif //GLIBMM_VFUNCS_ENABLED //Default Signal Handlers:: virtual void on_draw_background(const Glib::RefPtr& drawable, int x, int y, int width, int height); @@ -117,7 +122,7 @@ protected: private: -; + public: Canvas(); @@ -378,8 +383,8 @@ public: // The following are simply accessed via the struct in C, // but Federico reports that they are meant to be used. //: Get the pixels per unit. - double get_pixels_per_unit() const; - + double get_pixels_per_unit() const; + //: Draw the background for the area given. //- This method is only used for non-antialiased canvases. @@ -395,24 +400,21 @@ public: Glib::SignalProxy1< void,GnomeCanvasBuf* > signal_render_background(); //: Private Virtual methods for groping the canvas inside bonobo. - virtual void request_update_vfunc(); + #ifdef GLIBMM_VFUNCS_ENABLED + virtual void request_update_vfunc(); +#endif //GLIBMM_VFUNCS_ENABLED + // Whether the canvas is in antialiased mode or not. - /** - * - * You rarely need to use properties because there are get_ and set_ methods for almost all of them. - * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when - * the value of the property changes. - */ - Glib::PropertyProxy property_aa() ; - -/** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** The antialiasing mode of the canvas. * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_aa() const; +#endif //#GLIBMM_PROPERTIES_ENABLED }; @@ -438,6 +440,8 @@ namespace Glib * @result A C++ instance that wraps this C instance. */ Gnome::Canvas::Canvas* wrap(GnomeCanvas* object, bool take_copy = false); -} +} //namespace Glib + + #endif /* _LIBGNOMECANVASMM_CANVAS_H */ diff --git a/libs/libgnomecanvasmm/libgnomecanvasmm/ellipse.cc b/libs/libgnomecanvasmm/libgnomecanvasmm/ellipse.cc index ecc2402516..48ddc4e883 100644 --- a/libs/libgnomecanvasmm/libgnomecanvasmm/ellipse.cc +++ b/libs/libgnomecanvasmm/libgnomecanvasmm/ellipse.cc @@ -1,5 +1,6 @@ // Generated by gtkmmproc -- DO NOT MODIFY! + #include #include @@ -48,7 +49,6 @@ Ellipse::Ellipse(Group& parentx) } /* namespace Canvas */ } /* namespace Gnome */ - namespace { } // anonymous namespace @@ -98,8 +98,13 @@ void Ellipse_Class::class_init_function(void* g_class, void* class_data) BaseClassType *const klass = static_cast(g_class); CppClassParent::class_init_function(klass, class_data); +#ifdef GLIBMM_VFUNCS_ENABLED +#endif //GLIBMM_VFUNCS_ENABLED } +#ifdef GLIBMM_VFUNCS_ENABLED +#endif //GLIBMM_VFUNCS_ENABLED + Glib::ObjectBase* Ellipse_Class::wrap_new(GObject* o) { @@ -140,6 +145,10 @@ GType Ellipse::get_base_type() } +#ifdef GLIBMM_VFUNCS_ENABLED +#endif //GLIBMM_VFUNCS_ENABLED + + } // namespace Canvas } // namespace Gnome diff --git a/libs/libgnomecanvasmm/libgnomecanvasmm/ellipse.h b/libs/libgnomecanvasmm/libgnomecanvasmm/ellipse.h index e085dc45e8..bea0d01c8c 100644 --- a/libs/libgnomecanvasmm/libgnomecanvasmm/ellipse.h +++ b/libs/libgnomecanvasmm/libgnomecanvasmm/ellipse.h @@ -3,6 +3,7 @@ #ifndef _LIBGNOMECANVASMM_ELLIPSE_H #define _LIBGNOMECANVASMM_ELLIPSE_H + #include // -*- C++ -*- @@ -98,15 +99,19 @@ public: public: //C++ methods used to invoke GTK+ virtual functions: +#ifdef GLIBMM_VFUNCS_ENABLED +#endif //GLIBMM_VFUNCS_ENABLED protected: //GTK+ Virtual Functions (override these to change behaviour): +#ifdef GLIBMM_VFUNCS_ENABLED +#endif //GLIBMM_VFUNCS_ENABLED //Default Signal Handlers:: private: -; + public: explicit Ellipse(Group& parent); @@ -117,6 +122,8 @@ public: } /* namespace Canvas */ } /* namespace Gnome */ + + namespace Glib { /** @relates Gnome::Canvas::Ellipse @@ -125,6 +132,8 @@ namespace Glib * @result A C++ instance that wraps this C instance. */ Gnome::Canvas::Ellipse* wrap(GnomeCanvasEllipse* object, bool take_copy = false); -} +} //namespace Glib + + #endif /* _LIBGNOMECANVASMM_ELLIPSE_H */ diff --git a/libs/libgnomecanvasmm/libgnomecanvasmm/group.cc b/libs/libgnomecanvasmm/libgnomecanvasmm/group.cc index 90c9c97466..4ad89d23bc 100644 --- a/libs/libgnomecanvasmm/libgnomecanvasmm/group.cc +++ b/libs/libgnomecanvasmm/libgnomecanvasmm/group.cc @@ -1,5 +1,6 @@ // Generated by gtkmmproc -- DO NOT MODIFY! + #include #include @@ -42,7 +43,6 @@ Group::Group(Group& parentx, double x, double y) } /* namespace Canvas */ } /* namespace Gnome */ - namespace { } // anonymous namespace @@ -92,8 +92,13 @@ void Group_Class::class_init_function(void* g_class, void* class_data) BaseClassType *const klass = static_cast(g_class); CppClassParent::class_init_function(klass, class_data); +#ifdef GLIBMM_VFUNCS_ENABLED +#endif //GLIBMM_VFUNCS_ENABLED } +#ifdef GLIBMM_VFUNCS_ENABLED +#endif //GLIBMM_VFUNCS_ENABLED + Glib::ObjectBase* Group_Class::wrap_new(GObject* o) { @@ -142,25 +147,37 @@ Group::Group() } +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy Group::property_x() { return Glib::PropertyProxy(this, "x"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly Group::property_x() const { return Glib::PropertyProxy_ReadOnly(this, "x"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy Group::property_y() { return Glib::PropertyProxy(this, "y"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly Group::property_y() const { return Glib::PropertyProxy_ReadOnly(this, "y"); } +#endif //GLIBMM_PROPERTIES_ENABLED + + +#ifdef GLIBMM_VFUNCS_ENABLED +#endif //GLIBMM_VFUNCS_ENABLED } // namespace Canvas diff --git a/libs/libgnomecanvasmm/libgnomecanvasmm/group.h b/libs/libgnomecanvasmm/libgnomecanvasmm/group.h index ef359297dd..a9516e0922 100644 --- a/libs/libgnomecanvasmm/libgnomecanvasmm/group.h +++ b/libs/libgnomecanvasmm/libgnomecanvasmm/group.h @@ -3,6 +3,7 @@ #ifndef _LIBGNOMECANVASMM_GROUP_H #define _LIBGNOMECANVASMM_GROUP_H + #include // -*- C++ -*- @@ -98,52 +99,64 @@ public: public: //C++ methods used to invoke GTK+ virtual functions: +#ifdef GLIBMM_VFUNCS_ENABLED +#endif //GLIBMM_VFUNCS_ENABLED protected: //GTK+ Virtual Functions (override these to change behaviour): +#ifdef GLIBMM_VFUNCS_ENABLED +#endif //GLIBMM_VFUNCS_ENABLED //Default Signal Handlers:: private: -; + public: friend class Canvas; explicit Group(Group& parent, double x = 0, double y = 0); Group(); - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** X. * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy property_x() ; +#endif //#GLIBMM_PROPERTIES_ENABLED -/** +#ifdef GLIBMM_PROPERTIES_ENABLED +/** X. * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_x() const; +#endif //#GLIBMM_PROPERTIES_ENABLED - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** Y. * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy property_y() ; +#endif //#GLIBMM_PROPERTIES_ENABLED -/** +#ifdef GLIBMM_PROPERTIES_ENABLED +/** Y. * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_y() const; +#endif //#GLIBMM_PROPERTIES_ENABLED }; @@ -151,6 +164,7 @@ public: } /* namespace Canvas */ } /* namespace Gnome */ + namespace Glib { /** @relates Gnome::Canvas::Group @@ -159,6 +173,8 @@ namespace Glib * @result A C++ instance that wraps this C instance. */ Gnome::Canvas::Group* wrap(GnomeCanvasGroup* object, bool take_copy = false); -} +} //namespace Glib + + #endif /* _LIBGNOMECANVASMM_GROUP_H */ diff --git a/libs/libgnomecanvasmm/libgnomecanvasmm/item.cc b/libs/libgnomecanvasmm/libgnomecanvasmm/item.cc index b39c34ad89..29bf222644 100644 --- a/libs/libgnomecanvasmm/libgnomecanvasmm/item.cc +++ b/libs/libgnomecanvasmm/libgnomecanvasmm/item.cc @@ -1,5 +1,6 @@ // Generated by gtkmmproc -- DO NOT MODIFY! + #include #include @@ -117,14 +118,35 @@ Item::get_i2c_affine() const return Art::AffineTrans(tmp); } +Group* Item::get_parent_group() +{ + //This is implemented in C, instead of using our C++ PropertyProxy, because uses of PropertyProxy + //do not compile with some versions of SUN Forte C++. + + GValue value = { 0, }; + g_value_init(&value, GNOME_TYPE_CANVAS_ITEM); + //The property is specified as ITEM, but it's actually always a GNOME_TYPE_CANVAS_GROUP. + + g_object_get_property(G_OBJECT(gobj()), "parent", &value); + + GnomeCanvasGroup* cgroup = GNOME_CANVAS_GROUP(g_value_get_object(&value)); + + return Glib::wrap(cgroup); +} + +const Group* Item::get_parent_group() const +{ + Item* nonconstthis = const_cast(this); + return nonconstthis->get_parent_group(); +} + } /* namespace Canvas */ } /* namespace Gnome */ - namespace { -gboolean Item_signal_event_callback(GnomeCanvasItem* self, GdkEvent* p0,void* data) +static gboolean Item_signal_event_callback(GnomeCanvasItem* self, GdkEvent* p0,void* data) { using namespace Gnome::Canvas; typedef sigc::slot< bool,GdkEvent* > SlotType; @@ -132,22 +154,26 @@ gboolean Item_signal_event_callback(GnomeCanvasItem* self, GdkEvent* p0,void* da // Do not try to call a signal on a disassociated wrapper. if(Glib::ObjectBase::_get_current_wrapper((GObject*) self)) { + #ifdef GLIBMM_EXCEPTIONS_ENABLED try { + #endif //GLIBMM_EXCEPTIONS_ENABLED if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data)) return static_cast((*static_cast(slot))(p0)); + #ifdef GLIBMM_EXCEPTIONS_ENABLED } catch(...) { Glib::exception_handlers_invoke(); } + #endif //GLIBMM_EXCEPTIONS_ENABLED } typedef gboolean RType; return RType(); } -gboolean Item_signal_event_notify_callback(GnomeCanvasItem* self, GdkEvent* p0, void* data) +static gboolean Item_signal_event_notify_callback(GnomeCanvasItem* self, GdkEvent* p0, void* data) { using namespace Gnome::Canvas; typedef sigc::slot< void,GdkEvent* > SlotType; @@ -155,22 +181,26 @@ gboolean Item_signal_event_notify_callback(GnomeCanvasItem* self, GdkEvent* p0, // Do not try to call a signal on a disassociated wrapper. if(Glib::ObjectBase::_get_current_wrapper((GObject*) self)) { + #ifdef GLIBMM_EXCEPTIONS_ENABLED try { + #endif //GLIBMM_EXCEPTIONS_ENABLED if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data)) (*static_cast(slot))(p0); + #ifdef GLIBMM_EXCEPTIONS_ENABLED } catch(...) { Glib::exception_handlers_invoke(); } + #endif //GLIBMM_EXCEPTIONS_ENABLED } typedef gboolean RType; return RType(); } -const Glib::SignalProxyInfo Item_signal_event_info = +static const Glib::SignalProxyInfo Item_signal_event_info = { "event", (GCallback) &Item_signal_event_callback, @@ -224,6 +254,7 @@ void Item_Class::class_init_function(void* g_class, void* class_data) BaseClassType *const klass = static_cast(g_class); CppClassParent::class_init_function(klass, class_data); +#ifdef GLIBMM_VFUNCS_ENABLED klass->update = &update_vfunc_callback; klass->realize = &realize_vfunc_callback; klass->unrealize = &unrealize_vfunc_callback; @@ -234,9 +265,11 @@ void Item_Class::class_init_function(void* g_class, void* class_data) klass->render = &render_vfunc_callback; klass->point = &point_vfunc_callback; klass->bounds = &bounds_vfunc_callback; +#endif //GLIBMM_VFUNCS_ENABLED klass->event = &event_callback; } +#ifdef GLIBMM_VFUNCS_ENABLED void Item_Class::update_vfunc_callback(GnomeCanvasItem* self, double* affine, ArtSVP* clip_path, int flags) { CppObjectType *const obj = dynamic_cast( @@ -249,15 +282,19 @@ void Item_Class::update_vfunc_callback(GnomeCanvasItem* self, double* affine, Ar // being overridden: if(obj && obj->is_derived_()) { + #ifdef GLIBMM_EXCEPTIONS_ENABLED try // Trap C++ exceptions which would normally be lost because this is a C callback. { + #endif //GLIBMM_EXCEPTIONS_ENABLED // Call the virtual member method, which derived classes might override. obj->update_vfunc(affine, clip_path, flags); + #ifdef GLIBMM_EXCEPTIONS_ENABLED } catch(...) { Glib::exception_handlers_invoke(); } + #endif //GLIBMM_EXCEPTIONS_ENABLED } else { @@ -283,15 +320,19 @@ void Item_Class::realize_vfunc_callback(GnomeCanvasItem* self) // being overridden: if(obj && obj->is_derived_()) { + #ifdef GLIBMM_EXCEPTIONS_ENABLED try // Trap C++ exceptions which would normally be lost because this is a C callback. { + #endif //GLIBMM_EXCEPTIONS_ENABLED // Call the virtual member method, which derived classes might override. obj->realize_vfunc(); + #ifdef GLIBMM_EXCEPTIONS_ENABLED } catch(...) { Glib::exception_handlers_invoke(); } + #endif //GLIBMM_EXCEPTIONS_ENABLED } else { @@ -317,15 +358,19 @@ void Item_Class::unrealize_vfunc_callback(GnomeCanvasItem* self) // being overridden: if(obj && obj->is_derived_()) { + #ifdef GLIBMM_EXCEPTIONS_ENABLED try // Trap C++ exceptions which would normally be lost because this is a C callback. { + #endif //GLIBMM_EXCEPTIONS_ENABLED // Call the virtual member method, which derived classes might override. obj->unrealize_vfunc(); + #ifdef GLIBMM_EXCEPTIONS_ENABLED } catch(...) { Glib::exception_handlers_invoke(); } + #endif //GLIBMM_EXCEPTIONS_ENABLED } else { @@ -351,15 +396,19 @@ void Item_Class::map_vfunc_callback(GnomeCanvasItem* self) // being overridden: if(obj && obj->is_derived_()) { + #ifdef GLIBMM_EXCEPTIONS_ENABLED try // Trap C++ exceptions which would normally be lost because this is a C callback. { + #endif //GLIBMM_EXCEPTIONS_ENABLED // Call the virtual member method, which derived classes might override. obj->map_vfunc(); + #ifdef GLIBMM_EXCEPTIONS_ENABLED } catch(...) { Glib::exception_handlers_invoke(); } + #endif //GLIBMM_EXCEPTIONS_ENABLED } else { @@ -385,15 +434,19 @@ void Item_Class::unmap_vfunc_callback(GnomeCanvasItem* self) // being overridden: if(obj && obj->is_derived_()) { + #ifdef GLIBMM_EXCEPTIONS_ENABLED try // Trap C++ exceptions which would normally be lost because this is a C callback. { + #endif //GLIBMM_EXCEPTIONS_ENABLED // Call the virtual member method, which derived classes might override. obj->unmap_vfunc(); + #ifdef GLIBMM_EXCEPTIONS_ENABLED } catch(...) { Glib::exception_handlers_invoke(); } + #endif //GLIBMM_EXCEPTIONS_ENABLED } else { @@ -419,15 +472,19 @@ ArtUta* Item_Class::coverage_vfunc_callback(GnomeCanvasItem* self) // being overridden: if(obj && obj->is_derived_()) { + #ifdef GLIBMM_EXCEPTIONS_ENABLED try // Trap C++ exceptions which would normally be lost because this is a C callback. { + #endif //GLIBMM_EXCEPTIONS_ENABLED // Call the virtual member method, which derived classes might override. return obj->coverage_vfunc(); + #ifdef GLIBMM_EXCEPTIONS_ENABLED } catch(...) { Glib::exception_handlers_invoke(); } + #endif //GLIBMM_EXCEPTIONS_ENABLED } else { @@ -456,16 +513,20 @@ void Item_Class::draw_vfunc_callback(GnomeCanvasItem* self, GdkDrawable* drawabl // being overridden: if(obj && obj->is_derived_()) { + #ifdef GLIBMM_EXCEPTIONS_ENABLED try // Trap C++ exceptions which would normally be lost because this is a C callback. { + #endif //GLIBMM_EXCEPTIONS_ENABLED // Call the virtual member method, which derived classes might override. obj->draw_vfunc(Glib::wrap(drawable, true) , x, y, width, height); + #ifdef GLIBMM_EXCEPTIONS_ENABLED } catch(...) { Glib::exception_handlers_invoke(); } + #endif //GLIBMM_EXCEPTIONS_ENABLED } else { @@ -491,15 +552,19 @@ void Item_Class::render_vfunc_callback(GnomeCanvasItem* self, GnomeCanvasBuf* bu // being overridden: if(obj && obj->is_derived_()) { + #ifdef GLIBMM_EXCEPTIONS_ENABLED try // Trap C++ exceptions which would normally be lost because this is a C callback. { + #endif //GLIBMM_EXCEPTIONS_ENABLED // Call the virtual member method, which derived classes might override. obj->render_vfunc(buf); + #ifdef GLIBMM_EXCEPTIONS_ENABLED } catch(...) { Glib::exception_handlers_invoke(); } + #endif //GLIBMM_EXCEPTIONS_ENABLED } else { @@ -525,15 +590,19 @@ double Item_Class::point_vfunc_callback(GnomeCanvasItem* self, double x, double // being overridden: if(obj && obj->is_derived_()) { + #ifdef GLIBMM_EXCEPTIONS_ENABLED try // Trap C++ exceptions which would normally be lost because this is a C callback. { + #endif //GLIBMM_EXCEPTIONS_ENABLED // Call the virtual member method, which derived classes might override. return obj->point_vfunc(x, y, cx, cy, actual_item); + #ifdef GLIBMM_EXCEPTIONS_ENABLED } catch(...) { Glib::exception_handlers_invoke(); } + #endif //GLIBMM_EXCEPTIONS_ENABLED } else { @@ -562,15 +631,19 @@ void Item_Class::bounds_vfunc_callback(GnomeCanvasItem* self, double* x1, double // being overridden: if(obj && obj->is_derived_()) { + #ifdef GLIBMM_EXCEPTIONS_ENABLED try // Trap C++ exceptions which would normally be lost because this is a C callback. { + #endif //GLIBMM_EXCEPTIONS_ENABLED // Call the virtual member method, which derived classes might override. obj->bounds_vfunc(x1, y1, x2, y2); + #ifdef GLIBMM_EXCEPTIONS_ENABLED } catch(...) { Glib::exception_handlers_invoke(); } + #endif //GLIBMM_EXCEPTIONS_ENABLED } else { @@ -584,6 +657,7 @@ void Item_Class::bounds_vfunc_callback(GnomeCanvasItem* self, double* x1, double } } +#endif //GLIBMM_VFUNCS_ENABLED gboolean Item_Class::event_callback(GnomeCanvasItem* self, GdkEvent* p0) { @@ -597,15 +671,19 @@ gboolean Item_Class::event_callback(GnomeCanvasItem* self, GdkEvent* p0) // being overridden: if(obj && obj->is_derived_()) { + #ifdef GLIBMM_EXCEPTIONS_ENABLED try // Trap C++ exceptions which would normally be lost because this is a C callback. { + #endif //GLIBMM_EXCEPTIONS_ENABLED // Call the virtual member method, which derived classes might override. return static_cast(obj->on_event(p0)); + #ifdef GLIBMM_EXCEPTIONS_ENABLED } catch(...) { Glib::exception_handlers_invoke(); } + #endif //GLIBMM_EXCEPTIONS_ENABLED } else { @@ -664,102 +742,102 @@ GType Item::get_base_type() void Item::move(double dx, double dy) { - gnome_canvas_item_move(gobj(), dx, dy); +gnome_canvas_item_move(gobj(), dx, dy); } void Item::raise(int positions) { - gnome_canvas_item_raise(gobj(), positions); +gnome_canvas_item_raise(gobj(), positions); } void Item::lower(int positions) { - gnome_canvas_item_lower(gobj(), positions); +gnome_canvas_item_lower(gobj(), positions); } void Item::raise_to_top() { - gnome_canvas_item_raise_to_top(gobj()); +gnome_canvas_item_raise_to_top(gobj()); } void Item::lower_to_bottom() { - gnome_canvas_item_lower_to_bottom(gobj()); +gnome_canvas_item_lower_to_bottom(gobj()); } void Item::ungrab(guint32 etime) { - gnome_canvas_item_ungrab(gobj(), etime); +gnome_canvas_item_ungrab(gobj(), etime); } void Item::w2i(double& x, double& y) { - gnome_canvas_item_w2i(gobj(), &(x), &(y)); +gnome_canvas_item_w2i(gobj(), &(x), &(y)); } void Item::i2w(double& x, double& y) { - gnome_canvas_item_i2w(gobj(), &(x), &(y)); +gnome_canvas_item_i2w(gobj(), &(x), &(y)); } void Item::grab_focus() { - gnome_canvas_item_grab_focus(gobj()); +gnome_canvas_item_grab_focus(gobj()); } void Item::get_bounds(double& x1, double& y1, double& x2, double& y2) const { - gnome_canvas_item_get_bounds(const_cast(gobj()), &(x1), &(y1), &(x2), &(y2)); +gnome_canvas_item_get_bounds(const_cast(gobj()), &(x1), &(y1), &(x2), &(y2)); } void Item::show() { - gnome_canvas_item_show(gobj()); +gnome_canvas_item_show(gobj()); } void Item::hide() { - gnome_canvas_item_hide(gobj()); +gnome_canvas_item_hide(gobj()); } void Item::reparent(Group& new_group) { - gnome_canvas_item_reparent(gobj(), (new_group).gobj()); +gnome_canvas_item_reparent(gobj(), (new_group).gobj()); } -Canvas* Item::get_canvas() const + Canvas* Item::get_canvas() const { return Glib::wrap(gobj()->canvas); } - + void Item::request_update() { - gnome_canvas_item_request_update(gobj()); +gnome_canvas_item_request_update(gobj()); } void Item::reset_bounds() { - gnome_canvas_item_reset_bounds(gobj()); +gnome_canvas_item_reset_bounds(gobj()); } void Item::update_svp(ArtSVP ** p_svp, ArtSVP * new_svp) { - gnome_canvas_item_update_svp(gobj(), p_svp, new_svp); +gnome_canvas_item_update_svp(gobj(), p_svp, new_svp); } void Item::update_svp_clip(ArtSVP ** p_svp, ArtSVP * new_svp, ArtSVP * clip_svp) { - gnome_canvas_item_update_svp_clip(gobj(), p_svp, new_svp, clip_svp); +gnome_canvas_item_update_svp_clip(gobj(), p_svp, new_svp, clip_svp); } void Item::request_redraw_svp(const ArtSVP* svp) { - gnome_canvas_item_request_redraw_svp(gobj(), svp); +gnome_canvas_item_request_redraw_svp(gobj(), svp); } void Item::update_bbox(int x1, int y1, int x2, int y2) { - gnome_canvas_update_bbox(gobj(), x1, y1, x2, y2); +gnome_canvas_update_bbox(gobj(), x1, y1, x2, y2); } @@ -769,15 +847,19 @@ Glib::SignalProxy1< bool,GdkEvent* > Item::signal_event() } +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy Item::property_parent() { return Glib::PropertyProxy(this, "parent"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly Item::property_parent() const { return Glib::PropertyProxy_ReadOnly(this, "parent"); } +#endif //GLIBMM_PROPERTIES_ENABLED bool Gnome::Canvas::Item::on_event(GdkEvent* p1) @@ -794,6 +876,7 @@ bool Gnome::Canvas::Item::on_event(GdkEvent* p1) } +#ifdef GLIBMM_VFUNCS_ENABLED void Gnome::Canvas::Item::update_vfunc(double* affine, ArtSVP* clip_path, int flags) { BaseClassType *const base = static_cast( @@ -900,6 +983,8 @@ void Gnome::Canvas::Item::bounds_vfunc(double* x1, double* y1, double* x2, doubl (*base->bounds)(gobj(),x1,y1,x2,y2); } +#endif //GLIBMM_VFUNCS_ENABLED + } // namespace Canvas diff --git a/libs/libgnomecanvasmm/libgnomecanvasmm/item.h b/libs/libgnomecanvasmm/libgnomecanvasmm/item.h index 9265b2018f..8c32b98f1f 100644 --- a/libs/libgnomecanvasmm/libgnomecanvasmm/item.h +++ b/libs/libgnomecanvasmm/libgnomecanvasmm/item.h @@ -3,6 +3,7 @@ #ifndef _LIBGNOMECANVASMM_ITEM_H #define _LIBGNOMECANVASMM_ITEM_H + #include // -*- C++ -*- @@ -105,9 +106,13 @@ public: public: //C++ methods used to invoke GTK+ virtual functions: +#ifdef GLIBMM_VFUNCS_ENABLED +#endif //GLIBMM_VFUNCS_ENABLED protected: //GTK+ Virtual Functions (override these to change behaviour): +#ifdef GLIBMM_VFUNCS_ENABLED +#endif //GLIBMM_VFUNCS_ENABLED //Default Signal Handlers:: virtual bool on_event(GdkEvent* p1); @@ -258,18 +263,48 @@ public: void reparent(Group& new_group); /// Returns the canvas we're on. - Canvas* get_canvas() const; + Canvas* get_canvas() const; + + #ifdef GLIBMM_VFUNCS_ENABLED + virtual void update_vfunc(double* affine, ArtSVP* clip_path, int flags); +#endif //GLIBMM_VFUNCS_ENABLED + + #ifdef GLIBMM_VFUNCS_ENABLED + virtual void realize_vfunc(); +#endif //GLIBMM_VFUNCS_ENABLED + + #ifdef GLIBMM_VFUNCS_ENABLED + virtual void unrealize_vfunc(); +#endif //GLIBMM_VFUNCS_ENABLED + + #ifdef GLIBMM_VFUNCS_ENABLED + virtual void map_vfunc(); +#endif //GLIBMM_VFUNCS_ENABLED + + #ifdef GLIBMM_VFUNCS_ENABLED + virtual void unmap_vfunc(); +#endif //GLIBMM_VFUNCS_ENABLED + + #ifdef GLIBMM_VFUNCS_ENABLED + virtual ArtUta* coverage_vfunc(); +#endif //GLIBMM_VFUNCS_ENABLED + + #ifdef GLIBMM_VFUNCS_ENABLED + virtual void draw_vfunc(const Glib::RefPtr& drawable, int x, int y, int width, int height); +#endif //GLIBMM_VFUNCS_ENABLED + + #ifdef GLIBMM_VFUNCS_ENABLED + virtual void render_vfunc(GnomeCanvasBuf* buf); +#endif //GLIBMM_VFUNCS_ENABLED + + #ifdef GLIBMM_VFUNCS_ENABLED + virtual double point_vfunc(double x, double y, int cx, int cy, GnomeCanvasItem** actual_item); +#endif //GLIBMM_VFUNCS_ENABLED + + #ifdef GLIBMM_VFUNCS_ENABLED + virtual void bounds_vfunc(double* x1, double* y1, double* x2, double* y2); +#endif //GLIBMM_VFUNCS_ENABLED - virtual void update_vfunc(double* affine, ArtSVP* clip_path, int flags); - virtual void realize_vfunc(); - virtual void unrealize_vfunc(); - virtual void map_vfunc(); - virtual void unmap_vfunc(); - virtual ArtUta* coverage_vfunc(); - virtual void draw_vfunc(const Glib::RefPtr& drawable, int x, int y, int width, int height); - virtual void render_vfunc(GnomeCanvasBuf* buf); - virtual double point_vfunc(double x, double y, int cx, int cy, GnomeCanvasItem** actual_item); - virtual void bounds_vfunc(double* x1, double* y1, double* x2, double* y2); //: Signal: an event ocurred for an item of this type. The(x, y) //: coordinates are in the canvas world coordinate system. @@ -278,14 +313,20 @@ public: Glib::SignalProxy1< bool,GdkEvent* > signal_event(); - /** + Group* get_parent_group(); + const Group* get_parent_group() const; + + #ifdef GLIBMM_PROPERTIES_ENABLED +/** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy property_parent() ; +#endif //#GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED /** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. @@ -293,6 +334,7 @@ public: * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_parent() const; +#endif //#GLIBMM_PROPERTIES_ENABLED protected: @@ -357,6 +399,7 @@ protected: } /* namespace Canvas */ } /* namespace Gnome */ + namespace Glib { /** @relates Gnome::Canvas::Item @@ -365,6 +408,8 @@ namespace Glib * @result A C++ instance that wraps this C instance. */ Gnome::Canvas::Item* wrap(GnomeCanvasItem* object, bool take_copy = false); -} +} //namespace Glib + + #endif /* _LIBGNOMECANVASMM_ITEM_H */ diff --git a/libs/libgnomecanvasmm/libgnomecanvasmm/line.cc b/libs/libgnomecanvasmm/libgnomecanvasmm/line.cc index 5b12c69ba6..62f9a933d3 100644 --- a/libs/libgnomecanvasmm/libgnomecanvasmm/line.cc +++ b/libs/libgnomecanvasmm/libgnomecanvasmm/line.cc @@ -1,5 +1,6 @@ // Generated by gtkmmproc -- DO NOT MODIFY! + #include #include @@ -118,7 +119,6 @@ GType Glib::Value::value_type() return Gnome::Canvas::Points::get_type(); } - namespace { } // anonymous namespace @@ -168,8 +168,13 @@ void Line_Class::class_init_function(void* g_class, void* class_data) BaseClassType *const klass = static_cast(g_class); CppClassParent::class_init_function(klass, class_data); +#ifdef GLIBMM_VFUNCS_ENABLED +#endif //GLIBMM_VFUNCS_ENABLED } +#ifdef GLIBMM_VFUNCS_ENABLED +#endif //GLIBMM_VFUNCS_ENABLED + Glib::ObjectBase* Line_Class::wrap_new(GObject* o) { @@ -210,175 +215,247 @@ GType Line::get_base_type() } +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy Line::property_points() { return Glib::PropertyProxy(this, "points"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly Line::property_points() const { return Glib::PropertyProxy_ReadOnly(this, "points"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy Line::property_fill_color() { return Glib::PropertyProxy(this, "fill-color"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly Line::property_fill_color() const { return Glib::PropertyProxy_ReadOnly(this, "fill-color"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy Line::property_fill_color_gdk() { return Glib::PropertyProxy(this, "fill-color-gdk"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly Line::property_fill_color_gdk() const { return Glib::PropertyProxy_ReadOnly(this, "fill-color-gdk"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy Line::property_fill_color_rgba() { return Glib::PropertyProxy(this, "fill-color-rgba"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly Line::property_fill_color_rgba() const { return Glib::PropertyProxy_ReadOnly(this, "fill-color-rgba"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy< Glib::RefPtr > Line::property_fill_stipple() { return Glib::PropertyProxy< Glib::RefPtr >(this, "fill-stipple"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly< Glib::RefPtr > Line::property_fill_stipple() const { return Glib::PropertyProxy_ReadOnly< Glib::RefPtr >(this, "fill-stipple"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy Line::property_width_pixels() { return Glib::PropertyProxy(this, "width-pixels"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly Line::property_width_pixels() const { return Glib::PropertyProxy_ReadOnly(this, "width-pixels"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy Line::property_width_units() { return Glib::PropertyProxy(this, "width-units"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly Line::property_width_units() const { return Glib::PropertyProxy_ReadOnly(this, "width-units"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy Line::property_cap_style() { return Glib::PropertyProxy(this, "cap-style"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly Line::property_cap_style() const { return Glib::PropertyProxy_ReadOnly(this, "cap-style"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy Line::property_join_style() { return Glib::PropertyProxy(this, "join-style"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly Line::property_join_style() const { return Glib::PropertyProxy_ReadOnly(this, "join-style"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy Line::property_line_style() { return Glib::PropertyProxy(this, "line-style"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly Line::property_line_style() const { return Glib::PropertyProxy_ReadOnly(this, "line-style"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy Line::property_first_arrowhead() { return Glib::PropertyProxy(this, "first-arrowhead"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly Line::property_first_arrowhead() const { return Glib::PropertyProxy_ReadOnly(this, "first-arrowhead"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy Line::property_last_arrowhead() { return Glib::PropertyProxy(this, "last-arrowhead"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly Line::property_last_arrowhead() const { return Glib::PropertyProxy_ReadOnly(this, "last-arrowhead"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy Line::property_smooth() { return Glib::PropertyProxy(this, "smooth"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly Line::property_smooth() const { return Glib::PropertyProxy_ReadOnly(this, "smooth"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy Line::property_spline_steps() { return Glib::PropertyProxy(this, "spline-steps"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly Line::property_spline_steps() const { return Glib::PropertyProxy_ReadOnly(this, "spline-steps"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy Line::property_arrow_shape_a() { return Glib::PropertyProxy(this, "arrow-shape-a"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly Line::property_arrow_shape_a() const { return Glib::PropertyProxy_ReadOnly(this, "arrow-shape-a"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy Line::property_arrow_shape_b() { return Glib::PropertyProxy(this, "arrow-shape-b"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly Line::property_arrow_shape_b() const { return Glib::PropertyProxy_ReadOnly(this, "arrow-shape-b"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy Line::property_arrow_shape_c() { return Glib::PropertyProxy(this, "arrow-shape-c"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly Line::property_arrow_shape_c() const { return Glib::PropertyProxy_ReadOnly(this, "arrow-shape-c"); } +#endif //GLIBMM_PROPERTIES_ENABLED + + +#ifdef GLIBMM_VFUNCS_ENABLED +#endif //GLIBMM_VFUNCS_ENABLED } // namespace Canvas diff --git a/libs/libgnomecanvasmm/libgnomecanvasmm/line.h b/libs/libgnomecanvasmm/libgnomecanvasmm/line.h index ab792c8abd..30f6327c69 100644 --- a/libs/libgnomecanvasmm/libgnomecanvasmm/line.h +++ b/libs/libgnomecanvasmm/libgnomecanvasmm/line.h @@ -3,6 +3,7 @@ #ifndef _LIBGNOMECANVASMM_LINE_H #define _LIBGNOMECANVASMM_LINE_H + #include /* $Id$ */ @@ -142,9 +143,13 @@ public: public: //C++ methods used to invoke GTK+ virtual functions: +#ifdef GLIBMM_VFUNCS_ENABLED +#endif //GLIBMM_VFUNCS_ENABLED protected: //GTK+ Virtual Functions (override these to change behaviour): +#ifdef GLIBMM_VFUNCS_ENABLED +#endif //GLIBMM_VFUNCS_ENABLED //Default Signal Handlers:: @@ -155,14 +160,17 @@ public: explicit Line(Group& parent); Line(Group& parent, const Points& points); - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy property_points() ; +#endif //#GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED /** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. @@ -170,15 +178,19 @@ public: * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_points() const; +#endif //#GLIBMM_PROPERTIES_ENABLED - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy property_fill_color() ; +#endif //#GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED /** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. @@ -186,15 +198,19 @@ public: * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_fill_color() const; +#endif //#GLIBMM_PROPERTIES_ENABLED - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy property_fill_color_gdk() ; +#endif //#GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED /** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. @@ -202,15 +218,19 @@ public: * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_fill_color_gdk() const; +#endif //#GLIBMM_PROPERTIES_ENABLED - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy property_fill_color_rgba() ; +#endif //#GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED /** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. @@ -218,15 +238,19 @@ public: * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_fill_color_rgba() const; +#endif //#GLIBMM_PROPERTIES_ENABLED - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy< Glib::RefPtr > property_fill_stipple() ; +#endif //#GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED /** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. @@ -234,15 +258,19 @@ public: * the value of the property changes. */ Glib::PropertyProxy_ReadOnly< Glib::RefPtr > property_fill_stipple() const; +#endif //#GLIBMM_PROPERTIES_ENABLED - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy property_width_pixels() ; +#endif //#GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED /** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. @@ -250,15 +278,19 @@ public: * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_width_pixels() const; +#endif //#GLIBMM_PROPERTIES_ENABLED - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy property_width_units() ; +#endif //#GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED /** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. @@ -266,15 +298,19 @@ public: * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_width_units() const; +#endif //#GLIBMM_PROPERTIES_ENABLED - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy property_cap_style() ; +#endif //#GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED /** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. @@ -282,15 +318,19 @@ public: * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_cap_style() const; +#endif //#GLIBMM_PROPERTIES_ENABLED - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy property_join_style() ; +#endif //#GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED /** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. @@ -298,15 +338,19 @@ public: * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_join_style() const; +#endif //#GLIBMM_PROPERTIES_ENABLED - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy property_line_style() ; +#endif //#GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED /** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. @@ -314,15 +358,19 @@ public: * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_line_style() const; +#endif //#GLIBMM_PROPERTIES_ENABLED - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy property_first_arrowhead() ; +#endif //#GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED /** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. @@ -330,15 +378,19 @@ public: * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_first_arrowhead() const; +#endif //#GLIBMM_PROPERTIES_ENABLED - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy property_last_arrowhead() ; +#endif //#GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED /** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. @@ -346,15 +398,19 @@ public: * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_last_arrowhead() const; +#endif //#GLIBMM_PROPERTIES_ENABLED - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy property_smooth() ; +#endif //#GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED /** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. @@ -362,15 +418,19 @@ public: * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_smooth() const; +#endif //#GLIBMM_PROPERTIES_ENABLED - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy property_spline_steps() ; +#endif //#GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED /** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. @@ -378,15 +438,19 @@ public: * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_spline_steps() const; +#endif //#GLIBMM_PROPERTIES_ENABLED - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy property_arrow_shape_a() ; +#endif //#GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED /** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. @@ -394,15 +458,19 @@ public: * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_arrow_shape_a() const; +#endif //#GLIBMM_PROPERTIES_ENABLED - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy property_arrow_shape_b() ; +#endif //#GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED /** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. @@ -410,15 +478,19 @@ public: * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_arrow_shape_b() const; +#endif //#GLIBMM_PROPERTIES_ENABLED - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy property_arrow_shape_c() ; +#endif //#GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED /** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. @@ -426,6 +498,7 @@ public: * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_arrow_shape_c() const; +#endif //#GLIBMM_PROPERTIES_ENABLED }; @@ -448,6 +521,7 @@ public: } // namespace Glib #endif /* DOXYGEN_SHOULD_SKIP_THIS */ + namespace Glib { /** @relates Gnome::Canvas::Line @@ -456,6 +530,8 @@ namespace Glib * @result A C++ instance that wraps this C instance. */ Gnome::Canvas::Line* wrap(GnomeCanvasLine* object, bool take_copy = false); -} +} //namespace Glib + + #endif /* _LIBGNOMECANVASMM_LINE_H */ diff --git a/libs/libgnomecanvasmm/libgnomecanvasmm/path-def.cc b/libs/libgnomecanvasmm/libgnomecanvasmm/path-def.cc index 528c3f8153..7f907ffd49 100644 --- a/libs/libgnomecanvasmm/libgnomecanvasmm/path-def.cc +++ b/libs/libgnomecanvasmm/libgnomecanvasmm/path-def.cc @@ -1,5 +1,6 @@ // Generated by gtkmmproc -- DO NOT MODIFY! + #include #include @@ -39,7 +40,6 @@ Gnome::Art::Point PathDef::currentpoint() const } /* namespace Canvas */ } /* namespace Gnome */ - namespace { } // anonymous namespace @@ -148,47 +148,47 @@ Glib::RefPtr PathDef::close_all() void PathDef::finish() { - gnome_canvas_path_def_finish(gobj()); +gnome_canvas_path_def_finish(gobj()); } void PathDef::ensure_space(int space) { - gnome_canvas_path_def_ensure_space(gobj(), space); +gnome_canvas_path_def_ensure_space(gobj(), space); } void PathDef::reset() { - gnome_canvas_path_def_reset(gobj()); +gnome_canvas_path_def_reset(gobj()); } void PathDef::moveto(double x, double y) { - gnome_canvas_path_def_moveto(gobj(), x, y); +gnome_canvas_path_def_moveto(gobj(), x, y); } void PathDef::lineto(double x, double y) { - gnome_canvas_path_def_lineto(gobj(), x, y); +gnome_canvas_path_def_lineto(gobj(), x, y); } void PathDef::lineto_moving(double x, double y) { - gnome_canvas_path_def_lineto_moving(gobj(), x, y); +gnome_canvas_path_def_lineto_moving(gobj(), x, y); } void PathDef::curveto(double x1, double y1, double x2, double y2, double x3, double y3) { - gnome_canvas_path_def_curveto(gobj(), x1, y1, x2, y2, x3, y3); +gnome_canvas_path_def_curveto(gobj(), x1, y1, x2, y2, x3, y3); } void PathDef::closepath() { - gnome_canvas_path_def_closepath(gobj()); +gnome_canvas_path_def_closepath(gobj()); } void PathDef::closepath_current() { - gnome_canvas_path_def_closepath_current(gobj()); +gnome_canvas_path_def_closepath_current(gobj()); } ArtBpath* PathDef::get_bpath() const diff --git a/libs/libgnomecanvasmm/libgnomecanvasmm/path-def.h b/libs/libgnomecanvasmm/libgnomecanvasmm/path-def.h index 4f528f5806..c092793298 100644 --- a/libs/libgnomecanvasmm/libgnomecanvasmm/path-def.h +++ b/libs/libgnomecanvasmm/libgnomecanvasmm/path-def.h @@ -3,6 +3,7 @@ #ifndef _LIBGNOMECANVASMM_PATH_DEF_H #define _LIBGNOMECANVASMM_PATH_DEF_H + #include /* $Id$ */ @@ -280,5 +281,6 @@ namespace Glib } // namespace Glib + #endif /* _LIBGNOMECANVASMM_PATH_DEF_H */ diff --git a/libs/libgnomecanvasmm/libgnomecanvasmm/pixbuf.cc b/libs/libgnomecanvasmm/libgnomecanvasmm/pixbuf.cc index c0b49a70dc..adc4f13640 100644 --- a/libs/libgnomecanvasmm/libgnomecanvasmm/pixbuf.cc +++ b/libs/libgnomecanvasmm/libgnomecanvasmm/pixbuf.cc @@ -1,5 +1,6 @@ // Generated by gtkmmproc -- DO NOT MODIFY! + #include #include @@ -107,8 +108,13 @@ void Pixbuf_Class::class_init_function(void* g_class, void* class_data) BaseClassType *const klass = static_cast(g_class); CppClassParent::class_init_function(klass, class_data); +#ifdef GLIBMM_VFUNCS_ENABLED +#endif //GLIBMM_VFUNCS_ENABLED } +#ifdef GLIBMM_VFUNCS_ENABLED +#endif //GLIBMM_VFUNCS_ENABLED + Glib::ObjectBase* Pixbuf_Class::wrap_new(GObject* o) { @@ -149,125 +155,177 @@ GType Pixbuf::get_base_type() } +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy< Glib::RefPtr > Pixbuf::property_pixbuf() { return Glib::PropertyProxy< Glib::RefPtr >(this, "pixbuf"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly< Glib::RefPtr > Pixbuf::property_pixbuf() const { return Glib::PropertyProxy_ReadOnly< Glib::RefPtr >(this, "pixbuf"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy Pixbuf::property_width() { return Glib::PropertyProxy(this, "width"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly Pixbuf::property_width() const { return Glib::PropertyProxy_ReadOnly(this, "width"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy Pixbuf::property_width_set() { return Glib::PropertyProxy(this, "width-set"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly Pixbuf::property_width_set() const { return Glib::PropertyProxy_ReadOnly(this, "width-set"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy Pixbuf::property_width_in_pixels() { return Glib::PropertyProxy(this, "width-in-pixels"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly Pixbuf::property_width_in_pixels() const { return Glib::PropertyProxy_ReadOnly(this, "width-in-pixels"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy Pixbuf::property_height() { return Glib::PropertyProxy(this, "height"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly Pixbuf::property_height() const { return Glib::PropertyProxy_ReadOnly(this, "height"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy Pixbuf::property_height_set() { return Glib::PropertyProxy(this, "height-set"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly Pixbuf::property_height_set() const { return Glib::PropertyProxy_ReadOnly(this, "height-set"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy Pixbuf::property_height_in_pixels() { return Glib::PropertyProxy(this, "height-in-pixels"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly Pixbuf::property_height_in_pixels() const { return Glib::PropertyProxy_ReadOnly(this, "height-in-pixels"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy Pixbuf::property_x() { return Glib::PropertyProxy(this, "x"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly Pixbuf::property_x() const { return Glib::PropertyProxy_ReadOnly(this, "x"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy Pixbuf::property_x_in_pixels() { return Glib::PropertyProxy(this, "x-in-pixels"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly Pixbuf::property_x_in_pixels() const { return Glib::PropertyProxy_ReadOnly(this, "x-in-pixels"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy Pixbuf::property_y() { return Glib::PropertyProxy(this, "y"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly Pixbuf::property_y() const { return Glib::PropertyProxy_ReadOnly(this, "y"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy Pixbuf::property_y_in_pixels() { return Glib::PropertyProxy(this, "y-in-pixels"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly Pixbuf::property_y_in_pixels() const { return Glib::PropertyProxy_ReadOnly(this, "y-in-pixels"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy Pixbuf::property_anchor() { return Glib::PropertyProxy(this, "anchor"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly Pixbuf::property_anchor() const { return Glib::PropertyProxy_ReadOnly(this, "anchor"); } +#endif //GLIBMM_PROPERTIES_ENABLED + + +#ifdef GLIBMM_VFUNCS_ENABLED +#endif //GLIBMM_VFUNCS_ENABLED } // namespace Canvas diff --git a/libs/libgnomecanvasmm/libgnomecanvasmm/pixbuf.h b/libs/libgnomecanvasmm/libgnomecanvasmm/pixbuf.h index 6b7922318e..b470e3e1db 100644 --- a/libs/libgnomecanvasmm/libgnomecanvasmm/pixbuf.h +++ b/libs/libgnomecanvasmm/libgnomecanvasmm/pixbuf.h @@ -3,6 +3,7 @@ #ifndef _LIBGNOMECANVASMM_PIXBUF_H #define _LIBGNOMECANVASMM_PIXBUF_H + #include // -*- C++ -*- @@ -97,9 +98,13 @@ public: public: //C++ methods used to invoke GTK+ virtual functions: +#ifdef GLIBMM_VFUNCS_ENABLED +#endif //GLIBMM_VFUNCS_ENABLED protected: //GTK+ Virtual Functions (override these to change behaviour): +#ifdef GLIBMM_VFUNCS_ENABLED +#endif //GLIBMM_VFUNCS_ENABLED //Default Signal Handlers:: @@ -110,14 +115,17 @@ public: Pixbuf(Group& parent, double x, double y, const Glib::RefPtr& image); explicit Pixbuf(Group& parent); - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy< Glib::RefPtr > property_pixbuf() ; +#endif //#GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED /** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. @@ -125,15 +133,19 @@ public: * the value of the property changes. */ Glib::PropertyProxy_ReadOnly< Glib::RefPtr > property_pixbuf() const; +#endif //#GLIBMM_PROPERTIES_ENABLED - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy property_width() ; +#endif //#GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED /** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. @@ -141,15 +153,19 @@ public: * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_width() const; +#endif //#GLIBMM_PROPERTIES_ENABLED - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy property_width_set() ; +#endif //#GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED /** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. @@ -157,15 +173,19 @@ public: * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_width_set() const; +#endif //#GLIBMM_PROPERTIES_ENABLED - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy property_width_in_pixels() ; +#endif //#GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED /** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. @@ -173,15 +193,19 @@ public: * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_width_in_pixels() const; +#endif //#GLIBMM_PROPERTIES_ENABLED - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy property_height() ; +#endif //#GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED /** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. @@ -189,15 +213,19 @@ public: * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_height() const; +#endif //#GLIBMM_PROPERTIES_ENABLED - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy property_height_set() ; +#endif //#GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED /** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. @@ -205,15 +233,19 @@ public: * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_height_set() const; +#endif //#GLIBMM_PROPERTIES_ENABLED - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy property_height_in_pixels() ; +#endif //#GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED /** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. @@ -221,15 +253,19 @@ public: * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_height_in_pixels() const; +#endif //#GLIBMM_PROPERTIES_ENABLED - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy property_x() ; +#endif //#GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED /** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. @@ -237,15 +273,19 @@ public: * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_x() const; +#endif //#GLIBMM_PROPERTIES_ENABLED - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy property_x_in_pixels() ; +#endif //#GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED /** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. @@ -253,15 +293,19 @@ public: * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_x_in_pixels() const; +#endif //#GLIBMM_PROPERTIES_ENABLED - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy property_y() ; +#endif //#GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED /** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. @@ -269,15 +313,19 @@ public: * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_y() const; +#endif //#GLIBMM_PROPERTIES_ENABLED - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy property_y_in_pixels() ; +#endif //#GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED /** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. @@ -285,15 +333,19 @@ public: * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_y_in_pixels() const; +#endif //#GLIBMM_PROPERTIES_ENABLED - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy property_anchor() ; +#endif //#GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED /** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. @@ -301,6 +353,7 @@ public: * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_anchor() const; +#endif //#GLIBMM_PROPERTIES_ENABLED }; @@ -308,6 +361,7 @@ public: } /* namespace Canvas */ } /* namespace Gnome */ + namespace Glib { /** @relates Gnome::Canvas::Pixbuf @@ -316,6 +370,8 @@ namespace Glib * @result A C++ instance that wraps this C instance. */ Gnome::Canvas::Pixbuf* wrap(GnomeCanvasPixbuf* object, bool take_copy = false); -} +} //namespace Glib + + #endif /* _LIBGNOMECANVASMM_PIXBUF_H */ diff --git a/libs/libgnomecanvasmm/libgnomecanvasmm/polygon.cc b/libs/libgnomecanvasmm/libgnomecanvasmm/polygon.cc index 08eb1b60bc..733f40b4a6 100644 --- a/libs/libgnomecanvasmm/libgnomecanvasmm/polygon.cc +++ b/libs/libgnomecanvasmm/libgnomecanvasmm/polygon.cc @@ -1,5 +1,6 @@ // Generated by gtkmmproc -- DO NOT MODIFY! + #include #include @@ -96,8 +97,13 @@ void Polygon_Class::class_init_function(void* g_class, void* class_data) BaseClassType *const klass = static_cast(g_class); CppClassParent::class_init_function(klass, class_data); +#ifdef GLIBMM_VFUNCS_ENABLED +#endif //GLIBMM_VFUNCS_ENABLED } +#ifdef GLIBMM_VFUNCS_ENABLED +#endif //GLIBMM_VFUNCS_ENABLED + Glib::ObjectBase* Polygon_Class::wrap_new(GObject* o) { @@ -138,15 +144,23 @@ GType Polygon::get_base_type() } +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy Polygon::property_points() { return Glib::PropertyProxy(this, "points"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly Polygon::property_points() const { return Glib::PropertyProxy_ReadOnly(this, "points"); } +#endif //GLIBMM_PROPERTIES_ENABLED + + +#ifdef GLIBMM_VFUNCS_ENABLED +#endif //GLIBMM_VFUNCS_ENABLED } // namespace Canvas diff --git a/libs/libgnomecanvasmm/libgnomecanvasmm/polygon.h b/libs/libgnomecanvasmm/libgnomecanvasmm/polygon.h index 1d6dad5e55..69c04be71f 100644 --- a/libs/libgnomecanvasmm/libgnomecanvasmm/polygon.h +++ b/libs/libgnomecanvasmm/libgnomecanvasmm/polygon.h @@ -3,6 +3,7 @@ #ifndef _LIBGNOMECANVASMM_POLYGON_H #define _LIBGNOMECANVASMM_POLYGON_H + #include /* $Id$ */ @@ -95,9 +96,13 @@ public: public: //C++ methods used to invoke GTK+ virtual functions: +#ifdef GLIBMM_VFUNCS_ENABLED +#endif //GLIBMM_VFUNCS_ENABLED protected: //GTK+ Virtual Functions (override these to change behaviour): +#ifdef GLIBMM_VFUNCS_ENABLED +#endif //GLIBMM_VFUNCS_ENABLED //Default Signal Handlers:: @@ -108,14 +113,17 @@ public: Polygon(Group& parent, const Points& points); explicit Polygon(Group& parent); - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy property_points() ; +#endif //#GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED /** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. @@ -123,6 +131,7 @@ public: * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_points() const; +#endif //#GLIBMM_PROPERTIES_ENABLED }; @@ -139,6 +148,8 @@ namespace Glib * @result A C++ instance that wraps this C instance. */ Gnome::Canvas::Polygon* wrap(GnomeCanvasPolygon* object, bool take_copy = false); -} +} //namespace Glib + + #endif /* _LIBGNOMECANVASMM_POLYGON_H */ diff --git a/libs/libgnomecanvasmm/libgnomecanvasmm/private/bpath_p.h b/libs/libgnomecanvasmm/libgnomecanvasmm/private/bpath_p.h index 4c6d727306..897cc84bb2 100644 --- a/libs/libgnomecanvasmm/libgnomecanvasmm/private/bpath_p.h +++ b/libs/libgnomecanvasmm/libgnomecanvasmm/private/bpath_p.h @@ -2,6 +2,8 @@ // Generated by gtkmmproc -- DO NOT MODIFY! #ifndef _LIBGNOMECANVASMM_BPATH_P_H #define _LIBGNOMECANVASMM_BPATH_P_H + + #include #include @@ -38,6 +40,8 @@ protected: //You could prevent the original default signal handlers being called by overriding the *_impl method. //Callbacks (virtual functions): +#ifdef GLIBMM_VFUNCS_ENABLED +#endif //GLIBMM_VFUNCS_ENABLED }; @@ -45,5 +49,6 @@ protected: } // namespace Gnome + #endif /* _LIBGNOMECANVASMM_BPATH_P_H */ diff --git a/libs/libgnomecanvasmm/libgnomecanvasmm/private/canvas_p.h b/libs/libgnomecanvasmm/libgnomecanvasmm/private/canvas_p.h index 48b08937c5..e042f0c010 100644 --- a/libs/libgnomecanvasmm/libgnomecanvasmm/private/canvas_p.h +++ b/libs/libgnomecanvasmm/libgnomecanvasmm/private/canvas_p.h @@ -2,6 +2,8 @@ // Generated by gtkmmproc -- DO NOT MODIFY! #ifndef _LIBGNOMECANVASMM_CANVAS_P_H #define _LIBGNOMECANVASMM_CANVAS_P_H + + #include #include @@ -40,7 +42,9 @@ protected: static void render_background_callback(GnomeCanvas* self, GnomeCanvasBuf* p0); //Callbacks (virtual functions): +#ifdef GLIBMM_VFUNCS_ENABLED static void request_update_vfunc_callback(GnomeCanvas* self); +#endif //GLIBMM_VFUNCS_ENABLED }; @@ -48,5 +52,6 @@ protected: } // namespace Gnome + #endif /* _LIBGNOMECANVASMM_CANVAS_P_H */ diff --git a/libs/libgnomecanvasmm/libgnomecanvasmm/private/ellipse_p.h b/libs/libgnomecanvasmm/libgnomecanvasmm/private/ellipse_p.h index 513b1a945c..20011b3d94 100644 --- a/libs/libgnomecanvasmm/libgnomecanvasmm/private/ellipse_p.h +++ b/libs/libgnomecanvasmm/libgnomecanvasmm/private/ellipse_p.h @@ -2,6 +2,8 @@ // Generated by gtkmmproc -- DO NOT MODIFY! #ifndef _LIBGNOMECANVASMM_ELLIPSE_P_H #define _LIBGNOMECANVASMM_ELLIPSE_P_H + + #include #include @@ -38,6 +40,8 @@ protected: //You could prevent the original default signal handlers being called by overriding the *_impl method. //Callbacks (virtual functions): +#ifdef GLIBMM_VFUNCS_ENABLED +#endif //GLIBMM_VFUNCS_ENABLED }; @@ -45,5 +49,6 @@ protected: } // namespace Gnome + #endif /* _LIBGNOMECANVASMM_ELLIPSE_P_H */ diff --git a/libs/libgnomecanvasmm/libgnomecanvasmm/private/group_p.h b/libs/libgnomecanvasmm/libgnomecanvasmm/private/group_p.h index 95a2ecff44..3d9787049b 100644 --- a/libs/libgnomecanvasmm/libgnomecanvasmm/private/group_p.h +++ b/libs/libgnomecanvasmm/libgnomecanvasmm/private/group_p.h @@ -2,6 +2,8 @@ // Generated by gtkmmproc -- DO NOT MODIFY! #ifndef _LIBGNOMECANVASMM_GROUP_P_H #define _LIBGNOMECANVASMM_GROUP_P_H + + #include #include @@ -38,6 +40,8 @@ protected: //You could prevent the original default signal handlers being called by overriding the *_impl method. //Callbacks (virtual functions): +#ifdef GLIBMM_VFUNCS_ENABLED +#endif //GLIBMM_VFUNCS_ENABLED }; @@ -45,5 +49,6 @@ protected: } // namespace Gnome + #endif /* _LIBGNOMECANVASMM_GROUP_P_H */ diff --git a/libs/libgnomecanvasmm/libgnomecanvasmm/private/item_p.h b/libs/libgnomecanvasmm/libgnomecanvasmm/private/item_p.h index d898eb8304..27eee31991 100644 --- a/libs/libgnomecanvasmm/libgnomecanvasmm/private/item_p.h +++ b/libs/libgnomecanvasmm/libgnomecanvasmm/private/item_p.h @@ -2,6 +2,8 @@ // Generated by gtkmmproc -- DO NOT MODIFY! #ifndef _LIBGNOMECANVASMM_ITEM_P_H #define _LIBGNOMECANVASMM_ITEM_P_H + + #include #include @@ -39,6 +41,7 @@ protected: static gboolean event_callback(GnomeCanvasItem* self, GdkEvent* p0); //Callbacks (virtual functions): +#ifdef GLIBMM_VFUNCS_ENABLED static void update_vfunc_callback(GnomeCanvasItem* self, double* affine, ArtSVP* clip_path, int flags); static void realize_vfunc_callback(GnomeCanvasItem* self); static void unrealize_vfunc_callback(GnomeCanvasItem* self); @@ -49,6 +52,7 @@ protected: static void render_vfunc_callback(GnomeCanvasItem* self, GnomeCanvasBuf* buf); static double point_vfunc_callback(GnomeCanvasItem* self, double x, double y, int cx, int cy, GnomeCanvasItem** actual_item); static void bounds_vfunc_callback(GnomeCanvasItem* self, double* x1, double* y1, double* x2, double* y2); +#endif //GLIBMM_VFUNCS_ENABLED }; @@ -56,5 +60,6 @@ protected: } // namespace Gnome + #endif /* _LIBGNOMECANVASMM_ITEM_P_H */ diff --git a/libs/libgnomecanvasmm/libgnomecanvasmm/private/line_p.h b/libs/libgnomecanvasmm/libgnomecanvasmm/private/line_p.h index 819ad6ee7c..962fc96436 100644 --- a/libs/libgnomecanvasmm/libgnomecanvasmm/private/line_p.h +++ b/libs/libgnomecanvasmm/libgnomecanvasmm/private/line_p.h @@ -2,6 +2,8 @@ // Generated by gtkmmproc -- DO NOT MODIFY! #ifndef _LIBGNOMECANVASMM_LINE_P_H #define _LIBGNOMECANVASMM_LINE_P_H + + #include #include @@ -38,6 +40,8 @@ protected: //You could prevent the original default signal handlers being called by overriding the *_impl method. //Callbacks (virtual functions): +#ifdef GLIBMM_VFUNCS_ENABLED +#endif //GLIBMM_VFUNCS_ENABLED }; @@ -45,5 +49,6 @@ protected: } // namespace Gnome + #endif /* _LIBGNOMECANVASMM_LINE_P_H */ diff --git a/libs/libgnomecanvasmm/libgnomecanvasmm/private/path-def_p.h b/libs/libgnomecanvasmm/libgnomecanvasmm/private/path-def_p.h index b7ccc3f278..18d4d97ca0 100644 --- a/libs/libgnomecanvasmm/libgnomecanvasmm/private/path-def_p.h +++ b/libs/libgnomecanvasmm/libgnomecanvasmm/private/path-def_p.h @@ -2,5 +2,7 @@ // Generated by gtkmmproc -- DO NOT MODIFY! #ifndef _LIBGNOMECANVASMM_PATH_DEF_P_H #define _LIBGNOMECANVASMM_PATH_DEF_P_H + + #endif /* _LIBGNOMECANVASMM_PATH_DEF_P_H */ diff --git a/libs/libgnomecanvasmm/libgnomecanvasmm/private/pixbuf_p.h b/libs/libgnomecanvasmm/libgnomecanvasmm/private/pixbuf_p.h index 54e464677a..99948eb48b 100644 --- a/libs/libgnomecanvasmm/libgnomecanvasmm/private/pixbuf_p.h +++ b/libs/libgnomecanvasmm/libgnomecanvasmm/private/pixbuf_p.h @@ -2,6 +2,8 @@ // Generated by gtkmmproc -- DO NOT MODIFY! #ifndef _LIBGNOMECANVASMM_PIXBUF_P_H #define _LIBGNOMECANVASMM_PIXBUF_P_H + + #include #include @@ -38,6 +40,8 @@ protected: //You could prevent the original default signal handlers being called by overriding the *_impl method. //Callbacks (virtual functions): +#ifdef GLIBMM_VFUNCS_ENABLED +#endif //GLIBMM_VFUNCS_ENABLED }; @@ -45,5 +49,6 @@ protected: } // namespace Gnome + #endif /* _LIBGNOMECANVASMM_PIXBUF_P_H */ diff --git a/libs/libgnomecanvasmm/libgnomecanvasmm/private/polygon_p.h b/libs/libgnomecanvasmm/libgnomecanvasmm/private/polygon_p.h index 2ca067cf7b..a8cf7bb60f 100644 --- a/libs/libgnomecanvasmm/libgnomecanvasmm/private/polygon_p.h +++ b/libs/libgnomecanvasmm/libgnomecanvasmm/private/polygon_p.h @@ -2,6 +2,8 @@ // Generated by gtkmmproc -- DO NOT MODIFY! #ifndef _LIBGNOMECANVASMM_POLYGON_P_H #define _LIBGNOMECANVASMM_POLYGON_P_H + + #include #include @@ -38,6 +40,8 @@ protected: //You could prevent the original default signal handlers being called by overriding the *_impl method. //Callbacks (virtual functions): +#ifdef GLIBMM_VFUNCS_ENABLED +#endif //GLIBMM_VFUNCS_ENABLED }; @@ -45,5 +49,6 @@ protected: } // namespace Gnome + #endif /* _LIBGNOMECANVASMM_POLYGON_P_H */ diff --git a/libs/libgnomecanvasmm/libgnomecanvasmm/private/rect-ellipse_p.h b/libs/libgnomecanvasmm/libgnomecanvasmm/private/rect-ellipse_p.h index 73913352bb..fee92dfe02 100644 --- a/libs/libgnomecanvasmm/libgnomecanvasmm/private/rect-ellipse_p.h +++ b/libs/libgnomecanvasmm/libgnomecanvasmm/private/rect-ellipse_p.h @@ -2,6 +2,8 @@ // Generated by gtkmmproc -- DO NOT MODIFY! #ifndef _LIBGNOMECANVASMM_RECT_ELLIPSE_P_H #define _LIBGNOMECANVASMM_RECT_ELLIPSE_P_H + + #include #include @@ -38,6 +40,8 @@ protected: //You could prevent the original default signal handlers being called by overriding the *_impl method. //Callbacks (virtual functions): +#ifdef GLIBMM_VFUNCS_ENABLED +#endif //GLIBMM_VFUNCS_ENABLED }; @@ -45,5 +49,6 @@ protected: } // namespace Gnome + #endif /* _LIBGNOMECANVASMM_RECT_ELLIPSE_P_H */ diff --git a/libs/libgnomecanvasmm/libgnomecanvasmm/private/rect_p.h b/libs/libgnomecanvasmm/libgnomecanvasmm/private/rect_p.h index a42c84fd15..2041ac1a42 100644 --- a/libs/libgnomecanvasmm/libgnomecanvasmm/private/rect_p.h +++ b/libs/libgnomecanvasmm/libgnomecanvasmm/private/rect_p.h @@ -2,6 +2,8 @@ // Generated by gtkmmproc -- DO NOT MODIFY! #ifndef _LIBGNOMECANVASMM_RECT_P_H #define _LIBGNOMECANVASMM_RECT_P_H + + #include #include @@ -38,6 +40,8 @@ protected: //You could prevent the original default signal handlers being called by overriding the *_impl method. //Callbacks (virtual functions): +#ifdef GLIBMM_VFUNCS_ENABLED +#endif //GLIBMM_VFUNCS_ENABLED }; @@ -45,5 +49,6 @@ protected: } // namespace Gnome + #endif /* _LIBGNOMECANVASMM_RECT_P_H */ diff --git a/libs/libgnomecanvasmm/libgnomecanvasmm/private/rich-text_p.h b/libs/libgnomecanvasmm/libgnomecanvasmm/private/rich-text_p.h index 90fa63a557..a5ef4b778a 100644 --- a/libs/libgnomecanvasmm/libgnomecanvasmm/private/rich-text_p.h +++ b/libs/libgnomecanvasmm/libgnomecanvasmm/private/rich-text_p.h @@ -2,6 +2,8 @@ // Generated by gtkmmproc -- DO NOT MODIFY! #ifndef _LIBGNOMECANVASMM_RICH_TEXT_P_H #define _LIBGNOMECANVASMM_RICH_TEXT_P_H + + #include #include @@ -36,9 +38,11 @@ protected: //Callbacks (default signal handlers): //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any. //You could prevent the original default signal handlers being called by overriding the *_impl method. - static void tag_changed_callback(GnomeCanvasRichText* self, GtkTextTag* tag); + static void tag_changed_callback(GnomeCanvasRichText* self, GtkTextTag* p0); //Callbacks (virtual functions): +#ifdef GLIBMM_VFUNCS_ENABLED +#endif //GLIBMM_VFUNCS_ENABLED }; @@ -46,5 +50,6 @@ protected: } // namespace Gnome + #endif /* _LIBGNOMECANVASMM_RICH_TEXT_P_H */ diff --git a/libs/libgnomecanvasmm/libgnomecanvasmm/private/shape_p.h b/libs/libgnomecanvasmm/libgnomecanvasmm/private/shape_p.h index f0fac4d6f2..fe010aef6a 100644 --- a/libs/libgnomecanvasmm/libgnomecanvasmm/private/shape_p.h +++ b/libs/libgnomecanvasmm/libgnomecanvasmm/private/shape_p.h @@ -2,6 +2,8 @@ // Generated by gtkmmproc -- DO NOT MODIFY! #ifndef _LIBGNOMECANVASMM_SHAPE_P_H #define _LIBGNOMECANVASMM_SHAPE_P_H + + #include #include @@ -38,6 +40,8 @@ protected: //You could prevent the original default signal handlers being called by overriding the *_impl method. //Callbacks (virtual functions): +#ifdef GLIBMM_VFUNCS_ENABLED +#endif //GLIBMM_VFUNCS_ENABLED }; @@ -45,5 +49,6 @@ protected: } // namespace Gnome + #endif /* _LIBGNOMECANVASMM_SHAPE_P_H */ diff --git a/libs/libgnomecanvasmm/libgnomecanvasmm/private/text_p.h b/libs/libgnomecanvasmm/libgnomecanvasmm/private/text_p.h index f15e8e5a50..f62f3627bf 100644 --- a/libs/libgnomecanvasmm/libgnomecanvasmm/private/text_p.h +++ b/libs/libgnomecanvasmm/libgnomecanvasmm/private/text_p.h @@ -2,6 +2,8 @@ // Generated by gtkmmproc -- DO NOT MODIFY! #ifndef _LIBGNOMECANVASMM_TEXT_P_H #define _LIBGNOMECANVASMM_TEXT_P_H + + #include #include @@ -38,6 +40,8 @@ protected: //You could prevent the original default signal handlers being called by overriding the *_impl method. //Callbacks (virtual functions): +#ifdef GLIBMM_VFUNCS_ENABLED +#endif //GLIBMM_VFUNCS_ENABLED }; @@ -45,5 +49,6 @@ protected: } // namespace Gnome + #endif /* _LIBGNOMECANVASMM_TEXT_P_H */ diff --git a/libs/libgnomecanvasmm/libgnomecanvasmm/private/widget_p.h b/libs/libgnomecanvasmm/libgnomecanvasmm/private/widget_p.h index 22fede33de..6b7ff7658d 100644 --- a/libs/libgnomecanvasmm/libgnomecanvasmm/private/widget_p.h +++ b/libs/libgnomecanvasmm/libgnomecanvasmm/private/widget_p.h @@ -2,6 +2,8 @@ // Generated by gtkmmproc -- DO NOT MODIFY! #ifndef _LIBGNOMECANVASMM_WIDGET_P_H #define _LIBGNOMECANVASMM_WIDGET_P_H + + #include #include @@ -38,6 +40,8 @@ protected: //You could prevent the original default signal handlers being called by overriding the *_impl method. //Callbacks (virtual functions): +#ifdef GLIBMM_VFUNCS_ENABLED +#endif //GLIBMM_VFUNCS_ENABLED }; @@ -45,5 +49,6 @@ protected: } // namespace Gnome + #endif /* _LIBGNOMECANVASMM_WIDGET_P_H */ diff --git a/libs/libgnomecanvasmm/libgnomecanvasmm/rect-ellipse.cc b/libs/libgnomecanvasmm/libgnomecanvasmm/rect-ellipse.cc index 2733963ce0..09deadeb5b 100644 --- a/libs/libgnomecanvasmm/libgnomecanvasmm/rect-ellipse.cc +++ b/libs/libgnomecanvasmm/libgnomecanvasmm/rect-ellipse.cc @@ -1,5 +1,6 @@ // Generated by gtkmmproc -- DO NOT MODIFY! + #include #include @@ -40,7 +41,6 @@ RectEllipse::RectEllipse(Group& parent) } /* namespace Canvas */ } /* namespace Gnome */ - namespace { } // anonymous namespace @@ -90,8 +90,13 @@ void RectEllipse_Class::class_init_function(void* g_class, void* class_data) BaseClassType *const klass = static_cast(g_class); CppClassParent::class_init_function(klass, class_data); +#ifdef GLIBMM_VFUNCS_ENABLED +#endif //GLIBMM_VFUNCS_ENABLED } +#ifdef GLIBMM_VFUNCS_ENABLED +#endif //GLIBMM_VFUNCS_ENABLED + Glib::ObjectBase* RectEllipse_Class::wrap_new(GObject* o) { @@ -132,45 +137,65 @@ GType RectEllipse::get_base_type() } +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy RectEllipse::property_x1() { return Glib::PropertyProxy(this, "x1"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly RectEllipse::property_x1() const { return Glib::PropertyProxy_ReadOnly(this, "x1"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy RectEllipse::property_y1() { return Glib::PropertyProxy(this, "y1"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly RectEllipse::property_y1() const { return Glib::PropertyProxy_ReadOnly(this, "y1"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy RectEllipse::property_x2() { return Glib::PropertyProxy(this, "x2"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly RectEllipse::property_x2() const { return Glib::PropertyProxy_ReadOnly(this, "x2"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy RectEllipse::property_y2() { return Glib::PropertyProxy(this, "y2"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly RectEllipse::property_y2() const { return Glib::PropertyProxy_ReadOnly(this, "y2"); } +#endif //GLIBMM_PROPERTIES_ENABLED + + +#ifdef GLIBMM_VFUNCS_ENABLED +#endif //GLIBMM_VFUNCS_ENABLED } // namespace Canvas diff --git a/libs/libgnomecanvasmm/libgnomecanvasmm/rect-ellipse.h b/libs/libgnomecanvasmm/libgnomecanvasmm/rect-ellipse.h index 9982ce34b2..4c3a43963b 100644 --- a/libs/libgnomecanvasmm/libgnomecanvasmm/rect-ellipse.h +++ b/libs/libgnomecanvasmm/libgnomecanvasmm/rect-ellipse.h @@ -3,6 +3,7 @@ #ifndef _LIBGNOMECANVASMM_RECT_ELLIPSE_H #define _LIBGNOMECANVASMM_RECT_ELLIPSE_H + #include // -*- C++ -*- @@ -101,9 +102,13 @@ public: public: //C++ methods used to invoke GTK+ virtual functions: +#ifdef GLIBMM_VFUNCS_ENABLED +#endif //GLIBMM_VFUNCS_ENABLED protected: //GTK+ Virtual Functions (override these to change behaviour): +#ifdef GLIBMM_VFUNCS_ENABLED +#endif //GLIBMM_VFUNCS_ENABLED //Default Signal Handlers:: @@ -113,14 +118,17 @@ private: public: explicit RectEllipse(Group& parent); - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy property_x1() ; +#endif //#GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED /** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. @@ -128,15 +136,19 @@ public: * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_x1() const; +#endif //#GLIBMM_PROPERTIES_ENABLED - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy property_y1() ; +#endif //#GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED /** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. @@ -144,15 +156,19 @@ public: * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_y1() const; +#endif //#GLIBMM_PROPERTIES_ENABLED - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy property_x2() ; +#endif //#GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED /** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. @@ -160,15 +176,19 @@ public: * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_x2() const; +#endif //#GLIBMM_PROPERTIES_ENABLED - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy property_y2() ; +#endif //#GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED /** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. @@ -176,6 +196,7 @@ public: * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_y2() const; +#endif //#GLIBMM_PROPERTIES_ENABLED }; @@ -183,6 +204,7 @@ public: } /* namespace Canvas */ } /* namespace Gnome */ + namespace Glib { /** @relates Gnome::Canvas::RectEllipse @@ -191,6 +213,8 @@ namespace Glib * @result A C++ instance that wraps this C instance. */ Gnome::Canvas::RectEllipse* wrap(GnomeCanvasRE* object, bool take_copy = false); -} +} //namespace Glib + + #endif /* _LIBGNOMECANVASMM_RECT_ELLIPSE_H */ diff --git a/libs/libgnomecanvasmm/libgnomecanvasmm/rect.cc b/libs/libgnomecanvasmm/libgnomecanvasmm/rect.cc index 68bc53a756..080cc6d924 100644 --- a/libs/libgnomecanvasmm/libgnomecanvasmm/rect.cc +++ b/libs/libgnomecanvasmm/libgnomecanvasmm/rect.cc @@ -1,5 +1,6 @@ // Generated by gtkmmproc -- DO NOT MODIFY! + #include #include @@ -47,7 +48,6 @@ Rect::Rect(Group& parentx) } /* namespace Canvas */ } /* namespace Gnome */ - namespace { } // anonymous namespace @@ -97,8 +97,13 @@ void Rect_Class::class_init_function(void* g_class, void* class_data) BaseClassType *const klass = static_cast(g_class); CppClassParent::class_init_function(klass, class_data); +#ifdef GLIBMM_VFUNCS_ENABLED +#endif //GLIBMM_VFUNCS_ENABLED } +#ifdef GLIBMM_VFUNCS_ENABLED +#endif //GLIBMM_VFUNCS_ENABLED + Glib::ObjectBase* Rect_Class::wrap_new(GObject* o) { @@ -139,6 +144,10 @@ GType Rect::get_base_type() } +#ifdef GLIBMM_VFUNCS_ENABLED +#endif //GLIBMM_VFUNCS_ENABLED + + } // namespace Canvas } // namespace Gnome diff --git a/libs/libgnomecanvasmm/libgnomecanvasmm/rect.h b/libs/libgnomecanvasmm/libgnomecanvasmm/rect.h index cebd0c4655..a06513f8d5 100644 --- a/libs/libgnomecanvasmm/libgnomecanvasmm/rect.h +++ b/libs/libgnomecanvasmm/libgnomecanvasmm/rect.h @@ -3,6 +3,7 @@ #ifndef _LIBGNOMECANVASMM_RECT_H #define _LIBGNOMECANVASMM_RECT_H + #include /* $Id$ */ @@ -99,9 +100,13 @@ public: public: //C++ methods used to invoke GTK+ virtual functions: +#ifdef GLIBMM_VFUNCS_ENABLED +#endif //GLIBMM_VFUNCS_ENABLED protected: //GTK+ Virtual Functions (override these to change behaviour): +#ifdef GLIBMM_VFUNCS_ENABLED +#endif //GLIBMM_VFUNCS_ENABLED //Default Signal Handlers:: @@ -119,6 +124,7 @@ public: } /* namespace Canvas */ } /* namespace Gnome */ + namespace Glib { /** @relates Gnome::Canvas::Rect @@ -127,6 +133,8 @@ namespace Glib * @result A C++ instance that wraps this C instance. */ Gnome::Canvas::Rect* wrap(GnomeCanvasRect* object, bool take_copy = false); -} +} //namespace Glib + + #endif /* _LIBGNOMECANVASMM_RECT_H */ diff --git a/libs/libgnomecanvasmm/libgnomecanvasmm/rich-text.cc b/libs/libgnomecanvasmm/libgnomecanvasmm/rich-text.cc index 87978b2b1b..3645b84fc8 100644 --- a/libs/libgnomecanvasmm/libgnomecanvasmm/rich-text.cc +++ b/libs/libgnomecanvasmm/libgnomecanvasmm/rich-text.cc @@ -1,5 +1,6 @@ // Generated by gtkmmproc -- DO NOT MODIFY! + #include #include @@ -65,7 +66,7 @@ RichText::iterator RichText::get_iter_at_location(int x, int y) const namespace { -void RichText_signal_tag_changed_callback(GnomeCanvasRichText* self, GtkTextTag* tag,void* data) +static void RichText_signal_tag_changed_callback(GnomeCanvasRichText* self, GtkTextTag* p0,void* data) { using namespace Gnome::Canvas; typedef sigc::slot< void,const Glib::RefPtr& > SlotType; @@ -73,20 +74,24 @@ void RichText_signal_tag_changed_callback(GnomeCanvasRichText* self, GtkTextTag* // Do not try to call a signal on a disassociated wrapper. if(Glib::ObjectBase::_get_current_wrapper((GObject*) self)) { + #ifdef GLIBMM_EXCEPTIONS_ENABLED try { + #endif //GLIBMM_EXCEPTIONS_ENABLED if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data)) - (*static_cast(slot))(Glib::wrap(tag, true) + (*static_cast(slot))(Glib::wrap(p0, true) ); + #ifdef GLIBMM_EXCEPTIONS_ENABLED } catch(...) { Glib::exception_handlers_invoke(); } + #endif //GLIBMM_EXCEPTIONS_ENABLED } } -const Glib::SignalProxyInfo RichText_signal_tag_changed_info = +static const Glib::SignalProxyInfo RichText_signal_tag_changed_info = { "tag_changed", (GCallback) &RichText_signal_tag_changed_callback, @@ -140,11 +145,15 @@ void RichText_Class::class_init_function(void* g_class, void* class_data) BaseClassType *const klass = static_cast(g_class); CppClassParent::class_init_function(klass, class_data); +#ifdef GLIBMM_VFUNCS_ENABLED +#endif //GLIBMM_VFUNCS_ENABLED klass->tag_changed = &tag_changed_callback; } +#ifdef GLIBMM_VFUNCS_ENABLED +#endif //GLIBMM_VFUNCS_ENABLED -void RichText_Class::tag_changed_callback(GnomeCanvasRichText* self, GtkTextTag* tag) +void RichText_Class::tag_changed_callback(GnomeCanvasRichText* self, GtkTextTag* p0) { CppObjectType *const obj = dynamic_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); @@ -156,16 +165,20 @@ void RichText_Class::tag_changed_callback(GnomeCanvasRichText* self, GtkTextTag* // being overridden: if(obj && obj->is_derived_()) { + #ifdef GLIBMM_EXCEPTIONS_ENABLED try // Trap C++ exceptions which would normally be lost because this is a C callback. { + #endif //GLIBMM_EXCEPTIONS_ENABLED // Call the virtual member method, which derived classes might override. - obj->on_tag_changed(Glib::wrap(tag, true) + obj->on_tag_changed(Glib::wrap(p0, true) ); + #ifdef GLIBMM_EXCEPTIONS_ENABLED } catch(...) { Glib::exception_handlers_invoke(); } + #endif //GLIBMM_EXCEPTIONS_ENABLED } else { @@ -175,7 +188,7 @@ void RichText_Class::tag_changed_callback(GnomeCanvasRichText* self, GtkTextTag* // Call the original underlying C function: if(base && base->tag_changed) - (*base->tag_changed)(self, tag); + (*base->tag_changed)(self, p0); } } @@ -221,22 +234,22 @@ GType RichText::get_base_type() void RichText::cut_clipboard() { - gnome_canvas_rich_text_cut_clipboard(gobj()); +gnome_canvas_rich_text_cut_clipboard(gobj()); } void RichText::copy_clipboard() { - gnome_canvas_rich_text_copy_clipboard(gobj()); +gnome_canvas_rich_text_copy_clipboard(gobj()); } void RichText::paste_clipboard() { - gnome_canvas_rich_text_paste_clipboard(gobj()); +gnome_canvas_rich_text_paste_clipboard(gobj()); } void RichText::set_buffer(const Glib::RefPtr& buffer) { - gnome_canvas_rich_text_set_buffer(gobj(), Glib::unwrap(buffer)); +gnome_canvas_rich_text_set_buffer(gobj(), Glib::unwrap(buffer)); } Glib::RefPtr RichText::get_buffer() const @@ -246,7 +259,7 @@ Glib::RefPtr RichText::get_buffer() const void RichText::get_iter_location(const iterator& iter, Gdk::Rectangle& location) const { - gnome_canvas_rich_text_get_iter_location(const_cast(gobj()), (iter).gobj(), (location).gobj()); +gnome_canvas_rich_text_get_iter_location(const_cast(gobj()), (iter).gobj(), (location).gobj()); } @@ -256,205 +269,285 @@ Glib::SignalProxy1< void,const Glib::RefPtr& > RichText::signal_ta } +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy RichText::property_text() { return Glib::PropertyProxy(this, "text"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly RichText::property_text() const { return Glib::PropertyProxy_ReadOnly(this, "text"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy RichText::property_x() { return Glib::PropertyProxy(this, "x"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly RichText::property_x() const { return Glib::PropertyProxy_ReadOnly(this, "x"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy RichText::property_y() { return Glib::PropertyProxy(this, "y"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly RichText::property_y() const { return Glib::PropertyProxy_ReadOnly(this, "y"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy RichText::property_width() { return Glib::PropertyProxy(this, "width"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly RichText::property_width() const { return Glib::PropertyProxy_ReadOnly(this, "width"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy RichText::property_height() { return Glib::PropertyProxy(this, "height"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly RichText::property_height() const { return Glib::PropertyProxy_ReadOnly(this, "height"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy RichText::property_editable() { return Glib::PropertyProxy(this, "editable"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly RichText::property_editable() const { return Glib::PropertyProxy_ReadOnly(this, "editable"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy RichText::property_visible() { return Glib::PropertyProxy(this, "visible"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly RichText::property_visible() const { return Glib::PropertyProxy_ReadOnly(this, "visible"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy RichText::property_cursor_visible() { return Glib::PropertyProxy(this, "cursor-visible"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly RichText::property_cursor_visible() const { return Glib::PropertyProxy_ReadOnly(this, "cursor-visible"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy RichText::property_cursor_blink() { return Glib::PropertyProxy(this, "cursor-blink"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly RichText::property_cursor_blink() const { return Glib::PropertyProxy_ReadOnly(this, "cursor-blink"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy RichText::property_grow_height() { return Glib::PropertyProxy(this, "grow-height"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly RichText::property_grow_height() const { return Glib::PropertyProxy_ReadOnly(this, "grow-height"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy RichText::property_wrap_mode() { return Glib::PropertyProxy(this, "wrap-mode"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly RichText::property_wrap_mode() const { return Glib::PropertyProxy_ReadOnly(this, "wrap-mode"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy RichText::property_justification() { return Glib::PropertyProxy(this, "justification"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly RichText::property_justification() const { return Glib::PropertyProxy_ReadOnly(this, "justification"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy RichText::property_direction() { return Glib::PropertyProxy(this, "direction"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly RichText::property_direction() const { return Glib::PropertyProxy_ReadOnly(this, "direction"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy RichText::property_anchor() { return Glib::PropertyProxy(this, "anchor"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly RichText::property_anchor() const { return Glib::PropertyProxy_ReadOnly(this, "anchor"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy RichText::property_pixels_above_lines() { return Glib::PropertyProxy(this, "pixels-above-lines"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly RichText::property_pixels_above_lines() const { return Glib::PropertyProxy_ReadOnly(this, "pixels-above-lines"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy RichText::property_pixels_below_lines() { return Glib::PropertyProxy(this, "pixels-below-lines"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly RichText::property_pixels_below_lines() const { return Glib::PropertyProxy_ReadOnly(this, "pixels-below-lines"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy RichText::property_pixels_inside_wrap() { return Glib::PropertyProxy(this, "pixels-inside-wrap"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly RichText::property_pixels_inside_wrap() const { return Glib::PropertyProxy_ReadOnly(this, "pixels-inside-wrap"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy RichText::property_left_margin() { return Glib::PropertyProxy(this, "left-margin"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly RichText::property_left_margin() const { return Glib::PropertyProxy_ReadOnly(this, "left-margin"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy RichText::property_right_margin() { return Glib::PropertyProxy(this, "right-margin"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly RichText::property_right_margin() const { return Glib::PropertyProxy_ReadOnly(this, "right-margin"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy RichText::property_indent() { return Glib::PropertyProxy(this, "indent"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly RichText::property_indent() const { return Glib::PropertyProxy_ReadOnly(this, "indent"); } +#endif //GLIBMM_PROPERTIES_ENABLED void Gnome::Canvas::RichText::on_tag_changed(const Glib::RefPtr& tag) @@ -468,6 +561,10 @@ void Gnome::Canvas::RichText::on_tag_changed(const Glib::RefPtr& t } +#ifdef GLIBMM_VFUNCS_ENABLED +#endif //GLIBMM_VFUNCS_ENABLED + + } // namespace Canvas } // namespace Gnome diff --git a/libs/libgnomecanvasmm/libgnomecanvasmm/rich-text.h b/libs/libgnomecanvasmm/libgnomecanvasmm/rich-text.h index 32af1680e4..acd8a8d9e4 100644 --- a/libs/libgnomecanvasmm/libgnomecanvasmm/rich-text.h +++ b/libs/libgnomecanvasmm/libgnomecanvasmm/rich-text.h @@ -3,6 +3,7 @@ #ifndef _LIBGNOMECANVASMM_RICH_TEXT_H #define _LIBGNOMECANVASMM_RICH_TEXT_H + #include // -*- C++ -*- @@ -96,9 +97,13 @@ public: public: //C++ methods used to invoke GTK+ virtual functions: +#ifdef GLIBMM_VFUNCS_ENABLED +#endif //GLIBMM_VFUNCS_ENABLED protected: //GTK+ Virtual Functions (override these to change behaviour): +#ifdef GLIBMM_VFUNCS_ENABLED +#endif //GLIBMM_VFUNCS_ENABLED //Default Signal Handlers:: virtual void on_tag_changed(const Glib::RefPtr& tag); @@ -133,325 +138,405 @@ public: Glib::SignalProxy1< void,const Glib::RefPtr& > signal_tag_changed(); - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** Text to display. * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy property_text() ; +#endif //#GLIBMM_PROPERTIES_ENABLED -/** +#ifdef GLIBMM_PROPERTIES_ENABLED +/** Text to display. * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_text() const; +#endif //#GLIBMM_PROPERTIES_ENABLED - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** X position. * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy property_x() ; +#endif //#GLIBMM_PROPERTIES_ENABLED -/** +#ifdef GLIBMM_PROPERTIES_ENABLED +/** X position. * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_x() const; +#endif //#GLIBMM_PROPERTIES_ENABLED - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** Y position. * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy property_y() ; +#endif //#GLIBMM_PROPERTIES_ENABLED -/** +#ifdef GLIBMM_PROPERTIES_ENABLED +/** Y position. * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_y() const; +#endif //#GLIBMM_PROPERTIES_ENABLED - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** Width for text box. * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy property_width() ; +#endif //#GLIBMM_PROPERTIES_ENABLED -/** +#ifdef GLIBMM_PROPERTIES_ENABLED +/** Width for text box. * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_width() const; +#endif //#GLIBMM_PROPERTIES_ENABLED - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** Height for text box. * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy property_height() ; +#endif //#GLIBMM_PROPERTIES_ENABLED -/** +#ifdef GLIBMM_PROPERTIES_ENABLED +/** Height for text box. * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_height() const; +#endif //#GLIBMM_PROPERTIES_ENABLED - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** Is this rich text item editable?. * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy property_editable() ; +#endif //#GLIBMM_PROPERTIES_ENABLED -/** +#ifdef GLIBMM_PROPERTIES_ENABLED +/** Is this rich text item editable?. * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_editable() const; +#endif //#GLIBMM_PROPERTIES_ENABLED - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** Is this rich text item visible?. * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy property_visible() ; +#endif //#GLIBMM_PROPERTIES_ENABLED -/** +#ifdef GLIBMM_PROPERTIES_ENABLED +/** Is this rich text item visible?. * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_visible() const; +#endif //#GLIBMM_PROPERTIES_ENABLED - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** Is the cursor visible in this rich text item?. * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy property_cursor_visible() ; +#endif //#GLIBMM_PROPERTIES_ENABLED -/** +#ifdef GLIBMM_PROPERTIES_ENABLED +/** Is the cursor visible in this rich text item?. * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_cursor_visible() const; +#endif //#GLIBMM_PROPERTIES_ENABLED - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** Does the cursor blink in this rich text item?. * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy property_cursor_blink() ; +#endif //#GLIBMM_PROPERTIES_ENABLED -/** +#ifdef GLIBMM_PROPERTIES_ENABLED +/** Does the cursor blink in this rich text item?. * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_cursor_blink() const; +#endif //#GLIBMM_PROPERTIES_ENABLED - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** Should the text box height grow if the text does not fit?. * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy property_grow_height() ; +#endif //#GLIBMM_PROPERTIES_ENABLED -/** +#ifdef GLIBMM_PROPERTIES_ENABLED +/** Should the text box height grow if the text does not fit?. * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_grow_height() const; +#endif //#GLIBMM_PROPERTIES_ENABLED - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** Wrap mode for multiline text. * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy property_wrap_mode() ; +#endif //#GLIBMM_PROPERTIES_ENABLED -/** +#ifdef GLIBMM_PROPERTIES_ENABLED +/** Wrap mode for multiline text. * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_wrap_mode() const; +#endif //#GLIBMM_PROPERTIES_ENABLED - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** Justification mode. * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy property_justification() ; +#endif //#GLIBMM_PROPERTIES_ENABLED -/** +#ifdef GLIBMM_PROPERTIES_ENABLED +/** Justification mode. * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_justification() const; +#endif //#GLIBMM_PROPERTIES_ENABLED - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** Text direction. * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy property_direction() ; +#endif //#GLIBMM_PROPERTIES_ENABLED -/** +#ifdef GLIBMM_PROPERTIES_ENABLED +/** Text direction. * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_direction() const; +#endif //#GLIBMM_PROPERTIES_ENABLED - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** Anchor point for text. * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy property_anchor() ; +#endif //#GLIBMM_PROPERTIES_ENABLED -/** +#ifdef GLIBMM_PROPERTIES_ENABLED +/** Anchor point for text. * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_anchor() const; +#endif //#GLIBMM_PROPERTIES_ENABLED - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** Number of pixels to put above lines. * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy property_pixels_above_lines() ; +#endif //#GLIBMM_PROPERTIES_ENABLED -/** +#ifdef GLIBMM_PROPERTIES_ENABLED +/** Number of pixels to put above lines. * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_pixels_above_lines() const; +#endif //#GLIBMM_PROPERTIES_ENABLED - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** Number of pixels to put below lines. * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy property_pixels_below_lines() ; +#endif //#GLIBMM_PROPERTIES_ENABLED -/** +#ifdef GLIBMM_PROPERTIES_ENABLED +/** Number of pixels to put below lines. * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_pixels_below_lines() const; +#endif //#GLIBMM_PROPERTIES_ENABLED - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** Number of pixels to put inside the wrap. * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy property_pixels_inside_wrap() ; +#endif //#GLIBMM_PROPERTIES_ENABLED -/** +#ifdef GLIBMM_PROPERTIES_ENABLED +/** Number of pixels to put inside the wrap. * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_pixels_inside_wrap() const; +#endif //#GLIBMM_PROPERTIES_ENABLED - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** Number of pixels in the left margin. * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy property_left_margin() ; +#endif //#GLIBMM_PROPERTIES_ENABLED -/** +#ifdef GLIBMM_PROPERTIES_ENABLED +/** Number of pixels in the left margin. * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_left_margin() const; +#endif //#GLIBMM_PROPERTIES_ENABLED - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** Number of pixels in the right margin. * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy property_right_margin() ; +#endif //#GLIBMM_PROPERTIES_ENABLED -/** +#ifdef GLIBMM_PROPERTIES_ENABLED +/** Number of pixels in the right margin. * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_right_margin() const; +#endif //#GLIBMM_PROPERTIES_ENABLED - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** Number of pixels for indentation. * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy property_indent() ; +#endif //#GLIBMM_PROPERTIES_ENABLED -/** +#ifdef GLIBMM_PROPERTIES_ENABLED +/** Number of pixels for indentation. * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_indent() const; +#endif //#GLIBMM_PROPERTIES_ENABLED }; @@ -459,6 +544,7 @@ public: } /* namespace Canvas */ } /* namespace Gnome */ + namespace Glib { /** @relates Gnome::Canvas::RichText @@ -467,6 +553,8 @@ namespace Glib * @result A C++ instance that wraps this C instance. */ Gnome::Canvas::RichText* wrap(GnomeCanvasRichText* object, bool take_copy = false); -} +} //namespace Glib + + #endif /* _LIBGNOMECANVASMM_RICH_TEXT_H */ diff --git a/libs/libgnomecanvasmm/libgnomecanvasmm/shape.cc b/libs/libgnomecanvasmm/libgnomecanvasmm/shape.cc index 98dedc0cf8..971b5ed49e 100644 --- a/libs/libgnomecanvasmm/libgnomecanvasmm/shape.cc +++ b/libs/libgnomecanvasmm/libgnomecanvasmm/shape.cc @@ -1,5 +1,6 @@ // Generated by gtkmmproc -- DO NOT MODIFY! + #include #include @@ -72,8 +73,13 @@ void Shape_Class::class_init_function(void* g_class, void* class_data) BaseClassType *const klass = static_cast(g_class); CppClassParent::class_init_function(klass, class_data); +#ifdef GLIBMM_VFUNCS_ENABLED +#endif //GLIBMM_VFUNCS_ENABLED } +#ifdef GLIBMM_VFUNCS_ENABLED +#endif //GLIBMM_VFUNCS_ENABLED + Glib::ObjectBase* Shape_Class::wrap_new(GObject* o) { @@ -114,155 +120,205 @@ GType Shape::get_base_type() } +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_WriteOnly Shape::property_fill_color() { return Glib::PropertyProxy_WriteOnly(this, "fill-color"); } +#endif //GLIBMM_PROPERTIES_ENABLED -Glib::PropertyProxy_ReadOnly Shape::property_fill_color() const -{ - return Glib::PropertyProxy_ReadOnly(this, "fill-color"); -} - +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy Shape::property_fill_color_gdk() { return Glib::PropertyProxy(this, "fill-color-gdk"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly Shape::property_fill_color_gdk() const { return Glib::PropertyProxy_ReadOnly(this, "fill-color-gdk"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy Shape::property_fill_color_rgba() { return Glib::PropertyProxy(this, "fill-color-rgba"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly Shape::property_fill_color_rgba() const { return Glib::PropertyProxy_ReadOnly(this, "fill-color-rgba"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_WriteOnly Shape::property_outline_color() { return Glib::PropertyProxy_WriteOnly(this, "outline-color"); } +#endif //GLIBMM_PROPERTIES_ENABLED -Glib::PropertyProxy_ReadOnly Shape::property_outline_color() const -{ - return Glib::PropertyProxy_ReadOnly(this, "outline-color"); -} - +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy Shape::property_outline_color_gdk() { return Glib::PropertyProxy(this, "outline-color-gdk"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly Shape::property_outline_color_gdk() const { return Glib::PropertyProxy_ReadOnly(this, "outline-color-gdk"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy Shape::property_outline_color_rgba() { return Glib::PropertyProxy(this, "outline-color-rgba"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly Shape::property_outline_color_rgba() const { return Glib::PropertyProxy_ReadOnly(this, "outline-color-rgba"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy< Glib::RefPtr > Shape::property_fill_stipple() { return Glib::PropertyProxy< Glib::RefPtr >(this, "fill-stipple"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly< Glib::RefPtr > Shape::property_fill_stipple() const { return Glib::PropertyProxy_ReadOnly< Glib::RefPtr >(this, "fill-stipple"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy< Glib::RefPtr > Shape::property_outline_stipple() { return Glib::PropertyProxy< Glib::RefPtr >(this, "outline-stipple"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly< Glib::RefPtr > Shape::property_outline_stipple() const { return Glib::PropertyProxy_ReadOnly< Glib::RefPtr >(this, "outline-stipple"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy Shape::property_width_pixels() { return Glib::PropertyProxy(this, "width-pixels"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly Shape::property_width_pixels() const { return Glib::PropertyProxy_ReadOnly(this, "width-pixels"); } +#endif //GLIBMM_PROPERTIES_ENABLED -Glib::PropertyProxy_WriteOnly Shape::property_width_units() +#ifdef GLIBMM_PROPERTIES_ENABLED +Glib::PropertyProxy Shape::property_width_units() { - return Glib::PropertyProxy_WriteOnly(this, "width-units"); + return Glib::PropertyProxy(this, "width-units"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly Shape::property_width_units() const { return Glib::PropertyProxy_ReadOnly(this, "width-units"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy Shape::property_cap_style() { return Glib::PropertyProxy(this, "cap-style"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly Shape::property_cap_style() const { return Glib::PropertyProxy_ReadOnly(this, "cap-style"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy Shape::property_join_style() { return Glib::PropertyProxy(this, "join-style"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly Shape::property_join_style() const { return Glib::PropertyProxy_ReadOnly(this, "join-style"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy Shape::property_wind() { return Glib::PropertyProxy(this, "wind"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly Shape::property_wind() const { return Glib::PropertyProxy_ReadOnly(this, "wind"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy Shape::property_miterlimit() { return Glib::PropertyProxy(this, "miterlimit"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly Shape::property_miterlimit() const { return Glib::PropertyProxy_ReadOnly(this, "miterlimit"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy Shape::property_dash() { return Glib::PropertyProxy(this, "dash"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly Shape::property_dash() const { return Glib::PropertyProxy_ReadOnly(this, "dash"); } +#endif //GLIBMM_PROPERTIES_ENABLED + + +#ifdef GLIBMM_VFUNCS_ENABLED +#endif //GLIBMM_VFUNCS_ENABLED } // namespace Canvas diff --git a/libs/libgnomecanvasmm/libgnomecanvasmm/shape.h b/libs/libgnomecanvasmm/libgnomecanvasmm/shape.h index e1ff6e84f0..ba588ef6c7 100644 --- a/libs/libgnomecanvasmm/libgnomecanvasmm/shape.h +++ b/libs/libgnomecanvasmm/libgnomecanvasmm/shape.h @@ -3,6 +3,7 @@ #ifndef _LIBGNOMECANVASMM_SHAPE_H #define _LIBGNOMECANVASMM_SHAPE_H + #include // -*- C++ -*- @@ -96,9 +97,13 @@ public: public: //C++ methods used to invoke GTK+ virtual functions: +#ifdef GLIBMM_VFUNCS_ENABLED +#endif //GLIBMM_VFUNCS_ENABLED protected: //GTK+ Virtual Functions (override these to change behaviour): +#ifdef GLIBMM_VFUNCS_ENABLED +#endif //GLIBMM_VFUNCS_ENABLED //Default Signal Handlers:: @@ -108,30 +113,28 @@ private: public: - /** - * - * You rarely need to use properties because there are get_ and set_ methods for almost all of them. - * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when - * the value of the property changes. - */ - Glib::PropertyProxy_WriteOnly property_fill_color() ; - + #ifdef GLIBMM_PROPERTIES_ENABLED /** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ - Glib::PropertyProxy_ReadOnly property_fill_color() const; + Glib::PropertyProxy_WriteOnly property_fill_color() ; +#endif //#GLIBMM_PROPERTIES_ENABLED - /** + + #ifdef GLIBMM_PROPERTIES_ENABLED +/** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy property_fill_color_gdk() ; +#endif //#GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED /** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. @@ -139,15 +142,19 @@ public: * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_fill_color_gdk() const; +#endif //#GLIBMM_PROPERTIES_ENABLED - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy property_fill_color_rgba() ; +#endif //#GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED /** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. @@ -155,31 +162,30 @@ public: * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_fill_color_rgba() const; +#endif //#GLIBMM_PROPERTIES_ENABLED - /** - * - * You rarely need to use properties because there are get_ and set_ methods for almost all of them. - * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when - * the value of the property changes. - */ - Glib::PropertyProxy_WriteOnly property_outline_color() ; - + #ifdef GLIBMM_PROPERTIES_ENABLED /** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ - Glib::PropertyProxy_ReadOnly property_outline_color() const; + Glib::PropertyProxy_WriteOnly property_outline_color() ; +#endif //#GLIBMM_PROPERTIES_ENABLED - /** + + #ifdef GLIBMM_PROPERTIES_ENABLED +/** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy property_outline_color_gdk() ; +#endif //#GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED /** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. @@ -187,15 +193,19 @@ public: * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_outline_color_gdk() const; +#endif //#GLIBMM_PROPERTIES_ENABLED - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy property_outline_color_rgba() ; +#endif //#GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED /** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. @@ -203,15 +213,19 @@ public: * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_outline_color_rgba() const; +#endif //#GLIBMM_PROPERTIES_ENABLED - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy< Glib::RefPtr > property_fill_stipple() ; +#endif //#GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED /** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. @@ -219,15 +233,19 @@ public: * the value of the property changes. */ Glib::PropertyProxy_ReadOnly< Glib::RefPtr > property_fill_stipple() const; +#endif //#GLIBMM_PROPERTIES_ENABLED - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy< Glib::RefPtr > property_outline_stipple() ; +#endif //#GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED /** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. @@ -235,15 +253,19 @@ public: * the value of the property changes. */ Glib::PropertyProxy_ReadOnly< Glib::RefPtr > property_outline_stipple() const; +#endif //#GLIBMM_PROPERTIES_ENABLED - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy property_width_pixels() ; +#endif //#GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED /** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. @@ -251,15 +273,19 @@ public: * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_width_pixels() const; +#endif //#GLIBMM_PROPERTIES_ENABLED - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ - Glib::PropertyProxy_WriteOnly property_width_units() ; + Glib::PropertyProxy property_width_units() ; +#endif //#GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED /** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. @@ -267,15 +293,19 @@ public: * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_width_units() const; +#endif //#GLIBMM_PROPERTIES_ENABLED - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy property_cap_style() ; +#endif //#GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED /** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. @@ -283,15 +313,19 @@ public: * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_cap_style() const; +#endif //#GLIBMM_PROPERTIES_ENABLED - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy property_join_style() ; +#endif //#GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED /** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. @@ -299,15 +333,19 @@ public: * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_join_style() const; +#endif //#GLIBMM_PROPERTIES_ENABLED - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy property_wind() ; +#endif //#GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED /** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. @@ -315,15 +353,19 @@ public: * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_wind() const; +#endif //#GLIBMM_PROPERTIES_ENABLED - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy property_miterlimit() ; +#endif //#GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED /** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. @@ -331,15 +373,19 @@ public: * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_miterlimit() const; +#endif //#GLIBMM_PROPERTIES_ENABLED - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy property_dash() ; +#endif //#GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED /** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. @@ -347,6 +393,7 @@ public: * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_dash() const; +#endif //#GLIBMM_PROPERTIES_ENABLED //TODO: Look at ArtVpathDash to see if it should be wrapped. @@ -355,6 +402,7 @@ public: } /* namespace Canvas */ } /* namespace Gnome */ + namespace Glib { /** @relates Gnome::Canvas::Shape @@ -363,6 +411,8 @@ namespace Glib * @result A C++ instance that wraps this C instance. */ Gnome::Canvas::Shape* wrap(GnomeCanvasShape* object, bool take_copy = false); -} +} //namespace Glib + + #endif /* _LIBGNOMECANVASMM_SHAPE_H */ diff --git a/libs/libgnomecanvasmm/libgnomecanvasmm/text.cc b/libs/libgnomecanvasmm/libgnomecanvasmm/text.cc index 62ccc4b981..131313f417 100644 --- a/libs/libgnomecanvasmm/libgnomecanvasmm/text.cc +++ b/libs/libgnomecanvasmm/libgnomecanvasmm/text.cc @@ -1,5 +1,6 @@ // Generated by gtkmmproc -- DO NOT MODIFY! + #include #include @@ -47,7 +48,6 @@ Text::Text(Group& parentx) } /* namespace Canvas */ } /* namespace Gnome */ - namespace { } // anonymous namespace @@ -97,8 +97,13 @@ void Text_Class::class_init_function(void* g_class, void* class_data) BaseClassType *const klass = static_cast(g_class); CppClassParent::class_init_function(klass, class_data); +#ifdef GLIBMM_VFUNCS_ENABLED +#endif //GLIBMM_VFUNCS_ENABLED } +#ifdef GLIBMM_VFUNCS_ENABLED +#endif //GLIBMM_VFUNCS_ENABLED + Glib::ObjectBase* Text_Class::wrap_new(GObject* o) { @@ -139,415 +144,576 @@ GType Text::get_base_type() } +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy Text::property_text() { return Glib::PropertyProxy(this, "text"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly Text::property_text() const { return Glib::PropertyProxy_ReadOnly(this, "text"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_WriteOnly Text::property_markup() { return Glib::PropertyProxy_WriteOnly(this, "markup"); } +#endif //GLIBMM_PROPERTIES_ENABLED -Glib::PropertyProxy_ReadOnly Text::property_markup() const -{ - return Glib::PropertyProxy_ReadOnly(this, "markup"); -} - +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy Text::property_x() { return Glib::PropertyProxy(this, "x"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly Text::property_x() const { return Glib::PropertyProxy_ReadOnly(this, "x"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy Text::property_y() { return Glib::PropertyProxy(this, "y"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly Text::property_y() const { return Glib::PropertyProxy_ReadOnly(this, "y"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy Text::property_font() { return Glib::PropertyProxy(this, "font"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly Text::property_font() const { return Glib::PropertyProxy_ReadOnly(this, "font"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy Text::property_font_desc() { return Glib::PropertyProxy(this, "font-desc"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly Text::property_font_desc() const { return Glib::PropertyProxy_ReadOnly(this, "font-desc"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy Text::property_family() { return Glib::PropertyProxy(this, "family"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly Text::property_family() const { return Glib::PropertyProxy_ReadOnly(this, "family"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy Text::property_family_set() { return Glib::PropertyProxy(this, "family-set"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly Text::property_family_set() const { return Glib::PropertyProxy_ReadOnly(this, "family-set"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy Text::property_attributes() { return Glib::PropertyProxy(this, "attributes"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly Text::property_attributes() const { return Glib::PropertyProxy_ReadOnly(this, "attributes"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy Text::property_style() { return Glib::PropertyProxy(this, "style"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly Text::property_style() const { return Glib::PropertyProxy_ReadOnly(this, "style"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy Text::property_style_set() { return Glib::PropertyProxy(this, "style-set"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly Text::property_style_set() const { return Glib::PropertyProxy_ReadOnly(this, "style-set"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy Text::property_variant() { return Glib::PropertyProxy(this, "variant"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly Text::property_variant() const { return Glib::PropertyProxy_ReadOnly(this, "variant"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy Text::property_variant_set() { return Glib::PropertyProxy(this, "variant-set"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly Text::property_variant_set() const { return Glib::PropertyProxy_ReadOnly(this, "variant-set"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy Text::property_weight() { return Glib::PropertyProxy(this, "weight"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly Text::property_weight() const { return Glib::PropertyProxy_ReadOnly(this, "weight"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy Text::property_weight_set() { return Glib::PropertyProxy(this, "weight-set"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly Text::property_weight_set() const { return Glib::PropertyProxy_ReadOnly(this, "weight-set"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy Text::property_stretch() { return Glib::PropertyProxy(this, "stretch"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly Text::property_stretch() const { return Glib::PropertyProxy_ReadOnly(this, "stretch"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy Text::property_stretch_set() { return Glib::PropertyProxy(this, "stretch-set"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly Text::property_stretch_set() const { return Glib::PropertyProxy_ReadOnly(this, "stretch-set"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy Text::property_size() { return Glib::PropertyProxy(this, "size"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly Text::property_size() const { return Glib::PropertyProxy_ReadOnly(this, "size"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy Text::property_size_set() { return Glib::PropertyProxy(this, "size-set"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly Text::property_size_set() const { return Glib::PropertyProxy_ReadOnly(this, "size-set"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy Text::property_size_points() { return Glib::PropertyProxy(this, "size-points"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly Text::property_size_points() const { return Glib::PropertyProxy_ReadOnly(this, "size-points"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy Text::property_strikethrough() { return Glib::PropertyProxy(this, "strikethrough"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly Text::property_strikethrough() const { return Glib::PropertyProxy_ReadOnly(this, "strikethrough"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy Text::property_strikethrough_set() { return Glib::PropertyProxy(this, "strikethrough-set"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly Text::property_strikethrough_set() const { return Glib::PropertyProxy_ReadOnly(this, "strikethrough-set"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy Text::property_underline() { return Glib::PropertyProxy(this, "underline"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly Text::property_underline() const { return Glib::PropertyProxy_ReadOnly(this, "underline"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy Text::property_underline_set() { return Glib::PropertyProxy(this, "underline-set"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly Text::property_underline_set() const { return Glib::PropertyProxy_ReadOnly(this, "underline-set"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy Text::property_rise() { return Glib::PropertyProxy(this, "rise"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly Text::property_rise() const { return Glib::PropertyProxy_ReadOnly(this, "rise"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy Text::property_rise_set() { return Glib::PropertyProxy(this, "rise-set"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly Text::property_rise_set() const { return Glib::PropertyProxy_ReadOnly(this, "rise-set"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy Text::property_scale() { return Glib::PropertyProxy(this, "scale"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly Text::property_scale() const { return Glib::PropertyProxy_ReadOnly(this, "scale"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy Text::property_scale_set() { return Glib::PropertyProxy(this, "scale-set"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly Text::property_scale_set() const { return Glib::PropertyProxy_ReadOnly(this, "scale-set"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy Text::property_anchor() { return Glib::PropertyProxy(this, "anchor"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly Text::property_anchor() const { return Glib::PropertyProxy_ReadOnly(this, "anchor"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy Text::property_justification() { return Glib::PropertyProxy(this, "justification"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly Text::property_justification() const { return Glib::PropertyProxy_ReadOnly(this, "justification"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy Text::property_clip_width() { return Glib::PropertyProxy(this, "clip-width"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly Text::property_clip_width() const { return Glib::PropertyProxy_ReadOnly(this, "clip-width"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy Text::property_clip_height() { return Glib::PropertyProxy(this, "clip-height"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly Text::property_clip_height() const { return Glib::PropertyProxy_ReadOnly(this, "clip-height"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy Text::property_clip() { return Glib::PropertyProxy(this, "clip"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly Text::property_clip() const { return Glib::PropertyProxy_ReadOnly(this, "clip"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy Text::property_x_offset() { return Glib::PropertyProxy(this, "x-offset"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly Text::property_x_offset() const { return Glib::PropertyProxy_ReadOnly(this, "x-offset"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy Text::property_y_offset() { return Glib::PropertyProxy(this, "y-offset"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly Text::property_y_offset() const { return Glib::PropertyProxy_ReadOnly(this, "y-offset"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy Text::property_fill_color() { return Glib::PropertyProxy(this, "fill-color"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly Text::property_fill_color() const { return Glib::PropertyProxy_ReadOnly(this, "fill-color"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy Text::property_fill_color_gdk() { return Glib::PropertyProxy(this, "fill-color-gdk"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly Text::property_fill_color_gdk() const { return Glib::PropertyProxy_ReadOnly(this, "fill-color-gdk"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy Text::property_fill_color_rgba() { return Glib::PropertyProxy(this, "fill-color-rgba"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly Text::property_fill_color_rgba() const { return Glib::PropertyProxy_ReadOnly(this, "fill-color-rgba"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy< Glib::RefPtr > Text::property_fill_stipple() { return Glib::PropertyProxy< Glib::RefPtr >(this, "fill-stipple"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly< Glib::RefPtr > Text::property_fill_stipple() const { return Glib::PropertyProxy_ReadOnly< Glib::RefPtr >(this, "fill-stipple"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy Text::property_text_width() { return Glib::PropertyProxy(this, "text-width"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly Text::property_text_width() const { return Glib::PropertyProxy_ReadOnly(this, "text-width"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy Text::property_text_height() { return Glib::PropertyProxy(this, "text-height"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly Text::property_text_height() const { return Glib::PropertyProxy_ReadOnly(this, "text-height"); } +#endif //GLIBMM_PROPERTIES_ENABLED + + +#ifdef GLIBMM_VFUNCS_ENABLED +#endif //GLIBMM_VFUNCS_ENABLED } // namespace Canvas diff --git a/libs/libgnomecanvasmm/libgnomecanvasmm/text.h b/libs/libgnomecanvasmm/libgnomecanvasmm/text.h index d73285c5af..311c631e07 100644 --- a/libs/libgnomecanvasmm/libgnomecanvasmm/text.h +++ b/libs/libgnomecanvasmm/libgnomecanvasmm/text.h @@ -3,6 +3,7 @@ #ifndef _LIBGNOMECANVASMM_TEXT_H #define _LIBGNOMECANVASMM_TEXT_H + #include /* $Id$ */ @@ -100,9 +101,13 @@ public: public: //C++ methods used to invoke GTK+ virtual functions: +#ifdef GLIBMM_VFUNCS_ENABLED +#endif //GLIBMM_VFUNCS_ENABLED protected: //GTK+ Virtual Functions (override these to change behaviour): +#ifdef GLIBMM_VFUNCS_ENABLED +#endif //GLIBMM_VFUNCS_ENABLED //Default Signal Handlers:: @@ -113,46 +118,48 @@ public: Text(Group& parent, double x, double y, const Glib::ustring& text); explicit Text(Group& parent); - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** Text to render. * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy property_text() ; +#endif //#GLIBMM_PROPERTIES_ENABLED -/** +#ifdef GLIBMM_PROPERTIES_ENABLED +/** Text to render. * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_text() const; +#endif //#GLIBMM_PROPERTIES_ENABLED - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** Marked up text to render. * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy_WriteOnly property_markup() ; +#endif //#GLIBMM_PROPERTIES_ENABLED + + #ifdef GLIBMM_PROPERTIES_ENABLED /** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ - Glib::PropertyProxy_ReadOnly property_markup() const; - - /** - * - * You rarely need to use properties because there are get_ and set_ methods for almost all of them. - * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when - * the value of the property changes. - */ Glib::PropertyProxy property_x() ; +#endif //#GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED /** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. @@ -160,15 +167,19 @@ public: * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_x() const; +#endif //#GLIBMM_PROPERTIES_ENABLED - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy property_y() ; +#endif //#GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED /** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. @@ -176,79 +187,99 @@ public: * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_y() const; +#endif //#GLIBMM_PROPERTIES_ENABLED - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** Font description as a string. * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy property_font() ; +#endif //#GLIBMM_PROPERTIES_ENABLED -/** +#ifdef GLIBMM_PROPERTIES_ENABLED +/** Font description as a string. * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_font() const; +#endif //#GLIBMM_PROPERTIES_ENABLED - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** Font description as a PangoFontDescription struct. * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy property_font_desc() ; +#endif //#GLIBMM_PROPERTIES_ENABLED -/** +#ifdef GLIBMM_PROPERTIES_ENABLED +/** Font description as a PangoFontDescription struct. * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_font_desc() const; +#endif //#GLIBMM_PROPERTIES_ENABLED - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** Name of the font family * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy property_family() ; +#endif //#GLIBMM_PROPERTIES_ENABLED -/** +#ifdef GLIBMM_PROPERTIES_ENABLED +/** Name of the font family * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_family() const; +#endif //#GLIBMM_PROPERTIES_ENABLED - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** Whether this tag affects the font family. * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy property_family_set() ; +#endif //#GLIBMM_PROPERTIES_ENABLED -/** +#ifdef GLIBMM_PROPERTIES_ENABLED +/** Whether this tag affects the font family. * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_family_set() const; +#endif //#GLIBMM_PROPERTIES_ENABLED - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy property_attributes() ; +#endif //#GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED /** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. @@ -256,319 +287,399 @@ public: * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_attributes() const; +#endif //#GLIBMM_PROPERTIES_ENABLED - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** Font style. * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy property_style() ; +#endif //#GLIBMM_PROPERTIES_ENABLED -/** +#ifdef GLIBMM_PROPERTIES_ENABLED +/** Font style. * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_style() const; +#endif //#GLIBMM_PROPERTIES_ENABLED - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** Whether this tag affects the font style. * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy property_style_set() ; +#endif //#GLIBMM_PROPERTIES_ENABLED -/** +#ifdef GLIBMM_PROPERTIES_ENABLED +/** Whether this tag affects the font style. * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_style_set() const; +#endif //#GLIBMM_PROPERTIES_ENABLED - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** Font variant. * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy property_variant() ; +#endif //#GLIBMM_PROPERTIES_ENABLED -/** +#ifdef GLIBMM_PROPERTIES_ENABLED +/** Font variant. * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_variant() const; +#endif //#GLIBMM_PROPERTIES_ENABLED - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** Whether this tag affects the font variant. * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy property_variant_set() ; +#endif //#GLIBMM_PROPERTIES_ENABLED -/** +#ifdef GLIBMM_PROPERTIES_ENABLED +/** Whether this tag affects the font variant. * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_variant_set() const; +#endif //#GLIBMM_PROPERTIES_ENABLED - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** Font weight. * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy property_weight() ; +#endif //#GLIBMM_PROPERTIES_ENABLED -/** +#ifdef GLIBMM_PROPERTIES_ENABLED +/** Font weight. * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_weight() const; +#endif //#GLIBMM_PROPERTIES_ENABLED - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** Whether this tag affects the font weight. * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy property_weight_set() ; +#endif //#GLIBMM_PROPERTIES_ENABLED -/** +#ifdef GLIBMM_PROPERTIES_ENABLED +/** Whether this tag affects the font weight. * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_weight_set() const; +#endif //#GLIBMM_PROPERTIES_ENABLED - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** Font stretch. * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy property_stretch() ; +#endif //#GLIBMM_PROPERTIES_ENABLED -/** +#ifdef GLIBMM_PROPERTIES_ENABLED +/** Font stretch. * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_stretch() const; +#endif //#GLIBMM_PROPERTIES_ENABLED - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** Whether this tag affects the font stretch. * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy property_stretch_set() ; +#endif //#GLIBMM_PROPERTIES_ENABLED -/** +#ifdef GLIBMM_PROPERTIES_ENABLED +/** Whether this tag affects the font stretch. * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_stretch_set() const; +#endif //#GLIBMM_PROPERTIES_ENABLED - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** Font size. * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy property_size() ; +#endif //#GLIBMM_PROPERTIES_ENABLED -/** +#ifdef GLIBMM_PROPERTIES_ENABLED +/** Font size. * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_size() const; +#endif //#GLIBMM_PROPERTIES_ENABLED - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** Whether this tag affects the font size. * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy property_size_set() ; +#endif //#GLIBMM_PROPERTIES_ENABLED -/** +#ifdef GLIBMM_PROPERTIES_ENABLED +/** Whether this tag affects the font size. * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_size_set() const; +#endif //#GLIBMM_PROPERTIES_ENABLED - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** Font size in points. * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy property_size_points() ; +#endif //#GLIBMM_PROPERTIES_ENABLED -/** +#ifdef GLIBMM_PROPERTIES_ENABLED +/** Font size in points. * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_size_points() const; +#endif //#GLIBMM_PROPERTIES_ENABLED - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** Whether to strike through the text. * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy property_strikethrough() ; +#endif //#GLIBMM_PROPERTIES_ENABLED -/** +#ifdef GLIBMM_PROPERTIES_ENABLED +/** Whether to strike through the text. * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_strikethrough() const; +#endif //#GLIBMM_PROPERTIES_ENABLED - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** Whether this tag affects strikethrough. * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy property_strikethrough_set() ; +#endif //#GLIBMM_PROPERTIES_ENABLED -/** +#ifdef GLIBMM_PROPERTIES_ENABLED +/** Whether this tag affects strikethrough. * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_strikethrough_set() const; +#endif //#GLIBMM_PROPERTIES_ENABLED - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** Style of underline for this text. * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy property_underline() ; +#endif //#GLIBMM_PROPERTIES_ENABLED -/** +#ifdef GLIBMM_PROPERTIES_ENABLED +/** Style of underline for this text. * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_underline() const; +#endif //#GLIBMM_PROPERTIES_ENABLED - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** Whether this tag affects underlining. * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy property_underline_set() ; +#endif //#GLIBMM_PROPERTIES_ENABLED -/** +#ifdef GLIBMM_PROPERTIES_ENABLED +/** Whether this tag affects underlining. * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_underline_set() const; +#endif //#GLIBMM_PROPERTIES_ENABLED - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** Offset of text above the baseline (below the baseline if rise is negative). * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy property_rise() ; +#endif //#GLIBMM_PROPERTIES_ENABLED -/** +#ifdef GLIBMM_PROPERTIES_ENABLED +/** Offset of text above the baseline (below the baseline if rise is negative). * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_rise() const; +#endif //#GLIBMM_PROPERTIES_ENABLED - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** Whether this tag affects the rise. * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy property_rise_set() ; +#endif //#GLIBMM_PROPERTIES_ENABLED -/** +#ifdef GLIBMM_PROPERTIES_ENABLED +/** Whether this tag affects the rise. * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_rise_set() const; +#endif //#GLIBMM_PROPERTIES_ENABLED - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** Size of font * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy property_scale() ; +#endif //#GLIBMM_PROPERTIES_ENABLED -/** +#ifdef GLIBMM_PROPERTIES_ENABLED +/** Size of font * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_scale() const; +#endif //#GLIBMM_PROPERTIES_ENABLED - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** Whether this tag affects font scaling. * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy property_scale_set() ; +#endif //#GLIBMM_PROPERTIES_ENABLED -/** +#ifdef GLIBMM_PROPERTIES_ENABLED +/** Whether this tag affects font scaling. * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_scale_set() const; +#endif //#GLIBMM_PROPERTIES_ENABLED - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy property_anchor() ; +#endif //#GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED /** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. @@ -576,15 +687,19 @@ public: * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_anchor() const; +#endif //#GLIBMM_PROPERTIES_ENABLED - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy property_justification() ; +#endif //#GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED /** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. @@ -592,15 +707,19 @@ public: * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_justification() const; +#endif //#GLIBMM_PROPERTIES_ENABLED - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy property_clip_width() ; +#endif //#GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED /** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. @@ -608,15 +727,19 @@ public: * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_clip_width() const; +#endif //#GLIBMM_PROPERTIES_ENABLED - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy property_clip_height() ; +#endif //#GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED /** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. @@ -624,15 +747,19 @@ public: * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_clip_height() const; +#endif //#GLIBMM_PROPERTIES_ENABLED - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy property_clip() ; +#endif //#GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED /** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. @@ -640,15 +767,19 @@ public: * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_clip() const; +#endif //#GLIBMM_PROPERTIES_ENABLED - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy property_x_offset() ; +#endif //#GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED /** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. @@ -656,15 +787,19 @@ public: * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_x_offset() const; +#endif //#GLIBMM_PROPERTIES_ENABLED - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy property_y_offset() ; +#endif //#GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED /** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. @@ -672,63 +807,79 @@ public: * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_y_offset() const; +#endif //#GLIBMM_PROPERTIES_ENABLED - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** Text color * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy property_fill_color() ; +#endif //#GLIBMM_PROPERTIES_ENABLED -/** +#ifdef GLIBMM_PROPERTIES_ENABLED +/** Text color * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_fill_color() const; +#endif //#GLIBMM_PROPERTIES_ENABLED - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** Text color * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy property_fill_color_gdk() ; +#endif //#GLIBMM_PROPERTIES_ENABLED -/** +#ifdef GLIBMM_PROPERTIES_ENABLED +/** Text color * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_fill_color_gdk() const; +#endif //#GLIBMM_PROPERTIES_ENABLED - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** Text color * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy property_fill_color_rgba() ; +#endif //#GLIBMM_PROPERTIES_ENABLED -/** +#ifdef GLIBMM_PROPERTIES_ENABLED +/** Text color * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_fill_color_rgba() const; +#endif //#GLIBMM_PROPERTIES_ENABLED - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy< Glib::RefPtr > property_fill_stipple() ; +#endif //#GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED /** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. @@ -736,38 +887,47 @@ public: * the value of the property changes. */ Glib::PropertyProxy_ReadOnly< Glib::RefPtr > property_fill_stipple() const; +#endif //#GLIBMM_PROPERTIES_ENABLED - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** Width of the rendered text. * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy property_text_width() ; +#endif //#GLIBMM_PROPERTIES_ENABLED -/** +#ifdef GLIBMM_PROPERTIES_ENABLED +/** Width of the rendered text. * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_text_width() const; +#endif //#GLIBMM_PROPERTIES_ENABLED - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** Height of the rendered text. * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy property_text_height() ; +#endif //#GLIBMM_PROPERTIES_ENABLED -/** +#ifdef GLIBMM_PROPERTIES_ENABLED +/** Height of the rendered text. * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_text_height() const; +#endif //#GLIBMM_PROPERTIES_ENABLED }; @@ -775,6 +935,7 @@ public: } /* namespace Canvas */ } /* namespace Gnome */ + namespace Glib { /** @relates Gnome::Canvas::Text @@ -783,6 +944,8 @@ namespace Glib * @result A C++ instance that wraps this C instance. */ Gnome::Canvas::Text* wrap(GnomeCanvasText* object, bool take_copy = false); -} +} //namespace Glib + + #endif /* _LIBGNOMECANVASMM_TEXT_H */ diff --git a/libs/libgnomecanvasmm/libgnomecanvasmm/widget.cc b/libs/libgnomecanvasmm/libgnomecanvasmm/widget.cc index ab9709f629..4d02f0947e 100644 --- a/libs/libgnomecanvasmm/libgnomecanvasmm/widget.cc +++ b/libs/libgnomecanvasmm/libgnomecanvasmm/widget.cc @@ -1,5 +1,6 @@ // Generated by gtkmmproc -- DO NOT MODIFY! + #include #include @@ -50,7 +51,6 @@ Widget::Widget(Group& parentx) } /* namespace Canvas */ } /* namespace Gnome */ - namespace { } // anonymous namespace @@ -100,8 +100,13 @@ void Widget_Class::class_init_function(void* g_class, void* class_data) BaseClassType *const klass = static_cast(g_class); CppClassParent::class_init_function(klass, class_data); +#ifdef GLIBMM_VFUNCS_ENABLED +#endif //GLIBMM_VFUNCS_ENABLED } +#ifdef GLIBMM_VFUNCS_ENABLED +#endif //GLIBMM_VFUNCS_ENABLED + Glib::ObjectBase* Widget_Class::wrap_new(GObject* o) { @@ -142,75 +147,107 @@ GType Widget::get_base_type() } +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy Widget::property_widget() { return Glib::PropertyProxy(this, "widget"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly Widget::property_widget() const { return Glib::PropertyProxy_ReadOnly(this, "widget"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy Widget::property_x() { return Glib::PropertyProxy(this, "x"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly Widget::property_x() const { return Glib::PropertyProxy_ReadOnly(this, "x"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy Widget::property_y() { return Glib::PropertyProxy(this, "y"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly Widget::property_y() const { return Glib::PropertyProxy_ReadOnly(this, "y"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy Widget::property_width() { return Glib::PropertyProxy(this, "width"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly Widget::property_width() const { return Glib::PropertyProxy_ReadOnly(this, "width"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy Widget::property_height() { return Glib::PropertyProxy(this, "height"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly Widget::property_height() const { return Glib::PropertyProxy_ReadOnly(this, "height"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy Widget::property_anchor() { return Glib::PropertyProxy(this, "anchor"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly Widget::property_anchor() const { return Glib::PropertyProxy_ReadOnly(this, "anchor"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy Widget::property_size_pixels() { return Glib::PropertyProxy(this, "size-pixels"); } +#endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy_ReadOnly Widget::property_size_pixels() const { return Glib::PropertyProxy_ReadOnly(this, "size-pixels"); } +#endif //GLIBMM_PROPERTIES_ENABLED + + +#ifdef GLIBMM_VFUNCS_ENABLED +#endif //GLIBMM_VFUNCS_ENABLED } // namespace Canvas diff --git a/libs/libgnomecanvasmm/libgnomecanvasmm/widget.h b/libs/libgnomecanvasmm/libgnomecanvasmm/widget.h index 0a087f23b3..271e7e5b9f 100644 --- a/libs/libgnomecanvasmm/libgnomecanvasmm/widget.h +++ b/libs/libgnomecanvasmm/libgnomecanvasmm/widget.h @@ -3,6 +3,7 @@ #ifndef _LIBGNOMECANVASMM_WIDGET_H #define _LIBGNOMECANVASMM_WIDGET_H + #include /* $Id$ */ @@ -99,9 +100,13 @@ public: public: //C++ methods used to invoke GTK+ virtual functions: +#ifdef GLIBMM_VFUNCS_ENABLED +#endif //GLIBMM_VFUNCS_ENABLED protected: //GTK+ Virtual Functions (override these to change behaviour): +#ifdef GLIBMM_VFUNCS_ENABLED +#endif //GLIBMM_VFUNCS_ENABLED //Default Signal Handlers:: @@ -112,14 +117,17 @@ public: Widget(Group& parent, double x, double y, Gtk::Widget& w); explicit Widget(Group& parent); - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy property_widget() ; +#endif //#GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED /** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. @@ -127,15 +135,19 @@ public: * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_widget() const; +#endif //#GLIBMM_PROPERTIES_ENABLED - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy property_x() ; +#endif //#GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED /** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. @@ -143,15 +155,19 @@ public: * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_x() const; +#endif //#GLIBMM_PROPERTIES_ENABLED - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy property_y() ; +#endif //#GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED /** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. @@ -159,15 +175,19 @@ public: * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_y() const; +#endif //#GLIBMM_PROPERTIES_ENABLED - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy property_width() ; +#endif //#GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED /** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. @@ -175,15 +195,19 @@ public: * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_width() const; +#endif //#GLIBMM_PROPERTIES_ENABLED - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy property_height() ; +#endif //#GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED /** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. @@ -191,15 +215,19 @@ public: * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_height() const; +#endif //#GLIBMM_PROPERTIES_ENABLED - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy property_anchor() ; +#endif //#GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED /** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. @@ -207,15 +235,19 @@ public: * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_anchor() const; +#endif //#GLIBMM_PROPERTIES_ENABLED - /** + #ifdef GLIBMM_PROPERTIES_ENABLED +/** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when * the value of the property changes. */ Glib::PropertyProxy property_size_pixels() ; +#endif //#GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED /** * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. @@ -223,6 +255,7 @@ public: * the value of the property changes. */ Glib::PropertyProxy_ReadOnly property_size_pixels() const; +#endif //#GLIBMM_PROPERTIES_ENABLED }; @@ -239,6 +272,8 @@ namespace Glib * @result A C++ instance that wraps this C instance. */ Gnome::Canvas::Widget* wrap(GnomeCanvasWidget* object, bool take_copy = false); -} +} //namespace Glib + + #endif /* _LIBGNOMECANVASMM_WIDGET_H */ diff --git a/libs/libgnomecanvasmm/libgnomecanvasmmconfig.h b/libs/libgnomecanvasmm/libgnomecanvasmmconfig.h index a1d3378c29..ff303303a5 100644 --- a/libs/libgnomecanvasmm/libgnomecanvasmmconfig.h +++ b/libs/libgnomecanvasmm/libgnomecanvasmmconfig.h @@ -5,7 +5,7 @@ /* version numbers */ #define LIBGNOMEUIMM_MAJOR_VERSION 2 -#define LIBGNOMEUIMM_MINOR_VERSION 10 +#define LIBGNOMEUIMM_MINOR_VERSION 16 #define LIBGNOMEUIMM_MICRO_VERSION 0 #endif /* _LIBGNOMEUIMM_CONFIG_H */