X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=lib%2Fgtksheet%2Fgtksheet.h;h=b228a1fbb517495644b19d2511085bfaa02b7556;hb=4ea6e37d180c9412cbcd39afa48a516522e6dd71;hp=9b8525309255c16dd7a134e88bd3d0593b30ccdd;hpb=8c40e5a3cb30d168600068f83fa8abd564f2b3ef;p=pspp

diff --git a/lib/gtksheet/gtksheet.h b/lib/gtksheet/gtksheet.h
index 9b85253092..b228a1fbb5 100644
--- a/lib/gtksheet/gtksheet.h
+++ b/lib/gtksheet/gtksheet.h
@@ -74,7 +74,6 @@ enum
 #define GTK_SHEET_ROW_FROZEN(sheet)      !gtk_sheet_rows_resizable (sheet)
 #define GTK_SHEET_COLUMN_FROZEN(sheet)   !gtk_sheet_columns_resizable (sheet)
 #define GTK_SHEET_AUTORESIZE(sheet)      gtk_sheet_autoresize (sheet)
-#define GTK_SHEET_CLIP_TEXT(sheet)       gtk_sheet_clip_text (sheet)
 #define GTK_SHEET_ROW_TITLES_VISIBLE(sheet)   gtk_sheet_row_titles_visible (sheet)
 #define GTK_SHEET_COL_TITLES_VISIBLE(sheet)   gtk_sheet_column_titles_visible (sheet)
 #define GTK_SHEET_AUTO_SCROLL(sheet)     gtk_sheet_autoscroll (sheet)
@@ -124,7 +123,6 @@ struct _GtkSheet{
   GtkSelectionMode selection_mode;
   gboolean autoresize;
   gboolean autoscroll;
-  gboolean clip_text;
   gboolean justify_entry;
 
   guint freeze_count;
@@ -149,9 +147,6 @@ struct _GtkSheet{
   gboolean rows_resizable;
   gboolean columns_resizable;
 
-  /* Displayed range */
-  GtkSheetRange view;
-
   /* active cell */
   GtkSheetCell active_cell;
   GtkWidget *sheet_entry;
@@ -161,10 +156,6 @@ struct _GtkSheet{
   /* expanding selection */
   GtkSheetCell selection_cell;
 
-  /* timer for flashing clipped range */
-  gint32 clip_timer;
-  gint interval;
-
   /* global selection button */
   GtkWidget *button;
 
@@ -227,11 +218,8 @@ struct _GtkSheet{
   /* current range being dragged */
   GtkSheetRange drag_range;
 
-  /* clipped range */
-  GtkSheetRange clip_range;
-
   /* Used for the subtitle (popups) */
-  gint motion_events;
+  gint motion_timer;
   GtkSheetHoverTitle *hover_window;
 };
 
@@ -249,8 +237,6 @@ struct _GtkSheetClass
 
  void (*select_range) 		(GtkSheet *sheet, GtkSheetRange *range);
 
- void (*clip_range) 		(GtkSheet *sheet, GtkSheetRange *clip_range);
-
  void (*resize_range)		(GtkSheet *sheet,
 	                	GtkSheetRange *old_range,
                         	GtkSheetRange *new_range);
@@ -353,6 +339,11 @@ gtk_sheet_get_rows_count 		(GtkSheet *sheet);
 void
 gtk_sheet_get_visible_range		(GtkSheet *sheet,
 					 GtkSheetRange *range);
+
+void
+gtk_sheet_get_selected_range		(GtkSheet *sheet,
+					 GtkSheetRange *range);
+
 void
 gtk_sheet_set_selection_mode		(GtkSheet *sheet, gint mode);
 
@@ -368,12 +359,6 @@ gtk_sheet_set_autoscroll		(GtkSheet *sheet, gboolean autoscroll);
 gboolean
 gtk_sheet_autoscroll			(GtkSheet *sheet);
 
-void
-gtk_sheet_set_clip_text			(GtkSheet *sheet, gboolean clip_text);
-
-gboolean
-gtk_sheet_clip_text			(GtkSheet *sheet);
-
 void
 gtk_sheet_set_justify_entry		(GtkSheet *sheet, gboolean justify);
 
@@ -503,16 +488,6 @@ void
 gtk_sheet_select_column 		(GtkSheet * sheet,
 		         		gint column);
 
-/* save selected range to "clipboard" */
-void
-gtk_sheet_clip_range 			(GtkSheet *sheet, const GtkSheetRange *range);
-/* free clipboard */
-void
-gtk_sheet_unclip_range			(GtkSheet *sheet);
-
-gboolean
-gtk_sheet_in_clip			(GtkSheet *sheet);
-
 /* get scrollbars adjustment */
 GtkAdjustment *
 gtk_sheet_get_vadjustment 		(GtkSheet * sheet);
@@ -557,18 +532,11 @@ gtk_sheet_cell_get_text 		(const GtkSheet *sheet, gint row, gint col);
 /* clear cell contents */
 void
 gtk_sheet_cell_clear			(GtkSheet *sheet, gint row, gint col);
-/* clear cell contents and remove links */
-void
-gtk_sheet_cell_delete			(GtkSheet *sheet, gint row, gint col);
 
 /* clear range contents. If range==NULL the whole sheet will be cleared */
 void
 gtk_sheet_range_clear			(GtkSheet *sheet,
 					 const GtkSheetRange *range);
-/* clear range contents and remove links */
-void
-gtk_sheet_range_delete			(GtkSheet *sheet,
-					 const GtkSheetRange *range);
 
 /* get cell state: GTK_STATE_NORMAL, GTK_STATE_SELECTED */
 GtkStateType