Savannah Git Hosting - mdk.git/commitdiff

diff --git a/mixgtk/mixgtk_device.c b/mixgtk/mixgtk_device.c

index 6496851d21048b53d1b152252cc6263fcbe06c43..c1abd0bcdf6f72e9f5325674be2171652f592f83 100644 (file)

--- a/mixgtk/mixgtk_device.c

+++ b/mixgtk/mixgtk_device.c

/* -*-c-*- ---------------- mixgtk_device.c :

* actual types for mixgtk devices

* ------------------------------------------------------------------

- * Copyright (C) 2001, 2002, 2004, 2005, 2006, 2007, 2008, 2019 Free Software Foundation, Inc.

+ * Copyright (C) 2001, 2002, 2004, 2005, 2006, 2007, 2008, 2019, 2020 Free Software Foundation, Inc.

*

* This program is free software; you can redistribute it and/or modify

* it under the terms of the GNU General Public License as published by

input_dlg_ = mixgtk_widget_factory_get_dialog (MIXGTK_INPUT_DIALOG);

g_assert (input_dlg_);

input_dlg_entry_ =

- GTK_ENTRY (mixgtk_widget_factory_get_child_by_name ("input_entry"));

+ GTK_ENTRY (mixgtk_widget_factory_get_by_name ("input_entry"));

g_assert (input_dlg_entry_);

GtkEntryCompletion *completion = gtk_entry_completion_new ();

input_list_ = gtk_list_store_new (1, G_TYPE_STRING);

{

devdlg_ = mixgtk_widget_factory_get_dialog (MIXGTK_DEVFORM_DIALOG);

g_assert (devdlg_);

- dtoggle_ = mixgtk_widget_factory_get_child_by_name ("decradio");

+ dtoggle_ = mixgtk_widget_factory_get_by_name ("decradio");

g_assert (dtoggle_);

- wtoggle_ = mixgtk_widget_factory_get_child_by_name ("wordradio");

+ wtoggle_ = mixgtk_widget_factory_get_by_name ("wordradio");

g_assert (wtoggle_);

- combo_ = mixgtk_widget_factory_get_child_by_name ("dev_combo");

+ combo_ = mixgtk_widget_factory_get_by_name ("dev_combo");

g_assert (combo_);

gtk_editable_set_editable (GTK_EDITABLE (combo_child_ ()), FALSE);

}

devdir_dlg_ = mixgtk_widget_factory_get_dialog (MIXGTK_DEVDIR_DIALOG);

g_assert (devdir_dlg_);

devdir_entry_ =

- GTK_ENTRY (mixgtk_widget_factory_get_child_by_name (DEVDIR_ENTRY_NAME));

+ GTK_ENTRY (mixgtk_widget_factory_get_by_name (DEVDIR_ENTRY_NAME));

g_assert (devdir_entry_);

}

gtk_entry_set_text (devdir_entry_, mix_device_get_dir ());

diff --git a/mixgtk/mixgtk_external.c b/mixgtk/mixgtk_external.c

index 35b902eebde04d004cacbcbba1af5699d8b60ff0..bf04c2b23e9983cb742aa8d93f16c720bb23919a 100644 (file)

--- a/mixgtk/mixgtk_external.c

+++ b/mixgtk/mixgtk_external.c

/* -*-c-*- -------------- mixgtk_cmd_dispatcher.c :

* Implementation of the functions declared in mixgtk_external.h

* ------------------------------------------------------------------

- * Copyright (C) 2006, 2007, 2008, 2009, 2019 Free Software Foundation, Inc.

+ * Copyright (C) 2006, 2007, 2008, 2009, 2019, 2020 Free Software Foundation, Inc.

*

* This program is free software; you can redistribute it and/or modify

* it under the terms of the GNU General Public License as published by

for (k = 0; k < ext_wdg_no; ++k)

{

- ext_wdg_[k] = mixgtk_widget_factory_get_child_by_name (ext_wdg_names_[k]);

+ ext_wdg_[k] = mixgtk_widget_factory_get_by_name (ext_wdg_names_[k]);

g_assert (ext_wdg_[k]);

}

diff --git a/mixgtk/mixgtk_input.c b/mixgtk/mixgtk_input.c

index 31179ad85724b5c6e19f10b825f36ca8b74ad12a..944392a9a1785ac6bf74bb488e2fb016436dc174 100644 (file)

--- a/mixgtk/mixgtk_input.c

+++ b/mixgtk/mixgtk_input.c

/* -*-c-*- -------------- mixgtk_input.c :

* Implementation of the functions declared in mixgtk_input.h

* ------------------------------------------------------------------

- * Copyright (C) 2001, 2002, 2004, 2006, 2007, 2019 Free Software Foundation, Inc.

+ * Copyright (C) 2001, 2002, 2004, 2006, 2007, 2019, 2020 Free Software Foundation, Inc.

*

* This program is free software; you can redistribute it and/or modify

* it under the terms of the GNU General Public License as published by

g_assert (dialog_ != NULL);

for (k = 0; k < SIZE_; ++k)

{

- childs_[k] = mixgtk_widget_factory_get_child_by_name (WGT_NAMES_[k]);

+ childs_[k] = mixgtk_widget_factory_get_by_name (WGT_NAMES_[k]);

g_assert (childs_[k] != NULL);

}

}

diff --git a/mixgtk/mixgtk_mixal.c b/mixgtk/mixgtk_mixal.c

index 5f8597bc78c1a4473d994499613554cda0639597..af99d5b651016c84a0282e60a3a6c8c8d511faf5 100644 (file)

--- a/mixgtk/mixgtk_mixal.c

+++ b/mixgtk/mixgtk_mixal.c

/* -*-c-*- -------------- mixgtk_mixal.c :

* Implementation of the functions declared in mixgtk_mixal.h

* ------------------------------------------------------------------

- * Copyright (C) 2001, 2002, 2004, 2006, 2007, 2019 Free Software Foundation, Inc.

+ * Copyright (C) 2001, 2002, 2004, 2006, 2007, 2019, 2020 Free Software Foundation, Inc.

*

* This program is free software; you can redistribute it and/or modify

* it under the terms of the GNU General Public License as published by

symbols_dlg_ = mixgtk_widget_factory_get_dialog (MIXGTK_SYMBOLS_DIALOG);

g_assert (symbols_dlg_);

symbols_view_ = GTK_TREE_VIEW

- (mixgtk_widget_factory_get_child_by_name (SYMBOLS_VIEW_NAME_));

+ (mixgtk_widget_factory_get_by_name (SYMBOLS_VIEW_NAME_));

g_assert (symbols_view_);

mixgtk_fontsel_set_font (MIX_FONT_SYMBOLS, GTK_WIDGET (symbols_view_));

diff --git a/mixgtk/mixgtk_widgets.c b/mixgtk/mixgtk_widgets.c

index 7cc1bb96320c3acc84f526f5cebfb8e3c69a2012..a5bd5e5ff22ad1d1ba6c9084cc8019f7caaedb6c 100644 (file)

--- a/mixgtk/mixgtk_widgets.c

+++ b/mixgtk/mixgtk_widgets.c

/* -*-c-*- -------------- mixgtk_widgets.c :

* Implementation of the functions declared in mixgtk_widgets.h

* ------------------------------------------------------------------

- * Copyright (C) 2001, 2004, 2006, 2007, 2014, 2019 Free Software Foundation, Inc.

+ * Copyright (C) 2001, 2004, 2006, 2007, 2014, 2019, 2020 Free Software Foundation, Inc.

*

* This program is free software; you can redistribute it and/or modify

* it under the terms of the GNU General Public License as published by

{

g_assert ((long)widget < WIDGET_NO_);

- return mixgtk_widget_factory_get_child_by_name (names_[widget]);

+ return mixgtk_widget_factory_get_by_name (names_[widget]);

}

}

GtkWidget *

-mixgtk_widget_factory_get_child_by_name (const gchar *name)

+mixgtk_widget_factory_get_by_name (const gchar *name)

{

g_assert (name != NULL);

GtkWidget *w = GTK_WIDGET (gtk_builder_get_object (builder_, name));

diff --git a/mixgtk/mixgtk_widgets.h b/mixgtk/mixgtk_widgets.h

index 7c5a42dc5bd578fd4bca7479f1aa7ce9525d82d0..9263583f05d11e903aecd29a8133d4c2a82735dc 100644 (file)

--- a/mixgtk/mixgtk_widgets.h

+++ b/mixgtk/mixgtk_widgets.h

/* -*-c-*- ---------------- mixgtk_widgets.h :

* glade-based factory of mixvm widgets

* ------------------------------------------------------------------

- * Copyright (C) 2001, 2004, 2006, 2007, 2019 Free Software Foundation, Inc.

+ * Copyright (C) 2001, 2004, 2006, 2007, 2019, 2020 Free Software Foundation, Inc.

*

* This program is free software; you can redistribute it and/or modify

* it under the terms of the GNU General Public License as published by

/* Get a widget by name */

