X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-selector.h;h=8e033ae4bd0a67dad28474c21fea41f05d2564cc;hb=03134dc262125d1785891d6111eec58ca09b3b54;hp=6385c14c2155b48ae2d7a3664d4e8cf058f54e49;hpb=c65449a628d13f4683e7dc7125874608c7152017;p=pspp-builds.git

diff --git a/src/ui/gui/psppire-selector.h b/src/ui/gui/psppire-selector.h
index 6385c14c..8e033ae4 100644
--- a/src/ui/gui/psppire-selector.h
+++ b/src/ui/gui/psppire-selector.h
@@ -46,7 +46,8 @@ typedef struct _PsppireSelectorClass  PsppireSelectorClass;
 /* Function for appending selected items to the destination widget */
 typedef void SelectItemsFunc (GtkTreeIter iter,
 			      GtkWidget *dest,
-			      GtkTreeModel *source_model);
+			      GtkTreeModel *source_model,
+			      gpointer data);
 
 /* Function to determine if items may be selected */
 typedef gboolean AllowSelectionFunc (GtkWidget *src, GtkWidget *dest);
@@ -76,7 +77,10 @@ struct _PsppireSelector
   GtkWidget *arrow;
   GtkAction *action;
 
+  gboolean dispose_has_run;
+
   enum psppire_selector_dir direction;
+
   GtkWidget *source;
   GtkWidget *dest;
 
@@ -91,9 +95,15 @@ struct _PsppireSelector
   GtkTreeModelFilter *filtered_source;
 
   SelectItemsFunc *select_items;
+  gpointer select_user_data;
+
   FilterItemsFunc *filter;
 
   AllowSelectionFunc *allow_selection;
+
+  gulong row_activate_id ;
+
+  gulong source_select_id ;
 };
 
 struct _PsppireSelectorClass
@@ -107,13 +117,19 @@ struct _PsppireSelectorClass
 
 GType      psppire_selector_get_type        (void);
 GtkWidget* psppire_selector_new             (void);
-void       psppire_selector_set_subjects    (PsppireSelector *,
-					     GtkWidget *,
-					     GtkWidget *,
-					     SelectItemsFunc *,
-					     FilterItemsFunc * );
 
-void      psppire_selector_set_allow        (PsppireSelector *, AllowSelectionFunc *);
+
+/* Set FILTER_FUNC for this selector */
+void psppire_selector_set_filter_func (PsppireSelector *selector,
+				       FilterItemsFunc *filter_func);
+
+/* Set SELECT_FUNC for this selector */
+void psppire_selector_set_select_func (PsppireSelector *selector,
+				       SelectItemsFunc *select_func,
+				       gpointer user_data);
+
+
+void psppire_selector_set_allow (PsppireSelector *, AllowSelectionFunc *);
 
 
 GType psppire_selector_orientation_get_type (void) G_GNUC_CONST;
@@ -126,7 +142,7 @@ typedef enum {
   PSPPIRE_SELECT_SOURCE_BELOW_DEST
 } PsppireSelectorOrientation;
 
-#define G_TYPE_PSPPIRE_SELECTOR_ORIENTATION \
+#define PSPPIRE_TYPE_SELECTOR_ORIENTATION \
   (psppire_selector_orientation_get_type())