Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/intern
diff options
context:
space:
mode:
authorSimon Clitherow <aphex@nildram.co.uk>2003-12-12 23:21:35 +0300
committerSimon Clitherow <aphex@nildram.co.uk>2003-12-12 23:21:35 +0300
commit8d94f3723d2535677a5610abfaf1d20a53b0267f (patch)
tree1e88e8a89e146b7e5192488788d69f0835acc061 /intern
parent57afdf5231352e3c10ed967daa19ed97ee93ec02 (diff)
Removed an '#ifndef FREE_WINDOWS' statement that prevented
a gcc/cygwin built Blender from showing the Blender app icon in the main window title bar. Only a minor issue, but it annoyed me long enough to want to fix it!
Diffstat (limited to 'intern')
-rw-r--r--intern/ghost/intern/GHOST_SystemWin32.cpp5
1 files changed, 1 insertions, 4 deletions
diff --git a/intern/ghost/intern/GHOST_SystemWin32.cpp b/intern/ghost/intern/GHOST_SystemWin32.cpp
index 1db695d8107..b11dd7b3cc8 100644
--- a/intern/ghost/intern/GHOST_SystemWin32.cpp
+++ b/intern/ghost/intern/GHOST_SystemWin32.cpp
@@ -317,11 +317,8 @@ GHOST_TSuccess GHOST_SystemWin32::init()
wc.cbClsExtra= 0;
wc.cbWndExtra= 0;
wc.hInstance= ::GetModuleHandle(0);
- #ifndef FREE_WINDOWS
wc.hIcon = ::LoadIcon(wc.hInstance, "APPICON");
- #else
- wc.hIcon = ::LoadIcon(NULL, "APPICON");
- #endif
+
if (!wc.hIcon) {
::LoadIcon(NULL, IDI_APPLICATION);
}