From 49393f6f445deb37e55a81798f88242e3e99d7a0 Mon Sep 17 00:00:00 2001 From: randomguy3 Date: Sun, 8 Jan 2012 23:25:15 +0000 Subject: Remove now-defunct window icon setting code, and don't bother setting the default icon list on windows git-svn-id: https://tikzit.svn.sourceforge.net/svnroot/tikzit/trunk@362 7c02a99a-9b00-45e3-bf44-6f3dd7fddb64 --- src/linux/MainWindow.m | 7 ------- src/linux/main.m | 2 ++ 2 files changed, 2 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/linux/MainWindow.m b/src/linux/MainWindow.m index 6ef8837..ecaf1fa 100644 --- a/src/linux/MainWindow.m +++ b/src/linux/MainWindow.m @@ -567,13 +567,6 @@ static void update_paste_action (GtkClipboard *clipboard, GdkEvent *event, GtkAc g_object_ref_sink (mainWindow); gtk_window_set_title (mainWindow, "TikZiT"); gtk_window_set_default_size (mainWindow, 700, 400); -#ifndef WINDOWS - GdkPixbuf *icon = gdk_pixbuf_new_from_file (TIKZITSHAREDIR "/tikzit48x48.png", NULL); - if (icon) { - gtk_window_set_icon (mainWindow, icon); - g_object_unref (icon); - } -#endif GtkBox *mainLayout = GTK_BOX (gtk_vbox_new (FALSE, 0)); gtk_widget_show (GTK_WIDGET (mainLayout)); diff --git a/src/linux/main.m b/src/linux/main.m index 9e39f27..f28123c 100644 --- a/src/linux/main.m +++ b/src/linux/main.m @@ -43,6 +43,7 @@ int main (int argc, char *argv[]) { NSAutoreleasePool *initPool = [[NSAutoreleasePool alloc] init]; +#ifndef WINDOWS GList *icon_list = NULL; g_list_prepend (icon_list, get_logo(LOGO_SIZE_128)); g_list_prepend (icon_list, get_logo(LOGO_SIZE_64)); @@ -56,6 +57,7 @@ int main (int argc, char *argv[]) { g_object_unref ((GObject*)list_head->data); list_head = list_head->next; } +#endif clipboard_init(); [TikzGraphAssembler setup]; -- cgit v1.2.3