X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fgtksheet%2Fgtksheet.h;h=1b87be408bdebbff9c35d8bcc6352bd300510327;hb=5beffdda43634370653661d5a0f5e3c75aa28747;hp=9f0a76dac46681dc10e0f368a1db0ff5f42c6204;hpb=dcf9b154cbcaa35c3d8459a201b77eec8bcb30bd;p=pspp

diff --git a/lib/gtksheet/gtksheet.h b/lib/gtksheet/gtksheet.h
index 9f0a76dac4..1b87be408b 100644
--- a/lib/gtksheet/gtksheet.h
+++ b/lib/gtksheet/gtksheet.h
@@ -71,7 +71,6 @@ enum
 
 /* Public flags, for compatibility */
 
-#define GTK_SHEET_IS_LOCKED(sheet)       gtk_sheet_locked(sheet)
 #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)
@@ -120,7 +119,6 @@ struct _GtkSheet{
   gboolean autoscroll;
   gboolean clip_text;
   gboolean justify_entry;
-  gboolean locked;
 
   guint freeze_count;
 
@@ -178,7 +176,7 @@ struct _GtkSheet{
   guint sheet_window_height;
 
   /* sheet backing pixmap */  
-  GdkWindow *pixmap;    
+  GdkPixmap *pixmap;    
 
   /* offsets for scrolling */
   gint hoffset;
@@ -377,7 +375,7 @@ void
 gtk_sheet_set_locked			(GtkSheet *sheet, gboolean lock);
 
 gboolean
-gtk_sheet_locked			(GtkSheet *sheet);
+gtk_sheet_locked			(const GtkSheet *sheet);
 
 /* set sheet title */
 void
@@ -439,7 +437,7 @@ gtk_sheet_row_button_justify		(GtkSheet *sheet,
 
 /* scroll the viewing area of the sheet to the given column
  * and row; row_align and col_align are between 0-1 representing the
- * location the row should appear on the screnn, 0.0 being top or left,
+ * location the row should appear on the screen, 0.0 being top or left,
  * 1.0 being bottom or right; if row or column is negative then there
  * is no change */
 void
@@ -540,8 +538,8 @@ gtk_sheet_set_cell_text			(GtkSheet *sheet,
 					gint row, gint col,
                    			const gchar *text);
 /* get cell contents */
-const gchar *     
-gtk_sheet_cell_get_text 		(GtkSheet *sheet, gint row, gint col);
+gchar *     
+gtk_sheet_cell_get_text 		(const GtkSheet *sheet, gint row, gint col);
 
 /* clear cell contents */
 void 
@@ -661,7 +659,7 @@ gtk_sheet_range_set_font		(GtkSheet *sheet,
 /* get cell attributes of the given cell */
 /* TRUE means that the cell is currently allocated */
 gboolean
-gtk_sheet_get_attributes		(GtkSheet *sheet, 
+gtk_sheet_get_attributes		(const GtkSheet *sheet, 
 					gint row, gint col, 
 					GtkSheetCellAttr *attributes);