projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'origin/stable'
[pspp-builds.git]
/
src
/
ui
/
gui
/
psppire-var-store.h
diff --git
a/src/ui/gui/psppire-var-store.h
b/src/ui/gui/psppire-var-store.h
index a4782efceb04e009126e7408eb10289ed1f85438..4cda0159bf0e776f4601f1e1b126b3ed211d11f2 100644
(file)
--- a/
src/ui/gui/psppire-var-store.h
+++ b/
src/ui/gui/psppire-var-store.h
@@
-17,7
+17,6
@@
#ifndef __PSPPIRE_VAR_STORE_H__
#define __PSPPIRE_VAR_STORE_H__
#ifndef __PSPPIRE_VAR_STORE_H__
#define __PSPPIRE_VAR_STORE_H__
-#include <gtksheet/gsheetmodel.h>
#include "psppire-dict.h"
#include <gdk/gdk.h>
#include "psppire-dict.h"
#include <gdk/gdk.h>
@@
-35,7
+34,7
@@
typedef enum
}
PsppireVarStoreFormatType;
}
PsppireVarStoreFormatType;
-#define
G_TYPE_PSPPIR
E_VAR_STORE_FORMAT_TYPE \
+#define
PSPPIRE_TYP
E_VAR_STORE_FORMAT_TYPE \
(psppire_var_store_format_type_get_type ())
/* PSPPIRE variable store. */
(psppire_var_store_format_type_get_type ())
/* PSPPIRE variable store. */
@@
-66,8
+65,6
@@
struct _PsppireVarStore
/*< private >*/
PsppireDict *dict;
GdkColor disabled;
/*< private >*/
PsppireDict *dict;
GdkColor disabled;
- const PangoFontDescription *font_desc;
- gint trailing_rows;
PsppireVarStoreFormatType format_type;
};
PsppireVarStoreFormatType format_type;
};