projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
output-item: Fix memory leak in output_item_dump().
[pspp]
/
src
/
ui
/
gui
/
psppire-dialog-action.h
diff --git
a/src/ui/gui/psppire-dialog-action.h
b/src/ui/gui/psppire-dialog-action.h
index c48173a107f5b9f7629dc384811cd6e785da6d1a..8f79acc4c0dedd9dbec693543c5f1a60ded6dbd9 100644
(file)
--- a/
src/ui/gui/psppire-dialog-action.h
+++ b/
src/ui/gui/psppire-dialog-action.h
@@
-14,13
+14,13
@@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-/*
- This is a an abstract base class,
deriving from Gtk
Action.
+/*
+ This is a an abstract base class,
which implements G
Action.
It's purpose is to abstract the way in which dialog boxes behave.
It's purpose is to abstract the way in which dialog boxes behave.
- That is, this action will fire whenever a dialog box is to be
+ That is, this action will fire whenever a dialog box is to be
popped up.
popped up.
-
- Additionally, most dialog boxes generate syntax to
+
+ Additionally, most dialog boxes generate syntax to
be run by the pspp back-end. This provides an abstraction
to do that. The programmer needs only to provide the function
to generate the syntax. This base class looks after the rest.
be run by the pspp back-end. This provides an abstraction
to do that. The programmer needs only to provide the function
to generate the syntax. This base class looks after the rest.
@@
-67,22
+67,24
@@
typedef struct _PsppireDialogActionClass PsppireDialogActionClass;
struct _PsppireDialogAction
{
struct _PsppireDialogAction
{
- G
tkAction
parent;
+ G
Object
parent;
/*< private >*/
/*< private >*/
- GtkUIManager *uim;
-
+ GVariantType *parameter_type;
GtkWidget *source;
GtkWidget *dialog;
GtkWidget *toplevel;
PsppireDict *dict;
GtkWidget *source;
GtkWidget *dialog;
GtkWidget *toplevel;
PsppireDict *dict;
+
+ gboolean activated;
};
struct _PsppireDialogActionClass
{
};
struct _PsppireDialogActionClass
{
- GtkActionClass parent_class;
- void (*activate) (PsppireDialogAction *);
+ GObjectClass parent_class;
+ GtkBuilder * (*initial_activate) (PsppireDialogAction *, GVariant *);
+ void (*activate) (PsppireDialogAction *, GVariant *);
char * (*generate_syntax) (const PsppireDialogAction *);
};
char * (*generate_syntax) (const PsppireDialogAction *);
};
@@
-90,19
+92,16
@@
GType psppire_dialog_action_get_type (void) ;
typedef void (*PsppireDialogActionRefresh) (PsppireDialogAction *) ;
typedef void (*PsppireDialogActionRefresh) (PsppireDialogAction *) ;
-void psppire_dialog_action_set_refresh (PsppireDialogAction *pda,
+void psppire_dialog_action_set_refresh (PsppireDialogAction *pda,
PsppireDialogActionRefresh refresh);
PsppireDialogActionRefresh refresh);
-void psppire_dialog_action_set_valid_predicate (PsppireDialogAction *act,
+void psppire_dialog_action_set_valid_predicate (PsppireDialogAction *act,
ContentsAreValid dialog_state_valid);
ContentsAreValid dialog_state_valid);
-typedef void (*activation) (PsppireDialogAction *);
-
-void psppire_dialog_action_set_activation (gpointer class, activation a);
-
-GHashTable *psppire_dialog_action_get_hash_table (PsppireDialogAction *act);
+GtkBuilder * psppire_dialog_action_get_xml (PsppireDialogAction *da);
+void psppire_dialog_action_activate_null (PsppireDialogAction *act);
G_END_DECLS
G_END_DECLS