diff options
| author | Taybin Rutkin <taybin@taybin.com> | 2007-02-01 13:17:04 +0000 |
|---|---|---|
| committer | Taybin Rutkin <taybin@taybin.com> | 2007-02-01 13:17:04 +0000 |
| commit | b05c4dc540d0f9f97975a0d6ff9c3cd8a569b980 (patch) | |
| tree | c39366f0c328f2c540ecc46ec42604cf547269d0 | |
| parent | 43a063d8c6142f482ea425cfebca1202a501668b (diff) | |
Moved GroupButtons to gtkmm2ext
Fixed stacktrace.cc compilation.
git-svn-id: svn://localhost/ardour2/trunk@1403 d708f5d6-7413-0410-9779-e7cbd77b26cf
| -rw-r--r-- | gtk2_ardour/SConscript | 1 | ||||
| -rw-r--r-- | gtk2_ardour/ardour.bindings | 1 | ||||
| -rw-r--r-- | gtk2_ardour/editor.cc | 3 | ||||
| -rw-r--r-- | libs/gtkmm2ext/SConscript | 1 | ||||
| -rw-r--r-- | libs/gtkmm2ext/grouped_buttons.cc (renamed from gtk2_ardour/grouped_buttons.cc) | 2 | ||||
| -rw-r--r-- | libs/gtkmm2ext/gtkmm2ext/grouped_buttons.h (renamed from gtk2_ardour/grouped_buttons.h) | 0 | ||||
| -rw-r--r-- | libs/pbd/stacktrace.cc | 2 |
7 files changed, 4 insertions, 6 deletions
diff --git a/gtk2_ardour/SConscript b/gtk2_ardour/SConscript index 9a43258196..5d15980b99 100644 --- a/gtk2_ardour/SConscript +++ b/gtk2_ardour/SConscript @@ -145,7 +145,6 @@ export_range_markers_dialog.cc gain_automation_time_axis.cc gain_meter.cc ghostregion.cc -grouped_buttons.cc gtk-custom-hruler.c gtk-custom-ruler.c imageframe.cc diff --git a/gtk2_ardour/ardour.bindings b/gtk2_ardour/ardour.bindings index 537ae9c60d..58ad927a82 100644 --- a/gtk2_ardour/ardour.bindings +++ b/gtk2_ardour/ardour.bindings @@ -112,7 +112,6 @@ (gtk_accel_path "<Actions>/Editor/extend-range-to-end-of-region" "rightanglebracket") (gtk_accel_path "<Actions>/Editor/scroll-backward" "leftarrow") (gtk_accel_path "<Actions>/Editor/start-range" "<Control>KP_Down") -; (gtk_accel_path "<Actions>/Editor/ToggleTranzportSurface" "") ; (gtk_accel_path "<Actions>/ShuttleActions/SetShuttleUnitsSemitones" "") ; (gtk_accel_path "<Actions>/JACK/JACKLatency128" "") ; (gtk_accel_path "<Actions>/Snap/snap-to-beat" "") diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index 6742fb0465..cf0a5baabf 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -35,6 +35,7 @@ #include <gdkmm/color.h> #include <gdkmm/bitmap.h> +#include <gtkmm2ext/grouped_buttons.h> #include <gtkmm2ext/gtk_ui.h> #include <gtkmm2ext/tearoff.h> #include <gtkmm2ext/utils.h> @@ -54,7 +55,6 @@ #include "ardour_ui.h" #include "editor.h" -#include "grouped_buttons.h" #include "keyboard.h" #include "marker.h" #include "playlist_selector.h" @@ -69,7 +69,6 @@ #include "editing.h" #include "public_editor.h" #include "crossfade_edit.h" -#include "audio_time_axis.h" #include "canvas_impl.h" #include "actions.h" #include "gui_thread.h" diff --git a/libs/gtkmm2ext/SConscript b/libs/gtkmm2ext/SConscript index 9c7511c85d..579ba5dd8e 100644 --- a/libs/gtkmm2ext/SConscript +++ b/libs/gtkmm2ext/SConscript @@ -40,6 +40,7 @@ click_box.cc dndtreeview.cc fastmeter.cc focus_entry.cc +grouped_buttons.cc gtk_ui.cc hexentry.cc idle_adjustment.cc diff --git a/gtk2_ardour/grouped_buttons.cc b/libs/gtkmm2ext/grouped_buttons.cc index 64c58d8197..b16b983d02 100644 --- a/gtk2_ardour/grouped_buttons.cc +++ b/libs/gtkmm2ext/grouped_buttons.cc @@ -20,7 +20,7 @@ #include <gtkmm.h> -#include "grouped_buttons.h" +#include <gtkmm2ext/grouped_buttons.h> using namespace std; diff --git a/gtk2_ardour/grouped_buttons.h b/libs/gtkmm2ext/gtkmm2ext/grouped_buttons.h index 2bb067fcd0..2bb067fcd0 100644 --- a/gtk2_ardour/grouped_buttons.h +++ b/libs/gtkmm2ext/gtkmm2ext/grouped_buttons.h diff --git a/libs/pbd/stacktrace.cc b/libs/pbd/stacktrace.cc index 82a78c6fe2..6495009765 100644 --- a/libs/pbd/stacktrace.cc +++ b/libs/pbd/stacktrace.cc @@ -42,7 +42,7 @@ PBD::stacktrace (std::ostream& out, int levels) void c_stacktrace () { - PBD::stacktrace (cout); + PBD::stacktrace (std::cout); } #endif /* HAVE_EXECINFO */ |