diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 1999-01-04 19:25:40 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 1999-01-04 19:25:40 +0000 |
| commit | b95db33f2cbd30213cadd4859f567e1dae32ef47 (patch) | |
| tree | a28848521b20e06870490ebacf7bd22e3aa6dedc /src/Fl_x.cxx | |
| parent | ea2cbbd5530915c508e86fed9a437adb0b2149f8 (diff) | |
Lots of changes:
- Added #defines for Visual C++ to speed up compiles.
- Added FLTK.DLL project to visualc directory.
- Added editor project to visualc directory.
- Added icon() method to Fl_Window class.
- Implemented xclass() method for WIN32.
- Fixed extern declaration of fl_send_extra_move in Fl_Menu_Window.cxx.
- scandir_win32.c needed to include <stdlib.h>.
- Added fix from Bill for fl_width() bug.
- Updated fix for Fl_Input to default to FL_DOWN_BOX.
- Added visible() check for children of Fl_Pack.
- Added WinMain() function to library.
- Now show console window in debug mode.
- Fixed demo.menu and demo.cxx to work under WIN32.
git-svn-id: file:///fltk/svn/fltk/trunk@180 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/Fl_x.cxx')
| -rw-r--r-- | src/Fl_x.cxx | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/Fl_x.cxx b/src/Fl_x.cxx index 6f2383afd..49613f267 100644 --- a/src/Fl_x.cxx +++ b/src/Fl_x.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_x.cxx,v 1.17 1998/12/29 14:08:07 mike Exp $" +// "$Id: Fl_x.cxx,v 1.18 1999/01/04 19:25:03 mike Exp $" // // X specific code for the Fast Light Tool Kit (FLTK). // @@ -656,6 +656,15 @@ void Fl_X::make_xid(Fl_Window* w, XVisualInfo *visual, Colormap colormap) (unsigned char *)buffer, p-buffer-1); } + // Set the icon pixmap as needed: + if (w->icon()) { + XWMHints hints; + + hints.icon_pixmap = (Pixmap)w->icon(); + hints.flags = IconPixmapHint; + XSetWMHints(fl_display, x->xid, &hints); + } + if (w->non_modal() && x->next && !fl_disable_transient_for) { // find some other window to be "transient for": Fl_Window* w = x->next->w; @@ -818,5 +827,5 @@ void Fl_Window::make_current() { #endif // -// End of "$Id: Fl_x.cxx,v 1.17 1998/12/29 14:08:07 mike Exp $". +// End of "$Id: Fl_x.cxx,v 1.18 1999/01/04 19:25:03 mike Exp $". // |