Author: matt
Date: 2010-04-01 07:58:37 -0700 (Thu, 01 Apr 2010)
New Revision: 7390
Log:
More cleanup.
Modified:
branches/branch-3.0/ide/Xcode3/FLTK.xcodeproj/project.pbxproj
branches/branch-3.0/test/boxtype2.cxx
branches/branch-3.0/test/button.cxx
branches/branch-3.0/test/button2.cxx
branches/branch-3.0/test/hello.cxx
Modified: branches/branch-3.0/ide/Xcode3/FLTK.xcodeproj/project.pbxproj
===================================================================
--- branches/branch-3.0/ide/Xcode3/FLTK.xcodeproj/project.pbxproj
2010-04-01 14:48:19 UTC (rev 7389)
+++ branches/branch-3.0/ide/Xcode3/FLTK.xcodeproj/project.pbxproj
2010-04-01 14:58:37 UTC (rev 7390)
@@ -7936,9 +7936,6 @@
6509E2125134A922AD004617 /* ask */,
9107E4EB6898E69CDEEEF128 /* bitmap */,
5C27633EE545BAAEA44DE35E /* blocks */,
- EF4798965605C2F042F562E6 /* boxtype */,
- C978313C1164914A00491051 /* boxtype1 */,
- C97831561164915600491051 /* boxtype2 */,
10D3DB5803F7FAFEC8290342 /* browser */,
ED5180E0F3CCE83524692330 /* buttons */,
EFFB6C29A0C01196ACBA347E /* checkers */,
@@ -7998,6 +7995,9 @@
A9337FB6F5EF09811A429FCE /* utf8 */,
82F240D0EA15FB0504309599 /* valuators */,
8C3A8B7F93BE1F0B5321F04A /* device */,
+ EF4798965605C2F042F562E6 /* boxtype */,
+ C978313C1164914A00491051 /* boxtype1 */,
+ C97831561164915600491051 /* boxtype2 */,
6FFE327CD2BCDC4E91814716 /* button */,
C9782F591163CD2F00491051 /* button1 */,
C9782F761163CD3800491051 /* button2 */,
Modified: branches/branch-3.0/test/boxtype2.cxx
===================================================================
--- branches/branch-3.0/test/boxtype2.cxx 2010-04-01 14:48:19 UTC (rev
7389)
+++ branches/branch-3.0/test/boxtype2.cxx 2010-04-01 14:58:37 UTC (rev
7390)
@@ -43,8 +43,8 @@
fltk::Widget *b = new fltk::InvisibleBox(type,x,y,square ? H-20 :
W-20,H-20,name);
b->labelsize(11);
if (square) {
- //b->clear_flag(fltk::ALIGN_MASK);
- //b->set_flag(fltk::ALIGN_RIGHT);
+ // FLTK123: b->clear_flag(fltk::ALIGN_MASK);
+ // FLTK123: b->set_flag(fltk::ALIGN_RIGHT);
}
return b;
}
Modified: branches/branch-3.0/test/button.cxx
===================================================================
--- branches/branch-3.0/test/button.cxx 2010-04-01 14:48:19 UTC (rev 7389)
+++ branches/branch-3.0/test/button.cxx 2010-04-01 14:58:37 UTC (rev 7390)
@@ -47,7 +47,7 @@
window->begin();
Button *b1 = new Button(20, 20, 80, 25, "&Beep");
b1->callback(beepcb,0);
- /*Button *b2 =*/ new Button(120,20, 80, 25, "&no op");
+ new Button(120,20, 80, 25, "&no op");
Button *b3 = new Button(220,20, 80, 25, "E&xit");
b3->callback(exitcb,0);
window->end();
Modified: branches/branch-3.0/test/button2.cxx
===================================================================
--- branches/branch-3.0/test/button2.cxx 2010-04-01 14:48:19 UTC (rev
7389)
+++ branches/branch-3.0/test/button2.cxx 2010-04-01 14:58:37 UTC (rev
7390)
@@ -46,20 +46,20 @@
}
int main(int argc, char ** argv) {
- //register_images();
+ // FLTK123: register_images();
Window *window = new Window(320,65);
window->begin();
Group* ib = new Group(0,0,window->w(),window->h());
ib->begin();
- //ib->image(new TiledImage(SharedImage::get("./images/bg.jpeg")));
+ // FLTK123: ib->image(new TiledImage(SharedImage::get("./images/bg.jpeg")));
window->resizable(ib);
Button *b1 = new Button(20, 20, 80, 25, "&Beep");
b1->callback(beepcb,0);
Button *b2 = new Button(120,20, 80, 25, "");
- //b2->image(new TiledImage(SharedImage::get("./images/coucou.png")));
+ // FLTK123: b2->image(new
TiledImage(SharedImage::get("./images/coucou.png")));
Button *b3 = new Button(220,20, 80, 25, "E&xit");
b3->callback(exitcb,0);
Modified: branches/branch-3.0/test/hello.cxx
===================================================================
--- branches/branch-3.0/test/hello.cxx 2010-04-01 14:48:19 UTC (rev 7389)
+++ branches/branch-3.0/test/hello.cxx 2010-04-01 14:58:37 UTC (rev 7390)
@@ -33,11 +33,14 @@
int main(int argc, char **argv) {
Window *window = new Window(300,180);
- Widget *box = new Widget(20,40,260,100,"Hello, World!");
- box->box(UP_BOX);
- box->labelfont(BOLD+ITALIC);
- box->labelsize(36);
- box->labeltype(SHADOW_LABEL);
+ window->begin();
+ {
+ Widget *box = new Widget(20,40,260,100,"Hello, World!");
+ box->box(UP_BOX);
+ box->labelfont(BOLD+ITALIC);
+ box->labelsize(36);
+ box->labeltype(SHADOW_LABEL);
+ }
window->end();
window->show(argc, argv);
return fltk3::run();
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
