diff options
| author | Tim Mayberry <mojofunk@gmail.com> | 2007-05-11 02:54:43 +0000 |
|---|---|---|
| committer | Tim Mayberry <mojofunk@gmail.com> | 2007-05-11 02:54:43 +0000 |
| commit | da285fc57dfda8c33ca0da967bcc40cd1e608ca4 (patch) | |
| tree | c55a976ea1858db97bdc292f2c5c7d53e906437e /gtk2_ardour/editor_canvas.cc | |
| parent | 809b64e41c7153ce07ad0226518efd72fdb8dab9 (diff) | |
Conditionally compile CMT additions, enabled by default.
git-svn-id: svn://localhost/ardour2/trunk@1833 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/editor_canvas.cc')
| -rw-r--r-- | gtk2_ardour/editor_canvas.cc | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc index 6b3b62b06e..704c87ca33 100644 --- a/gtk2_ardour/editor_canvas.cc +++ b/gtk2_ardour/editor_canvas.cc @@ -28,11 +28,9 @@ #include "waveview.h" #include "simplerect.h" #include "simpleline.h" -#include "imageframe.h" #include "waveview_p.h" #include "simplerect_p.h" #include "simpleline_p.h" -#include "imageframe_p.h" #include "canvas_impl.h" #include "editing.h" #include "rgb_macros.h" @@ -40,6 +38,11 @@ #include "time_axis_view.h" #include "audio_time_axis.h" +#ifdef WITH_CMT +#include "imageframe.h" +#include "imageframe_p.h" +#endif + #include "i18n.h" using namespace std; @@ -61,7 +64,10 @@ extern "C" GType gnome_canvas_simpleline_get_type(void); GType gnome_canvas_simplerect_get_type(void); GType gnome_canvas_waveview_get_type(void); + +#ifdef WITH_CMT GType gnome_canvas_imageframe_get_type(void); +#endif } @@ -72,14 +78,20 @@ static void ardour_canvas_type_init() Glib::wrap_register(gnome_canvas_simpleline_get_type(), &Gnome::Canvas::SimpleLine_Class::wrap_new); Glib::wrap_register(gnome_canvas_simplerect_get_type(), &Gnome::Canvas::SimpleRect_Class::wrap_new); Glib::wrap_register(gnome_canvas_waveview_get_type(), &Gnome::Canvas::WaveView_Class::wrap_new); + +#ifdef WITH_CMT Glib::wrap_register(gnome_canvas_imageframe_get_type(), &Gnome::Canvas::ImageFrame_Class::wrap_new); +#endif // Register the gtkmm gtypes: (void) Gnome::Canvas::WaveView::get_type(); (void) Gnome::Canvas::SimpleLine::get_type(); (void) Gnome::Canvas::SimpleRect::get_type(); + +#ifdef WITH_CMT (void) Gnome::Canvas::ImageFrame::get_type(); +#endif } void |