HGKeeper

libgnt/libgnt

Seal away all object struct members.
release-2.x.y
2019-04-09, Elliott Sales de Andrade

77c26f5070d0

Parents 78bef0588dd6
Children 047434452827

Seal away all object struct members.

20 files changed, 167 insertions(+), 137 deletions(-)

+9 -0

gnt.h

+9 -9

gntbox.h

+1 -1

gntbutton.h

+2 -2

gntcheckbox.h

+9 -1

gntclipboard.h

+2 -2

gntcombobox.h

+18 -18

gntentry.h

+13 -13

gntfilesel.h

+2 -2

gntlabel.h

+2 -2

gntline.h

+6 -5

gntmenu.h

+11 -9

gntmenuitem.h

+1 -1

gntmenuitemcheck.h

+8 -8

gntslider.h

+5 -5

gnttextview.h

+20 -20

gnttree.h

+16 -8

gntwidget.h

+2 -2

gntwindow.h

+22 -21

gntwm.h

+9 -8

gntws.h

~~--- a/gnt.h Sun Apr 07 04:58:33 2019 -0400~~

+++ b/gnt.h Tue Apr 09 04:36:32 2019 -0400

@@ -34,6 +34,15 @@

#define GNT_H

#include <glib.h>

+#ifndef GNTSEAL

+# if defined(GNTSEAL_ENABLE)

+# define GNTSEAL(ident) _gnt_sealed__ ## ident

+# else

+# define GNTSEAL(ident) ident

+# endif

+#endif /* !GNTSEAL */

#include "gntwidget.h"

#include "gntclipboard.h"

#include "gntcolors.h"

~~--- a/gntbox.h Sun Apr 07 04:58:33 2019 -0400~~

+++ b/gntbox.h Tue Apr 09 04:36:32 2019 -0400

@@ -57,17 +57,17 @@