extern GtkWidget *

-mixgtk_widget_factory_get_child_by_name (const gchar *name);

+mixgtk_widget_factory_get_by_name (const gchar *name);

#endif /* MIXGTK_WIDGETS_H */

diff --git a/mixgtk/mixgtk_wm.c b/mixgtk/mixgtk_wm.c

index 24af5684860598a3f7e7a2a224dfc4305d2aeb84..f1cf8d77d295b5b10302c83ce40ec44ce54ea666 100644 (file)

--- a/mixgtk/mixgtk_wm.c

+++ b/mixgtk/mixgtk_wm.c

infos_[k].menu =

GTK_CHECK_MENU_ITEM

- (mixgtk_widget_factory_get_child_by_name (infos_[k].menu_name));

+ (mixgtk_widget_factory_get_by_name (infos_[k].menu_name));

g_assert (infos_[k].menu != NULL);

txt = mixgtk_config_get (infos_[k].config_key);

infos_[k].detached = txt && !g_ascii_strcasecmp (txt, DETACH_YES_);

gint style = mixgtk_config_tb_style ();

tb_menu_ = GTK_CHECK_MENU_ITEM

- (mixgtk_widget_factory_get_child_by_name (TB_MENU_NAME_));

+ (mixgtk_widget_factory_get_by_name (TB_MENU_NAME_));

g_assert (tb_menu_ != NULL);

gtk_check_menu_item_set_active (tb_menu_, mixgtk_config_show_toolbars ());

for (k = 0; k < 4; ++k)

{

- GtkWidget *item = mixgtk_widget_factory_get_child_by_name (names[k]);

+ GtkWidget *item = mixgtk_widget_factory_get_by_name (names[k]);

g_signal_connect (G_OBJECT (item),

"activate",

G_CALLBACK (on_tb_style_), GUINT_TO_POINTER (k));

gint k;

GtkToolbar *tb =

- GTK_TOOLBAR (mixgtk_widget_factory_get_child_by_name (TB_NAME));

+ GTK_TOOLBAR (mixgtk_widget_factory_get_by_name (TB_NAME));

gtk_toolbar_set_style (tb, style);

for (k = 0; k < INF_NO_; ++k)

{

GtkToolbar *tb = GTK_TOOLBAR

- (mixgtk_widget_factory_get_child_by_name (infos_[k].toolbar_name));

+ (mixgtk_widget_factory_get_by_name (infos_[k].toolbar_name));

gtk_toolbar_set_style (tb, style);

}

}

{

gint k;

- GtkWidget *handle =

- mixgtk_widget_factory_get_child_by_name (TB_NAME);

+ GtkWidget *handle = mixgtk_widget_factory_get_by_name (TB_NAME);

if (show)

gtk_widget_show (handle);

for (k = 0; k < INF_NO_; ++k)

{

GtkWidget *hd =

- mixgtk_widget_factory_get_child_by_name (infos_[k].toolbar_name);

+ mixgtk_widget_factory_get_by_name (infos_[k].toolbar_name);

if (show) gtk_widget_show (hd); else gtk_widget_hide (hd);

}

#define AUTOSAVE_ITEM_ "save_on_exit"

GtkCheckMenuItem *item = GTK_CHECK_MENU_ITEM

- (mixgtk_widget_factory_get_child_by_name (AUTOSAVE_ITEM_));

+ (mixgtk_widget_factory_get_by_name (AUTOSAVE_ITEM_));

if (item)

{

gtk_check_menu_item_set_active (item, mixgtk_config_is_autosave ());

GtkWidget *label;

about_ = mixgtk_widget_factory_get_dialog (MIXGTK_ABOUT_DIALOG);

g_assert (about_ != NULL);

- label = mixgtk_widget_factory_get_child_by_name (VERSION_LABEL_);

+ label = mixgtk_widget_factory_get_by_name (VERSION_LABEL_);

g_assert (label != NULL);

gtk_label_set_text (GTK_LABEL (label), VERSION);

gtk_widget_show (label);