Author: spitzak
Date: 2007-04-07 18:14:29 -0400 (Sat, 07 Apr 2007)
New Revision: 5766
Log:
Changed if's to the arrangement used in other source files

Modified:
   trunk/src/AnsiWidget.cxx
   trunk/test/keyboard_ui.cxx
   trunk/test/tabs.cxx

Modified: trunk/src/AnsiWidget.cxx
===================================================================
--- trunk/src/AnsiWidget.cxx	2007-04-06 14:31:47 UTC (rev 5765)
+++ trunk/src/AnsiWidget.cxx	2007-04-07 22:14:29 UTC (rev 5766)
@@ -324,14 +324,7 @@
 /*! returns the color of the pixel at the given xy location
  */
 int AnsiWidget::getPixel(int x, int y) {
-#if defined(WIN32) 
-  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);
-#elif defined(__APPLE__)
-  // TODO !
-#else
+#if USE_X11
   XImage *image = 
     XGetImage(fltk::xdisplay, xwindow, x, y, 1, 1, AllPlanes, ZPixmap);
   if (image) {
@@ -339,6 +332,13 @@
     XDestroyImage(image);
     return -color;
   }
+#elif defined(_WIN32)
+  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);
+#elif defined(__APPLE__)
+  // TODO !
 #endif
   return 0;
 }

Modified: trunk/test/keyboard_ui.cxx
===================================================================
--- trunk/test/keyboard_ui.cxx	2007-04-06 14:31:47 UTC (rev 5765)
+++ trunk/test/keyboard_ui.cxx	2007-04-07 22:14:29 UTC (rev 5766)
@@ -11,6 +11,7 @@
   fltk::Window* w;
    {fltk::Window* o = new fltk::Window(490, 190);
     w = o;
+    o->shortcut(0xff1b);
     o->begin();
      {fltk::Output* o = key_output = new fltk::Output(15, 15, 170, 30, "Fl::event_key():");
       o->textfont(fltk::COURIER);

Modified: trunk/test/tabs.cxx
===================================================================
--- trunk/test/tabs.cxx	2007-04-06 14:31:47 UTC (rev 5765)
+++ trunk/test/tabs.cxx	2007-04-07 22:14:29 UTC (rev 5766)
@@ -82,6 +82,7 @@
         }
          {fltk::Clock* o = new fltk::Clock(155, 13, 100, 100, "Make sure this clock does not use processor time when this tab is hidden or w\
 indow is iconized");
+          o->box(fltk::OSHADOW_BOX);
           o->labelfont(fltk::TIMES);
           o->color((fltk::Color)238);
           o->labelsize(10);