diff options
Diffstat (limited to 'iup/include')
-rwxr-xr-x | iup/include/iup.h | 19 | ||||
-rwxr-xr-x | iup/include/iupcbs.h | 2 | ||||
-rwxr-xr-x | iup/include/iupcontrols.h | 3 | ||||
-rwxr-xr-x | iup/include/iuplua.h | 2 |
4 files changed, 13 insertions, 13 deletions
diff --git a/iup/include/iup.h b/iup/include/iup.h index 9913329..2d33b98 100755 --- a/iup/include/iup.h +++ b/iup/include/iup.h @@ -19,11 +19,11 @@ extern "C" { #define IUP_NAME "IUP - Portable User Interface" -#define IUP_COPYRIGHT "Copyright (C) 1994-2009 Tecgraf, PUC-Rio." +#define IUP_COPYRIGHT "Copyright (C) 1994-2010 Tecgraf, PUC-Rio." #define IUP_DESCRIPTION "Portable toolkit for building graphical user interfaces." -#define IUP_VERSION "3.0" /* bug fixes are reported only by IupVersion functions */ -#define IUP_VERSION_NUMBER 300000 -#define IUP_VERSION_DATE "2009/10/02" +#define IUP_VERSION "3.1" /* bug fixes are reported only by IupVersion functions */ +#define IUP_VERSION_NUMBER 301000 +#define IUP_VERSION_DATE "2010/04/22" typedef struct Ihandle_ Ihandle; typedef int (*Icallback)(Ihandle*); @@ -38,6 +38,7 @@ void IupImageLibOpen (void); int IupMainLoop (void); int IupLoopStep (void); +int IupLoopStepWait (void); int IupMainLoopLevel (void); void IupFlush (void); void IupExitLoop (void); @@ -148,6 +149,7 @@ Ihandle* IupNormalizerv(Ihandle* *ih_list); Ihandle* IupCbox (Ihandle* child, ...); Ihandle* IupCboxv (Ihandle* *children); Ihandle* IupSbox (Ihandle *child); +Ihandle* IupSplit (Ihandle* child1, Ihandle* child2); Ihandle* IupFrame (Ihandle* child); @@ -197,12 +199,13 @@ int IupTreeSetUserId(Ihandle* ih, int id, void* userid); void* IupTreeGetUserId(Ihandle* ih, int id); int IupTreeGetId(Ihandle* ih, void *userid); -void IupTreeSetAttribute (Ihandle* ih, const char* name, int id, char* value); -void IupTreeStoreAttribute(Ihandle* ih, const char* name, int id, char* value); +void IupTreeSetAttribute (Ihandle* ih, const char* name, int id, const char* value); +void IupTreeStoreAttribute(Ihandle* ih, const char* name, int id, const char* value); char* IupTreeGetAttribute (Ihandle* ih, const char* name, int id); int IupTreeGetInt (Ihandle* ih, const char* name, int id); float IupTreeGetFloat (Ihandle* ih, const char* name, int id); -void IupTreeSetfAttribute (Ihandle* ih, const char* name, int id, char* format, ...); +void IupTreeSetfAttribute (Ihandle* ih, const char* name, int id, const char* format, ...); +void IupTreeSetAttributeHandle(Ihandle* ih, const char* a, int id, Ihandle* ih_named); /************************************************************************/ @@ -338,7 +341,7 @@ int IupMain (int argc, char** argv); /* In C++ we have to declare the prototype #endif /****************************************************************************** -* Copyright (C) 1994-2009 Tecgraf, PUC-Rio. +* Copyright (C) 1994-2010 Tecgraf, PUC-Rio. * * Permission is hereby granted, free of charge, to any person obtaining * a copy of this software and associated documentation files (the diff --git a/iup/include/iupcbs.h b/iup/include/iupcbs.h index f33166b..70d117f 100755 --- a/iup/include/iupcbs.h +++ b/iup/include/iupcbs.h @@ -24,7 +24,7 @@ typedef int (*IFnnii)(Ihandle*, Ihandle*, int, int); /* drop_cb */ typedef int (*IFnnn)(Ihandle*, Ihandle*, Ihandle*); /* tabchange_cb */ typedef int (*IFnss)(Ihandle*, char *, char *); /* file_cb */ typedef int (*IFns)(Ihandle*, char *); /* multiselect_cb */ -typedef int (*IFnis)(Ihandle*, int, char *); /* text_action, multiline_action, edit_cb, renamenode_cb, rename_cb */ +typedef int (*IFnis)(Ihandle*, int, char *); /* text_action, multiline_action, edit_cb, rename_cb */ typedef int (*IFnsii)(Ihandle*, char*, int, int); /* list_action */ typedef int (*IFnsiii)(Ihandle*, char*, int, int, int); /* dropfiles_cb */ typedef int (*IFniis)(Ihandle*, int, int, char*); /* motion_cb, click_cb, value_edit_cb */ diff --git a/iup/include/iupcontrols.h b/iup/include/iupcontrols.h index c7bc566..a30d407 100755 --- a/iup/include/iupcontrols.h +++ b/iup/include/iupcontrols.h @@ -15,9 +15,6 @@ extern "C" { int IupControlsOpen(void); void IupControlsClose(void); /* for backward compatibility only, does nothing since IUP 3 */ -void IupOldValOpen(void); -void IupOldTabsOpen(void); - Ihandle* IupColorbar(void); Ihandle* IupCells(void); Ihandle *IupColorBrowser(void); diff --git a/iup/include/iuplua.h b/iup/include/iuplua.h index dc660b5..854a858 100755 --- a/iup/include/iuplua.h +++ b/iup/include/iuplua.h @@ -23,7 +23,7 @@ int iuplua_dofile (char *filename); #ifdef LUA_TNONE /* Lua 5 */ int iuplua_open(lua_State *L); -int iupkey_open(lua_State *L); +int iupkey_open(lua_State *L); /* does nothing, kept for backward compatibility */ int iuplua_close(lua_State * L); /* utilities */ |