Author: fabien
Date: 2007-04-02 11:39:41 -0400 (Mon, 02 Apr 2007)
New Revision: 5752
Log:
- Fixed hard coded path reference to if image in fluid about_panel.fl
- Fixed minor warnings due to incorrect casts
- Added TODO file to ide/visualc project
 


Modified:
   branches/fctrunk/
   branches/fctrunk/TODO
   branches/fctrunk/fltk/AnsiWidget.h
   branches/fctrunk/fluid/about_panel.fl
   branches/fctrunk/ide/visualc/fltk_images.lib.dsp
   branches/fctrunk/src/AnsiWidget.cxx
   branches/fctrunk/src/win32/Image.cxx


Property changes on: branches/fctrunk
___________________________________________________________________
Name: merge-revision
   - 4886
   + 5751
Name: merge-baserev
   + 5751

Modified: branches/fctrunk/TODO
===================================================================
--- branches/fctrunk/TODO	2007-04-02 13:22:14 UTC (rev 5751)
+++ branches/fctrunk/TODO	2007-04-02 15:39:41 UTC (rev 5752)
@@ -1,6 +1,5 @@
 FLTK 2.0 TODO
 -------------
-
 	- Fix configure script and makefiles.
 	- fltk::FloatInput/IntInput doesn't return 1 from handle
 	  for non-number characters; this means that those
@@ -14,9 +13,6 @@
 	  WAS: inactive widgets should not have focus so this
 	  should not be a problem. However may be a problem for
 	  Browser which shows selection even when it does not have focus.
-	- fltk::Tabs needs to be updated to use the 1.1.x
-	  drawing code.
-	  WAS: I personally prefer the diagonal tabs.
 	- FLUID widget panel has random widgets in red?
 	  WAS: that is supposed to indicate which are set to
 	  non-default values, but it may be broken.

Modified: branches/fctrunk/fltk/AnsiWidget.h
===================================================================
--- branches/fctrunk/fltk/AnsiWidget.h	2007-04-02 13:22:14 UTC (rev 5751)
+++ branches/fctrunk/fltk/AnsiWidget.h	2007-04-02 15:39:41 UTC (rev 5752)
@@ -32,7 +32,7 @@
 
 class AnsiWidget : public Widget {
     public:
-    AnsiWidget(int x, int y, int w, int h, int defsize);
+    AnsiWidget(int x, int y, int w, int h, float defsize);
     virtual ~AnsiWidget();
 
     // inherited methods
@@ -59,7 +59,7 @@
     int textHeight(void);
     int getWidth()  {return w();}
     int getHeight() {return h();}
-    void setFontSize(int i) {labelsize(i);}
+    void setFontSize(float i) {labelsize(i);}
     int getFontSize() {return (int)labelsize();}
     void beep() const;
     static Color ansiToFltk(long color);

Modified: branches/fctrunk/fluid/about_panel.fl
===================================================================
--- branches/fctrunk/fluid/about_panel.fl	2007-04-02 13:22:14 UTC (rev 5751)
+++ branches/fctrunk/fluid/about_panel.fl	2007-04-02 15:39:41 UTC (rev 5752)
@@ -14,7 +14,7 @@
   } {
     {fltk::Group} display_group {selected
       xywh {0 0 550 400}
-      image {/home/fabien/devl/fltk/trunk/pixmaps/fluid/fluid_about.gif}
+      image {fluid_about.gif}
       extra_code {o->resizable(o);}
     } {
       {fltk::ReturnButton} about_ok {

Modified: branches/fctrunk/ide/visualc/fltk_images.lib.dsp
===================================================================
(Binary files differ)

Modified: branches/fctrunk/src/AnsiWidget.cxx
===================================================================
--- branches/fctrunk/src/AnsiWidget.cxx	2007-04-02 13:22:14 UTC (rev 5751)
+++ branches/fctrunk/src/AnsiWidget.cxx	2007-04-02 15:39:41 UTC (rev 5752)
@@ -105,7 +105,7 @@
 
 /*! Standard constructor for a widget.
  */
-AnsiWidget::AnsiWidget(int x, int y, int w, int h, int defsize) : 
+AnsiWidget::AnsiWidget(int x, int y, int w, int h, float defsize) : 
   Widget(x, y, w, h, 0) {
   labelsize(defsize);
   init();
@@ -327,7 +327,7 @@
   begin_offscreen();
   // needs to return a -ve number to distiguish from basic 16 color values
   // unpacked in later calls to ansiToFltk()
-  return -::GetPixel(fl_bitmap_dc, x, y);
+  return - (int) ::GetPixel(fl_bitmap_dc, x, y);
 
 #else
   XImage *image = 
@@ -632,12 +632,12 @@
         setcolor(labelcolor());
         fillrect(Rectangle(curX, curY, cx, fontHeight));
         setcolor(color());
-        drawtext((const char*)p, numChars, curX, curY+ascent);
+        drawtext((const char*)p, numChars, (float) curX, (float) curY+ascent); 
       } else {
         setcolor(color());
         fillrect(Rectangle(curX, curY, cx, fontHeight));
         setcolor(labelcolor());
-        drawtext((const char*)p, numChars, curX, curY+ascent);
+        drawtext((const char*)p, numChars, (float) curX, (float) curY+ascent);
       }
 
       if (underline) {

Modified: branches/fctrunk/src/win32/Image.cxx
===================================================================
--- branches/fctrunk/src/win32/Image.cxx	2007-04-02 13:22:14 UTC (rev 5751)
+++ branches/fctrunk/src/win32/Image.cxx	2007-04-02 15:39:41 UTC (rev 5752)
@@ -252,7 +252,7 @@
 void Image::fetch_if_needed() const {
   if (pixeltype_==MASK) {
     int fg = fltk::get_color_index(fltk::getcolor())&0xffffff00;
-    if ((flags & 0xffffff00) != fg)
+    if (int(flags & 0xffffff00) != fg)
       (const_cast<Image*>(this))->flags = (flags&0xff&~FETCHED)|fg;
   }
   if (!(flags&FETCHED)) {