projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge 'master' into 'gtk3'.
[pspp]
/
src
/
ui
/
gui
/
psppire-buttonbox.h
diff --git
a/src/ui/gui/psppire-buttonbox.h
b/src/ui/gui/psppire-buttonbox.h
index 03f9fe34e6a737e5ae12558a704f80042cd81ce7..dc6eb5cf3178ae21b27c0586896edd2935fa7426 100644
(file)
--- a/
src/ui/gui/psppire-buttonbox.h
+++ b/
src/ui/gui/psppire-buttonbox.h
@@
-1,5
+1,5
@@
/* PSPPIRE - a graphical user interface for PSPP.
/* PSPPIRE - a graphical user interface for PSPP.
- Copyright (C) 2007 Free Software Foundation
+ Copyright (C) 2007
, 2010, 2011, 2012
Free Software Foundation
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
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
@@
-21,7
+21,7
@@
#include <glib.h>
#include <glib-object.h>
#include <glib.h>
#include <glib-object.h>
-#include <gtk/gtk
bbox
.h>
+#include <gtk/gtk.h>
G_BEGIN_DECLS
G_BEGIN_DECLS
@@
-41,6
+41,7
@@
enum
PSPPIRE_BUTTON_GOTO,
PSPPIRE_BUTTON_CONTINUE,
PSPPIRE_BUTTON_CANCEL,
PSPPIRE_BUTTON_GOTO,
PSPPIRE_BUTTON_CONTINUE,
PSPPIRE_BUTTON_CANCEL,
+ PSPPIRE_BUTTON_CLOSE,
PSPPIRE_BUTTON_HELP,
PSPPIRE_BUTTON_RESET,
PSPPIRE_BUTTON_PASTE,
PSPPIRE_BUTTON_HELP,
PSPPIRE_BUTTON_RESET,
PSPPIRE_BUTTON_PASTE,
@@
-53,6
+54,7
@@
struct _PsppireButtonBox
/* <private> */
GtkWidget *button[n_PsppireButtonBoxButtons];
/* <private> */
GtkWidget *button[n_PsppireButtonBoxButtons];
+ guint def;
};
struct _PsppireButtonBoxClass
};
struct _PsppireButtonBoxClass
@@
-69,12
+71,10
@@
_psppire_button_box_child_requisition (GtkWidget *widget,
int *nvis_children,
int *nvis_secondaries,
int *width,
int *nvis_children,
int *nvis_secondaries,
int *width,
-
-
-#define PSPPIRE_TYPE_BUTTON_MASK \
- (psppire_button_flags_get_type())
int *height);
int *height);
+#define PSPPIRE_TYPE_BUTTON_MASK psppire_button_flags_get_type()
+
G_END_DECLS
#endif /* __PSPPIRE_BUTTONBOX_H__ */
G_END_DECLS
#endif /* __PSPPIRE_BUTTONBOX_H__ */