22 Jun 08:50
Agar: r8208 - in trunk/demos: console fixedres focusing glview loader maximized objsystem plotting scrollbar scrollview sockets table table2 textbox themes unitconv
Author: vedge
Date: 2009-06-22 03:50:07 -0300 (Mon, 22 Jun 2009)
New Revision: 8208
Modified:
trunk/demos/console/console.c
trunk/demos/fixedres/fixedres.c
trunk/demos/focusing/focusing.c
trunk/demos/glview/glview.c
trunk/demos/loader/loader.c
trunk/demos/maximized/maximized.c
trunk/demos/objsystem/animal.c
trunk/demos/objsystem/mammal.c
trunk/demos/plotting/plotting.c
trunk/demos/scrollbar/scrollbar.c
trunk/demos/scrollview/scrollview.c
trunk/demos/sockets/sockets.c
trunk/demos/table/table.c
trunk/demos/table2/table.c
trunk/demos/textbox/textbox.c
trunk/demos/themes/themes.c
trunk/demos/unitconv/unitconv.c
Log:
AG_FOO_{HFILL,VFILL,EXPAND} are deprecated, use AG_Expand*() instead.
Modified: trunk/demos/console/console.c
===================================================================
--- trunk/demos/console/console.c 2009-06-22 06:44:45 UTC (rev 8207)
+++ trunk/demos/console/console.c 2009-06-22 06:50:07 UTC (rev 8208)
@@ -45,8 +45,12 @@
AG_BindGlobalKey(SDLK_F8, KMOD_NONE, AG_ViewCapture);
win = AG_WindowNew(0);
- cons = AG_ConsoleNew(win, AG_CONSOLE_EXPAND);
- box = AG_BoxNewHoriz(win, AG_BOX_HFILL|AG_BOX_HOMOGENOUS);
+
+ cons = AG_ConsoleNew(win, 0);
+ AG_Expand(cons);
+
+ box = AG_BoxNewHoriz(win, AG_BOX_HOMOGENOUS);
+ AG_ExpandHoriz(box);
{
AG_ButtonNewFn(box, 0, "Add Line", AddLine, "%p", cons);
AG_ButtonNewFn(box, 0, "Clear", ClearLines, "%p", cons);
Modified: trunk/demos/fixedres/fixedres.c
===================================================================
--- trunk/demos/fixedres/fixedres.c 2009-06-22 06:44:45 UTC (rev 8207)
+++ trunk/demos/fixedres/fixedres.c 2009-06-22 06:50:07 UTC (rev 8208)
@@ -27,10 +27,11 @@
/*
* Create a container which allows manual setting of the coordinates
- * and geometry of its child widgets. The AG_FIXED_EXPAND flag
- * requests that the container cover the entire window.
+ * and geometry of its child widgets. We use AG_Expand() so the
+ * container will cover the entire window.
*/
- fx = AG_FixedNew(win, AG_FIXED_EXPAND);
+ fx = AG_FixedNew(win, 0);
+ AG_Expand(fx);
/*
* Set the window background color to black since the background
Modified: trunk/demos/focusing/focusing.c
===================================================================
--- trunk/demos/focusing/focusing.c 2009-06-22 06:44:45 UTC (rev 8207)
+++ trunk/demos/focusing/focusing.c 2009-06-22 06:50:07 UTC (rev 8208)
@@ -72,8 +72,10 @@
win = AG_WindowNew(AG_WINDOW_NOCLOSE);
AG_WindowSetCaption(win, "Unfocused mousemotion");
AG_LabelNew(win, 0, "Mouse hover to gain focus");
- fx1 = AG_FixedNew(win, AG_FIXED_EXPAND);
+ fx1 = AG_FixedNew(win, 0);
+ AG_Expand(fx1);
+
btn = AG_ButtonNew(fx1, 0, "Foo");
AG_FixedMove(fx1, btn, 0, 0);
AG_FixedSize(fx1, btn, 32, 32);
@@ -113,18 +115,25 @@
AG_LabelNew(win, 0, "<TAB> = Cycle focus forward\n"
"<SHIFT+TAB> = Cycle focus backward");
- b = AG_BoxNewHoriz(win, AG_BOX_EXPAND|AG_BOX_HOMOGENOUS);
+ b = AG_BoxNewHoriz(win, AG_BOX_HOMOGENOUS);
+ AG_Expand(b);
- btn = AG_ButtonNew(b, AG_BUTTON_HFILL, "Foo");
+ btn = AG_ButtonNew(b, 0, "Foo");
+ AG_ExpandHoriz(btn);
widget2 = AGWIDGET(btn);
- b1 = AG_BoxNewVert(b, AG_BOX_VFILL);
+ b1 = AG_BoxNewVert(b, 0);
+ AG_ExpandVert(b1);
for (i = 0; i < 5; i++) {
- AG_ButtonNew(b1, AG_BUTTON_HFILL, "#%d", i);
+ AG_ButtonNew(b1, 0, "#%d", i);
+ AG_ExpandHoriz(b1);
}
- b2 = AG_BoxNewVert(b, AG_BOX_VFILL);;
+
+ b2 = AG_BoxNewVert(b, 0);;
+ AG_ExpandVert(b2);
for (i = 5; i < 10; i++) {
- AG_ButtonNew(b2, AG_BUTTON_HFILL, "#%d", i);
+ AG_ButtonNew(b2, 0, "#%d", i);
+ AG_ExpandHoriz(b2);
}
AG_WindowSetPosition(win, AG_WINDOW_MR, 0);
Modified: trunk/demos/glview/glview.c
===================================================================
--- trunk/demos/glview/glview.c 2009-06-22 06:44:45 UTC (rev 8207)
+++ trunk/demos/glview/glview.c 2009-06-22 06:50:07 UTC (rev 8208)
@@ -238,13 +238,15 @@
AG_HSVPal *pal;
win = AG_WindowNew(AG_WINDOW_PLAIN);
- hb = AG_BoxNewHoriz(win, AG_BOX_EXPAND);
+ hb = AG_BoxNewHoriz(win, 0);
+ AG_Expand(hb);
{
AG_Notebook *nb;
AG_NotebookTab *ntab;
/* Create the AG_GLView widget. */
- glv = AG_GLViewNew(hb, AG_GLVIEW_EXPAND);
+ glv = AG_GLViewNew(hb, 0);
+ AG_Expand(glv);
AG_WidgetFocus(glv);
/* Set up our callback functions. */
@@ -253,18 +255,26 @@
AG_GLViewOverlayFn(glv, MyOverlayFunction, NULL);
AG_GLViewButtondownFn(glv, Mousebutton, NULL);
- nb = AG_NotebookNew(hb, AG_NOTEBOOK_VFILL);
+ nb = AG_NotebookNew(hb, 0);
+ AG_ExpandVert(nb);
+
ntab = AG_NotebookAddTab(nb, "Amb", AG_BOX_VERT);
- pal = AG_HSVPalNew(ntab, AG_HSVPAL_VFILL);
+ pal = AG_HSVPalNew(ntab, 0);
AG_BindFloat(pal, "RGBAv", ambient);
+ AG_ExpandVert(pal);
+
ntab = AG_NotebookAddTab(nb, "Dif", AG_BOX_VERT);
- pal = AG_HSVPalNew(ntab, AG_HSVPAL_VFILL);
+ pal = AG_HSVPalNew(ntab, 0);
AG_BindFloat(pal, "RGBAv", diffuse);
+ AG_ExpandVert(pal);
+
ntab = AG_NotebookAddTab(nb, "Spe", AG_BOX_VERT);
- pal = AG_HSVPalNew(ntab, AG_HSVPAL_VFILL);
+ pal = AG_HSVPalNew(ntab, 0);
AG_BindFloat(pal, "RGBAv", specular);
+ AG_ExpandVert(pal);
}
- hb = AG_BoxNewHoriz(win, AG_BOX_HFILL|AG_BOX_FRAME);
+ hb = AG_BoxNewHoriz(win, AG_BOX_FRAME);
+ AG_ExpandHoriz(hb);
{
AG_RadioNewInt(hb, 0, primitiveNames, (int *)&primitive);
AG_SeparatorNewVert(hb);
Modified: trunk/demos/loader/loader.c
===================================================================
--- trunk/demos/loader/loader.c 2009-06-22 06:44:45 UTC (rev 8207)
+++ trunk/demos/loader/loader.c 2009-06-22 06:50:07 UTC (rev 8208)
@@ -127,12 +127,14 @@
AG_Window *win;
AG_FileDlg *fd;
AG_FileType *ft;
+ AG_Box *box;
win = AG_WindowNew(0);
AG_WindowSetCaption(win, "Image loader");
/* Create the file loader widget. */
- fd = AG_FileDlgNew(win, AG_FILEDLG_EXPAND);
+ fd = AG_FileDlgNew(win, 0);
+ AG_Expand(fd);
/* Set some default directory. */
AG_FileDlgSetDirectoryMRU(fd, "images-dir", "./Images");
@@ -167,7 +169,9 @@
* create various widgets for per-type options. We specify where those
* widgets will be created here.
*/
- AG_FileDlgSetOptionContainer(fd, AG_BoxNewVert(win, AG_BOX_HFILL));
+ box = AG_BoxNewVert(win, 0);
+ AG_ExpandHoriz(box);
+ AG_FileDlgSetOptionContainer(fd, box);
AG_WindowSetPosition(win, AG_WINDOW_MIDDLE_LEFT, 0);
AG_WindowShow(win);
Modified: trunk/demos/maximized/maximized.c
===================================================================
--- trunk/demos/maximized/maximized.c 2009-06-22 06:44:45 UTC (rev 8207)
+++ trunk/demos/maximized/maximized.c 2009-06-22 06:50:07 UTC (rev 8208)
@@ -23,7 +23,8 @@
AG_WindowSetPadding(win, 0, 0, 0, 0);
/* Create an example table. */
- table = AG_TableNew(win, AG_TABLE_EXPAND);
+ table = AG_TableNew(win, 0);
+ AG_Expand(table);
AG_TableAddCol(table, "Foo", "<8888>", NULL);
AG_TableAddCol(table, "Bar", NULL, NULL);
for (i = 0; i < 100; i++) {
Modified: trunk/demos/objsystem/animal.c
===================================================================
--- trunk/demos/objsystem/animal.c 2009-06-22 06:44:45 UTC (rev 8207)
+++ trunk/demos/objsystem/animal.c 2009-06-22 06:50:07 UTC (rev 8208)
@@ -122,14 +122,15 @@
{
Animal *animal = obj;
AG_Window *win;
+ AG_Numerical *num;
win = AG_WindowNew(0);
AG_WindowSetCaption(win, "Animal: %s", AGOBJECT(animal)->name);
- AG_NumericalNewFlt(win, AG_NUMERICAL_HFILL, "sec", "Age: ",
- &animal->age);
- AG_NumericalNewInt(win, AG_NUMERICAL_HFILL, NULL, "Cell count: ",
- &animal->cellCount);
+ num = AG_NumericalNewFlt(win, 0, "sec", "Age: ", &animal->age);
+ AG_ExpandHoriz(num);
+ num = AG_NumericalNewInt(win, 0, NULL, "Cell count: ", &animal->cellCount);
+ AG_ExpandHoriz(num);
return (win);
}
Modified: trunk/demos/objsystem/mammal.c
===================================================================
--- trunk/demos/objsystem/mammal.c 2009-06-22 06:44:45 UTC (rev 8207)
+++ trunk/demos/objsystem/mammal.c 2009-06-22 06:50:07 UTC (rev 8208)
@@ -83,10 +83,12 @@
/* Allow user to edit paramters specific to this class. */
AG_LabelNew(win, 0, "Hair color:");
- pal = AG_HSVPalNew(win, AG_HSVPAL_EXPAND);
+ pal = AG_HSVPalNew(win, 0);
AG_BindFloat(pal, "hue", &mammal->hairColor.h);
AG_BindFloat(pal, "saturation", &mammal->hairColor.s);
AG_BindFloat(pal, "value", &mammal->hairColor.v);
+ AG_Expand(pal);
+
return (win);
}
Modified: trunk/demos/plotting/plotting.c
===================================================================
--- trunk/demos/plotting/plotting.c 2009-06-22 06:44:45 UTC (rev 8207)
+++ trunk/demos/plotting/plotting.c 2009-06-22 06:50:07 UTC (rev 8208)
@@ -199,6 +199,7 @@
AG_Pane *pane;
AG_Numerical *num;
AG_Box *box;
+ AG_Button *btn;
int i;
if (AG_InitCore("agar-plotting-demo", 0) == -1) {
@@ -217,10 +218,12 @@
win = AG_WindowNew(AG_WINDOW_PLAIN);
AG_WindowSetCaption(win, "M_Plotter example");
- pane = AG_PaneNew(win, AG_PANE_HORIZ, AG_PANE_EXPAND);
+ pane = AG_PaneNew(win, AG_PANE_HORIZ, 0);
+ AG_Expand(pane);
{
/* Create our plotter widget */
- plt = M_PlotterNew(pane->div[1], M_PLOTTER_EXPAND);
+ plt = M_PlotterNew(pane->div[1], 0);
+ AG_Expand(plt);
/*
* Create the velocity plot item. This is what our algorithm
@@ -249,7 +252,8 @@
}
/* Allow the user to play with the parameters. */
- box = AG_BoxNew(pane->div[0], AG_BOX_VERT, AG_BOX_EXPAND);
+ box = AG_BoxNew(pane->div[0], AG_BOX_VERT, 0);
+ AG_Expand(box);
{
struct {
const char *name;
@@ -282,8 +286,9 @@
AG_LabelNewPolled(box, 0, "Ts: %lf", &Ts);
AG_LabelNewPolled(box, 0, "Ta: %lf", &Ta);
AG_LabelNewPolled(box, 0, "To: %lf", &To);
- AG_ButtonAct(box, AG_BUTTON_HFILL, "Generate",
- GeneratePlot, "%p", plt);
+
+ btn = AG_ButtonAct(box, 0, "Generate", GeneratePlot, "%p", plt);
+ AG_ExpandHoriz(btn);
}
AG_SetEvent(win, "window-shown", GeneratePlot, "%p", plt);
AG_WindowMaximize(win);
Modified: trunk/demos/scrollbar/scrollbar.c
===================================================================
--- trunk/demos/scrollbar/scrollbar.c 2009-06-22 06:44:45 UTC (rev 8207)
+++ trunk/demos/scrollbar/scrollbar.c 2009-06-22 06:50:07 UTC (rev 8208)
@@ -23,32 +23,40 @@
CreateWindow(void)
{
AG_Window *win;
+ AG_Label *lbl;
+ AG_Scrollbar *sb;
win = AG_WindowNew(AG_WINDOW_PLAIN);
- AG_LabelNewPolled(win, AG_LABEL_HFILL, "Int binding: %d", &vInt);
- AG_ScrollbarNewInt(win, AG_SCROLLBAR_HORIZ, AG_SCROLLBAR_HFILL,
- &vInt, &minInt, &maxInt, &visInt);
+ lbl = AG_LabelNewPolled(win, 0, "Int binding: %d", &vInt);
+ sb = AG_ScrollbarNewInt(win, AG_SCROLLBAR_HORIZ, 0, &vInt, &minInt, &maxInt, &visInt);
+ AG_ExpandHoriz(lbl);
+ AG_ExpandHoriz(sb);
- AG_LabelNewPolled(win, AG_LABEL_HFILL, "Uint binding: %d", &vUint);
- AG_ScrollbarNewInt(win, AG_SCROLLBAR_HORIZ, AG_SCROLLBAR_HFILL,
- &vUint, &minUint, &maxUint, &visUint);
+ lbl = AG_LabelNewPolled(win, 0, "Uint binding: %d", &vUint);
+ sb = AG_ScrollbarNewInt(win, AG_SCROLLBAR_HORIZ, 0, &vUint, &minUint, &maxUint, &visUint);
+ AG_ExpandHoriz(lbl);
+ AG_ExpandHoriz(sb);
- AG_LabelNewPolled(win, AG_LABEL_HFILL, "8-bit binding: %[s8]", &v8);
- AG_ScrollbarNewSint8(win, AG_SCROLLBAR_HORIZ, AG_SCROLLBAR_HFILL,
- &v8, &min8, &max8, &vis8);
+ lbl = AG_LabelNewPolled(win, 0, "8-bit binding: %[s8]", &v8);
+ sb = AG_ScrollbarNewSint8(win, AG_SCROLLBAR_HORIZ, 0, &v8, &min8, &max8, &vis8);
+ AG_ExpandHoriz(lbl);
+ AG_ExpandHoriz(sb);
- AG_LabelNewPolled(win, AG_LABEL_HFILL, "32-bit binding: %[u32]", &v32);
- AG_ScrollbarNewUint32(win, AG_SCROLLBAR_HORIZ, AG_SCROLLBAR_HFILL,
- &v32, &min32, &max32, &vis32);
+ lbl = AG_LabelNewPolled(win, 0, "32-bit binding: %[u32]", &v32);
+ sb = AG_ScrollbarNewUint32(win, AG_SCROLLBAR_HORIZ, 0, &v32, &min32, &max32, &vis32);
+ AG_ExpandHoriz(lbl);
+ AG_ExpandHoriz(sb);
- AG_LabelNewPolled(win, AG_LABEL_HFILL, "Float binding: %f", &vFlt);
- AG_ScrollbarNewFloat(win, AG_SCROLLBAR_HORIZ, AG_SCROLLBAR_HFILL,
- &vFlt, &minFlt, &maxFlt, &visFlt);
+ lbl = AG_LabelNewPolled(win, 0, "Float binding: %f", &vFlt);
+ sb = AG_ScrollbarNewFloat(win, AG_SCROLLBAR_HORIZ, 0, &vFlt, &minFlt, &maxFlt, &visFlt);
+ AG_ExpandHoriz(lbl);
+ AG_ExpandHoriz(sb);
- AG_LabelNewPolled(win, AG_LABEL_HFILL, "Double binding: %lf", &vDbl);
- AG_ScrollbarNewDouble(win, AG_SCROLLBAR_HORIZ, AG_SCROLLBAR_HFILL,
- &vDbl, &minDbl, &maxDbl, &visDbl);
+ lbl = AG_LabelNewPolled(win, 0, "Double binding: %lf", &vDbl);
+ sb = AG_ScrollbarNewDouble(win, AG_SCROLLBAR_HORIZ, 0, &vDbl, &minDbl, &maxDbl, &visDbl);
+ AG_ExpandHoriz(lbl);
+ AG_ExpandHoriz(sb);
AG_WindowMaximize(win);
AG_WindowShow(win);
Modified: trunk/demos/scrollview/scrollview.c
===================================================================
--- trunk/demos/scrollview/scrollview.c 2009-06-22 06:44:45 UTC (rev 8207)
+++ trunk/demos/scrollview/scrollview.c 2009-06-22 06:50:07 UTC (rev 8208)
@@ -42,7 +42,8 @@
AG_ButtonNew(win, 0, "Foo");
- sv = AG_ScrollviewNew(win, AG_SCROLLVIEW_EXPAND);
+ sv = AG_ScrollviewNew(win, 0);
+ AG_Expand(sv);
/* Create a bunch of buttons under the Scrollview. */
for (y = 0; y < 20; y++) {
Modified: trunk/demos/sockets/sockets.c
===================================================================
--- trunk/demos/sockets/sockets.c 2009-06-22 06:44:45 UTC (rev 8207)
+++ trunk/demos/sockets/sockets.c 2009-06-22 06:50:07 UTC (rev 8208)
@@ -85,7 +85,9 @@
AG_WindowSetGeometryAligned(win, AG_WINDOW_BL, agView->w, 128);
agColors[WINDOW_BG_COLOR] = AG_MapRGB(agVideoFmt, 0,0,0);
- fx = AG_FixedNew(win, AG_FIXED_EXPAND);
+ fx = AG_FixedNew(win, 0);
+ AG_Expand(fx);
+
if ((px = AG_PixmapFromBMP(fx, 0, "Images/menubg.bmp")) == NULL) {
fprintf(stderr, "Cannot find menubg.bmp\n", AG_GetError());
exit(1);
Modified: trunk/demos/table/table.c
===================================================================
--- trunk/demos/table/table.c 2009-06-22 06:44:45 UTC (rev 8207)
+++ trunk/demos/table/table.c 2009-06-22 06:50:07 UTC (rev 8208)
@@ -69,7 +69,8 @@
* we wanted to allow multiple selections, or the AG_TABLE_POLL
* flag to update the table periodically.
*/
- table = AG_TableNew(win, AG_TABLE_EXPAND);
+ table = AG_TableNew(win, 0);
+ AG_Expand(table);
/*
* Create a column large enough to hold the string "<HIDDEN POINTER>".
@@ -162,9 +163,10 @@
AG_WindowSetCaption(win, "Example 2: Polled Table");
/* Create a polled table. */
- table = AG_TableNewPolled(win, AG_TABLE_EXPAND, UpdateTable, NULL);
+ table = AG_TableNewPolled(win, 0, UpdateTable, NULL);
AG_TableAddCol(table, "Column 1", "<8888>", NULL);
AG_TableAddCol(table, "Column 2", "<888888888>", NULL);
+ AG_Expand(table);
/* Display and resize our window. */
AG_WindowSetGeometryAligned(win, AG_WINDOW_ML, 150, 300);
@@ -212,7 +214,8 @@
AG_WindowSetCaption(win, "Example 3: Table With Embedded Widgets");
/* Create our table. */
- table = AG_TableNew(win, AG_TABLE_EXPAND);
+ table = AG_TableNew(win, 0);
+ AG_Expand(table);
/* Create our columns. */
AG_TableAddCol(table, "Widgets", "<Widgets>", NULL);
@@ -242,7 +245,8 @@
AG_TableEnd(table);
/* Provide a function to report on the status of MyTable. */
- box = AG_BoxNewHoriz(win, AG_BOX_HFILL|AG_BOX_HOMOGENOUS);
+ box = AG_BoxNewHoriz(win, AG_BOX_HOMOGENOUS);
+ AG_ExpandHoriz(box);
{
AG_ButtonNewFn(box, 0, "Report selected rows",
ReportSelectedRows, "%p", MyTable);
Modified: trunk/demos/table2/table.c
===================================================================
--- trunk/demos/table2/table.c 2009-06-22 06:44:45 UTC (rev 8207)
+++ trunk/demos/table2/table.c 2009-06-22 06:50:07 UTC (rev 8208)
@@ -41,7 +41,8 @@
win = AG_WindowNew(0);
AG_WindowSetCaption(win, "Example 1: Static Table");
- table = AG_TableNew(win, AG_TABLE_EXPAND);
+ table = AG_TableNew(win, 0);
+ AG_Expand(table);
AG_TableAddCol(table, "This column", "<Foobar>", NULL);
AG_TableAddCol(table, "Sorted column", "100px", NULL);
@@ -77,7 +78,9 @@
AG_WindowSetGeometry(win, 0, 0, 320, 240);
AG_WindowSetPosition(win, AG_WINDOW_LOWER_CENTER, 0);
- table = AG_TableNew(win, AG_TABLE_EXPAND);
+ table = AG_TableNew(win, 0);
+ AG_Expand(table);
+
AG_LabelNew(win, 0, "%d total", 100);
/* Create our columns. */
@@ -154,13 +157,14 @@
win = AG_WindowNew(0);
AG_WindowSetCaption(win, "Example 3: Table With Embedded Widgets");
- table = AG_TableNew(win, AG_TABLE_EXPAND);
+ table = AG_TableNew(win, 0);
AG_TableAddCol(table, "Button", "20%", NULL);
AG_TableAddCol(table, "Button2", "20%", NULL);
AG_TableAddCol(table, "Items", "20%", NULL);
AG_TableAddCol(table, "Pixmap1", "20%", NULL);
AG_TableAddCol(table, "Pixmap2", "20%", NULL);
AG_TableSetRowHeight(table,120);
+ AG_Expand(table);
memset(MyTable, 0, 20*sizeof(int));
@@ -184,7 +188,8 @@
}
AG_TableEnd(table);
- box = AG_BoxNewHoriz(win, AG_BOX_HFILL|AG_BOX_HOMOGENOUS);
+ box = AG_BoxNewHoriz(win, AG_BOX_HOMOGENOUS);
+ AG_ExpandHoriz(box);
{
AG_ButtonNewFn(box, 0, "Report selected rows",
ReportSelectedRows, "%p", MyTable);
Modified: trunk/demos/textbox/textbox.c
===================================================================
--- trunk/demos/textbox/textbox.c 2009-06-22 06:44:45 UTC (rev 8207)
+++ trunk/demos/textbox/textbox.c 2009-06-22 06:50:07 UTC (rev 8208)
@@ -112,9 +112,17 @@
AG_CheckboxNewFn(win, 0, "Disable input", SetDisable, "%p", textbox);
#if 0
AG_SeparatorNewHoriz(win);
- AG_LabelNewPolled(win, AG_LABEL_HFILL, "Lines: %d", &textbox->ed->yMax);
- AG_LabelNewPolled(win, AG_LABEL_HFILL, "Cursor position: %d",
- &textbox->ed->pos);
+ {
+ AG_Label *lbl;
+
+ lbl = AG_LabelNewPolled(win, 0, "Lines: %d",
+ &textbox->ed->yMax);
+ AG_ExpandHoriz(lbl);
+
+ lbl = AG_LabelNewPolled(win, 0, "Cursor position: %d",
+ &textbox->ed->pos);
+ AG_ExpandHoriz(lbl);
+ }
#endif
AG_WindowSetGeometryAligned(win, AG_WINDOW_MC, 540, 380);
AG_WindowShow(win);
Modified: trunk/demos/themes/themes.c
===================================================================
--- trunk/demos/themes/themes.c 2009-06-22 06:44:45 UTC (rev 8207)
+++ trunk/demos/themes/themes.c 2009-06-22 06:50:07 UTC (rev 8208)
@@ -51,7 +51,8 @@
* The MPane widget also provides a set of preconfigured layouts
* for multiple pane views.
*/
- pane = AG_PaneNew(win, AG_PANE_HORIZ, AG_PANE_EXPAND);
+ pane = AG_PaneNew(win, AG_PANE_HORIZ, 0);
+ AG_Expand(pane);
div1 = pane->div[0];
div2 = pane->div[1];
{
@@ -78,8 +79,8 @@
* Box is a general-purpose widget container. We use AG_BoxNewHoriz()
* for horizontal widget packing.
*/
- hBox = AG_BoxNewHoriz(div1, AG_BOX_HFILL|AG_BOX_HOMOGENOUS|
- AG_BOX_FRAME);
+ hBox = AG_BoxNewHoriz(div1, AG_BOX_HOMOGENOUS|AG_BOX_FRAME);
+ AG_ExpandHoriz(hBox);
{
/*
* The Button widget is a simple push-button. It is typically
@@ -90,7 +91,8 @@
AG_ButtonNew(hBox, 0, "%c", 0x41+i);
}
- hBox = AG_BoxNewHoriz(div1, AG_BOX_HFILL);
+ hBox = AG_BoxNewHoriz(div1, 0);
+ AG_ExpandHoriz(hBox);
{
/* The Radio checkbox is a group of radio buttons. */
{
@@ -99,7 +101,10 @@
"Radio2",
NULL
};
- AG_RadioNew(hBox, AG_RADIO_EXPAND, radioItems);
+ AG_Radio *rad;
+
+ rad = AG_RadioNew(hBox, 0, radioItems);
+ AG_Expand(rad);
}
vBox = AG_BoxNewVert(hBox, 0);
@@ -121,12 +126,14 @@
* to it. The button triggers a popup window which displays a list
* (using the AG_Tlist(3) widget).
*/
- com = AG_ComboNew(div1, AG_COMBO_HFILL, "Combo: ");
+ com = AG_ComboNew(div1, 0, "Combo: ");
+ AG_ExpandHoriz(com);
AG_ComboSizeHint(com, "Item #00 ", 10);
AG_SetEvent(com, "combo-selected", ComboSelected, NULL);
/* UCombo is a variant of Combo which looks like a single button. */
- ucom = AG_UComboNew(div1, AG_UCOMBO_HFILL);
+ ucom = AG_UComboNew(div1, 0);
+ AG_ExpandHoriz(ucom);
/* Populate the Tlist displayed by the combo widgets we just created. */
for (i = 0; i < 50; i++) {
@@ -143,9 +150,12 @@
static float myFloat = 1.0;
static int myMin = 0, myMax = 10, myInt = 1;
- num = AG_NumericalNew(div1, AG_NUMERICAL_HFILL, "cm", "Real: ");
+ num = AG_NumericalNew(div1, 0, "cm", "Real: ");
+ AG_ExpandHoriz(num);
AG_BindFloat(num, "value", &myFloat);
- num = AG_NumericalNew(div1, AG_NUMERICAL_HFILL, NULL, "Int: ");
+
+ num = AG_NumericalNew(div1, 0, NULL, "Int: ");
+ AG_ExpandHoriz(num);
AG_BindInt(num, "value", &myInt);
}
@@ -166,14 +176,14 @@
AG_Slider *sl;
AG_ProgressBar *pb;
- sb = AG_ScrollbarNewInt(div1, AG_SCROLLBAR_HORIZ,
- AG_SCROLLBAR_HFILL,
+ sb = AG_ScrollbarNewInt(div1, AG_SCROLLBAR_HORIZ, 0,
&myVal, &myMin, &myMax, &myVisible);
+ AG_ExpandHoriz(sb);
AG_ScrollbarSetIntIncrement(sb, 10);
- sl = AG_SliderNewInt(div1, AG_SLIDER_HORIZ,
- AG_SLIDER_HFILL,
+ sl = AG_SliderNewInt(div1, AG_SLIDER_HORIZ, 0,
&myVal, &myMin, &myMax);
+ AG_ExpandHoriz(sl);
AG_SliderSetIntIncrement(sl, 10);
pb = AG_ProgressBarNewInt(div1, AG_PROGRESS_BAR_HORIZ,
@@ -190,7 +200,8 @@
AG_NotebookTab *ntab;
AG_Table *table;
- nb = AG_NotebookNew(div2, AG_NOTEBOOK_EXPAND);
+ nb = AG_NotebookNew(div2, 0);
+ AG_Expand(nb);
ntab = AG_NotebookAddTab(nb, "Table", AG_BOX_VERT);
{
@@ -202,10 +213,11 @@
* the table is static or needs to be repopulated
* periodically.
*/
- table = AG_TableNew(ntab, AG_TABLE_EXPAND);
+ table = AG_TableNew(ntab, 0);
AG_TableAddCol(table, "x", "33%", NULL);
AG_TableAddCol(table, "sin(x)", "33%", NULL);
AG_TableAddCol(table, "cos(x)", "33%", NULL);
+ AG_Expand(table);
for (f = 0.0f; f < 60.0f; f += 0.3f) {
/*
* Insert a Table row for sin(f) and cos(f).
@@ -226,12 +238,12 @@
/*
* Textboxes with the MULTILINE flag provide basic
* text edition functionality. The CATCH_TAB flag
- * causes the widget to receive TAB key events (which
- * are normally used to focus other widget).
+ * causes the widget to receive TAB key events
+ * (normally used to focus other widgets).
*/
- tbox = AG_TextboxNew(ntab, AG_TEXTBOX_EXPAND|
- AG_TEXTBOX_MULTILINE|
+ tbox = AG_TextboxNew(ntab, AG_TEXTBOX_MULTILINE|
AG_TEXTBOX_CATCH_TAB, NULL);
+ AG_Expand(tbox);
AG_WidgetSetFocusable(tbox, 1);
/*
@@ -456,15 +468,17 @@
AG_Label *lbl;
AG_Box *hBox;
- lbl = AG_LabelNew(win, AG_LABEL_HFILL,
+ lbl = AG_LabelNew(win, 0,
"Using Agar version: %d.%d.%d (\"%s\")\n"
"Graphics mode: %s",
ver.major, ver.minor, ver.patch, ver.release,
AG_GetBool(agConfig,"view.opengl") ?
"OpenGL" : "Unaccelerated (framebuffer)");
+ AG_ExpandHoriz(lbl);
AG_LabelJustify(lbl, AG_TEXT_CENTER);
- hBox = AG_BoxNewHoriz(win, AG_BOX_HFILL);
+ hBox = AG_BoxNewHoriz(win, 0);
+ AG_ExpandHoriz(hBox);
{
AG_ButtonNewFn(hBox, 0, "Default theme",
SetTheme, "%p", &agStyleDefault);
Modified: trunk/demos/unitconv/unitconv.c
===================================================================
--- trunk/demos/unitconv/unitconv.c 2009-06-22 06:44:45 UTC (rev 8207)
+++ trunk/demos/unitconv/unitconv.c 2009-06-22 06:50:07 UTC (rev 8208)
@@ -67,8 +67,10 @@
AG_SeparatorNewHoriz(win);
- n1 = AG_NumericalNew(win, AG_NUMERICAL_HFILL, "in", "Value: ");
- n2 = AG_NumericalNew(win, AG_NUMERICAL_HFILL, "mm", "Value: ");
+ n1 = AG_NumericalNew(win, 0, "in", "Value: ");
+ n2 = AG_NumericalNew(win, 0, "mm", "Value: ");
+ AG_ExpandHoriz(n1);
+ AG_ExpandHoriz(n2);
AG_BindDouble(n1, "value", &value);
AG_BindDouble(n2, "value", &value);
AG_NumericalSizeHint(n1, "0000.00");
RSS Feed