mirror of
https://github.com/Ardour/ardour.git
synced 2025-12-15 19:16:40 +01:00
Upgrade gtkmm to 2.10.8, glibmm to 2.13.3 and add cairomm 1.2.4
git-svn-id: svn://localhost/ardour2/trunk@2630 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
parent
b01bdb7e70
commit
61c990dfba
647 changed files with 30833 additions and 7328 deletions
|
|
@ -1,5 +1,6 @@
|
|||
// Generated by gtkmmproc -- DO NOT MODIFY!
|
||||
|
||||
|
||||
#include <gtkmm/combobox.h>
|
||||
#include <gtkmm/private/combobox_p.h>
|
||||
|
||||
|
|
@ -24,7 +25,7 @@
|
|||
* License along with this library; if not, write to the Free
|
||||
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
*/
|
||||
|
||||
|
||||
#include <gtkmm/liststore.h>
|
||||
#include <gtkmm/cellrenderertext.h>
|
||||
#include <gtkmm/treeview_private.h> //For SignalProxy_RowSeparator.
|
||||
|
|
@ -74,13 +75,13 @@ TreeModel::const_iterator ComboBox::get_active() const
|
|||
|
||||
void ComboBox::set_row_separator_func(const SlotRowSeparator& slot)
|
||||
{
|
||||
//Create a signal proxy. A pointer to this will be passed through the callback's data parameter.
|
||||
//It will be deleted when SignalProxy_RowSeparator::gtk_callback_destroy() is called.
|
||||
TreeView_Private::SignalProxy_RowSeparator *const pSignalProxy = new TreeView_Private::SignalProxy_RowSeparator(slot);
|
||||
//Create a copy of the slot. A pointer to this will be passed through the callback's data parameter.
|
||||
//It will be deleted when SignalProxy_RowSeparator_gtk_callback_destroy() is called.
|
||||
SlotRowSeparator* slot_copy = new SlotRowSeparator(slot);
|
||||
|
||||
gtk_combo_box_set_row_separator_func(gobj(),
|
||||
&TreeView_Private::SignalProxy_RowSeparator::gtk_callback, pSignalProxy,
|
||||
&TreeView_Private::SignalProxy_RowSeparator::gtk_callback_destroy);
|
||||
&TreeView_Private::SignalProxy_RowSeparator_gtk_callback, slot_copy,
|
||||
&TreeView_Private::SignalProxy_RowSeparator_gtk_callback_destroy);
|
||||
}
|
||||
|
||||
void ComboBox::unset_row_separator_func()
|
||||
|
|
@ -94,13 +95,15 @@ void ComboBox::unset_row_separator_func()
|
|||
namespace
|
||||
{
|
||||
|
||||
const Glib::SignalProxyInfo ComboBox_signal_changed_info =
|
||||
|
||||
static const Glib::SignalProxyInfo ComboBox_signal_changed_info =
|
||||
{
|
||||
"changed",
|
||||
(GCallback) &Glib::SignalProxyNormal::slot0_void_callback,
|
||||
(GCallback) &Glib::SignalProxyNormal::slot0_void_callback
|
||||
};
|
||||
|
||||
|
||||
} // anonymous namespace
|
||||
|
||||
|
||||
|
|
@ -146,10 +149,18 @@ void ComboBox_Class::class_init_function(void* g_class, void* class_data)
|
|||
BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
|
||||
CppClassParent::class_init_function(klass, class_data);
|
||||
|
||||
#ifdef GLIBMM_VFUNCS_ENABLED
|
||||
#endif //GLIBMM_VFUNCS_ENABLED
|
||||
|
||||
#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
|
||||
klass->changed = &changed_callback;
|
||||
#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
|
||||
}
|
||||
|
||||
#ifdef GLIBMM_VFUNCS_ENABLED
|
||||
#endif //GLIBMM_VFUNCS_ENABLED
|
||||
|
||||
#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
|
||||
void ComboBox_Class::changed_callback(GtkComboBox* self)
|
||||
{
|
||||
CppObjectType *const obj = dynamic_cast<CppObjectType*>(
|
||||
|
|
@ -162,15 +173,19 @@ void ComboBox_Class::changed_callback(GtkComboBox* self)
|
|||
// being overridden:
|
||||
if(obj && obj->is_derived_())
|
||||
{
|
||||
#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_changed();
|
||||
#ifdef GLIBMM_EXCEPTIONS_ENABLED
|
||||
}
|
||||
catch(...)
|
||||
{
|
||||
Glib::exception_handlers_invoke();
|
||||
}
|
||||
#endif //GLIBMM_EXCEPTIONS_ENABLED
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -183,6 +198,7 @@ void ComboBox_Class::changed_callback(GtkComboBox* self)
|
|||
(*base->changed)(self);
|
||||
}
|
||||
}
|
||||
#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
|
||||
|
||||
|
||||
Glib::ObjectBase* ComboBox_Class::wrap_new(GObject* o)
|
||||
|
|
@ -240,7 +256,7 @@ ComboBox::ComboBox(const Glib::RefPtr<TreeModel>& model)
|
|||
|
||||
void ComboBox::set_wrap_width(int width)
|
||||
{
|
||||
gtk_combo_box_set_wrap_width(gobj(), width);
|
||||
gtk_combo_box_set_wrap_width(gobj(), width);
|
||||
}
|
||||
|
||||
int ComboBox::get_wrap_width() const
|
||||
|
|
@ -250,7 +266,7 @@ int ComboBox::get_wrap_width() const
|
|||
|
||||
void ComboBox::set_row_span_column(int row_span)
|
||||
{
|
||||
gtk_combo_box_set_row_span_column(gobj(), row_span);
|
||||
gtk_combo_box_set_row_span_column(gobj(), row_span);
|
||||
}
|
||||
|
||||
int ComboBox::get_row_span_column() const
|
||||
|
|
@ -260,7 +276,7 @@ int ComboBox::get_row_span_column() const
|
|||
|
||||
void ComboBox::set_column_span_column(int column_span)
|
||||
{
|
||||
gtk_combo_box_set_column_span_column(gobj(), column_span);
|
||||
gtk_combo_box_set_column_span_column(gobj(), column_span);
|
||||
}
|
||||
|
||||
int ComboBox::get_column_span_column() const
|
||||
|
|
@ -275,7 +291,17 @@ bool ComboBox::get_add_tearoffs() const
|
|||
|
||||
void ComboBox::set_add_tearoffs(bool add_tearoffs)
|
||||
{
|
||||
gtk_combo_box_set_add_tearoffs(gobj(), static_cast<int>(add_tearoffs));
|
||||
gtk_combo_box_set_add_tearoffs(gobj(), static_cast<int>(add_tearoffs));
|
||||
}
|
||||
|
||||
Glib::ustring ComboBox::get_title() const
|
||||
{
|
||||
return Glib::convert_const_gchar_ptr_to_ustring(gtk_combo_box_get_title(const_cast<GtkComboBox*>(gobj())));
|
||||
}
|
||||
|
||||
void ComboBox::set_title(const Glib::ustring& title)
|
||||
{
|
||||
gtk_combo_box_set_title(gobj(), title.c_str());
|
||||
}
|
||||
|
||||
bool ComboBox::get_focus_on_click() const
|
||||
|
|
@ -285,7 +311,7 @@ bool ComboBox::get_focus_on_click() const
|
|||
|
||||
void ComboBox::set_focus_on_click(bool focus_on_click)
|
||||
{
|
||||
gtk_combo_box_set_focus_on_click(gobj(), static_cast<int>(focus_on_click));
|
||||
gtk_combo_box_set_focus_on_click(gobj(), static_cast<int>(focus_on_click));
|
||||
}
|
||||
|
||||
int ComboBox::get_active_row_number() const
|
||||
|
|
@ -295,147 +321,196 @@ int ComboBox::get_active_row_number() const
|
|||
|
||||
void ComboBox::set_active(int index)
|
||||
{
|
||||
gtk_combo_box_set_active(gobj(), index);
|
||||
gtk_combo_box_set_active(gobj(), index);
|
||||
}
|
||||
|
||||
void ComboBox::set_active(const TreeModel::iterator& iter)
|
||||
{
|
||||
gtk_combo_box_set_active_iter(gobj(), const_cast<GtkTreeIter*>((iter).gobj()));
|
||||
gtk_combo_box_set_active_iter(gobj(), const_cast<GtkTreeIter*>((iter).gobj()));
|
||||
}
|
||||
|
||||
Glib::RefPtr<TreeModel> ComboBox::get_model()
|
||||
{
|
||||
|
||||
Glib::RefPtr<TreeModel> retvalue = Glib::wrap(gtk_combo_box_get_model(gobj()));
|
||||
|
||||
if(retvalue)
|
||||
retvalue->reference(); //The function does not do a ref for us.
|
||||
return retvalue;
|
||||
|
||||
}
|
||||
|
||||
Glib::RefPtr<const TreeModel> ComboBox::get_model() const
|
||||
{
|
||||
|
||||
Glib::RefPtr<const TreeModel> retvalue = Glib::wrap(gtk_combo_box_get_model(const_cast<GtkComboBox*>(gobj())));
|
||||
|
||||
if(retvalue)
|
||||
retvalue->reference(); //The function does not do a ref for us.
|
||||
return retvalue;
|
||||
return const_cast<ComboBox*>(this)->get_model();
|
||||
}
|
||||
|
||||
void ComboBox::set_model(const Glib::RefPtr<TreeModel>& model)
|
||||
{
|
||||
gtk_combo_box_set_model(gobj(), Glib::unwrap(model));
|
||||
gtk_combo_box_set_model(gobj(), Glib::unwrap(model));
|
||||
}
|
||||
|
||||
void ComboBox::popup()
|
||||
{
|
||||
gtk_combo_box_popup(gobj());
|
||||
gtk_combo_box_popup(gobj());
|
||||
}
|
||||
|
||||
void ComboBox::popdown()
|
||||
{
|
||||
gtk_combo_box_popdown(gobj());
|
||||
gtk_combo_box_popdown(gobj());
|
||||
}
|
||||
|
||||
#ifdef GTKMM_ATKMM_ENABLED
|
||||
Glib::RefPtr<Atk::Object> ComboBox::get_popup_accessible()
|
||||
{
|
||||
return Glib::wrap(gtk_combo_box_get_popup_accessible(gobj()));
|
||||
}
|
||||
|
||||
|
||||
#endif // GTKMM_ATKMM_ENABLED
|
||||
#ifdef GTKMM_ATKMM_ENABLED
|
||||
Glib::RefPtr<const Atk::Object> ComboBox::get_popup_accessible() const
|
||||
{
|
||||
return Glib::wrap(gtk_combo_box_get_popup_accessible(const_cast<GtkComboBox*>(gobj())));
|
||||
return const_cast<ComboBox*>(this)->get_popup_accessible();
|
||||
}
|
||||
|
||||
|
||||
#endif // GTKMM_ATKMM_ENABLED
|
||||
|
||||
|
||||
Glib::SignalProxy0< void > ComboBox::signal_changed()
|
||||
{
|
||||
return Glib::SignalProxy0< void >(this, &ComboBox_signal_changed_info);
|
||||
}
|
||||
|
||||
|
||||
#ifdef GLIBMM_PROPERTIES_ENABLED
|
||||
Glib::PropertyProxy< Glib::RefPtr<TreeModel> > ComboBox::property_model()
|
||||
{
|
||||
return Glib::PropertyProxy< Glib::RefPtr<TreeModel> >(this, "model");
|
||||
}
|
||||
#endif //GLIBMM_PROPERTIES_ENABLED
|
||||
|
||||
#ifdef GLIBMM_PROPERTIES_ENABLED
|
||||
Glib::PropertyProxy_ReadOnly< Glib::RefPtr<TreeModel> > ComboBox::property_model() const
|
||||
{
|
||||
return Glib::PropertyProxy_ReadOnly< Glib::RefPtr<TreeModel> >(this, "model");
|
||||
}
|
||||
#endif //GLIBMM_PROPERTIES_ENABLED
|
||||
|
||||
#ifdef GLIBMM_PROPERTIES_ENABLED
|
||||
Glib::PropertyProxy<int> ComboBox::property_wrap_width()
|
||||
{
|
||||
return Glib::PropertyProxy<int>(this, "wrap-width");
|
||||
}
|
||||
#endif //GLIBMM_PROPERTIES_ENABLED
|
||||
|
||||
#ifdef GLIBMM_PROPERTIES_ENABLED
|
||||
Glib::PropertyProxy_ReadOnly<int> ComboBox::property_wrap_width() const
|
||||
{
|
||||
return Glib::PropertyProxy_ReadOnly<int>(this, "wrap-width");
|
||||
}
|
||||
#endif //GLIBMM_PROPERTIES_ENABLED
|
||||
|
||||
#ifdef GLIBMM_PROPERTIES_ENABLED
|
||||
Glib::PropertyProxy<int> ComboBox::property_row_span_column()
|
||||
{
|
||||
return Glib::PropertyProxy<int>(this, "row-span-column");
|
||||
}
|
||||
#endif //GLIBMM_PROPERTIES_ENABLED
|
||||
|
||||
#ifdef GLIBMM_PROPERTIES_ENABLED
|
||||
Glib::PropertyProxy_ReadOnly<int> ComboBox::property_row_span_column() const
|
||||
{
|
||||
return Glib::PropertyProxy_ReadOnly<int>(this, "row-span-column");
|
||||
}
|
||||
#endif //GLIBMM_PROPERTIES_ENABLED
|
||||
|
||||
#ifdef GLIBMM_PROPERTIES_ENABLED
|
||||
Glib::PropertyProxy<int> ComboBox::property_column_span_column()
|
||||
{
|
||||
return Glib::PropertyProxy<int>(this, "column-span-column");
|
||||
}
|
||||
#endif //GLIBMM_PROPERTIES_ENABLED
|
||||
|
||||
#ifdef GLIBMM_PROPERTIES_ENABLED
|
||||
Glib::PropertyProxy_ReadOnly<int> ComboBox::property_column_span_column() const
|
||||
{
|
||||
return Glib::PropertyProxy_ReadOnly<int>(this, "column-span-column");
|
||||
}
|
||||
#endif //GLIBMM_PROPERTIES_ENABLED
|
||||
|
||||
#ifdef GLIBMM_PROPERTIES_ENABLED
|
||||
Glib::PropertyProxy<int> ComboBox::property_active()
|
||||
{
|
||||
return Glib::PropertyProxy<int>(this, "active");
|
||||
}
|
||||
#endif //GLIBMM_PROPERTIES_ENABLED
|
||||
|
||||
#ifdef GLIBMM_PROPERTIES_ENABLED
|
||||
Glib::PropertyProxy_ReadOnly<int> ComboBox::property_active() const
|
||||
{
|
||||
return Glib::PropertyProxy_ReadOnly<int>(this, "active");
|
||||
}
|
||||
#endif //GLIBMM_PROPERTIES_ENABLED
|
||||
|
||||
#ifdef GLIBMM_PROPERTIES_ENABLED
|
||||
Glib::PropertyProxy<bool> ComboBox::property_add_tearoffs()
|
||||
{
|
||||
return Glib::PropertyProxy<bool>(this, "add-tearoffs");
|
||||
}
|
||||
#endif //GLIBMM_PROPERTIES_ENABLED
|
||||
|
||||
#ifdef GLIBMM_PROPERTIES_ENABLED
|
||||
Glib::PropertyProxy_ReadOnly<bool> ComboBox::property_add_tearoffs() const
|
||||
{
|
||||
return Glib::PropertyProxy_ReadOnly<bool>(this, "add-tearoffs");
|
||||
}
|
||||
#endif //GLIBMM_PROPERTIES_ENABLED
|
||||
|
||||
#ifdef GLIBMM_PROPERTIES_ENABLED
|
||||
Glib::PropertyProxy<bool> ComboBox::property_has_frame()
|
||||
{
|
||||
return Glib::PropertyProxy<bool>(this, "has-frame");
|
||||
}
|
||||
#endif //GLIBMM_PROPERTIES_ENABLED
|
||||
|
||||
#ifdef GLIBMM_PROPERTIES_ENABLED
|
||||
Glib::PropertyProxy_ReadOnly<bool> ComboBox::property_has_frame() const
|
||||
{
|
||||
return Glib::PropertyProxy_ReadOnly<bool>(this, "has-frame");
|
||||
}
|
||||
#endif //GLIBMM_PROPERTIES_ENABLED
|
||||
|
||||
#ifdef GLIBMM_PROPERTIES_ENABLED
|
||||
Glib::PropertyProxy<bool> ComboBox::property_focus_on_click()
|
||||
{
|
||||
return Glib::PropertyProxy<bool>(this, "focus-on-click");
|
||||
}
|
||||
#endif //GLIBMM_PROPERTIES_ENABLED
|
||||
|
||||
#ifdef GLIBMM_PROPERTIES_ENABLED
|
||||
Glib::PropertyProxy_ReadOnly<bool> ComboBox::property_focus_on_click() const
|
||||
{
|
||||
return Glib::PropertyProxy_ReadOnly<bool>(this, "focus-on-click");
|
||||
}
|
||||
#endif //GLIBMM_PROPERTIES_ENABLED
|
||||
|
||||
#ifdef GLIBMM_PROPERTIES_ENABLED
|
||||
Glib::PropertyProxy<Glib::ustring> ComboBox::property_tearoff_title()
|
||||
{
|
||||
return Glib::PropertyProxy<Glib::ustring>(this, "tearoff-title");
|
||||
}
|
||||
#endif //GLIBMM_PROPERTIES_ENABLED
|
||||
|
||||
#ifdef GLIBMM_PROPERTIES_ENABLED
|
||||
Glib::PropertyProxy_ReadOnly<Glib::ustring> ComboBox::property_tearoff_title() const
|
||||
{
|
||||
return Glib::PropertyProxy_ReadOnly<Glib::ustring>(this, "tearoff-title");
|
||||
}
|
||||
#endif //GLIBMM_PROPERTIES_ENABLED
|
||||
|
||||
|
||||
#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
|
||||
void Gtk::ComboBox::on_changed()
|
||||
{
|
||||
BaseClassType *const base = static_cast<BaseClassType*>(
|
||||
|
|
@ -445,6 +520,10 @@ void Gtk::ComboBox::on_changed()
|
|||
if(base && base->changed)
|
||||
(*base->changed)(gobj());
|
||||
}
|
||||
#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
|
||||
|
||||
#ifdef GLIBMM_VFUNCS_ENABLED
|
||||
#endif //GLIBMM_VFUNCS_ENABLED
|
||||
|
||||
|
||||
} // namespace Gtk
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue