AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Don't export gtk_get_option_group

Browse Source 
We want to get rid of commandline option handling in GTK+.
This is a step in that direction.
This commit is contained in:
Matthias Clasen 2016-12-27 18:45:53 -05:00
parent 42fd5a0b8b
commit 63d6e2d8e2
4 changed files with 1 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtk/gtk-launch.c
View File

@ -79,8 +79,6 @@ main (int argc, char *argv[])
"optionally passing one or more URIs as arguments.");
g_option_context_set_summary (context, summary);
g_option_context_add_main_entries (context, entries, GETTEXT_PACKAGE);
g_option_context_add_group (context, gtk_get_option_group (FALSE));
g_option_context_parse (context, &argc, &argv, &error);
g_option_context_free (context);

2
gtk/gtkapplication.c
View File

@ -327,8 +327,6 @@ gtk_application_local_command_line (GApplication *application,
gchar ***arguments,
gint *exit_status)
{
g_application_add_option_group (application, gtk_get_option_group (FALSE));
return G_APPLICATION_CLASS (gtk_application_parent_class)->local_command_line (application, arguments, exit_status);
}

19
gtk/gtkmain.c
View File

@ -864,24 +864,7 @@ gtk_simulate_touchscreen (void)
return test_touchscreen > 0 || (gtk_get_debug_flags () & GTK_DEBUG_TOUCHSCREEN) != 0;
}
/**
* gtk_get_option_group:
* @open_default_display: whether to open the default display
* when parsing the commandline arguments
*
* Returns a #GOptionGroup for the commandline arguments recognized
* by GTK+ and GDK.
*
* You should add this group to your #GOptionContext
* with g_option_context_add_group(), if you are using
* g_option_context_parse() to parse your commandline arguments.
*
* Returns: (transfer full): a #GOptionGroup for the commandline
* arguments recognized by GTK+
*
* Since: 2.6
*/
GOptionGroup *
static GOptionGroup *
gtk_get_option_group (gboolean open_default_display)
{
GOptionGroup *group;

3
gtk/gtkmain.h
View File

@ -80,9 +80,6 @@ GDK_AVAILABLE_IN_ALL
gboolean gtk_init_check (int *argc,
char ***argv);
GDK_AVAILABLE_IN_ALL
GOptionGroup *gtk_get_option_group (gboolean open_default_display);
#ifdef G_OS_WIN32
/* Variants that are used to check for correct struct packing