Polygon drawing fixed fltk#765, fl_message wrapped in Fl_Group::curre…

…nt(0), so it doesn't end up inside some current group fltk#253. Undefined 'check' in Fl_Menu_Item_, so it will compile as an Apple XCode project (to be delivered later).. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4154 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
junyang0412 · Mar 21, 2005 · 562198f · 562198f
1 parent 0576685
commit 562198f
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 1 deletion.
diff --git a/CHANGES b/CHANGES
@@ -1,5 +1,8 @@
 CHANGES IN FLTK 1.1.7
 
+	- Fixed Quickdraw drawing of 3 and 4 sided polygons (STR #765)
+	- Fixed fl_message code so that it does not get accidentaly
+	  addded to the current group (STR #253)
 	- Documentation fixes (STR #648, STR #692, STR #730, STR
 	  #744, STR #745)
 	- FLUID now highlights code in the widget callback and

diff --git a/FL/Fl_Menu_Item.H b/FL/Fl_Menu_Item.H
@@ -29,7 +29,7 @@
 #  include "Fl_Widget.H"
 #  include "Fl_Image.H"
 
-#  if defined(__APPLE__) && defined(__MWERKS__) && defined(check)
+#  if defined(__APPLE__) && defined(check)
 #    undef check
 #  endif
 

diff --git a/src/fl_ask.cxx b/src/fl_ask.cxx
@@ -59,6 +59,11 @@ static Fl_Window *makeform() {
    message_form->size(410,103);
    return message_form;
  }
+ // make sure that the dialog does not become the child of some 
+ // current group
+ Fl_Group *previously_current_group = Fl_Group::current();
+ Fl_Group::current(0);
+ // create a new top level window
  Fl_Window *w = message_form = new Fl_Window(410,103,"");
  // w->clear_border();
  // w->box(FL_UP_BOX);
@@ -82,6 +87,7 @@ static Fl_Window *makeform() {
  w->resizable(new Fl_Box(60,10,110-60,27));
  w->end();
  w->set_modal();
+ Fl_Group::current(previously_current_group);
  return w;
 }
 

diff --git a/src/fl_rect.cxx b/src/fl_rect.cxx
@@ -346,8 +346,10 @@ void fl_polygon(int x, int y, int x1, int y1, int x2, int y2) {
   MoveTo(x, y);
   LineTo(x1, y1);
   LineTo(x2, y2);
+  LineTo(x, y);
   ClosePoly();
   PaintPoly(poly);
+  FramePoly(poly);
   KillPoly(poly);
 #elif defined(__APPLE_QUARTZ__)
   CGContextMoveToPoint(fl_gc, x, y);
@@ -377,8 +379,10 @@ void fl_polygon(int x, int y, int x1, int y1, int x2, int y2, int x3, int y3) {
   LineTo(x1, y1);
   LineTo(x2, y2);
   LineTo(x3, y3);
+  LineTo(x, y);
   ClosePoly();
   PaintPoly(poly);
+  FramePoly(poly);
   KillPoly(poly);
 #elif defined(__APPLE_QUARTZ__)
   CGContextMoveToPoint(fl_gc, x, y);