Author: AlbrechtS
Date: 2011-08-23 03:53:22 -0700 (Tue, 23 Aug 2011)
New Revision: 9000
Log:
Fix case where HAVE_GL is false. This is a side effect in my
current build that needs to be investigated (why is HAVE_GL false
in the first place?). The fix is needed anyway.
Modified:
branches/branch-3.0/test/CubeView.cxx
branches/branch-3.0/test/CubeView.h
Modified: branches/branch-3.0/test/CubeView.cxx
===================================================================
--- branches/branch-3.0/test/CubeView.cxx 2011-08-23 08:44:07 UTC (rev
8999)
+++ branches/branch-3.0/test/CubeView.cxx 2011-08-23 10:53:22 UTC (rev
9000)
@@ -34,7 +34,7 @@
: fltk3::GlWindow(x,y,w,h,l)
#else
CubeView::CubeView(int x,int y,int w,int h,const char *l)
- : Fl_Box(x,y,w,h,l)
+ : fltk3::Box(x,y,w,h,l)
#endif /* HAVE_GL */
{
vAng = 0.0;
@@ -57,7 +57,7 @@
#if !HAVE_GL
label("OpenGL is required for this demo to operate.");
- align(FL_ALIGN_WRAP | FL_ALIGN_INSIDE);
+ align(fltk3::ALIGN_WRAP | fltk3::ALIGN_INSIDE);
#endif /* !HAVE_GL */
}
Modified: branches/branch-3.0/test/CubeView.h
===================================================================
--- branches/branch-3.0/test/CubeView.h 2011-08-23 08:44:07 UTC (rev 8999)
+++ branches/branch-3.0/test/CubeView.h 2011-08-23 10:53:22 UTC (rev 9000)
@@ -41,7 +41,7 @@
#if HAVE_GL
class CubeView : public fltk3::GlWindow {
#else
-class CubeView : public Fl_Box {
+class CubeView : public fltk3::Box {
#endif /* HAVE_GL */
public:
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
