Author: matt
Date: 2011-05-24 09:31:38 -0700 (Tue, 24 May 2011)
New Revision: 8734
Log:
123: all test programs compile and run.
Modified:
branches/branch-3.0/test/ask.cxx
branches/branch-3.0/test/cairo_test.cxx
branches/branch-3.0/test/cursor.cxx
branches/branch-3.0/test/fl_jpeg_image.cxx
branches/branch-3.0/test/threads.h
Modified: branches/branch-3.0/test/ask.cxx
===================================================================
--- branches/branch-3.0/test/ask.cxx 2011-05-24 10:20:25 UTC (rev 8733)
+++ branches/branch-3.0/test/ask.cxx 2011-05-24 16:31:38 UTC (rev 8734)
@@ -8,7 +8,7 @@
// the need to define callbacks.
//
// This also demonstrates how to trap attempts by the user to
-// close the last window by overriding Fl::exit
+// close the last window by overriding fltk3::exit
//
// Copyright 1998-2010 by Bill Spitzak and others.
//
Modified: branches/branch-3.0/test/cairo_test.cxx
===================================================================
--- branches/branch-3.0/test/cairo_test.cxx 2011-05-24 10:20:25 UTC (rev
8733)
+++ branches/branch-3.0/test/cairo_test.cxx 2011-05-24 16:31:38 UTC (rev
8734)
@@ -145,7 +145,7 @@
int main(int argc, char** argv) {
#ifdef AUTOLINK
- Fl::cairo_autolink_context(true);
+ fltk3::cairo_autolink_context(true);
#endif
Fl_Cairo_Window window(300,300);
Modified: branches/branch-3.0/test/cursor.cxx
===================================================================
--- branches/branch-3.0/test/cursor.cxx 2011-05-24 10:20:25 UTC (rev 8733)
+++ branches/branch-3.0/test/cursor.cxx 2011-05-24 16:31:38 UTC (rev 8734)
@@ -139,7 +139,7 @@
// draw the manual's diagram of cursors...
window.size(400,800);
int y = 300;
- Fl::set_font(fltk3::FREE_FONT, "cursor");
+ fltk3::set_font(fltk3::FREE_FONT, "cursor");
char buf[100]; char *p = buf;
for (fltk3::Menu* m = choices; m->label(); m++) {
fltk3::Box* b = new fltk3::Box(35,y,150,25,m->label());
Modified: branches/branch-3.0/test/fl_jpeg_image.cxx
===================================================================
--- branches/branch-3.0/test/fl_jpeg_image.cxx 2011-05-24 10:20:25 UTC (rev
8733)
+++ branches/branch-3.0/test/fl_jpeg_image.cxx 2011-05-24 16:31:38 UTC (rev
8734)
@@ -96,12 +96,12 @@
int main(int argc, char ** argv) {
int i = 1;
- if (!Fl::args(argc,argv,i,arg) || i != argc-1) {
+ if (!fltk3::args(argc,argv,i,arg) || i != argc-1) {
fprintf(stderr,"usage: %s <switches> image_file\n"
" -v # : use visual\n"
" -m : monochrome\n"
"%s\n",
- argv[0],Fl::help);
+ argv[0],fltk3::help);
exit(1);
}
Modified: branches/branch-3.0/test/threads.h
===================================================================
--- branches/branch-3.0/test/threads.h 2011-05-24 10:20:25 UTC (rev 8733)
+++ branches/branch-3.0/test/threads.h 2011-05-24 16:31:38 UTC (rev 8734)
@@ -28,16 +28,16 @@
// Inline classes to provide portable support for threads and mutexes.
//
// FLTK does not use this (it has an internal mutex implementation
-// that is used if Fl::lock() is called). This header file's only
+// that is used if fltk3::lock() is called). This header file's only
// purpose is so we can write portable demo programs. It may be useful
// or an inspiration to people who want to try writing multithreaded
// programs themselves.
//
-// FLTK has no multithreaded support unless the main thread calls Fl::lock().
-// This main thread is the only thread allowed to call fltk3::run() or
Fl::wait().
+// FLTK has no multithreaded support unless the main thread calls
fltk3::lock().
+// This main thread is the only thread allowed to call fltk3::run() or
fltk3::wait().
// From then on FLTK will be locked except when the main thread is actually
-// waiting for events from the user. Other threads must call Fl::lock() and
-// Fl::unlock() to surround calls to FLTK (such as to change widgets or
+// waiting for events from the user. Other threads must call fltk3::lock() and
+// fltk3::unlock() to surround calls to FLTK (such as to change widgets or
// redraw them).
#ifndef Threads_H
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
