From efe09af4eef72f46dcaf50ced776ef7667a04087 Mon Sep 17 00:00:00 2001 From: scuri Date: Mon, 30 Nov 2009 19:27:33 +0000 Subject: *** empty log message *** --- test/cdtest/cdtest.c | 14 +- test/cdtest/cdtest.led | 1 + test/cdtest/cdtest_led.c | 644 +++++++++++++++++++++++------------------------ test/cdtest/config.mak | 2 +- test/cdtest/drivers.c | 27 +- 5 files changed, 347 insertions(+), 341 deletions(-) (limited to 'test/cdtest') diff --git a/test/cdtest/cdtest.c b/test/cdtest/cdtest.c index 9180bf4..82cc812 100644 --- a/test/cdtest/cdtest.c +++ b/test/cdtest/cdtest.c @@ -2079,11 +2079,10 @@ int fInteger(Ihandle *self, int c) ignore(self); if (isdigit(c) || c == '-') return IUP_DEFAULT; - else if ((c==K_TAB) || (c==K_CR) || (c==K_LEFT) || - (c==K_RIGHT) || (c==K_DEL) || (c==K_BS) || (c==K_sTAB)) - return IUP_DEFAULT; - else + else if (c) return IUP_IGNORE; + else + return IUP_DEFAULT; } /*-------------------------------------------------------------------------*/ @@ -2094,13 +2093,12 @@ int fReal(Ihandle *self, int c) ignore(self); if (isdigit(c)) return IUP_DEFAULT; - else if ((c==K_TAB) || (c==K_CR) || (c==K_LEFT) || - (c==K_RIGHT) || (c==K_DEL) || (c==K_BS) || (c==K_sTAB)) - return IUP_DEFAULT; else if ((c=='.') || (c=='e') || (c=='E') || (c=='+') || (c=='-')) return IUP_DEFAULT; - else + else if (c) return IUP_IGNORE; + else + return IUP_DEFAULT; } /*-------------------------------------------------------------------------*/ diff --git a/test/cdtest/cdtest.led b/test/cdtest/cdtest.led index 1f2c412..2ef3593 100644 --- a/test/cdtest/cdtest.led +++ b/test/cdtest/cdtest.led @@ -370,6 +370,7 @@ mnOpen = MENU mnSave = MENU ( ITEM("MF...", cmdMF), + ITEM("DEBUG...", cmdDebug), itPDF = ITEM[ACTIVE=NO]("PDF...", cmdPDF), itPS = ITEM[ACTIVE=NO]("PS...", cmdPS), itEPS = ITEM[ACTIVE=NO]("EPS...", cmdEPS), diff --git a/test/cdtest/cdtest_led.c b/test/cdtest/cdtest_led.c index b4530b4..a7d8d50 100644 --- a/test/cdtest/cdtest_led.c +++ b/test/cdtest/cdtest_led.c @@ -1,4 +1,4 @@ -/* Automatically generated by Iup ledc 2.6 */ +/* Automatically generated by Iup 3.0 LED Compiler to C. */ #include #include @@ -6,23 +6,6 @@ static Ihandle* named[ 172 ]; -static Ihandle* decl( char* name, Ihandle* elem, char* first, ...) -{ - char *attr, *val; - va_list arg; - va_start (arg, first); - attr = first; - while (attr) - { - val = va_arg(arg,char*); - IupSetAttribute( elem, attr, val ); - attr = va_arg(arg,char*); - } - va_end (arg); - if(name) IupSetHandle( name, elem ); - return elem; -} - static void image_imgLine (void) { unsigned char map[] = { @@ -46,7 +29,7 @@ static void image_imgLine (void) 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1 }; - decl( "imgLine", IupImage( 18, 18, map ), + IupSetAtt( "imgLine", IupImage( 18, 18, map ), "0", "BGCOLOR", "1", "0 0 0", NULL ); } @@ -74,7 +57,7 @@ static void image_imgClip (void) 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1 }; - decl( "imgClip", IupImage( 18, 18, map ), + IupSetAtt( "imgClip", IupImage( 18, 18, map ), "0", "BGCOLOR", "1", "0 0 0", NULL ); } @@ -102,7 +85,7 @@ static void image_imgImage (void) 0, 0, 0, 0, 0, 0, 0, 1, 2, 1, 3, 0, 0, 0, 0, 0, 0, 0, -1 }; - decl( "imgImage", IupImage( 18, 18, map ), + IupSetAtt( "imgImage", IupImage( 18, 18, map ), "0", "BGCOLOR", "1", "0 0 0", "2", "255 255 255", @@ -132,7 +115,7 @@ static void image_imgImageRGB (void) 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1 }; - decl( "imgImageRGB", IupImage( 18, 18, map ), + IupSetAtt( "imgImageRGB", IupImage( 18, 18, map ), "0", "BGCOLOR", "1", "255 0 0", "2", "0 255 0", @@ -162,7 +145,7 @@ static void image_imgBox (void) 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1 }; - decl( "imgBox", IupImage( 18, 18, map ), + IupSetAtt( "imgBox", IupImage( 18, 18, map ), "0", "BGCOLOR", "1", "0 0 0", "2", "255 255 255", NULL ); @@ -191,7 +174,7 @@ static void image_imgRect (void) 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1 }; - decl( "imgRect", IupImage( 18, 18, map ), + IupSetAtt( "imgRect", IupImage( 18, 18, map ), "0", "BGCOLOR", "1", "0 0 0", "2", "255 255 255", NULL ); @@ -220,7 +203,7 @@ static void image_imgSector (void) 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1 }; - decl( "imgSector", IupImage( 18, 18, map ), + IupSetAtt( "imgSector", IupImage( 18, 18, map ), "0", "BGCOLOR", "1", "0 0 0", "2", "255 255 255", NULL ); @@ -249,7 +232,7 @@ static void image_imgChord (void) 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1 }; - decl( "imgChord", IupImage( 18, 18, map ), + IupSetAtt( "imgChord", IupImage( 18, 18, map ), "0", "BGCOLOR", "1", "0 0 0", "2", "255 255 255", NULL ); @@ -278,7 +261,7 @@ static void image_imgArc (void) 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1 }; - decl( "imgArc", IupImage( 18, 18, map ), + IupSetAtt( "imgArc", IupImage( 18, 18, map ), "0", "BGCOLOR", "1", "0 0 0", "2", "255 255 255", NULL ); @@ -307,7 +290,7 @@ static void image_imgText (void) 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1 }; - decl( "imgText", IupImage( 18, 18, map ), + IupSetAtt( "imgText", IupImage( 18, 18, map ), "0", "BGCOLOR", "1", "255 255 255", "2", "0 0 0", NULL ); @@ -336,7 +319,7 @@ static void image_imgPoly (void) 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1 }; - decl( "imgPoly", IupImage( 18, 18, map ), + IupSetAtt( "imgPoly", IupImage( 18, 18, map ), "0", "BGCOLOR", "1", "0 0 0", NULL ); } @@ -364,7 +347,7 @@ static void image_imgMark (void) 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1 }; - decl( "imgMark", IupImage( 18, 18, map ), + IupSetAtt( "imgMark", IupImage( 18, 18, map ), "0", "BGCOLOR", "1", "0 0 0", NULL ); } @@ -392,7 +375,7 @@ static void image_imgPixel (void) 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1 }; - decl( "imgPixel", IupImage( 18, 18, map ), + IupSetAtt( "imgPixel", IupImage( 18, 18, map ), "0", "BGCOLOR", "1", "0 0 0", "2", "255 255 255", NULL ); @@ -414,70 +397,71 @@ void cdtest_loadled (void) image_imgPoly (); image_imgMark (); image_imgPixel (); - named[0] = decl( "mnOpen", IupMenu( + named[0] = IupSetAtt( "mnOpen", IupMenu( IupItem( "MF...", "cmdPlayMF" ), - named[1] = decl( "itPlayCGM", IupItem( "CGM...", "cmdPlayCGM" ), + named[1] = IupSetAtt( "itPlayCGM", IupItem( "CGM...", "cmdPlayCGM" ), "ACTIVE", "NO", NULL ), - named[2] = decl( "itPlayEMF", IupItem( "EMF...", "cmdPlayEMF" ), + named[2] = IupSetAtt( "itPlayEMF", IupItem( "EMF...", "cmdPlayEMF" ), "ACTIVE", "NO", NULL ), - named[3] = decl( "itPlayWMF", IupItem( "WMF...", "cmdPlayWMF" ), + named[3] = IupSetAtt( "itPlayWMF", IupItem( "WMF...", "cmdPlayWMF" ), "ACTIVE", "NO", NULL ), NULL), NULL ); - named[4] = decl( "mnSave", IupMenu( + named[4] = IupSetAtt( "mnSave", IupMenu( IupItem( "MF...", "cmdMF" ), - named[5] = decl( "itPDF", IupItem( "PDF...", "cmdPDF" ), + IupItem( "DEBUG...", "cmdDebug" ), + named[5] = IupSetAtt( "itPDF", IupItem( "PDF...", "cmdPDF" ), "ACTIVE", "NO", NULL ), - named[6] = decl( "itPS", IupItem( "PS...", "cmdPS" ), + named[6] = IupSetAtt( "itPS", IupItem( "PS...", "cmdPS" ), "ACTIVE", "NO", NULL ), - named[7] = decl( "itEPS", IupItem( "EPS...", "cmdEPS" ), + named[7] = IupSetAtt( "itEPS", IupItem( "EPS...", "cmdEPS" ), "ACTIVE", "NO", NULL ), - named[8] = decl( "itCGMt", IupItem( "CGMt...", "cmdCGMt" ), + named[8] = IupSetAtt( "itCGMt", IupItem( "CGMt...", "cmdCGMt" ), "ACTIVE", "NO", NULL ), - named[9] = decl( "itCGMb", IupItem( "CGMb...", "cmdCGMb" ), + named[9] = IupSetAtt( "itCGMb", IupItem( "CGMb...", "cmdCGMb" ), "ACTIVE", "NO", NULL ), - named[10] = decl( "itDGN", IupItem( "DGN...", "cmdDGN" ), + named[10] = IupSetAtt( "itDGN", IupItem( "DGN...", "cmdDGN" ), "ACTIVE", "NO", NULL ), - named[11] = decl( "itDXF", IupItem( "DXF...", "cmdDXF" ), + named[11] = IupSetAtt( "itDXF", IupItem( "DXF...", "cmdDXF" ), "ACTIVE", "NO", NULL ), - named[12] = decl( "itEMF", IupItem( "EMF...", "cmdEMF" ), + named[12] = IupSetAtt( "itEMF", IupItem( "EMF...", "cmdEMF" ), "ACTIVE", "NO", NULL ), - named[13] = decl( "itWMF", IupItem( "WMF...", "cmdWMF" ), + named[13] = IupSetAtt( "itWMF", IupItem( "WMF...", "cmdWMF" ), "ACTIVE", "NO", NULL ), NULL), NULL ); - named[14] = decl( "mnFile", IupMenu( - decl( NULL, IupSubmenu( "Open", + named[14] = IupSetAtt( "mnFile", IupMenu( + IupSetAtt( NULL, IupSubmenu( "Open", named[0] /* mnOpen */ ), "KEY", "K_O", NULL ), IupSeparator(), - decl( NULL, IupSubmenu( "Save", + IupSetAtt( NULL, IupSubmenu( "Save", named[4] /* mnSave */ ), "KEY", "K_S", NULL ), IupSeparator(), - named[15] = decl( "itPrint", IupItem( "Print...", "cmdPrint" ), + named[15] = IupSetAtt( "itPrint", IupItem( "Print...", "cmdPrint" ), "KEY", "K_P", NULL ), IupSeparator(), - decl( NULL, IupItem( "Exit", "cmdFileExit" ), + IupSetAtt( NULL, IupItem( "Exit", "cmdFileExit" ), "KEY", "K_x", NULL ), NULL), NULL ); - named[16] = decl( "mnEdit", IupMenu( - named[17] = decl( "itEditUndo", IupItem( "Undo", "cmdEditUndo" ), NULL ), + named[16] = IupSetAtt( "mnEdit", IupMenu( + named[17] = IupSetAtt( "itEditUndo", IupItem( "Undo", "cmdEditUndo" ), NULL ), IupSeparator(), - named[18] = decl( "itClipBoard", IupItem( "Copy as EMF/WMF", "cmdClipBoard" ), + named[18] = IupSetAtt( "itClipBoard", IupItem( "Copy as EMF/WMF", "cmdClipBoard" ), "ACTIVE", "NO", NULL ), - named[19] = decl( "itClipBoardBitmap", IupItem( "Copy as Bitmap", "cmdClipBoardBitmap" ), + named[19] = IupSetAtt( "itClipBoardBitmap", IupItem( "Copy as Bitmap", "cmdClipBoardBitmap" ), "ACTIVE", "NO", NULL ), - named[20] = decl( "itClipBoardMetafile", IupItem( "Copy as CD Metafile", "cmdClipBoardMetafile" ), + named[20] = IupSetAtt( "itClipBoardMetafile", IupItem( "Copy as CD Metafile", "cmdClipBoardMetafile" ), "ACTIVE", "NO", NULL ), - named[21] = decl( "itClipBoardPaste", IupItem( "Paste", "cmdClipBoardPaste" ), + named[21] = IupSetAtt( "itClipBoardPaste", IupItem( "Paste", "cmdClipBoardPaste" ), "ACTIVE", "NO", NULL ), IupSeparator(), IupItem( "Clear", "cmdEditClear" ), IupSeparator(), IupItem( "Options...", "cmdOptions" ), NULL), NULL ); - named[22] = decl( "mnPrimitives", IupMenu( + named[22] = IupSetAtt( "mnPrimitives", IupMenu( IupItem( "Pixel...", "cmdPixel" ), IupItem( "Mark...", "cmdMark" ), IupItem( "Line...", "cmdLine" ), @@ -492,8 +476,8 @@ void cdtest_loadled (void) IupItem( "Server Image...", "cmdImage" ), IupItem( "RGB Image...", "cmdImageRGB" ), NULL), NULL ); - named[23] = decl( "mnDraw", IupMenu( - decl( NULL, IupSubmenu( "Primitives", + named[23] = IupSetAtt( "mnDraw", IupMenu( + IupSetAtt( NULL, IupSubmenu( "Primitives", named[22] /* mnPrimitives */ ), "KEY", "K_P", NULL ), @@ -501,80 +485,80 @@ void cdtest_loadled (void) IupItem( "Clipping...", "cmdClip" ), IupItem( "Attributes...", "cmdAttributes" ), IupSeparator(), - named[24] = decl( "itWDCanvas", IupItem( "Show WD Canvas", "cmdWDCanvas" ), NULL ), - named[25] = decl( "itPICCanvas", IupItem( "Show Picture Canvas", "cmdPICCanvas" ), NULL ), + named[24] = IupSetAtt( "itWDCanvas", IupItem( "Show WD Canvas", "cmdWDCanvas" ), NULL ), + named[25] = IupSetAtt( "itPICCanvas", IupItem( "Show Picture Canvas", "cmdPICCanvas" ), NULL ), NULL), "ISMENU", "YES", NULL ); - named[26] = decl( "mnHelp", IupMenu( + named[26] = IupSetAtt( "mnHelp", IupMenu( IupItem( "About...", "cmdHelpAbout" ), NULL), NULL ); - named[27] = decl( "mnMain", IupMenu( - decl( NULL, IupSubmenu( "File", + named[27] = IupSetAtt( "mnMain", IupMenu( + IupSetAtt( NULL, IupSubmenu( "File", named[14] /* mnFile */ ), "KEY", "K_mF", NULL ), - decl( NULL, IupSubmenu( "Edit", + IupSetAtt( NULL, IupSubmenu( "Edit", named[16] /* mnEdit */ ), "KEY", "K_mE", NULL ), - decl( NULL, IupSubmenu( "Draw", + IupSetAtt( NULL, IupSubmenu( "Draw", named[23] /* mnDraw */ ), "KEY", "K_mD", NULL ), - decl( NULL, IupSubmenu( "Help", + IupSetAtt( NULL, IupSubmenu( "Help", named[26] /* mnHelp */ ), "KEY", "K_mH", NULL ), NULL), NULL ); - named[28] = decl( "lbStatusLine", IupLabel( "Esta eh a barra de status do CDTest." ), + named[28] = IupSetAtt( "lbStatusLine", IupLabel( "Esta eh a barra de status do CDTest." ), "EXPAND", "HORIZONTAL", NULL ); - named[29] = decl( "btLine", IupButton( "", "cmdLine" ), + named[29] = IupSetAtt( "btLine", IupButton( "", "cmdLine" ), "IMAGE", "imgLine", "TIP", "Line", NULL ); - named[30] = decl( "btBox", IupButton( "", "cmdBox" ), + named[30] = IupSetAtt( "btBox", IupButton( "", "cmdBox" ), "IMAGE", "imgBox", "TIP", "Box", NULL ); - named[31] = decl( "btRect", IupButton( "", "cmdRect" ), + named[31] = IupSetAtt( "btRect", IupButton( "", "cmdRect" ), "IMAGE", "imgRect", "TIP", "Rect", NULL ); - named[32] = decl( "btArc", IupButton( "", "cmdArc" ), + named[32] = IupSetAtt( "btArc", IupButton( "", "cmdArc" ), "IMAGE", "imgArc", "TIP", "Arc", NULL ); - named[33] = decl( "btSector", IupButton( "", "cmdSector" ), + named[33] = IupSetAtt( "btSector", IupButton( "", "cmdSector" ), "IMAGE", "imgSector", "TIP", "Sector", NULL ); - named[34] = decl( "btChord", IupButton( "", "cmdChord" ), + named[34] = IupSetAtt( "btChord", IupButton( "", "cmdChord" ), "IMAGE", "imgChord", "TIP", "Chord", NULL ); - named[35] = decl( "btPixel", IupButton( "", "cmdPixel" ), + named[35] = IupSetAtt( "btPixel", IupButton( "", "cmdPixel" ), "IMAGE", "imgPixel", "TIP", "Pixel", NULL ); - named[36] = decl( "btMark", IupButton( "", "cmdMark" ), + named[36] = IupSetAtt( "btMark", IupButton( "", "cmdMark" ), "IMAGE", "imgMark", "TIP", "Mark", NULL ); - named[37] = decl( "btText", IupButton( "", "cmdText" ), + named[37] = IupSetAtt( "btText", IupButton( "", "cmdText" ), "IMAGE", "imgText", "TIP", "Text", NULL ); - named[38] = decl( "btPoly", IupButton( "", "cmdPoly" ), + named[38] = IupSetAtt( "btPoly", IupButton( "", "cmdPoly" ), "IMAGE", "imgPoly", "TIP", "Polygon", NULL ); - named[39] = decl( "btImageRGB", IupButton( "", "cmdImageRGB" ), + named[39] = IupSetAtt( "btImageRGB", IupButton( "", "cmdImageRGB" ), "IMAGE", "imgImageRGB", "TIP", "RGB Image", NULL ); - named[40] = decl( "btImage", IupButton( "", "cmdImage" ), + named[40] = IupSetAtt( "btImage", IupButton( "", "cmdImage" ), "IMAGE", "imgImage", "TIP", "Server Image", NULL ); - named[41] = decl( "btClip", IupButton( "", "cmdClip" ), + named[41] = IupSetAtt( "btClip", IupButton( "", "cmdClip" ), "IMAGE", "imgClip", "TIP", "Clipping Area", NULL ); - named[42] = decl( "btCurPrim", IupButton( "", "cmdShowDialog" ), + named[42] = IupSetAtt( "btCurPrim", IupButton( "", "cmdShowDialog" ), "IMAGE", "imgLine", "TIP", "Show primitive dialog", NULL ); - named[43] = decl( "lbMousePos", IupLabel( "( , )" ), + named[43] = IupSetAtt( "lbMousePos", IupLabel( "( , )" ), "SIZE", "90", NULL ); - named[44] = decl( "PrimBar", IupVbox( + named[44] = IupSetAtt( "PrimBar", IupVbox( named[42] /* btCurPrim */, - decl( NULL, IupFill(), + IupSetAtt( NULL, IupFill(), "SIZE", "20", NULL ), named[35] /* btPixel */, named[36] /* btMark */, @@ -586,57 +570,57 @@ void cdtest_loadled (void) named[33] /* btSector */, named[34] /* btChord */, named[37] /* btText */, - decl( NULL, IupFill(), + IupSetAtt( NULL, IupFill(), "SIZE", "5", NULL ), named[40] /* btImage */, named[39] /* btImageRGB */, - decl( NULL, IupFill(), + IupSetAtt( NULL, IupFill(), "SIZE", "5", NULL ), named[41] /* btClip */, - decl( NULL, IupFill(), + IupSetAtt( NULL, IupFill(), "SIZE", "30", NULL ), NULL), "GAP", "2", NULL ); - named[45] = decl( "cnvColorBar", IupCanvas( "cmdColorBarRepaint" ), + named[45] = IupSetAtt( "cnvColorBar", IupCanvas( "cmdColorBarRepaint" ), "BUTTON_CB", "cmdColorBarButtonCB", "RESIZE_CB", "cmdColorBarResizeCB", "SIZE", "220x12", "BORDER", "NO", "EXPAND", "NO", NULL ); - named[46] = decl( "cnvMain", IupCanvas( "cmdRepaint" ), + named[46] = IupSetAtt( "cnvMain", IupCanvas( "cmdRepaint" ), "MOTION_CB", "cmdMotionCB", "BUTTON_CB", "cmdButtonCB", "RESIZE_CB", "cmdResizeCB", NULL ); - named[47] = decl( "DeskTop", IupVbox( - decl( NULL, IupFill(), + named[47] = IupSetAtt( "DeskTop", IupVbox( + IupSetAtt( NULL, IupFill(), "SIZE", "5", NULL ), IupHbox( - decl( NULL, IupFill(), + IupSetAtt( NULL, IupFill(), "SIZE", "5", NULL ), named[44] /* PrimBar */, - decl( NULL, IupFill(), + IupSetAtt( NULL, IupFill(), "SIZE", "2", NULL ), IupVbox( - decl( NULL, IupFill(), + IupSetAtt( NULL, IupFill(), "SIZE", "2", NULL ), named[43] /* lbMousePos */, - decl( NULL, IupFill(), + IupSetAtt( NULL, IupFill(), "SIZE", "5", NULL ), named[46] /* cnvMain */, - decl( NULL, IupFill(), + IupSetAtt( NULL, IupFill(), "SIZE", "2", NULL ), named[45] /* cnvColorBar */, - decl( NULL, IupFill(), + IupSetAtt( NULL, IupFill(), "SIZE", "5", NULL ), named[28] /* lbStatusLine */, NULL), - decl( NULL, IupFill(), + IupSetAtt( NULL, IupFill(), "SIZE", "5", NULL ), NULL), - decl( NULL, IupFill(), + IupSetAtt( NULL, IupFill(), "SIZE", "5", NULL ), NULL), NULL ); - named[48] = decl( "dlgMain", IupDialog( + named[48] = IupSetAtt( "dlgMain", IupDialog( named[47] /* DeskTop */ ), "TITLE", "CD Test 5.3", @@ -646,9 +630,9 @@ void cdtest_loadled (void) "GETFOCUS_CB", "cmdGetFocusCB", "KILLFOCUS_CB", "cmdKillFocusCB", "CLOSE_CB", "cmdFileExit", NULL ); - named[49] = decl( "cnvWDCanvas", IupCanvas( "cmdWDRepaint" ), + named[49] = IupSetAtt( "cnvWDCanvas", IupCanvas( "cmdWDRepaint" ), "BORDER", "NO", NULL ); - named[50] = decl( "dlgWDCanvas", IupDialog( + named[50] = IupSetAtt( "dlgWDCanvas", IupDialog( named[49] /* cnvWDCanvas */ ), "TITLE", "WD Canvas", @@ -656,9 +640,9 @@ void cdtest_loadled (void) "SIZE", "200x200", "PARENTDIALOG", "dlgMain", "GAP", "5x5", NULL ); - named[51] = decl( "cnvPICCanvas", IupCanvas( "cmdPICRepaint" ), + named[51] = IupSetAtt( "cnvPICCanvas", IupCanvas( "cmdPICRepaint" ), "BORDER", "NO", NULL ); - named[52] = decl( "dlgPICCanvas", IupDialog( + named[52] = IupSetAtt( "dlgPICCanvas", IupDialog( named[51] /* cnvPICCanvas */ ), "TITLE", "PIC Canvas", @@ -666,46 +650,46 @@ void cdtest_loadled (void) "SIZE", "200x200", "PARENTDIALOG", "dlgMain", "GAP", "5x5", NULL ); - named[53] = decl( "btOptionsHide", IupButton( "Hide", "cmdOptionsHide" ), + named[53] = IupSetAtt( "btOptionsHide", IupButton( "Hide", "cmdOptionsHide" ), "SIZE", "30", NULL ); - named[54] = decl( "tgSimulate", IupToggle( "Simulate", "cmdSimulate" ), + named[54] = IupSetAtt( "tgSimulate", IupToggle( "Simulate", "cmdSimulate" ), "VALUE", "OFF", "SIZE", "55", NULL ); - named[55] = decl( "tgStretchPlay", IupToggle( "Stretch Play", "cmdStretchPlay" ), + named[55] = IupSetAtt( "tgStretchPlay", IupToggle( "Stretch Play", "cmdStretchPlay" ), "VALUE", "OFF", "SIZE", "70", NULL ); - named[56] = decl( "tgNoBuffering", IupToggle( "No buffering", "cmdNoBuffering" ), + named[56] = IupSetAtt( "tgNoBuffering", IupToggle( "No buffering", "cmdNoBuffering" ), "VALUE", "ON", NULL ); - named[57] = decl( "tgImageBuffer", IupToggle( "CD_DBUFFER", "cmdImageBuffer" ), NULL ); - named[58] = decl( "tgRGBBuffer", IupToggle( "CD_DBUFFERRGB", "cmdRGBBuffer" ), NULL ); - named[59] = decl( "rdBuffering", IupRadio( + named[57] = IupSetAtt( "tgImageBuffer", IupToggle( "CD_DBUFFER", "cmdImageBuffer" ), NULL ); + named[58] = IupSetAtt( "tgRGBBuffer", IupToggle( "CD_DBUFFERRGB", "cmdRGBBuffer" ), NULL ); + named[59] = IupSetAtt( "rdBuffering", IupRadio( IupVbox( named[56] /* tgNoBuffering */, named[57] /* tgImageBuffer */, named[58] /* tgRGBBuffer */, NULL) ), NULL ); - named[60] = decl( "OptionsDesktop", IupVbox( - decl( NULL, IupVbox( - decl( NULL, IupFrame( + named[60] = IupSetAtt( "OptionsDesktop", IupVbox( + IupSetAtt( NULL, IupVbox( + IupSetAtt( NULL, IupFrame( named[59] /* rdBuffering */ ), "TITLE", "Buffering:", "MARGIN", "5x5", "SIZE", "80", NULL ), - decl( NULL, IupFill(), + IupSetAtt( NULL, IupFill(), "SIZE", "10", NULL ), named[54] /* tgSimulate */, named[55] /* tgStretchPlay */, - decl( NULL, IupFill(), + IupSetAtt( NULL, IupFill(), "SIZE", "10", NULL ), named[53] /* btOptionsHide */, - decl( NULL, IupFill(), + IupSetAtt( NULL, IupFill(), "SIZE", "2", NULL ), NULL), "GAP", "2", NULL ), NULL), NULL ); - named[61] = decl( "dlgOptions", IupDialog( + named[61] = IupSetAtt( "dlgOptions", IupDialog( named[60] /* OptionsDesktop */ ), "TITLE", "Options", @@ -714,7 +698,7 @@ void cdtest_loadled (void) "MINBOX", "NO", "RESIZE", "NO", "MARGIN", "5x2", NULL ); - named[62] = decl( "lstTextAlignment", IupList( "cmdTextAlignment" ), + named[62] = IupSetAtt( "lstTextAlignment", IupList( "cmdTextAlignment" ), "1", "CD_NORTH", "2", "CD_SOUTH", "3", "CD_EAST", @@ -730,11 +714,11 @@ void cdtest_loadled (void) "DROPDOWN", "YES", "VALUE", "10", "SIZE", "89", NULL ); - named[63] = decl( "txtMarkSize", IupText( "cmdInteger" ), + named[63] = IupSetAtt( "txtMarkSize", IupText( "cmdInteger" ), "NC", "4", "SIZE", "20x12", "VALUE", "10", NULL ); - named[64] = decl( "lstMarkType", IupList( "cmdMarkType" ), + named[64] = IupSetAtt( "lstMarkType", IupList( "cmdMarkType" ), "1", "CD_PLUS", "2", "CD_STAR", "3", "CD_CIRCLE", @@ -747,14 +731,14 @@ void cdtest_loadled (void) "DROPDOWN", "YES", "VALUE", "2", "SIZE", "80", NULL ); - named[65] = decl( "lstWriteMode", IupList( "cmdWriteMode" ), + named[65] = IupSetAtt( "lstWriteMode", IupList( "cmdWriteMode" ), "1", "CD_REPLACE", "2", "CD_XOR", "3", "CD_NOT_XOR", "VALUE", "1", "DROPDOWN", "YES", "SIZE", "80", NULL ); - named[66] = decl( "lstFontTypeFace", IupList( "cmdFontTypeFace" ), + named[66] = IupSetAtt( "lstFontTypeFace", IupList( "cmdFontTypeFace" ), "1", "CD_SYSTEM", "2", "CD_COURIER", "3", "CD_TIMES_ROMAN", @@ -762,27 +746,27 @@ void cdtest_loadled (void) "VALUE", "1", "DROPDOWN", "YES", "SIZE", "80", NULL ); - named[67] = decl( "lstLineCap", IupList( "cmdLineCap" ), + named[67] = IupSetAtt( "lstLineCap", IupList( "cmdLineCap" ), "1", "CD_CAPFLAT", "2", "CD_CAPSQUARE", "3", "CD_CAPROUND", "VALUE", "1", "DROPDOWN", "YES", "SIZE", "80", NULL ); - named[68] = decl( "lstLineJoin", IupList( "cmdLineJoin" ), + named[68] = IupSetAtt( "lstLineJoin", IupList( "cmdLineJoin" ), "1", "CD_BEVEL", "2", "CD_MITER", "3", "CD_ROUND", "VALUE", "1", "DROPDOWN", "YES", "SIZE", "80", NULL ); - named[69] = decl( "lstFillMode", IupList( "cmdFillMode" ), + named[69] = IupSetAtt( "lstFillMode", IupList( "cmdFillMode" ), "1", "CD_EVENODD", "2", "CD_WINDING", "VALUE", "1", "DROPDOWN", "YES", "SIZE", "80", NULL ); - named[70] = decl( "lstFontStyle", IupList( "cmdFontStyle" ), + named[70] = IupSetAtt( "lstFontStyle", IupList( "cmdFontStyle" ), "1", "CD_PLAIN", "2", "CD_BOLD", "3", "CD_ITALIC", @@ -790,19 +774,19 @@ void cdtest_loadled (void) "VALUE", "1", "DROPDOWN", "YES", "SIZE", "80", NULL ); - named[71] = decl( "txtLineWidth", IupText( "cmdInteger" ), + named[71] = IupSetAtt( "txtLineWidth", IupText( "cmdInteger" ), "SIZE", "30", "NC", "3", "VALUE", "1", NULL ); - named[72] = decl( "txtFontSize", IupText( "cmdInteger" ), + named[72] = IupSetAtt( "txtFontSize", IupText( "cmdInteger" ), "SIZE", "30", "NC", "3", "VALUE", "12", NULL ); - named[73] = decl( "txtTextOrientation", IupText( "cmdInteger" ), + named[73] = IupSetAtt( "txtTextOrientation", IupText( "cmdInteger" ), "SIZE", "30", "NC", "3", "VALUE", "0", NULL ); - named[74] = decl( "lstLineStyle", IupList( "cmdLineStyle" ), + named[74] = IupSetAtt( "lstLineStyle", IupList( "cmdLineStyle" ), "1", "CD_CONTINUOUS", "2", "CD_DASHED", "3", "CD_DOTTED", @@ -812,19 +796,19 @@ void cdtest_loadled (void) "VALUE", "1", "DROPDOWN", "YES", "SIZE", "80", NULL ); - named[75] = decl( "tgSolid", IupToggle( "CD_SOLID", "cmdSolid" ), + named[75] = IupSetAtt( "tgSolid", IupToggle( "CD_SOLID", "cmdSolid" ), "VALUE", "ON", NULL ); - named[76] = decl( "tgHatch", IupToggle( "CD_HATCH", "cmdHatch" ), NULL ); - named[77] = decl( "tgStipple", IupToggle( "CD_STIPPLE", "cmdStipple" ), NULL ); - named[78] = decl( "tgPattern", IupToggle( "CD_PATTERN", "cmdPattern" ), NULL ); - named[79] = decl( "lstOpacity", IupList( "cmdOpacity" ), + named[76] = IupSetAtt( "tgHatch", IupToggle( "CD_HATCH", "cmdHatch" ), NULL ); + named[77] = IupSetAtt( "tgStipple", IupToggle( "CD_STIPPLE", "cmdStipple" ), NULL ); + named[78] = IupSetAtt( "tgPattern", IupToggle( "CD_PATTERN", "cmdPattern" ), NULL ); + named[79] = IupSetAtt( "lstOpacity", IupList( "cmdOpacity" ), "1", "CD_OPAQUE", "2", "CD_TRANSPARENT", "VALUE", "2", "DROPDOWN", "YES", "SIZE", "80", "ACTIVE", "YES", NULL ); - named[80] = decl( "lstHatchStyle", IupList( "cmdHatchStyle" ), + named[80] = IupSetAtt( "lstHatchStyle", IupList( "cmdHatchStyle" ), "1", "CD_HORIZONTAL", "2", "CD_VERTICAL", "3", "CD_FDIAGONAL", @@ -835,9 +819,9 @@ void cdtest_loadled (void) "DROPDOWN", "YES", "SIZE", "80", "ACTIVE", "YES", NULL ); - named[81] = decl( "btAttributesHide", IupButton( "Hide", "cmdAttributesHide" ), + named[81] = IupSetAtt( "btAttributesHide", IupButton( "Hide", "cmdAttributesHide" ), "SIZE", "30", NULL ); - named[82] = decl( "rdInteriorStyle", IupRadio( + named[82] = IupSetAtt( "rdInteriorStyle", IupRadio( IupVbox( named[75] /* tgSolid */, named[76] /* tgHatch */, @@ -845,30 +829,30 @@ void cdtest_loadled (void) named[78] /* tgPattern */, NULL) ), NULL ); - named[83] = decl( "AttributesDesktop", IupVbox( + named[83] = IupSetAtt( "AttributesDesktop", IupVbox( IupHbox( - decl( NULL, IupVbox( + IupSetAtt( NULL, IupVbox( IupLabel( "Write Mode:" ), named[65] /* lstWriteMode */, - decl( NULL, IupFill(), + IupSetAtt( NULL, IupFill(), "SIZE", "4", NULL ), - decl( NULL, IupFrame( + IupSetAtt( NULL, IupFrame( IupVbox( IupLabel( "Back Opacity:" ), named[79] /* lstOpacity */, - decl( NULL, IupFill(), + IupSetAtt( NULL, IupFill(), "SIZE", "2", NULL ), IupLabel( "Fill Mode:" ), named[69] /* lstFillMode */, - decl( NULL, IupFill(), + IupSetAtt( NULL, IupFill(), "SIZE", "2", NULL ), - decl( NULL, IupFrame( + IupSetAtt( NULL, IupFrame( named[82] /* rdInteriorStyle */ ), "TITLE", "Interior Style:", "MARGIN", "5x5", "SIZE", "80", NULL ), - decl( NULL, IupFill(), + IupSetAtt( NULL, IupFill(), "SIZE", "2", NULL ), IupLabel( "Hatch Style:" ), named[80] /* lstHatchStyle */, @@ -876,13 +860,13 @@ void cdtest_loadled (void) ), "TITLE", "Fill Attributes", "MARGIN", "5x5", NULL ), - decl( NULL, IupFill(), + IupSetAtt( NULL, IupFill(), "SIZE", "10", NULL ), - decl( NULL, IupFrame( + IupSetAtt( NULL, IupFrame( IupVbox( IupLabel( "Mark Type:" ), named[64] /* lstMarkType */, - decl( NULL, IupFill(), + IupSetAtt( NULL, IupFill(), "SIZE", "2", NULL ), IupLabel( "Mark Size:" ), named[63] /* txtMarkSize */, @@ -890,53 +874,53 @@ void cdtest_loadled (void) ), "TITLE", "Mark Attributes", "MARGIN", "5x5", NULL ), - decl( NULL, IupFill(), + IupSetAtt( NULL, IupFill(), "SIZE", "10", NULL ), named[81] /* btAttributesHide */, NULL), "GAP", "2", NULL ), - decl( NULL, IupVbox( - decl( NULL, IupFrame( + IupSetAtt( NULL, IupVbox( + IupSetAtt( NULL, IupFrame( IupVbox( IupLabel( "Font Typeface:" ), named[66] /* lstFontTypeFace */, - decl( NULL, IupFill(), + IupSetAtt( NULL, IupFill(), "SIZE", "2", NULL ), IupLabel( "Font Style:" ), named[70] /* lstFontStyle */, - decl( NULL, IupFill(), + IupSetAtt( NULL, IupFill(), "SIZE", "2", NULL ), IupLabel( "Font Size:" ), named[72] /* txtFontSize */, - decl( NULL, IupFill(), + IupSetAtt( NULL, IupFill(), "SIZE", "2", NULL ), - decl( NULL, IupLabel( "Text Alignment:" ), + IupSetAtt( NULL, IupLabel( "Text Alignment:" ), "SIZE", "x9", NULL ), named[62] /* lstTextAlignment */, - decl( NULL, IupFill(), + IupSetAtt( NULL, IupFill(), "SIZE", "2", NULL ), - decl( NULL, IupLabel( "Text Orientation:" ), + IupSetAtt( NULL, IupLabel( "Text Orientation:" ), "SIZE", "x9", NULL ), named[73] /* txtTextOrientation */, NULL) ), "TITLE", "Text Attributes", "MARGIN", "5x5", NULL ), - decl( NULL, IupFill(), + IupSetAtt( NULL, IupFill(), "SIZE", "10", NULL ), - decl( NULL, IupFrame( + IupSetAtt( NULL, IupFrame( IupVbox( IupLabel( "Line Style:" ), named[74] /* lstLineStyle */, - decl( NULL, IupFill(), + IupSetAtt( NULL, IupFill(), "SIZE", "2", NULL ), IupLabel( "Line Width:" ), named[71] /* txtLineWidth */, - decl( NULL, IupFill(), + IupSetAtt( NULL, IupFill(), "SIZE", "2", NULL ), IupLabel( "Line Cap:" ), named[67] /* lstLineCap */, - decl( NULL, IupFill(), + IupSetAtt( NULL, IupFill(), "SIZE", "2", NULL ), IupLabel( "Line Join:" ), named[68] /* lstLineJoin */, @@ -948,7 +932,7 @@ void cdtest_loadled (void) "GAP", "2", NULL ), NULL), NULL), NULL ); - named[84] = decl( "dlgAttributes", IupDialog( + named[84] = IupSetAtt( "dlgAttributes", IupDialog( named[83] /* AttributesDesktop */ ), "TITLE", "Attributes", @@ -958,51 +942,51 @@ void cdtest_loadled (void) "RESIZE", "NO", "CLOSE_CB", "cmdAttributesHide", "MARGIN", "5x2", NULL ); - named[85] = decl( "txtLBX1", IupText( "cmdInteger" ), + named[85] = IupSetAtt( "txtLBX1", IupText( "cmdInteger" ), "NC", "8", "SIZE", "30x12", "VALUE", "0", NULL ); - named[86] = decl( "txtLBX2", IupText( "cmdInteger" ), + named[86] = IupSetAtt( "txtLBX2", IupText( "cmdInteger" ), "NC", "8", "SIZE", "30x12", "VALUE", "0", NULL ); - named[87] = decl( "txtLBY1", IupText( "cmdInteger" ), + named[87] = IupSetAtt( "txtLBY1", IupText( "cmdInteger" ), "NC", "8", "SIZE", "30x12", "VALUE", "0", NULL ); - named[88] = decl( "txtLBY2", IupText( "cmdInteger" ), + named[88] = IupSetAtt( "txtLBY2", IupText( "cmdInteger" ), "NC", "8", "SIZE", "30x12", "VALUE", "0", NULL ); - named[89] = decl( "btLBDraw", IupButton( "Draw", "cmdDraw" ), + named[89] = IupSetAtt( "btLBDraw", IupButton( "Draw", "cmdDraw" ), "SIZE", "30", NULL ); - named[90] = decl( "btLBHide", IupButton( "Hide", "cmdMsgHide" ), + named[90] = IupSetAtt( "btLBHide", IupButton( "Hide", "cmdMsgHide" ), "SIZE", "30", NULL ); - named[91] = decl( "LBData", IupVbox( - decl( NULL, IupHbox( - decl( NULL, IupLabel( "X1:" ), + named[91] = IupSetAtt( "LBData", IupVbox( + IupSetAtt( NULL, IupHbox( + IupSetAtt( NULL, IupLabel( "X1:" ), "SIZE", "15x9", NULL ), named[85] /* txtLBX1 */, - decl( NULL, IupFill(), + IupSetAtt( NULL, IupFill(), "SIZE", "5", NULL ), - decl( NULL, IupLabel( "Y1:" ), + IupSetAtt( NULL, IupLabel( "Y1:" ), "SIZE", "15x9", NULL ), named[87] /* txtLBY1 */, NULL), "ALIGNMENT", "ACENTER", NULL ), - decl( NULL, IupHbox( - decl( NULL, IupLabel( "X2:" ), + IupSetAtt( NULL, IupHbox( + IupSetAtt( NULL, IupLabel( "X2:" ), "SIZE", "15x9", NULL ), named[86] /* txtLBX2 */, - decl( NULL, IupFill(), + IupSetAtt( NULL, IupFill(), "SIZE", "5", NULL ), - decl( NULL, IupLabel( "Y2:" ), + IupSetAtt( NULL, IupLabel( "Y2:" ), "SIZE", "15x9", NULL ), named[88] /* txtLBY2 */, NULL), "ALIGNMENT", "ACENTER", NULL ), NULL), NULL ); - named[92] = decl( "LBDeskTop", IupVbox( + named[92] = IupSetAtt( "LBDeskTop", IupVbox( IupHbox( IupFill(), named[91] /* LBData */, @@ -1011,13 +995,13 @@ void cdtest_loadled (void) IupHbox( IupFill(), named[89] /* btLBDraw */, - decl( NULL, IupFill(), + IupSetAtt( NULL, IupFill(), "SIZE", "5", NULL ), named[90] /* btLBHide */, IupFill(), NULL), NULL), NULL ); - named[93] = decl( "dlgLB", IupDialog( + named[93] = IupSetAtt( "dlgLB", IupDialog( named[92] /* LBDeskTop */ ), "TITLE", "Line Parameters", @@ -1027,70 +1011,70 @@ void cdtest_loadled (void) "RESIZE", "NO", "CLOSE_CB", "cmdMsgHide", "MARGIN", "5x5", NULL ); - named[94] = decl( "txtASXC", IupText( "cmdInteger" ), + named[94] = IupSetAtt( "txtASXC", IupText( "cmdInteger" ), "NC", "4", "SIZE", "30x12", "VALUE", "0", NULL ); - named[95] = decl( "txtASYC", IupText( "cmdInteger" ), + named[95] = IupSetAtt( "txtASYC", IupText( "cmdInteger" ), "NC", "4", "SIZE", "30x12", "VALUE", "0", NULL ); - named[96] = decl( "txtASW", IupText( "cmdInteger" ), + named[96] = IupSetAtt( "txtASW", IupText( "cmdInteger" ), "NC", "4", "SIZE", "30x12", "VALUE", "0", NULL ); - named[97] = decl( "txtASH", IupText( "cmdInteger" ), + named[97] = IupSetAtt( "txtASH", IupText( "cmdInteger" ), "NC", "4", "SIZE", "30x12", "VALUE", "0", NULL ); - named[98] = decl( "txtASAngle1", IupText( "cmdReal" ), + named[98] = IupSetAtt( "txtASAngle1", IupText( "cmdReal" ), "NC", "10", "SIZE", "30x12", "VALUE", "0", NULL ); - named[99] = decl( "txtASAngle2", IupText( "cmdReal" ), + named[99] = IupSetAtt( "txtASAngle2", IupText( "cmdReal" ), "NC", "10", "SIZE", "30x12", "VALUE", "360", NULL ); - named[100] = decl( "btASDraw", IupButton( "Draw", "cmdDraw" ), + named[100] = IupSetAtt( "btASDraw", IupButton( "Draw", "cmdDraw" ), "SIZE", "30", NULL ); - named[101] = decl( "btASHide", IupButton( "Hide", "cmdMsgHide" ), + named[101] = IupSetAtt( "btASHide", IupButton( "Hide", "cmdMsgHide" ), "SIZE", "30", NULL ); - named[102] = decl( "ASData", IupVbox( - decl( NULL, IupHbox( - decl( NULL, IupLabel( "Xc:" ), + named[102] = IupSetAtt( "ASData", IupVbox( + IupSetAtt( NULL, IupHbox( + IupSetAtt( NULL, IupLabel( "Xc:" ), "SIZE", "30x9", NULL ), named[94] /* txtASXC */, - decl( NULL, IupFill(), + IupSetAtt( NULL, IupFill(), "SIZE", "5", NULL ), - decl( NULL, IupLabel( "Yc:" ), + IupSetAtt( NULL, IupLabel( "Yc:" ), "SIZE", "30x9", NULL ), named[95] /* txtASYC */, NULL), "ALIGNMENT", "ACENTER", NULL ), - decl( NULL, IupHbox( - decl( NULL, IupLabel( "W:" ), + IupSetAtt( NULL, IupHbox( + IupSetAtt( NULL, IupLabel( "W:" ), "SIZE", "30x9", NULL ), named[96] /* txtASW */, - decl( NULL, IupFill(), + IupSetAtt( NULL, IupFill(), "SIZE", "5", NULL ), - decl( NULL, IupLabel( "H:" ), + IupSetAtt( NULL, IupLabel( "H:" ), "SIZE", "30x9", NULL ), named[97] /* txtASH */, NULL), "ALIGNMENT", "ACENTER", NULL ), - decl( NULL, IupHbox( - decl( NULL, IupLabel( "Angle1:" ), + IupSetAtt( NULL, IupHbox( + IupSetAtt( NULL, IupLabel( "Angle1:" ), "SIZE", "30x9", NULL ), named[98] /* txtASAngle1 */, - decl( NULL, IupFill(), + IupSetAtt( NULL, IupFill(), "SIZE", "5", NULL ), - decl( NULL, IupLabel( "Angle2:" ), + IupSetAtt( NULL, IupLabel( "Angle2:" ), "SIZE", "30x9", NULL ), named[99] /* txtASAngle2 */, NULL), "ALIGNMENT", "ACENTER", NULL ), NULL), NULL ); - named[103] = decl( "ASDeskTop", IupVbox( + named[103] = IupSetAtt( "ASDeskTop", IupVbox( IupHbox( IupFill(), named[102] /* ASData */, @@ -1099,13 +1083,13 @@ void cdtest_loadled (void) IupHbox( IupFill(), named[100] /* btASDraw */, - decl( NULL, IupFill(), + IupSetAtt( NULL, IupFill(), "SIZE", "5", NULL ), named[101] /* btASHide */, IupFill(), NULL), NULL), NULL ); - named[104] = decl( "dlgAS", IupDialog( + named[104] = IupSetAtt( "dlgAS", IupDialog( named[103] /* ASDeskTop */ ), "PARENTDIALOG", "dlgMain", @@ -1115,32 +1099,32 @@ void cdtest_loadled (void) "RESIZE", "NO", "CLOSE_CB", "cmdMsgHide", "MARGIN", "5x5", NULL ); - named[105] = decl( "txtPixelX", IupText( "cmdInteger" ), + named[105] = IupSetAtt( "txtPixelX", IupText( "cmdInteger" ), "NC", "5", "SIZE", "30x12", "VALUE", "0", NULL ); - named[106] = decl( "txtPixelY", IupText( "cmdInteger" ), + named[106] = IupSetAtt( "txtPixelY", IupText( "cmdInteger" ), "NC", "5", "SIZE", "30x12", "VALUE", "0", NULL ); - named[107] = decl( "btPixelDraw", IupButton( "Draw", "cmdDraw" ), + named[107] = IupSetAtt( "btPixelDraw", IupButton( "Draw", "cmdDraw" ), "SIZE", "30", NULL ); - named[108] = decl( "btPixelHide", IupButton( "Hide", "cmdMsgHide" ), + named[108] = IupSetAtt( "btPixelHide", IupButton( "Hide", "cmdMsgHide" ), "SIZE", "30", NULL ); - named[109] = decl( "PixelData", IupVbox( - decl( NULL, IupHbox( - decl( NULL, IupLabel( "X:" ), + named[109] = IupSetAtt( "PixelData", IupVbox( + IupSetAtt( NULL, IupHbox( + IupSetAtt( NULL, IupLabel( "X:" ), "SIZE", "10x9", NULL ), named[105] /* txtPixelX */, - decl( NULL, IupFill(), + IupSetAtt( NULL, IupFill(), "SIZE", "5", NULL ), - decl( NULL, IupLabel( "Y:" ), + IupSetAtt( NULL, IupLabel( "Y:" ), "SIZE", "10x9", NULL ), named[106] /* txtPixelY */, NULL), "ALIGNMENT", "ACENTER", NULL ), NULL), NULL ); - named[110] = decl( "PixelDeskTop", IupVbox( + named[110] = IupSetAtt( "PixelDeskTop", IupVbox( IupHbox( IupFill(), named[109] /* PixelData */, @@ -1149,13 +1133,13 @@ void cdtest_loadled (void) IupHbox( IupFill(), named[107] /* btPixelDraw */, - decl( NULL, IupFill(), + IupSetAtt( NULL, IupFill(), "SIZE", "5", NULL ), named[108] /* btPixelHide */, IupFill(), NULL), NULL), NULL ); - named[111] = decl( "dlgPixel", IupDialog( + named[111] = IupSetAtt( "dlgPixel", IupDialog( named[110] /* PixelDeskTop */ ), "PARENTDIALOG", "dlgMain", @@ -1165,34 +1149,34 @@ void cdtest_loadled (void) "RESIZE", "NO", "CLOSE_CB", "cmdMsgHide", "MARGIN", "5x5", NULL ); - named[112] = decl( "txtMarkX", IupText( "cmdInteger" ), + named[112] = IupSetAtt( "txtMarkX", IupText( "cmdInteger" ), "NC", "5", "SIZE", "30x12", "VALUE", "0", NULL ); - named[113] = decl( "txtMarkY", IupText( "cmdInteger" ), + named[113] = IupSetAtt( "txtMarkY", IupText( "cmdInteger" ), "NC", "5", "SIZE", "30x12", "VALUE", "0", NULL ); - named[114] = decl( "btMarkDraw", IupButton( "Draw", "cmdDraw" ), + named[114] = IupSetAtt( "btMarkDraw", IupButton( "Draw", "cmdDraw" ), "SIZE", "30", NULL ); - named[115] = decl( "btMarkHide", IupButton( "Hide", "cmdMsgHide" ), + named[115] = IupSetAtt( "btMarkHide", IupButton( "Hide", "cmdMsgHide" ), "SIZE", "30", NULL ); - named[116] = decl( "MarkData", IupVbox( - decl( NULL, IupHbox( + named[116] = IupSetAtt( "MarkData", IupVbox( + IupSetAtt( NULL, IupHbox( IupFill(), - decl( NULL, IupLabel( "X:" ), + IupSetAtt( NULL, IupLabel( "X:" ), "SIZE", "10x9", NULL ), named[112] /* txtMarkX */, - decl( NULL, IupFill(), + IupSetAtt( NULL, IupFill(), "SIZE", "5", NULL ), - decl( NULL, IupLabel( "Y:" ), + IupSetAtt( NULL, IupLabel( "Y:" ), "SIZE", "10x9", NULL ), named[113] /* txtMarkY */, IupFill(), NULL), "ALIGNMENT", "ACENTER", NULL ), NULL), NULL ); - named[117] = decl( "MarkDeskTop", IupVbox( + named[117] = IupSetAtt( "MarkDeskTop", IupVbox( IupHbox( IupFill(), named[116] /* MarkData */, @@ -1201,13 +1185,13 @@ void cdtest_loadled (void) IupHbox( IupFill(), named[114] /* btMarkDraw */, - decl( NULL, IupFill(), + IupSetAtt( NULL, IupFill(), "SIZE", "5", NULL ), named[115] /* btMarkHide */, IupFill(), NULL), NULL), NULL ); - named[118] = decl( "dlgMark", IupDialog( + named[118] = IupSetAtt( "dlgMark", IupDialog( named[117] /* MarkDeskTop */ ), "PARENTDIALOG", "dlgMain", @@ -1217,43 +1201,43 @@ void cdtest_loadled (void) "RESIZE", "NO", "CLOSE_CB", "cmdMsgHide", "MARGIN", "5x5", NULL ); - named[119] = decl( "txtTextX", IupText( "cmdInteger" ), + named[119] = IupSetAtt( "txtTextX", IupText( "cmdInteger" ), "NC", "5", "SIZE", "30x12", "VALUE", "0", NULL ); - named[120] = decl( "txtTextY", IupText( "cmdInteger" ), + named[120] = IupSetAtt( "txtTextY", IupText( "cmdInteger" ), "NC", "5", "SIZE", "30x12", "VALUE", "0", NULL ); - named[121] = decl( "txtTextS", IupText( "cmdString" ), + named[121] = IupSetAtt( "txtTextS", IupText( "cmdString" ), "NC", "100", "SIZE", "89x12", "VALUE", "Text", NULL ); - named[122] = decl( "btTextDraw", IupButton( "Draw", "cmdDraw" ), + named[122] = IupSetAtt( "btTextDraw", IupButton( "Draw", "cmdDraw" ), "SIZE", "30", NULL ); - named[123] = decl( "btTextHide", IupButton( "Hide", "cmdMsgHide" ), + named[123] = IupSetAtt( "btTextHide", IupButton( "Hide", "cmdMsgHide" ), "SIZE", "30", NULL ); - named[124] = decl( "TextData", IupVbox( - decl( NULL, IupHbox( - decl( NULL, IupLabel( "X:" ), + named[124] = IupSetAtt( "TextData", IupVbox( + IupSetAtt( NULL, IupHbox( + IupSetAtt( NULL, IupLabel( "X:" ), "SIZE", "10x9", NULL ), named[119] /* txtTextX */, - decl( NULL, IupFill(), + IupSetAtt( NULL, IupFill(), "SIZE", "5", NULL ), - decl( NULL, IupLabel( "Y:" ), + IupSetAtt( NULL, IupLabel( "Y:" ), "SIZE", "10x9", NULL ), named[120] /* txtTextY */, NULL), "ALIGNMENT", "ACENTER", NULL ), IupHbox( IupVbox( - decl( NULL, IupLabel( "Text:" ), + IupSetAtt( NULL, IupLabel( "Text:" ), "SIZE", "25x9", NULL ), named[121] /* txtTextS */, NULL), NULL), NULL), NULL ); - named[125] = decl( "TextDeskTop", IupVbox( + named[125] = IupSetAtt( "TextDeskTop", IupVbox( IupHbox( IupFill(), named[124] /* TextData */, @@ -1262,13 +1246,13 @@ void cdtest_loadled (void) IupHbox( IupFill(), named[122] /* btTextDraw */, - decl( NULL, IupFill(), + IupSetAtt( NULL, IupFill(), "SIZE", "5", NULL ), named[123] /* btTextHide */, IupFill(), NULL), NULL), NULL ); - named[126] = decl( "dlgText", IupDialog( + named[126] = IupSetAtt( "dlgText", IupDialog( named[125] /* TextDeskTop */ ), "PARENTDIALOG", "dlgMain", @@ -1278,15 +1262,15 @@ void cdtest_loadled (void) "CLOSE_CB", "cmdMsgHide", "RESIZE", "NO", "MARGIN", "5x5", NULL ); - named[127] = decl( "tgOpenLines", IupToggle( "CD_OPEN_LINES", "cmdOpenLines" ), + named[127] = IupSetAtt( "tgOpenLines", IupToggle( "CD_OPEN_LINES", "cmdOpenLines" ), "VALUE", "ON", NULL ); - named[128] = decl( "tgClosedLines", IupToggle( "CD_CLOSED_LINES", "cmdClosedLines" ), NULL ); - named[129] = decl( "tgFilled", IupToggle( "CD_FILL", "cmdFill" ), NULL ); - named[130] = decl( "tgClip", IupToggle( "CD_CLIP", "cmdPolyClip" ), NULL ); - named[131] = decl( "tgBezier", IupToggle( "CD_BEZIER", "cmdPolyBezier" ), NULL ); - named[132] = decl( "btPolyHide", IupButton( "Hide", "cmdMsgHide" ), + named[128] = IupSetAtt( "tgClosedLines", IupToggle( "CD_CLOSED_LINES", "cmdClosedLines" ), NULL ); + named[129] = IupSetAtt( "tgFilled", IupToggle( "CD_FILL", "cmdFill" ), NULL ); + named[130] = IupSetAtt( "tgClip", IupToggle( "CD_CLIP", "cmdPolyClip" ), NULL ); + named[131] = IupSetAtt( "tgBezier", IupToggle( "CD_BEZIER", "cmdPolyBezier" ), NULL ); + named[132] = IupSetAtt( "btPolyHide", IupButton( "Hide", "cmdMsgHide" ), "SIZE", "30", NULL ); - named[133] = decl( "rdMode", IupRadio( + named[133] = IupSetAtt( "rdMode", IupRadio( IupVbox( named[127] /* tgOpenLines */, named[128] /* tgClosedLines */, @@ -1295,14 +1279,14 @@ void cdtest_loadled (void) named[131] /* tgBezier */, NULL) ), NULL ); - named[134] = decl( "PolyDesktop", IupVbox( - decl( NULL, IupFill(), + named[134] = IupSetAtt( "PolyDesktop", IupVbox( + IupSetAtt( NULL, IupFill(), "SIZE", "5", NULL ), IupHbox( IupFill(), - decl( NULL, IupFrame( + IupSetAtt( NULL, IupFrame( IupHbox( - decl( NULL, IupFill(), + IupSetAtt( NULL, IupFill(), "SIZE", "5", NULL ), named[133] /* rdMode */, NULL) @@ -1310,17 +1294,17 @@ void cdtest_loadled (void) "TITLE", "Polygon Mode:", NULL ), IupFill(), NULL), - decl( NULL, IupFill(), + IupSetAtt( NULL, IupFill(), "SIZE", "10", NULL ), IupHbox( IupFill(), named[132] /* btPolyHide */, IupFill(), NULL), - decl( NULL, IupFill(), + IupSetAtt( NULL, IupFill(), "SIZE", "5", NULL ), NULL), NULL ); - named[135] = decl( "dlgPoly", IupDialog( + named[135] = IupSetAtt( "dlgPoly", IupDialog( named[134] /* PolyDesktop */ ), "PARENTDIALOG", "dlgMain", @@ -1329,55 +1313,55 @@ void cdtest_loadled (void) "MINBOX", "NO", "RESIZE", "NO", "CLOSE_CB", "cmdMsgHide", NULL ); - named[136] = decl( "txtClipXmin", IupText( "cmdInteger" ), + named[136] = IupSetAtt( "txtClipXmin", IupText( "cmdInteger" ), "NC", "5", "SIZE", "30x12", "VALUE", "0", NULL ); - named[137] = decl( "txtClipXmax", IupText( "cmdInteger" ), + named[137] = IupSetAtt( "txtClipXmax", IupText( "cmdInteger" ), "NC", "5", "SIZE", "30x12", "VALUE", "0", NULL ); - named[138] = decl( "txtClipYmin", IupText( "cmdInteger" ), + named[138] = IupSetAtt( "txtClipYmin", IupText( "cmdInteger" ), "NC", "5", "SIZE", "30x12", "VALUE", "0", NULL ); - named[139] = decl( "txtClipYmax", IupText( "cmdInteger" ), + named[139] = IupSetAtt( "txtClipYmax", IupText( "cmdInteger" ), "NC", "5", "SIZE", "30x12", "VALUE", "0", NULL ); - named[140] = decl( "btClipOff", IupButton( "Off", "cmdClipOff" ), + named[140] = IupSetAtt( "btClipOff", IupButton( "Off", "cmdClipOff" ), "SIZE", "30", NULL ); - named[141] = decl( "btClipArea", IupButton( "Area", "cmdClipArea" ), + named[141] = IupSetAtt( "btClipArea", IupButton( "Area", "cmdClipArea" ), "SIZE", "30", NULL ); - named[142] = decl( "btClipPoly", IupButton( "Polygon", "cmdClipPoly" ), + named[142] = IupSetAtt( "btClipPoly", IupButton( "Polygon", "cmdClipPoly" ), "SIZE", "50", NULL ); - named[143] = decl( "btClipHide", IupButton( "Hide", "cmdMsgHide" ), + named[143] = IupSetAtt( "btClipHide", IupButton( "Hide", "cmdMsgHide" ), "SIZE", "30", NULL ); - named[144] = decl( "ClipData", IupVbox( - decl( NULL, IupHbox( - decl( NULL, IupLabel( "Xmin:" ), + named[144] = IupSetAtt( "ClipData", IupVbox( + IupSetAtt( NULL, IupHbox( + IupSetAtt( NULL, IupLabel( "Xmin:" ), "SIZE", "25x9", NULL ), named[136] /* txtClipXmin */, - decl( NULL, IupFill(), + IupSetAtt( NULL, IupFill(), "SIZE", "5", NULL ), - decl( NULL, IupLabel( "Ymin:" ), + IupSetAtt( NULL, IupLabel( "Ymin:" ), "SIZE", "25x9", NULL ), named[138] /* txtClipYmin */, NULL), "ALIGNMENT", "ACENTER", NULL ), - decl( NULL, IupHbox( - decl( NULL, IupLabel( "Xmax:" ), + IupSetAtt( NULL, IupHbox( + IupSetAtt( NULL, IupLabel( "Xmax:" ), "SIZE", "25x9", NULL ), named[137] /* txtClipXmax */, - decl( NULL, IupFill(), + IupSetAtt( NULL, IupFill(), "SIZE", "5", NULL ), - decl( NULL, IupLabel( "Ymax:" ), + IupSetAtt( NULL, IupLabel( "Ymax:" ), "SIZE", "25x9", NULL ), named[139] /* txtClipYmax */, NULL), "ALIGNMENT", "ACENTER", NULL ), NULL), NULL ); - named[145] = decl( "ClipDeskTop", IupVbox( + named[145] = IupSetAtt( "ClipDeskTop", IupVbox( IupHbox( IupFill(), named[144] /* ClipData */, @@ -1386,19 +1370,19 @@ void cdtest_loadled (void) IupHbox( IupFill(), named[140] /* btClipOff */, - decl( NULL, IupFill(), + IupSetAtt( NULL, IupFill(), "SIZE", "5", NULL ), named[141] /* btClipArea */, - decl( NULL, IupFill(), + IupSetAtt( NULL, IupFill(), "SIZE", "5", NULL ), named[142] /* btClipPoly */, - decl( NULL, IupFill(), + IupSetAtt( NULL, IupFill(), "SIZE", "5", NULL ), named[143] /* btClipHide */, IupFill(), NULL), NULL), NULL ); - named[146] = decl( "dlgClip", IupDialog( + named[146] = IupSetAtt( "dlgClip", IupDialog( named[145] /* ClipDeskTop */ ), "PARENTDIALOG", "dlgMain", @@ -1408,53 +1392,53 @@ void cdtest_loadled (void) "MINBOX", "NO", "RESIZE", "NO", "MARGIN", "5x5", NULL ); - named[147] = decl( "txtImageX", IupText( "cmdInteger" ), + named[147] = IupSetAtt( "txtImageX", IupText( "cmdInteger" ), "NC", "5", "SIZE", "30x12", "VALUE", "0", NULL ); - named[148] = decl( "txtImageY", IupText( "cmdInteger" ), + named[148] = IupSetAtt( "txtImageY", IupText( "cmdInteger" ), "NC", "5", "SIZE", "30x12", "VALUE", "0", NULL ); - named[149] = decl( "txtImageW", IupText( "cmdInteger" ), + named[149] = IupSetAtt( "txtImageW", IupText( "cmdInteger" ), "NC", "5", "SIZE", "30x12", "VALUE", "0", NULL ); - named[150] = decl( "txtImageH", IupText( "cmdInteger" ), + named[150] = IupSetAtt( "txtImageH", IupText( "cmdInteger" ), "NC", "5", "SIZE", "30x12", "VALUE", "0", NULL ); - named[151] = decl( "btImagePut", IupButton( "Put", "cmdImagePut" ), + named[151] = IupSetAtt( "btImagePut", IupButton( "Put", "cmdImagePut" ), "SIZE", "30", NULL ); - named[152] = decl( "btImageGet", IupButton( "Get", "cmdImageGet" ), + named[152] = IupSetAtt( "btImageGet", IupButton( "Get", "cmdImageGet" ), "SIZE", "30", NULL ); - named[153] = decl( "btImageHide", IupButton( "Hide", "cmdMsgHide" ), + named[153] = IupSetAtt( "btImageHide", IupButton( "Hide", "cmdMsgHide" ), "SIZE", "30", NULL ); - named[154] = decl( "ImageData", IupVbox( - decl( NULL, IupHbox( - decl( NULL, IupLabel( "X:" ), + named[154] = IupSetAtt( "ImageData", IupVbox( + IupSetAtt( NULL, IupHbox( + IupSetAtt( NULL, IupLabel( "X:" ), "SIZE", "30x9", NULL ), named[147] /* txtImageX */, - decl( NULL, IupFill(), + IupSetAtt( NULL, IupFill(), "SIZE", "5", NULL ), - decl( NULL, IupLabel( "Y:" ), + IupSetAtt( NULL, IupLabel( "Y:" ), "SIZE", "30x9", NULL ), named[148] /* txtImageY */, NULL), "ALIGNMENT", "ACENTER", NULL ), - decl( NULL, IupHbox( - decl( NULL, IupLabel( "Width:" ), + IupSetAtt( NULL, IupHbox( + IupSetAtt( NULL, IupLabel( "Width:" ), "SIZE", "30x9", NULL ), named[149] /* txtImageW */, - decl( NULL, IupFill(), + IupSetAtt( NULL, IupFill(), "SIZE", "5", NULL ), - decl( NULL, IupLabel( "Height:" ), + IupSetAtt( NULL, IupLabel( "Height:" ), "SIZE", "30x9", NULL ), named[150] /* txtImageH */, NULL), "ALIGNMENT", "ACENTER", NULL ), NULL), NULL ); - named[155] = decl( "ImageDeskTop", IupVbox( + named[155] = IupSetAtt( "ImageDeskTop", IupVbox( IupHbox( IupFill(), named[154] /* ImageData */, @@ -1463,16 +1447,16 @@ void cdtest_loadled (void) IupHbox( IupFill(), named[152] /* btImageGet */, - decl( NULL, IupFill(), + IupSetAtt( NULL, IupFill(), "SIZE", "5", NULL ), named[151] /* btImagePut */, - decl( NULL, IupFill(), + IupSetAtt( NULL, IupFill(), "SIZE", "5", NULL ), named[153] /* btImageHide */, IupFill(), NULL), NULL), NULL ); - named[156] = decl( "dlgImage", IupDialog( + named[156] = IupSetAtt( "dlgImage", IupDialog( named[155] /* ImageDeskTop */ ), "PARENTDIALOG", "dlgMain", @@ -1482,53 +1466,53 @@ void cdtest_loadled (void) "CLOSE_CB", "cmdMsgHide", "RESIZE", "NO", "MARGIN", "5x5", NULL ); - named[157] = decl( "txtImageRGBX", IupText( "cmdInteger" ), + named[157] = IupSetAtt( "txtImageRGBX", IupText( "cmdInteger" ), "NC", "5", "SIZE", "30x12", "VALUE", "0", NULL ); - named[158] = decl( "txtImageRGBY", IupText( "cmdInteger" ), + named[158] = IupSetAtt( "txtImageRGBY", IupText( "cmdInteger" ), "NC", "5", "SIZE", "30x12", "VALUE", "0", NULL ); - named[159] = decl( "txtImageRGBW", IupText( "cmdInteger" ), + named[159] = IupSetAtt( "txtImageRGBW", IupText( "cmdInteger" ), "NC", "5", "SIZE", "30x12", "VALUE", "0", NULL ); - named[160] = decl( "txtImageRGBH", IupText( "cmdInteger" ), + named[160] = IupSetAtt( "txtImageRGBH", IupText( "cmdInteger" ), "NC", "5", "SIZE", "30x12", "VALUE", "0", NULL ); - named[161] = decl( "btImageRGBPut", IupButton( "Put", "cmdImageRGBPut" ), + named[161] = IupSetAtt( "btImageRGBPut", IupButton( "Put", "cmdImageRGBPut" ), "SIZE", "30", NULL ); - named[162] = decl( "btImageRGBGet", IupButton( "Get", "cmdImageRGBGet" ), + named[162] = IupSetAtt( "btImageRGBGet", IupButton( "Get", "cmdImageRGBGet" ), "SIZE", "30", NULL ); - named[163] = decl( "btImageRGBHide", IupButton( "Hide", "cmdMsgHide" ), + named[163] = IupSetAtt( "btImageRGBHide", IupButton( "Hide", "cmdMsgHide" ), "SIZE", "30", NULL ); - named[164] = decl( "ImageRGBData", IupVbox( - decl( NULL, IupHbox( - decl( NULL, IupLabel( "X:" ), + named[164] = IupSetAtt( "ImageRGBData", IupVbox( + IupSetAtt( NULL, IupHbox( + IupSetAtt( NULL, IupLabel( "X:" ), "SIZE", "30x9", NULL ), named[157] /* txtImageRGBX */, - decl( NULL, IupFill(), + IupSetAtt( NULL, IupFill(), "SIZE", "5", NULL ), - decl( NULL, IupLabel( "Y:" ), + IupSetAtt( NULL, IupLabel( "Y:" ), "SIZE", "30x9", NULL ), named[158] /* txtImageRGBY */, NULL), "ALIGNMENT", "ACENTER", NULL ), - decl( NULL, IupHbox( - decl( NULL, IupLabel( "Width:" ), + IupSetAtt( NULL, IupHbox( + IupSetAtt( NULL, IupLabel( "Width:" ), "SIZE", "30x9", NULL ), named[159] /* txtImageRGBW */, - decl( NULL, IupFill(), + IupSetAtt( NULL, IupFill(), "SIZE", "5", NULL ), - decl( NULL, IupLabel( "Height:" ), + IupSetAtt( NULL, IupLabel( "Height:" ), "SIZE", "30x9", NULL ), named[160] /* txtImageRGBH */, NULL), "ALIGNMENT", "ACENTER", NULL ), NULL), NULL ); - named[165] = decl( "ImageRGBDeskTop", IupVbox( + named[165] = IupSetAtt( "ImageRGBDeskTop", IupVbox( IupHbox( IupFill(), named[164] /* ImageRGBData */, @@ -1537,16 +1521,16 @@ void cdtest_loadled (void) IupHbox( IupFill(), named[162] /* btImageRGBGet */, - decl( NULL, IupFill(), + IupSetAtt( NULL, IupFill(), "SIZE", "5", NULL ), named[161] /* btImageRGBPut */, - decl( NULL, IupFill(), + IupSetAtt( NULL, IupFill(), "SIZE", "5", NULL ), named[163] /* btImageRGBHide */, IupFill(), NULL), NULL), NULL ); - named[166] = decl( "dlgImageRGB", IupDialog( + named[166] = IupSetAtt( "dlgImageRGB", IupDialog( named[165] /* ImageRGBDeskTop */ ), "PARENTDIALOG", "dlgMain", @@ -1556,22 +1540,22 @@ void cdtest_loadled (void) "CLOSE_CB", "cmdMsgHide", "RESIZE", "NO", "MARGIN", "5x5", NULL ); - named[167] = decl( "btCDTest", IupButton( "Close", "cmdCloseAbout" ), NULL ); - named[168] = decl( "AboutDeskTop", IupHbox( + named[167] = IupSetAtt( "btCDTest", IupButton( "Close", "cmdCloseAbout" ), NULL ); + named[168] = IupSetAtt( "AboutDeskTop", IupHbox( IupFill(), - decl( NULL, IupVbox( + IupSetAtt( NULL, IupVbox( IupLabel( "CD Test 5.3" ), - decl( NULL, IupFill(), + IupSetAtt( NULL, IupFill(), "SIZE", "5", NULL ), IupLabel( "Antonio Scuri" ), IupLabel( "Diego Nehab" ), - decl( NULL, IupFill(), + IupSetAtt( NULL, IupFill(), "SIZE", "5", NULL ), IupLabel( "Tecgraf/PUC-Rio" ), - decl( NULL, IupFill(), + IupSetAtt( NULL, IupFill(), "SIZE", "5", NULL ), IupLabel( "CD Library Version" ), - named[169] = decl( "lblVersion", IupLabel( "" ), NULL ), + named[169] = IupSetAtt( "lblVersion", IupLabel( "" ), NULL ), named[167] /* btCDTest */, NULL), "ALIGNMENT", "ACENTER", NULL ), @@ -1579,7 +1563,7 @@ void cdtest_loadled (void) NULL), "MARGIN", "5x5", "GAP", "2", NULL ); - named[170] = decl( "dlgHelpAbout", IupDialog( + named[170] = IupSetAtt( "dlgHelpAbout", IupDialog( named[168] /* AboutDeskTop */ ), "PARENTDIALOG", "dlgMain", diff --git a/test/cdtest/config.mak b/test/cdtest/config.mak index e04e7d1..6a71b59 100644 --- a/test/cdtest/config.mak +++ b/test/cdtest/config.mak @@ -10,7 +10,7 @@ USE_CD=Yes USE_IUP3=Yes cdtest_led.c: cdtest.led - ledc -f cdtest_loadled -o cdtest_led.c cdtest.led + $(IUP)/bin/$(TEC_UNAME)/ledc -f cdtest_loadled -o cdtest_led.c cdtest.led USE_STATIC = Yes diff --git a/test/cdtest/drivers.c b/test/cdtest/drivers.c index 93918d5..62e92aa 100644 --- a/test/cdtest/drivers.c +++ b/test/cdtest/drivers.c @@ -32,6 +32,7 @@ extern tCTC ctgc; #define DXF #define DGN #define PDF +#define CDDBG static int LoadCanvas(char* ctx_name, cdContext* ctx, char *filename) { @@ -69,7 +70,7 @@ static int SaveCanvas(char* ctx_name, cdContext* ctx, char *data) canvas = cdCreateCanvas(ctx, data); if (!canvas) { - IupMessage("Error!", "Can not create canvas."); + IupMessagef("Error!", "Could not create canvas of driver %s.", ctx_name); return IUP_DEFAULT; } @@ -327,6 +328,26 @@ static int fPlayMF(void) } #endif +#ifdef CDDBG +#include +/*-------------------------------------------------------------------------*/ +/* Copia o conteudo do canvas para um arquivo metafile do CD. */ +/*-------------------------------------------------------------------------*/ +static int fDebug(void) +{ + char filename[1024]="*.mf"; + char data[1000]; + + if (IupGetFile(filename)>=0) + { + sprintf(data, "%s %gx%g %g", filename, ((double)ctgc.w)/ctgc.res, ((double)ctgc.h)/ctgc.res, ctgc.res); + return SaveCanvas("CD_DEBUG", CD_DEBUG, data); + } + + return IUP_DEFAULT; +} +#endif + /*-------------------------------------------------------------------------*/ /* Copia o conteudo do canvas para um arquivo WMF. */ /*-------------------------------------------------------------------------*/ @@ -389,7 +410,6 @@ static int fPrint(void) { char *data = "CDTEST.PRN -d"; return SaveCanvas("CD_PRINTER", CD_PRINTER, data); - return IUP_DEFAULT; } #endif @@ -432,6 +452,9 @@ void DriversInit(void) IupSetAttribute(IupGetHandle("itDGN"), IUP_ACTIVE, IUP_YES); IupSetFunction("cmdDGN", (Icallback) fDGN); #endif +#ifdef CDDBG + IupSetFunction("cmdDebug", (Icallback) fDebug); +#endif #ifdef CGM IupSetAttribute(IupGetHandle("itCGMb"), IUP_ACTIVE, IUP_YES); IupSetFunction("cmdCGMb", (Icallback) fCGMb); -- cgit v1.2.3