Author: matt Date: 2011-01-09 12:05:58 -0800 (Sun, 09 Jan 2011) New Revision: 8232 Log: Test2 partially works.
Modified: branches/branch-3.0-2011/fltk/Color.h branches/branch-3.0-2011/fltk/FL_API.h branches/branch-3.0-2011/fltk/Flags.h branches/branch-3.0-2011/fltk/Group.h branches/branch-3.0-2011/fltk/Rectangle.h branches/branch-3.0-2011/fltk/Style.h branches/branch-3.0-2011/fltk/Widget.h branches/branch-3.0-2011/fltk/Window.h branches/branch-3.0-2011/fltk/run.h branches/branch-3.0-2011/fltk3/Box.h branches/branch-3.0-2011/fltk3/Widget.h branches/branch-3.0-2011/ide/Xcode3/FLTK.xcodeproj/project.pbxproj branches/branch-3.0-2011/src/Fl_Box.cxx branches/branch-3.0-2011/src/Fl_Widget.cxx branches/branch-3.0-2011/test/hello.cxx branches/branch-3.0-2011/test2/hello.cxx Modified: branches/branch-3.0-2011/fltk/Color.h =================================================================== --- branches/branch-3.0-2011/fltk/Color.h 2011-01-09 19:24:30 UTC (rev 8231) +++ branches/branch-3.0-2011/fltk/Color.h 2011-01-09 20:05:58 UTC (rev 8232) @@ -1,5 +1,3 @@ -#warn FLTK123: This file has not been ported yet -#if 0 // // "$Id: Color.h 6233 2008-09-14 07:54:06Z spitzak $" // @@ -29,8 +27,8 @@ // http://www.fltk.org/str.php // -#ifndef fltk_Color_h -#define fltk_Color_h +#ifndef fltk2_Color_h +#define fltk2_Color_h #include "FL_API.h" #include "Flags.h" @@ -106,6 +104,8 @@ WINDOWS_BLUE = 0x88 //!< default selection_color }; +#if 0 // TODO: FLTK123 + inline Color color(unsigned char r, unsigned char g, unsigned char b) { return Color((r<<24)+(g<<16)+(b<<8)); } inline Color color(unsigned char g) { @@ -122,6 +122,8 @@ FL_API void set_background(Color); FL_API Color nearest_index(Color); +#endif // TODO: FLTK123 + } //@} @@ -131,4 +133,3 @@ // // End of "$Id: Color.h 6233 2008-09-14 07:54:06Z spitzak $". // -#endif Modified: branches/branch-3.0-2011/fltk/FL_API.h =================================================================== --- branches/branch-3.0-2011/fltk/FL_API.h 2011-01-09 19:24:30 UTC (rev 8231) +++ branches/branch-3.0-2011/fltk/FL_API.h 2011-01-09 20:05:58 UTC (rev 8232) @@ -1,5 +1,3 @@ -#warn FLTK123: This file has not been ported yet -#if 0 // "$Id: FL_API.h 5448 2006-09-19 01:14:07Z spitzak $" // // This file is included by all FLTK header files. Originally it was to @@ -25,8 +23,13 @@ // USA. // // Please report all bugs and problems to "[email protected]". -#ifndef FL_API +#ifndef FLTK2_FL_API_H +#define FLTK2_FL_API_H +#define FL_API + +#if 0 // TODO: FLTK123 + #if _MSC_VER > 1000 # pragma once // suppress vc2005 warnings: @@ -71,9 +74,10 @@ typedef unsigned char uchar; +#endif // TODO: FLTK123 + #endif // // End of "$Id: FL_API.h 5448 2006-09-19 01:14:07Z spitzak $". // -#endif Modified: branches/branch-3.0-2011/fltk/Flags.h =================================================================== --- branches/branch-3.0-2011/fltk/Flags.h 2011-01-09 19:24:30 UTC (rev 8231) +++ branches/branch-3.0-2011/fltk/Flags.h 2011-01-09 20:05:58 UTC (rev 8232) @@ -1,5 +1,3 @@ -#warn FLTK123: This file has not been ported yet -#if 0 // // "$Id: Flags.h 6233 2008-09-14 07:54:06Z spitzak $" // @@ -112,4 +110,3 @@ // // End of "$Id: Flags.h 6233 2008-09-14 07:54:06Z spitzak $". // -#endif Modified: branches/branch-3.0-2011/fltk/Group.h =================================================================== --- branches/branch-3.0-2011/fltk/Group.h 2011-01-09 19:24:30 UTC (rev 8231) +++ branches/branch-3.0-2011/fltk/Group.h 2011-01-09 20:05:58 UTC (rev 8232) @@ -1,5 +1,3 @@ -#warn FLTK123: This file has not been ported yet -#if 0 // // "$Id: Group.h 5915 2007-06-19 17:49:29Z spitzak $" // @@ -26,27 +24,34 @@ // Please report all bugs and problems to "[email protected]". // -#ifndef fltk_Group_h -#define fltk_Group_h +#ifndef fltk2_Group_h +#define fltk2_Group_h -#ifndef fltk_Widget_h -# include "Widget.h" -#endif +#include <fltk3/Group.h> +#include "Widget.h" namespace fltk { class FL_API Group : public Widget { public: + + Group() {} + Group(int,int,int,int, const char * = 0, bool begin=false); + +#if 0 // TODO: FLTK123 int children() const {return children_;} Widget* child(int n) const {return array_[n];} void draw(); void layout(); int handle(int); - - void begin() {current_ = this;} - void end() {current_ = (Group*)parent();} +#endif // TODO: FLTK123 + + void begin() { ((fltk3::Group*)_p)->begin(); } + void end() { ((fltk3::Group*)_p)->end(); } + +#if 0 // TODO: FLTK123 static Group *current() {return current_;} static void current(Group *g) {current_ = g;} @@ -105,7 +110,7 @@ int *sizes_; // remembered initial sizes of children static Group *current_; - +#endif // TODO: FLTK123 }; } @@ -115,4 +120,3 @@ // // End of "$Id: Group.h 5915 2007-06-19 17:49:29Z spitzak $". // -#endif Modified: branches/branch-3.0-2011/fltk/Rectangle.h =================================================================== --- branches/branch-3.0-2011/fltk/Rectangle.h 2011-01-09 19:24:30 UTC (rev 8231) +++ branches/branch-3.0-2011/fltk/Rectangle.h 2011-01-09 20:05:58 UTC (rev 8232) @@ -1,5 +1,3 @@ -#warn FLTK123: This file has not been ported yet -#if 0 // "$Id: Rectangle.h 5454 2006-09-19 02:38:02Z spitzak $" // // Copyright 1998-2006 by Bill Spitzak and others. @@ -21,8 +19,8 @@ // // Please report all bugs and problems to "[email protected]". -#ifndef fltk_Rectangle_h -#define fltk_Rectangle_h +#ifndef fltk2_Rectangle_h +#define fltk2_Rectangle_h #include "FL_API.h" @@ -38,10 +36,17 @@ namespace fltk { class FL_API Rectangle { + +#if 0 // TODO: FLTK123 int x_, y_, w_, h_; - +#endif // TODO: FLTK123 + public: + Rectangle() {} + +#if 0 // TODO: FLTK123 + Rectangle(int x, int y, int w, int h); /*! Left edge */ int x() const {return x_;} /*! Top edge */ @@ -97,11 +102,7 @@ /*! Where to put baseline to center current font nicely */ int baseline_y() const; - Rectangle() {} - /*! Constructor that sets x(), y(), w(), and h(). */ - Rectangle(int x, int y, int w, int h) : x_(x), y_(y), w_(w), h_(h) {} - /*! Constructor that sets x() and y() to zero, and sets w() and h(). */ Rectangle(int w, int h) : x_(0), y_(0), w_(w), h_(h) {} @@ -116,10 +117,10 @@ void merge(const Rectangle& r); void intersect(const Rectangle& r); - +#endif // TODO: FLTK123 + }; } #endif -#endif Modified: branches/branch-3.0-2011/fltk/Style.h =================================================================== --- branches/branch-3.0-2011/fltk/Style.h 2011-01-09 19:24:30 UTC (rev 8231) +++ branches/branch-3.0-2011/fltk/Style.h 2011-01-09 20:05:58 UTC (rev 8232) @@ -1,5 +1,3 @@ -#warn FLTK123: This file has not been ported yet -#if 0 // // "$Id: Style.h 6233 2008-09-14 07:54:06Z spitzak $" // @@ -25,11 +23,13 @@ // Please report all bugs and problems to "[email protected]". // -#ifndef fltk_Style_h -#define fltk_Style_h +#ifndef fltk2_Style_h +#define fltk2_Style_h #include "Color.h" +#if 0 // TODO: FLTK123 + namespace fltk { /// \name fltk/Style.h @@ -202,9 +202,10 @@ //@} +#endif // TODO: FLTK123 + #endif // // End of "$Id: Style.h 6233 2008-09-14 07:54:06Z spitzak $". // -#endif Modified: branches/branch-3.0-2011/fltk/Widget.h =================================================================== --- branches/branch-3.0-2011/fltk/Widget.h 2011-01-09 19:24:30 UTC (rev 8231) +++ branches/branch-3.0-2011/fltk/Widget.h 2011-01-09 20:05:58 UTC (rev 8232) @@ -1,5 +1,3 @@ -#warn FLTK123: This file has not been ported yet -#if 0 // "$Id: Widget.h 6518 2008-11-11 22:31:26Z spitzak $" // // Copyright 1998-2006 by Bill Spitzak and others. @@ -21,14 +19,17 @@ // // Please report all bugs and problems to "[email protected]". -#ifndef fltk_Widget_h -#define fltk_Widget_h +#ifndef fltk2_Widget_h +#define fltk2_Widget_h +#include <fltk3/Wrapper.h> +#include <fltk3/Widget.h> #include "Style.h" #include "Rectangle.h" namespace fltk { +#if 0 // TODO: FLTK123 class FL_API Widget; class FL_API Window; class FL_API Symbol; @@ -45,15 +46,26 @@ #ifdef FLTK_1_WIDGET // back-compatability section: FL_API Font* font(int); #endif - -class FL_API Widget : public Rectangle { + +#endif // TODO: FLTK123 + + class FL_API Widget : public fltk3::Wrapper { + +#if 0 // TODO: FLTK123 // disable the copy assignment/constructors: Widget & operator=(const Widget &); Widget(const Widget &); - +#endif // TODO: FLTK123 + public: - Widget(int,int,int,int,const char* =0); + Widget() {} + Widget(int x, int y, int w, int h, const char *l=0) { + _p = new fltk3::Widget(x, y, w, h, l); + _p->wrapper(this); + } + +#if 0 // TODO: FLTK123 virtual ~Widget(); virtual void draw(); @@ -216,9 +228,12 @@ void cursor(Cursor*) const ; void measure_label(int&, int&) const ; + + // TODO: FLTK123 - please port FLTK2 box styles to FLTK3! + Box* box() { return (fltk::Box)((fltk3::Widget*)_p)->box(); } + void box(Box *b) { ((fltk3::Widget*)_p)->box((fltk3::Boxtype)b); } - Box* box() const; - Box* buttonbox() const; + Box* buttonbox() const; Symbol* glyph() const; Font* labelfont() const; Font* textfont() const; @@ -237,7 +252,6 @@ unsigned char scrollbar_align() const; unsigned char scrollbar_width() const; - void box(Box*) ; void buttonbox(Box*) ; void glyph(Symbol*) ; void labelfont(Font*) ; @@ -310,7 +324,7 @@ uchar damage_; uchar layout_damage_; uchar when_; - +#endif // TODO: FLTK123 }; enum { // Widget::when() values @@ -331,4 +345,3 @@ // // End of "$Id: Widget.h 6518 2008-11-11 22:31:26Z spitzak $". // -#endif Modified: branches/branch-3.0-2011/fltk/Window.h =================================================================== --- branches/branch-3.0-2011/fltk/Window.h 2011-01-09 19:24:30 UTC (rev 8231) +++ branches/branch-3.0-2011/fltk/Window.h 2011-01-09 20:05:58 UTC (rev 8232) @@ -1,5 +1,3 @@ -#warn FLTK123: This file has not been ported yet -#if 0 // "$Id: Window.h 6150 2008-08-04 22:53:30Z spitzak $" // // Window widget. This must be the outermost group. You can also put @@ -24,26 +22,35 @@ // // Please report all bugs and problems to "[email protected]". -#ifndef fltk_Window_h -#define fltk_Window_h +#ifndef fltk2_Window_h +#define fltk2_Window_h +#include <fltk3/Window.h> #include "Group.h" namespace fltk { +#if 0 // TODo: FLTK123 + // value for x,y to indicate window system places window const int USEDEFAULT = ((int)0x80000000); // same as Win32 value class CreatedWindow; class Monitor; -// implementations of methods of Window are in different files in src/ +#endif // TODO: FLTK123 class FL_API Window : public Group { public: + Window(int W, int H, const char *l = 0) { + _p = new fltk3::Window(W, H, l); + _p->wrapper(this); + // FIXME: this should not cause a begine in FLTK3 for compatibility + } + +#if 0 // TODo: FLTK123 Window(int,int,int,int, const char* = 0, bool begin = false); - Window(int,int, const char* = 0); static NamedStyle* default_style; virtual ~Window(); @@ -87,7 +94,11 @@ bool shown() const {return i != 0;} void show(); - void show(int, char**); +#endif // TODO: FLTK123 + + void show(int argc, char **argv) { ((fltk3::Window*)_p)->show(argc, argv); } + +#if 0 // TODO: FLTK123 void show(const Window* parent); bool exec(const Window* parent = 0, bool grab = false); void make_exec_return(bool); @@ -149,6 +160,8 @@ }; static const char* xclass_; void _Window(); // constructor innards +#endif // TODO: FLTK123 + }; } @@ -158,4 +171,3 @@ // // End of "$Id: Window.h 6150 2008-08-04 22:53:30Z spitzak $". // -#endif Modified: branches/branch-3.0-2011/fltk/run.h =================================================================== --- branches/branch-3.0-2011/fltk/run.h 2011-01-09 19:24:30 UTC (rev 8231) +++ branches/branch-3.0-2011/fltk/run.h 2011-01-09 20:05:58 UTC (rev 8232) @@ -1,5 +1,3 @@ -#warn FLTK123: This file has not been ported yet -#if 0 // "$Id: run.h 6233 2008-09-14 07:54:06Z spitzak $" // // The basic fltk runtime. Every program needs to call this somewhere. @@ -30,8 +28,11 @@ # undef check #endif +#include <fltk3/run.h> + namespace fltk { +#if 0 // TODO: FLTK123 /// \name fltk/run.h //@{ @@ -46,7 +47,11 @@ FL_API int wait(float time); FL_API int check(); FL_API int ready(); -FL_API int run(); +#endif // TODO: FLTK123 + + FL_API int run() { return fltk3::run(); } + +#if 0 // TODO: FLTK123 FL_API void flush(); FL_API void redraw(); extern FL_API int damage_; @@ -88,9 +93,8 @@ FL_API void* thread_message(); FL_API bool in_main_thread(); -//@} +#endif // TODO: FLTK123 } #endif -#endif Modified: branches/branch-3.0-2011/fltk3/Box.h =================================================================== --- branches/branch-3.0-2011/fltk3/Box.h 2011-01-09 19:24:30 UTC (rev 8231) +++ branches/branch-3.0-2011/fltk3/Box.h 2011-01-09 20:05:58 UTC (rev 8232) @@ -45,8 +45,6 @@ will let you draw a frame around them. */ class FL_EXPORT fltk3::Box : public fltk3::Widget { -protected: - void draw(); public: /** - The first constructor sets box() to fltk3::NO_BOX, which Modified: branches/branch-3.0-2011/fltk3/Widget.h =================================================================== --- branches/branch-3.0-2011/fltk3/Widget.h 2011-01-09 19:24:30 UTC (rev 8231) +++ branches/branch-3.0-2011/fltk3/Widget.h 2011-01-09 20:05:58 UTC (rev 8232) @@ -135,18 +135,6 @@ protected: - /** Creates a widget at the given position and size. - - The fltk3::Widget is a protected constructor, but all derived widgets have a - matching public constructor. It takes a value for x(), y(), w(), h(), and - an optional value for label(). - - \param[in] x, y the position of the widget relative to the enclosing window - \param[in] w, h size of the widget in pixels - \param[in] label optional text for the widget label - */ - Widget(int x, int y, int w, int h, const char *label=0L); - /** Internal use only. Use position(int,int), size(int,int) or resize(int,int,int,int) instead. */ void x(int v) {x_ = v;} /** Internal use only. Use position(int,int), size(int,int) or resize(int,int,int,int) instead. */ @@ -200,6 +188,18 @@ public: + /** Creates a widget at the given position and size. + + The fltk3::Widget is a protected constructor, but all derived widgets have a + matching public constructor. It takes a value for x(), y(), w(), h(), and + an optional value for label(). + + \param[in] x, y the position of the widget relative to the enclosing window + \param[in] w, h size of the widget in pixels + \param[in] label optional text for the widget label + */ + Widget(int x, int y, int w, int h, const char *label=0L); + /** Destroys the widget. Destroying single widgets is not very common. You almost always want to destroy the parent group instead, which will destroy all of the child widgets @@ -226,7 +226,7 @@ s->draw(); // calls Fl_Scrollbar::draw() \endcode */ - virtual void draw() = 0; + virtual void draw(); /** Handles the specified event. You normally don't call this method directly, but instead let FLTK do Modified: branches/branch-3.0-2011/ide/Xcode3/FLTK.xcodeproj/project.pbxproj =================================================================== --- branches/branch-3.0-2011/ide/Xcode3/FLTK.xcodeproj/project.pbxproj 2011-01-09 19:24:30 UTC (rev 8231) +++ branches/branch-3.0-2011/ide/Xcode3/FLTK.xcodeproj/project.pbxproj 2011-01-09 20:05:58 UTC (rev 8232) @@ -630,7 +630,10 @@ C9555EF512DA01B500FFF041 /* Xutf8.h in Headers */ = {isa = PBXBuildFile; fileRef = C9555E6112DA01B500FFF041 /* Xutf8.h */; }; C9555FD012DA220500FFF041 /* fltk.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FEB0F8FE6383384180570D94 /* fltk.framework */; }; C9555FD212DA220500FFF041 /* fltk.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = FEB0F8FE6383384180570D94 /* fltk.framework */; }; - C9555FF612DA227B00FFF041 /* hello.cxx in Sources */ = {isa = PBXBuildFile; fileRef = C9555FF512DA227B00FFF041 /* hello.cxx */; }; + C955616A12DA430000FFF041 /* fltk.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FEB0F8FE6383384180570D94 /* fltk.framework */; }; + C955616C12DA430000FFF041 /* fltk.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = FEB0F8FE6383384180570D94 /* fltk.framework */; }; + C955617C12DA433000FFF041 /* hello.cxx in Sources */ = {isa = PBXBuildFile; fileRef = C955617B12DA433000FFF041 /* hello.cxx */; }; + C955617D12DA433B00FFF041 /* hello.cxx in Sources */ = {isa = PBXBuildFile; fileRef = C9555FF512DA227B00FFF041 /* hello.cxx */; }; C96290C21274D0CF007D3CFE /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C9628FFD1274D0B3007D3CFE /* Cocoa.framework */; }; C96290E21274D0EF007D3CFE /* AGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C96290E11274D0EF007D3CFE /* AGL.framework */; }; C96290E61274D100007D3CFE /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C96290E51274D100007D3CFE /* OpenGL.framework */; }; @@ -1495,6 +1498,18 @@ ); script = "export DYLD_FRAMEWORK_PATH=${TARGET_BUILD_DIR} && cd ${INPUT_FILE_DIR} && ${TARGET_BUILD_DIR}/Fluid.app/Contents/MacOS/Fluid -c ${INPUT_FILE_NAME}"; }; + C955616D12DA430000FFF041 /* PBXBuildRule */ = { + isa = PBXBuildRule; + compilerSpec = com.apple.compilers.proxy.script; + filePatterns = "*.fl"; + fileType = pattern.proxy; + isEditable = 1; + outputFiles = ( + "${INPUT_FILE_DIR}/${INPUT_FILE_BASE}.cxx", + "${INPUT_FILE_DIR}/${INPUT_FILE_BASE}.h", + ); + script = "export DYLD_FRAMEWORK_PATH=${TARGET_BUILD_DIR} && cd ${INPUT_FILE_DIR} && ${TARGET_BUILD_DIR}/Fluid.app/Contents/MacOS/Fluid -c ${INPUT_FILE_NAME}"; + }; CD536C27425E520D78677840 /* PBXBuildRule */ = { isa = PBXBuildRule; compilerSpec = com.apple.compilers.proxy.script; @@ -2785,6 +2800,13 @@ remoteGlobalIDString = A57FDE871C99A52BEEDEE68C; remoteInfo = fltk; }; + C955616512DA430000FFF041 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 4BF1A7FFEACF5F31B4127482 /* Project object */; + proxyType = 1; + remoteGlobalIDString = A57FDE871C99A52BEEDEE68C; + remoteInfo = fltk; + }; CA3CA540809B8723BA17A4D4 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 4BF1A7FFEACF5F31B4127482 /* Project object */; @@ -3687,6 +3709,16 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + C955616B12DA430000FFF041 /* CopyFiles */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + C955616C12DA430000FFF041 /* fltk.framework in CopyFiles */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; C99FD8E112D2A295002FC776 /* CopyFiles */ = { isa = PBXCopyFilesBuildPhase; buildActionMask = 2147483647; @@ -4398,6 +4430,9 @@ C9555FD712DA220500FFF041 /* hello.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = hello.app; sourceTree = BUILT_PRODUCTS_DIR; }; C9555FEA12DA220600FFF041 /* hello-Info copy.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "hello-Info copy.plist"; path = "plists/hello-Info copy.plist"; sourceTree = "<group>"; }; C9555FF512DA227B00FFF041 /* hello.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = hello.cxx; path = ../../test1/hello.cxx; sourceTree = SOURCE_ROOT; }; + C955617112DA430000FFF041 /* hello.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = hello.app; sourceTree = BUILT_PRODUCTS_DIR; }; + C955617912DA430000FFF041 /* hello-Info copy 2.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "hello-Info copy 2.plist"; path = "plists/hello-Info copy 2.plist"; sourceTree = "<group>"; }; + C955617B12DA433000FFF041 /* hello.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = hello.cxx; path = ../../test2/hello.cxx; sourceTree = SOURCE_ROOT; }; C9628FFD1274D0B3007D3CFE /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; }; C96290E11274D0EF007D3CFE /* AGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AGL.framework; path = System/Library/Frameworks/AGL.framework; sourceTree = SDKROOT; }; C96290E51274D100007D3CFE /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = System/Library/Frameworks/OpenGL.framework; sourceTree = SDKROOT; }; @@ -5089,6 +5124,14 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + C955616912DA430000FFF041 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + C955616A12DA430000FFF041 /* fltk.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; CFFFB4C330636C95339A8F4F /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -5554,9 +5597,11 @@ 188555DBC553F66588792C6B /* Frameworks */, 015D2BD894993395B263D6C0 /* Tests */, C9555FF312DA223C00FFF041 /* Tests FLTK 1 */, + C955616012DA42DE00FFF041 /* Tests FLTK 2 */, DCB546B00EC62A9F8CC4181A /* Products */, C9628FFA1274D0A1007D3CFE /* Resources */, C9555FEA12DA220600FFF041 /* hello-Info copy.plist */, + C955617912DA430000FFF041 /* hello-Info copy 2.plist */, ); sourceTree = "<group>"; }; @@ -6271,6 +6316,22 @@ name = Hello; sourceTree = "<group>"; }; + C955616012DA42DE00FFF041 /* Tests FLTK 2 */ = { + isa = PBXGroup; + children = ( + C955616112DA42F100FFF041 /* Hello */, + ); + name = "Tests FLTK 2"; + sourceTree = "<group>"; + }; + C955616112DA42F100FFF041 /* Hello */ = { + isa = PBXGroup; + children = ( + C955617B12DA433000FFF041 /* hello.cxx */, + ); + name = Hello; + sourceTree = "<group>"; + }; C9628FFA1274D0A1007D3CFE /* Resources */ = { isa = PBXGroup; children = ( @@ -6492,6 +6553,7 @@ 5191489A6263E11B65A57B4D /* valuators.app */, C9165EAF1291A304003FF4F0 /* utf8.app */, C9555FD712DA220500FFF041 /* hello.app */, + C955617112DA430000FFF041 /* hello.app */, ); name = Products; sourceTree = "<group>"; @@ -8193,6 +8255,26 @@ productReference = C9555FD712DA220500FFF041 /* hello.app */; productType = "com.apple.product-type.application"; }; + C955616312DA430000FFF041 /* hello2 */ = { + isa = PBXNativeTarget; + buildConfigurationList = C955616E12DA430000FFF041 /* Build configuration list for PBXNativeTarget "hello2" */; + buildPhases = ( + C955616612DA430000FFF041 /* Resources */, + C955616712DA430000FFF041 /* Sources */, + C955616912DA430000FFF041 /* Frameworks */, + C955616B12DA430000FFF041 /* CopyFiles */, + ); + buildRules = ( + C955616D12DA430000FFF041 /* PBXBuildRule */, + ); + dependencies = ( + C955616412DA430000FFF041 /* PBXTargetDependency */, + ); + name = hello2; + productName = hello; + productReference = C955617112DA430000FFF041 /* hello.app */; + productType = "com.apple.product-type.application"; + }; CA05747C492074A51F2F35BC /* iconize */ = { isa = PBXNativeTarget; buildConfigurationList = A28344FBEB8BBC1EB0B0B397 /* Build configuration list for PBXNativeTarget "iconize" */; @@ -8579,6 +8661,7 @@ 2BFE084E4D6FAB77DCAF0A83 /* utf8 */, E167C0E81B125EBADAC8ED73 /* valuators */, C9555FC912DA220500FFF041 /* hello1 */, + C955616312DA430000FFF041 /* hello2 */, ); }; /* End PBXProject section */ @@ -9055,6 +9138,13 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + C955616612DA430000FFF041 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; D5AB2E01EE1DBEB40D62B39C /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; @@ -9916,10 +10006,18 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - C9555FF612DA227B00FFF041 /* hello.cxx in Sources */, + C955617D12DA433B00FFF041 /* hello.cxx in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; + C955616712DA430000FFF041 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + C955617C12DA433000FFF041 /* hello.cxx in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; CA99DB1AAB6C9D1F7D21B324 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -10829,6 +10927,11 @@ target = A57FDE871C99A52BEEDEE68C /* fltk */; targetProxy = C9555FCB12DA220500FFF041 /* PBXContainerItemProxy */; }; + C955616412DA430000FFF041 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = A57FDE871C99A52BEEDEE68C /* fltk */; + targetProxy = C955616512DA430000FFF041 /* PBXContainerItemProxy */; + }; C97AC7320761F9B9C60C0B57 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = A57FDE871C99A52BEEDEE68C /* fltk */; @@ -15069,6 +15172,67 @@ }; name = Release; }; + C955616F12DA430000FFF041 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + COPY_PHASE_STRIP = NO; + GCC_DYNAMIC_NO_PIC = NO; + GCC_ENABLE_FIX_AND_CONTINUE = YES; + GCC_MODEL_TUNING = G5; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = fltk.pch; + GCC_PREPROCESSOR_DEFINITIONS = "USING_XCODE=1"; + HEADER_SEARCH_PATHS = ( + ../../ide/XCode3/, + ../../, + ../../png, + ../../jpeg, + ); + INFOPLIST_FILE = "plists/hello-Info copy 2.plist"; + INSTALL_PATH = "$(HOME)/Applications"; + OTHER_LDFLAGS = ( + "-framework", + Cocoa, + ); + PRODUCT_NAME = hello; + WARNING_CFLAGS = ( + "-Wno-format-security", + "-Wall", + ); + }; + name = Debug; + }; + C955617012DA430000FFF041 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + GCC_MODEL_TUNING = G5; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = fltk.pch; + GCC_PREPROCESSOR_DEFINITIONS = "USING_XCODE=1"; + HEADER_SEARCH_PATHS = ( + ../../ide/XCode3/, + ../../, + ../../png, + ../../jpeg, + ); + INFOPLIST_FILE = "plists/hello-Info copy 2.plist"; + INSTALL_PATH = "$(HOME)/Applications"; + OTHER_LDFLAGS = ( + "-framework", + Cocoa, + ); + PRODUCT_NAME = hello; + WARNING_CFLAGS = ( + "-Wno-format-security", + "-Wall", + ); + }; + name = Release; + }; CB5DC25E5DACEFD0C087A26C /* Release */ = { isa = XCBuildConfiguration; buildSettings = { @@ -16441,6 +16605,15 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Debug; }; + C955616E12DA430000FFF041 /* Build configuration list for PBXNativeTarget "hello2" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + C955616F12DA430000FFF041 /* Debug */, + C955617012DA430000FFF041 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Debug; + }; CC535F451DEEEC6CB8B8BE9D /* Build configuration list for PBXNativeTarget "fullscreen" */ = { isa = XCConfigurationList; buildConfigurations = ( Modified: branches/branch-3.0-2011/src/Fl_Box.cxx =================================================================== --- branches/branch-3.0-2011/src/Fl_Box.cxx 2011-01-09 19:24:30 UTC (rev 8231) +++ branches/branch-3.0-2011/src/Fl_Box.cxx 2011-01-09 20:05:58 UTC (rev 8232) @@ -28,11 +28,6 @@ #include <fltk3/Widget.h> #include <fltk3/Box.h> -void fltk3::Box::draw() { - draw_box(); - draw_label(); -} - int fltk3::Box::handle(int event) { if (event == FL_ENTER || event == FL_LEAVE) return 1; else return 0; Modified: branches/branch-3.0-2011/src/Fl_Widget.cxx =================================================================== --- branches/branch-3.0-2011/src/Fl_Widget.cxx 2011-01-09 19:24:30 UTC (rev 8231) +++ branches/branch-3.0-2011/src/Fl_Widget.cxx 2011-01-09 20:05:58 UTC (rev 8232) @@ -340,6 +340,12 @@ clear_changed(); } +void fltk3::Widget::draw() { + draw_box(); + draw_label(); +} + + // // End of "$Id$". // Modified: branches/branch-3.0-2011/test/hello.cxx =================================================================== --- branches/branch-3.0-2011/test/hello.cxx 2011-01-09 19:24:30 UTC (rev 8231) +++ branches/branch-3.0-2011/test/hello.cxx 2011-01-09 20:05:58 UTC (rev 8232) @@ -29,16 +29,18 @@ #include <fltk3/Window.h> #include <fltk3/Box.h> +using namespace fltk3; + int main(int argc, char **argv) { - fltk3::Window *window = new fltk3::Window(340,180); - fltk3::Box *box = new fltk3::Box(20,40,300,100,"Hello, World!"); - box->box(fltk3::UP_BOX); - box->labelfont(fltk3::BOLD+fltk3::ITALIC); + Window *window = new Window(340,180); + Box *box = new Box(20,40,300,100,"Hello, World!"); + box->box(UP_BOX); + box->labelfont(BOLD+ITALIC); box->labelsize(36); - box->labeltype(fltk3::SHADOW_LABEL); + box->labeltype(SHADOW_LABEL); window->end(); window->show(argc, argv); - return fltk3::run(); + return run(); } // Modified: branches/branch-3.0-2011/test2/hello.cxx =================================================================== --- branches/branch-3.0-2011/test2/hello.cxx 2011-01-09 19:24:30 UTC (rev 8231) +++ branches/branch-3.0-2011/test2/hello.cxx 2011-01-09 20:05:58 UTC (rev 8232) @@ -9,10 +9,10 @@ Window *window = new Window(300, 180); window->begin(); Widget *box = new Widget(20, 40, 260, 100, "Hello, World!"); - box->box(UP_BOX); - box->labelfont(HELVETICA_BOLD_ITALIC); - box->labelsize(36); - box->labeltype(SHADOW_LABEL); + // FIXME: box->box(UP_BOX); + // FIXME: box->labelfont(HELVETICA_BOLD_ITALIC); + // FIXME: box->labelsize(36); + // FIXME: box->labeltype(SHADOW_LABEL); window->end(); window->show(argc, argv); return run(); _______________________________________________ fltk-commit mailing list [email protected] http://lists.easysw.com/mailman/listinfo/fltk-commit
