[Xfce4-commits] <xfce4-mm:master> Removed bindings for deprecated libxfcegui4 library.

Jens Luedicke noreply at xfce.org
Sun Jan 16 20:02:03 CET 2011


Updating branch refs/heads/master
         to 79e4265fb0fac06da49ef1789c19af71c783752a (commit)
       from 2baad3fa699a5c15a2824a85d3d8f1d5195c1cf6 (commit)

commit 79e4265fb0fac06da49ef1789c19af71c783752a
Author: Jens Luedicke <jens at linux-vq8x.site>
Date:   Sun Jan 16 19:51:21 2011 +0100

    Removed bindings for deprecated libxfcegui4 library.

 libxfce4gui-mm/Makefile.am              |   50 -------
 libxfce4gui-mm/app-menu-item.cpp        |  239 -------------------------------
 libxfce4gui-mm/app-menu-item.h          |  104 -------------
 libxfce4gui-mm/dialogs.cpp              |  168 ----------------------
 libxfce4gui-mm/dialogs.h                |   70 ---------
 libxfce4gui-mm/exec.cpp                 |   64 --------
 libxfce4gui-mm/exec.h                   |   50 -------
 libxfce4gui-mm/gdk-extensions.cpp       |   68 ---------
 libxfce4gui-mm/gdk-extensions.h         |   48 ------
 libxfce4gui-mm/gtk-extensions.cpp       |   50 -------
 libxfce4gui-mm/gtk-extensions.h         |   46 ------
 libxfce4gui-mm/heading.cpp              |  202 --------------------------
 libxfce4gui-mm/heading.h                |   97 -------------
 libxfce4gui-mm/libxfce4gui-mm-1.0.pc.in |   11 --
 libxfce4gui-mm/titled-dialog.cpp        |  189 ------------------------
 libxfce4gui-mm/titled-dialog.h          |   94 ------------
 16 files changed, 0 insertions(+), 1550 deletions(-)

