Updated 1.3 with changes from 1.1.9

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

CMakeLists.txt

@@ -6,8 +6,8 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.0)
 
 # The FLTK version
 SET(FLTK_VERSION_MAJOR "1")
-SET(FLTK_VERSION_MINOR "1")
+SET(FLTK_VERSION_MINOR "3")
-SET(FLTK_VERSION_PATCH "7")
+SET(FLTK_VERSION_PATCH "0")
 SET(FLTK_VERSION "${FLTK_VERSION_MAJOR}.${FLTK_VERSION_MINOR}")
 SET(FLTK_VERSION_FULL "${FLTK_VERSION}.${FLTK_VERSION_PATCH}")
 

configure.in

@@ -35,8 +35,8 @@ AC_INIT(src/Fl.cxx)
 
 dnl FLTK library versions...
 FL_MAJOR_VERSION=1
-FL_MINOR_VERSION=1
+FL_MINOR_VERSION=3
-FL_PATCH_VERSION=8
+FL_PATCH_VERSION=0
 FL_API_VERSION=${FL_MAJOR_VERSION}.${FL_MINOR_VERSION}
 
 AC_SUBST(FL_MAJOR_VERSION)

fluid/Fl_Window_Type.cxx

@@ -501,9 +501,15 @@ Fl_Window_Type Fl_Window_type;
 // Resize from window manager...
 void Overlay_Window::resize(int X,int Y,int W,int H) {
   Fl_Widget* t = resizable(); resizable(0);
+
+  // do not set the mod flag if the window was not resized. In FLUID, all
+  // windows are opened without a given x/y position, so modifying x/y
+  // should not mark the project as dirty
+  if (W!=w() || H!=h())
+    set_modflag(1);
+
   Fl_Overlay_Window::resize(X,Y,W,H);
   resizable(t);
-  set_modflag(1);
   update_xywh();
 }
 

src/Fl_File_Chooser.cxx

@@ -218,7 +218,7 @@ Fl_File_Chooser::Fl_File_Chooser(const char *d, const char *p, int t, const char
         fileName->callback((Fl_Callback*)cb_fileName);
         fileName->when(FL_WHEN_ENTER_KEY);
         Fl_Group::current()->resizable(fileName);
-        fileName->when(FL_WHEN_CHANGED | FL_WHEN_ENTER_KEY_ALWAYS);
+        fileName->when(FL_WHEN_CHANGED | FL_WHEN_ENTER_KEY);
       } // Fl_File_Input* fileName
       { Fl_Box* o = new Fl_Box(10, 310, 105, 25, "Filename:");
         o->labelfont(1);

src/Fl_File_Chooser.fl

@@ -123,7 +123,7 @@ window->hide();}
         Fl_File_Input fileName {
           callback {fileNameCB();}
           private xywh {115 300 365 35} labelfont 1 when 8 resizable
-          code0 {fileName->when(FL_WHEN_CHANGED | FL_WHEN_ENTER_KEY_ALWAYS);}
+          code0 {fileName->when(FL_WHEN_CHANGED | FL_WHEN_ENTER_KEY);}
         }
         Fl_Box {} {
           label {Filename:}

src/Fl_File_Chooser2.cxx

@@ -134,9 +134,12 @@ Fl_File_Chooser::count() {
   for (i = 1, fcount = 0; i <= fileList->size(); i ++)
     if (fileList->selected(i)) {
       // See if this file is a directory...
-      filename = (char *)fileList->text(i);
+      // matt: why would we do that? It is perfectly legal to select multiple
+      // directories in a DIR chooser. They are visually selected and value(i)
+      // returns all of them as expected
+      //filename = (char *)fileList->text(i);
 
-      if (filename[strlen(filename) - 1] != '/')
+      //if (filename[strlen(filename) - 1] != '/')
 	fcount ++;
     }
 
@@ -505,8 +508,8 @@ Fl_File_Chooser::fileNameCB()
 		first_line;	// First matching line
   const char	*file;		// File from directory
 
-
 //  puts("fileNameCB()");
+//  printf("Event: %s\n", fl_eventnames[Fl::event()]);
 
   // Get the filename from the text field...
   filename = (char *)fileName->value();

src/Fl_Help_View.cxx

@@ -2872,7 +2872,7 @@ void Fl_Help_View::end_selection(int clipboard)
           *d++ = *src++;
         }
         c = src[-1];
-        p = isspace(c) ? ' ' : c;
+        p = isspace(c&255) ? ' ' : c;
       }
       continue;
     }
@@ -2888,7 +2888,7 @@ void Fl_Help_View::end_selection(int clipboard)
     }
     int n = s-value_;
     if (n>selection_first && n<=selection_last) {
-      if (!pre && isspace(c)) c = ' ';
+      if (!pre && isspace(c&255)) c = ' ';
       if (p!=' '||c!=' ')
         *d++ = c;
       p = c;

test/file_chooser.cxx

@@ -315,8 +315,9 @@ show_callback(void)
 
   fc->show();
 
-  while (fc->visible())
+  while (fc->visible()) {
     Fl::wait();
+  }
 
   count = fc->count();
   if (count > 0)