compiles and runs, but crashes ... duh

git-svn-id: svn://localhost/trunk/ardour2@113 d708f5d6-7413-0410-9779-e7cbd77b26cf

5 files changed, 27 insertions, 12 deletions

diff --git a/libs/gtkmm2ext/gtkmm2ext/fastmeter.h b/libs/gtkmm2ext/gtkmm2ext/fastmeter.h
index 5620a17a4d..f0e26a09ca 100644
--- a/libs/gtkmm2ext/gtkmm2ext/fastmeter.h
+++ b/libs/gtkmm2ext/gtkmm2ext/fastmeter.h
@@ -54,18 +54,18 @@ class FastMeter : public Gtk::DrawingArea {
 	void on_size_request (GtkRequisition*);
 	
   private:  
-	static Glib::RefPtr<Gdk::Pixmap>* h_pixmap;
-	static Glib::RefPtr<Gdk::Bitmap>* h_mask;
+	static Glib::RefPtr<Gdk::Pixmap> h_pixmap;
+	static Glib::RefPtr<Gdk::Bitmap> h_mask;
 	static gint h_pixheight;
 	static gint h_pixwidth;
 
-	static Glib::RefPtr<Gdk::Pixmap>* v_pixmap;
-	static Glib::RefPtr<Gdk::Bitmap>* v_mask;
+	static Glib::RefPtr<Gdk::Pixmap> v_pixmap;
+	static Glib::RefPtr<Gdk::Bitmap> v_mask;
 	static gint v_pixheight;
 	static gint v_pixwidth;
 
 	Orientation orientation;
-	Glib::RefPtr<Gdk::Pixmap>* backing;
+	Glib::RefPtr<Gdk::Pixmap> backing;
 	Gdk::Rectangle pixrect;
 	gint request_width;
 	gint request_height;
diff --git a/libs/gtkmm2ext/gtkmm2ext/gtkutils.h b/libs/gtkmm2ext/gtkmm2ext/gtkutils.h
index ae60252e83..1841040560 100644
--- a/libs/gtkmm2ext/gtkmm2ext/gtkutils.h
+++ b/libs/gtkmm2ext/gtkmm2ext/gtkutils.h
@@ -23,8 +23,12 @@
 
 #include <string>
 
-void set_usize_to_display_given_text (Gtk::Widget& w,
-				      const std::string& text,
-				      gint hpadding = 0,
-				      gint vpadding = 0);
+namespace Gtk {
+	class Widget;
+}
+
+void gtk_set_size_request_to_display_given_text (Gtk::Widget& w,
+						 const std::string& text,
+						 gint hpadding = 0,
+						 gint vpadding = 0);
 #endif /* __gtkutils_h__ */
diff --git a/libs/gtkmm2ext/gtkmm2ext/popup.h b/libs/gtkmm2ext/gtkmm2ext/popup.h
index 5684230f56..89f14b4c50 100644
--- a/libs/gtkmm2ext/gtkmm2ext/popup.h
+++ b/libs/gtkmm2ext/gtkmm2ext/popup.h
@@ -42,6 +42,9 @@ class PopUp : public Gtk::Window, public Touchable
 
 	bool on_delete_event (GdkEventAny* );
 
+  protected:
+	void on_realize ();
+
   private:
 	Gtk::Label label;
 	std::string my_text;
diff --git a/libs/gtkmm2ext/gtkmm2ext/tearoff.h b/libs/gtkmm2ext/gtkmm2ext/tearoff.h
index d0478d5c57..70146fa3db 100644
--- a/libs/gtkmm2ext/gtkmm2ext/tearoff.h
+++ b/libs/gtkmm2ext/gtkmm2ext/tearoff.h
@@ -37,6 +37,7 @@ class TearOff : public Gtk::HBox
 	Gtk::Window* tearoff_window() const { return own_window; }
 	bool torn_off() const;
 
+
   private:
 	Gtk::Widget&   contents;
 	Gtk::Window*   own_window;
diff --git a/libs/gtkmm2ext/gtkmm2ext/utils.h b/libs/gtkmm2ext/gtkmm2ext/utils.h
index 7de3101496..4fba212c03 100644
--- a/libs/gtkmm2ext/gtkmm2ext/utils.h
+++ b/libs/gtkmm2ext/gtkmm2ext/utils.h
@@ -23,9 +23,15 @@
 
 #include <vector>
 #include <string>
-#include <gtkmm/widget.h>
-#include <gtkmm/paned.h>
-#include <gtkmm/comboboxtext.h>
+
+#include <gdkmm/window.h> /* for WMDecoration */
+
+namespace Gtk {
+	class ComboBoxText;
+	class Widget;
+	class Window;
+	class Paned;
+}
 
 namespace Gtkmm2ext {
 	void init ();
@@ -42,6 +48,7 @@ namespace Gtkmm2ext {
 	}
 
 	GdkWindow* get_paned_handle (Gtk::Paned& paned);
+	void set_decoration (Gtk::Window* win, Gdk::WMDecoration decor);
 };
 
 #endif /*  __gtkmm2ext_utils_h__ */