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:
David Robillard
parent
0e31c56591
commit
35fc31a1de
1550 changed files with 362440 additions and 73136 deletions
|
|
@ -45,16 +45,18 @@ namespace Gtk
|
|||
|
||||
MenuItem::MenuItem(Widget& widget)
|
||||
:
|
||||
Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations.
|
||||
Gtk::Item(Glib::ConstructParams(menuitem_class_.init(), (char*) 0))
|
||||
// Mark this class as non-derived to allow C++ vfuncs to be skipped.
|
||||
Glib::ObjectBase(0),
|
||||
Gtk::Item(Glib::ConstructParams(menuitem_class_.init()))
|
||||
{
|
||||
add(widget);
|
||||
}
|
||||
|
||||
MenuItem::MenuItem(const Glib::ustring& label, bool mnemonic)
|
||||
:
|
||||
Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations.
|
||||
Gtk::Item(Glib::ConstructParams(menuitem_class_.init(), (char*) 0))
|
||||
// Mark this class as non-derived to allow C++ vfuncs to be skipped.
|
||||
Glib::ObjectBase(0),
|
||||
Gtk::Item(Glib::ConstructParams(menuitem_class_.init()))
|
||||
{
|
||||
add_accel_label(label, mnemonic); /* Left-aligned label */
|
||||
}
|
||||
|
|
@ -140,7 +142,7 @@ static const Glib::SignalProxyInfo MenuItem_signal_activate_item_info =
|
|||
};
|
||||
|
||||
|
||||
static void MenuItem_signal_toggle_size_request_callback(GtkMenuItem* self, int* p0,void* data)
|
||||
static void MenuItem_signal_toggle_size_request_callback(GtkMenuItem* self, gint* p0,void* data)
|
||||
{
|
||||
using namespace Gtk;
|
||||
typedef sigc::slot< void,int* > SlotType;
|
||||
|
|
@ -153,7 +155,8 @@ static void MenuItem_signal_toggle_size_request_callback(GtkMenuItem* self, int*
|
|||
{
|
||||
#endif //GLIBMM_EXCEPTIONS_ENABLED
|
||||
if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
|
||||
(*static_cast<SlotType*>(slot))(p0);
|
||||
(*static_cast<SlotType*>(slot))(p0
|
||||
);
|
||||
#ifdef GLIBMM_EXCEPTIONS_ENABLED
|
||||
}
|
||||
catch(...)
|
||||
|
|
@ -266,7 +269,7 @@ void MenuItem_Class::class_init_function(void* g_class, void* class_data)
|
|||
#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
|
||||
void MenuItem_Class::activate_callback(GtkMenuItem* 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
|
||||
|
|
@ -274,36 +277,39 @@ void MenuItem_Class::activate_callback(GtkMenuItem* 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_activate();
|
||||
#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_activate();
|
||||
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->activate)
|
||||
(*base->activate)(self);
|
||||
}
|
||||
// Call the original underlying C function:
|
||||
if(base && base->activate)
|
||||
(*base->activate)(self);
|
||||
}
|
||||
void MenuItem_Class::activate_item_callback(GtkMenuItem* 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
|
||||
|
|
@ -311,36 +317,39 @@ void MenuItem_Class::activate_item_callback(GtkMenuItem* 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_activate_item();
|
||||
#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_activate_item();
|
||||
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->activate_item)
|
||||
(*base->activate_item)(self);
|
||||
}
|
||||
// Call the original underlying C function:
|
||||
if(base && base->activate_item)
|
||||
(*base->activate_item)(self);
|
||||
}
|
||||
void MenuItem_Class::toggle_size_request_callback(GtkMenuItem* self, int* p0)
|
||||
void MenuItem_Class::toggle_size_request_callback(GtkMenuItem* self, gint* p0)
|
||||
{
|
||||
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
|
||||
|
|
@ -348,36 +357,40 @@ void MenuItem_Class::toggle_size_request_callback(GtkMenuItem* self, int* p0)
|
|||
// 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_toggle_size_request(p0);
|
||||
#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_toggle_size_request(p0
|
||||
);
|
||||
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->toggle_size_request)
|
||||
(*base->toggle_size_request)(self, p0);
|
||||
}
|
||||
// Call the original underlying C function:
|
||||
if(base && base->toggle_size_request)
|
||||
(*base->toggle_size_request)(self, p0);
|
||||
}
|
||||
void MenuItem_Class::toggle_size_allocate_callback(GtkMenuItem* self, gint p0)
|
||||
{
|
||||
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
|
||||
|
|
@ -385,33 +398,36 @@ void MenuItem_Class::toggle_size_allocate_callback(GtkMenuItem* self, gint p0)
|
|||
// 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_toggle_size_allocate(p0
|
||||
#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_toggle_size_allocate(p0
|
||||
);
|
||||
#ifdef GLIBMM_EXCEPTIONS_ENABLED
|
||||
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->toggle_size_allocate)
|
||||
(*base->toggle_size_allocate)(self, p0);
|
||||
}
|
||||
// Call the original underlying C function:
|
||||
if(base && base->toggle_size_allocate)
|
||||
(*base->toggle_size_allocate)(self, p0);
|
||||
}
|
||||
#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
|
||||
|
||||
|
|
@ -457,7 +473,8 @@ GType MenuItem::get_base_type()
|
|||
|
||||
MenuItem::MenuItem()
|
||||
:
|
||||
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::Item(Glib::ConstructParams(menuitem_class_.init()))
|
||||
{
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue