AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-14 06:10:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'matthiasc/for-master' into 'master'

Browse Source 
Matthiasc/for master

See merge request GNOME/gtk!2141
This commit is contained in:
Matthias Clasen 2020-06-23 19:10:54 +00:00
commit a3f4caa291
7 changed files with 327 additions and 345 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gtk/gtkappchooserbutton.c
View File

@ -61,6 +61,7 @@
#include "gtkdialog.h"
#include "gtkintl.h"
#include "gtkmarshalers.h"
#include "gtkliststore.h"
enum {
PROP_SHOW_DIALOG_ITEM = 1,

1
gtk/gtkcomboboxtext.c
View File

@ -24,6 +24,7 @@
#include "gtkcelllayout.h"
#include "gtkbuildable.h"
#include "gtkbuilderprivate.h"
#include "gtkliststore.h"
#include <string.h>

626
gtk/gtkentrycompletion.c
View File

File diff suppressed because it is too large Load Diff

41
gtk/gtkentryprivate.h
View File

@ -31,33 +31,11 @@
G_BEGIN_DECLS
typedef struct _GtkEntryCompletionClass GtkEntryCompletionClass;
typedef struct _GtkEntryCompletionPrivate GtkEntryCompletionPrivate;
struct _GtkEntryCompletion
{
GObject parent_instance;
/*< private >*/
GtkEntryCompletionPrivate *priv;
};
struct _GtkEntryCompletionClass
{
GObjectClass parent_class;
gboolean (* match_selected) (GtkEntryCompletion *completion,
GtkTreeModel *model,
GtkTreeIter *iter);
gboolean (* insert_prefix) (GtkEntryCompletion *completion,
const gchar *prefix);
gboolean (* cursor_on_match) (GtkEntryCompletion *completion,
GtkTreeModel *model,
GtkTreeIter *iter);
void (* no_matches) (GtkEntryCompletion *completion);
};
struct _GtkEntryCompletionPrivate
{
GtkWidget *entry;
GtkWidget *tree_view;
@ -101,13 +79,30 @@ struct _GtkEntryCompletionPrivate
GSource *check_completion_idle;
};
struct _GtkEntryCompletionClass
{
GObjectClass parent_class;
gboolean (* match_selected) (GtkEntryCompletion *completion,
GtkTreeModel *model,
GtkTreeIter *iter);
void (* action_activated) (GtkEntryCompletion *completion,
gint index_);
gboolean (* insert_prefix) (GtkEntryCompletion *completion,
const gchar *prefix);
gboolean (* cursor_on_match) (GtkEntryCompletion *completion,
GtkTreeModel *model,
GtkTreeIter *iter);
void (* no_matches) (GtkEntryCompletion *completion);
};
void _gtk_entry_completion_resize_popup (GtkEntryCompletion *completion);
void _gtk_entry_completion_popdown (GtkEntryCompletion *completion);
void _gtk_entry_completion_connect (GtkEntryCompletion *completion,
GtkEntry *entry);
void _gtk_entry_completion_disconnect (GtkEntryCompletion *completion);
GtkIMContext* _gtk_entry_get_im_context (GtkEntry *entry);
GtkIMContext * _gtk_entry_get_im_context (GtkEntry *entry);
GtkEventController * gtk_entry_get_key_controller (GtkEntry *entry);
GtkText *gtk_entry_get_text_widget (GtkEntry *entry);

1
gtk/gtkmountoperation.c
View File

@ -60,6 +60,7 @@
#include "gtkshortcuttrigger.h"
#include "gtkshortcutaction.h"
#include "gtkshortcut.h"
#include "gtkliststore.h"
#include <glib/gprintf.h>
/**

1
gtk/inspector/recorder.c
View File

@ -26,6 +26,7 @@
#include <gtk/gtklabel.h>
#include <gtk/gtklistbox.h>
#include <gtk/gtklistview.h>
#include <gtk/gtkliststore.h>
#include <gtk/gtkmessagedialog.h>
#include <gtk/gtkpicture.h>
#include <gtk/gtkpopover.h>

1
gtk/inspector/statistics.c
View File

@ -31,6 +31,7 @@
#include "gtktreeview.h"
#include "gtkeventcontrollerkey.h"
#include "gtkmain.h"
#include "gtkliststore.h"
#include <glib/gi18n-lib.h>