diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2006-03-15 02:04:30 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2006-03-15 02:04:30 +0000 |
commit | 4d2afdd0f79b8c4b76338d61f1b2474d39d684ce (patch) | |
tree | dedceaafba959131a601a5ba97d873d40a4d1bdd /libs/gtkmm2ext/gtkmm2ext/fastmeter.h | |
parent | ee873ee8969fa9d0d3da24923c2b690ff7fa0460 (diff) |
pixbufs instead of pixmaps; function-scope local fd's for reading from a FileSource
git-svn-id: svn://localhost/trunk/ardour2@395 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/gtkmm2ext/gtkmm2ext/fastmeter.h')
-rw-r--r-- | libs/gtkmm2ext/gtkmm2ext/fastmeter.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/libs/gtkmm2ext/gtkmm2ext/fastmeter.h b/libs/gtkmm2ext/gtkmm2ext/fastmeter.h index 87cfd0b836..c59e85b674 100644 --- a/libs/gtkmm2ext/gtkmm2ext/fastmeter.h +++ b/libs/gtkmm2ext/gtkmm2ext/fastmeter.h @@ -22,7 +22,7 @@ #define __gtkmm2ext_fastmeter_h__ #include <gtkmm/drawingarea.h> -#include <gdkmm/pixmap.h> +#include <gdkmm/pixbuf.h> namespace Gtkmm2ext { @@ -52,23 +52,19 @@ class FastMeter : public Gtk::DrawingArea { protected: bool on_expose_event (GdkEventExpose*); void on_size_request (GtkRequisition*); - void on_realize (); private: static std::string h_image_path; static std::string v_image_path; - static Glib::RefPtr<Gdk::Pixmap> h_pixmap; - static Glib::RefPtr<Gdk::Bitmap> h_mask; + static Glib::RefPtr<Gdk::Pixbuf> h_pixbuf; 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::Pixbuf> v_pixbuf; static gint v_pixheight; static gint v_pixwidth; Orientation orientation; - Glib::RefPtr<Gdk::Pixmap> backing; GdkRectangle pixrect; gint request_width; gint request_height; |