From 0184365c807d9ca2b414ff52d7d5c1b36e1e4d30 Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Fri, 3 Dec 2004 02:48:22 +0000 Subject: [PATCH] Fl_Help_View::topline() incorrectly set the changed() flag (STR #631) Fl_Choice::value() now supports NULL or -1 to deselect the current item (STR #637) More VC++ 6 project file fixes (STR #638) git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@3928 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- CHANGES | 5 +++++ FL/Fl_Menu_.H | 6 +++--- src/Fl_Choice.cxx | 6 +++--- src/Fl_Help_View.cxx | 5 ++--- visualc/fltkdll.dsp | 4 ++-- visualc/help.dsp | 4 ++-- visualc/libpng.dsp | 6 +++--- 7 files changed, 20 insertions(+), 16 deletions(-) diff --git a/CHANGES b/CHANGES index fc2152223..8ea76ca80 100644 --- a/CHANGES +++ b/CHANGES @@ -1,5 +1,10 @@ CHANGES IN FLTK 1.1.7 + - Fl_Help_View::topline() incorrectly set the changed() + flag (STR #631) + - Fl_Choice::value() now supports NULL or -1 to deselect + the current item (STR #637) + - More VC++ 6 project file fixes (STR #638) - Added missing Watcom makefile in the test directory (STR #636) - Fl_Text_Display::word_left would hang if the cursor diff --git a/FL/Fl_Menu_.H b/FL/Fl_Menu_.H index 54a62c95c..eb646af31 100644 --- a/FL/Fl_Menu_.H +++ b/FL/Fl_Menu_.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Menu_.H,v 1.7.2.4.2.10 2004/04/11 04:38:54 easysw Exp $" +// "$Id: Fl_Menu_.H,v 1.7.2.4.2.11 2004/12/03 02:48:21 easysw Exp $" // // Menu base class header file for the Fast Light Tool Kit (FLTK). // @@ -72,7 +72,7 @@ public: int mode(int i) const {return menu_[i].flags;} const Fl_Menu_Item *mvalue() const {return value_;} - int value() const {return (int)(value_-menu_);} + int value() const {return value_ ? (int)(value_-menu_) : -1;} int value(const Fl_Menu_Item*); int value(int i) {return value(menu_+i);} const char *text() const {return value_ ? value_->text : 0;} @@ -96,5 +96,5 @@ public: #endif // -// End of "$Id: Fl_Menu_.H,v 1.7.2.4.2.10 2004/04/11 04:38:54 easysw Exp $". +// End of "$Id: Fl_Menu_.H,v 1.7.2.4.2.11 2004/12/03 02:48:21 easysw Exp $". // diff --git a/src/Fl_Choice.cxx b/src/Fl_Choice.cxx index 090e06943..7029d51c9 100644 --- a/src/Fl_Choice.cxx +++ b/src/Fl_Choice.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_Choice.cxx,v 1.10.2.5.2.17 2004/04/29 02:47:09 easysw Exp $" +// "$Id: Fl_Choice.cxx,v 1.10.2.5.2.18 2004/12/03 02:48:21 easysw Exp $" // // Choice widget for the Fast Light Tool Kit (FLTK). // @@ -107,13 +107,13 @@ Fl_Choice::Fl_Choice(int X, int Y, int W, int H, const char *l) } int Fl_Choice::value(const Fl_Menu_Item *v) { - if (!v) return 0; if (!Fl_Menu_::value(v)) return 0; redraw(); return 1; } int Fl_Choice::value(int v) { + if (v == -1) return value((const Fl_Menu_Item *)0); if (v < 0 || v >= (size() - 1)) return 0; if (!Fl_Menu_::value(v)) return 0; redraw(); @@ -159,5 +159,5 @@ int Fl_Choice::handle(int e) { } // -// End of "$Id: Fl_Choice.cxx,v 1.10.2.5.2.17 2004/04/29 02:47:09 easysw Exp $". +// End of "$Id: Fl_Choice.cxx,v 1.10.2.5.2.18 2004/12/03 02:48:21 easysw Exp $". // diff --git a/src/Fl_Help_View.cxx b/src/Fl_Help_View.cxx index 10f52ab3f..125677d31 100644 --- a/src/Fl_Help_View.cxx +++ b/src/Fl_Help_View.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_Help_View.cxx,v 1.1.2.54 2004/09/24 16:00:10 easysw Exp $" +// "$Id: Fl_Help_View.cxx,v 1.1.2.55 2004/12/03 02:48:21 easysw Exp $" // // Fl_Help_View widget routines. // @@ -2597,7 +2597,6 @@ Fl_Help_View::topline(int t) // I - Top line number scrollbar_.value(topline_, h() - 24, 0, size_); - set_changed(); do_callback(); redraw(); @@ -2801,5 +2800,5 @@ hscrollbar_callback(Fl_Widget *s, void *) // -// End of "$Id: Fl_Help_View.cxx,v 1.1.2.54 2004/09/24 16:00:10 easysw Exp $". +// End of "$Id: Fl_Help_View.cxx,v 1.1.2.55 2004/12/03 02:48:21 easysw Exp $". // diff --git a/visualc/fltkdll.dsp b/visualc/fltkdll.dsp index b9ee77405..9a748ec3c 100644 --- a/visualc/fltkdll.dsp +++ b/visualc/fltkdll.dsp @@ -53,7 +53,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /dll /machine:I386 -# ADD LINK32 opengl32.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /version:1.0 /subsystem:windows /dll /pdb:"fltkdll.pdb" /machine:I386 /nodefaultlib:"libcmt" /nodefaultlib:"msvcrt" /out:"fltkdll.dll" +# ADD LINK32 opengl32.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /version:1.0 /subsystem:windows /dll /pdb:"fltkdll.pdb" /machine:I386 /out:"fltkdll.dll" # SUBTRACT LINK32 /pdb:none !ELSEIF "$(CFG)" == "fltkdll - Win32 Debug" @@ -80,7 +80,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 opengl32.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /version:1.0 /subsystem:windows /dll /pdb:"fltkdlld.pdb" /debug /machine:I386 /nodefaultlib:"libcmtd" /nodefaultlib:"msvcrt" /out:"fltkdlld.dll" /pdbtype:sept +# ADD LINK32 opengl32.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /version:1.0 /subsystem:windows /dll /pdb:"fltkdlld.pdb" /debug /machine:I386 /out:"fltkdlld.dll" /pdbtype:sept # SUBTRACT LINK32 /pdb:none /incremental:no !ENDIF diff --git a/visualc/help.dsp b/visualc/help.dsp index cde2d9099..10534758f 100644 --- a/visualc/help.dsp +++ b/visualc/help.dsp @@ -53,7 +53,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 fltk.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd" /nodefaultlib:"libcmt" /out:"../test/help.exe" /libpath:"..\lib" +# ADD LINK32 wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 /out:"../test/help.exe" /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:yes !ELSEIF "$(CFG)" == "help - Win32 Debug" @@ -80,7 +80,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 fltkd.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libc" /nodefaultlib:"libcd" /nodefaultlib:"libcmt" /nodefaultlib:"libcmtd" /out:"../test/helpd.exe" /pdbtype:sept /libpath:"..\lib" +# ADD LINK32 wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd" /out:"../test/helpd.exe" /pdbtype:sept /libpath:"..\lib" # SUBTRACT LINK32 /pdb:none /incremental:no !ENDIF diff --git a/visualc/libpng.dsp b/visualc/libpng.dsp index 44ef669e3..1d4ea9787 100644 --- a/visualc/libpng.dsp +++ b/visualc/libpng.dsp @@ -41,7 +41,7 @@ RSC=rc.exe # PROP Intermediate_Dir "Release" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /Ot /Op /Ob2 /I "..\zlib-1.1.3" /I "../visualc" /I "../zlib" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /Ot /Op /Ob2 /I "../visualc" /I "../zlib" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c # SUBTRACT CPP /Os # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 @@ -50,7 +50,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\fltkpng.lib" +# ADD LIB32 /nologo /out:"..\lib\fltkpng.lib" !ELSEIF "$(CFG)" == "libpng - Win32 Debug" @@ -65,7 +65,7 @@ LIB32=link.exe -lib # PROP Intermediate_Dir "Debug" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MDd /GX /Zi /Od /I "..\zlib-1.1.3" /I "../visualc" /I "../zlib" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c +# ADD CPP /nologo /MDd /GX /Zi /Od /I "../visualc" /I "../zlib" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 BSC32=bscmake.exe