diff --git a/libxfce4gui-mm/Makefile.am b/libxfce4gui-mm/Makefile.am
deleted file mode 100644
index bde560b..0000000
--- a/libxfce4gui-mm/Makefile.am
+++ /dev/null
@@ -1,50 +0,0 @@
-
-INCLUDES =								\
-	-I$(top_srcdir)							\
-	-DG_LOG_DOMAIN=\"libxfce4gui-mm\"				\
-	$(PLATFORM_CXXFLAGS)
-
-lib_LTLIBRARIES =							\
-	libxfce4gui-mm.la
-
-libxfce4gui_mm_includedir = $(includedir)/xfce4/libxfce4gui-mm
-libxfce4gui_mm_include_HEADERS =					\
-	gdk-extensions.h						\
-	gtk-extensions.h						\
-	dialogs.h							\
-	exec.h								\
-	app-menu-item.h							\
-	heading.h							\
-	titled-dialog.h
-
-libxfce4gui_mm_la_SOURCES =						\
-	gdk-extensions.cpp						\
-	gdk-extensions.h						\
-	gtk-extensions.cpp						\
-	gtk-extensions.h						\
-	exec.cpp							\
-	exec.h								\
-	dialogs.cpp							\
-	dialogs.h							\
-	app-menu-item.cpp						\
-	app-menu-item.h							\
-	heading.cpp							\
-	heading.h							\
-	titled-dialog.cpp						\
-	titled-dialog.h
-	
-libxfce4gui_mm_la_CXXFLAGS = 						\
-	$(GTKMM_CFLAGS)							\
-	$(LIBXFCEGUI4_CFLAGS)						\
-	$(PLATFORM_CXXFLAGS)
-
-libxfce4gui_mm_la_LDFLAGS =						\
-	-version-info $(LIBXFCE4GUI_MM_VERINFO)				\
-	$(PLATFORM_LDFLAGS)
-
-libxfce4gui_mm_la_LIBADD =						\
-	$(GTKMM_LIBS)							\
-	$(LIBXFCEGUI4_LIBS)
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libxfce4gui-mm-1.0.pc
diff --git a/libxfce4gui-mm/app-menu-item.cpp b/libxfce4gui-mm/app-menu-item.cpp
deleted file mode 100644
index d7f3a91..0000000
--- a/libxfce4gui-mm/app-menu-item.cpp
+++ /dev/null
@@ -1,239 +0,0 @@
-/* $Id$ */
-/** \file app-menu-item.cpp
- * \author Jens Luedicke <jens.luedicke at gmail.com>
- * \date 2009
- *
- *  libxfce4gui-mm - C++ wrapper library for libxfcegui4.
- * 
- *  Copyright (c) 2009 Jens Luedicke <jens.luedicke at gmail.com>
- *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public
- *  License as published by the Free Software Foundation; either
- *  version 2 of the License, or (at your option) any later version.
- *
- *  This library is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this library; if not, write to the
- *  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- *  Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "app-menu-item.h"
-
-#include <gtkmm/private/imagemenuitem_p.h>
-
-#include <libxfcegui4/libxfcegui4.h>
-
-namespace Xfce4 {
-namespace Gui {
-
-class AppMenuItem_Class : public Glib::Class {
-public:
-	typedef AppMenuItem              CppObjectType;
-	typedef XfceAppMenuItem          BaseObjectType;
-	typedef XfceAppMenuItemClass     BaseClassType;
-	typedef Gtk::ImageMenuItem_Class CppClassParent;
-	typedef GtkImageMenuItemClass    BaseClassParent;
-
-	friend class AppMenuItem;
-
-	const Glib::Class& init();
-
-	static void class_init_function(void* g_class, void* class_data);
-
-	static Glib::ObjectBase* wrap_new(GObject*);
-};
-
-const Glib::Class& AppMenuItem_Class::init()
-{
-	TRACE("entering");
-	
-	if (!gtype_) { // create the GType if necessary
-		// Glib::Class has to know the class init function to clone custom types.
-		class_init_func_ = &AppMenuItem_Class::class_init_function;
-
-		// This is actually just optimized away, apparently with no harm.
-		// Make sure that the parent type has been created.
-		//CppClassParent::CppObjectType::get_type();
-
-		// Create the wrapper type, with the same class/instance size as the base type.
-		register_derived_type(xfce_app_menu_item_get_type());
-
-		// Add derived versions of interfaces, if the C type implements any interfaces:
-	}
-
-	TRACE("leaving");
-
-	return *this;
-}
-
-void AppMenuItem_Class::class_init_function(void* g_class, void* class_data)
-{
-	TRACE("entering");
-
-	BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
-	CppClassParent::class_init_function(klass, class_data);
-
-	TRACE("leaving");
-}
-
-Glib::ObjectBase* AppMenuItem_Class::wrap_new(GObject* o)
-{
-	TRACE("entering");
-
-	return manage(new AppMenuItem((XfceAppMenuItem*)(o)));
-}
-
-
-
-AppMenuItem::CppClassType AppMenuItem::app_menu_item_class_; // initialize static member
-
-GType AppMenuItem::get_type()
-{
-	TRACE("entering");
-
-	return app_menu_item_class_.init().get_type();
-}
-
-GType AppMenuItem::get_base_type()
-{
-	TRACE("entering");
-
-	return xfce_app_menu_item_get_type();
-}
-
-
-
-AppMenuItem::AppMenuItem()
-: Glib::ObjectBase(0),
-  Gtk::ImageMenuItem(Glib::ConstructParams(app_menu_item_class_.init()))
-{
-}
-
-AppMenuItem::AppMenuItem(const Glib::ustring &label)
-: Glib::ObjectBase(0),
-  Gtk::ImageMenuItem(Glib::ConstructParams(app_menu_item_class_.init(), "label", label.c_str(), static_cast<char*>(0)))
-{
-	TRACE("AppMenuItem::AppMenuItem(const Glib::ustring &label)");
-}
-
-AppMenuItem::AppMenuItem(const Glib::ustring &label, const Glib::ustring &command)
-: Glib::ObjectBase(0),
-  Gtk::ImageMenuItem(Glib::ConstructParams(app_menu_item_class_.init(), "label", label.c_str(), "command", command.c_str(), static_cast<char*>(0)))
-{
-	TRACE("AppMenuItem::AppMenuItem(const Glib::ustring &label, const Glib::ustring &command)");
-}
-
-AppMenuItem::AppMenuItem(const Glib::ustring &label,
-                         const Glib::ustring &command,
-                         const Glib::ustring &icon_filename,
-                         bool needs_term,
-                         bool snotify)
-: Glib::ObjectBase(0),
-  Gtk::ImageMenuItem(Glib::ConstructParams(app_menu_item_class_.init(), "label", label.c_str(), "command", command.c_str(), "icon_name", icon_filename.c_str(), "needs_term", needs_term, "snotify", snotify, static_cast<char*>(0)))
-{
-}
-
-AppMenuItem::~AppMenuItem()
-{
-//	_destroy();
-}
-
-AppMenuItem::AppMenuItem(const Glib::ConstructParams& construct_params)
-: Glib::ObjectBase(0),
-  Gtk::ImageMenuItem(construct_params)
-{
-}
-
-AppMenuItem::AppMenuItem(XfceAppMenuItem* castitem)
-: Glib::ObjectBase(0),
-  Gtk::ImageMenuItem(reinterpret_cast<GtkImageMenuItem*>(castitem))
-{
-}
-
-
-void AppMenuItem::set_name(const Glib::ustring &name)
-{
-	xfce_app_menu_item_set_name(gobj(), name.c_str());
-}
-
-void AppMenuItem::set_icon_name(const Glib::ustring &filename)
-{
-	xfce_app_menu_item_set_icon_name(gobj(), filename.c_str());
-}
-
-void AppMenuItem::set_command(const Glib::ustring &command)
-{
-	xfce_app_menu_item_set_command(gobj(), command.c_str());	
-}
-
-void AppMenuItem::set_needs_term(bool needs_term)
-{
-	xfce_app_menu_item_set_needs_term(gobj(), static_cast<gboolean>(needs_term));
-}
-
-void AppMenuItem::set_startup_notification(bool snotify)
-{
-	xfce_app_menu_item_set_startup_notification(gobj(), static_cast<gboolean>(snotify));
-}
-
-const Glib::ustring AppMenuItem::get_name()
-{
-	const gchar *result;
-	result = xfce_app_menu_item_get_name(gobj());
-
-	return Glib::ustring(result);
-}
-
-const Glib::ustring AppMenuItem::get_icon_name()
-{
-	const gchar *result;
-	result = xfce_app_menu_item_get_icon_name(gobj());
-
-	return Glib::ustring(result);
-}
-
-const Glib::ustring AppMenuItem::get_command()
-{
-	const gchar *result;
-	result = xfce_app_menu_item_get_command(gobj());
-
-	return Glib::ustring(result);
-}
-
-bool AppMenuItem::get_needs_term()
-{
-	gboolean result;
-	result = xfce_app_menu_item_get_needs_term(gobj());
-
-	return static_cast<bool>(result);
-}
-
-bool AppMenuItem::get_startup_notification()
-{
-	gboolean result;
-	result = xfce_app_menu_item_get_startup_notification(gobj());
-
-	return static_cast<bool>(result);
-}
-
-}
-}
-
-namespace Glib {
-
-Xfce4::Gui::AppMenuItem* wrap(XfceAppMenuItem* object, bool take_copy)
-{
-	return dynamic_cast<Xfce4::Gui::AppMenuItem *> (Glib::wrap_auto ((GObject*)(object), take_copy));
-}
-
-}
diff --git a/libxfce4gui-mm/app-menu-item.h b/libxfce4gui-mm/app-menu-item.h
deleted file mode 100644
index 2e3bcf2..0000000
--- a/libxfce4gui-mm/app-menu-item.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/* $Id$ */
-/** \file app-menu-item.h
- * \author Jens Luedicke <jens.luedicke at gmail.com>
- * \date 2009
- *
- *  libxfce4gui-mm - C++ wrapper library for libxfcegui4.
- * 
- *  Copyright (c) 2009 Jens Luedicke <jens.luedicke at gmail.com>
- *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public
- *  License as published by the Free Software Foundation; either
- *  version 2 of the License, or (at your option) any later version.
- *
- *  This library is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this library; if not, write to the
- *  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- *  Boston, MA 02111-1307, USA.
- */
-
-#ifndef _XFCE_APP_MENU_ITEM_H_
-#define _XFCE_APP_MENU_ITEM_H_
-
-#include <gtkmm/imagemenuitem.h>
-#include <glibmm/ustring.h>
-
-typedef struct _XfceAppMenuItem       XfceAppMenuItem;
-typedef struct _XfceAppMenuItemClass  XfceAppMenuItemClass;
-
-namespace Xfce4 {
-namespace Gui {
-
-class AppMenuItem_Class;
-
-class AppMenuItem : public Gtk::ImageMenuItem {
-public:
-	typedef AppMenuItem           CppObjectType;
-	typedef AppMenuItem_Class     CppClassType;
-	typedef XfceAppMenuItem       BaseObjectType;
-	typedef XfceAppMenuItemClass  BaseClassType;
-
-	static GType get_type()      G_GNUC_CONST;
-	static GType get_base_type() G_GNUC_CONST;
-
-	XfceAppMenuItem*       gobj()       { return reinterpret_cast<XfceAppMenuItem*>(gobject_); }
-	const XfceAppMenuItem* gobj() const { return reinterpret_cast<XfceAppMenuItem*>(gobject_); }
-
-	AppMenuItem();
-	explicit AppMenuItem(const Glib::ustring &label);
-	explicit AppMenuItem(const Glib::ustring &label, const Glib::ustring &command);
-	explicit AppMenuItem(const Glib::ustring &label,
-                             const Glib::ustring &command,
-                             const Glib::ustring &icon_filename,
-                             bool needs_term,
-                             bool snotify);
-
-	virtual ~AppMenuItem();
-
-	void set_name(const Glib::ustring &name);
-	void set_icon_name(const Glib::ustring &filename);
-	void set_command(const Glib::ustring &command);
-	void set_needs_term(bool needs_term);
-	void set_startup_notification(bool snotify);
-
-	const Glib::ustring get_name();
-	const Glib::ustring get_icon_name();
-	const Glib::ustring get_command();
-	bool get_needs_term();
-	bool get_startup_notification();
-
-protected:
-	explicit AppMenuItem(const Glib::ConstructParams& construct_params);
-	explicit AppMenuItem(XfceAppMenuItem* castitem);
-	
-private:
-	friend class AppMenuItem_Class;
-	static CppClassType app_menu_item_class_;
-
-	// noncopyable
-	AppMenuItem(const AppMenuItem&);
-	AppMenuItem& operator=(const AppMenuItem&);
-};
-
-}
-}
-
-namespace Glib {
-	/** A Glib::wrap() method for this object.
-	 * 
-	 * @param object The C instance.
-	 * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref.
-	 * @result A C++ instance that wraps this C instance.
-	 *
-	 * @relates Xfce4::Gui::AppMenuItem
-	 */
-	Xfce4::Gui::AppMenuItem* wrap(XfceAppMenuItem* object, bool take_copy = false);
-}
-
-#endif /* _XFCE_APP_MENU_ITEM_H_ */
diff --git a/libxfce4gui-mm/dialogs.cpp b/libxfce4gui-mm/dialogs.cpp
deleted file mode 100644
index 90404d3..0000000
--- a/libxfce4gui-mm/dialogs.cpp
+++ /dev/null
@@ -1,168 +0,0 @@
-/* $Id$ */
-/** \file dialogs.cpp
- * \author Jens Luedicke <jens.luedicke at gmail.com>
- * \date 2009
- *
- *  libxfce4gui-mm - C++ wrapper library for libxfcegui4.
- * 
- *  Copyright (c) 2009 Jens Luedicke <jens.luedicke at gmail.com>
- *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public
- *  License as published by the Free Software Foundation; either
- *  version 2 of the License, or (at your option) any later version.
- *
- *  This library is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this library; if not, write to the
- *  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- *  Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "dialogs.h"
-
-#include <gtkmm/window.h>
-#include <glibmm/ustring.h>
-
-#include <libxfcegui4/libxfcegui4.h>
-
-namespace Xfce4 {
-namespace Gui {
-namespace Dialogs {
-
-void error(const gchar *format, ...)
-{
-	va_list args;
-
-	va_start(args, format);
-	
-	xfce_verr(format, args);
-
-	va_end(args);
-}
-
-void warn(const gchar *format, ...)
-{
-	va_list args;
-
-	va_start(args, format);
-
-	xfce_vwarn(format, args);
-
-	va_end(args);
-}
-
-void info(const gchar *format, ...)
-{
-	va_list args;
-
-	va_start(args, format);
-
-	xfce_vinfo(format, args);
-
-	va_end(args);
-}
-
-bool confirm(const Glib::ustring &text, 
-             const Glib::ustring &stock_id,
-	     const Glib::ustring &action)
-{
-	gboolean result;
-	
-	result = xfce_confirm(text.c_str(), stock_id.c_str(), action.c_str());
-	
-	return static_cast<bool>(result);
-}
-
-#if 0
-gint message_dialog(Gtk::Window *parent, 
-                    const Glib::ustring &title,
-                    const Glib::ustring &icon_id,
-                    const Glib::ustring &primary_text,
-                    const Glib::ustring &secondary_text,
-                    const Glib::ustring &first_button_type,
-                    ...) 
-{
-	gint result;
-	va_list args;
-
-	va_start(args, first_button_type);
-	
-	xfce_message_dialog_new_valist(parent->gobj(), 
-	                               title.c_str(), 
-	                       	       icon_id.c_str(), 
-				       primary_text.c_str(), 
-				       secondary_text.c_str(), 
-				       first_button_type.c_str(), 
-				       args);
-	va_end(args);
-	
-	return result;
-}
-#endif
-					 
-Gtk::Widget* create_header(Glib::RefPtr<Gdk::Pixbuf> &icon,
-                           const Glib::ustring &text)
-{
-	GtkWidget *result;
-	
-	if (icon) {
-		result = xfce_create_header(icon->gobj(), text.c_str());
-	} else {
-		result = xfce_create_header(0, text.c_str());
-	}
-
-	Gtk::Widget *widget = Glib::wrap(result);
-	
-	return widget;
-}
-
-Gtk::Widget* create_header_with_image(Gtk::Widget *image,
-                                      const Glib::ustring &text)
-{
-	GtkWidget *result;
-	
-	if (image != 0) {
-		result = xfce_create_header_with_image(image->gobj(), text.c_str());
-	} else {
-		result = xfce_create_header_with_image(0, text.c_str());
-	}
-
-	Gtk::Widget *widget = Glib::wrap(result);
-	
-	return widget;
-}
-
-Gtk::Widget* create_mixed_button(const Glib::ustring &stock, const Glib::ustring &text)
-{
-	GtkWidget *result;
-	
-	result = xfce_create_mixed_button(stock.c_str(), text.c_str());
-
-	Gtk::Widget *widget = Glib::wrap(result);
-	
-	return widget;
-}
-
-Gtk::Widget* create_small_label(const Glib::ustring &text)
-{
-	GtkWidget *result;
-	
-	result = xfce_create_small_label(text.c_str());
-
-	Gtk::Widget *widget = Glib::wrap(result);
-	
-	return widget;
-}
-
-}
-}
-}
diff --git a/libxfce4gui-mm/dialogs.h b/libxfce4gui-mm/dialogs.h
deleted file mode 100644
index c3e3874..0000000
--- a/libxfce4gui-mm/dialogs.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* $Id$ */
-/** \file dialogs.h
- * \author Jens Luedicke <jens.luedicke at gmail.com>
- * \date 2009
- *
- *  libxfce4gui-mm - C++ wrapper library for libxfcegui4.
- * 
- *  Copyright (c) 2009 Jens Luedicke <jens.luedicke at gmail.com>
- *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public
- *  License as published by the Free Software Foundation; either
- *  version 2 of the License, or (at your option) any later version.
- *
- *  This library is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this library; if not, write to the
- *  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- *  Boston, MA 02111-1307, USA.
- */
-
-#ifndef _XFCE_DIALOGS_H_
-#define _XFCE_DIALOGS_H_
-
-#include <glibmm/refptr.h>
-#include <glibmm/ustring.h>
-#include <gtkmm/window.h>
-
-namespace Xfce4 {
-namespace Gui {
-namespace Dialogs {
-
-void error(const gchar *format, ...);
-void warn(const gchar *format, ...);
-void info(const gchar *format, ...);
-
-bool confirm(const Glib::ustring &text, 
-             const Glib::ustring &stock_id, 
-	     const Glib::ustring &action);
-
-#if 0
-gint message_dialog(Gtk::Window *parent,
-                    const Glib::ustring &title,
-                    const Glib::ustring &icon_id,
-                    const Glib::ustring &primary_text,
-                    const Glib::ustring &secondary_text,
-                    const Glib::ustring &first_button_type,
-                    ...);
-#endif
-					 
-Gtk::Widget* create_header(Glib::RefPtr<Gdk::Pixbuf> &icon,
-                           const Glib::ustring &text);
-
-Gtk::Widget* create_header_with_image(Gtk::Widget *image,
-                                      const Glib::ustring &text);
-
-Gtk::Widget* create_mixed_button(const Glib::ustring &stock,
-                                 const Glib::ustring &text);
-
-Gtk::Widget* create_small_label(const Glib::ustring &text);
-
-}
-}
-}
-
-#endif /* _XFCE_DIALOGS_H_ */
diff --git a/libxfce4gui-mm/exec.cpp b/libxfce4gui-mm/exec.cpp
deleted file mode 100644
index 8cd508f..0000000
--- a/libxfce4gui-mm/exec.cpp
+++ /dev/null
@@ -1,64 +0,0 @@
-/* $Id$ */
-/** \file exec.cpp
- * \author Jens Luedicke <jens.luedicke at gmail.com>
- * \date 2009
- *
- *  libxfce4gui-mm - C++ wrapper library for libxfcegui4.
- * 
- *  Copyright (c) 2009 Jens Luedicke <jens.luedicke at gmail.com>
- *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public
- *  License as published by the Free Software Foundation; either
- *  version 2 of the License, or (at your option) any later version.
- *
- *  This library is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this library; if not, write to the
- *  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- *  Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "exec.h"
-
-#include <libxfcegui4/libxfcegui4.h>
-
-namespace Xfce4 {
-namespace Gui {
-
-bool exec(const Glib::ustring &cmd, 
-          bool in_terminal,
-	  bool use_sn, 
-	  Glib::Error &error)
-{
-	GError *err = error.gobj();
-
-	gboolean result = xfce_exec(cmd.c_str(), static_cast<gboolean>(in_terminal), static_cast<gboolean>(use_sn), &err);
-
-	return static_cast<bool>(result);
-}
-
-bool exec_with_envp(const Glib::ustring &cmd,
-                    bool in_terminal,
-		    bool use_sn, 
-		    Glib::Error &error, 
-		    Glib::StringArrayHandle &envp)
-{
-	gchar **env = const_cast<gchar**>(envp.data());
-	GError *err = error.gobj();
-
-	gboolean result = xfce_exec_with_envp(cmd.c_str(), static_cast<gboolean>(in_terminal), static_cast<gboolean>(use_sn), &err, env);
-
-	return static_cast<bool>(result);
-}
-
-}
-}
diff --git a/libxfce4gui-mm/exec.h b/libxfce4gui-mm/exec.h
deleted file mode 100644
index a0084ee..0000000
--- a/libxfce4gui-mm/exec.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/* $Id$ */
-/** \file exec.h
- * \author Jens Luedicke <jens.luedicke at gmail.com>
- * \date 2009
- *
- *  libxfce4gui-mm - C++ wrapper library for libxfcegui4.
- * 
- *  Copyright (c) 2009 Jens Luedicke <jens.luedicke at gmail.com>
- *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public
- *  License as published by the Free Software Foundation; either
- *  version 2 of the License, or (at your option) any later version.
- *
- *  This library is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this library; if not, write to the
- *  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- *  Boston, MA 02111-1307, USA.
- */
-
-#ifndef _XFCE_EXEC_H_
-#define _XFCE_EXEC_H_
-
-#include <glibmm/ustring.h>
-#include <glibmm/arrayhandle.h>
-#include <glibmm/error.h>
-
-namespace Xfce4 {
-namespace Gui {
-
-bool exec(const Glib::ustring &cmd,
-          bool in_terminal,
-          bool use_sn,
-          Glib::Error &error);
-
-bool exec_with_envp(const Glib::ustring &cmd,
-                    bool in_terminal,
-                    bool use_sn,
-                    Glib::Error &error,
-                    Glib::StringArrayHandle &envp);
-
-}
-}
-
-#endif /* _XFCE_EXEC_H_ */
diff --git a/libxfce4gui-mm/gdk-extensions.cpp b/libxfce4gui-mm/gdk-extensions.cpp
deleted file mode 100644
index 940dc4e..0000000
--- a/libxfce4gui-mm/gdk-extensions.cpp
+++ /dev/null
@@ -1,68 +0,0 @@
-/* $Id$ */
-/** \file gdk-extensions.cpp
- * \author Jens Luedicke <jens.luedicke at gmail.com>
- * \date 2009
- *
- *  libxfce4gui-mm - C++ wrapper library for libxfcegui4.
- * 
- *  Copyright (c) 2009 Jens Luedicke <jens.luedicke at gmail.com>
- *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public
- *  License as published by the Free Software Foundation; either
- *  version 2 of the License, or (at your option) any later version.
- *
- *  This library is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this library; if not, write to the
- *  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- *  Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "gdk-extensions.h"
-
-#include <libxfcegui4/libxfcegui4.h>
-
-namespace Xfce4 {
-namespace Gui {
-
-Glib::ustring gdk_display_get_fullname(Glib::RefPtr<Gdk::Display> &display)
-{
-	gchar *result;
-	
-	if (display) {
-		result = xfce_gdk_display_get_fullname(display->gobj());
-	} else {
-		result = xfce_gdk_display_get_fullname(0);
-	}
-
-	return Glib::ustring(result);
-}
-
-Glib::RefPtr<Gdk::Screen> gdk_display_locate_monitor_with_pointer(Glib::RefPtr<Gdk::Display> &display,
-                                                                  gint *monitor_return)
-{
-	GdkScreen *result = xfce_gdk_display_locate_monitor_with_pointer(display->gobj(), monitor_return);
-
-	Glib::RefPtr<Gdk::Screen> screen = Glib::wrap(result);
-
-	return screen;	
-}
-
-Glib::ustring gdk_screen_get_fullname(Glib::RefPtr<Gdk::Screen> &screen)
-{
-	gchar *result = xfce_gdk_screen_get_fullname(screen->gobj());
-
-	return Glib::ustring(result);
-}
-
-}
-}
diff --git a/libxfce4gui-mm/gdk-extensions.h b/libxfce4gui-mm/gdk-extensions.h
deleted file mode 100644
index f22011b..0000000
--- a/libxfce4gui-mm/gdk-extensions.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* $Id$ */
-/** \file gdk-extensions.h
- * \author Jens Luedicke <jens.luedicke at gmail.com>
- * \date 2009
- *
- *  libxfce4gui-mm - C++ wrapper library for libxfcegui4.
- * 
- *  Copyright (c) 2009 Jens Luedicke <jens.luedicke at gmail.com>
- *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public
- *  License as published by the Free Software Foundation; either
- *  version 2 of the License, or (at your option) any later version.
- *
- *  This library is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this library; if not, write to the
- *  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- *  Boston, MA 02111-1307, USA.
- */
-
-#ifndef _XFCE_GDK_EXTENSIONS_H_
-#define _XFCE_GDK_EXTENSIONS_H_
-
-#include <glibmm/refptr.h>
-#include <glibmm/ustring.h>
-#include <gdkmm/display.h>
-#include <gdkmm/screen.h>
-
-namespace Xfce4 {
-namespace Gui {
-
-Glib::ustring gdk_display_get_fullname(Glib::RefPtr<Gdk::Display> &display);
-
-Glib::RefPtr<Gdk::Screen> gdk_display_locate_monitor_with_pointer(Glib::RefPtr<Gdk::Display> &display,
-                                                                  gint *monitor_return);
-
-Glib::ustring gdk_screen_get_fullname(Glib::RefPtr<Gdk::Screen> &screen);
-
-}
-}
-
-#endif /* _XFCE_GDK_EXTENSIONS_H_ */
-
diff --git a/libxfce4gui-mm/gtk-extensions.cpp b/libxfce4gui-mm/gtk-extensions.cpp
deleted file mode 100644
index 811b9b9..0000000
--- a/libxfce4gui-mm/gtk-extensions.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-/* $Id$ */
-/** \file gtk-extensions.cpp
- * \author Jens Luedicke <jens.luedicke at gmail.com>
- * \date 2009
- *
- *  libxfce4gui-mm - C++ wrapper library for libxfcegui4.
- * 
- *  Copyright (c) 2009 Jens Luedicke <jens.luedicke at gmail.com>
- *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public
- *  License as published by the Free Software Foundation; either
- *  version 2 of the License, or (at your option) any later version.
- *
- *  This library is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this library; if not, write to the
- *  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- *  Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "gtk-extensions.h"
-
-#include <libxfcegui4/libxfcegui4.h>
-
-namespace Xfce4 {
-namespace Gui {
-
-void gtk_window_center_on_monitor(Gtk::Window &window, 
-                                  Glib::RefPtr<Gdk::Screen> &screen,
-                                  gint monitor)
-{
-	xfce_gtk_window_center_on_monitor(window.gobj(), screen->gobj(), monitor);
-}
-
-void gtk_window_center_on_monitor_with_pointer(Gtk::Window &window)
-{
-	xfce_gtk_window_center_on_monitor_with_pointer(window.gobj());
-}
-
-}
-}
diff --git a/libxfce4gui-mm/gtk-extensions.h b/libxfce4gui-mm/gtk-extensions.h
deleted file mode 100644
index cfe76af..0000000
--- a/libxfce4gui-mm/gtk-extensions.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* $Id$ */
-/** \file gtk-extensions.h
- * \author Jens Luedicke <jens.luedicke at gmail.com>
- * \date 2009
- *
- *  libxfce4gui-mm - C++ wrapper library for libxfcegui4.
- * 
- *  Copyright (c) 2009 Jens Luedicke <jens.luedicke at gmail.com>
- *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public
- *  License as published by the Free Software Foundation; either
- *  version 2 of the License, or (at your option) any later version.
- *
- *  This library is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this library; if not, write to the
- *  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- *  Boston, MA 02111-1307, USA.
- */
-
-#ifndef _XFCE_GTK_EXTENSIONS_H_
-#define _XFCE_GTK_EXTENSIONS_H_
-
-#include <glibmm/refptr.h>
-#include <gtkmm/window.h>
-#include <gdkmm/screen.h>
-
-namespace Xfce4 {
-namespace Gui {
-
-void gtk_window_center_on_monitor(Gtk::Window &window,
-                                  Glib::RefPtr<Gdk::Screen> &screen,
-                                  gint monitor);
-				  
-void gtk_window_center_on_monitor_with_pointer(Gtk::Window &window);
-
-}
-}
-
-#endif /* _XFCE_GTK_EXTENSIONS_H_ */
-
diff --git a/libxfce4gui-mm/heading.cpp b/libxfce4gui-mm/heading.cpp
deleted file mode 100644
index c975e09..0000000
--- a/libxfce4gui-mm/heading.cpp
+++ /dev/null
@@ -1,202 +0,0 @@
-/* $Id$ */
-/** \file heading.cpp
- * \author Jens Luedicke <jens.luedicke at gmail.com>
- * \date 2009
- *
- *  libxfce4gui-mm - C++ wrapper library for libxfcegui4.
- * 
- *  Copyright (c) 2009 Jens Luedicke <jens.luedicke at gmail.com>
- *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public
- *  License as published by the Free Software Foundation; either
- *  version 2 of the License, or (at your option) any later version.
- *
- *  This library is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this library; if not, write to the
- *  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- *  Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "heading.h"
-
-#include <gtkmm/private/widget_p.h>
-
-#include <libxfcegui4/libxfcegui4.h>
-
-namespace Xfce4 {
-namespace Gui {
-
-class Heading_Class : public Glib::Class {
-public:
-	typedef Heading           CppObjectType;
-	typedef XfceHeading       BaseObjectType;
-	typedef XfceHeadingClass  BaseClassType;
-	typedef Gtk::Widget_Class CppClassParent;
-	typedef GtkWidgetClass    BaseClassParent;
-
-	friend class Heading;
-
-	const Glib::Class& init();
-
-	static void class_init_function(void* g_class, void* class_data);
-
-	static Glib::ObjectBase* wrap_new(GObject*);
-};
-
-const Glib::Class& Heading_Class::init()
-{
-	TRACE("entering");
-	
-	if (!gtype_) { // create the GType if necessary
-		// Glib::Class has to know the class init function to clone custom types.
-		class_init_func_ = &Heading_Class::class_init_function;
-
-		// This is actually just optimized away, apparently with no harm.
-		// Make sure that the parent type has been created.
-		//CppClassParent::CppObjectType::get_type();
-
-		// Create the wrapper type, with the same class/instance size as the base type.
-		register_derived_type(xfce_heading_get_type());
-
-		// Add derived versions of interfaces, if the C type implements any interfaces:
-	}
-
-	TRACE("leaving");
-
-	return *this;
-}
-
-void Heading_Class::class_init_function(void* g_class, void* class_data)
-{
-	TRACE("entering");
-
-	BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
-	CppClassParent::class_init_function(klass, class_data);
-
-	TRACE("leaving");
-}
-
-Glib::ObjectBase* Heading_Class::wrap_new(GObject* o)
-{
-	TRACE("entering");
-
-	return manage(new Heading((XfceHeading*)(o)));
-}
-
-
-
-Heading::CppClassType Heading::heading_class_; // initialize static member
-
-GType Heading::get_type()
-{
-	TRACE("entering");
-
-	return heading_class_.init().get_type();
-}
-
-GType Heading::get_base_type()
-{
-	TRACE("entering");
-
-	return xfce_app_menu_item_get_type();
-}
-
-
-
-Heading::Heading()
-: Glib::ObjectBase(0),
-  Gtk::Widget(Glib::ConstructParams(heading_class_.init()))
-{
-}
-
-Heading::~Heading()
-{
-//	_destroy();
-}
-
-Heading::Heading(const Glib::ConstructParams& construct_params)
-: Glib::ObjectBase(0),
-  Gtk::Widget(construct_params)
-{
-}
-
-Heading::Heading(XfceHeading* castitem)
-: Glib::ObjectBase(0),
-  Gtk::Widget(reinterpret_cast<GtkWidget*>(castitem))
-{
-}
-
-
-Glib::RefPtr<Gdk::Pixbuf> Heading::get_icon()
-{
-	GdkPixbuf *result = xfce_heading_get_icon(gobj());
-
-	return Glib::wrap(result);
-}
-
-void Heading::set_icon(Glib::RefPtr<Gdk::Pixbuf> &icon)
-{
-	if (icon) {
-		xfce_heading_set_icon(gobj(), icon->gobj());
-	} else {
-		xfce_heading_set_icon(gobj(), 0);
-	}
-}
-
-const Glib::ustring Heading::get_icon_name()
-{
-	const gchar *result = xfce_heading_get_icon_name(gobj());
-
-	return Glib::ustring(result);
-}
-
-void Heading::set_icon_name(const Glib::ustring &icon_name)
-{
-	xfce_heading_set_icon_name(gobj(), icon_name.c_str());
-}
-
-const Glib::ustring Heading::get_subtitle()
-{
-	const gchar *result = xfce_heading_get_subtitle(gobj());
-
-	return Glib::ustring(result);
-}
-
-void Heading::set_subtitle(const Glib::ustring &subtitle)
-{
-	xfce_heading_set_subtitle(gobj(), subtitle.c_str());
-}
-
-const Glib::ustring Heading::get_title()
-{
-	const gchar *result = xfce_heading_get_title(gobj());
-
-	return Glib::ustring(result);
-}
-
-void Heading::set_title(const Glib::ustring &title)
-{
-	xfce_heading_set_title(gobj(), title.c_str());
-}
-
-}
-}
-
-namespace Glib {
-
-Xfce4::Gui::Heading* wrap(XfceHeading* object, bool take_copy)
-{
-	return dynamic_cast<Xfce4::Gui::Heading *> (Glib::wrap_auto ((GObject*)(object), take_copy));
-}
-
-}
diff --git a/libxfce4gui-mm/heading.h b/libxfce4gui-mm/heading.h
deleted file mode 100644
index 96de6ff..0000000
--- a/libxfce4gui-mm/heading.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/* $Id$ */
-/** \file heading.h
- * \author Jens Luedicke <jens.luedicke at gmail.com>
- * \date 2009
- *
- *  libxfce4gui-mm - C++ wrapper library for libxfcegui4.
- * 
- *  Copyright (c) 2009 Jens Luedicke <jens.luedicke at gmail.com>
- *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public
- *  License as published by the Free Software Foundation; either
- *  version 2 of the License, or (at your option) any later version.
- *
- *  This library is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this library; if not, write to the
- *  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- *  Boston, MA 02111-1307, USA.
- */
-
-#ifndef _XFCE_HEADING_H_
-#define _XFCE_HEADING_H_
-
-#include <glibmm/refptr.h>
-#include <glibmm/ustring.h>
-#include <gtkmm/widget.h>
-
-typedef struct _XfceHeading       XfceHeading;
-typedef struct _XfceHeadingClass  XfceHeadingClass;
-
-namespace Xfce4 {
-namespace Gui {
-
-class Heading_Class;
-
-class Heading : public Gtk::Widget {
-public:
-	typedef Heading           CppObjectType;
-	typedef Heading_Class     CppClassType;
-	typedef XfceHeading       BaseObjectType;
-	typedef XfceHeadingClass  BaseClassType;
-
-	static GType get_type()      G_GNUC_CONST;
-	static GType get_base_type() G_GNUC_CONST;
-
-	XfceHeading*       gobj()       { return reinterpret_cast<XfceHeading*>(gobject_); }
-	const XfceHeading* gobj() const { return reinterpret_cast<XfceHeading*>(gobject_); }
-
-	Heading();
-	virtual ~Heading();
-
-	Glib::RefPtr<Gdk::Pixbuf> get_icon();
-	void set_icon(Glib::RefPtr<Gdk::Pixbuf> &icon);
-
-	const Glib::ustring get_icon_name();
-	void set_icon_name(const Glib::ustring &icon_name);
-
-	const Glib::ustring get_subtitle();
-	void set_subtitle(const Glib::ustring &subtitle);
-
-	const Glib::ustring get_title();
-	void set_title(const Glib::ustring &title);
-
-protected:
-	explicit Heading(const Glib::ConstructParams& construct_params);
-	explicit Heading(XfceHeading* castitem);
-	
-private:
-	friend class Heading_Class;
-	static CppClassType heading_class_;
-
-	// noncopyable
-	Heading(const Heading&);
-	Heading& operator=(const Heading&);
-};
-
-}
-}
-
-namespace Glib {
-	/** A Glib::wrap() method for this object.
-	 * 
-	 * @param object The C instance.
-	 * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref.
-	 * @result A C++ instance that wraps this C instance.
-	 *
-	 * @relates Xfce4::Gui::Heading
-	 */
-	Xfce4::Gui::Heading* wrap(XfceHeading* object, bool take_copy = false);
-}
-
-#endif /* _XFCE_HEADING_H_ */
diff --git a/libxfce4gui-mm/libxfce4gui-mm-1.0.pc.in b/libxfce4gui-mm/libxfce4gui-mm-1.0.pc.in
deleted file mode 100644
index f0a3992..0000000
--- a/libxfce4gui-mm/libxfce4gui-mm-1.0.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: libxfce4gui-mm
-Description: C++ wrapper library for libxfcegui4
-Requires: gtkmm-2.4
-Version: @VERSION@
-Libs: -L${libdir} -lxfce4gui-mm
-Cflags: -I${includedir}/xfce4/libxfce4gui-mm
diff --git a/libxfce4gui-mm/titled-dialog.cpp b/libxfce4gui-mm/titled-dialog.cpp
deleted file mode 100644
index 7b45e61..0000000
--- a/libxfce4gui-mm/titled-dialog.cpp
+++ /dev/null
@@ -1,189 +0,0 @@
-/* $Id$ */
-/** \file titled-dialog.cpp
- * \author Jens Luedicke <jens.luedicke at gmail.com>
- * \date 2009
- *
- *  libxfce4gui-mm - C++ wrapper library for libxfcegui4.
- * 
- *  Copyright (c) 2009 Jens Luedicke <jens.luedicke at gmail.com>
- *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public
- *  License as published by the Free Software Foundation; either
- *  version 2 of the License, or (at your option) any later version.
- *
- *  This library is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this library; if not, write to the
- *  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- *  Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "titled-dialog.h"
-
-#include <gtkmm/private/dialog_p.h>
-
-#include <libxfcegui4/libxfcegui4.h>
-
-namespace Xfce4 {
-namespace Gui {
-
-class TitledDialog_Class : public Glib::Class {
-public:
-	typedef TitledDialog           CppObjectType;
-	typedef XfceTitledDialog       BaseObjectType;
-	typedef XfceTitledDialogClass  BaseClassType;
-	typedef Gtk::Dialog_Class      CppClassParent;
-	typedef GtkDialogClass         BaseClassParent;
-
-	friend class TitledDialog;
-
-	const Glib::Class& init();
-
-	static void class_init_function(void* g_class, void* class_data);
-
-	static Glib::ObjectBase* wrap_new(GObject*);
-};
-
-const Glib::Class& TitledDialog_Class::init()
-{
-	TRACE("entering");
-	
-	if (!gtype_) { // create the GType if necessary
-		// Glib::Class has to know the class init function to clone custom types.
-		class_init_func_ = &TitledDialog_Class::class_init_function;
-
-		// This is actually just optimized away, apparently with no harm.
-		// Make sure that the parent type has been created.
-		//CppClassParent::CppObjectType::get_type();
-
-		// Create the wrapper type, with the same class/instance size as the base type.
-		register_derived_type(xfce_titled_dialog_get_type());
-
-		// Add derived versions of interfaces, if the C type implements any interfaces:
-	}
-
-	TRACE("leaving");
-
-	return *this;
-}
-
-void TitledDialog_Class::class_init_function(void* g_class, void* class_data)
-{
-	TRACE("entering");
-
-	BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
-	CppClassParent::class_init_function(klass, class_data);
-
-	TRACE("leaving");
-}
-
-Glib::ObjectBase* TitledDialog_Class::wrap_new(GObject* o)
-{
-	TRACE("entering");
-
-	return manage(new TitledDialog((XfceTitledDialog*)(o)));
-}
-
-
-
-TitledDialog::CppClassType TitledDialog::titled_dialog_class_; // initialize static member
-
-GType TitledDialog::get_type()
-{
-	TRACE("entering");
-
-	return titled_dialog_class_.init().get_type();
-}
-
-GType TitledDialog::get_base_type()
-{
-	TRACE("entering");
-
-	return xfce_app_menu_item_get_type();
-}
-
-
-
-TitledDialog::TitledDialog()
-: Glib::ObjectBase(0),
-  Gtk::Dialog(Glib::ConstructParams(titled_dialog_class_.init()))
-{
-}
-
-#if 0
-TitledDialog::TitledDialog(const Glib::ustring &title,
-                           Gtk::Window &parent,
-                           const gchar *first_button_text,
-                           ...)
-: Glib::ObjectBase(0),
-  Gtk::Dialog(Glib::ConstructParams(titled_dialog_class_.init(), "title", title.c_str(), static_cast<char*>(0)))
-{
-	va_list args;
-	const gchar* button_text;
-
-//	set_parent(parent);
-	
-	va_start(args, first_button_text);
-
-	for (button_text = first_button_text; button_text != NULL; ) {
-		gint response_id = va_arg(args, gint);
-		
-		add_button(Glib::ustring(button_text), response_id);
-
-		button_text = va_arg(args, const gchar*);
-	}
-
-	va_end(args);
-}
-#endif
-
-TitledDialog::~TitledDialog()
-{
-//	_destroy();
-}
-
-TitledDialog::TitledDialog(const Glib::ConstructParams& construct_params)
-: Glib::ObjectBase(0),
-  Gtk::Dialog(construct_params)
-{
-}
-
-TitledDialog::TitledDialog(XfceTitledDialog* castitem)
-: Glib::ObjectBase(0),
-  Gtk::Dialog(reinterpret_cast<GtkDialog*>(castitem))
-{
-}
-
-
-const Glib::ustring TitledDialog::get_subtitle()
-{
-	const gchar *result = xfce_titled_dialog_get_subtitle(gobj());
-	
-	return Glib::ustring(result);
-}
-
-void TitledDialog::set_subtitle(const Glib::ustring &subtitle)
-{
-	xfce_titled_dialog_set_subtitle(gobj(), subtitle.c_str());
-}
-
-}
-}
-
-namespace Glib {
-
-Xfce4::Gui::TitledDialog* wrap(XfceTitledDialog* object, bool take_copy)
-{
-	return dynamic_cast<Xfce4::Gui::TitledDialog *> (Glib::wrap_auto ((GObject*)(object), take_copy));
-}
-
-}
diff --git a/libxfce4gui-mm/titled-dialog.h b/libxfce4gui-mm/titled-dialog.h
deleted file mode 100644
index b94bb30..0000000
--- a/libxfce4gui-mm/titled-dialog.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/** \file titled-dialog.h
- * \author Jens Luedicke <jens.luedicke at gmail.com>
- * \date 2009
- *
- *  libxfce4gui-mm - C++ wrapper library for libxfcegui4.
- * 
- *  Copyright (c) 2009 Jens Luedicke <jens.luedicke at gmail.com>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef _XFCE_TITLED_DIALOG_H_
-#define _XFCE_TITLED_DIALOG_H_
-
-#include <glibmm/refptr.h>
-#include <glibmm/ustring.h>
-#include <gtkmm/dialog.h>
-
-typedef struct _XfceTitledDialog       XfceTitledDialog;
-typedef struct _XfceTitledDialogClass  XfceTitledDialogClass;
-
-namespace Xfce4 {
-namespace Gui {
-
-class TitledDialog_Class;
-
-class TitledDialog : public Gtk::Dialog {
-public:
-	typedef TitledDialog           CppObjectType;
-	typedef TitledDialog_Class     CppClassType;
-	typedef XfceTitledDialog       BaseObjectType;
-	typedef XfceTitledDialogClass  BaseClassType;
-
-	static GType get_type()      G_GNUC_CONST;
-	static GType get_base_type() G_GNUC_CONST;
-
-	XfceTitledDialog*       gobj()       { return reinterpret_cast<XfceTitledDialog*>(gobject_); }
-	const XfceTitledDialog* gobj() const { return reinterpret_cast<XfceTitledDialog*>(gobject_); }
-
-	TitledDialog();
-
-#if 0
-	TitledDialog(const Glib::ustring &title,
-                     Gtk::Window &parent,
-                     const gchar* first_button_text,
-                     ...);
-#endif
-
-	virtual ~TitledDialog();
-
-	const Glib::ustring get_subtitle();
-	void set_subtitle(const Glib::ustring &subtitle);
-
-protected:
-	explicit TitledDialog(const Glib::ConstructParams& construct_params);
-	explicit TitledDialog(XfceTitledDialog* castitem);
-	
-private:
-	friend class TitledDialog_Class;
-	static CppClassType titled_dialog_class_;
-
-	// noncopyable
-	TitledDialog(const TitledDialog&);
-	TitledDialog& operator=(const TitledDialog&);
-};
-
-}
-}
-
-namespace Glib {
-	/** A Glib::wrap() method for this object.
-	 * 
-	 * @param object The C instance.
-	 * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref.
-	 * @result A C++ instance that wraps this C instance.
-	 *
-	 * @relates Xfce4::Gui::TitledDialog
-	 */
-	Xfce4::Gui::TitledDialog* wrap(XfceTitledDialog* object, bool take_copy = false);
-}
-
-#endif /* _XFCE_TITLED_DIALOG_H_ */



More information about the Xfce4-commits mailing list