{

GntWidget parent;

~~- gboolean vertical;~~

~~- gboolean homogeneous;~~

~~- gboolean fill;~~

~~- GList *list; /* List of widgets */~~

+ gboolean GNTSEAL(vertical);

+ gboolean GNTSEAL(homogeneous);

+ gboolean GNTSEAL(fill);

+ GList *GNTSEAL(list); /* List of widgets */

~~- GntWidget *active;~~

~~- int pad; /* Number of spaces to use between widgets */~~

~~- GntAlignment alignment; /* How are the widgets going to be aligned? */~~

+ GntWidget *GNTSEAL(active);

+ int GNTSEAL(pad); /* Number of spaces to use between widgets */

+ GntAlignment GNTSEAL(alignment); /* How are the widgets going to be aligned? */

~~- char *title;~~

~~- GList *focus; /* List of widgets to cycle focus (only valid for parent boxes) */~~

+ char *GNTSEAL(title);

+ GList *GNTSEAL(focus); /* List of widgets to cycle focus (only valid for parent boxes) */

void (*gnt_reserved1)(void);

void (*gnt_reserved2)(void);

~~--- a/gntbutton.h Sun Apr 07 04:58:33 2019 -0400~~

+++ b/gntbutton.h Tue Apr 09 04:36:32 2019 -0400

@@ -52,7 +52,7 @@

{

GntWidget parent;

~~- GntButtonPriv *priv;~~

+ GntButtonPriv *GNTSEAL(priv);

void (*gnt_reserved1)(void);

void (*gnt_reserved2)(void);

~~--- a/gntcheckbox.h Sun Apr 07 04:58:33 2019 -0400~~

+++ b/gntcheckbox.h Tue Apr 09 04:36:32 2019 -0400

@@ -27,8 +27,8 @@

#ifndef GNT_CHECK_BOX_H

#define GNT_CHECK_BOX_H

+#include "gnt.h"

#include "gntbutton.h"

~~-#include "gnt.h"~~

#include "gntcolors.h"

#include "gntkeys.h"

@@ -50,7 +50,7 @@

struct _GntCheckBox

{

GntButton parent;

~~- gboolean checked;~~

+ gboolean GNTSEAL(checked);

};

struct _GntCheckBoxClass

~~--- a/gntclipboard.h Sun Apr 07 04:58:33 2019 -0400~~

+++ b/gntclipboard.h Tue Apr 09 04:36:32 2019 -0400

@@ -31,6 +31,14 @@

#include <glib.h>

#include <glib-object.h>

+#ifndef GNTSEAL

+# if defined(GNTSEAL_ENABLE)

+# define GNTSEAL(ident) _gnt_sealed__ ## ident

+# else

+# define GNTSEAL(ident) ident

+# endif

+#endif /* !GNTSEAL */

#define GNT_TYPE_CLIPBOARD (gnt_clipboard_get_gtype())

#define GNT_CLIPBOARD(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GNT_TYPE_CLIPBOARD, GntClipboard))

#define GNT_CLIPBOARD_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), GNT_TYPE_CLIPBOARD, GntClipboardClass))

@@ -44,7 +52,7 @@

struct _GntClipboard

{

GObject inherit;

~~- gchar *string;~~

+ gchar *GNTSEAL(string);

};

struct _GntClipboardClass

~~--- a/gntcombobox.h Sun Apr 07 04:58:33 2019 -0400~~

+++ b/gntcombobox.h Tue Apr 09 04:36:32 2019 -0400

@@ -51,9 +51,9 @@

{

GntWidget parent;

~~- GntWidget *dropdown; /* This is a GntTree */~~

+ GntWidget *GNTSEAL(dropdown); /* This is a GntTree */

~~- void *selected; /* Currently selected key */~~

+ void *GNTSEAL(selected); /* Currently selected key */

};

struct _GntComboBoxClass

~~--- a/gntentry.h Sun Apr 07 04:58:33 2019 -0400~~

+++ b/gntentry.h Tue Apr 09 04:36:32 2019 -0400

@@ -27,10 +27,10 @@

#ifndef GNT_ENTRY_H

#define GNT_ENTRY_H

~~-#include "gntwidget.h"~~

#include "gnt.h"

#include "gntcolors.h"

#include "gntkeys.h"

+#include "gntwidget.h"

#define GNT_TYPE_ENTRY (gnt_entry_get_gtype())

#define GNT_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GNT_TYPE_ENTRY, GntEntry))

@@ -66,28 +66,28 @@

{

GntWidget parent;

~~- GntEntryFlag flag;~~

+ GntEntryFlag GNTSEAL(flag);

~~- char *start;~~

~~- char *end;~~

~~- char *scroll; /* Current scrolling position */~~

~~- char *cursor; /* Cursor location */~~

~~- /* 0 <= cursor - scroll < widget-width */~~

+ char *GNTSEAL(start);

+ char *GNTSEAL(end);

+ char *GNTSEAL(scroll); /* Current scrolling position */

+ char *GNTSEAL(cursor); /* Cursor location */

+ /* 0 <= cursor - scroll < widget-width */

~~- size_t buffer; /* Size of the buffer */~~

+ size_t GNTSEAL(buffer); /* Size of the buffer */

~~- int max; /* 0 means infinite */~~

~~- gboolean masked;~~

+ int GNTSEAL(max); /* 0 means infinite */

+ gboolean GNTSEAL(masked);

~~- GList *history; /* History of the strings. User can use this by pressing ctrl+up/down */~~

~~- int histlength; /* How long can the history be? */~~

+ GList *GNTSEAL(history); /* History of the strings. User can use this by pressing ctrl+up/down */

+ int GNTSEAL(histlength); /* How long can the history be? */

~~- GList *suggests; /* List of suggestions */~~

~~- gboolean word; /* Are the suggestions for only a word, or for the whole thing? */~~

~~- gboolean always; /* Should the list of suggestions show at all times, or only on tab-press? */~~

~~- GntWidget *ddown; /* The dropdown with the suggested list */~~

~~- GntEntryKillRing *killring; /**< @since 2.3.0 */~~

~~- GntEntrySearch *search; /**< @since 2.7.0 */~~

+ GList *GNTSEAL(suggests); /* List of suggestions */

+ gboolean GNTSEAL(word); /* Are the suggestions for only a word, or for the whole thing? */

+ gboolean GNTSEAL(always); /* Should the list of suggestions show at all times, or only on tab-press? */

+ GntWidget *GNTSEAL(ddown); /* The dropdown with the suggested list */

+ GntEntryKillRing *GNTSEAL(killring); /**< @since 2.3.0 */

+ GntEntrySearch *GNTSEAL(search); /**< @since 2.7.0 */

};

struct _GntEntryClass

~~--- a/gntfilesel.h Sun Apr 07 04:58:33 2019 -0400~~

+++ b/gntfilesel.h Tue Apr 09 04:36:32 2019 -0400

@@ -27,10 +27,10 @@

#ifndef GNT_FILE_SEL_H

#define GNT_FILE_SEL_H

~~-#include "gntwindow.h"~~

#include "gnt.h"

#include "gntcolors.h"

#include "gntkeys.h"

+#include "gntwindow.h"

#define GNT_TYPE_FILE_SEL (gnt_file_sel_get_gtype())

#define GNT_FILE_SEL(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GNT_TYPE_FILE_SEL, GntFileSel))

@@ -52,22 +52,22 @@

{

GntWindow parent;

~~- GntWidget *dirs; /* list of files */~~

~~- GntWidget *files; /* list of directories */~~

~~- GntWidget *location; /* location entry */~~

+ GntWidget *GNTSEAL(dirs); /* list of files */

+ GntWidget *GNTSEAL(files); /* list of directories */

+ GntWidget *GNTSEAL(location); /* location entry */

~~- GntWidget *select; /* select button */~~

~~- GntWidget *cancel; /* cancel button */~~

+ GntWidget *GNTSEAL(select); /* select button */

+ GntWidget *GNTSEAL(cancel); /* cancel button */

~~- char *current; /* Full path of the current location */~~

~~- char *suggest; /* Suggested filename */~~

+ char *GNTSEAL(current); /* Full path of the current location */

+ char *GNTSEAL(suggest); /* Suggested filename */

/* XXX: someone should make these useful */

~~- gboolean must_exist; /* Make sure the selected file (the name entered in 'location') exists */~~

~~- gboolean dirsonly; /* Show only directories */~~

~~- gboolean multiselect;~~

~~- GList *tags; /* List of tagged files when multiselect is set */~~

+ gboolean GNTSEAL(must_exist); /* Make sure the selected file (the name entered in 'location') exists */

+ gboolean GNTSEAL(dirsonly); /* Show only directories */

+ gboolean GNTSEAL(multiselect);

+ GList *GNTSEAL(tags); /* List of tagged files when multiselect is set */

~~- gboolean (*read_fn)(const char *path, GList **files, GError **error);~~

+ gboolean (*GNTSEAL(read_fn))(const char *path, GList **files, GError **error);

};

struct _GntFileSelClass

~~--- a/gntlabel.h Sun Apr 07 04:58:33 2019 -0400~~

+++ b/gntlabel.h Tue Apr 09 04:36:32 2019 -0400

@@ -45,8 +45,8 @@

{

GntWidget parent;

~~- char *text;~~

~~- GntTextFormatFlags flags;~~

+ char *GNTSEAL(text);

+ GntTextFormatFlags GNTSEAL(flags);

void (*gnt_reserved1)(void);

void (*gnt_reserved2)(void);

~~--- a/gntline.h Sun Apr 07 04:58:33 2019 -0400~~

+++ b/gntline.h Tue Apr 09 04:36:32 2019 -0400

@@ -27,10 +27,10 @@

#ifndef GNT_LINE_H

#define GNT_LINE_H

~~-#include "gntwidget.h"~~

#include "gnt.h"

#include "gntcolors.h"

#include "gntkeys.h"

+#include "gntwidget.h"

#define GNT_TYPE_LINE (gnt_line_get_gtype())

#define GNT_LINE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GNT_TYPE_LINE, GntLine))

@@ -51,7 +51,7 @@

{

GntWidget parent;

~~- gboolean vertical;~~

+ gboolean GNTSEAL(vertical);

};

struct _GntLineClass

~~--- a/gntmenu.h Sun Apr 07 04:58:33 2019 -0400~~

+++ b/gntmenu.h Tue Apr 09 04:36:32 2019 -0400

@@ -27,6 +27,7 @@

#ifndef GNT_MENU_H

#define GNT_MENU_H

+#include "gnt.h"

#include "gnttree.h"

#include "gntcolors.h"

#include "gntkeys.h"

@@ -62,15 +63,15 @@

struct _GntMenu

{

GntTree parent;

~~- GntMenuType type;~~

+ GntMenuType GNTSEAL(type);

~~- GList *list;~~

~~- int selected;~~

+ GList *GNTSEAL(list);

+ int GNTSEAL(selected);

/* This will keep track of its immediate submenu which is visible so that

* keystrokes can be passed to it. */

~~- GntMenu *submenu;~~

~~- GntMenu *parentmenu;~~

+ GntMenu *GNTSEAL(submenu);

+ GntMenu *GNTSEAL(parentmenu);

};

struct _GntMenuClass

~~--- a/gntmenuitem.h Sun Apr 07 04:58:33 2019 -0400~~

+++ b/gntmenuitem.h Tue Apr 09 04:36:32 2019 -0400

@@ -30,6 +30,8 @@

#include <glib.h>

#include <glib-object.h>

+#include "gnt.h"

#define GNT_TYPE_MENU_ITEM (gnt_menuitem_get_gtype())

#define GNT_MENU_ITEM(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GNT_TYPE_MENU_ITEM, GntMenuItem))

#define GNT_MENU_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), GNT_TYPE_MENU_ITEM, GntMenuItemClass))

@@ -50,10 +52,10 @@

struct _GntMenuItemPriv

{

/* These will be used to determine the position of the submenu */

~~- int x;~~

~~- int y;~~

~~- char trigger;~~

~~- char *id;~~

+ int GNTSEAL(x);

+ int GNTSEAL(y);

+ char GNTSEAL(trigger);

+ char *GNTSEAL(id);

};

typedef void (*GntMenuItemCallback)(GntMenuItem *item, gpointer data);

@@ -61,17 +63,17 @@

struct _GntMenuItem

{

GObject parent;

~~- GntMenuItemPriv priv;~~

+ GntMenuItemPriv GNTSEAL(priv);

~~- char *text;~~

+ char *GNTSEAL(text);

/* A GntMenuItem can have a callback associated with it.

* The callback will be activated whenever the suer selects it and presses enter (or clicks).

* However, if the GntMenuItem has some child, then the callback and callbackdata will be ignored. */

~~- gpointer callbackdata;~~

~~- GntMenuItemCallback callback;~~

+ gpointer GNTSEAL(callbackdata);

+ GntMenuItemCallback GNTSEAL(callback);

~~- GntMenu *submenu;~~

+ GntMenu *GNTSEAL(submenu);

};

struct _GntMenuItemClass

~~--- a/gntmenuitemcheck.h Sun Apr 07 04:58:33 2019 -0400~~

+++ b/gntmenuitemcheck.h Tue Apr 09 04:36:32 2019 -0400

@@ -50,7 +50,7 @@

struct _GntMenuItemCheck

{

GntMenuItem parent;

~~- gboolean checked;~~

+ gboolean GNTSEAL(checked);

};

struct _GntMenuItemCheckClass

~~--- a/gntslider.h Sun Apr 07 04:58:33 2019 -0400~~

+++ b/gntslider.h Tue Apr 09 04:36:32 2019 -0400

@@ -27,9 +27,9 @@

#ifndef GNT_SLIDER_H

#define GNT_SLIDER_H

~~-#include "gntwidget.h"~~

#include "gnt.h"

#include "gntlabel.h"

+#include "gntwidget.h"

#define GNT_TYPE_SLIDER (gnt_slider_get_gtype())

#define GNT_SLIDER(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GNT_TYPE_SLIDER, GntSlider))

@@ -50,14 +50,14 @@

{

GntWidget parent;

~~- gboolean vertical;~~

+ gboolean GNTSEAL(vertical);

~~- int max; /* maximum value */~~

~~- int min; /* minimum value */~~

~~- int step; /* amount to change at each step */~~

~~- int current; /* current value */~~

~~- int smallstep;~~

~~- int largestep;~~

+ int GNTSEAL(max); /* maximum value */

+ int GNTSEAL(min); /* minimum value */

+ int GNTSEAL(step); /* amount to change at each step */

+ int GNTSEAL(current); /* current value */

+ int GNTSEAL(smallstep);

+ int GNTSEAL(largestep);

};

struct _GntSliderClass

~~--- a/gnttextview.h Sun Apr 07 04:58:33 2019 -0400~~

+++ b/gnttextview.h Tue Apr 09 04:36:32 2019 -0400

@@ -27,10 +27,10 @@

#ifndef GNT_TEXT_VIEW_H

#define GNT_TEXT_VIEW_H

~~-#include "gntwidget.h"~~

#include "gnt.h"

#include "gntcolors.h"

#include "gntkeys.h"

+#include "gntwidget.h"

#define GNT_TYPE_TEXT_VIEW (gnt_text_view_get_gtype())

#define GNT_TEXT_VIEW(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GNT_TYPE_TEXT_VIEW, GntTextView))

@@ -58,11 +58,11 @@

{

GntWidget parent;

~~- GString *string;~~

~~- GList *list; /* List of GntTextLine */~~

+ GString *GNTSEAL(string);

+ GList *GNTSEAL(list); /* List of GntTextLine */

~~- GList *tags; /* A list of tags */~~

~~- GntTextViewFlag flags;~~

+ GList *GNTSEAL(tags); /* A list of tags */

+ GntTextViewFlag GNTSEAL(flags);

};

typedef enum

~~--- a/gnttree.h Sun Apr 07 04:58:33 2019 -0400~~

+++ b/gnttree.h Tue Apr 09 04:36:32 2019 -0400

@@ -27,11 +27,11 @@

#ifndef GNT_TREE_H

#define GNT_TREE_H

~~-#include "gntwidget.h"~~

#include "gnt.h"

#include "gntcolors.h"

#include "gntkeys.h"

#include "gnttextview.h"

+#include "gntwidget.h"

#define GNT_TYPE_TREE (gnt_tree_get_gtype())

#define GNT_TREE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GNT_TYPE_TREE, GntTree))

@@ -58,32 +58,32 @@

{

GntWidget parent;

~~- GntTreeRow *current; /* current selection */~~

+ GntTreeRow *GNTSEAL(current); /* current selection */

~~- GntTreeRow *top; /* The topmost visible item */~~

~~- GntTreeRow *bottom; /* The bottommost visible item */~~

+ GntTreeRow *GNTSEAL(top); /* The topmost visible item */

+ GntTreeRow *GNTSEAL(bottom); /* The bottommost visible item */

~~- GntTreeRow *root; /* The root of all evil */~~

+ GntTreeRow *GNTSEAL(root); /* The root of all evil */

~~- GList *list; /* List of GntTreeRow s */~~

~~- GHashTable *hash; /* We need this for quickly referencing the rows */~~

~~- guint (*hash_func)(gconstpointer);~~

~~- gboolean (*hash_eq_func)(gconstpointer, gconstpointer);~~

~~- GDestroyNotify key_destroy;~~

~~- GDestroyNotify value_destroy;~~

+ GList *GNTSEAL(list); /* List of GntTreeRow s */

+ GHashTable *GNTSEAL(hash); /* We need this for quickly referencing the rows */

+ guint (*GNTSEAL(hash_func))(gconstpointer);

+ gboolean (*GNTSEAL(hash_eq_func))(gconstpointer, gconstpointer);

+ GDestroyNotify GNTSEAL(key_destroy);

+ GDestroyNotify GNTSEAL(value_destroy);

~~- int ncol; /* No. of columns */~~

+ int GNTSEAL(ncol); /* No. of columns */

struct _GntTreeColInfo

{

~~- int width;~~

~~- char *title;~~

~~- int width_ratio;~~

~~- GntTreeColumnFlag flags;~~

~~- } *columns; /* Would a GList be better? */~~

~~- gboolean show_title;~~

~~- gboolean show_separator; /* Whether to show column separators */~~

+ int GNTSEAL(width);

+ char *GNTSEAL(title);

+ int GNTSEAL(width_ratio);

+ GntTreeColumnFlag GNTSEAL(flags);

+ } *GNTSEAL(columns); /* Would a GList be better? */

+ gboolean GNTSEAL(show_title);

+ gboolean GNTSEAL(show_separator); /* Whether to show column separators */

~~- GntTreePriv *priv;~~

+ GntTreePriv *GNTSEAL(priv);

};

struct _GntTreeClass

~~--- a/gntwidget.h Sun Apr 07 04:58:33 2019 -0400~~

+++ b/gntwidget.h Tue Apr 09 04:36:32 2019 -0400

@@ -31,6 +31,14 @@

#include <glib.h>

#include <ncurses.h>

+#ifndef GNTSEAL

+# if defined(GNTSEAL_ENABLE)

+# define GNTSEAL(ident) _gnt_sealed__ ## ident

+# else

+# define GNTSEAL(ident) ident

+# endif

+#endif /* !GNTSEAL */

#include "gntbindable.h"

#define GNT_TYPE_WIDGET (gnt_widget_get_gtype())

@@ -87,22 +95,22 @@

struct _GntWidgetPriv

{

~~- int x, y;~~

~~- int width, height;~~

~~- GntWidgetFlags flags;~~

~~- char *name;~~

+ int GNTSEAL(x), GNTSEAL(y);

+ int GNTSEAL(width), GNTSEAL(height);

+ GntWidgetFlags GNTSEAL(flags);

+ char *GNTSEAL(name);

~~- int minw, minh; /* Minimum size for the widget */~~

+ int GNTSEAL(minw), GNTSEAL(minh); /* Minimum size for the widget */

};

struct _GntWidget

{

GntBindable inherit;

~~- GntWidget *parent;~~

+ GntWidget *GNTSEAL(parent);

~~- GntWidgetPriv priv;~~

~~- WINDOW *window;~~

+ GntWidgetPriv GNTSEAL(priv);

+ WINDOW *GNTSEAL(window);

void (*gnt_reserved1)(void);

void (*gnt_reserved2)(void);

~~--- a/gntwindow.h Sun Apr 07 04:58:33 2019 -0400~~

+++ b/gntwindow.h Tue Apr 09 04:36:32 2019 -0400

@@ -57,8 +57,8 @@

struct _GntWindow

{

GntBox parent;

~~- GntMenu *menu;~~

~~- GntWindowPriv *priv;~~

+ GntMenu *GNTSEAL(menu);

+ GntWindowPriv *GNTSEAL(priv);

};

struct _GntWindowClass

~~--- a/gntwm.h Sun Apr 07 04:58:33 2019 -0400~~

+++ b/gntwm.h Tue Apr 09 04:36:32 2019 -0400

@@ -27,6 +27,7 @@

#ifndef GNTWM_H

#define GNTWM_H

+#include "gnt.h"

#include "gntwidget.h"

#include "gntmenu.h"

#include "gntws.h"

@@ -80,24 +81,24 @@

{

GntBindable inherit;

~~- GMainLoop *loop;~~

+ GMainLoop *GNTSEAL(loop);

~~- GList *workspaces;~~

~~- GList *tagged; /* tagged windows */~~

~~- GntWS *cws;~~

+ GList *GNTSEAL(workspaces);

+ GList *GNTSEAL(tagged); /* tagged windows */

+ GntWS *GNTSEAL(cws);

struct {

~~- GntWidget *window;~~

~~- GntWidget *tree;~~

~~- } _list,~~

~~- *windows, /* Window-list window */~~

~~- *actions; /* Action-list window */~~

+ GntWidget *GNTSEAL(window);

+ GntWidget *GNTSEAL(tree);

+ } GNTSEAL(_list),

+ *GNTSEAL(windows), /* Window-list window */

+ *GNTSEAL(actions); /* Action-list window */

~~- GHashTable *nodes; /* GntWidget -> GntNode */~~

~~- GHashTable *name_places; /* window name -> ws*/~~

~~- GHashTable *title_places; /* window title -> ws */~~

+ GHashTable *GNTSEAL(nodes); /* GntWidget -> GntNode */

+ GHashTable *GNTSEAL(name_places); /* window name -> ws*/

+ GHashTable *GNTSEAL(title_places); /* window title -> ws */

~~- GList *acts; /* List of actions */~~

+ GList *GNTSEAL(acts); /* List of actions */

/**

* There can be at most one menu at a time on the screen.

@@ -105,23 +106,23 @@

* the menu until it is closed, either when the user activates a menuitem, or

* presses Escape to cancel the menu.

~~- GntMenu *menu; /* Currently active menu */~~

+ GntMenu *GNTSEAL(menu); /* Currently active menu */

/**

* 'event_stack' will be set to TRUE when a user-event, ie. a mouse-click

* or a key-press is being processed. This variable will be used to determine

* whether to give focus to a new window.

~~- gboolean event_stack;~~

+ gboolean GNTSEAL(event_stack);

~~- GntKeyPressMode mode;~~

+ GntKeyPressMode GNTSEAL(mode);

~~- GHashTable *positions;~~

+ GHashTable *GNTSEAL(positions);

~~- void *res1;~~

~~- void *res2;~~

~~- void *res3;~~

~~- void *res4;~~

+ void *GNTSEAL(res1);

+ void *GNTSEAL(res2);

+ void *GNTSEAL(res3);

+ void *GNTSEAL(res4);

};

typedef struct _GntWMClass GntWMClass;

~~--- a/gntws.h Sun Apr 07 04:58:33 2019 -0400~~

+++ b/gntws.h Tue Apr 09 04:36:32 2019 -0400

@@ -27,6 +27,7 @@

#ifndef GNTWS_H

#define GNTWS_H

+#include "gnt.h"

#include "gntwidget.h"

#include <panel.h>

@@ -42,15 +43,15 @@

struct _GntWS

{

GntBindable inherit;

~~- char *name;~~

~~- GList *list;~~

~~- GList *ordered;~~

~~- gpointer ui_data;~~

+ char *GNTSEAL(name);

+ GList *GNTSEAL(list);

+ GList *GNTSEAL(ordered);

+ gpointer GNTSEAL(ui_data);

~~- void *res1;~~

~~- void *res2;~~

~~- void *res3;~~

~~- void *res4;~~

+ void *GNTSEAL(res1);

+ void *GNTSEAL(res2);

+ void *GNTSEAL(res3);

+ void *GNTSEAL(res4);

};

typedef struct _GntWSClass GntWSClass;