mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

STR #1792: fixed documentation of FL_HORIZONTAL vs. the correct Fl_Pack::HORIZONTAL

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@5946 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Matthias Melcher 2007-10-07 09:58:45 +00:00
parent 072398649c
commit 05cf7832af
3 changed files with 26 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES
View File

@ -2,7 +2,7 @@ CHANGES IN FLTK 1.1.8
- Documentation fixes (STR #1454, STR #1455, STR #1456,
STR #1457, STR #1458, STR #1460, STR #1481, STR #1578,
STR #1639, STR #1645, STR #1644, STR #1793)
STR #1639, STR #1645, STR #1644, STR #1792, STR #1793)
- Fixed Fl_Chart drawing (STR #1756)
- Fixed mapping of subwindows with unmapped parent
windows (STR #1706)

4
documentation/Fl_Pack.html
View File

@ -23,9 +23,9 @@
<H3>Description</H3>
This widget was designed to add the functionality of compressing and
aligning widgets.
<P>If <TT>type()</TT> is <TT>FL_HORIZONTAL</TT> all the children are
<P>If <TT>type()</TT> is <TT>Fl_Pack::HORIZONTAL</TT> all the children are
resized to the height of the <TT>Fl_Pack</TT>, and are moved next to
each other horizontally. If <TT>type()</TT> is not <TT>FL_HORIZONTAL</TT>
each other horizontally. If <TT>type()</TT> is not <TT>Fl_Pack::HORIZONTAL</TT>
then the children are resized to the width and are stacked below each
other. Then the <TT>Fl_Pack</TT> resizes itself to surround the child
widgets. </P>

65
test/hello.cxx
View File

@ -1,48 +1,29 @@
//
// "$Id$"
//
// Hello, World! program for the Fast Light Tool Kit (FLTK).
//
// Copyright 1998-2005 by Bill Spitzak and others.
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Library General Public
// License as published by the Free Software Foundation; either
// version 2 of the License, or (at your option) any later version.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
// Library General Public License for more details.
//
// You should have received a copy of the GNU Library General Public
// License along with this library; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA.
//
// Please report all bugs and problems on the following page:
//
// http://www.fltk.org/str.php
//
#include <FL/Fl.H>
#include <FL/Fl_Window.H>
#include <FL/Fl_Box.H>
#include <FL/filename.H>
int main(int argc, char **argv) {
char b[1024];
fl_filename_relative(b, 1024, "/Users/matt/proj/source");
Fl_Window *window = new Fl_Window(300,180);
Fl_Box *box = new Fl_Box(FL_UP_BOX,20,40,260,100,"Hello, World!");
box->labelfont(FL_BOLD+FL_ITALIC);
box->labelsize(36);
box->labeltype(FL_SHADOW_LABEL);
window->end();
window->show(argc, argv);
return Fl::run();
int main(int argc, char ** argv)
{
Fl_Window *window;
Fl_Box *box, *box1;
window = new Fl_Window(300, 180);
window->color(50);
box = new Fl_Box(20, 40, 130, 100, "Hello World!");
box->box(FL_UP_BOX);
box->labelsize(36);
box->color(fl_rgb_color(15));
box->labelfont(FL_BOLD+FL_ITALIC);
box->labeltype(FL_SHADOW_LABEL);
box1 = new Fl_Box(150, 40, 130, 100, "Hello World!");
box1->box(FL_UP_BOX);
box1->labelsize(36);
box1->color(15);
box1->labelfont(FL_BOLD+FL_ITALIC);
box1->labeltype(FL_SHADOW_LABEL);
window->end();
window->resizable(window);
window->show(argc, argv);
return(Fl::run());
}
//
// End of "$Id$".
//