More doco updates.

FLUID's Layout->Center In Group functionality did not properly
handle widgets that were children of a Fl_Window widget (STR
#318)

The Fl_Text_Display destructor did not remove the predelete
callback associated with the current buffer (STR #332)

Fixed several bugs in the MacOS X Fl::add_fd() handling (STR
#333, STR #337)

The Fl_Text_Display widget did not display selections set by the
application (STR #322)


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@3299 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

CHANGES

@@ -1,7 +1,17 @@
 CHANGES IN FLTK 1.1.5rc1
 
 	- Documentation updates (STR #245, STR #250, STR #277,
-	  STR #281)
+	  STR #281, STR #328, STR #338)
+	- FLUID's Layout->Center In Group functionality did not
+	  properly handle widgets that were children of a
+	  Fl_Window widget (STR #318)
+	- The Fl_Text_Display destructor did not remove the
+	  predelete callback associated with the current buffer
+	  (STR #332)
+	- Fixed several bugs in the MacOS X Fl::add_fd()
+	  handling (STR #333, STR #337)
+	- The Fl_Text_Display widget did not display selections
+	  set by the application (STR #322)
 	- FLUID crashed if you did layout with a window widget
 	  (STR #317)
 	- Fl_Scroll::clear() didn't remove the child widget from

documentation/Fl_Menu_.html

@@ -45,7 +45,7 @@ be "private": a dynamically allocated array managed by the Fl_Menu_.
 <LI><A href=#Fl_Menu_.copy>copy</A></LI>
 <LI><A href=#Fl_Menu_.down_box>down_box</A></LI>
 <LI><A href=#Fl_Menu_.global>global</A></LI>
-<LI><A href=#Fl_Menu_.item_pathname>global</A></LI>
+<LI><A href=#Fl_Menu_.item_pathname>item_pathname</A></LI>
 <LI><A href=#Fl_Menu_.menu>menu</A></LI>
 </UL>
 </TD><TD align=left valign=top>
@@ -146,12 +146,13 @@ that the new entry was placed at.</P>
 FL_CTRL+'A') or a string describing the shortcut in one of two ways:</p>
 
 <pre>
-  [#+^]<ascii_value>     eg. "97", "^97", "+97", "#97"
+  [#+^]&lt;ascii_value&gt;    eg. "97", "^97", "+97", "#97"
-  [#+^]<ascii_char>      eg. "a", "^a", "+a", "#a"
+  [#+^]&lt;ascii_char&gt;     eg. "a", "^a", "+a", "#a"
 </pre>
-..where <ascii_value> is a decimal value representing an ascii character
+..where &lt;ascii_value&gt; is a decimal value representing an
-(eg. 97 is the ascii for 'a'), and the optional prefixes enhance the value 
+ascii character (eg. 97 is the ascii for 'a'), and the optional
-that follows. Multiple prefixes must appear in the above order.
+prefixes enhance the value  that follows. Multiple prefixes must
+appear in the above order.
 <pre>
   # - Alt
   + - Shift
@@ -215,7 +216,7 @@ not have to be put in a window at all).
 one will replace the old one.  There is no way to remove the <TT>
 global()</TT> setting (so don't destroy the widget!)</P>
 
-<h4><a name='Fl_Menu_.item_pathnaem'>int Fl_Menu_::item_pathname(char *name, int namelen ) const;</a><br>
+<h4><a name=Fl_Menu_.item_pathname>int Fl_Menu_::item_pathname(char *name, int namelen ) const;</a><br>
 int Fl_Menu_::item_pathname(char *name, int namelen,
                             const Fl_Menu_Item *finditem) const;</h4>
 

fluid/align_widget.cxx

@@ -1,5 +1,5 @@
 //
-// "$Id: align_widget.cxx,v 1.1.2.4 2004/04/06 02:47:25 easysw Exp $"
+// "$Id: align_widget.cxx,v 1.1.2.5 2004/04/06 17:38:36 easysw Exp $"
 //
 // alignment code for the Fast Light Tool Kit (FLTK).
 //
@@ -303,7 +303,10 @@ void align_widget_cb(Fl_Widget*, long how)
       {
 	Fl_Widget *w = ((Fl_Widget_Type *)o)->o;
 	Fl_Widget *p = ((Fl_Widget_Type *)o->parent)->o;
-	int center2 = 2*p->x()+p->w();
+	int center2;
+
+	if (w->window() == p) center2 = p->w();
+	else center2 = 2*p->x()+p->w();
 	w->resize((center2-w->w())/2, w->y(), w->w(), w->h());
 	w->redraw();
 	if (w->window()) w->window()->redraw();
@@ -315,7 +318,10 @@ void align_widget_cb(Fl_Widget*, long how)
       {
 	Fl_Widget *w = ((Fl_Widget_Type *)o)->o;
 	Fl_Widget *p = ((Fl_Widget_Type *)o->parent)->o;
-	int center2 = 2*p->y()+p->h();
+	int center2;
+
+	if (w->window() == p) center2 = p->h();
+	else center2 = 2*p->y()+p->h();
 	w->resize(w->x(), (center2-w->h())/2, w->w(), w->h());
 	w->redraw();
 	if (w->window()) w->window()->redraw();
@@ -326,6 +332,6 @@ void align_widget_cb(Fl_Widget*, long how)
 
 
 //
-// End of "$Id: align_widget.cxx,v 1.1.2.4 2004/04/06 02:47:25 easysw Exp $".
+// End of "$Id: align_widget.cxx,v 1.1.2.5 2004/04/06 17:38:36 easysw Exp $".
 //
 

src/Fl_Text_Display.cxx

@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_Text_Display.cxx,v 1.12.2.49 2004/03/01 02:05:02 easysw Exp $"
+// "$Id: Fl_Text_Display.cxx,v 1.12.2.50 2004/04/06 17:38:36 easysw Exp $"
 //
 // Copyright 2001-2003 by Bill Spitzak and others.
 // Original code Copyright Mark Edel.  Permission to distribute under
@@ -143,7 +143,10 @@ Fl_Text_Display::Fl_Text_Display(int X, int Y, int W, int H,  const char* l)
 ** freed, nor are the style buffer or style table.
 */
 Fl_Text_Display::~Fl_Text_Display() {
-  if (mBuffer) mBuffer->remove_modify_callback(buffer_modified_cb, this);
+  if (mBuffer) {
+    mBuffer->remove_modify_callback(buffer_modified_cb, this);
+    mBuffer->remove_predelete_callback(buffer_predelete_cb, this);
+  }
   if (mLineStarts) delete[] mLineStarts;
 }
 
@@ -1583,13 +1586,15 @@ void Fl_Text_Display::draw_string( int style, int X, int Y, int toX,
     font  = styleRec->font;
     fsize = styleRec->size;
 
-    if ( style & (HIGHLIGHT_MASK | PRIMARY_MASK) && Fl::focus() == this) {
+    if (style & (HIGHLIGHT_MASK | PRIMARY_MASK)) {
-      background = selection_color();
+      if (Fl::focus() == this) background = selection_color();
+      else background = fl_color_average(color(), selection_color(), 0.5f);
     } else background = color();
 
     foreground = fl_contrast(styleRec->color, background);
-  } else if ( style & (HIGHLIGHT_MASK | PRIMARY_MASK) && Fl::focus() == this ) {
+  } else if (style & (HIGHLIGHT_MASK | PRIMARY_MASK)) {
-    background = selection_color();
+    if (Fl::focus() == this) background = selection_color();
+    else background = fl_color_average(color(), selection_color(), 0.5f);
     foreground = fl_contrast(textcolor(), background);
   } else {
     foreground = textcolor();
@@ -3061,5 +3066,5 @@ int Fl_Text_Display::handle(int event) {
 
 
 //
-// End of "$Id: Fl_Text_Display.cxx,v 1.12.2.49 2004/03/01 02:05:02 easysw Exp $".
+// End of "$Id: Fl_Text_Display.cxx,v 1.12.2.50 2004/04/06 17:38:36 easysw Exp $".
 //