From 1b38bbdd2e58f62009f958fe0bb87131c0897ebb Mon Sep 17 00:00:00 2001
From: Albrecht Schlosser <albrechts.fltk@online.de>
Date: Wed, 11 Feb 2015 00:30:53 +0000
Subject: Fix window icon when set before Fl_Window::show() - Windows only.

The window icon was reset during show() if it was set before show(),
because Fl_X::make() didn't check the new RGB image icons. Hence the
previously set Fl_RGB_Image icon was ignored and replaced by the default
Windows application icon.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10570 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
---
 src/Fl_win32.cxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/Fl_win32.cxx b/src/Fl_win32.cxx
index ea2f352ea..f028d7618 100644
--- a/src/Fl_win32.cxx
+++ b/src/Fl_win32.cxx
@@ -1789,7 +1789,7 @@ Fl_X* Fl_X::make(Fl_Window* w) {
     wcw.lpfnWndProc = (WNDPROC)WndProc;
     wcw.cbClsExtra = wcw.cbWndExtra = 0;
     wcw.hInstance = fl_display;
-    if (!w->icon())
+    if (!w->icon() && !w->icon_->count)
       w->icon((void *)LoadIcon(NULL, IDI_APPLICATION));
     wcw.hIcon = wcw.hIconSm = (HICON)w->icon();
     wcw.hCursor = LoadCursor(NULL, IDC_ARROW);
-- 
cgit v1.2.3