diff options
| author | Bill Spitzak <spitzak@gmail.com> | 1999-10-14 04:56:09 +0000 |
|---|---|---|
| committer | Bill Spitzak <spitzak@gmail.com> | 1999-10-14 04:56:09 +0000 |
| commit | ce249490d4ada2885c2058a5177e544be702769b (patch) | |
| tree | c917a318e108be83b2bf8b4180d5cb4d3ff460ee /src/Fl_Input.cxx | |
| parent | 4ccf6b4b378363bc96d48e433d905d2b24250cc6 (diff) | |
These are some (hopefully minor) changes we keep needing to edit into
each new version of fltk for use at Digital Domain. These were found by
running a diff between 1.0.6 and our inhouse version.
1. WinMain is moved to the fl_call_main.c file so that it can easily be
conditionally-compiled out (code copied from fltk 2.0, not tested!)
2. Fl_win32 ignores the value of window->xclass(). This seemed to cause
problems when windows had different xclass() in the same app and did not
have any useful effect on windows. This value is changed to set the icon
of the app on X.
3. sgi pragmas added to x.H to turn off warnings from their broken xlib
header files. Please tell me if this causes any sgi compilers to complain,
we should add more stuff to the #ifdef to stop that.
4. Fl_Gl_Window::ortho() changed so that text and images are not erased
if the origin is off the left/bottom of the window.
5. Small change to Fl_Input so that a click that gives it the focus also
selects all the text. This is more windoze-like and it seems the users
really like it.
Note also that we had to set USE_XDBE to zero to get things to work on
the newest Irix machines. I give up, Xdbe has been nothing but an impossible
and confusing mess and it is obvious that the X servers are not testing it
and thus it is suffering from software rot so it is unlikely to work anywhere
in the future. Not sure if we want to switch it off in the official version,
though.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.0@774 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/Fl_Input.cxx')
| -rw-r--r-- | src/Fl_Input.cxx | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/Fl_Input.cxx b/src/Fl_Input.cxx index d0e1fc8a3..70648bf6f 100644 --- a/src/Fl_Input.cxx +++ b/src/Fl_Input.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_Input.cxx,v 1.10.2.1 1999/04/20 04:43:24 bill Exp $" +// "$Id: Fl_Input.cxx,v 1.10.2.2 1999/10/14 04:56:08 bill Exp $" // // Input widget for the Fast Light Tool Kit (FLTK). // @@ -313,11 +313,18 @@ int Fl_Input::handle(int event) { compose = 0; if (Fl::event_button() == 2) { Fl::paste(*this); - if (Fl::focus()==this) return 1; // remove line for Motif behavior +#ifndef MOTIF // use -DMOTIF for Motif rather than Win32+Motif hybrid + if (Fl::focus()==this) return 1; +#endif } if (Fl::focus() != this) { Fl::focus(this); handle(FL_FOCUS); // cause minimal update +#ifndef MOTIF + position(size(),0); // select everything + Fl::event_is_click(0); // prevents next click from doing word-select + return 1; +#endif } break; @@ -337,5 +344,5 @@ Fl_Input::Fl_Input(int x, int y, int w, int h, const char *l) } // -// End of "$Id: Fl_Input.cxx,v 1.10.2.1 1999/04/20 04:43:24 bill Exp $". +// End of "$Id: Fl_Input.cxx,v 1.10.2.2 1999/10/14 04:56:08 bill Exp $". // |