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-selector.h
diff --git
a/src/ui/gui/psppire-selector.h
b/src/ui/gui/psppire-selector.h
index 072139107ccc7325aeef48fb5210e6b2554964ff..6fff5d4269da20286062e0f8c36def77374f1fa5 100644
(file)
--- a/
src/ui/gui/psppire-selector.h
+++ b/
src/ui/gui/psppire-selector.h
@@
-1,10
+1,9
@@
-/*
- PSPPIRE --- A Graphical User Interface for PSPP
+/* PSPPIRE - a graphical user interface for PSPP.
Copyright (C) 2007 Free Software Foundation
Copyright (C) 2007 Free Software Foundation
- This program is free software
;
you can redistribute it and/or modify
+ 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
it under the terms of the GNU General Public License as published by
- the Free Software Foundation
; either version 2
of the License, or
+ the Free Software Foundation
, either version 3
of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
(at your option) any later version.
This program is distributed in the hope that it will be useful,
@@
-13,10
+12,7
@@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301, USA.
-*/
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#ifndef __PSPPIRE_SELECTOR_H__
#ifndef __PSPPIRE_SELECTOR_H__
@@
-26,6
+22,7
@@
#include <glib.h>
#include <glib-object.h>
#include <gtk/gtkbutton.h>
#include <glib.h>
#include <glib-object.h>
#include <gtk/gtkbutton.h>
+#include <gtk/gtkaction.h>
#include <gtk/gtkarrow.h>
#include <gtk/gtktreemodel.h>
#include <gtk/gtktreemodelfilter.h>
#include <gtk/gtkarrow.h>
#include <gtk/gtktreemodel.h>
#include <gtk/gtktreemodelfilter.h>
@@
-49,7
+46,11
@@
typedef struct _PsppireSelectorClass PsppireSelectorClass;
/* Function for appending selected items to the destination widget */
typedef void SelectItemsFunc (GtkTreeIter iter,
GtkWidget *dest,
/* 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);
/* Function to determine whether an item in MODEL, pointed to by ITER
/* Function to determine whether an item in MODEL, pointed to by ITER
@@
-74,18
+75,28
@@
struct _PsppireSelector
/* <private> */
GtkWidget *arrow;
/* <private> */
GtkWidget *arrow;
+ GtkAction *action;
enum psppire_selector_dir direction;
GtkWidget *source;
GtkWidget *dest;
enum psppire_selector_dir direction;
GtkWidget *source;
GtkWidget *dest;
+ /* A flag indicating that the object is in the process of
+ updating its subjects.
+ (not thread safe if two threads access the same object)
+ */
+ gboolean selecting;
gint orientation;
GtkTreeModelFilter *filtered_source;
SelectItemsFunc *select_items;
gint orientation;
GtkTreeModelFilter *filtered_source;
SelectItemsFunc *select_items;
+ gpointer select_user_data;
+
FilterItemsFunc *filter;
FilterItemsFunc *filter;
+
+ AllowSelectionFunc *allow_selection;
};
struct _PsppireSelectorClass
};
struct _PsppireSelectorClass
@@
-103,7
+114,11
@@
void psppire_selector_set_subjects (PsppireSelector *,
GtkWidget *,
GtkWidget *,
SelectItemsFunc *,
GtkWidget *,
GtkWidget *,
SelectItemsFunc *,
- FilterItemsFunc * );
+ FilterItemsFunc *,
+ gpointer );
+
+void psppire_selector_set_allow (PsppireSelector *, AllowSelectionFunc *);
+
GType psppire_selector_orientation_get_type (void) G_GNUC_CONST;
GType psppire_selector_orientation_get_type (void) G_GNUC_CONST;
@@
-115,7
+130,7
@@
typedef enum {
PSPPIRE_SELECT_SOURCE_BELOW_DEST
} PsppireSelectorOrientation;
PSPPIRE_SELECT_SOURCE_BELOW_DEST
} PsppireSelectorOrientation;
-#define
G_TYPE_PSPPIR
E_SELECTOR_ORIENTATION \
+#define
PSPPIRE_TYP
E_SELECTOR_ORIENTATION \
(psppire_selector_orientation_get_type())
(psppire_selector_orientation_get_type())