Removed an unsed variable and used an unused macro

[pspp-builds.git] / src / ui / gui / psppire-data-store.h

diff --git a/src/ui/gui/psppire-data-store.h b/src/ui/gui/psppire-data-store.h
index 1693a9ad0b9e138f213bec8af144eb65311ad92c..058f9e1420be2990a83b06b8af1bd0708a3e6c15 100644 (file)
--- a/src/ui/gui/psppire-data-store.h
+++ b/src/ui/gui/psppire-data-store.h
@@ -23,9 +23,7 @@
 #define FIRST_CASE_NUMBER 1
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define GTK_TYPE_DATA_STORE           (psppire_data_store_get_type ())
 
@@ -72,8 +70,6 @@ enum dict_signal_handler {
   n_dict_signals
 };
 
-void do_this_thing (PsppireDict *, struct dictionary *, void *);
-
 
 struct _PsppireDataStore
 {
@@ -86,9 +82,6 @@ struct _PsppireDataStore
 
   gboolean show_labels;
 
-  /* Geometry */
-  gint margin_width;
-
   gint cf_handler_id [n_cf_signals];
   gint dict_handler_id [n_dict_signals];
 };
@@ -96,12 +89,6 @@ struct _PsppireDataStore
 struct _PsppireDataStoreClass
 {
   GObjectClass parent_class;
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
 };
 
 
@@ -115,7 +102,7 @@ void psppire_data_store_set_dictionary (PsppireDataStore *data_store,
                                        PsppireDict *dict);
 
 void psppire_data_store_show_labels (PsppireDataStore *store,
-                                   gboolean show_labels);
+                                    gboolean show_labels);
 
 void psppire_data_store_clear (PsppireDataStore *data_store);
 
@@ -137,9 +124,6 @@ gboolean psppire_data_store_set_string (PsppireDataStore *ds,
 casenumber psppire_data_store_get_case_count (const PsppireDataStore *ds);
 size_t psppire_data_store_get_value_count (const PsppireDataStore *ds);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __PSPPIRE_DATA_STORE_H__ */