X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-selector.h;h=8174f97c8f5f4a20a1888774e75a05e72402d1fc;hb=7c2fa3735ac1115b6c1ad4b5e0613673de2faf4c;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..8174f97c 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,6 +95,8 @@ struct _PsppireSelector
   GtkTreeModelFilter *filtered_source;
 
   SelectItemsFunc *select_items;
+  gpointer select_user_data;
+
   FilterItemsFunc *filter;
 
   AllowSelectionFunc *allow_selection;
@@ -108,10 +114,9 @@ struct _PsppireSelectorClass
 GType      psppire_selector_get_type        (void);
 GtkWidget* psppire_selector_new             (void);
 void       psppire_selector_set_subjects    (PsppireSelector *,
-					     GtkWidget *,
-					     GtkWidget *,
 					     SelectItemsFunc *,
-					     FilterItemsFunc * );
+					     FilterItemsFunc *,
+					     gpointer );
 
 void      psppire_selector_set_allow        (PsppireSelector *, AllowSelectionFunc *);
 
@@ -126,7 +131,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())