diff options
| author | Matthias Melcher <fltk@matthiasm.com> | 2006-06-28 10:23:33 +0000 |
|---|---|---|
| committer | Matthias Melcher <fltk@matthiasm.com> | 2006-06-28 10:23:33 +0000 |
| commit | d20a41681d9e50c6516b1543e443f5909b25ff96 (patch) | |
| tree | 86712bde995bf573cd6f7b2003dca355af83fba3 /src | |
| parent | a794dcf8ee25956c7936663e758b702dcade8da1 (diff) | |
Fixed Fl_Window::copy_label() losing copy (STR #1332)
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@5251 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src')
| -rw-r--r-- | src/Fl_Window.cxx | 7 | ||||
| -rw-r--r-- | src/Fl_win32.cxx | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/Fl_Window.cxx b/src/Fl_Window.cxx index 5425aaa1d..84b3d119f 100644 --- a/src/Fl_Window.cxx +++ b/src/Fl_Window.cxx @@ -100,10 +100,11 @@ int Fl_Window::y_root() const { void Fl_Window::draw() { const char *savelabel = label(); - uchar saveflags = flags(); + int saveflags = flags(); int savex = x(); x(0); int savey = y(); y(0); // Make sure we don't draw the window title in the window background... + clear_flag(COPIED_LABEL); // do not free copied labels! Fl_Widget::label(0); Fl_Group::draw(); #ifdef __APPLE_QUARTZ__ @@ -133,7 +134,9 @@ void Fl_Window::draw() { x(savex); } -void Fl_Window::label(const char *name) {label(name, iconlabel());} +void Fl_Window::label(const char *name) { + label(name, iconlabel()); +} void Fl_Window::copy_label(const char *a) { if (flags() & COPIED_LABEL) { diff --git a/src/Fl_win32.cxx b/src/Fl_win32.cxx index ed0a41c34..3f6e3a052 100644 --- a/src/Fl_win32.cxx +++ b/src/Fl_win32.cxx @@ -1303,7 +1303,7 @@ Fl_X* Fl_X::make(Fl_Window* w) { Fl::e_number = old_event; w->redraw(); // force draw to happen } - // If we've captured the mouse, we dont want do activate any + // If we've captured the mouse, we dont want to activate any // other windows from the code, or we loose the capture. ShowWindow(x->xid, !showit ? SW_SHOWMINNOACTIVE : (Fl::grab() || (style & WS_POPUP)) ? SW_SHOWNOACTIVATE : SW_SHOWNORMAL); |