From fad4aff018ea3836d16a66ae9cb86053c5030cc6 Mon Sep 17 00:00:00 2001 From: jdolan Date: Sun, 7 Jul 2013 09:12:25 -0400 Subject: [PATCH] Use newer, simpler API to set window icon, and update window icon with current branding (affects Mac / Linux only). --- install/bitmaps/icon.png | Bin 407 -> 10579 bytes radiant/mainframe.cpp | 14 ++++++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/install/bitmaps/icon.png b/install/bitmaps/icon.png index b42e1c9a882ca12b9030c834eabb34a1076581be..88fdea55f204a2ffe1ac3fabd6d1fe40e3c992ae 100644 GIT binary patch literal 10579 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 literal 407 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv#^NA%Cx&(BWL|<~l0AZa85pY6 z7#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=Y_eC&cwX!~YH-o1x=B1H=FS z|HFT8`U2!JmIV0)GdMiEkp|)`*1akU3T^vI+&d;6D&Fiel;p!^(;1$y` zPLp^0qaEen&)$})xbp#HtHdE|VgDpuF^#tlcbjt5nQw_?2bso)dv#{MdZV$>FF@8kal^^MTCX zGi&3&{bIks%%R5+&p7c!|AWW#@4aEQbLHpU9F)Hu=rYw3*NBpo#FA92window, NULL, pixmap, mask ); + CString icon = g_strBitmapsPath; + icon += "icon.png"; + + GError *error = NULL; + + gtk_window_set_icon_from_file( GTK_WINDOW( window ), icon.GetBuffer(), &error ); + if ( error != NULL ) { + Sys_Printf( "Failed to load icon: %s\n", error->message ); + g_error_free( error ); + } } #endif