Author: matt
Date: 2012-08-03 11:28:53 -0700 (Fri, 03 Aug 2012)
New Revision: 9658
Log:
Well, this version seems to compile on all my available platforms. Sigh. Fixed
a few remaining issues with constants and ifdefs.
Modified:
branches/branch-3.0/fluid/fluid.cxx
branches/branch-3.0/include/fltk3/Box.h
branches/branch-3.0/include/fltk3/osx.h
branches/branch-3.0/src/fltk3/Adjuster.cxx
branches/branch-3.0/src/fltk3/filename_list.cxx
Modified: branches/branch-3.0/fluid/fluid.cxx
===================================================================
--- branches/branch-3.0/fluid/fluid.cxx 2012-08-03 15:09:41 UTC (rev 9657)
+++ branches/branch-3.0/fluid/fluid.cxx 2012-08-03 18:28:53 UTC (rev 9658)
@@ -1432,7 +1432,6 @@
int i; // Looping var
int max_files;
-
fluid_prefs.get("recent_files", max_files, 5);
if (max_files > 10) max_files = 10;
Modified: branches/branch-3.0/include/fltk3/Box.h
===================================================================
--- branches/branch-3.0/include/fltk3/Box.h 2012-08-03 15:09:41 UTC (rev
9657)
+++ branches/branch-3.0/include/fltk3/Box.h 2012-08-03 18:28:53 UTC (rev
9658)
@@ -47,26 +47,30 @@
namespace fltk3 {
+
class FLTK3_EXPORT BoxWidget : public Widget {
public:
BoxWidget(fltk3::Box* b, int x, int y, int w, int h, const char *l=0);
BoxWidget(int x, int y, int w, int h, const char *l=0);
};
+
class FLTK3_EXPORT Box : public Symbol {
public:
typedef unsigned int Flags;
- static const Flags PRESSED = 0x0001;
- static const Flags HOVERING = 0x0002;
- static const Flags FOCUSED = 0x0004;
- static const Flags ACTIVE = 0x0008;
- static const Flags TIE_LEFT = 0x0100;
- static const Flags TIE_RIGHT = 0x0200;
- static const Flags TIE_TOP = 0x0400;
- static const Flags TIE_BOTTOM = 0x0800;
- static const Flags TIE_MASK = 0x0f00;
- static const Flags TIE_HIDDEN = 0x1000;
+ enum {
+ PRESSED = 0x0001,
+ HOVERING = 0x0002,
+ FOCUSED = 0x0004,
+ ACTIVE = 0x0008,
+ TIE_LEFT = 0x0100,
+ TIE_RIGHT = 0x0200,
+ TIE_TOP = 0x0400,
+ TIE_BOTTOM = 0x0800,
+ TIE_MASK = 0x0f00,
+ TIE_HIDDEN = 0x1000
+ };
Box(const char *name=0L)
: Symbol(name) { }
Modified: branches/branch-3.0/include/fltk3/osx.h
===================================================================
--- branches/branch-3.0/include/fltk3/osx.h 2012-08-03 15:09:41 UTC (rev
9657)
+++ branches/branch-3.0/include/fltk3/osx.h 2012-08-03 18:28:53 UTC (rev
9658)
@@ -163,6 +163,12 @@
#ifndef MAC_OS_X_VERSION_10_6
#define MAC_OS_X_VERSION_10_6 1060
#endif
+#ifndef MAC_OS_X_VERSION_10_7
+#define MAC_OS_X_VERSION_10_7 1070
+#endif
+#ifndef MAC_OS_X_VERSION_10_8
+#define MAC_OS_X_VERSION_10_8 1080
+#endif
namespace fltk3 {
typedef CGImageRef Bitmask;
Modified: branches/branch-3.0/src/fltk3/Adjuster.cxx
===================================================================
--- branches/branch-3.0/src/fltk3/Adjuster.cxx 2012-08-03 15:09:41 UTC (rev
9657)
+++ branches/branch-3.0/src/fltk3/Adjuster.cxx 2012-08-03 18:28:53 UTC (rev
9658)
@@ -30,6 +30,7 @@
#include <fltk3/Bitmap.h>
#include <fltk3/draw.h>
#include <fltk3/Wrapper.h>
+#include <fltk3/Box.h>
// three bitmaps for the arrow images
@@ -71,9 +72,9 @@
fltk3::Color sel = fltk3::color_average(fltk3::BLACK, col, 0.2f);
fltk3::Box* up = box(), *dn = fltk3::down(box());
- fltk3::draw_box((pDragButton==1?dn:up), 0, 2*dy, W, H,
(pDragButton==1?sel:col), hor?Box::TIE_RIGHT:Box::TIE_TOP);
- fltk3::draw_box((pDragButton==2?dn:up), dx, dy, W, H,
(pDragButton==2?sel:col),
hor?Box::TIE_LEFT|Box::TIE_RIGHT:Box::TIE_TOP|Box::TIE_BOTTOM);
- fltk3::draw_box((pDragButton==3?dn:up), 2*dx, 0, W, H,
(pDragButton==3?sel:col), hor?Box::TIE_LEFT:Box::TIE_BOTTOM);
+ fltk3::draw_box((pDragButton==1?dn:up), 0, 2*dy, W, H,
(pDragButton==1?sel:col), hor?(Box::TIE_RIGHT):(Box::TIE_TOP));
+ fltk3::draw_box((pDragButton==2?dn:up), dx, dy, W, H,
(pDragButton==2?sel:col),
hor?(Box::TIE_LEFT|Box::TIE_RIGHT):(Box::TIE_TOP|Box::TIE_BOTTOM));
+ fltk3::draw_box((pDragButton==3?dn:up), 2*dx, 0, W, H,
(pDragButton==3?sel:col), hor?(Box::TIE_LEFT):(Box::TIE_BOTTOM));
if (active_r())
fltk3::color(selection_color());
else
Modified: branches/branch-3.0/src/fltk3/filename_list.cxx
===================================================================
--- branches/branch-3.0/src/fltk3/filename_list.cxx 2012-08-03 15:09:41 UTC
(rev 9657)
+++ branches/branch-3.0/src/fltk3/filename_list.cxx 2012-08-03 18:28:53 UTC
(rev 9658)
@@ -28,6 +28,7 @@
// Wrapper for scandir with const-correct function prototypes.
#include <fltk3/filename.h>
+#include <fltk3/x.h>
#include <fltk3/utf8.h>
#include "flstring.h"
#include <stdlib.h>
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
