diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-10-09 14:00:42 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-10-09 14:00:42 -0400 |
| commit | 2a6a16f980ff9181b138f7a30aedfbde4426a591 (patch) | |
| tree | d86752508bbd033be18301796e7d0c571a4fe1c0 /libs/gtkmm2ext/gtkmm2ext | |
| parent | 66aa6dfc8ecdb7591768bc45866a8c2b0d77e767 (diff) | |
| parent | 465b800d8b7dc0d9e0f92a16c6fcae29d2bbd544 (diff) | |
merge with master, fixing conflicts in 3 wscript files
Diffstat (limited to 'libs/gtkmm2ext/gtkmm2ext')
| -rw-r--r-- | libs/gtkmm2ext/gtkmm2ext/gtk_ui.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libs/gtkmm2ext/gtkmm2ext/gtk_ui.h b/libs/gtkmm2ext/gtkmm2ext/gtk_ui.h index a758ad78f4..9fa9e99fe8 100644 --- a/libs/gtkmm2ext/gtkmm2ext/gtk_ui.h +++ b/libs/gtkmm2ext/gtkmm2ext/gtk_ui.h @@ -156,8 +156,7 @@ class UI : public AbstractUI<UIRequest> stopping just after we return from it (at the top level) */ - sigc::signal<void> starting; - sigc::signal<void> stopping; + virtual int starting() = 0; sigc::signal<void> theme_changed; |