summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Merry <alex.merry@cs.ox.ac.uk>2012-12-14 12:32:13 +0000
committerAlex Merry <alex.merry@cs.ox.ac.uk>2012-12-14 12:32:13 +0000
commit7677929bc29056dbeda537c64acc62102fff7586 (patch)
tree6753fa5fae7b613a99962e831c98c6cc35ca1c4c
parent0a47b1c62c929ccff2a9f803455b94d9024ac051 (diff)
Remove unused functions from gtkhelpers
-rw-r--r--tikzit/src/gtk/gtkhelpers.h12
-rw-r--r--tikzit/src/gtk/gtkhelpers.m141
2 files changed, 0 insertions, 153 deletions
diff --git a/tikzit/src/gtk/gtkhelpers.h b/tikzit/src/gtk/gtkhelpers.h
index a84e02b..bcdac89 100644
--- a/tikzit/src/gtk/gtkhelpers.h
+++ b/tikzit/src/gtk/gtkhelpers.h
@@ -24,20 +24,8 @@
#include <gtk/gtk.h>
#import <gdk-pixbuf/gdk-pixbuf.h>
-void gtk_table_adjust_attach (GtkTable *table,
- GtkWidget *widget,
- gint left_adjust,
- gint right_adjust,
- gint top_adjust,
- gint bottom_adjust);
-void gtk_table_delete_row (GtkTable *table, guint row);
-void gtk_table_delete_rows (GtkTable *table, guint firstRow, guint count);
-
NSString * gtk_editable_get_string (GtkEditable *editable, gint start, gint end);
-void gtk_entry_set_string (GtkEntry *entry, NSString *string);
-NSString * gtk_entry_get_string (GtkEntry *entry);
-
GdkRectangle gdk_rectangle_from_ns_rect (NSRect rect);
NSRect gdk_rectangle_to_ns_rect (GdkRectangle rect);
diff --git a/tikzit/src/gtk/gtkhelpers.m b/tikzit/src/gtk/gtkhelpers.m
index cc21622..da13f54 100644
--- a/tikzit/src/gtk/gtkhelpers.m
+++ b/tikzit/src/gtk/gtkhelpers.m
@@ -25,137 +25,6 @@
#import "gtkhelpers.h"
#import <gdk/gdkkeysyms.h>
-void gtk_table_adjust_attach (GtkTable *table,
- GtkWidget *widget,
- gint left_adjust,
- gint right_adjust,
- gint top_adjust,
- gint bottom_adjust) {
- guint top_attach;
- guint bottom_attach;
- guint left_attach;
- guint right_attach;
- GtkAttachOptions xoptions;
- GtkAttachOptions yoptions;
- guint xpadding;
- guint ypadding;
-
- gtk_container_child_get (GTK_CONTAINER (table), widget,
- "top-attach", &top_attach,
- "bottom-attach", &bottom_attach,
- "left-attach", &left_attach,
- "right-attach", &right_attach,
- "x-options", &xoptions,
- "y-options", &yoptions,
- "x-padding", &xpadding,
- "y-padding", &ypadding,
- NULL);
-
- g_object_ref (G_OBJECT (widget));
- gtk_container_remove (GTK_CONTAINER (table), widget);
- gtk_table_attach (table, widget,
- left_attach + left_adjust,
- right_attach + right_adjust,
- top_attach + top_adjust,
- bottom_attach + bottom_adjust,
- xoptions,
- yoptions,
- xpadding,
- ypadding);
- g_object_unref (G_OBJECT (widget));
-}
-
-/*
- * Delete multiple table rows
- */
-void gtk_table_delete_rows (GtkTable *table, guint firstRow, guint count) {
- if (count == 0) {
- return;
- }
- GtkContainer *tableC = GTK_CONTAINER (table);
-
- guint n_columns;
- guint n_rows;
- g_object_get (G_OBJECT (table),
- "n-columns", &n_columns,
- "n-rows", &n_rows,
- NULL);
- guint topBound = firstRow;
- guint bottomBound = firstRow + count;
- if (bottomBound > n_rows) {
- bottomBound = n_rows;
- count = bottomBound - topBound;
- }
-
- GList *toBeDeleted = NULL;
- GList *toBeShrunk = NULL;
- /* indexed by top-attach */
- GPtrArray *toBeMoved = g_ptr_array_sized_new (n_rows - topBound);
- g_ptr_array_set_size (toBeMoved, n_rows - topBound);
-
- GList *childIt = gtk_container_get_children (tableC);
-
- while (childIt) {
- GtkWidget *widget = GTK_WIDGET (childIt->data);
- guint top_attach;
- guint bottom_attach;
- gtk_container_child_get (tableC, widget,
- "top-attach", &top_attach,
- "bottom-attach", &bottom_attach,
- NULL);
- if (top_attach >= topBound && bottom_attach <= bottomBound) {
- toBeDeleted = g_list_prepend (toBeDeleted, widget);
- } else if (top_attach <= topBound && bottom_attach > topBound) {
- toBeShrunk = g_list_prepend (toBeShrunk, widget);
- } else if (top_attach > topBound) {
- GList *rowList = (GList*)g_ptr_array_index (toBeMoved, top_attach - topBound);
- rowList = g_list_prepend (rowList, widget);
- g_ptr_array_index (toBeMoved, top_attach - topBound) = rowList;
- }
- childIt = childIt->next;
- }
- g_list_free (childIt);
-
- /* remove anything that is completely within the segment being deleted */
- while (toBeDeleted) {
- gtk_container_remove (tableC, GTK_WIDGET (toBeDeleted->data));
- toBeDeleted = toBeDeleted->next;
- }
- g_list_free (toBeDeleted);
-
- /* shrink anything that spans the segment */
- while (toBeShrunk) {
- GtkWidget *widget = GTK_WIDGET (toBeShrunk->data);
- gtk_table_adjust_attach (table, widget, 0, 0, 0, -count);
- toBeShrunk = toBeShrunk->next;
- }
- g_list_free (toBeShrunk);
-
- /* move everything below the segment being deleted up, in order */
- /* note that "n-rows" is not a valid "top-attach" */
- for (int offset = 0; offset < (n_rows - 1) - topBound; ++offset) {
- GList *rowList = (GList *)g_ptr_array_index (toBeMoved, offset);
- guint top_attach = offset + topBound;
- guint overlap = bottomBound - top_attach;
- while (rowList) {
- GtkWidget *widget = GTK_WIDGET (rowList->data);
- gtk_table_adjust_attach (table, widget, 0, 0, -offset, -(offset + overlap));
- rowList = rowList->next;
- }
- g_list_free (rowList);
- g_ptr_array_index (toBeMoved, offset) = NULL;
- }
-
- gtk_table_resize (table, n_rows - 1, n_columns);
-}
-
-/*
- * Delete a table row
- */
-void gtk_table_delete_row (GtkTable *table, guint row) {
- gtk_table_delete_rows (table, row, 1);
-}
-
NSString * gtk_editable_get_string (GtkEditable *editable, gint start, gint end)
{
gchar *text = gtk_editable_get_chars (editable, start, end);
@@ -164,16 +33,6 @@ NSString * gtk_editable_get_string (GtkEditable *editable, gint start, gint end)
return string;
}
-void gtk_entry_set_string (GtkEntry *entry, NSString *string)
-{
- gtk_entry_set_text (entry, string == nil ? "" : [string UTF8String]);
-}
-
-NSString * gtk_entry_get_string (GtkEntry *entry)
-{
- return [NSString stringWithUTF8String:gtk_entry_get_text (entry)];
-}
-
GdkRectangle gdk_rectangle_from_ns_rect (NSRect box) {
GdkRectangle rect;
rect.x = box.origin.x;