mirror of
https://github.com/Ardour/ardour.git
synced 2025-12-15 19:16:40 +01:00
Remove ancient/unused flowcanvas and libglademm from repository.
Update libraries to latest stable released version (except gnomecanvasmm, which is strangely packaged...). Fixes building (at least here). git-svn-id: svn://localhost/ardour2/trunk@2790 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
parent
0e31c56591
commit
35fc31a1de
1550 changed files with 362440 additions and 73136 deletions
|
|
@ -118,7 +118,7 @@ void ToggleToolButton_Class::class_init_function(void* g_class, void* class_data
|
|||
#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
|
||||
void ToggleToolButton_Class::toggled_callback(GtkToggleToolButton* self)
|
||||
{
|
||||
CppObjectType *const obj = dynamic_cast<CppObjectType*>(
|
||||
Glib::ObjectBase *const obj_base = static_cast<Glib::ObjectBase*>(
|
||||
Glib::ObjectBase::_get_current_wrapper((GObject*)self));
|
||||
|
||||
// Non-gtkmmproc-generated custom classes implicitly call the default
|
||||
|
|
@ -126,32 +126,35 @@ void ToggleToolButton_Class::toggled_callback(GtkToggleToolButton* self)
|
|||
// generated classes can use this optimisation, which avoids the unnecessary
|
||||
// parameter conversions if there is no possibility of the virtual function
|
||||
// being overridden:
|
||||
if(obj && obj->is_derived_())
|
||||
if(obj_base && obj_base->is_derived_())
|
||||
{
|
||||
#ifdef GLIBMM_EXCEPTIONS_ENABLED
|
||||
try // Trap C++ exceptions which would normally be lost because this is a C callback.
|
||||
CppObjectType *const obj = dynamic_cast<CppObjectType* const>(obj_base);
|
||||
if(obj) // This can be NULL during destruction.
|
||||
{
|
||||
#endif //GLIBMM_EXCEPTIONS_ENABLED
|
||||
// Call the virtual member method, which derived classes might override.
|
||||
obj->on_toggled();
|
||||
#ifdef GLIBMM_EXCEPTIONS_ENABLED
|
||||
#ifdef GLIBMM_EXCEPTIONS_ENABLED
|
||||
try // Trap C++ exceptions which would normally be lost because this is a C callback.
|
||||
{
|
||||
#endif //GLIBMM_EXCEPTIONS_ENABLED
|
||||
// Call the virtual member method, which derived classes might override.
|
||||
obj->on_toggled();
|
||||
return;
|
||||
#ifdef GLIBMM_EXCEPTIONS_ENABLED
|
||||
}
|
||||
catch(...)
|
||||
{
|
||||
Glib::exception_handlers_invoke();
|
||||
}
|
||||
#endif //GLIBMM_EXCEPTIONS_ENABLED
|
||||
}
|
||||
catch(...)
|
||||
{
|
||||
Glib::exception_handlers_invoke();
|
||||
}
|
||||
#endif //GLIBMM_EXCEPTIONS_ENABLED
|
||||
}
|
||||
else
|
||||
{
|
||||
BaseClassType *const base = static_cast<BaseClassType*>(
|
||||
|
||||
BaseClassType *const base = static_cast<BaseClassType*>(
|
||||
g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class).
|
||||
);
|
||||
|
||||
// Call the original underlying C function:
|
||||
if(base && base->toggled)
|
||||
(*base->toggled)(self);
|
||||
}
|
||||
// Call the original underlying C function:
|
||||
if(base && base->toggled)
|
||||
(*base->toggled)(self);
|
||||
}
|
||||
#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
|
||||
|
||||
|
|
@ -197,15 +200,17 @@ GType ToggleToolButton::get_base_type()
|
|||
|
||||
ToggleToolButton::ToggleToolButton()
|
||||
:
|
||||
Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations.
|
||||
// Mark this class as non-derived to allow C++ vfuncs to be skipped.
|
||||
Glib::ObjectBase(0),
|
||||
Gtk::ToolButton(Glib::ConstructParams(toggletoolbutton_class_.init()))
|
||||
{
|
||||
}
|
||||
|
||||
ToggleToolButton::ToggleToolButton(const Gtk::StockID& stock_id)
|
||||
:
|
||||
Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations.
|
||||
Gtk::ToolButton(Glib::ConstructParams(toggletoolbutton_class_.init(), "stock_id", (stock_id).get_c_str(), (char*) 0))
|
||||
// Mark this class as non-derived to allow C++ vfuncs to be skipped.
|
||||
Glib::ObjectBase(0),
|
||||
Gtk::ToolButton(Glib::ConstructParams(toggletoolbutton_class_.init(), "stock_id", (stock_id).get_c_str(), static_cast<char*>(0)))
|
||||
{
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue