diff options
| author | Albrecht Schlosser <albrechts.fltk@online.de> | 2015-02-11 00:30:53 +0000 |
|---|---|---|
| committer | Albrecht Schlosser <albrechts.fltk@online.de> | 2015-02-11 00:30:53 +0000 |
| commit | 1b38bbdd2e58f62009f958fe0bb87131c0897ebb (patch) | |
| tree | 2527ac1d7319d86ac97cf606c7b0ebeb3a9f8724 | |
| parent | b72f2783eb5b08b5c6f70f0f2acbd3a7af4cce3e (diff) | |
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
| -rw-r--r-- | src/Fl_win32.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
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); |