Rename gsheetmodel to psppiresheetmodel

[pspp-builds.git] / lib / gtksheet / gtkextra-sheet.h

diff --git a/lib/gtksheet/gtkextra-sheet.h b/lib/gtksheet/gtkextra-sheet.h
index 0bd573c8a0242c2f752996303854e3f9558214a7..7ea9b1714cc732cbec011571752a3c432d703093 100644 (file)
--- a/lib/gtksheet/gtkextra-sheet.h
+++ b/lib/gtksheet/gtkextra-sheet.h
@@ -1,5 +1,5 @@
-/* This version of GtkSheet has been heavily modified, for the specific 
- *  requirements of PSPPIRE. 
+/* This version of GtkSheet has been heavily modified, for the specific
+ *  requirements of PSPPIRE.
  *
  * GtkSheet widget for Gtk+.
  * Copyright (C) 1999-2001 Adrian E. Feiguin <adrian@ifir.ifir.edu.ar>
@@ -16,15 +16,15 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 
-#ifndef __GTK_EXTRA_SHEET_H__
-#define __GTK_EXTRA_SHEET_H__
+#ifndef GTK_EXTRA_SHEET_H__
+#define GTK_EXTRA_SHEET_H__
 
 
 struct _GtkSheet ;
@@ -32,47 +32,30 @@ struct _GtkSheet ;
 typedef struct _GtkSheet GtkSheet;
 
 
-struct _GtkSheetChild
-{
-  GtkWidget *widget;
-  gint x,y ;
-  gboolean attached_to_cell;
-  gboolean floating;
-  gint row, col;
-  guint16 xpadding;
-  guint16 ypadding;
-  gboolean xexpand;
-  gboolean yexpand;
-  gboolean xshrink;
-  gboolean yshrink;
-  gboolean xfill;
-  gboolean yfill;
-};
-
-typedef struct _GtkSheetChild GtkSheetChild;
-
-
-
 struct _GtkSheetButton
 {
   GtkStateType state;
   gchar *label;
 
   gboolean label_visible;
-  GtkSheetChild *child;
 
   GtkJustification justification;
 };
 
-typedef struct _GtkSheetButton GtkSheetButton;
-
+struct _GtkSheetCell
+{
+  gint row;
+  gint col;
+};
 
+typedef struct _GtkSheetButton GtkSheetButton;
+typedef struct _GtkSheetCell GtkSheetCell;
 
-GtkSheetButton * gtk_sheet_button_new(void);
+GtkSheetButton * gtk_sheet_button_new (void);
 
-inline void gtk_sheet_button_free(GtkSheetButton *button);
+void gtk_sheet_button_free (GtkSheetButton *button);
 
 
-#endif /* __GTK_EXTRA_SHEET_H__ */
+#endif /* GTK_EXTRA_SHEET_H__ */