diff options
| author | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2010-09-09 02:26:30 +0200 |
|---|---|---|
| committer | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2010-09-09 02:32:26 +0200 |
| commit | 7505e88db66798b2b8fcdff2d92a7136cd826b5b (patch) | |
| tree | b6ced565318f8e8112e35cb0ad53abe4212ef8de | |
| parent | e9a184546b18cf3b796bd560561f312934004c54 (diff) | |
Upgrading to IUP 3.2 - and cleaning up.
239 files changed, 1743 insertions, 19471 deletions
diff --git a/iup/Makefile b/iup/Makefile deleted file mode 100755 index 1bcb9c7..0000000 --- a/iup/Makefile +++ /dev/null @@ -1,29 +0,0 @@ - -.PHONY: do_all iup iupgtk iupcd iupcontrols iupgl iup_pplot iupim iupimglib ledc iupview iuplua3 iuplua5 iupconsole -#do_all: iup iupgtk iupcd iupcontrols iupgl iup_pplot iupim iupimglib ledc iupview iuplua3 iuplua5 iupconsole -do_all: iup iupgtk iupcd iupcontrols iupgl iup_pplot iupim iupimglib ledc iupview iuplua5 iupconsole - -iup iupgtk: - @$(MAKE) --no-print-directory -C ./src/ $@ -iupcd: - @$(MAKE) --no-print-directory -C ./srccd/ -iupcontrols: - @$(MAKE) --no-print-directory -C ./srccontrols/ -iup_pplot: - @$(MAKE) --no-print-directory -C ./srcpplot/ -iupgl: - @$(MAKE) --no-print-directory -C ./srcgl/ -iupim: - @$(MAKE) --no-print-directory -C ./srcim/ -iupimglib: - @$(MAKE) --no-print-directory -C ./srcimglib/ -iuplua3: - @$(MAKE) --no-print-directory -C ./srclua3/ -iuplua5: - @$(MAKE) --no-print-directory -C ./srclua5/ -iupconsole: - @$(MAKE) --no-print-directory -C ./srcconsole/ -ledc: - @$(MAKE) --no-print-directory -C ./srcledc/ -iupview: iupcontrols iup - @$(MAKE) --no-print-directory -C ./srcview/ diff --git a/iup/dox/iup.dox b/iup/dox/iup.dox deleted file mode 100755 index f20c7c3..0000000 --- a/iup/dox/iup.dox +++ /dev/null @@ -1,264 +0,0 @@ -# Doxyfile 1.5.7.1 - -#--------------------------------------------------------------------------- -# Project related configuration options -#--------------------------------------------------------------------------- -DOXYFILE_ENCODING = UTF-8 -PROJECT_NAME = IUP -PROJECT_NUMBER = 3.0 -OUTPUT_DIRECTORY = ../html -CREATE_SUBDIRS = NO -OUTPUT_LANGUAGE = English -BRIEF_MEMBER_DESC = NO -REPEAT_BRIEF = NO -ABBREVIATE_BRIEF = "The $name class" \ - "The $name widget" \ - "The $name file" \ - is \ - provides \ - specifies \ - contains \ - represents \ - a \ - an \ - the -ALWAYS_DETAILED_SEC = NO -INLINE_INHERITED_MEMB = NO -FULL_PATH_NAMES = NO -STRIP_FROM_PATH = -STRIP_FROM_INC_PATH = -SHORT_NAMES = NO -JAVADOC_AUTOBRIEF = NO -QT_AUTOBRIEF = NO -MULTILINE_CPP_IS_BRIEF = NO -INHERIT_DOCS = YES -SEPARATE_MEMBER_PAGES = NO -TAB_SIZE = 8 -ALIASES = -OPTIMIZE_OUTPUT_FOR_C = YES -OPTIMIZE_OUTPUT_JAVA = NO -OPTIMIZE_FOR_FORTRAN = NO -OPTIMIZE_OUTPUT_VHDL = NO -BUILTIN_STL_SUPPORT = NO -CPP_CLI_SUPPORT = NO -SIP_SUPPORT = NO -IDL_PROPERTY_SUPPORT = YES -DISTRIBUTE_GROUP_DOC = YES -SUBGROUPING = YES -TYPEDEF_HIDES_STRUCT = NO -SYMBOL_CACHE_SIZE = 0 -#--------------------------------------------------------------------------- -# Build related configuration options -#--------------------------------------------------------------------------- -EXTRACT_ALL = NO -EXTRACT_PRIVATE = NO -EXTRACT_STATIC = NO -EXTRACT_LOCAL_CLASSES = NO -EXTRACT_LOCAL_METHODS = NO -EXTRACT_ANON_NSPACES = NO -HIDE_UNDOC_MEMBERS = NO -HIDE_UNDOC_CLASSES = YES -HIDE_FRIEND_COMPOUNDS = NO -HIDE_IN_BODY_DOCS = NO -INTERNAL_DOCS = NO -CASE_SENSE_NAMES = YES -HIDE_SCOPE_NAMES = NO -SHOW_INCLUDE_FILES = NO -INLINE_INFO = YES -SORT_MEMBER_DOCS = NO -SORT_BRIEF_DOCS = NO -SORT_GROUP_NAMES = NO -SORT_BY_SCOPE_NAME = NO -GENERATE_TODOLIST = NO -GENERATE_TESTLIST = NO -GENERATE_BUGLIST = NO -GENERATE_DEPRECATEDLIST= NO -ENABLED_SECTIONS = -MAX_INITIALIZER_LINES = 30 -SHOW_USED_FILES = NO -SHOW_DIRECTORIES = NO -SHOW_FILES = YES -SHOW_NAMESPACES = YES -FILE_VERSION_FILTER = -LAYOUT_FILE = -#--------------------------------------------------------------------------- -# configuration options related to warning and progress messages -#--------------------------------------------------------------------------- -QUIET = YES -WARNINGS = YES -WARN_IF_UNDOCUMENTED = NO -WARN_IF_DOC_ERROR = YES -WARN_NO_PARAMDOC = NO -WARN_FORMAT = "$file:$line: $text" -WARN_LOGFILE = -#--------------------------------------------------------------------------- -# configuration options related to the input files -#--------------------------------------------------------------------------- -INPUT = ../src -INPUT_ENCODING = UTF-8 -FILE_PATTERNS = *.h \ - iup.c -RECURSIVE = YES -EXCLUDE = -EXCLUDE_SYMLINKS = NO -EXCLUDE_PATTERNS = -EXCLUDE_SYMBOLS = -EXAMPLE_PATH = -EXAMPLE_PATTERNS = * -EXAMPLE_RECURSIVE = NO -IMAGE_PATH = -INPUT_FILTER = -FILTER_PATTERNS = -FILTER_SOURCE_FILES = NO -#--------------------------------------------------------------------------- -# configuration options related to source browsing -#--------------------------------------------------------------------------- -SOURCE_BROWSER = NO -INLINE_SOURCES = NO -STRIP_CODE_COMMENTS = NO -REFERENCED_BY_RELATION = YES -REFERENCES_RELATION = YES -REFERENCES_LINK_SOURCE = YES -USE_HTAGS = NO -VERBATIM_HEADERS = NO -#--------------------------------------------------------------------------- -# configuration options related to the alphabetical class index -#--------------------------------------------------------------------------- -ALPHABETICAL_INDEX = NO -COLS_IN_ALPHA_INDEX = 5 -IGNORE_PREFIX = -#--------------------------------------------------------------------------- -# configuration options related to the HTML output -#--------------------------------------------------------------------------- -GENERATE_HTML = YES -HTML_OUTPUT = doxygen/ -HTML_FILE_EXTENSION = .html -HTML_HEADER = -HTML_FOOTER = -HTML_STYLESHEET = -HTML_ALIGN_MEMBERS = YES -HTML_DYNAMIC_SECTIONS = NO -GENERATE_DOCSET = NO -DOCSET_FEEDNAME = "Doxygen generated docs" -DOCSET_BUNDLE_ID = org.doxygen.Project -GENERATE_HTMLHELP = NO -CHM_FILE = -HHC_LOCATION = -GENERATE_CHI = NO -CHM_INDEX_ENCODING = -BINARY_TOC = NO -TOC_EXPAND = NO -GENERATE_QHP = NO -QCH_FILE = -QHP_NAMESPACE = org.doxygen.Project -QHP_VIRTUAL_FOLDER = doc -QHG_LOCATION = -DISABLE_INDEX = YES -ENUM_VALUES_PER_LINE = 4 -GENERATE_TREEVIEW = FRAME -TREEVIEW_WIDTH = 250 -FORMULA_FONTSIZE = 10 -#--------------------------------------------------------------------------- -# configuration options related to the LaTeX output -#--------------------------------------------------------------------------- -GENERATE_LATEX = NO -LATEX_OUTPUT = latex -LATEX_CMD_NAME = latex -MAKEINDEX_CMD_NAME = makeindex -COMPACT_LATEX = NO -PAPER_TYPE = a4wide -EXTRA_PACKAGES = -LATEX_HEADER = -PDF_HYPERLINKS = YES -USE_PDFLATEX = YES -LATEX_BATCHMODE = NO -LATEX_HIDE_INDICES = NO -#--------------------------------------------------------------------------- -# configuration options related to the RTF output -#--------------------------------------------------------------------------- -GENERATE_RTF = NO -RTF_OUTPUT = rtf -COMPACT_RTF = NO -RTF_HYPERLINKS = NO -RTF_STYLESHEET_FILE = -RTF_EXTENSIONS_FILE = -#--------------------------------------------------------------------------- -# configuration options related to the man page output -#--------------------------------------------------------------------------- -GENERATE_MAN = NO -MAN_OUTPUT = man -MAN_EXTENSION = .3 -MAN_LINKS = NO -#--------------------------------------------------------------------------- -# configuration options related to the XML output -#--------------------------------------------------------------------------- -GENERATE_XML = NO -XML_OUTPUT = xml -XML_SCHEMA = -XML_DTD = -XML_PROGRAMLISTING = YES -#--------------------------------------------------------------------------- -# configuration options for the AutoGen Definitions output -#--------------------------------------------------------------------------- -GENERATE_AUTOGEN_DEF = NO -#--------------------------------------------------------------------------- -# configuration options related to the Perl module output -#--------------------------------------------------------------------------- -GENERATE_PERLMOD = NO -PERLMOD_LATEX = NO -PERLMOD_PRETTY = YES -PERLMOD_MAKEVAR_PREFIX = -#--------------------------------------------------------------------------- -# Configuration options related to the preprocessor -#--------------------------------------------------------------------------- -ENABLE_PREPROCESSING = YES -MACRO_EXPANSION = NO -EXPAND_ONLY_PREDEF = NO -SEARCH_INCLUDES = YES -INCLUDE_PATH = ../include/ -INCLUDE_FILE_PATTERNS = -PREDEFINED = IUP_ASSERT -EXPAND_AS_DEFINED = -SKIP_FUNCTION_MACROS = YES -#--------------------------------------------------------------------------- -# Configuration::additions related to external references -#--------------------------------------------------------------------------- -TAGFILES = -GENERATE_TAGFILE = -ALLEXTERNALS = NO -EXTERNAL_GROUPS = YES -PERL_PATH = /usr/bin/perl -#--------------------------------------------------------------------------- -# Configuration options related to the dot tool -#--------------------------------------------------------------------------- -CLASS_DIAGRAMS = NO -MSCGEN_PATH = -HIDE_UNDOC_RELATIONS = YES -HAVE_DOT = YES -DOT_FONTNAME = FreeSans -DOT_FONTSIZE = 10 -DOT_FONTPATH = -CLASS_GRAPH = YES -COLLABORATION_GRAPH = YES -GROUP_GRAPHS = YES -UML_LOOK = NO -TEMPLATE_RELATIONS = NO -INCLUDE_GRAPH = YES -INCLUDED_BY_GRAPH = YES -CALL_GRAPH = NO -CALLER_GRAPH = NO -GRAPHICAL_HIERARCHY = YES -DIRECTORY_GRAPH = YES -DOT_IMAGE_FORMAT = png -DOT_PATH = -DOTFILE_DIRS = -DOT_GRAPH_MAX_NODES = 50 -MAX_DOT_GRAPH_DEPTH = 1000 -DOT_TRANSPARENT = NO -DOT_MULTI_TARGETS = NO -GENERATE_LEGEND = YES -DOT_CLEANUP = YES -#--------------------------------------------------------------------------- -# Configuration::additions related to the search engine -#--------------------------------------------------------------------------- -SEARCHENGINE = NO diff --git a/iup/etc/iup.rc b/iup/etc/iup.rc index 49c324d..785e7ad 100755 --- a/iup/etc/iup.rc +++ b/iup/etc/iup.rc @@ -1,8 +1,12 @@ -TECGRAF_ICON ICON "tecgraf.ico" +TECGRAF_ICON ICON "tecgraf.ico" /* the first icon will also defines the executable icon in Explorer */ +CURSOR_PEN CURSOR "pen.cur" + +/****************************************************/ +/* Applications can change or remove this */ 1 VERSIONINFO - FILEVERSION 3,0,0,0 - PRODUCTVERSION 3,0,0,0 + FILEVERSION 3,1,0,0 + PRODUCTVERSION 3,1,0,0 BEGIN BLOCK "StringFileInfo" BEGIN @@ -11,16 +15,17 @@ BEGIN VALUE "Comments", "www.tecgraf.puc-rio.br/iup\0" VALUE "CompanyName", "Tecgraf/PUC-Rio\0" VALUE "FileDescription", "IUP - Portable User Interface\0" - VALUE "FileVersion", "3.0.0\0" + VALUE "FileVersion", "3.1.0\0" VALUE "LegalCopyright", "Copyright © 1994-2010 Tecgraf, PUC-Rio.\0" VALUE "OriginalFilename", "iup.dll\0" VALUE "ProductName", "IUP for Windows\0" - VALUE "ProductVersion", "3.0.0\0" + VALUE "ProductVersion", "3.1.0\0" END END END -CURSOR_PEN CURSOR "pen.cur" +/****************************************************/ +/* Used by IupFileDlg when SHOWPREVIEW=Yes */ /* To avoid the inclusion of <winuser.h> */ #define WS_CHILD 0x40000000L @@ -40,5 +45,16 @@ BEGIN CONTROL "", IUP_PREVIEWCANVAS, "STATIC", SS_OWNERDRAW, 70, 0, 120, 90, WS_EX_STATICEDGE END -/* The following line will enable Windows XP Visual Styles */ +/****************************************************/ +/* The following lines will enable Windows XP/Vista Visual Styles */ + +/* don't add this if building the DLL */ +#ifndef IUP_DLL +#ifdef TEC_64 +1 24 "iup64.manifest" +#else 1 24 "iup.manifest" +#endif +#endif + +/****************************************************/ diff --git a/iup/include/iup.h b/iup/include/iup.h index 2d33b98..572d88c 100755 --- a/iup/include/iup.h +++ b/iup/include/iup.h @@ -21,9 +21,9 @@ extern "C" { #define IUP_NAME "IUP - Portable User Interface" #define IUP_COPYRIGHT "Copyright (C) 1994-2010 Tecgraf, PUC-Rio." #define IUP_DESCRIPTION "Portable toolkit for building graphical user interfaces." -#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" +#define IUP_VERSION "3.2" /* bug fixes are reported only by IupVersion functions */ +#define IUP_VERSION_NUMBER 302000 +#define IUP_VERSION_DATE "2010/06/26" /* does not include bug fix releases */ typedef struct Ihandle_ Ihandle; typedef int (*Icallback)(Ihandle*); @@ -91,6 +91,7 @@ int IupGetInt2 (Ihandle* ih, const char* name); int IupGetIntInt (Ihandle *ih, const char* name, int *i1, int *i2); float IupGetFloat (Ihandle* ih, const char* name); void IupSetfAttribute (Ihandle* ih, const char* name, const char* format, ...); +void IupResetAttribute(Ihandle *ih, const char* name); int IupGetAllAttributes(Ihandle* ih, char** names, int n); Ihandle* IupSetAtt(const char* handle_name, Ihandle* ih, const char* name, ...); diff --git a/iup/include/iupcbs.h b/iup/include/iupcbs.h index 70d117f..94be8b8 100755 --- a/iup/include/iupcbs.h +++ b/iup/include/iupcbs.h @@ -24,6 +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 (*IFnsi)(Ihandle*, char *, int); /* copydata_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 */ diff --git a/iup/mak.vc8/iup.sln b/iup/mak.vc8/iup.sln deleted file mode 100755 index c0fe994..0000000 --- a/iup/mak.vc8/iup.sln +++ /dev/null @@ -1,347 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 9.00 -# Visual Studio 2005 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iupcore", "iupcore.vcproj", "{2C7E83B9-7FE8-432A-97BA-FCF4D0728408}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iupgtk", "iupgtk.vcproj", "{2C7E83B9-7FE8-5555-97BA-FCF4D0728408}" - ProjectSection(ProjectDependencies) = postProject - {2C7E83B9-7FE8-432A-97BA-FCF4D0728408} = {2C7E83B9-7FE8-432A-97BA-FCF4D0728408} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iupmot", "iupmot.vcproj", "{2C7E83B9-1234-432A-97BA-FCF4D0728408}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iuptest", "iuptest.vcproj", "{2F92EC58-D94C-40BF-8C82-77607C72E1E3}" - ProjectSection(ProjectDependencies) = postProject - {5EEFE977-C56D-462F-BDEE-12A5452EB8CC} = {5EEFE977-C56D-462F-BDEE-12A5452EB8CC} - {5A42018B-95AC-A789-E4E4-59A692649DCA} = {5A42018B-95AC-A789-E4E4-59A692649DCA} - {2C7E83B9-123A-BCDF-97BA-FCF4D0728408} = {2C7E83B9-123A-BCDF-97BA-FCF4D0728408} - {2C7E83B9-7FE8-432A-97BA-FCF4D0728408} = {2C7E83B9-7FE8-432A-97BA-FCF4D0728408} - {BE7472E1-E76E-4969-A35F-054614F5884E} = {BE7472E1-E76E-4969-A35F-054614F5884E} - {E251B4F4-0B0A-482B-BA18-1234ADC4B6AA} = {E251B4F4-0B0A-482B-BA18-1234ADC4B6AA} - {E251B4F4-0B0A-482B-BA18-2509ADC4B6AA} = {E251B4F4-0B0A-482B-BA18-2509ADC4B6AA} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iuptestgtk", "iuptestgtk.vcproj", "{2F92EC58-1234-40BF-5678-77607C72E1E3}" - ProjectSection(ProjectDependencies) = postProject - {5EEFE977-C56D-462F-BDEE-12A5452EB8CC} = {5EEFE977-C56D-462F-BDEE-12A5452EB8CC} - {5A42018B-95AC-A789-E4E4-59A692649DCA} = {5A42018B-95AC-A789-E4E4-59A692649DCA} - {2C7E83B9-7FE8-432A-97BA-FCF4D0728408} = {2C7E83B9-7FE8-432A-97BA-FCF4D0728408} - {2C7E83B9-7FE8-5555-97BA-FCF4D0728408} = {2C7E83B9-7FE8-5555-97BA-FCF4D0728408} - {BE7472E1-E76E-4969-A35F-054614F5884E} = {BE7472E1-E76E-4969-A35F-054614F5884E} - {E251B4F4-0B0A-482B-BA18-1234ADC4B6AA} = {E251B4F4-0B0A-482B-BA18-1234ADC4B6AA} - {E251B4F4-0B0A-482B-BA18-2509ADC4B6AA} = {E251B4F4-0B0A-482B-BA18-2509ADC4B6AA} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iupwin", "iupwin.vcproj", "{2C7E83B9-123A-BCDF-97BA-FCF4D0728408}" - ProjectSection(ProjectDependencies) = postProject - {2C7E83B9-7FE8-432A-97BA-FCF4D0728408} = {2C7E83B9-7FE8-432A-97BA-FCF4D0728408} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iupgl", "iupgl.vcproj", "{E251B4F4-0B0A-482B-BA18-2509ADC4B6AA}" - ProjectSection(ProjectDependencies) = postProject - {2C7E83B9-7FE8-432A-97BA-FCF4D0728408} = {2C7E83B9-7FE8-432A-97BA-FCF4D0728408} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iupcontrols", "iupcontrols.vcproj", "{5EEFE977-C56D-462F-BDEE-12A5452EB8CC}" - ProjectSection(ProjectDependencies) = postProject - {2C7E83B9-7FE8-432A-97BA-FCF4D0728408} = {2C7E83B9-7FE8-432A-97BA-FCF4D0728408} - {BE7472E1-E76E-4969-A35F-054614F5884E} = {BE7472E1-E76E-4969-A35F-054614F5884E} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iup_pplot", "iup_pplot.vcproj", "{5A42018B-95AC-A789-E4E4-59A692649DCA}" - ProjectSection(ProjectDependencies) = postProject - {2C7E83B9-7FE8-432A-97BA-FCF4D0728408} = {2C7E83B9-7FE8-432A-97BA-FCF4D0728408} - {BE7472E1-E76E-4969-A35F-054614F5884E} = {BE7472E1-E76E-4969-A35F-054614F5884E} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iupole", "iupole.vcproj", "{0C80BBEE-1B00-4567-1234-067292C84EDB}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iupimglib", "iupimglib.vcproj", "{E251B4F4-0B0A-482B-BB33-1234ADC4B6AA}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iupcd", "iupcd.vcproj", "{BE7472E1-E76E-4969-A35F-054614F5884E}" - ProjectSection(ProjectDependencies) = postProject - {2C7E83B9-7FE8-432A-97BA-FCF4D0728408} = {2C7E83B9-7FE8-432A-97BA-FCF4D0728408} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iupim", "iupim.vcproj", "{E251B4F4-0B0A-482B-BA18-1234ADC4B6AA}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iuplua3", "iuplua3.vcproj", "{1EBC7A53-4677-4C3A-8DFF-49D301F17D85}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iuplua3_exe", "iupluaexe3.vcproj", "{A60D658D-766C-40DB-BAFF-59AB884D86FB}" - ProjectSection(ProjectDependencies) = postProject - {1EBC7A53-4677-4C3A-8DFF-269001F17D85} = {1EBC7A53-4677-4C3A-8DFF-269001F17D85} - {1EBC7A53-4677-4C3A-8DFF-49D301F17D85} = {1EBC7A53-4677-4C3A-8DFF-49D301F17D85} - {1EBC7A53-4677-4C3A-8DFF-49DFF4417D85} = {1EBC7A53-4677-4C3A-8DFF-49DFF4417D85} - {1EBC7A53-33FF-4C3A-8DFF-49D301F17D85} = {1EBC7A53-33FF-4C3A-8DFF-49D301F17D85} - {5EEFE977-C56D-462F-BDEE-12A5452EB8CC} = {5EEFE977-C56D-462F-BDEE-12A5452EB8CC} - {5EEFE977-C56D-462F-BDEE-12A5452EB8CC} = {5EEFE977-C56D-462F-BDEE-12A5452EB8CC} - {5EEFE977-C56D-462F-BDEE-12A5452EB8CC} = {5EEFE977-C56D-462F-BDEE-12A5452EB8CC} - {5EEFE977-C56D-462F-BDEE-12A5452EB8CC} = {5EEFE977-C56D-462F-BDEE-12A5452EB8CC} - {5EEFE977-C56D-462F-BDEE-12A5452EB8CC} = {5EEFE977-C56D-462F-BDEE-12A5452EB8CC} - {5EEFE977-C56D-462F-BDEE-12A5452EB8CC} = {5EEFE977-C56D-462F-BDEE-12A5452EB8CC} - {5EEFE977-C56D-462F-BDEE-12A5452EB8CC} = {5EEFE977-C56D-462F-BDEE-12A5452EB8CC} - {5EEFE977-C56D-462F-BDEE-12A5452EB8CC} = {5EEFE977-C56D-462F-BDEE-12A5452EB8CC} - {2C7E83B9-7FE8-432A-97BA-FCF4D0728408} = {2C7E83B9-7FE8-432A-97BA-FCF4D0728408} - {E251B4F4-0B0A-482B-BA18-1234ADC4B6AA} = {E251B4F4-0B0A-482B-BA18-1234ADC4B6AA} - {E251B4F4-0B0A-482B-BA18-2509ADC4B6AA} = {E251B4F4-0B0A-482B-BA18-2509ADC4B6AA} - {E251B4F4-0B0A-482B-BA18-2509ADC4B6AA} = {E251B4F4-0B0A-482B-BA18-2509ADC4B6AA} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iuplua5", "iuplua5.vcproj", "{1EBC7A53-4677-4C3A-8D4A-49D301F17D85}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iuplua5_exe", "iupluaexe5.vcproj", "{A60D658D-766C-40DB-BAE4-59AB884D86FB}" - ProjectSection(ProjectDependencies) = postProject - {1EBC7A53-4677-4C3A-8D4A-49D301157985} = {1EBC7A53-4677-4C3A-8D4A-49D301157985} - {1EBC7A53-4677-4C3A-8D4A-49D301F17D85} = {1EBC7A53-4677-4C3A-8D4A-49D301F17D85} - {1EBC7A53-4677-AAAA-1234-49D301F17D85} = {1EBC7A53-4677-AAAA-1234-49D301F17D85} - {1EBC7A53-4677-75D7-8D4A-49D301F17D85} = {1EBC7A53-4677-75D7-8D4A-49D301F17D85} - {1EBC7A53-4677-ADF1-8D4A-49D301F17D85} = {1EBC7A53-4677-ADF1-8D4A-49D301F17D85} - {B4823266-DF8C-4EFB-91C0-C7688C234EAC} = {B4823266-DF8C-4EFB-91C0-C7688C234EAC} - {5EEFE977-C56D-462F-BDEE-12A5452EB8CC} = {5EEFE977-C56D-462F-BDEE-12A5452EB8CC} - {5EEFE977-C56D-462F-BDEE-12A5452EB8CC} = {5EEFE977-C56D-462F-BDEE-12A5452EB8CC} - {5EEFE977-C56D-462F-BDEE-12A5452EB8CC} = {5EEFE977-C56D-462F-BDEE-12A5452EB8CC} - {5EEFE977-C56D-462F-BDEE-12A5452EB8CC} = {5EEFE977-C56D-462F-BDEE-12A5452EB8CC} - {5EEFE977-C56D-462F-BDEE-12A5452EB8CC} = {5EEFE977-C56D-462F-BDEE-12A5452EB8CC} - {5EEFE977-C56D-462F-BDEE-12A5452EB8CC} = {5EEFE977-C56D-462F-BDEE-12A5452EB8CC} - {5EEFE977-C56D-462F-BDEE-12A5452EB8CC} = {5EEFE977-C56D-462F-BDEE-12A5452EB8CC} - {5A42018B-95AC-A789-E4E4-59A692649DCA} = {5A42018B-95AC-A789-E4E4-59A692649DCA} - {2C7E83B9-123A-BCDF-97BA-FCF4D0728408} = {2C7E83B9-123A-BCDF-97BA-FCF4D0728408} - {2C7E83B9-7FE8-432A-97BA-FCF4D0728408} = {2C7E83B9-7FE8-432A-97BA-FCF4D0728408} - {BE7472E1-E76E-4969-A35F-054614F5884E} = {BE7472E1-E76E-4969-A35F-054614F5884E} - {E251B4F4-0B0A-482B-BA18-1234ADC4B6AA} = {E251B4F4-0B0A-482B-BA18-1234ADC4B6AA} - {E251B4F4-0B0A-482B-BA18-2509ADC4B6AA} = {E251B4F4-0B0A-482B-BA18-2509ADC4B6AA} - {E251B4F4-0B0A-482B-BA18-2509ADC4B6AA} = {E251B4F4-0B0A-482B-BA18-2509ADC4B6AA} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ledc", "ledc.vcproj", "{0F789DF8-22CC-4392-98DB-AC3960FAD4EA}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iupview", "iupview.vcproj", "{2F92EC58-D94C-40BF-4444-77607C72E1E3}" - ProjectSection(ProjectDependencies) = postProject - {5EEFE977-C56D-462F-BDEE-12A5452EB8CC} = {5EEFE977-C56D-462F-BDEE-12A5452EB8CC} - {2C7E83B9-123A-BCDF-97BA-FCF4D0728408} = {2C7E83B9-123A-BCDF-97BA-FCF4D0728408} - {2C7E83B9-7FE8-432A-97BA-FCF4D0728408} = {2C7E83B9-7FE8-432A-97BA-FCF4D0728408} - {E251B4F4-0B0A-482B-BA18-1234ADC4B6AA} = {E251B4F4-0B0A-482B-BA18-1234ADC4B6AA} - {E251B4F4-0B0A-482B-BA18-2509ADC4B6AA} = {E251B4F4-0B0A-482B-BA18-2509ADC4B6AA} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iupluaim5", "iupluaim5.vcproj", "{1EBC7A53-4677-ADF1-8D4A-49D301F17D85}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iupluaim3", "iupluaim3.vcproj", "{1EBC7A53-4677-4C3A-8DFF-269001F17D85}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iupluacontrols5", "iupluacontrols5.vcproj", "{1EBC7A53-4677-75D7-8D4A-49D301F17D85}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iupluacontrols3", "iupluacontrols3.vcproj", "{1EBC7A53-4677-4C3A-8DFF-49DFF4417D85}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iupluagl5", "iupluagl5.vcproj", "{1EBC7A53-4677-4C3A-8D4A-49D301157985}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iupluagl3", "iupluagl3.vcproj", "{1EBC7A53-33FF-4C3A-8DFF-49D301F17D85}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iupluaole3", "iupluaole3.vcproj", "{1EBC7A53-33FF-7890-7890-49D301F17D85}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iupluaole5", "iupluaole5.vcproj", "{1EBC7A53-4677-5555-2222-49D301157985}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iuplua_pplot5", "iuplua_pplot5.vcproj", "{1EBC7A53-4677-AAAA-1234-49D301F17D85}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iuplua_pplot3", "iuplua_pplot3.vcproj", "{1EBC7A53-4677-1234-DDDD-49DFF4417D85}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iupluacd3", "iupluacd3.vcproj", "{B4823266-DF8C-4EFB-91C0-C7E78C234EAC}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iupluacd5", "iupluacd5.vcproj", "{B4823266-DF8C-4EFB-91C0-C7688C234EAC}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Lua5", "Lua5", "{1CBEAA34-BA34-497D-A775-B9AF6F905696}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Lua3", "Lua3", "{11041D08-354A-4300-9624-41277E67DE34}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iupluaimglib5", "iupluaimglib5.vcproj", "{1EBC7A53-4677-FFFF-1234-49D301F17D85}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core", "Core", "{B7B3CB79-CA94-4ED3-9DCA-EC12458C2EBD}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test", "Test", "{FC52B7B5-744E-45D6-815C-3502F9D965E7}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iupsample", "iupsample.vcproj", "{9462FDEA-3E53-4250-8710-DD50AF48607C}" - ProjectSection(ProjectDependencies) = postProject - {5EEFE977-C56D-462F-BDEE-12A5452EB8CC} = {5EEFE977-C56D-462F-BDEE-12A5452EB8CC} - {2C7E83B9-123A-BCDF-97BA-FCF4D0728408} = {2C7E83B9-123A-BCDF-97BA-FCF4D0728408} - {2C7E83B9-7FE8-432A-97BA-FCF4D0728408} = {2C7E83B9-7FE8-432A-97BA-FCF4D0728408} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iupsamplegtk", "iupsamplegtk.vcproj", "{C684B76D-52EC-49CE-84F2-B031509419A5}" - ProjectSection(ProjectDependencies) = postProject - {5EEFE977-C56D-462F-BDEE-12A5452EB8CC} = {5EEFE977-C56D-462F-BDEE-12A5452EB8CC} - {2C7E83B9-7FE8-432A-97BA-FCF4D0728408} = {2C7E83B9-7FE8-432A-97BA-FCF4D0728408} - {2C7E83B9-7FE8-5555-97BA-FCF4D0728408} = {2C7E83B9-7FE8-5555-97BA-FCF4D0728408} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iupviewgtk", "iupviewgtk.vcproj", "{E7D19356-B0AB-44AD-ACCB-5FFFCC4837BE}" - ProjectSection(ProjectDependencies) = postProject - {5EEFE977-C56D-462F-BDEE-12A5452EB8CC} = {5EEFE977-C56D-462F-BDEE-12A5452EB8CC} - {2C7E83B9-7FE8-432A-97BA-FCF4D0728408} = {2C7E83B9-7FE8-432A-97BA-FCF4D0728408} - {2C7E83B9-7FE8-5555-97BA-FCF4D0728408} = {2C7E83B9-7FE8-5555-97BA-FCF4D0728408} - {E251B4F4-0B0A-482B-BA18-1234ADC4B6AA} = {E251B4F4-0B0A-482B-BA18-1234ADC4B6AA} - {E251B4F4-0B0A-482B-BA18-2509ADC4B6AA} = {E251B4F4-0B0A-482B-BA18-2509ADC4B6AA} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iuplua5gtk_exe", "iupluaexe5gtk.vcproj", "{389DF3C9-A628-4F6D-8C52-8924FA01DE66}" - ProjectSection(ProjectDependencies) = postProject - {1EBC7A53-4677-4C3A-8D4A-49D301157985} = {1EBC7A53-4677-4C3A-8D4A-49D301157985} - {1EBC7A53-4677-4C3A-8D4A-49D301F17D85} = {1EBC7A53-4677-4C3A-8D4A-49D301F17D85} - {1EBC7A53-4677-AAAA-1234-49D301F17D85} = {1EBC7A53-4677-AAAA-1234-49D301F17D85} - {1EBC7A53-4677-75D7-8D4A-49D301F17D85} = {1EBC7A53-4677-75D7-8D4A-49D301F17D85} - {1EBC7A53-4677-ADF1-8D4A-49D301F17D85} = {1EBC7A53-4677-ADF1-8D4A-49D301F17D85} - {5EEFE977-C56D-462F-BDEE-12A5452EB8CC} = {5EEFE977-C56D-462F-BDEE-12A5452EB8CC} - {5A42018B-95AC-A789-E4E4-59A692649DCA} = {5A42018B-95AC-A789-E4E4-59A692649DCA} - {2C7E83B9-7FE8-432A-97BA-FCF4D0728408} = {2C7E83B9-7FE8-432A-97BA-FCF4D0728408} - {2C7E83B9-7FE8-5555-97BA-FCF4D0728408} = {2C7E83B9-7FE8-5555-97BA-FCF4D0728408} - {BE7472E1-E76E-4969-A35F-054614F5884E} = {BE7472E1-E76E-4969-A35F-054614F5884E} - {E251B4F4-0B0A-482B-BA18-1234ADC4B6AA} = {E251B4F4-0B0A-482B-BA18-1234ADC4B6AA} - {E251B4F4-0B0A-482B-BA18-2509ADC4B6AA} = {E251B4F4-0B0A-482B-BA18-2509ADC4B6AA} - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {2C7E83B9-7FE8-432A-97BA-FCF4D0728408}.Debug|Win32.ActiveCfg = Debug|Win32 - {2C7E83B9-7FE8-432A-97BA-FCF4D0728408}.Debug|Win32.Build.0 = Debug|Win32 - {2C7E83B9-7FE8-5555-97BA-FCF4D0728408}.Debug|Win32.ActiveCfg = Debug|Win32 - {2C7E83B9-7FE8-5555-97BA-FCF4D0728408}.Debug|Win32.Build.0 = Debug|Win32 - {2C7E83B9-1234-432A-97BA-FCF4D0728408}.Debug|Win32.ActiveCfg = Debug|Win32 - {2F92EC58-D94C-40BF-8C82-77607C72E1E3}.Debug|Win32.ActiveCfg = Debug|Win32 - {2F92EC58-D94C-40BF-8C82-77607C72E1E3}.Debug|Win32.Build.0 = Debug|Win32 - {2F92EC58-1234-40BF-5678-77607C72E1E3}.Debug|Win32.ActiveCfg = Debug|Win32 - {2F92EC58-1234-40BF-5678-77607C72E1E3}.Debug|Win32.Build.0 = Debug|Win32 - {2C7E83B9-123A-BCDF-97BA-FCF4D0728408}.Debug|Win32.ActiveCfg = Debug|Win32 - {2C7E83B9-123A-BCDF-97BA-FCF4D0728408}.Debug|Win32.Build.0 = Debug|Win32 - {E251B4F4-0B0A-482B-BA18-2509ADC4B6AA}.Debug|Win32.ActiveCfg = Debug|Win32 - {E251B4F4-0B0A-482B-BA18-2509ADC4B6AA}.Debug|Win32.Build.0 = Debug|Win32 - {5EEFE977-C56D-462F-BDEE-12A5452EB8CC}.Debug|Win32.ActiveCfg = Debug|Win32 - {5EEFE977-C56D-462F-BDEE-12A5452EB8CC}.Debug|Win32.Build.0 = Debug|Win32 - {5A42018B-95AC-A789-E4E4-59A692649DCA}.Debug|Win32.ActiveCfg = Debug|Win32 - {5A42018B-95AC-A789-E4E4-59A692649DCA}.Debug|Win32.Build.0 = Debug|Win32 - {0C80BBEE-1B00-4567-1234-067292C84EDB}.Debug|Win32.ActiveCfg = Debug|Win32 - {0C80BBEE-1B00-4567-1234-067292C84EDB}.Debug|Win32.Build.0 = Debug|Win32 - {E251B4F4-0B0A-482B-BB33-1234ADC4B6AA}.Debug|Win32.ActiveCfg = Debug|Win32 - {E251B4F4-0B0A-482B-BB33-1234ADC4B6AA}.Debug|Win32.Build.0 = Debug|Win32 - {BE7472E1-E76E-4969-A35F-054614F5884E}.Debug|Win32.ActiveCfg = Debug|Win32 - {BE7472E1-E76E-4969-A35F-054614F5884E}.Debug|Win32.Build.0 = Debug|Win32 - {E251B4F4-0B0A-482B-BA18-1234ADC4B6AA}.Debug|Win32.ActiveCfg = Debug|Win32 - {E251B4F4-0B0A-482B-BA18-1234ADC4B6AA}.Debug|Win32.Build.0 = Debug|Win32 - {1EBC7A53-4677-4C3A-8DFF-49D301F17D85}.Debug|Win32.ActiveCfg = Debug|Win32 - {1EBC7A53-4677-4C3A-8DFF-49D301F17D85}.Debug|Win32.Build.0 = Debug|Win32 - {A60D658D-766C-40DB-BAFF-59AB884D86FB}.Debug|Win32.ActiveCfg = Debug|Win32 - {A60D658D-766C-40DB-BAFF-59AB884D86FB}.Debug|Win32.Build.0 = Debug|Win32 - {1EBC7A53-4677-4C3A-8D4A-49D301F17D85}.Debug|Win32.ActiveCfg = Debug|Win32 - {1EBC7A53-4677-4C3A-8D4A-49D301F17D85}.Debug|Win32.Build.0 = Debug|Win32 - {A60D658D-766C-40DB-BAE4-59AB884D86FB}.Debug|Win32.ActiveCfg = Debug|Win32 - {A60D658D-766C-40DB-BAE4-59AB884D86FB}.Debug|Win32.Build.0 = Debug|Win32 - {0F789DF8-22CC-4392-98DB-AC3960FAD4EA}.Debug|Win32.ActiveCfg = Debug|Win32 - {0F789DF8-22CC-4392-98DB-AC3960FAD4EA}.Debug|Win32.Build.0 = Debug|Win32 - {2F92EC58-D94C-40BF-4444-77607C72E1E3}.Debug|Win32.ActiveCfg = Debug|Win32 - {2F92EC58-D94C-40BF-4444-77607C72E1E3}.Debug|Win32.Build.0 = Debug|Win32 - {1EBC7A53-4677-ADF1-8D4A-49D301F17D85}.Debug|Win32.ActiveCfg = Debug|Win32 - {1EBC7A53-4677-ADF1-8D4A-49D301F17D85}.Debug|Win32.Build.0 = Debug|Win32 - {1EBC7A53-4677-4C3A-8DFF-269001F17D85}.Debug|Win32.ActiveCfg = Debug|Win32 - {1EBC7A53-4677-4C3A-8DFF-269001F17D85}.Debug|Win32.Build.0 = Debug|Win32 - {1EBC7A53-4677-75D7-8D4A-49D301F17D85}.Debug|Win32.ActiveCfg = Debug|Win32 - {1EBC7A53-4677-75D7-8D4A-49D301F17D85}.Debug|Win32.Build.0 = Debug|Win32 - {1EBC7A53-4677-4C3A-8DFF-49DFF4417D85}.Debug|Win32.ActiveCfg = Debug|Win32 - {1EBC7A53-4677-4C3A-8DFF-49DFF4417D85}.Debug|Win32.Build.0 = Debug|Win32 - {1EBC7A53-4677-4C3A-8D4A-49D301157985}.Debug|Win32.ActiveCfg = Debug|Win32 - {1EBC7A53-4677-4C3A-8D4A-49D301157985}.Debug|Win32.Build.0 = Debug|Win32 - {1EBC7A53-33FF-4C3A-8DFF-49D301F17D85}.Debug|Win32.ActiveCfg = Debug|Win32 - {1EBC7A53-33FF-4C3A-8DFF-49D301F17D85}.Debug|Win32.Build.0 = Debug|Win32 - {1EBC7A53-33FF-7890-7890-49D301F17D85}.Debug|Win32.ActiveCfg = Debug|Win32 - {1EBC7A53-33FF-7890-7890-49D301F17D85}.Debug|Win32.Build.0 = Debug|Win32 - {1EBC7A53-4677-5555-2222-49D301157985}.Debug|Win32.ActiveCfg = Debug|Win32 - {1EBC7A53-4677-5555-2222-49D301157985}.Debug|Win32.Build.0 = Debug|Win32 - {1EBC7A53-4677-AAAA-1234-49D301F17D85}.Debug|Win32.ActiveCfg = Debug|Win32 - {1EBC7A53-4677-AAAA-1234-49D301F17D85}.Debug|Win32.Build.0 = Debug|Win32 - {1EBC7A53-4677-1234-DDDD-49DFF4417D85}.Debug|Win32.ActiveCfg = Debug|Win32 - {1EBC7A53-4677-1234-DDDD-49DFF4417D85}.Debug|Win32.Build.0 = Debug|Win32 - {B4823266-DF8C-4EFB-91C0-C7E78C234EAC}.Debug|Win32.ActiveCfg = Debug|Win32 - {B4823266-DF8C-4EFB-91C0-C7E78C234EAC}.Debug|Win32.Build.0 = Debug|Win32 - {B4823266-DF8C-4EFB-91C0-C7688C234EAC}.Debug|Win32.ActiveCfg = Debug|Win32 - {B4823266-DF8C-4EFB-91C0-C7688C234EAC}.Debug|Win32.Build.0 = Debug|Win32 - {1EBC7A53-4677-FFFF-1234-49D301F17D85}.Debug|Win32.ActiveCfg = Debug|Win32 - {1EBC7A53-4677-FFFF-1234-49D301F17D85}.Debug|Win32.Build.0 = Debug|Win32 - {9462FDEA-3E53-4250-8710-DD50AF48607C}.Debug|Win32.ActiveCfg = Debug|Win32 - {9462FDEA-3E53-4250-8710-DD50AF48607C}.Debug|Win32.Build.0 = Debug|Win32 - {C684B76D-52EC-49CE-84F2-B031509419A5}.Debug|Win32.ActiveCfg = Debug|Win32 - {C684B76D-52EC-49CE-84F2-B031509419A5}.Debug|Win32.Build.0 = Debug|Win32 - {E7D19356-B0AB-44AD-ACCB-5FFFCC4837BE}.Debug|Win32.ActiveCfg = Debug|Win32 - {E7D19356-B0AB-44AD-ACCB-5FFFCC4837BE}.Debug|Win32.Build.0 = Debug|Win32 - {389DF3C9-A628-4F6D-8C52-8924FA01DE66}.Debug|Win32.ActiveCfg = Debug|Win32 - {389DF3C9-A628-4F6D-8C52-8924FA01DE66}.Debug|Win32.Build.0 = Debug|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {2C7E83B9-7FE8-5555-97BA-FCF4D0728408} = {B7B3CB79-CA94-4ED3-9DCA-EC12458C2EBD} - {2C7E83B9-1234-432A-97BA-FCF4D0728408} = {B7B3CB79-CA94-4ED3-9DCA-EC12458C2EBD} - {2C7E83B9-123A-BCDF-97BA-FCF4D0728408} = {B7B3CB79-CA94-4ED3-9DCA-EC12458C2EBD} - {2C7E83B9-7FE8-432A-97BA-FCF4D0728408} = {B7B3CB79-CA94-4ED3-9DCA-EC12458C2EBD} - {2F92EC58-1234-40BF-5678-77607C72E1E3} = {FC52B7B5-744E-45D6-815C-3502F9D965E7} - {2F92EC58-D94C-40BF-8C82-77607C72E1E3} = {FC52B7B5-744E-45D6-815C-3502F9D965E7} - {9462FDEA-3E53-4250-8710-DD50AF48607C} = {FC52B7B5-744E-45D6-815C-3502F9D965E7} - {C684B76D-52EC-49CE-84F2-B031509419A5} = {FC52B7B5-744E-45D6-815C-3502F9D965E7} - {A60D658D-766C-40DB-BAFF-59AB884D86FB} = {11041D08-354A-4300-9624-41277E67DE34} - {1EBC7A53-4677-4C3A-8DFF-269001F17D85} = {11041D08-354A-4300-9624-41277E67DE34} - {1EBC7A53-4677-4C3A-8DFF-49DFF4417D85} = {11041D08-354A-4300-9624-41277E67DE34} - {1EBC7A53-33FF-4C3A-8DFF-49D301F17D85} = {11041D08-354A-4300-9624-41277E67DE34} - {1EBC7A53-33FF-7890-7890-49D301F17D85} = {11041D08-354A-4300-9624-41277E67DE34} - {1EBC7A53-4677-1234-DDDD-49DFF4417D85} = {11041D08-354A-4300-9624-41277E67DE34} - {B4823266-DF8C-4EFB-91C0-C7E78C234EAC} = {11041D08-354A-4300-9624-41277E67DE34} - {1EBC7A53-4677-4C3A-8DFF-49D301F17D85} = {11041D08-354A-4300-9624-41277E67DE34} - {A60D658D-766C-40DB-BAE4-59AB884D86FB} = {1CBEAA34-BA34-497D-A775-B9AF6F905696} - {1EBC7A53-4677-ADF1-8D4A-49D301F17D85} = {1CBEAA34-BA34-497D-A775-B9AF6F905696} - {1EBC7A53-4677-75D7-8D4A-49D301F17D85} = {1CBEAA34-BA34-497D-A775-B9AF6F905696} - {1EBC7A53-4677-4C3A-8D4A-49D301157985} = {1CBEAA34-BA34-497D-A775-B9AF6F905696} - {1EBC7A53-4677-5555-2222-49D301157985} = {1CBEAA34-BA34-497D-A775-B9AF6F905696} - {1EBC7A53-4677-AAAA-1234-49D301F17D85} = {1CBEAA34-BA34-497D-A775-B9AF6F905696} - {B4823266-DF8C-4EFB-91C0-C7688C234EAC} = {1CBEAA34-BA34-497D-A775-B9AF6F905696} - {1EBC7A53-4677-4C3A-8D4A-49D301F17D85} = {1CBEAA34-BA34-497D-A775-B9AF6F905696} - {1EBC7A53-4677-FFFF-1234-49D301F17D85} = {1CBEAA34-BA34-497D-A775-B9AF6F905696} - {389DF3C9-A628-4F6D-8C52-8924FA01DE66} = {1CBEAA34-BA34-497D-A775-B9AF6F905696} - EndGlobalSection - GlobalSection(DevPartner) = postSolution - EndGlobalSection - GlobalSection(DevPartner) = postSolution - EndGlobalSection - GlobalSection(DevPartner) = postSolution - EndGlobalSection - GlobalSection(DevPartner) = postSolution - EndGlobalSection - GlobalSection(DevPartner) = postSolution - EndGlobalSection - GlobalSection(DevPartner) = postSolution - EndGlobalSection - GlobalSection(DevPartner) = postSolution - EndGlobalSection - GlobalSection(DevPartner) = postSolution - EndGlobalSection - GlobalSection(DevPartner) = postSolution - EndGlobalSection - GlobalSection(DevPartner) = postSolution - EndGlobalSection - GlobalSection(DevPartner) = postSolution - EndGlobalSection - GlobalSection(DevPartner) = postSolution - EndGlobalSection - GlobalSection(DevPartner) = postSolution - EndGlobalSection - GlobalSection(DevPartner) = postSolution - EndGlobalSection - GlobalSection(DevPartner) = postSolution - EndGlobalSection - GlobalSection(DevPartner) = postSolution - EndGlobalSection - GlobalSection(DevPartner) = postSolution - EndGlobalSection - GlobalSection(DevPartner) = postSolution - EndGlobalSection - GlobalSection(DevPartner) = postSolution - EndGlobalSection - GlobalSection(DevPartner) = postSolution - EndGlobalSection -EndGlobal diff --git a/iup/mak.vc8/iup_pplot.vcproj b/iup/mak.vc8/iup_pplot.vcproj deleted file mode 100755 index 0a4e7a2..0000000 --- a/iup/mak.vc8/iup_pplot.vcproj +++ /dev/null @@ -1,137 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="8,00" - Name="iup_pplot" - ProjectGUID="{5A42018B-95AC-A789-E4E4-59A692649DCA}" - Keyword="Win32Proj" - TargetFrameworkVersion="131072" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory="..\lib" - IntermediateDirectory="..\obj\Debug\$(ProjectName)" - ConfigurationType="4" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\include;..\src;..\srcpplot;..\..\cd\include" - PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE;_IUP_PPLOT_;CD_NO_OLD_INTERFACE;_DEBUG;IUP_ASSERT" - MinimalRebuild="false" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - UsePrecompiledHeader="0" - WarningLevel="4" - Detect64BitPortabilityProblems="false" - DebugInformationFormat="1" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - OutputFile="$(OutDir)/$(ProjectName).lib" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <Filter - Name="inc" - > - <File - RelativePath="..\srcpplot\iupPPlot.h" - > - </File> - <File - RelativePath="..\srcpplot\iuppplot.hpp" - > - </File> - <File - RelativePath="..\srcpplot\iupPPlotInteraction.h" - > - </File> - </Filter> - <Filter - Name="include" - > - <File - RelativePath="..\include\iup_pplot.h" - > - </File> - </Filter> - <File - RelativePath="..\srcpplot\iup_pplot.cpp" - > - </File> - <File - RelativePath="..\srcpplot\iup_pplot.def" - > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\srcpplot\iupPPlot.cpp" - > - </File> - <File - RelativePath="..\srcpplot\iupPPlotInteraction.cpp" - > - </File> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/iup/mak.vc8/iupcd.vcproj b/iup/mak.vc8/iupcd.vcproj deleted file mode 100755 index 8b4fcf2..0000000 --- a/iup/mak.vc8/iupcd.vcproj +++ /dev/null @@ -1,104 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="8,00" - Name="iupcd" - ProjectGUID="{BE7472E1-E76E-4969-A35F-054614F5884E}" - TargetFrameworkVersion="131072" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory="..\lib" - IntermediateDirectory="..\obj\Debug\$(ProjectName)" - ConfigurationType="4" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\include;..\..\cd\include" - PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,CD_NO_OLD_INTERFACE,_CRT_SECURE_NO_DEPRECATE" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - PrecompiledHeaderFile="..\obj\iup/iupcd.pch" - AssemblerListingLocation="" - ObjectFile="$(IntDir)\" - ProgramDataBaseFileName="$(IntDir)\vc90.pdb" - BrowseInformation="0" - WarningLevel="4" - SuppressStartupBanner="true" - DebugInformationFormat="1" - CompileAs="0" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - Culture="1046" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - OutputFile="$(OutDir)/$(ProjectName).lib" - SuppressStartupBanner="true" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <File - RelativePath="..\srccd\iup_cd.c" - > - </File> - <File - RelativePath="..\srccd\iupcd.def" - > - </File> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/iup/mak.vc8/iupcontrols.vcproj b/iup/mak.vc8/iupcontrols.vcproj deleted file mode 100755 index a780f89..0000000 --- a/iup/mak.vc8/iupcontrols.vcproj +++ /dev/null @@ -1,335 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="8,00" - Name="iupcontrols" - ProjectGUID="{5EEFE977-C56D-462F-BDEE-12A5452EB8CC}" - Keyword="Win32Proj" - TargetFrameworkVersion="131072" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory="..\lib" - IntermediateDirectory="..\obj\Debug\$(ProjectName)" - ConfigurationType="4" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\include;..\src;..\srccontrols;..\..\cd\include" - PreprocessorDefinitions="WIN32;_DEBUG;CD_NO_OLD_INTERFACE;_CRT_SECURE_NO_DEPRECATE;IUP_ASSERT" - MinimalRebuild="false" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - UsePrecompiledHeader="0" - BrowseInformation="0" - WarningLevel="4" - Detect64BitPortabilityProblems="false" - DebugInformationFormat="1" - CompileAs="0" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - OutputFile="$(OutDir)/$(ProjectName).lib" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <Filter - Name="include" - > - <File - RelativePath="..\include\iupcb.h" - > - </File> - <File - RelativePath="..\include\iupcells.h" - > - </File> - <File - RelativePath="..\include\iupcolorbar.h" - > - </File> - <File - RelativePath="..\include\iupcontrols.h" - > - </File> - <File - RelativePath="..\include\iupdial.h" - > - </File> - <File - RelativePath="..\include\iupgauge.h" - > - </File> - <File - RelativePath="..\include\iupmask.h" - > - </File> - <File - RelativePath="..\include\iupmatrix.h" - > - </File> - <File - RelativePath="..\include\iuptabs.h" - > - </File> - <File - RelativePath="..\include\iuptree.h" - > - </File> - <File - RelativePath="..\include\iupval.h" - > - </File> - </Filter> - <Filter - Name="inc" - > - <File - RelativePath="..\srccontrols\iup_cdutil.h" - > - </File> - <File - RelativePath="..\srccontrols\iup_controls.h" - > - </File> - </Filter> - <Filter - Name="colorbrowser" - > - <File - RelativePath="..\srccontrols\color\iup_colorbrowser.c" - > - </File> - <File - RelativePath="..\srccontrols\color\iup_colorbrowserdlg.c" - > - </File> - <File - RelativePath="..\srccontrols\color\iup_colorhsi.c" - > - </File> - <File - RelativePath="..\srccontrols\color\iup_colorhsi.h" - > - </File> - </Filter> - <Filter - Name="matrix" - > - <File - RelativePath="..\srccontrols\matrix\iupmat_aux.c" - > - </File> - <File - RelativePath="..\srccontrols\matrix\iupmat_colres.c" - > - </File> - <File - RelativePath="..\srccontrols\matrix\iupmat_draw.c" - > - </File> - <File - RelativePath="..\srccontrols\matrix\iupmat_edit.c" - > - </File> - <File - RelativePath="..\srccontrols\matrix\iupmat_focus.c" - > - </File> - <File - RelativePath="..\srccontrols\matrix\iupmat_getset.c" - > - </File> - <File - RelativePath="..\srccontrols\matrix\iupmat_key.c" - > - </File> - <File - RelativePath="..\srccontrols\matrix\iupmat_mark.c" - > - </File> - <File - RelativePath="..\srccontrols\matrix\iupmat_mem.c" - > - </File> - <File - RelativePath="..\srccontrols\matrix\iupmat_mouse.c" - > - </File> - <File - RelativePath="..\srccontrols\matrix\iupmat_numlc.c" - > - </File> - <File - RelativePath="..\srccontrols\matrix\iupmat_scroll.c" - > - </File> - <File - RelativePath="..\srccontrols\matrix\iupmatrix.c" - > - </File> - <Filter - Name="inc" - > - <File - RelativePath="..\srccontrols\matrix\iupmat_aux.h" - > - </File> - <File - RelativePath="..\srccontrols\matrix\iupmat_cd.h" - > - </File> - <File - RelativePath="..\srccontrols\matrix\iupmat_colres.h" - > - </File> - <File - RelativePath="..\srccontrols\matrix\iupmat_def.h" - > - </File> - <File - RelativePath="..\srccontrols\matrix\iupmat_draw.h" - > - </File> - <File - RelativePath="..\srccontrols\matrix\iupmat_edit.h" - > - </File> - <File - RelativePath="..\srccontrols\matrix\iupmat_focus.h" - > - </File> - <File - RelativePath="..\srccontrols\matrix\iupmat_getset.h" - > - </File> - <File - RelativePath="..\srccontrols\matrix\iupmat_key.h" - > - </File> - <File - RelativePath="..\srccontrols\matrix\iupmat_mark.h" - > - </File> - <File - RelativePath="..\srccontrols\matrix\iupmat_mem.h" - > - </File> - <File - RelativePath="..\srccontrols\matrix\iupmat_mouse.h" - > - </File> - <File - RelativePath="..\srccontrols\matrix\iupmat_numlc.h" - > - </File> - <File - RelativePath="..\srccontrols\matrix\iupmat_scroll.h" - > - </File> - </Filter> - </Filter> - <File - RelativePath="..\srccontrols\iup_cdutil.c" - > - </File> - <File - RelativePath="..\srccontrols\iup_cells.c" - > - </File> - <File - RelativePath="..\srccontrols\iup_colorbar.c" - > - </File> - <File - RelativePath="..\srccontrols\iup_controls.c" - > - </File> - <File - RelativePath="..\srccontrols\iup_dial.c" - > - </File> - <File - RelativePath="..\srccontrols\iup_gauge.c" - > - </File> - <File - RelativePath="..\srccontrols\iup_oldmask.c" - > - </File> - <File - RelativePath="..\srccontrols\iup_oldtabs.c" - > - </File> - <File - RelativePath="..\srccontrols\iup_oldval.c" - > - </File> - <File - RelativePath="..\srccontrols\iupcontrols.def" - > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - </File> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/iup/mak.vc8/iupcore.vcproj b/iup/mak.vc8/iupcore.vcproj deleted file mode 100755 index 4b5b4a3..0000000 --- a/iup/mak.vc8/iupcore.vcproj +++ /dev/null @@ -1,600 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="8,00" - Name="iupcore" - ProjectGUID="{2C7E83B9-7FE8-432A-97BA-FCF4D0728408}" - Keyword="Win32Proj" - TargetFrameworkVersion="131072" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory="..\lib" - IntermediateDirectory="..\obj\Debug\$(ProjectName)" - ConfigurationType="4" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\src;..\src\win;..\include" - PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;IUP_ASSERT" - MinimalRebuild="false" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - UsePrecompiledHeader="0" - BrowseInformation="0" - WarningLevel="4" - Detect64BitPortabilityProblems="false" - DebugInformationFormat="1" - CompileAs="0" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - OutputFile="$(OutDir)\$(ProjectName).lib" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <Filter - Name="src" - > - <File - RelativePath="..\src\iup.c" - > - </File> - <File - RelativePath="..\src\iup_array.c" - > - </File> - <File - RelativePath="..\src\iup_assert.c" - > - </File> - <File - RelativePath="..\src\iup_attrib.c" - > - </File> - <File - RelativePath="..\src\iup_callback.c" - > - </File> - <File - RelativePath="..\src\iup_childtree.c" - > - </File> - <File - RelativePath="..\src\iup_class.c" - > - </File> - <File - RelativePath="..\src\iup_classattrib.c" - > - </File> - <File - RelativePath="..\src\iup_classbase.c" - > - </File> - <File - RelativePath="..\src\iup_dlglist.c" - > - </File> - <File - RelativePath="..\src\iup_focus.c" - > - </File> - <File - RelativePath="..\src\iup_font.c" - > - </File> - <File - RelativePath="..\src\iup_func.c" - > - </File> - <File - RelativePath="..\src\iup_globalattrib.c" - > - </File> - <File - RelativePath="..\src\iup_key.c" - > - </File> - <File - RelativePath="..\src\iup_layout.c" - > - </File> - <File - RelativePath="..\src\iup_ledlex.c" - > - </File> - <File - RelativePath="..\src\iup_ledparse.c" - > - </File> - <File - RelativePath="..\src\iup_mask.c" - > - </File> - <File - RelativePath="..\src\iup_maskmatch.c" - > - </File> - <File - RelativePath="..\src\iup_maskparse.c" - > - </File> - <File - RelativePath="..\src\iup_names.c" - > - </File> - <File - RelativePath="..\src\iup_object.c" - > - </File> - <File - RelativePath="..\src\iup_open.c" - > - </File> - <File - RelativePath="..\src\iup_register.c" - > - </File> - <File - RelativePath="..\src\iup_show.c" - > - </File> - <File - RelativePath="..\src\iup_str.c" - > - </File> - <File - RelativePath="..\src\iup_strmessage.c" - > - </File> - <File - RelativePath="..\src\iup_table.c" - > - </File> - </Filter> - <Filter - Name="inc" - > - <File - RelativePath="..\src\iup_array.h" - > - </File> - <File - RelativePath="..\src\iup_assert.h" - > - </File> - <File - RelativePath="..\src\iup_attrib.h" - > - </File> - <File - RelativePath="..\src\iup_childtree.h" - > - </File> - <File - RelativePath="..\src\iup_class.h" - > - </File> - <File - RelativePath="..\src\iup_classbase.h" - > - </File> - <File - RelativePath="..\src\iup_dlglist.h" - > - </File> - <File - RelativePath="..\src\iup_drv.h" - > - </File> - <File - RelativePath="..\src\iup_drvfont.h" - > - </File> - <File - RelativePath="..\src\iup_drvinfo.h" - > - </File> - <File - RelativePath="..\src\iup_focus.h" - > - </File> - <File - RelativePath="..\src\iup_func.h" - > - </File> - <File - RelativePath="..\src\iup_globalattrib.h" - > - </File> - <File - RelativePath="..\src\iup_key.h" - > - </File> - <File - RelativePath="..\src\iup_layout.h" - > - </File> - <File - RelativePath="..\src\iup_ledlex.h" - > - </File> - <File - RelativePath="..\src\iup_mask.h" - > - </File> - <File - RelativePath="..\src\iup_maskmatch.h" - > - </File> - <File - RelativePath="..\src\iup_maskparse.h" - > - </File> - <File - RelativePath="..\src\iup_names.h" - > - </File> - <File - RelativePath="..\src\iup_object.h" - > - </File> - <File - RelativePath="..\src\iup_predial.h" - > - </File> - <File - RelativePath="..\src\iup_register.h" - > - </File> - <File - RelativePath="..\src\iup_str.h" - > - </File> - <File - RelativePath="..\src\iup_strmessage.h" - > - </File> - <File - RelativePath="..\src\iup_table.h" - > - </File> - </Filter> - <Filter - Name="include" - Filter="h;hpp;hxx;hm;inl;inc" - > - <File - RelativePath="..\include\iup.h" - > - </File> - <File - RelativePath="..\include\iupcbs.h" - > - </File> - <File - RelativePath="..\include\iupkey.h" - > - </File> - <File - RelativePath="..\include\iupspin.h" - > - </File> - </Filter> - <Filter - Name="windows" - > - <File - RelativePath="..\src\win\iupwindows_help.c" - > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - PreprocessorDefinitions="_WIN32_WINNT=0x0500;_WIN32_IE=0x0500" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\src\win\iupwindows_info.c" - > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - PreprocessorDefinitions="_WIN32_WINNT=0x0500;_WIN32_IE=0x0500" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\src\win\iupwindows_main.c" - > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - PreprocessorDefinitions="_WIN32_WINNT=0x0500;_WIN32_IE=0x0500" - /> - </FileConfiguration> - </File> - </Filter> - <Filter - Name="src_controls" - > - <File - RelativePath="..\src\iup_box.c" - > - </File> - <File - RelativePath="..\src\iup_button.c" - > - </File> - <File - RelativePath="..\src\iup_canvas.c" - > - </File> - <File - RelativePath="..\src\iup_cbox.c" - > - </File> - <File - RelativePath="..\src\iup_colordlg.c" - > - </File> - <File - RelativePath="..\src\iup_dialog.c" - > - </File> - <File - RelativePath="..\src\iup_filedlg.c" - > - </File> - <File - RelativePath="..\src\iup_fill.c" - > - </File> - <File - RelativePath="..\src\iup_fontdlg.c" - > - </File> - <File - RelativePath="..\src\iup_frame.c" - > - </File> - <File - RelativePath="..\src\iup_getparam.c" - > - </File> - <File - RelativePath="..\src\iup_hbox.c" - > - </File> - <File - RelativePath="..\src\iup_image.c" - > - </File> - <File - RelativePath="..\src\iup_label.c" - > - </File> - <File - RelativePath="..\src\iup_list.c" - > - </File> - <File - RelativePath="..\src\iup_menu.c" - > - </File> - <File - RelativePath="..\src\iup_messagedlg.c" - > - </File> - <File - RelativePath="..\src\iup_normalizer.c" - > - </File> - <File - RelativePath="..\src\iup_predial.c" - > - </File> - <File - RelativePath="..\src\iup_progressbar.c" - > - </File> - <File - RelativePath="..\src\iup_radio.c" - > - </File> - <File - RelativePath="..\src\iup_sbox.c" - > - </File> - <File - RelativePath="..\src\iup_scanf.c" - > - </File> - <File - RelativePath="..\src\iup_spin.c" - > - </File> - <File - RelativePath="..\src\iup_tabs.c" - > - </File> - <File - RelativePath="..\src\iup_text.c" - > - </File> - <File - RelativePath="..\src\iup_timer.c" - > - </File> - <File - RelativePath="..\src\iup_toggle.c" - > - </File> - <File - RelativePath="..\src\iup_tree.c" - > - </File> - <File - RelativePath="..\src\iup_user.c" - > - </File> - <File - RelativePath="..\src\iup_val.c" - > - </File> - <File - RelativePath="..\src\iup_vbox.c" - > - </File> - <File - RelativePath="..\src\iup_zbox.c" - > - </File> - </Filter> - <Filter - Name="inc_controls" - > - <File - RelativePath="..\src\iup_box.h" - > - </File> - <File - RelativePath="..\src\iup_button.h" - > - </File> - <File - RelativePath="..\src\iup_canvas.h" - > - </File> - <File - RelativePath="..\src\iup_dialog.h" - > - </File> - <File - RelativePath="..\src\iup_frame.h" - > - </File> - <File - RelativePath="..\src\iup_image.h" - > - </File> - <File - RelativePath="..\src\iup_label.h" - > - </File> - <File - RelativePath="..\src\iup_list.h" - > - </File> - <File - RelativePath="..\src\iup_menu.h" - > - </File> - <File - RelativePath="..\src\iup_progressbar.h" - > - </File> - <File - RelativePath="..\src\iup_stdcontrols.h" - > - </File> - <File - RelativePath="..\src\iup_tabs.h" - > - </File> - <File - RelativePath="..\src\iup_text.h" - > - </File> - <File - RelativePath="..\src\iup_timer.h" - > - </File> - <File - RelativePath="..\src\iup_toggle.h" - > - </File> - <File - RelativePath="..\src\iup_tree.h" - > - </File> - <File - RelativePath="..\src\iup_val.h" - > - </File> - </Filter> - <File - RelativePath="..\src\iup.def" - > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - </File> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/iup/mak.vc8/iupgl.vcproj b/iup/mak.vc8/iupgl.vcproj deleted file mode 100755 index 3cdeb89..0000000 --- a/iup/mak.vc8/iupgl.vcproj +++ /dev/null @@ -1,127 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="8,00" - Name="iupgl" - ProjectGUID="{E251B4F4-0B0A-482B-BA18-2509ADC4B6AA}" - TargetFrameworkVersion="131072" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory="..\lib" - IntermediateDirectory="..\obj\Debug\$(ProjectName)" - ConfigurationType="4" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\include;..\src" - PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;IUP_ASSERT" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - UsePrecompiledHeader="0" - BrowseInformation="0" - WarningLevel="4" - SuppressStartupBanner="true" - DebugInformationFormat="1" - CompileAs="0" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" - Culture="1046" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - OutputFile="$(OutDir)/$(ProjectName).lib" - SuppressStartupBanner="true" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <File - RelativePath="..\srcgl\iup_glcanvas_win.c" - > - </File> - <File - RelativePath="..\srcgl\iup_glcanvas_x.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="d:\lng\x11inc" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\srcgl\iupgl.def" - > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\include\iupgl.h" - > - </File> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/iup/mak.vc8/iupgtk.vcproj b/iup/mak.vc8/iupgtk.vcproj deleted file mode 100755 index 9fccbb2..0000000 --- a/iup/mak.vc8/iupgtk.vcproj +++ /dev/null @@ -1,221 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="8,00" - Name="iupgtk" - ProjectGUID="{2C7E83B9-7FE8-5555-97BA-FCF4D0728408}" - Keyword="Win32Proj" - TargetFrameworkVersion="131072" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory="..\lib" - IntermediateDirectory="..\obj\Debug\$(ProjectName)" - ConfigurationType="4" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\src;..\src\gtk;..\include;"d:\lng\gtk\include\atk-1.0";d:\lng\gtk\include\cairo;"d:\lng\gtk\include\glib-2.0";"d:\lng\gtk\include\gtk-2.0";"d:\lng\gtk\include\pango-1.0";"d:\lng\gtk\lib\gtk-2.0\include";"d:\lng\gtk\lib\glib-2.0\include"" - PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_WIN32_WINNT=0x0500;_WIN32_IE=0x0500;IUP_ASSERT;_CRT_SECURE_NO_DEPRECATE;GTK_DISABLE_DEPRECATED" - MinimalRebuild="false" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - UsePrecompiledHeader="0" - BrowseInformation="0" - WarningLevel="4" - Detect64BitPortabilityProblems="false" - DebugInformationFormat="1" - CompileAs="0" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - AdditionalDependencies="iupcore.lib" - AdditionalLibraryDirectories="$(OutDir)" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <Filter - Name="src" - > - <File - RelativePath="..\src\gtk\iupgtk_common.c" - > - </File> - <File - RelativePath="..\src\gtk\iupgtk_focus.c" - > - </File> - <File - RelativePath="..\src\gtk\iupgtk_font.c" - > - </File> - <File - RelativePath="..\src\gtk\iupgtk_globalattrib.c" - > - </File> - <File - RelativePath="..\src\gtk\iupgtk_key.c" - > - </File> - <File - RelativePath="..\src\gtk\iupgtk_loop.c" - > - </File> - <File - RelativePath="..\src\gtk\iupgtk_open.c" - > - </File> - <File - RelativePath="..\src\gtk\iupgtk_tips.c" - > - </File> - </Filter> - <Filter - Name="inc" - > - <File - RelativePath="..\src\gtk\iupgtk_drv.h" - > - </File> - </Filter> - <Filter - Name="src_controls" - > - <File - RelativePath="..\src\gtk\iupgtk_button.c" - > - </File> - <File - RelativePath="..\src\gtk\iupgtk_canvas.c" - > - </File> - <File - RelativePath="..\src\gtk\iupgtk_clipboard.c" - > - </File> - <File - RelativePath="..\src\gtk\iupgtk_colordlg.c" - > - </File> - <File - RelativePath="..\src\gtk\iupgtk_dialog.c" - > - </File> - <File - RelativePath="..\src\gtk\iupgtk_filedlg.c" - > - </File> - <File - RelativePath="..\src\gtk\iupgtk_fontdlg.c" - > - </File> - <File - RelativePath="..\src\gtk\iupgtk_frame.c" - > - </File> - <File - RelativePath="..\src\gtk\iupgtk_image.c" - > - </File> - <File - RelativePath="..\src\gtk\iupgtk_label.c" - > - </File> - <File - RelativePath="..\src\gtk\iupgtk_list.c" - > - </File> - <File - RelativePath="..\src\gtk\iupgtk_menu.c" - > - </File> - <File - RelativePath="..\src\gtk\iupgtk_messagedlg.c" - > - </File> - <File - RelativePath="..\src\gtk\iupgtk_progressbar.c" - > - </File> - <File - RelativePath="..\src\gtk\iupgtk_tabs.c" - > - </File> - <File - RelativePath="..\src\gtk\iupgtk_text.c" - > - </File> - <File - RelativePath="..\src\gtk\iupgtk_timer.c" - > - </File> - <File - RelativePath="..\src\gtk\iupgtk_toggle.c" - > - </File> - <File - RelativePath="..\src\gtk\iupgtk_tree.c" - > - </File> - <File - RelativePath="..\src\gtk\iupgtk_val.c" - > - </File> - </Filter> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/iup/mak.vc8/iupim.vcproj b/iup/mak.vc8/iupim.vcproj deleted file mode 100755 index 62a26b2..0000000 --- a/iup/mak.vc8/iupim.vcproj +++ /dev/null @@ -1,103 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="8,00" - Name="iupim" - ProjectGUID="{E251B4F4-0B0A-482B-BA18-1234ADC4B6AA}" - TargetFrameworkVersion="0" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory="..\lib" - IntermediateDirectory="..\obj\Debug\$(ProjectName)" - ConfigurationType="4" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\include;..\src;..\..\im\include" - PreprocessorDefinitions="WIN32,_DEBUG,_CRT_SECURE_NO_DEPRECATE;IUP_ASSERT" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - UsePrecompiledHeader="0" - BrowseInformation="0" - WarningLevel="4" - SuppressStartupBanner="true" - DebugInformationFormat="1" - CompileAs="0" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" - Culture="1046" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - OutputFile="$(OutDir)/$(ProjectName).lib" - SuppressStartupBanner="true" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <File - RelativePath="..\srcim\iup_im.c" - > - </File> - <File - RelativePath="..\include\iupim.h" - > - </File> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/iup/mak.vc8/iupimglib.vcproj b/iup/mak.vc8/iupimglib.vcproj deleted file mode 100755 index 17711a3..0000000 --- a/iup/mak.vc8/iupimglib.vcproj +++ /dev/null @@ -1,142 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="8,00" - Name="iupimglib" - ProjectGUID="{E251B4F4-0B0A-482B-BB33-1234ADC4B6AA}" - TargetFrameworkVersion="131072" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory="..\lib" - IntermediateDirectory="..\obj\Debug\$(ProjectName)" - ConfigurationType="4" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\include;..\src" - PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - UsePrecompiledHeader="0" - BrowseInformation="0" - WarningLevel="4" - SuppressStartupBanner="true" - DebugInformationFormat="1" - CompileAs="0" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" - Culture="1046" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - OutputFile="$(OutDir)/$(ProjectName).lib" - SuppressStartupBanner="true" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <Filter - Name="inc" - > - <File - RelativePath="..\srcimglib\iup_imglib_bitmaps.h" - > - </File> - <File - RelativePath="..\srcimglib\iup_imglib_bitmaps8.h" - > - </File> - <File - RelativePath="..\srcimglib\iup_imglib_bitmapsgtk.h" - > - </File> - <File - RelativePath="..\srcimglib\iup_imglib_icons.h" - > - </File> - <File - RelativePath="..\srcimglib\iup_imglib_icons8.h" - > - </File> - <File - RelativePath="..\srcimglib\iup_imglib_logos.h" - > - </File> - <File - RelativePath="..\srcimglib\iup_imglib_logos8.h" - > - </File> - </Filter> - <File - RelativePath="..\srcimglib\iup_image_library.c" - > - </File> - <File - RelativePath="..\srcimglib\iupimglib.def" - > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - </File> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/iup/mak.vc8/iuplua3.vcproj b/iup/mak.vc8/iuplua3.vcproj deleted file mode 100755 index 2e5e78f..0000000 --- a/iup/mak.vc8/iuplua3.vcproj +++ /dev/null @@ -1,194 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="8,00" - Name="iuplua3" - ProjectGUID="{1EBC7A53-4677-4C3A-8DFF-49D301F17D85}" - TargetFrameworkVersion="0" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory="..\lib" - IntermediateDirectory="..\obj\Debug\$(ProjectName)" - ConfigurationType="4" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\src;..\include;..\..\lua\include;..\..\cd\include;..\srclua3" - PreprocessorDefinitions="WIN32,_DEBUG,IUPLUA_USELOH,_CRT_SECURE_NO_DEPRECATE" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - UsePrecompiledHeader="0" - BrowseInformation="0" - WarningLevel="4" - SuppressStartupBanner="true" - DebugInformationFormat="1" - CompileAs="0" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - Culture="1046" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - OutputFile="$(OutDir)/$(ProjectName).lib" - SuppressStartupBanner="true" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <Filter - Name="Source Files" - Filter="cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90" - > - <File - RelativePath="..\srclua3\il_cbox.c" - > - </File> - <File - RelativePath="..\srclua3\il_getcolor.c" - > - </File> - <File - RelativePath="..\srclua3\il_getparam.c" - > - </File> - <File - RelativePath="..\srclua3\il_sbox.c" - > - </File> - <File - RelativePath="..\srclua3\il_scanf.c" - > - </File> - <File - RelativePath="..\srclua3\il_spin.c" - > - </File> - <File - RelativePath="..\srclua3\il_tabs.c" - > - </File> - <File - RelativePath="..\srclua3\il_tree.c" - > - </File> - <File - RelativePath="..\srclua3\il_val.c" - > - </File> - <File - RelativePath="..\srclua3\iuplua.c" - > - </File> - <File - RelativePath="..\srclua3\iuplua_api.c" - > - </File> - <File - RelativePath="..\srclua3\iuplua_widgets.c" - > - </File> - </Filter> - <Filter - Name="Lua" - > - <File - RelativePath="..\srclua3\constants.lua" - > - </File> - <File - RelativePath="..\srclua3\iuplua.lua" - > - </File> - <File - RelativePath="..\srclua3\iuplua_widgets.lua" - > - </File> - <File - RelativePath="..\srclua3\sbox.lua" - > - </File> - <File - RelativePath="..\srclua3\spin.lua" - > - </File> - <File - RelativePath="..\srclua3\tabs.lua" - > - </File> - <File - RelativePath="..\srclua3\tree.lua" - > - </File> - <File - RelativePath="..\srclua3\val.lua" - > - </File> - </Filter> - <Filter - Name="Includes" - > - <File - RelativePath="..\srclua3\il.h" - > - </File> - <File - RelativePath="..\include\iuplua.h" - > - </File> - </Filter> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/iup/mak.vc8/iuplua5.vcproj b/iup/mak.vc8/iuplua5.vcproj deleted file mode 100755 index 1245e86..0000000 --- a/iup/mak.vc8/iuplua5.vcproj +++ /dev/null @@ -1,470 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="8,00" - Name="iuplua5" - ProjectGUID="{1EBC7A53-4677-4C3A-8D4A-49D301F17D85}" - TargetFrameworkVersion="0" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory="..\lib" - IntermediateDirectory="..\obj\Debug\$(ProjectName)" - ConfigurationType="4" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\src;..\include;..\srclua5;..\..\lua5.1\include" - PreprocessorDefinitions="WIN32,_DEBUG,IUPLUA_USELOH,_CRT_SECURE_NO_DEPRECATE" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - UsePrecompiledHeader="0" - BrowseInformation="0" - WarningLevel="4" - SuppressStartupBanner="true" - DebugInformationFormat="1" - CompileAs="0" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - Culture="1046" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - OutputFile="$(OutDir)/$(ProjectName)1.lib" - SuppressStartupBanner="true" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <Filter - Name="Source Files" - Filter="cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90" - > - <File - RelativePath="..\srclua5\iuplua.c" - > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - WarningLevel="4" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\srclua5\iuplua_api.c" - > - </File> - <Filter - Name="controls" - > - <File - RelativePath="..\srclua5\il_button.c" - > - </File> - <File - RelativePath="..\srclua5\il_canvas.c" - > - </File> - <File - RelativePath="..\srclua5\il_cbox.c" - > - </File> - <File - RelativePath="..\srclua5\il_clipboard.c" - > - </File> - <File - RelativePath="..\srclua5\il_colordlg.c" - > - </File> - <File - RelativePath="..\srclua5\il_dialog.c" - > - </File> - <File - RelativePath="..\srclua5\il_filedlg.c" - > - </File> - <File - RelativePath="..\srclua5\il_fill.c" - > - </File> - <File - RelativePath="..\srclua5\il_fontdlg.c" - > - </File> - <File - RelativePath="..\srclua5\il_frame.c" - > - </File> - <File - RelativePath="..\srclua5\il_getcolor.c" - > - </File> - <File - RelativePath="..\srclua5\il_getparam.c" - > - </File> - <File - RelativePath="..\srclua5\il_hbox.c" - > - </File> - <File - RelativePath="..\srclua5\il_image.c" - > - </File> - <File - RelativePath="..\srclua5\il_imagergb.c" - > - </File> - <File - RelativePath="..\srclua5\il_imagergba.c" - > - </File> - <File - RelativePath="..\srclua5\il_item.c" - > - </File> - <File - RelativePath="..\srclua5\il_label.c" - > - </File> - <File - RelativePath="..\srclua5\il_list.c" - > - </File> - <File - RelativePath="..\srclua5\il_menu.c" - > - </File> - <File - RelativePath="..\srclua5\il_messagedlg.c" - > - </File> - <File - RelativePath="..\srclua5\il_multiline.c" - > - </File> - <File - RelativePath="..\srclua5\il_normalizer.c" - > - </File> - <File - RelativePath="..\srclua5\il_progressbar.c" - > - </File> - <File - RelativePath="..\srclua5\il_radio.c" - > - </File> - <File - RelativePath="..\srclua5\il_sbox.c" - > - </File> - <File - RelativePath="..\srclua5\il_scanf.c" - > - </File> - <File - RelativePath="..\srclua5\il_separator.c" - > - </File> - <File - RelativePath="..\srclua5\il_spin.c" - > - </File> - <File - RelativePath="..\srclua5\il_spinbox.c" - > - </File> - <File - RelativePath="..\srclua5\il_submenu.c" - > - </File> - <File - RelativePath="..\srclua5\il_tabs.c" - > - </File> - <File - RelativePath="..\srclua5\il_text.c" - > - </File> - <File - RelativePath="..\srclua5\il_timer.c" - > - </File> - <File - RelativePath="..\srclua5\il_toggle.c" - > - </File> - <File - RelativePath="..\srclua5\il_tree.c" - > - </File> - <File - RelativePath="..\srclua5\il_tree_aux.c" - > - </File> - <File - RelativePath="..\srclua5\il_user.c" - > - </File> - <File - RelativePath="..\srclua5\il_val.c" - > - </File> - <File - RelativePath="..\srclua5\il_vbox.c" - > - </File> - <File - RelativePath="..\srclua5\il_zbox.c" - > - </File> - </Filter> - </Filter> - <Filter - Name="Lua" - > - <File - RelativePath="..\srclua5\constants.lua" - > - </File> - <File - RelativePath="..\srclua5\ctrl_template.lua" - > - </File> - <File - RelativePath="..\srclua5\generator.lua" - > - </File> - <File - RelativePath="..\srclua5\iuplua.lua" - > - </File> - <Filter - Name="controls" - > - <File - RelativePath="..\srclua5\button.lua" - > - </File> - <File - RelativePath="..\srclua5\canvas.lua" - > - </File> - <File - RelativePath="..\srclua5\cbox.lua" - > - </File> - <File - RelativePath="..\srclua5\clipboard.lua" - > - </File> - <File - RelativePath="..\srclua5\colordlg.lua" - > - </File> - <File - RelativePath="..\srclua5\dialog.lua" - > - </File> - <File - RelativePath="..\srclua5\filedlg.lua" - > - </File> - <File - RelativePath="..\srclua5\fill.lua" - > - </File> - <File - RelativePath="..\srclua5\fontdlg.lua" - > - </File> - <File - RelativePath="..\srclua5\frame.lua" - > - </File> - <File - RelativePath="..\srclua5\hbox.lua" - > - </File> - <File - RelativePath="..\srclua5\image.lua" - > - </File> - <File - RelativePath="..\srclua5\imagergb.lua" - > - </File> - <File - RelativePath="..\srclua5\imagergba.lua" - > - </File> - <File - RelativePath="..\srclua5\item.lua" - > - </File> - <File - RelativePath="..\srclua5\label.lua" - > - </File> - <File - RelativePath="..\srclua5\list.lua" - > - </File> - <File - RelativePath="..\srclua5\menu.lua" - > - </File> - <File - RelativePath="..\srclua5\messagedlg.lua" - > - </File> - <File - RelativePath="..\srclua5\multiline.lua" - > - </File> - <File - RelativePath="..\srclua5\normalizer.lua" - > - </File> - <File - RelativePath="..\srclua5\progressbar.lua" - > - </File> - <File - RelativePath="..\srclua5\radio.lua" - > - </File> - <File - RelativePath="..\srclua5\sbox.lua" - > - </File> - <File - RelativePath="..\srclua5\separator.lua" - > - </File> - <File - RelativePath="..\srclua5\spin.lua" - > - </File> - <File - RelativePath="..\srclua5\spinbox.lua" - > - </File> - <File - RelativePath="..\srclua5\submenu.lua" - > - </File> - <File - RelativePath="..\srclua5\tabs.lua" - > - </File> - <File - RelativePath="..\srclua5\text.lua" - > - </File> - <File - RelativePath="..\srclua5\timer.lua" - > - </File> - <File - RelativePath="..\srclua5\toggle.lua" - > - </File> - <File - RelativePath="..\srclua5\tree.lua" - > - </File> - <File - RelativePath="..\srclua5\user.lua" - > - </File> - <File - RelativePath="..\srclua5\val.lua" - > - </File> - <File - RelativePath="..\srclua5\vbox.lua" - > - </File> - <File - RelativePath="..\srclua5\zbox.lua" - > - </File> - </Filter> - </Filter> - <Filter - Name="Includes" - > - <File - RelativePath="..\srclua5\il.h" - > - </File> - <File - RelativePath="..\include\iuplua.h" - > - </File> - <File - RelativePath="..\srclua5\scanf.h" - > - </File> - </Filter> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/iup/mak.vc8/iuplua_pplot3.vcproj b/iup/mak.vc8/iuplua_pplot3.vcproj deleted file mode 100755 index 810f451..0000000 --- a/iup/mak.vc8/iuplua_pplot3.vcproj +++ /dev/null @@ -1,110 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="8,00" - Name="iuplua_pplot3" - ProjectGUID="{1EBC7A53-4677-1234-DDDD-49DFF4417D85}" - TargetFrameworkVersion="0" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory="..\lib" - IntermediateDirectory="..\obj\Debug\$(ProjectName)" - ConfigurationType="4" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\src;..\include;..\..\lua\include;..\..\cd\include;..\srclua3" - PreprocessorDefinitions="WIN32,_DEBUG,IUPLUA_USELOH,_CRT_SECURE_NO_DEPRECATE" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - UsePrecompiledHeader="0" - BrowseInformation="0" - WarningLevel="4" - SuppressStartupBanner="true" - DebugInformationFormat="1" - CompileAs="0" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - Culture="1046" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - OutputFile="$(OutDir)/$(ProjectName).lib" - SuppressStartupBanner="true" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <Filter - Name="Source Files" - Filter="cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90" - > - <File - RelativePath="..\srclua3\iuplua_pplot.c" - > - </File> - </Filter> - <Filter - Name="Lua" - > - <File - RelativePath="..\srclua3\pplot.lua" - > - </File> - </Filter> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/iup/mak.vc8/iuplua_pplot5.vcproj b/iup/mak.vc8/iuplua_pplot5.vcproj deleted file mode 100755 index 95b5d91..0000000 --- a/iup/mak.vc8/iuplua_pplot5.vcproj +++ /dev/null @@ -1,122 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="8,00" - Name="iuplua_pplot5" - ProjectGUID="{1EBC7A53-4677-AAAA-1234-49D301F17D85}" - TargetFrameworkVersion="0" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory="..\lib" - IntermediateDirectory="..\obj\Debug\$(ProjectName)" - ConfigurationType="4" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\src;..\include;..\srclua5;..\..\lua5.1\include;..\..\cd\include" - PreprocessorDefinitions="WIN32,_DEBUG,IUPLUA_USELOH,_CRT_SECURE_NO_DEPRECATE" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - UsePrecompiledHeader="0" - BrowseInformation="0" - WarningLevel="4" - SuppressStartupBanner="true" - DebugInformationFormat="1" - CompileAs="0" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - Culture="1046" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - OutputFile="$(OutDir)/$(ProjectName)1.lib" - SuppressStartupBanner="true" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <Filter - Name="Source Files" - Filter="cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90" - > - <File - RelativePath="..\srclua5\il_pplot.c" - > - </File> - <File - RelativePath="..\srclua5\iuplua_pplot.c" - > - </File> - </Filter> - <Filter - Name="Lua" - > - <File - RelativePath="..\srclua5\pplot.lua" - > - </File> - </Filter> - <Filter - Name="Includes" - > - <File - RelativePath="..\include\iuplua_pplot.h" - > - </File> - </Filter> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/iup/mak.vc8/iupluacd3.vcproj b/iup/mak.vc8/iupluacd3.vcproj deleted file mode 100755 index 0ef35f5..0000000 --- a/iup/mak.vc8/iupluacd3.vcproj +++ /dev/null @@ -1,99 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="8,00" - Name="iupluacd3" - ProjectGUID="{B4823266-DF8C-4EFB-91C0-C7E78C234EAC}" - TargetFrameworkVersion="0" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory="..\lib" - IntermediateDirectory="..\obj\Debug\$(ProjectName)" - ConfigurationType="4" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\include;..\..\lua\include;..\..\cd\include" - PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,CD_NO_OLD_INTERFACE,_CRT_SECURE_NO_DEPRECATE" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - PrecompiledHeaderFile="" - AssemblerListingLocation="" - ObjectFile="$(IntDir)\" - ProgramDataBaseFileName="$(IntDir)\vc90.pdb" - BrowseInformation="0" - WarningLevel="4" - SuppressStartupBanner="true" - DebugInformationFormat="1" - CompileAs="0" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - OutputFile="$(OutDir)/$(ProjectName).lib" - SuppressStartupBanner="true" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <File - RelativePath="..\srclua3\iuplua_cd.c" - > - </File> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/iup/mak.vc8/iupluacd5.vcproj b/iup/mak.vc8/iupluacd5.vcproj deleted file mode 100755 index 118f1a4..0000000 --- a/iup/mak.vc8/iupluacd5.vcproj +++ /dev/null @@ -1,99 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="8,00" - Name="iupluacd5" - ProjectGUID="{B4823266-DF8C-4EFB-91C0-C7688C234EAC}" - TargetFrameworkVersion="0" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory="..\lib" - IntermediateDirectory="..\obj\Debug\$(ProjectName)" - ConfigurationType="4" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\include;..\..\lua5.1\include;..\..\cd\include" - PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,CD_NO_OLD_INTERFACE,_CRT_SECURE_NO_DEPRECATE" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - PrecompiledHeaderFile="" - AssemblerListingLocation="" - ObjectFile="$(IntDir)\" - ProgramDataBaseFileName="$(IntDir)\vc90.pdb" - BrowseInformation="0" - WarningLevel="4" - SuppressStartupBanner="true" - DebugInformationFormat="1" - CompileAs="0" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - OutputFile="$(OutDir)/$(ProjectName)1.lib" - SuppressStartupBanner="true" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <File - RelativePath="..\srclua5\iuplua_cd.c" - > - </File> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/iup/mak.vc8/iupluacontrols3.vcproj b/iup/mak.vc8/iupluacontrols3.vcproj deleted file mode 100755 index d482502..0000000 --- a/iup/mak.vc8/iupluacontrols3.vcproj +++ /dev/null @@ -1,170 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="8,00" - Name="iupluacontrols3" - ProjectGUID="{1EBC7A53-4677-4C3A-8DFF-49DFF4417D85}" - TargetFrameworkVersion="0" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory="..\lib" - IntermediateDirectory="..\obj\Debug\$(ProjectName)" - ConfigurationType="4" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\src;..\include;..\..\lua\include;..\..\cd\include;..\srclua3" - PreprocessorDefinitions="WIN32,_DEBUG,IUPLUA_USELOH,_CRT_SECURE_NO_DEPRECATE" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - UsePrecompiledHeader="0" - BrowseInformation="0" - WarningLevel="4" - SuppressStartupBanner="true" - DebugInformationFormat="1" - CompileAs="0" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - Culture="1046" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - OutputFile="$(OutDir)/$(ProjectName).lib" - SuppressStartupBanner="true" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <Filter - Name="Source Files" - Filter="cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90" - > - <File - RelativePath="..\srclua3\il_cells.c" - > - </File> - <File - RelativePath="..\srclua3\il_colorbar.c" - > - </File> - <File - RelativePath="..\srclua3\il_colorbrowser.c" - > - </File> - <File - RelativePath="..\srclua3\il_dial.c" - > - </File> - <File - RelativePath="..\srclua3\il_gauge.c" - > - </File> - <File - RelativePath="..\srclua3\il_mask.c" - > - </File> - <File - RelativePath="..\srclua3\il_matrix.c" - > - </File> - <File - RelativePath="..\srclua3\iuplua_controls.c" - > - </File> - </Filter> - <Filter - Name="Lua" - > - <File - RelativePath="..\srclua3\cells.lua" - > - </File> - <File - RelativePath="..\srclua3\colorbar.lua" - > - </File> - <File - RelativePath="..\srclua3\colorbrowser.lua" - > - </File> - <File - RelativePath="..\srclua3\dial.lua" - > - </File> - <File - RelativePath="..\srclua3\gauge.lua" - > - </File> - <File - RelativePath="..\srclua3\matrix.lua" - > - </File> - </Filter> - <Filter - Name="Includes" - > - <File - RelativePath="..\srclua3\il_controls.h" - > - </File> - <File - RelativePath="..\include\iupluacontrols.h" - > - </File> - </Filter> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/iup/mak.vc8/iupluacontrols5.vcproj b/iup/mak.vc8/iupluacontrols5.vcproj deleted file mode 100755 index 2458549..0000000 --- a/iup/mak.vc8/iupluacontrols5.vcproj +++ /dev/null @@ -1,182 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="8,00" - Name="iupluacontrols5" - ProjectGUID="{1EBC7A53-4677-75D7-8D4A-49D301F17D85}" - TargetFrameworkVersion="0" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory="..\lib" - IntermediateDirectory="..\obj\Debug\$(ProjectName)" - ConfigurationType="4" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\src;..\include;..\srclua5;..\..\lua5.1\include;..\..\cd\include" - PreprocessorDefinitions="WIN32,_DEBUG,IUPLUA_USELOH,_CRT_SECURE_NO_DEPRECATE" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - UsePrecompiledHeader="0" - BrowseInformation="0" - WarningLevel="4" - SuppressStartupBanner="true" - DebugInformationFormat="1" - CompileAs="0" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - Culture="1046" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - OutputFile="$(OutDir)/$(ProjectName)1.lib" - SuppressStartupBanner="true" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <Filter - Name="Source Files" - Filter="cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90" - > - <File - RelativePath="..\srclua5\il_cells.c" - > - </File> - <File - RelativePath="..\srclua5\il_colorbar.c" - > - </File> - <File - RelativePath="..\srclua5\il_colorbrowser.c" - > - </File> - <File - RelativePath="..\srclua5\il_dial.c" - > - </File> - <File - RelativePath="..\srclua5\il_gauge.c" - > - </File> - <File - RelativePath="..\srclua5\il_mask.c" - > - </File> - <File - RelativePath="..\srclua5\il_matrix.c" - > - </File> - <File - RelativePath="..\srclua5\il_matrix_aux.c" - > - </File> - <File - RelativePath="..\srclua5\iuplua_controls.c" - > - </File> - </Filter> - <Filter - Name="Lua" - > - <File - RelativePath="..\srclua5\cells.lua" - > - </File> - <File - RelativePath="..\srclua5\colorbar.lua" - > - </File> - <File - RelativePath="..\srclua5\colorbrowser.lua" - > - </File> - <File - RelativePath="..\srclua5\dial.lua" - > - </File> - <File - RelativePath="..\srclua5\gauge.lua" - > - </File> - <File - RelativePath="..\srclua5\matrix.lua" - > - </File> - </Filter> - <Filter - Name="Includes" - > - <File - RelativePath="..\srclua5\il_controls.h" - > - </File> - <File - RelativePath="..\include\iupluacontrols.h" - > - </File> - <File - RelativePath="..\srclua5\luagetparam.h" - > - </File> - <File - RelativePath="..\srclua5\luamask.h" - > - </File> - </Filter> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/iup/mak.vc8/iupluaexe3.vcproj b/iup/mak.vc8/iupluaexe3.vcproj deleted file mode 100755 index d63e803..0000000 --- a/iup/mak.vc8/iupluaexe3.vcproj +++ /dev/null @@ -1,120 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="8,00" - Name="iuplua3_exe" - ProjectGUID="{A60D658D-766C-40DB-BAFF-59AB884D86FB}" - TargetFrameworkVersion="0" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory="..\bin" - IntermediateDirectory="..\obj\Debug\$(ProjectName)" - ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\include;..\src;..\..\lua\include;..\..\cd\include;..\..\im\include" - PreprocessorDefinitions="WIN32,_DEBUG,_CRT_SECURE_NO_DEPRECATE" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - UsePrecompiledHeader="0" - BrowseInformation="0" - WarningLevel="4" - SuppressStartupBanner="true" - DebugInformationFormat="1" - CompileAs="0" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" - Culture="1046" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - AdditionalOptions="/MACHINE:I386" - AdditionalDependencies="iup.lib comctl32.lib iupcontrols.lib iup_pplot.lib iuplua_pplot3.lib iupgl.lib cd.lib freetype6.lib iupcd.lib iupluagl3.lib iupim.lib iupluaim3.lib iupluacontrols3.lib lua.lib lualib.lib iuplua3.lib opengl32.lib glu32.lib im.lib cdlua3.lib iupluacd3.lib imlua3.lib" - OutputFile="$(OutDir)/iuplua3.exe" - LinkIncremental="1" - SuppressStartupBanner="true" - AdditionalLibraryDirectories="..\..\im\lib;..\..\cd\lib;..\lib;..\..\lua\lib\vc9" - GenerateManifest="false" - GenerateDebugInformation="true" - SubSystem="1" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <File - RelativePath="..\srcconsole\console3.lua" - > - </File> - <File - RelativePath="..\srcconsole\iup_lua3.c" - > - </File> - <File - RelativePath="..\srcconsole\iuplua3.rc" - > - </File> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/iup/mak.vc8/iupluaexe5.vcproj b/iup/mak.vc8/iupluaexe5.vcproj deleted file mode 100755 index 854191e..0000000 --- a/iup/mak.vc8/iupluaexe5.vcproj +++ /dev/null @@ -1,121 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="8,00" - Name="iuplua5_exe" - ProjectGUID="{A60D658D-766C-40DB-BAE4-59AB884D86FB}" - TargetFrameworkVersion="0" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory="..\bin" - IntermediateDirectory="..\obj\Debug\$(ProjectName)" - ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - TypeLibraryName="..\bin\iupluaexe5.tlb" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\include;..\srclua5;..\..\lua5.1\include;..\..\cd\include;..\..\im\include;..\..\luagl\include" - PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;IUPLUA_IMGLIB;USE_STATIC" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - UsePrecompiledHeader="0" - BrowseInformation="0" - WarningLevel="4" - SuppressStartupBanner="true" - DebugInformationFormat="1" - CompileAs="0" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" - Culture="1046" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - AdditionalOptions="/MACHINE:I386" - AdditionalDependencies="iup.lib comctl32.lib iupcontrols.lib iupimglib.lib iup_pplot.lib iupgl.lib cd.lib iupcd.lib freetype6.lib cdcontextplus.lib lua5.1.lib iuplua51.lib iupluaim51.lib iupluaimglib51.lib iupluagl51.lib iupluacontrols51.lib iuplua_pplot51.lib iupim.lib opengl32.lib glu32.lib gdiplus.lib im.lib cdlua51.lib iupluacd51.lib imlua51.lib imlua_process51.lib cdluaim51.lib im_process.lib" - OutputFile="$(OutDir)/iuplua51.exe" - LinkIncremental="1" - SuppressStartupBanner="true" - AdditionalLibraryDirectories="..\..\im\lib;..\..\cd\lib;..\lib;..\..\lua5.1\lib\vc9;..\..\luagl\lib\static" - GenerateManifest="false" - GenerateDebugInformation="true" - SubSystem="1" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <File - RelativePath="..\srcconsole\console5.lua" - > - </File> - <File - RelativePath="..\srcconsole\iup_lua51.c" - > - </File> - <File - RelativePath="..\srcconsole\iuplua5.rc" - > - </File> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/iup/mak.vc8/iupluaexe5gtk.vcproj b/iup/mak.vc8/iupluaexe5gtk.vcproj deleted file mode 100755 index 4d729fa..0000000 --- a/iup/mak.vc8/iupluaexe5gtk.vcproj +++ /dev/null @@ -1,117 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="8,00" - Name="iuplua5gtk_exe" - ProjectGUID="{389DF3C9-A628-4F6D-8C52-8924FA01DE66}" - TargetFrameworkVersion="0" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory="..\bin" - IntermediateDirectory="..\obj\Debug\$(ProjectName)" - ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - TypeLibraryName="..\bin\iupluaexe5.tlb" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\include;..\srclua5;..\..\lua5.1\include;..\..\cd\include;..\..\im\include" - PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;IUPLUA_IMGLIB;USE_STATIC" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - UsePrecompiledHeader="0" - BrowseInformation="0" - WarningLevel="4" - SuppressStartupBanner="true" - DebugInformationFormat="1" - CompileAs="0" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" - Culture="1046" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - AdditionalOptions="/MACHINE:I386" - AdditionalDependencies="iupgtk.lib comctl32.lib gtk-win32-2.0.lib gdk-win32-2.0.lib gdk_pixbuf-2.0.lib pango-1.0.lib pangowin32-1.0.lib gobject-2.0.lib gmodule-2.0.lib glib-2.0.lib iupcontrols.lib iupimglib.lib iup_pplot.lib iupgl.lib cd.lib iupcd.lib freetype6.lib cdcontextplus.lib lua5.1.lib iuplua51.lib iupluaim51.lib iupluaimglib51.lib iupluagl51.lib iupluacontrols51.lib iuplua_pplot51.lib iupim.lib opengl32.lib glu32.lib gdiplus.lib im.lib cdlua51.lib iupluacd51.lib imlua51.lib imlua_process51.lib cdluaim51.lib im_process.lib" - OutputFile="$(OutDir)/iuplua51gtk.exe" - LinkIncremental="1" - SuppressStartupBanner="true" - AdditionalLibraryDirectories="..\..\im\lib;d:\lng\gtk\lib;..\..\cd\lib;..\lib;..\..\lua5.1\lib\vc9" - GenerateManifest="false" - GenerateDebugInformation="true" - SubSystem="1" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <File - RelativePath="..\srcconsole\console5.lua" - > - </File> - <File - RelativePath="..\srcconsole\iup_lua51.c" - > - </File> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/iup/mak.vc8/iupluagl3.vcproj b/iup/mak.vc8/iupluagl3.vcproj deleted file mode 100755 index ccf7465..0000000 --- a/iup/mak.vc8/iupluagl3.vcproj +++ /dev/null @@ -1,101 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="8,00" - Name="iupluagl3" - ProjectGUID="{1EBC7A53-33FF-4C3A-8DFF-49D301F17D85}" - TargetFrameworkVersion="0" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory="..\lib" - IntermediateDirectory="..\obj\Debug\$(ProjectName)" - ConfigurationType="4" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\src;..\include;..\..\lua\include;..\..\cd\include;..\srclua3" - PreprocessorDefinitions="WIN32,_DEBUG,_CRT_SECURE_NO_DEPRECATE" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - UsePrecompiledHeader="0" - BrowseInformation="0" - WarningLevel="4" - SuppressStartupBanner="true" - DebugInformationFormat="1" - CompileAs="0" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - Culture="1046" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - OutputFile="$(OutDir)/$(ProjectName).lib" - SuppressStartupBanner="true" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <File - RelativePath="..\srclua3\iuplua_glcanvas.c" - > - </File> - <File - RelativePath="..\include\iupluagl.h" - > - </File> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/iup/mak.vc8/iupluagl5.vcproj b/iup/mak.vc8/iupluagl5.vcproj deleted file mode 100755 index 12822d6..0000000 --- a/iup/mak.vc8/iupluagl5.vcproj +++ /dev/null @@ -1,118 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="8,00" - Name="iupluagl5" - ProjectGUID="{1EBC7A53-4677-4C3A-8D4A-49D301157985}" - TargetFrameworkVersion="0" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory="..\lib" - IntermediateDirectory="..\obj\Debug\$(ProjectName)" - ConfigurationType="4" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\src;..\include;..\srclua5;..\..\lua5.1\include" - PreprocessorDefinitions="WIN32,_DEBUG,IUPLUA_USELOH,_CRT_SECURE_NO_DEPRECATE" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - UsePrecompiledHeader="0" - BrowseInformation="0" - WarningLevel="4" - SuppressStartupBanner="true" - DebugInformationFormat="1" - CompileAs="0" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - Culture="1046" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - OutputFile="$(OutDir)/$(ProjectName)1.lib" - SuppressStartupBanner="true" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <Filter - Name="Source Files" - Filter="cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90" - > - <File - RelativePath="..\srclua5\il_glcanvas.c" - > - </File> - <File - RelativePath="..\srclua5\iuplua_glcanvas.c" - > - </File> - <File - RelativePath="..\include\iupluagl.h" - > - </File> - </Filter> - <Filter - Name="Lua" - > - <File - RelativePath="..\srclua5\glcanvas.lua" - > - </File> - </Filter> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/iup/mak.vc8/iupluaim3.vcproj b/iup/mak.vc8/iupluaim3.vcproj deleted file mode 100755 index f928818..0000000 --- a/iup/mak.vc8/iupluaim3.vcproj +++ /dev/null @@ -1,101 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="8,00" - Name="iupluaim3" - ProjectGUID="{1EBC7A53-4677-4C3A-8DFF-269001F17D85}" - TargetFrameworkVersion="0" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory="..\lib" - IntermediateDirectory="..\obj\Debug\$(ProjectName)" - ConfigurationType="4" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\src;..\include;..\..\lua\include;..\..\cd\include;..\srclua3" - PreprocessorDefinitions="WIN32,_DEBUG,_CRT_SECURE_NO_DEPRECATE" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - UsePrecompiledHeader="0" - BrowseInformation="0" - WarningLevel="4" - SuppressStartupBanner="true" - DebugInformationFormat="1" - CompileAs="0" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - Culture="1046" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - OutputFile="$(OutDir)/$(ProjectName).lib" - SuppressStartupBanner="true" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <File - RelativePath="..\srclua3\iuplua_im.c" - > - </File> - <File - RelativePath="..\include\iupluaim.h" - > - </File> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/iup/mak.vc8/iupluaim5.vcproj b/iup/mak.vc8/iupluaim5.vcproj deleted file mode 100755 index e596071..0000000 --- a/iup/mak.vc8/iupluaim5.vcproj +++ /dev/null @@ -1,101 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="8,00" - Name="iupluaim5" - ProjectGUID="{1EBC7A53-4677-ADF1-8D4A-49D301F17D85}" - TargetFrameworkVersion="0" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory="..\lib" - IntermediateDirectory="..\obj\Debug\$(ProjectName)" - ConfigurationType="4" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\src;..\include;..\srclua5;..\..\lua5.1\include" - PreprocessorDefinitions="WIN32,_DEBUG,IUPLUA_USELOH,_CRT_SECURE_NO_DEPRECATE" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - UsePrecompiledHeader="0" - BrowseInformation="0" - WarningLevel="4" - SuppressStartupBanner="true" - DebugInformationFormat="1" - CompileAs="0" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - Culture="1046" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - OutputFile="$(OutDir)/$(ProjectName)1.lib" - SuppressStartupBanner="true" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <File - RelativePath="..\srclua5\iuplua_im.c" - > - </File> - <File - RelativePath="..\include\iupluaim.h" - > - </File> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/iup/mak.vc8/iupluaimglib5.vcproj b/iup/mak.vc8/iupluaimglib5.vcproj deleted file mode 100755 index 1a09336..0000000 --- a/iup/mak.vc8/iupluaimglib5.vcproj +++ /dev/null @@ -1,97 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="8,00" - Name="iupluaimglib5" - ProjectGUID="{1EBC7A53-4677-FFFF-1234-49D301F17D85}" - TargetFrameworkVersion="0" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory="..\lib" - IntermediateDirectory="..\obj\Debug\$(ProjectName)" - ConfigurationType="4" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\src;..\include;..\srclua5;..\..\lua5.1\include" - PreprocessorDefinitions="WIN32,_DEBUG,IUPLUA_USELOH,_CRT_SECURE_NO_DEPRECATE" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - UsePrecompiledHeader="0" - BrowseInformation="0" - WarningLevel="4" - SuppressStartupBanner="true" - DebugInformationFormat="1" - CompileAs="0" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - Culture="1046" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - OutputFile="$(OutDir)/$(ProjectName)1.lib" - SuppressStartupBanner="true" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <File - RelativePath="..\srclua5\iuplua_imglib.c" - > - </File> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/iup/mak.vc8/iupluaole3.vcproj b/iup/mak.vc8/iupluaole3.vcproj deleted file mode 100755 index f37e980..0000000 --- a/iup/mak.vc8/iupluaole3.vcproj +++ /dev/null @@ -1,101 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="8,00" - Name="iupluaole3" - ProjectGUID="{1EBC7A53-33FF-7890-7890-49D301F17D85}" - TargetFrameworkVersion="0" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory="..\lib" - IntermediateDirectory="..\obj\Debug\$(ProjectName)" - ConfigurationType="4" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\src;..\include;..\..\lua\include;..\..\cd\include;..\srclua3" - PreprocessorDefinitions="WIN32,_DEBUG,_CRT_SECURE_NO_DEPRECATE" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - UsePrecompiledHeader="0" - BrowseInformation="0" - WarningLevel="4" - SuppressStartupBanner="true" - DebugInformationFormat="1" - CompileAs="0" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - Culture="1046" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - OutputFile="$(OutDir)/$(ProjectName).lib" - SuppressStartupBanner="true" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <File - RelativePath="..\srclua3\iuplua_olecontrol.c" - > - </File> - <File - RelativePath="..\include\iupluaole.h" - > - </File> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/iup/mak.vc8/iupluaole5.vcproj b/iup/mak.vc8/iupluaole5.vcproj deleted file mode 100755 index c8abb2f..0000000 --- a/iup/mak.vc8/iupluaole5.vcproj +++ /dev/null @@ -1,114 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="8,00" - Name="iupluaole5" - ProjectGUID="{1EBC7A53-4677-5555-2222-49D301157985}" - TargetFrameworkVersion="0" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory="..\lib" - IntermediateDirectory="..\obj\Debug\$(ProjectName)" - ConfigurationType="4" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\src;..\include;..\srclua5;..\..\lua5.1\include" - PreprocessorDefinitions="WIN32,_DEBUG,IUPLUA_USELOH,_CRT_SECURE_NO_DEPRECATE" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - UsePrecompiledHeader="0" - BrowseInformation="0" - WarningLevel="4" - SuppressStartupBanner="true" - DebugInformationFormat="1" - CompileAs="0" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - Culture="1046" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - OutputFile="$(OutDir)/$(ProjectName)1.lib" - SuppressStartupBanner="true" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <Filter - Name="Source Files" - Filter="cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90" - > - <File - RelativePath="..\srclua5\il_olecontrol.c" - > - </File> - <File - RelativePath="..\include\iupluaole.h" - > - </File> - </Filter> - <Filter - Name="Lua" - > - <File - RelativePath="..\srclua5\olecontrol.lua" - > - </File> - </Filter> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/iup/mak.vc8/iupmot.vcproj b/iup/mak.vc8/iupmot.vcproj deleted file mode 100755 index d2d1780..0000000 --- a/iup/mak.vc8/iupmot.vcproj +++ /dev/null @@ -1,239 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="8,00" - Name="iupmot" - ProjectGUID="{2C7E83B9-1234-432A-97BA-FCF4D0728408}" - Keyword="Win32Proj" - TargetFrameworkVersion="131072" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory="..\lib" - IntermediateDirectory="..\obj\Debug\$(ProjectName)" - ConfigurationType="4" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\src;..\src\mot;..\include;d:\lng\x11inc;D:\_goodies\iup\_libs\openmotif2.1.30\lib" - PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_WIN32_WINNT=0x0500;_WIN32_IE=0x0500;IUP_ASSERT;_CRT_SECURE_NO_DEPRECATE" - MinimalRebuild="false" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - UsePrecompiledHeader="0" - BrowseInformation="0" - WarningLevel="4" - Detect64BitPortabilityProblems="false" - DebugInformationFormat="1" - CompileAs="0" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <Filter - Name="unix" - > - <File - RelativePath="..\src\mot\iupunix_help.c" - > - </File> - <File - RelativePath="..\src\mot\iupunix_info.c" - > - </File> - </Filter> - <Filter - Name="src" - > - <File - RelativePath="..\src\mot\iupmot_color.c" - > - </File> - <File - RelativePath="..\src\mot\iupmot_common.c" - > - </File> - <File - RelativePath="..\src\mot\iupmot_focus.c" - > - </File> - <File - RelativePath="..\src\mot\iupmot_font.c" - > - </File> - <File - RelativePath="..\src\mot\iupmot_globalattrib.c" - > - </File> - <File - RelativePath="..\src\mot\iupmot_key.c" - > - </File> - <File - RelativePath="..\src\mot\iupmot_loop.c" - > - </File> - <File - RelativePath="..\src\mot\iupmot_open.c" - > - </File> - <File - RelativePath="..\src\mot\iupmot_tips.c" - > - </File> - </Filter> - <Filter - Name="inc" - > - <File - RelativePath="..\src\mot\iupmot_color.h" - > - </File> - <File - RelativePath="..\src\mot\iupmot_drv.h" - > - </File> - </Filter> - <Filter - Name="src_controls" - > - <File - RelativePath="..\src\mot\iupmot_button.c" - > - </File> - <File - RelativePath="..\src\mot\iupmot_canvas.c" - > - </File> - <File - RelativePath="..\src\mot\iupmot_clipboard.c" - > - </File> - <File - RelativePath="..\src\mot\iupmot_colordlg.c" - > - </File> - <File - RelativePath="..\src\mot\iupmot_dialog.c" - > - </File> - <File - RelativePath="..\src\mot\iupmot_filedlg.c" - > - </File> - <File - RelativePath="..\src\mot\iupmot_fontdlg.c" - > - </File> - <File - RelativePath="..\src\mot\iupmot_frame.c" - > - </File> - <File - RelativePath="..\src\mot\iupmot_image.c" - > - </File> - <File - RelativePath="..\src\mot\iupmot_label.c" - > - </File> - <File - RelativePath="..\src\mot\iupmot_list.c" - > - </File> - <File - RelativePath="..\src\mot\iupmot_menu.c" - > - </File> - <File - RelativePath="..\src\mot\iupmot_messagedlg.c" - > - </File> - <File - RelativePath="..\src\mot\iupmot_progressbar.c" - > - </File> - <File - RelativePath="..\src\mot\iupmot_tabs.c" - > - </File> - <File - RelativePath="..\src\mot\iupmot_text.c" - > - </File> - <File - RelativePath="..\src\mot\iupmot_timer.c" - > - </File> - <File - RelativePath="..\src\mot\iupmot_toggle.c" - > - </File> - <File - RelativePath="..\src\mot\iupmot_tree.c" - > - </File> - <File - RelativePath="..\src\mot\iupmot_val.c" - > - </File> - </Filter> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/iup/mak.vc8/iupole.vcproj b/iup/mak.vc8/iupole.vcproj deleted file mode 100755 index f6afc87..0000000 --- a/iup/mak.vc8/iupole.vcproj +++ /dev/null @@ -1,182 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="8,00" - Name="iupole" - ProjectGUID="{0C80BBEE-1B00-4567-1234-067292C84EDB}" - Keyword="Win32Proj" - TargetFrameworkVersion="131072" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory="..\lib" - IntermediateDirectory="..\obj\Debug\$(ProjectName)" - ConfigurationType="4" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\src;..\include" - PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE" - MinimalRebuild="false" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - UsePrecompiledHeader="0" - BrowseInformation="0" - WarningLevel="4" - Detect64BitPortabilityProblems="false" - DebugInformationFormat="1" - CompileAs="0" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - OutputFile="$(OutDir)/$(ProjectName).lib" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <Filter - Name="inc" - Filter="h;hpp;hxx;hm;inl;inc" - > - <File - RelativePath="..\srcole\tAmbientProperties.h" - > - </File> - <File - RelativePath="..\srcole\tDispatch.h" - > - </File> - <File - RelativePath="..\srcole\tLegacy.h" - > - </File> - <File - RelativePath="..\srcole\tOleClientSite.h" - > - </File> - <File - RelativePath="..\srcole\tOleControlSite.h" - > - </File> - <File - RelativePath="..\srcole\tOleHandler.h" - > - </File> - <File - RelativePath="..\srcole\tOleInPlaceFrame.h" - > - </File> - <File - RelativePath="..\srcole\tOleInPlaceSite.h" - > - </File> - </Filter> - <Filter - Name="src" - Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" - > - <File - RelativePath="..\srcole\iup_olecontrol.cpp" - > - </File> - <File - RelativePath="..\srcole\tAmbientProperties.cpp" - > - </File> - <File - RelativePath="..\srcole\tDispatch.cpp" - > - </File> - <File - RelativePath="..\srcole\tLegacy.cpp" - > - </File> - <File - RelativePath="..\srcole\tOleClientSite.cpp" - > - </File> - <File - RelativePath="..\srcole\tOleControlSite.cpp" - > - </File> - <File - RelativePath="..\srcole\tOleHandler.cpp" - > - </File> - <File - RelativePath="..\srcole\tOleInPlaceFrame.cpp" - > - </File> - <File - RelativePath="..\srcole\tOleInPlaceSite.cpp" - > - </File> - </Filter> - <Filter - Name="include" - > - <File - RelativePath="..\include\iupole.h" - > - </File> - </Filter> - <File - RelativePath="..\srcole\iupole.def" - > - </File> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/iup/mak.vc8/iupsample.vcproj b/iup/mak.vc8/iupsample.vcproj deleted file mode 100755 index dde33fd..0000000 --- a/iup/mak.vc8/iupsample.vcproj +++ /dev/null @@ -1,1179 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="8,00" - Name="iupsample" - ProjectGUID="{9462FDEA-3E53-4250-8710-DD50AF48607C}" - TargetFrameworkVersion="131072" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory="..\bin" - IntermediateDirectory="..\obj\Debug\$(ProjectName)" - ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - TypeLibraryName="..\bin\$(ProjectName).tlb" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\include;..\..\cd\include" - PreprocessorDefinitions="WIN32;_DEBUG;_WIN32_WINNT=0x0500;_WIN32_IE=0x0500;_CRT_SECURE_NO_DEPRECATE;__IUPDEF_H" - ExceptionHandling="0" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - UsePrecompiledHeader="0" - BrowseInformation="0" - WarningLevel="4" - SuppressStartupBanner="true" - DebugInformationFormat="1" - CompileAs="0" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" - Culture="1046" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="comctl32.lib ole32.lib opengl32.lib glu32.lib iup.lib iupgl.lib iupcontrols.lib iupimglib.lib cd.lib freetype6.lib iupcd.lib iup_pplot.lib" - LinkIncremental="1" - SuppressStartupBanner="true" - AdditionalLibraryDirectories="..\lib;..\..\cd\lib;d:\lng\SpeechSDK\Lib\i386" - GenerateManifest="false" - GenerateDebugInformation="true" - ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb" - SubSystem="1" - RandomizedBaseAddress="1" - DataExecutionPrevention="0" - TargetMachine="1" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <Filter - Name="C" - > - <File - RelativePath="..\html\examples\C\alarm.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\button.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\canvas1.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\canvas2.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\canvas3.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\cbox.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\cells_checkboard.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\cells_degrade.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\..\iup\html\examples\C\cells_numbering.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\colorbar.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\colorbrowser.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\dialog1.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\dialog2.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\filedlg.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\fill.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\frame.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\gauge.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\getattribute.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\getcolor.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\getfile.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\getparam.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\glcanvas.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\hbox.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\idle.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\image.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\item.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\label.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\list1.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\list2.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\listdialog.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\lua_init.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\mask.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\matrix.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\mdi.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\menu.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\message.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\multiline1.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\multiline2.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\ole_browser.cpp" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\pplot.cpp" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\progressbar.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\radio.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\sample.c" - > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\sbox1.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\sbox2.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\scanf.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\scrollbar.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\separator.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\submenu.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\tabs.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\text.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\timer.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\toggle.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\tree.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\val.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\vbox.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\zbox.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - </Filter> - <Filter - Name="Lua" - > - <File - RelativePath="..\html\examples\Lua\alarm.wlua" - > - </File> - <File - RelativePath="..\html\examples\Lua\button.wlua" - > - </File> - <File - RelativePath="..\html\examples\Lua\canvas.wlua" - > - </File> - <File - RelativePath="..\html\examples\Lua\colorbrowser.wlua" - > - </File> - <File - RelativePath="..\html\examples\Lua\console.wlua" - > - </File> - <File - RelativePath="..\html\examples\Lua\dial.wlua" - > - </File> - <File - RelativePath="..\html\examples\Lua\dialog.wlua" - > - </File> - <File - RelativePath="..\html\examples\Lua\filedlg.wlua" - > - </File> - <File - RelativePath="..\html\examples\Lua\fill.wlua" - > - </File> - <File - RelativePath="..\html\examples\Lua\fonts.wlua" - > - </File> - <File - RelativePath="..\html\examples\Lua\frame.wlua" - > - </File> - <File - RelativePath="..\html\examples\Lua\gauge.wlua" - > - </File> - <File - RelativePath="..\html\examples\Lua\getcolor.wlua" - > - </File> - <File - RelativePath="..\html\examples\Lua\getfile.wlua" - > - </File> - <File - RelativePath="..\html\examples\Lua\getparam.wlua" - > - </File> - <File - RelativePath="..\html\examples\Lua\glcanvas.wlua" - > - </File> - <File - RelativePath="..\html\examples\Lua\hbox.wlua" - > - </File> - <File - RelativePath="..\html\examples\Lua\idle.wlua" - > - </File> - <File - RelativePath="..\html\examples\Lua\image.wlua" - > - </File> - <File - RelativePath="..\html\examples\Lua\imagelib.wlua" - > - </File> - <File - RelativePath="..\html\examples\Lua\item.wlua" - > - </File> - <File - RelativePath="..\html\examples\Lua\label.wlua" - > - </File> - <File - RelativePath="..\html\examples\Lua\list.wlua" - > - </File> - <File - RelativePath="..\html\examples\Lua\listdialog.wlua" - > - </File> - <File - RelativePath="..\html\examples\Lua\luagl.wlua" - > - </File> - <File - RelativePath="..\html\examples\Lua\mask.wlua" - > - </File> - <File - RelativePath="..\html\examples\Lua\mask_matrix.wlua" - > - </File> - <File - RelativePath="..\html\examples\Lua\matrix.wlua" - > - </File> - <File - RelativePath="..\html\examples\Lua\matrix_cbmode.wlua" - > - </File> - <File - RelativePath="..\html\examples\Lua\menu.wlua" - > - </File> - <File - RelativePath="..\html\examples\Lua\message.wlua" - > - </File> - <File - RelativePath="..\html\examples\Lua\multiline.wlua" - > - </File> - <File - RelativePath="..\html\examples\Lua\radio.wlua" - > - </File> - <File - RelativePath="..\html\examples\Lua\sample.wlua" - > - </File> - <File - RelativePath="..\html\examples\Lua\sbox.wlua" - > - </File> - <File - RelativePath="..\html\examples\Lua\scanf.wlua" - > - </File> - <File - RelativePath="..\html\examples\Lua\separator.wlua" - > - </File> - <File - RelativePath="..\html\examples\Lua\submenu.wlua" - > - </File> - <File - RelativePath="..\html\examples\Lua\tabs.wlua" - > - </File> - <File - RelativePath="..\html\examples\Lua\text.wlua" - > - </File> - <File - RelativePath="..\html\examples\Lua\timer.wlua" - > - </File> - <File - RelativePath="..\html\examples\Lua\toggle.wlua" - > - </File> - <File - RelativePath="..\html\examples\Lua\tray.wlua" - > - </File> - <File - RelativePath="..\html\examples\Lua\tree1.wlua" - > - </File> - <File - RelativePath="..\html\examples\Lua\tree2.wlua" - > - </File> - <File - RelativePath="..\html\examples\Lua\tree3.wlua" - > - </File> - <File - RelativePath="..\html\examples\Lua\val.wlua" - > - </File> - <File - RelativePath="..\html\examples\Lua\vbox.wlua" - > - </File> - <File - RelativePath="..\html\examples\Lua\zbox.wlua" - > - </File> - </Filter> - <Filter - Name="LED" - > - <File - RelativePath="..\html\examples\LED\button.led" - > - </File> - <File - RelativePath="..\html\examples\LED\canvas.led" - > - </File> - <File - RelativePath="..\html\examples\LED\colorbrowser.led" - > - </File> - <File - RelativePath="..\html\examples\LED\dial.led" - > - </File> - <File - RelativePath="..\html\examples\LED\dialog.led" - > - </File> - <File - RelativePath="..\html\examples\LED\filedlg.led" - > - </File> - <File - RelativePath="..\html\examples\LED\fill.led" - > - </File> - <File - RelativePath="..\html\examples\LED\frame.led" - > - </File> - <File - RelativePath="..\html\examples\LED\gauge.led" - > - </File> - <File - RelativePath="..\html\examples\LED\hbox.led" - > - </File> - <File - RelativePath="..\html\examples\LED\image.led" - > - </File> - <File - RelativePath="..\html\examples\LED\label.led" - > - </File> - <File - RelativePath="..\html\examples\LED\list.led" - > - </File> - <File - RelativePath="..\html\examples\LED\matrix.led" - > - </File> - <File - RelativePath="..\html\examples\LED\menu.led" - > - </File> - <File - RelativePath="..\html\examples\LED\radio.led" - > - </File> - <File - RelativePath="..\html\examples\LED\sample.led" - > - </File> - <File - RelativePath="..\html\examples\LED\submenu.led" - > - </File> - <File - RelativePath="..\html\examples\LED\tabs.led" - > - </File> - <File - RelativePath="..\html\examples\LED\text.led" - > - </File> - <File - RelativePath="..\html\examples\LED\toggle.led" - > - </File> - <File - RelativePath="..\html\examples\LED\val.led" - > - </File> - <File - RelativePath="..\html\examples\LED\vbox.led" - > - </File> - <File - RelativePath="..\html\examples\LED\zbox.led" - > - </File> - <Filter - Name="src" - > - <File - RelativePath="..\html\examples\LED\dial.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\LED\filedlg.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\LED\gauge.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\LED\matrix.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\LED\tabs.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\LED\toggle.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - </Filter> - </Filter> - <File - RelativePath="..\test\iuptest.rc" - > - </File> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/iup/mak.vc8/iupsamplegtk.vcproj b/iup/mak.vc8/iupsamplegtk.vcproj deleted file mode 100755 index 290a86e..0000000 --- a/iup/mak.vc8/iupsamplegtk.vcproj +++ /dev/null @@ -1,798 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="8,00" - Name="iupsamplegtk" - ProjectGUID="{C684B76D-52EC-49CE-84F2-B031509419A5}" - TargetFrameworkVersion="131072" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory="..\bin" - IntermediateDirectory="..\obj\Debug\$(ProjectName)" - ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - TypeLibraryName="..\bin\$(ProjectName).tlb" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\include;"d:\lng\gtk\include\atk-1.0";d:\lng\gtk\include\cairo;"d:\lng\gtk\include\glib-2.0";"d:\lng\gtk\include\gtk-2.0";"d:\lng\gtk\include\pango-1.0";"d:\lng\gtk\lib\gtk-2.0\include";"d:\lng\gtk\lib\glib-2.0\include";..\..\cd\include" - PreprocessorDefinitions="WIN32;_DEBUG;_WIN32_WINNT=0x0400;_CRT_SECURE_NO_DEPRECATE;USE_GTK" - ExceptionHandling="0" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - UsePrecompiledHeader="0" - BrowseInformation="0" - WarningLevel="4" - SuppressStartupBanner="true" - DebugInformationFormat="1" - CompileAs="0" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" - Culture="1046" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - AdditionalOptions="/MACHINE:I386" - AdditionalDependencies="comctl32.lib ole32.lib opengl32.lib glu32.lib gtk-win32-2.0.lib gdk-win32-2.0.lib gdk_pixbuf-2.0.lib pango-1.0.lib pangowin32-1.0.lib gobject-2.0.lib gmodule-2.0.lib glib-2.0.lib iupgtk.lib iupgl.lib iupcontrols.lib iupimglib.lib iup_pplot.lib cd.lib freetype6.lib iupcd.lib" - LinkIncremental="1" - SuppressStartupBanner="true" - AdditionalLibraryDirectories="..\lib;d:\lng\gtk\lib;..\..\cd\lib" - GenerateDebugInformation="true" - ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb" - SubSystem="1" - RandomizedBaseAddress="1" - DataExecutionPrevention="0" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <Filter - Name="C" - > - <File - RelativePath="..\html\examples\C\alarm.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\button.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\canvas1.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\canvas2.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\canvas3.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\cbox.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\cells_checkboard.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\cells_degrade.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\..\iup\html\examples\C\cells_numbering.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\colorbar.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\colorbrowser.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\dialog1.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\dialog2.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\filedlg.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\fill.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\frame.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\gauge.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\getattribute.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\getcolor.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\getfile.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\getparam.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\glcanvas.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\hbox.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\idle.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\image.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\item.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\label.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\list1.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\list2.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\listdialog.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\lua_init.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\mask.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\matrix.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\mdi.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\menu.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\message.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\multiline1.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\multiline2.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\ole_browser.cpp" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\pplot.cpp" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\progressbar.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\radio.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\sample.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\sbox1.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\sbox2.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\scanf.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\scrollbar.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\separator.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\submenu.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\tabs.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\text.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\timer.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\toggle.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\tree.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\val.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\vbox.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\zbox.c" - > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - </Filter> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/iup/mak.vc8/iuptest.vcproj b/iup/mak.vc8/iuptest.vcproj deleted file mode 100755 index b539677..0000000 --- a/iup/mak.vc8/iuptest.vcproj +++ /dev/null @@ -1,320 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="8,00" - Name="iuptest" - ProjectGUID="{2F92EC58-D94C-40BF-8C82-77607C72E1E3}" - TargetFrameworkVersion="131072" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory="..\bin" - IntermediateDirectory="..\obj\Debug\$(ProjectName)" - ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - TypeLibraryName="..\bin\$(ProjectName).tlb" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\include;..\..\cd\include;D:\LNG\vld\include" - PreprocessorDefinitions="WIN32;_DEBUG;_WIN32_WINNT=0x0500;_WIN32_IE=0x0500;_CRT_SECURE_NO_DEPRECATE;__IUPDEF_H;BIG_TEST;USE_OPENGL;PPLOT_TEST" - ExceptionHandling="0" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - UsePrecompiledHeader="0" - BrowseInformation="0" - WarningLevel="4" - SuppressStartupBanner="true" - DebugInformationFormat="1" - CompileAs="0" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" - Culture="1046" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="comctl32.lib ole32.lib opengl32.lib glu32.lib iup.lib iupgl.lib iupcontrols.lib iupimglib.lib cd.lib freetype6.lib iupcd.lib iup_pplot.lib vld.lib" - LinkIncremental="1" - SuppressStartupBanner="true" - AdditionalLibraryDirectories="..\lib;..\..\cd\lib;d:\lng\SpeechSDK\Lib\i386;D:\LNG\vld\lib" - GenerateManifest="false" - GenerateDebugInformation="true" - ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb" - SubSystem="1" - RandomizedBaseAddress="1" - DataExecutionPrevention="0" - TargetMachine="1" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <Filter - Name="Resources" - > - <File - RelativePath="..\test\dial.led" - > - </File> - <File - RelativePath="..\test\iuptest.rc" - > - </File> - </Filter> - <File - RelativePath="..\test\bigtest.c" - > - </File> - <File - RelativePath="..\test\button.c" - > - </File> - <File - RelativePath="..\test\canvas.c" - > - </File> - <File - RelativePath="..\test\canvas_cddbuffer.c" - > - </File> - <File - RelativePath="..\test\canvas_cdsimple.c" - > - </File> - <File - RelativePath="..\test\canvas_scrollbar.c" - > - </File> - <File - RelativePath="..\test\cells_checkboard.c" - > - </File> - <File - RelativePath="..\test\cells_degrade.c" - > - </File> - <File - RelativePath="..\test\cells_numbering.c" - > - </File> - <File - RelativePath="..\test\class_conf.c" - > - </File> - <File - RelativePath="..\test\clipboard.c" - > - </File> - <File - RelativePath="..\test\colorbar.c" - > - </File> - <File - RelativePath="..\test\colorbrowser.c" - > - </File> - <File - RelativePath="..\test\dial.c" - > - </File> - <File - RelativePath="..\test\dialog.c" - > - </File> - <File - RelativePath="..\test\frame.c" - > - </File> - <File - RelativePath="..\test\gauge.c" - > - </File> - <File - RelativePath="..\test\getcolor.c" - > - </File> - <File - RelativePath="..\test\getparam.c" - > - </File> - <File - RelativePath="..\test\glcanvas.c" - > - </File> - <File - RelativePath="..\test\glcanvas_cube.c" - > - </File> - <File - RelativePath="..\test\hbox.c" - > - </File> - <File - RelativePath="..\test\idle.c" - > - </File> - <File - RelativePath="..\test\label.c" - > - </File> - <File - RelativePath="..\test\list.c" - > - </File> - <File - RelativePath="..\test\matrix.c" - > - </File> - <File - RelativePath="..\test\matrix_cbmode.c" - > - </File> - <File - RelativePath="..\test\matrix_cbs.c" - > - </File> - <File - RelativePath="..\test\mdi.c" - > - </File> - <File - RelativePath="..\test\menu.c" - > - </File> - <File - RelativePath="..\test\ole.cpp" - > - </File> - <File - RelativePath="..\test\pplot.c" - > - </File> - <File - RelativePath="..\test\predialogs.c" - > - </File> - <File - RelativePath="..\test\progressbar.c" - > - </File> - <File - RelativePath="..\test\sample.c" - > - </File> - <File - RelativePath="..\test\sbox.c" - > - </File> - <File - RelativePath="..\test\scanf.c" - > - </File> - <File - RelativePath="..\test\spin.c" - > - </File> - <File - RelativePath="..\test\sysinfo.c" - > - </File> - <File - RelativePath="..\test\tabs.c" - > - </File> - <File - RelativePath="..\test\text.c" - > - </File> - <File - RelativePath="..\test\text_spin.c" - > - </File> - <File - RelativePath="..\test\timer.c" - > - </File> - <File - RelativePath="..\test\toggle.c" - > - </File> - <File - RelativePath="..\test\tray.c" - > - </File> - <File - RelativePath="..\test\tree.c" - > - </File> - <File - RelativePath="..\test\val.c" - > - </File> - <File - RelativePath="..\test\vbox.c" - > - </File> - <File - RelativePath="..\test\zbox.c" - > - </File> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/iup/mak.vc8/iuptestgtk.vcproj b/iup/mak.vc8/iuptestgtk.vcproj deleted file mode 100755 index 017bb69..0000000 --- a/iup/mak.vc8/iuptestgtk.vcproj +++ /dev/null @@ -1,311 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="8,00" - Name="iuptestgtk" - ProjectGUID="{2F92EC58-1234-40BF-5678-77607C72E1E3}" - TargetFrameworkVersion="131072" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory="..\bin" - IntermediateDirectory="..\obj\Debug\$(ProjectName)" - ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - TypeLibraryName="..\bin\$(ProjectName).tlb" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\include;"d:\lng\gtk\include\atk-1.0";d:\lng\gtk\include\cairo;"d:\lng\gtk\include\glib-2.0";"d:\lng\gtk\include\gtk-2.0";"d:\lng\gtk\include\pango-1.0";"d:\lng\gtk\lib\gtk-2.0\include";"d:\lng\gtk\lib\glib-2.0\include";..\..\cd\include;D:\LNG\vld\include" - PreprocessorDefinitions="WIN32;_DEBUG;_WIN32_WINNT=0x0400;_CRT_SECURE_NO_DEPRECATE;BIG_TEST;USE_OPENGL;PPLOT_TEST" - ExceptionHandling="0" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - UsePrecompiledHeader="0" - BrowseInformation="0" - WarningLevel="4" - SuppressStartupBanner="true" - DebugInformationFormat="1" - CompileAs="0" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" - Culture="1046" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - AdditionalOptions="/MACHINE:I386" - AdditionalDependencies="comctl32.lib ole32.lib opengl32.lib glu32.lib gtk-win32-2.0.lib gdk-win32-2.0.lib gdk_pixbuf-2.0.lib pango-1.0.lib pangowin32-1.0.lib gobject-2.0.lib gmodule-2.0.lib glib-2.0.lib iupgtk.lib iupgl.lib iupcontrols.lib iupimglib.lib iup_pplot.lib cd.lib freetype6.lib iupcd.lib" - LinkIncremental="1" - SuppressStartupBanner="true" - AdditionalLibraryDirectories="..\lib;d:\lng\gtk\lib;..\..\cd\lib;D:\LNG\vld\lib" - GenerateDebugInformation="true" - ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb" - SubSystem="1" - RandomizedBaseAddress="1" - DataExecutionPrevention="0" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <Filter - Name="Resources" - > - <File - RelativePath="..\test\dial.led" - > - </File> - </Filter> - <File - RelativePath="..\test\bigtest.c" - > - </File> - <File - RelativePath="..\test\button.c" - > - </File> - <File - RelativePath="..\test\canvas.c" - > - </File> - <File - RelativePath="..\test\canvas_cddbuffer.c" - > - </File> - <File - RelativePath="..\test\canvas_cdsimple.c" - > - </File> - <File - RelativePath="..\test\canvas_scrollbar.c" - > - </File> - <File - RelativePath="..\test\cells_checkboard.c" - > - </File> - <File - RelativePath="..\test\cells_degrade.c" - > - </File> - <File - RelativePath="..\test\cells_numbering.c" - > - </File> - <File - RelativePath="..\test\class_conf.c" - > - </File> - <File - RelativePath="..\test\clipboard.c" - > - </File> - <File - RelativePath="..\test\colorbar.c" - > - </File> - <File - RelativePath="..\test\colorbrowser.c" - > - </File> - <File - RelativePath="..\test\dial.c" - > - </File> - <File - RelativePath="..\test\dialog.c" - > - </File> - <File - RelativePath="..\test\frame.c" - > - </File> - <File - RelativePath="..\test\gauge.c" - > - </File> - <File - RelativePath="..\test\getcolor.c" - > - </File> - <File - RelativePath="..\test\getparam.c" - > - </File> - <File - RelativePath="..\test\glcanvas.c" - > - </File> - <File - RelativePath="..\test\glcanvas_cube.c" - > - </File> - <File - RelativePath="..\test\hbox.c" - > - </File> - <File - RelativePath="..\test\idle.c" - > - </File> - <File - RelativePath="..\test\label.c" - > - </File> - <File - RelativePath="..\test\list.c" - > - </File> - <File - RelativePath="..\test\matrix.c" - > - </File> - <File - RelativePath="..\test\matrix_cbmode.c" - > - </File> - <File - RelativePath="..\test\matrix_cbs.c" - > - </File> - <File - RelativePath="..\test\mdi.c" - > - </File> - <File - RelativePath="..\test\menu.c" - > - </File> - <File - RelativePath="..\test\pplot.c" - > - </File> - <File - RelativePath="..\test\predialogs.c" - > - </File> - <File - RelativePath="..\test\progressbar.c" - > - </File> - <File - RelativePath="..\test\sample.c" - > - </File> - <File - RelativePath="..\test\sbox.c" - > - </File> - <File - RelativePath="..\test\scanf.c" - > - </File> - <File - RelativePath="..\test\spin.c" - > - </File> - <File - RelativePath="..\test\sysinfo.c" - > - </File> - <File - RelativePath="..\test\tabs.c" - > - </File> - <File - RelativePath="..\test\text.c" - > - </File> - <File - RelativePath="..\test\text_spin.c" - > - </File> - <File - RelativePath="..\test\timer.c" - > - </File> - <File - RelativePath="..\test\toggle.c" - > - </File> - <File - RelativePath="..\test\tray.c" - > - </File> - <File - RelativePath="..\test\tree.c" - > - </File> - <File - RelativePath="..\test\val.c" - > - </File> - <File - RelativePath="..\test\vbox.c" - > - </File> - <File - RelativePath="..\test\zbox.c" - > - </File> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/iup/mak.vc8/iupview.vcproj b/iup/mak.vc8/iupview.vcproj deleted file mode 100755 index 9a61127..0000000 --- a/iup/mak.vc8/iupview.vcproj +++ /dev/null @@ -1,117 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="8,00" - Name="iupview" - ProjectGUID="{2F92EC58-D94C-40BF-4444-77607C72E1E3}" - TargetFrameworkVersion="0" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory="..\bin" - IntermediateDirectory="..\obj\Debug\$(ProjectName)" - ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - TypeLibraryName="..\bin\debug/iupview.tlb" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\include;..\src" - PreprocessorDefinitions="WIN32,_DEBUG,USE_IM,_CRT_SECURE_NO_DEPRECATE" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - UsePrecompiledHeader="0" - BrowseInformation="0" - WarningLevel="4" - SuppressStartupBanner="true" - DebugInformationFormat="1" - CompileAs="0" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" - Culture="1046" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - AdditionalOptions="/MACHINE:I386" - AdditionalDependencies="comctl32.lib ole32.lib iup.lib iupcontrols.lib cd.lib freetype6.lib iupcd.lib iupgl.lib opengl32.lib glu32.lib iupimglib.lib im.lib iupim.lib" - LinkIncremental="1" - SuppressStartupBanner="true" - AdditionalLibraryDirectories="..\..\im\lib;..\..\cd\lib;..\lib" - GenerateManifest="false" - GenerateDebugInformation="true" - ProgramDatabaseFile="..\bin\iupview.pdb" - SubSystem="1" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <File - RelativePath="..\etc\iup.rc" - > - </File> - <File - RelativePath="..\srcview\iup_view.c" - > - </File> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/iup/mak.vc8/iupviewgtk.vcproj b/iup/mak.vc8/iupviewgtk.vcproj deleted file mode 100755 index 9276b02..0000000 --- a/iup/mak.vc8/iupviewgtk.vcproj +++ /dev/null @@ -1,113 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="8,00" - Name="iupviewgtk" - ProjectGUID="{E7D19356-B0AB-44AD-ACCB-5FFFCC4837BE}" - TargetFrameworkVersion="0" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory="..\bin" - IntermediateDirectory="..\obj\Debug\$(ProjectName)" - ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - TypeLibraryName="..\bin\debug/iupviewgtk.tlb" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\include;..\src" - PreprocessorDefinitions="WIN32,_DEBUG,USE_IM,_CRT_SECURE_NO_DEPRECATE" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - UsePrecompiledHeader="0" - BrowseInformation="0" - WarningLevel="4" - SuppressStartupBanner="true" - DebugInformationFormat="1" - CompileAs="0" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" - Culture="1046" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - AdditionalOptions="/MACHINE:I386" - AdditionalDependencies="comctl32.lib ole32.lib gtk-win32-2.0.lib gdk-win32-2.0.lib gdk_pixbuf-2.0.lib pango-1.0.lib pangowin32-1.0.lib gobject-2.0.lib gmodule-2.0.lib glib-2.0.lib iupgtk.lib iupcontrols.lib cd.lib freetype6.lib iupcd.lib iupgl.lib opengl32.lib glu32.lib iupimglib.lib im.lib iupim.lib" - LinkIncremental="1" - SuppressStartupBanner="true" - AdditionalLibraryDirectories="..\..\im\lib;d:\lng\gtk\lib;..\..\cd\lib;..\lib" - GenerateManifest="true" - GenerateDebugInformation="true" - ProgramDatabaseFile="..\bin\iupviewgtk.pdb" - SubSystem="1" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <File - RelativePath="..\srcview\iup_view.c" - > - </File> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/iup/mak.vc8/iupwin.vcproj b/iup/mak.vc8/iupwin.vcproj deleted file mode 100755 index cf53df8..0000000 --- a/iup/mak.vc8/iupwin.vcproj +++ /dev/null @@ -1,254 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="8,00" - Name="iupwin" - ProjectGUID="{2C7E83B9-123A-BCDF-97BA-FCF4D0728408}" - Keyword="Win32Proj" - TargetFrameworkVersion="131072" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory="..\lib" - IntermediateDirectory="..\obj\Debug\$(ProjectName)" - ConfigurationType="4" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\src;..\include" - PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_WIN32_WINNT=0x0500;_WIN32_IE=0x0500;WINVER=0x0500;IUP_ASSERT;_CRT_SECURE_NO_DEPRECATE;NOTREEVIEW" - MinimalRebuild="false" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - UsePrecompiledHeader="0" - BrowseInformation="0" - WarningLevel="4" - Detect64BitPortabilityProblems="false" - DebugInformationFormat="1" - CompileAs="0" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - AdditionalDependencies="iupcore.lib" - OutputFile="$(OutDir)\iup.lib" - AdditionalLibraryDirectories="$(OutDir)" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <Filter - Name="inc" - > - <File - RelativePath="..\src\win\iupwin_brush.h" - > - </File> - <File - RelativePath="..\src\win\iupwin_draw.h" - > - </File> - <File - RelativePath="..\src\win\iupwin_drv.h" - > - </File> - <File - RelativePath="..\src\win\iupwin_handle.h" - > - </File> - <File - RelativePath="..\src\win\iupwin_info.h" - > - </File> - </Filter> - <Filter - Name="src" - > - <File - RelativePath="..\src\win\iupwin_brush.c" - > - </File> - <File - RelativePath="..\src\win\iupwin_common.c" - > - </File> - <File - RelativePath="..\src\win\iupwin_draw.c" - > - </File> - <File - RelativePath="..\src\win\iupwin_focus.c" - > - </File> - <File - RelativePath="..\src\win\iupwin_font.c" - > - </File> - <File - RelativePath="..\src\win\iupwin_globalattrib.c" - > - </File> - <File - RelativePath="..\src\win\iupwin_handle.c" - > - </File> - <File - RelativePath="..\src\win\iupwin_info.c" - > - </File> - <File - RelativePath="..\src\win\iupwin_key.c" - > - </File> - <File - RelativePath="..\src\win\iupwin_loop.c" - > - </File> - <File - RelativePath="..\src\win\iupwin_open.c" - > - </File> - <File - RelativePath="..\src\win\iupwin_tips.c" - > - </File> - </Filter> - <Filter - Name="src_controls" - > - <File - RelativePath="..\src\win\iupwin_button.c" - > - </File> - <File - RelativePath="..\src\win\iupwin_canvas.c" - > - </File> - <File - RelativePath="..\src\win\iupwin_clipboard.c" - > - </File> - <File - RelativePath="..\src\win\iupwin_colordlg.c" - > - </File> - <File - RelativePath="..\src\win\iupwin_dialog.c" - > - </File> - <File - RelativePath="..\src\win\iupwin_filedlg.c" - > - </File> - <File - RelativePath="..\src\win\iupwin_fontdlg.c" - > - </File> - <File - RelativePath="..\src\win\iupwin_frame.c" - > - </File> - <File - RelativePath="..\src\win\iupwin_image.c" - > - </File> - <File - RelativePath="..\src\win\iupwin_label.c" - > - </File> - <File - RelativePath="..\src\win\iupwin_list.c" - > - </File> - <File - RelativePath="..\src\win\iupwin_menu.c" - > - </File> - <File - RelativePath="..\src\win\iupwin_messagedlg.c" - > - </File> - <File - RelativePath="..\src\win\iupwin_progressbar.c" - > - </File> - <File - RelativePath="..\src\win\iupwin_tabs.c" - > - </File> - <File - RelativePath="..\src\win\iupwin_text.c" - > - </File> - <File - RelativePath="..\src\win\iupwin_timer.c" - > - </File> - <File - RelativePath="..\src\win\iupwin_toggle.c" - > - </File> - <File - RelativePath="..\src\win\iupwin_tree.c" - > - </File> - <File - RelativePath="..\src\win\iupwin_val.c" - > - </File> - </Filter> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/iup/mak.vc8/ledc.vcproj b/iup/mak.vc8/ledc.vcproj deleted file mode 100755 index 766db48..0000000 --- a/iup/mak.vc8/ledc.vcproj +++ /dev/null @@ -1,120 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="8,00" - Name="ledc" - ProjectGUID="{0F789DF8-22CC-4392-98DB-AC3960FAD4EA}" - Keyword="Win32Proj" - TargetFrameworkVersion="0" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory="..\bin" - IntermediateDirectory="..\obj\Debug\$(ProjectName)" - ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE" - MinimalRebuild="false" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - UsePrecompiledHeader="0" - BrowseInformation="0" - WarningLevel="4" - Detect64BitPortabilityProblems="false" - DebugInformationFormat="1" - CompileAs="0" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - OutputFile="$(OutDir)/ledc.exe" - LinkIncremental="1" - SuppressStartupBanner="true" - GenerateManifest="false" - GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)/ledc.pdb" - SubSystem="1" - TargetMachine="1" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <File - RelativePath="..\etc\iup.rc" - > - </File> - <File - RelativePath="..\srcledc\ledc.c" - > - </File> - <File - RelativePath="..\srcledc\lex.yy.c" - > - </File> - <File - RelativePath="..\srcledc\y.tab.c" - > - </File> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/iup/mak.vc9/iup.sln b/iup/mak.vc9/iup.sln deleted file mode 100755 index 47e2076..0000000 --- a/iup/mak.vc9/iup.sln +++ /dev/null @@ -1,353 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iupcore", "iupcore.vcproj", "{2C7E83B9-7FE8-432A-97BA-FCF4D0728408}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iupgtk", "iupgtk.vcproj", "{2C7E83B9-7FE8-5555-97BA-FCF4D0728408}" - ProjectSection(ProjectDependencies) = postProject - {2C7E83B9-7FE8-432A-97BA-FCF4D0728408} = {2C7E83B9-7FE8-432A-97BA-FCF4D0728408} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iupmot", "iupmot.vcproj", "{2C7E83B9-1234-432A-97BA-FCF4D0728408}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iuptest", "iuptest.vcproj", "{2F92EC58-D94C-40BF-8C82-77607C72E1E3}" - ProjectSection(ProjectDependencies) = postProject - {5EEFE977-C56D-462F-BDEE-12A5452EB8CC} = {5EEFE977-C56D-462F-BDEE-12A5452EB8CC} - {5A42018B-95AC-A789-E4E4-59A692649DCA} = {5A42018B-95AC-A789-E4E4-59A692649DCA} - {2C7E83B9-123A-BCDF-97BA-FCF4D0728408} = {2C7E83B9-123A-BCDF-97BA-FCF4D0728408} - {2C7E83B9-7FE8-432A-97BA-FCF4D0728408} = {2C7E83B9-7FE8-432A-97BA-FCF4D0728408} - {BE7472E1-E76E-4969-A35F-054614F5884E} = {BE7472E1-E76E-4969-A35F-054614F5884E} - {E251B4F4-0B0A-482B-BA18-1234ADC4B6AA} = {E251B4F4-0B0A-482B-BA18-1234ADC4B6AA} - {E251B4F4-0B0A-482B-BA18-2509ADC4B6AA} = {E251B4F4-0B0A-482B-BA18-2509ADC4B6AA} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iuptestgtk", "iuptestgtk.vcproj", "{2F92EC58-1234-40BF-5678-77607C72E1E3}" - ProjectSection(ProjectDependencies) = postProject - {5EEFE977-C56D-462F-BDEE-12A5452EB8CC} = {5EEFE977-C56D-462F-BDEE-12A5452EB8CC} - {5A42018B-95AC-A789-E4E4-59A692649DCA} = {5A42018B-95AC-A789-E4E4-59A692649DCA} - {2C7E83B9-7FE8-432A-97BA-FCF4D0728408} = {2C7E83B9-7FE8-432A-97BA-FCF4D0728408} - {2C7E83B9-7FE8-5555-97BA-FCF4D0728408} = {2C7E83B9-7FE8-5555-97BA-FCF4D0728408} - {BE7472E1-E76E-4969-A35F-054614F5884E} = {BE7472E1-E76E-4969-A35F-054614F5884E} - {E251B4F4-0B0A-482B-BA18-1234ADC4B6AA} = {E251B4F4-0B0A-482B-BA18-1234ADC4B6AA} - {E251B4F4-0B0A-482B-BA18-2509ADC4B6AA} = {E251B4F4-0B0A-482B-BA18-2509ADC4B6AA} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iupwin", "iupwin.vcproj", "{2C7E83B9-123A-BCDF-97BA-FCF4D0728408}" - ProjectSection(ProjectDependencies) = postProject - {2C7E83B9-7FE8-432A-97BA-FCF4D0728408} = {2C7E83B9-7FE8-432A-97BA-FCF4D0728408} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iupgl", "iupgl.vcproj", "{E251B4F4-0B0A-482B-BA18-2509ADC4B6AA}" - ProjectSection(ProjectDependencies) = postProject - {2C7E83B9-7FE8-432A-97BA-FCF4D0728408} = {2C7E83B9-7FE8-432A-97BA-FCF4D0728408} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iupcontrols", "iupcontrols.vcproj", "{5EEFE977-C56D-462F-BDEE-12A5452EB8CC}" - ProjectSection(ProjectDependencies) = postProject - {2C7E83B9-7FE8-432A-97BA-FCF4D0728408} = {2C7E83B9-7FE8-432A-97BA-FCF4D0728408} - {BE7472E1-E76E-4969-A35F-054614F5884E} = {BE7472E1-E76E-4969-A35F-054614F5884E} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iup_pplot", "iup_pplot.vcproj", "{5A42018B-95AC-A789-E4E4-59A692649DCA}" - ProjectSection(ProjectDependencies) = postProject - {2C7E83B9-7FE8-432A-97BA-FCF4D0728408} = {2C7E83B9-7FE8-432A-97BA-FCF4D0728408} - {BE7472E1-E76E-4969-A35F-054614F5884E} = {BE7472E1-E76E-4969-A35F-054614F5884E} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iupole", "iupole.vcproj", "{0C80BBEE-1B00-4567-1234-067292C84EDB}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iupimglib", "iupimglib.vcproj", "{E251B4F4-0B0A-482B-BB33-1234ADC4B6AA}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iupcd", "iupcd.vcproj", "{BE7472E1-E76E-4969-A35F-054614F5884E}" - ProjectSection(ProjectDependencies) = postProject - {2C7E83B9-7FE8-432A-97BA-FCF4D0728408} = {2C7E83B9-7FE8-432A-97BA-FCF4D0728408} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iupim", "iupim.vcproj", "{E251B4F4-0B0A-482B-BA18-1234ADC4B6AA}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iuplua3", "iuplua3.vcproj", "{1EBC7A53-4677-4C3A-8DFF-49D301F17D85}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iuplua3_exe", "iupluaexe3.vcproj", "{A60D658D-766C-40DB-BAFF-59AB884D86FB}" - ProjectSection(ProjectDependencies) = postProject - {1EBC7A53-4677-4C3A-8DFF-269001F17D85} = {1EBC7A53-4677-4C3A-8DFF-269001F17D85} - {1EBC7A53-4677-4C3A-8DFF-49D301F17D85} = {1EBC7A53-4677-4C3A-8DFF-49D301F17D85} - {1EBC7A53-4677-4C3A-8DFF-49DFF4417D85} = {1EBC7A53-4677-4C3A-8DFF-49DFF4417D85} - {1EBC7A53-33FF-4C3A-8DFF-49D301F17D85} = {1EBC7A53-33FF-4C3A-8DFF-49D301F17D85} - {5EEFE977-C56D-462F-BDEE-12A5452EB8CC} = {5EEFE977-C56D-462F-BDEE-12A5452EB8CC} - {5EEFE977-C56D-462F-BDEE-12A5452EB8CC} = {5EEFE977-C56D-462F-BDEE-12A5452EB8CC} - {5EEFE977-C56D-462F-BDEE-12A5452EB8CC} = {5EEFE977-C56D-462F-BDEE-12A5452EB8CC} - {5EEFE977-C56D-462F-BDEE-12A5452EB8CC} = {5EEFE977-C56D-462F-BDEE-12A5452EB8CC} - {5EEFE977-C56D-462F-BDEE-12A5452EB8CC} = {5EEFE977-C56D-462F-BDEE-12A5452EB8CC} - {5EEFE977-C56D-462F-BDEE-12A5452EB8CC} = {5EEFE977-C56D-462F-BDEE-12A5452EB8CC} - {5EEFE977-C56D-462F-BDEE-12A5452EB8CC} = {5EEFE977-C56D-462F-BDEE-12A5452EB8CC} - {5EEFE977-C56D-462F-BDEE-12A5452EB8CC} = {5EEFE977-C56D-462F-BDEE-12A5452EB8CC} - {2C7E83B9-7FE8-432A-97BA-FCF4D0728408} = {2C7E83B9-7FE8-432A-97BA-FCF4D0728408} - {E251B4F4-0B0A-482B-BA18-1234ADC4B6AA} = {E251B4F4-0B0A-482B-BA18-1234ADC4B6AA} - {E251B4F4-0B0A-482B-BA18-2509ADC4B6AA} = {E251B4F4-0B0A-482B-BA18-2509ADC4B6AA} - {E251B4F4-0B0A-482B-BA18-2509ADC4B6AA} = {E251B4F4-0B0A-482B-BA18-2509ADC4B6AA} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iuplua5", "iuplua5.vcproj", "{1EBC7A53-4677-4C3A-8D4A-49D301F17D85}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iuplua5_exe", "iupluaexe5.vcproj", "{A60D658D-766C-40DB-BAE4-59AB884D86FB}" - ProjectSection(ProjectDependencies) = postProject - {1EBC7A53-4677-4C3A-8D4A-49D301157985} = {1EBC7A53-4677-4C3A-8D4A-49D301157985} - {1EBC7A53-4677-4C3A-8D4A-49D301F17D85} = {1EBC7A53-4677-4C3A-8D4A-49D301F17D85} - {1EBC7A53-4677-AAAA-1234-49D301F17D85} = {1EBC7A53-4677-AAAA-1234-49D301F17D85} - {1EBC7A53-4677-75D7-8D4A-49D301F17D85} = {1EBC7A53-4677-75D7-8D4A-49D301F17D85} - {1EBC7A53-4677-ADF1-8D4A-49D301F17D85} = {1EBC7A53-4677-ADF1-8D4A-49D301F17D85} - {1EBC7A53-4677-FFFF-1234-49D301F17D85} = {1EBC7A53-4677-FFFF-1234-49D301F17D85} - {B4823266-DF8C-4EFB-91C0-C7688C234EAC} = {B4823266-DF8C-4EFB-91C0-C7688C234EAC} - {5EEFE977-C56D-462F-BDEE-12A5452EB8CC} = {5EEFE977-C56D-462F-BDEE-12A5452EB8CC} - {5EEFE977-C56D-462F-BDEE-12A5452EB8CC} = {5EEFE977-C56D-462F-BDEE-12A5452EB8CC} - {5EEFE977-C56D-462F-BDEE-12A5452EB8CC} = {5EEFE977-C56D-462F-BDEE-12A5452EB8CC} - {5EEFE977-C56D-462F-BDEE-12A5452EB8CC} = {5EEFE977-C56D-462F-BDEE-12A5452EB8CC} - {5EEFE977-C56D-462F-BDEE-12A5452EB8CC} = {5EEFE977-C56D-462F-BDEE-12A5452EB8CC} - {5EEFE977-C56D-462F-BDEE-12A5452EB8CC} = {5EEFE977-C56D-462F-BDEE-12A5452EB8CC} - {5EEFE977-C56D-462F-BDEE-12A5452EB8CC} = {5EEFE977-C56D-462F-BDEE-12A5452EB8CC} - {5A42018B-95AC-A789-E4E4-59A692649DCA} = {5A42018B-95AC-A789-E4E4-59A692649DCA} - {2C7E83B9-123A-BCDF-97BA-FCF4D0728408} = {2C7E83B9-123A-BCDF-97BA-FCF4D0728408} - {2C7E83B9-7FE8-432A-97BA-FCF4D0728408} = {2C7E83B9-7FE8-432A-97BA-FCF4D0728408} - {BE7472E1-E76E-4969-A35F-054614F5884E} = {BE7472E1-E76E-4969-A35F-054614F5884E} - {E251B4F4-0B0A-482B-BA18-1234ADC4B6AA} = {E251B4F4-0B0A-482B-BA18-1234ADC4B6AA} - {E251B4F4-0B0A-482B-BA18-2509ADC4B6AA} = {E251B4F4-0B0A-482B-BA18-2509ADC4B6AA} - {E251B4F4-0B0A-482B-BA18-2509ADC4B6AA} = {E251B4F4-0B0A-482B-BA18-2509ADC4B6AA} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ledc", "ledc.vcproj", "{0F789DF8-22CC-4392-98DB-AC3960FAD4EA}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iupview", "iupview.vcproj", "{2F92EC58-D94C-40BF-4444-77607C72E1E3}" - ProjectSection(ProjectDependencies) = postProject - {5EEFE977-C56D-462F-BDEE-12A5452EB8CC} = {5EEFE977-C56D-462F-BDEE-12A5452EB8CC} - {2C7E83B9-123A-BCDF-97BA-FCF4D0728408} = {2C7E83B9-123A-BCDF-97BA-FCF4D0728408} - {2C7E83B9-7FE8-432A-97BA-FCF4D0728408} = {2C7E83B9-7FE8-432A-97BA-FCF4D0728408} - {E251B4F4-0B0A-482B-BA18-1234ADC4B6AA} = {E251B4F4-0B0A-482B-BA18-1234ADC4B6AA} - {E251B4F4-0B0A-482B-BA18-2509ADC4B6AA} = {E251B4F4-0B0A-482B-BA18-2509ADC4B6AA} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iupluaim5", "iupluaim5.vcproj", "{1EBC7A53-4677-ADF1-8D4A-49D301F17D85}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iupluaim3", "iupluaim3.vcproj", "{1EBC7A53-4677-4C3A-8DFF-269001F17D85}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iupluacontrols5", "iupluacontrols5.vcproj", "{1EBC7A53-4677-75D7-8D4A-49D301F17D85}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iupluacontrols3", "iupluacontrols3.vcproj", "{1EBC7A53-4677-4C3A-8DFF-49DFF4417D85}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iupluagl5", "iupluagl5.vcproj", "{1EBC7A53-4677-4C3A-8D4A-49D301157985}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iupluagl3", "iupluagl3.vcproj", "{1EBC7A53-33FF-4C3A-8DFF-49D301F17D85}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iupluaole3", "iupluaole3.vcproj", "{1EBC7A53-33FF-7890-7890-49D301F17D85}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iupluaole5", "iupluaole5.vcproj", "{1EBC7A53-4677-5555-2222-49D301157985}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iuplua_pplot5", "iuplua_pplot5.vcproj", "{1EBC7A53-4677-AAAA-1234-49D301F17D85}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iuplua_pplot3", "iuplua_pplot3.vcproj", "{1EBC7A53-4677-1234-DDDD-49DFF4417D85}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iupluacd3", "iupluacd3.vcproj", "{B4823266-DF8C-4EFB-91C0-C7E78C234EAC}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iupluacd5", "iupluacd5.vcproj", "{B4823266-DF8C-4EFB-91C0-C7688C234EAC}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Lua5", "Lua5", "{1CBEAA34-BA34-497D-A775-B9AF6F905696}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Lua3", "Lua3", "{11041D08-354A-4300-9624-41277E67DE34}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iupluaimglib5", "iupluaimglib5.vcproj", "{1EBC7A53-4677-FFFF-1234-49D301F17D85}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core", "Core", "{B7B3CB79-CA94-4ED3-9DCA-EC12458C2EBD}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test", "Test", "{FC52B7B5-744E-45D6-815C-3502F9D965E7}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iupsample", "iupsample.vcproj", "{9462FDEA-3E53-4250-8710-DD50AF48607C}" - ProjectSection(ProjectDependencies) = postProject - {5EEFE977-C56D-462F-BDEE-12A5452EB8CC} = {5EEFE977-C56D-462F-BDEE-12A5452EB8CC} - {2C7E83B9-123A-BCDF-97BA-FCF4D0728408} = {2C7E83B9-123A-BCDF-97BA-FCF4D0728408} - {2C7E83B9-7FE8-432A-97BA-FCF4D0728408} = {2C7E83B9-7FE8-432A-97BA-FCF4D0728408} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iupsamplegtk", "iupsamplegtk.vcproj", "{C684B76D-52EC-49CE-84F2-B031509419A5}" - ProjectSection(ProjectDependencies) = postProject - {5EEFE977-C56D-462F-BDEE-12A5452EB8CC} = {5EEFE977-C56D-462F-BDEE-12A5452EB8CC} - {2C7E83B9-7FE8-432A-97BA-FCF4D0728408} = {2C7E83B9-7FE8-432A-97BA-FCF4D0728408} - {2C7E83B9-7FE8-5555-97BA-FCF4D0728408} = {2C7E83B9-7FE8-5555-97BA-FCF4D0728408} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iupviewgtk", "iupviewgtk.vcproj", "{E7D19356-B0AB-44AD-ACCB-5FFFCC4837BE}" - ProjectSection(ProjectDependencies) = postProject - {5EEFE977-C56D-462F-BDEE-12A5452EB8CC} = {5EEFE977-C56D-462F-BDEE-12A5452EB8CC} - {2C7E83B9-7FE8-432A-97BA-FCF4D0728408} = {2C7E83B9-7FE8-432A-97BA-FCF4D0728408} - {2C7E83B9-7FE8-5555-97BA-FCF4D0728408} = {2C7E83B9-7FE8-5555-97BA-FCF4D0728408} - {E251B4F4-0B0A-482B-BA18-1234ADC4B6AA} = {E251B4F4-0B0A-482B-BA18-1234ADC4B6AA} - {E251B4F4-0B0A-482B-BA18-2509ADC4B6AA} = {E251B4F4-0B0A-482B-BA18-2509ADC4B6AA} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iuplua5gtk_exe", "iupluaexe5gtk.vcproj", "{389DF3C9-A628-4F6D-8C52-8924FA01DE66}" - ProjectSection(ProjectDependencies) = postProject - {1EBC7A53-4677-4C3A-8D4A-49D301157985} = {1EBC7A53-4677-4C3A-8D4A-49D301157985} - {1EBC7A53-4677-4C3A-8D4A-49D301F17D85} = {1EBC7A53-4677-4C3A-8D4A-49D301F17D85} - {1EBC7A53-4677-AAAA-1234-49D301F17D85} = {1EBC7A53-4677-AAAA-1234-49D301F17D85} - {1EBC7A53-4677-75D7-8D4A-49D301F17D85} = {1EBC7A53-4677-75D7-8D4A-49D301F17D85} - {1EBC7A53-4677-ADF1-8D4A-49D301F17D85} = {1EBC7A53-4677-ADF1-8D4A-49D301F17D85} - {5EEFE977-C56D-462F-BDEE-12A5452EB8CC} = {5EEFE977-C56D-462F-BDEE-12A5452EB8CC} - {5A42018B-95AC-A789-E4E4-59A692649DCA} = {5A42018B-95AC-A789-E4E4-59A692649DCA} - {2C7E83B9-7FE8-432A-97BA-FCF4D0728408} = {2C7E83B9-7FE8-432A-97BA-FCF4D0728408} - {2C7E83B9-7FE8-5555-97BA-FCF4D0728408} = {2C7E83B9-7FE8-5555-97BA-FCF4D0728408} - {BE7472E1-E76E-4969-A35F-054614F5884E} = {BE7472E1-E76E-4969-A35F-054614F5884E} - {E251B4F4-0B0A-482B-BA18-1234ADC4B6AA} = {E251B4F4-0B0A-482B-BA18-1234ADC4B6AA} - {E251B4F4-0B0A-482B-BA18-2509ADC4B6AA} = {E251B4F4-0B0A-482B-BA18-2509ADC4B6AA} - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{B24D8E0A-2EB5-4C49-A146-C0AABEF81788}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {2C7E83B9-7FE8-432A-97BA-FCF4D0728408}.Debug|Win32.ActiveCfg = Debug|Win32 - {2C7E83B9-7FE8-432A-97BA-FCF4D0728408}.Debug|Win32.Build.0 = Debug|Win32 - {2C7E83B9-7FE8-5555-97BA-FCF4D0728408}.Debug|Win32.ActiveCfg = Debug|Win32 - {2C7E83B9-7FE8-5555-97BA-FCF4D0728408}.Debug|Win32.Build.0 = Debug|Win32 - {2C7E83B9-1234-432A-97BA-FCF4D0728408}.Debug|Win32.ActiveCfg = Debug|Win32 - {2F92EC58-D94C-40BF-8C82-77607C72E1E3}.Debug|Win32.ActiveCfg = Debug|Win32 - {2F92EC58-D94C-40BF-8C82-77607C72E1E3}.Debug|Win32.Build.0 = Debug|Win32 - {2F92EC58-1234-40BF-5678-77607C72E1E3}.Debug|Win32.ActiveCfg = Debug|Win32 - {2F92EC58-1234-40BF-5678-77607C72E1E3}.Debug|Win32.Build.0 = Debug|Win32 - {2C7E83B9-123A-BCDF-97BA-FCF4D0728408}.Debug|Win32.ActiveCfg = Debug|Win32 - {2C7E83B9-123A-BCDF-97BA-FCF4D0728408}.Debug|Win32.Build.0 = Debug|Win32 - {E251B4F4-0B0A-482B-BA18-2509ADC4B6AA}.Debug|Win32.ActiveCfg = Debug|Win32 - {E251B4F4-0B0A-482B-BA18-2509ADC4B6AA}.Debug|Win32.Build.0 = Debug|Win32 - {5EEFE977-C56D-462F-BDEE-12A5452EB8CC}.Debug|Win32.ActiveCfg = Debug|Win32 - {5EEFE977-C56D-462F-BDEE-12A5452EB8CC}.Debug|Win32.Build.0 = Debug|Win32 - {5A42018B-95AC-A789-E4E4-59A692649DCA}.Debug|Win32.ActiveCfg = Debug|Win32 - {5A42018B-95AC-A789-E4E4-59A692649DCA}.Debug|Win32.Build.0 = Debug|Win32 - {0C80BBEE-1B00-4567-1234-067292C84EDB}.Debug|Win32.ActiveCfg = Debug|Win32 - {0C80BBEE-1B00-4567-1234-067292C84EDB}.Debug|Win32.Build.0 = Debug|Win32 - {E251B4F4-0B0A-482B-BB33-1234ADC4B6AA}.Debug|Win32.ActiveCfg = Debug|Win32 - {E251B4F4-0B0A-482B-BB33-1234ADC4B6AA}.Debug|Win32.Build.0 = Debug|Win32 - {BE7472E1-E76E-4969-A35F-054614F5884E}.Debug|Win32.ActiveCfg = Debug|Win32 - {BE7472E1-E76E-4969-A35F-054614F5884E}.Debug|Win32.Build.0 = Debug|Win32 - {E251B4F4-0B0A-482B-BA18-1234ADC4B6AA}.Debug|Win32.ActiveCfg = Debug|Win32 - {E251B4F4-0B0A-482B-BA18-1234ADC4B6AA}.Debug|Win32.Build.0 = Debug|Win32 - {1EBC7A53-4677-4C3A-8DFF-49D301F17D85}.Debug|Win32.ActiveCfg = Debug|Win32 - {1EBC7A53-4677-4C3A-8DFF-49D301F17D85}.Debug|Win32.Build.0 = Debug|Win32 - {A60D658D-766C-40DB-BAFF-59AB884D86FB}.Debug|Win32.ActiveCfg = Debug|Win32 - {A60D658D-766C-40DB-BAFF-59AB884D86FB}.Debug|Win32.Build.0 = Debug|Win32 - {1EBC7A53-4677-4C3A-8D4A-49D301F17D85}.Debug|Win32.ActiveCfg = Debug|Win32 - {1EBC7A53-4677-4C3A-8D4A-49D301F17D85}.Debug|Win32.Build.0 = Debug|Win32 - {A60D658D-766C-40DB-BAE4-59AB884D86FB}.Debug|Win32.ActiveCfg = Debug|Win32 - {A60D658D-766C-40DB-BAE4-59AB884D86FB}.Debug|Win32.Build.0 = Debug|Win32 - {0F789DF8-22CC-4392-98DB-AC3960FAD4EA}.Debug|Win32.ActiveCfg = Debug|Win32 - {0F789DF8-22CC-4392-98DB-AC3960FAD4EA}.Debug|Win32.Build.0 = Debug|Win32 - {2F92EC58-D94C-40BF-4444-77607C72E1E3}.Debug|Win32.ActiveCfg = Debug|Win32 - {2F92EC58-D94C-40BF-4444-77607C72E1E3}.Debug|Win32.Build.0 = Debug|Win32 - {1EBC7A53-4677-ADF1-8D4A-49D301F17D85}.Debug|Win32.ActiveCfg = Debug|Win32 - {1EBC7A53-4677-ADF1-8D4A-49D301F17D85}.Debug|Win32.Build.0 = Debug|Win32 - {1EBC7A53-4677-4C3A-8DFF-269001F17D85}.Debug|Win32.ActiveCfg = Debug|Win32 - {1EBC7A53-4677-4C3A-8DFF-269001F17D85}.Debug|Win32.Build.0 = Debug|Win32 - {1EBC7A53-4677-75D7-8D4A-49D301F17D85}.Debug|Win32.ActiveCfg = Debug|Win32 - {1EBC7A53-4677-75D7-8D4A-49D301F17D85}.Debug|Win32.Build.0 = Debug|Win32 - {1EBC7A53-4677-4C3A-8DFF-49DFF4417D85}.Debug|Win32.ActiveCfg = Debug|Win32 - {1EBC7A53-4677-4C3A-8DFF-49DFF4417D85}.Debug|Win32.Build.0 = Debug|Win32 - {1EBC7A53-4677-4C3A-8D4A-49D301157985}.Debug|Win32.ActiveCfg = Debug|Win32 - {1EBC7A53-4677-4C3A-8D4A-49D301157985}.Debug|Win32.Build.0 = Debug|Win32 - {1EBC7A53-33FF-4C3A-8DFF-49D301F17D85}.Debug|Win32.ActiveCfg = Debug|Win32 - {1EBC7A53-33FF-4C3A-8DFF-49D301F17D85}.Debug|Win32.Build.0 = Debug|Win32 - {1EBC7A53-33FF-7890-7890-49D301F17D85}.Debug|Win32.ActiveCfg = Debug|Win32 - {1EBC7A53-33FF-7890-7890-49D301F17D85}.Debug|Win32.Build.0 = Debug|Win32 - {1EBC7A53-4677-5555-2222-49D301157985}.Debug|Win32.ActiveCfg = Debug|Win32 - {1EBC7A53-4677-5555-2222-49D301157985}.Debug|Win32.Build.0 = Debug|Win32 - {1EBC7A53-4677-AAAA-1234-49D301F17D85}.Debug|Win32.ActiveCfg = Debug|Win32 - {1EBC7A53-4677-AAAA-1234-49D301F17D85}.Debug|Win32.Build.0 = Debug|Win32 - {1EBC7A53-4677-1234-DDDD-49DFF4417D85}.Debug|Win32.ActiveCfg = Debug|Win32 - {1EBC7A53-4677-1234-DDDD-49DFF4417D85}.Debug|Win32.Build.0 = Debug|Win32 - {B4823266-DF8C-4EFB-91C0-C7E78C234EAC}.Debug|Win32.ActiveCfg = Debug|Win32 - {B4823266-DF8C-4EFB-91C0-C7E78C234EAC}.Debug|Win32.Build.0 = Debug|Win32 - {B4823266-DF8C-4EFB-91C0-C7688C234EAC}.Debug|Win32.ActiveCfg = Debug|Win32 - {B4823266-DF8C-4EFB-91C0-C7688C234EAC}.Debug|Win32.Build.0 = Debug|Win32 - {1EBC7A53-4677-FFFF-1234-49D301F17D85}.Debug|Win32.ActiveCfg = Debug|Win32 - {1EBC7A53-4677-FFFF-1234-49D301F17D85}.Debug|Win32.Build.0 = Debug|Win32 - {9462FDEA-3E53-4250-8710-DD50AF48607C}.Debug|Win32.ActiveCfg = Debug|Win32 - {9462FDEA-3E53-4250-8710-DD50AF48607C}.Debug|Win32.Build.0 = Debug|Win32 - {C684B76D-52EC-49CE-84F2-B031509419A5}.Debug|Win32.ActiveCfg = Debug|Win32 - {C684B76D-52EC-49CE-84F2-B031509419A5}.Debug|Win32.Build.0 = Debug|Win32 - {E7D19356-B0AB-44AD-ACCB-5FFFCC4837BE}.Debug|Win32.ActiveCfg = Debug|Win32 - {E7D19356-B0AB-44AD-ACCB-5FFFCC4837BE}.Debug|Win32.Build.0 = Debug|Win32 - {389DF3C9-A628-4F6D-8C52-8924FA01DE66}.Debug|Win32.ActiveCfg = Debug|Win32 - {389DF3C9-A628-4F6D-8C52-8924FA01DE66}.Debug|Win32.Build.0 = Debug|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {2C7E83B9-7FE8-5555-97BA-FCF4D0728408} = {B7B3CB79-CA94-4ED3-9DCA-EC12458C2EBD} - {2C7E83B9-1234-432A-97BA-FCF4D0728408} = {B7B3CB79-CA94-4ED3-9DCA-EC12458C2EBD} - {2C7E83B9-123A-BCDF-97BA-FCF4D0728408} = {B7B3CB79-CA94-4ED3-9DCA-EC12458C2EBD} - {2C7E83B9-7FE8-432A-97BA-FCF4D0728408} = {B7B3CB79-CA94-4ED3-9DCA-EC12458C2EBD} - {2F92EC58-1234-40BF-5678-77607C72E1E3} = {FC52B7B5-744E-45D6-815C-3502F9D965E7} - {2F92EC58-D94C-40BF-8C82-77607C72E1E3} = {FC52B7B5-744E-45D6-815C-3502F9D965E7} - {9462FDEA-3E53-4250-8710-DD50AF48607C} = {FC52B7B5-744E-45D6-815C-3502F9D965E7} - {C684B76D-52EC-49CE-84F2-B031509419A5} = {FC52B7B5-744E-45D6-815C-3502F9D965E7} - {1EBC7A53-4677-4C3A-8DFF-269001F17D85} = {11041D08-354A-4300-9624-41277E67DE34} - {1EBC7A53-4677-4C3A-8DFF-49DFF4417D85} = {11041D08-354A-4300-9624-41277E67DE34} - {1EBC7A53-33FF-4C3A-8DFF-49D301F17D85} = {11041D08-354A-4300-9624-41277E67DE34} - {1EBC7A53-33FF-7890-7890-49D301F17D85} = {11041D08-354A-4300-9624-41277E67DE34} - {1EBC7A53-4677-1234-DDDD-49DFF4417D85} = {11041D08-354A-4300-9624-41277E67DE34} - {B4823266-DF8C-4EFB-91C0-C7E78C234EAC} = {11041D08-354A-4300-9624-41277E67DE34} - {1EBC7A53-4677-4C3A-8DFF-49D301F17D85} = {11041D08-354A-4300-9624-41277E67DE34} - {1EBC7A53-4677-ADF1-8D4A-49D301F17D85} = {1CBEAA34-BA34-497D-A775-B9AF6F905696} - {1EBC7A53-4677-75D7-8D4A-49D301F17D85} = {1CBEAA34-BA34-497D-A775-B9AF6F905696} - {1EBC7A53-4677-4C3A-8D4A-49D301157985} = {1CBEAA34-BA34-497D-A775-B9AF6F905696} - {1EBC7A53-4677-5555-2222-49D301157985} = {1CBEAA34-BA34-497D-A775-B9AF6F905696} - {1EBC7A53-4677-AAAA-1234-49D301F17D85} = {1CBEAA34-BA34-497D-A775-B9AF6F905696} - {B4823266-DF8C-4EFB-91C0-C7688C234EAC} = {1CBEAA34-BA34-497D-A775-B9AF6F905696} - {1EBC7A53-4677-4C3A-8D4A-49D301F17D85} = {1CBEAA34-BA34-497D-A775-B9AF6F905696} - {1EBC7A53-4677-FFFF-1234-49D301F17D85} = {1CBEAA34-BA34-497D-A775-B9AF6F905696} - {A60D658D-766C-40DB-BAFF-59AB884D86FB} = {B24D8E0A-2EB5-4C49-A146-C0AABEF81788} - {A60D658D-766C-40DB-BAE4-59AB884D86FB} = {B24D8E0A-2EB5-4C49-A146-C0AABEF81788} - {389DF3C9-A628-4F6D-8C52-8924FA01DE66} = {B24D8E0A-2EB5-4C49-A146-C0AABEF81788} - {2F92EC58-D94C-40BF-4444-77607C72E1E3} = {B24D8E0A-2EB5-4C49-A146-C0AABEF81788} - {E7D19356-B0AB-44AD-ACCB-5FFFCC4837BE} = {B24D8E0A-2EB5-4C49-A146-C0AABEF81788} - {0F789DF8-22CC-4392-98DB-AC3960FAD4EA} = {B24D8E0A-2EB5-4C49-A146-C0AABEF81788} - EndGlobalSection - GlobalSection(DevPartner) = postSolution - EndGlobalSection - GlobalSection(DevPartner) = postSolution - EndGlobalSection - GlobalSection(DevPartner) = postSolution - EndGlobalSection - GlobalSection(DevPartner) = postSolution - EndGlobalSection - GlobalSection(DevPartner) = postSolution - EndGlobalSection - GlobalSection(DevPartner) = postSolution - EndGlobalSection - GlobalSection(DevPartner) = postSolution - EndGlobalSection - GlobalSection(DevPartner) = postSolution - EndGlobalSection - GlobalSection(DevPartner) = postSolution - EndGlobalSection - GlobalSection(DevPartner) = postSolution - EndGlobalSection - GlobalSection(DevPartner) = postSolution - EndGlobalSection - GlobalSection(DevPartner) = postSolution - EndGlobalSection - GlobalSection(DevPartner) = postSolution - EndGlobalSection - GlobalSection(DevPartner) = postSolution - EndGlobalSection - GlobalSection(DevPartner) = postSolution - EndGlobalSection - GlobalSection(DevPartner) = postSolution - EndGlobalSection - GlobalSection(DevPartner) = postSolution - EndGlobalSection - GlobalSection(DevPartner) = postSolution - EndGlobalSection - GlobalSection(DevPartner) = postSolution - EndGlobalSection - GlobalSection(DevPartner) = postSolution - EndGlobalSection -EndGlobal diff --git a/iup/mak.vc9/iup_pplot.vcproj b/iup/mak.vc9/iup_pplot.vcproj deleted file mode 100755 index 8887000..0000000 --- a/iup/mak.vc9/iup_pplot.vcproj +++ /dev/null @@ -1,137 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="9,00" - Name="iup_pplot" - ProjectGUID="{5A42018B-95AC-A789-E4E4-59A692649DCA}" - Keyword="Win32Proj" - TargetFrameworkVersion="131072" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory="..\lib" - IntermediateDirectory="..\obj\Debug\$(ProjectName)" - ConfigurationType="4" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\include;..\src;..\srcpplot;..\..\cd\include" - PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE;_IUP_PPLOT_;CD_NO_OLD_INTERFACE;_DEBUG;IUP_ASSERT" - MinimalRebuild="false" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - UsePrecompiledHeader="0" - WarningLevel="4" - Detect64BitPortabilityProblems="false" - DebugInformationFormat="1" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - OutputFile="$(OutDir)/$(ProjectName).lib" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <Filter - Name="inc" - > - <File - RelativePath="..\srcpplot\iupPPlot.h" - > - </File> - <File - RelativePath="..\srcpplot\iuppplot.hpp" - > - </File> - <File - RelativePath="..\srcpplot\iupPPlotInteraction.h" - > - </File> - </Filter> - <Filter - Name="include" - > - <File - RelativePath="..\include\iup_pplot.h" - > - </File> - </Filter> - <File - RelativePath="..\srcpplot\iup_pplot.cpp" - > - </File> - <File - RelativePath="..\srcpplot\iup_pplot.def" - > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\srcpplot\iupPPlot.cpp" - > - </File> - <File - RelativePath="..\srcpplot\iupPPlotInteraction.cpp" - > - </File> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/iup/mak.vc9/iupcd.vcproj b/iup/mak.vc9/iupcd.vcproj deleted file mode 100755 index ddc990f..0000000 --- a/iup/mak.vc9/iupcd.vcproj +++ /dev/null @@ -1,104 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="9,00" - Name="iupcd" - ProjectGUID="{BE7472E1-E76E-4969-A35F-054614F5884E}" - TargetFrameworkVersion="131072" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory="..\lib" - IntermediateDirectory="..\obj\Debug\$(ProjectName)" - ConfigurationType="4" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\include;..\..\cd\include" - PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,CD_NO_OLD_INTERFACE,_CRT_SECURE_NO_DEPRECATE" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - PrecompiledHeaderFile="..\obj\iup/iupcd.pch" - AssemblerListingLocation="" - ObjectFile="$(IntDir)\" - ProgramDataBaseFileName="$(IntDir)\vc90.pdb" - BrowseInformation="0" - WarningLevel="4" - SuppressStartupBanner="true" - DebugInformationFormat="1" - CompileAs="0" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - Culture="1046" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - OutputFile="$(OutDir)/$(ProjectName).lib" - SuppressStartupBanner="true" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <File - RelativePath="..\srccd\iup_cd.c" - > - </File> - <File - RelativePath="..\srccd\iupcd.def" - > - </File> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/iup/mak.vc9/iupcontrols.vcproj b/iup/mak.vc9/iupcontrols.vcproj deleted file mode 100755 index 2a7875c..0000000 --- a/iup/mak.vc9/iupcontrols.vcproj +++ /dev/null @@ -1,327 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="9,00" - Name="iupcontrols" - ProjectGUID="{5EEFE977-C56D-462F-BDEE-12A5452EB8CC}" - Keyword="Win32Proj" - TargetFrameworkVersion="131072" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory="..\lib" - IntermediateDirectory="..\obj\Debug\$(ProjectName)" - ConfigurationType="4" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\include;..\src;..\srccontrols;..\..\cd\include" - PreprocessorDefinitions="WIN32;_DEBUG;CD_NO_OLD_INTERFACE;_CRT_SECURE_NO_DEPRECATE;IUP_ASSERT" - MinimalRebuild="false" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - UsePrecompiledHeader="0" - BrowseInformation="0" - WarningLevel="4" - Detect64BitPortabilityProblems="false" - DebugInformationFormat="1" - CompileAs="0" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - OutputFile="$(OutDir)/$(ProjectName).lib" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <Filter - Name="include" - > - <File - RelativePath="..\include\iupcb.h" - > - </File> - <File - RelativePath="..\include\iupcells.h" - > - </File> - <File - RelativePath="..\include\iupcolorbar.h" - > - </File> - <File - RelativePath="..\include\iupcontrols.h" - > - </File> - <File - RelativePath="..\include\iupdial.h" - > - </File> - <File - RelativePath="..\include\iupgauge.h" - > - </File> - <File - RelativePath="..\include\iupmask.h" - > - </File> - <File - RelativePath="..\include\iupmatrix.h" - > - </File> - <File - RelativePath="..\include\iuptabs.h" - > - </File> - <File - RelativePath="..\include\iuptree.h" - > - </File> - <File - RelativePath="..\include\iupval.h" - > - </File> - </Filter> - <Filter - Name="inc" - > - <File - RelativePath="..\srccontrols\iup_cdutil.h" - > - </File> - <File - RelativePath="..\srccontrols\iup_controls.h" - > - </File> - </Filter> - <Filter - Name="colorbrowser" - > - <File - RelativePath="..\srccontrols\color\iup_colorbrowser.c" - > - </File> - <File - RelativePath="..\srccontrols\color\iup_colorbrowserdlg.c" - > - </File> - <File - RelativePath="..\srccontrols\color\iup_colorhsi.c" - > - </File> - <File - RelativePath="..\srccontrols\color\iup_colorhsi.h" - > - </File> - </Filter> - <Filter - Name="matrix" - > - <File - RelativePath="..\srccontrols\matrix\iupmat_aux.c" - > - </File> - <File - RelativePath="..\srccontrols\matrix\iupmat_colres.c" - > - </File> - <File - RelativePath="..\srccontrols\matrix\iupmat_draw.c" - > - </File> - <File - RelativePath="..\srccontrols\matrix\iupmat_edit.c" - > - </File> - <File - RelativePath="..\srccontrols\matrix\iupmat_focus.c" - > - </File> - <File - RelativePath="..\srccontrols\matrix\iupmat_getset.c" - > - </File> - <File - RelativePath="..\srccontrols\matrix\iupmat_key.c" - > - </File> - <File - RelativePath="..\srccontrols\matrix\iupmat_mark.c" - > - </File> - <File - RelativePath="..\srccontrols\matrix\iupmat_mem.c" - > - </File> - <File - RelativePath="..\srccontrols\matrix\iupmat_mouse.c" - > - </File> - <File - RelativePath="..\srccontrols\matrix\iupmat_numlc.c" - > - </File> - <File - RelativePath="..\srccontrols\matrix\iupmat_scroll.c" - > - </File> - <File - RelativePath="..\srccontrols\matrix\iupmatrix.c" - > - </File> - <Filter - Name="inc" - > - <File - RelativePath="..\srccontrols\matrix\iupmat_aux.h" - > - </File> - <File - RelativePath="..\srccontrols\matrix\iupmat_cd.h" - > - </File> - <File - RelativePath="..\srccontrols\matrix\iupmat_colres.h" - > - </File> - <File - RelativePath="..\srccontrols\matrix\iupmat_def.h" - > - </File> - <File - RelativePath="..\srccontrols\matrix\iupmat_draw.h" - > - </File> - <File - RelativePath="..\srccontrols\matrix\iupmat_edit.h" - > - </File> - <File - RelativePath="..\srccontrols\matrix\iupmat_focus.h" - > - </File> - <File - RelativePath="..\srccontrols\matrix\iupmat_getset.h" - > - </File> - <File - RelativePath="..\srccontrols\matrix\iupmat_key.h" - > - </File> - <File - RelativePath="..\srccontrols\matrix\iupmat_mark.h" - > - </File> - <File - RelativePath="..\srccontrols\matrix\iupmat_mem.h" - > - </File> - <File - RelativePath="..\srccontrols\matrix\iupmat_mouse.h" - > - </File> - <File - RelativePath="..\srccontrols\matrix\iupmat_numlc.h" - > - </File> - <File - RelativePath="..\srccontrols\matrix\iupmat_scroll.h" - > - </File> - </Filter> - </Filter> - <File - RelativePath="..\srccontrols\iup_cdutil.c" - > - </File> - <File - RelativePath="..\srccontrols\iup_cells.c" - > - </File> - <File - RelativePath="..\srccontrols\iup_colorbar.c" - > - </File> - <File - RelativePath="..\srccontrols\iup_controls.c" - > - </File> - <File - RelativePath="..\srccontrols\iup_dial.c" - > - </File> - <File - RelativePath="..\srccontrols\iup_gauge.c" - > - </File> - <File - RelativePath="..\srccontrols\iup_oldmask.c" - > - </File> - <File - RelativePath="..\srccontrols\iupcontrols.def" - > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - </File> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/iup/mak.vc9/iupcore.vcproj b/iup/mak.vc9/iupcore.vcproj deleted file mode 100755 index 851395e..0000000 --- a/iup/mak.vc9/iupcore.vcproj +++ /dev/null @@ -1,593 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="9,00" - Name="iupcore" - ProjectGUID="{2C7E83B9-7FE8-432A-97BA-FCF4D0728408}" - Keyword="Win32Proj" - TargetFrameworkVersion="131072" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory="..\lib" - IntermediateDirectory="..\obj\Debug\$(ProjectName)" - ConfigurationType="4" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\src;..\src\win;..\include" - PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;IUP_ASSERT" - MinimalRebuild="false" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - UsePrecompiledHeader="0" - BrowseInformation="0" - WarningLevel="4" - Detect64BitPortabilityProblems="false" - DebugInformationFormat="1" - CompileAs="0" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - OutputFile="$(OutDir)\$(ProjectName).lib" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <Filter - Name="src" - > - <File - RelativePath="..\src\iup.c" - > - </File> - <File - RelativePath="..\src\iup_array.c" - > - </File> - <File - RelativePath="..\src\iup_assert.c" - > - </File> - <File - RelativePath="..\src\iup_attrib.c" - > - </File> - <File - RelativePath="..\src\iup_callback.c" - > - </File> - <File - RelativePath="..\src\iup_childtree.c" - > - </File> - <File - RelativePath="..\src\iup_class.c" - > - </File> - <File - RelativePath="..\src\iup_classattrib.c" - > - </File> - <File - RelativePath="..\src\iup_classbase.c" - > - </File> - <File - RelativePath="..\src\iup_dlglist.c" - > - </File> - <File - RelativePath="..\src\iup_focus.c" - > - </File> - <File - RelativePath="..\src\iup_font.c" - > - </File> - <File - RelativePath="..\src\iup_func.c" - > - </File> - <File - RelativePath="..\src\iup_globalattrib.c" - > - </File> - <File - RelativePath="..\src\iup_key.c" - > - </File> - <File - RelativePath="..\src\iup_layout.c" - > - </File> - <File - RelativePath="..\src\iup_ledlex.c" - > - </File> - <File - RelativePath="..\src\iup_ledparse.c" - > - </File> - <File - RelativePath="..\src\iup_mask.c" - > - </File> - <File - RelativePath="..\src\iup_maskmatch.c" - > - </File> - <File - RelativePath="..\src\iup_maskparse.c" - > - </File> - <File - RelativePath="..\src\iup_names.c" - > - </File> - <File - RelativePath="..\src\iup_object.c" - > - </File> - <File - RelativePath="..\src\iup_open.c" - > - </File> - <File - RelativePath="..\src\iup_register.c" - > - </File> - <File - RelativePath="..\src\iup_show.c" - > - </File> - <File - RelativePath="..\src\iup_str.c" - > - </File> - <File - RelativePath="..\src\iup_strmessage.c" - > - </File> - <File - RelativePath="..\src\iup_table.c" - > - </File> - </Filter> - <Filter - Name="inc" - > - <File - RelativePath="..\src\iup_array.h" - > - </File> - <File - RelativePath="..\src\iup_assert.h" - > - </File> - <File - RelativePath="..\src\iup_attrib.h" - > - </File> - <File - RelativePath="..\src\iup_childtree.h" - > - </File> - <File - RelativePath="..\src\iup_class.h" - > - </File> - <File - RelativePath="..\src\iup_classbase.h" - > - </File> - <File - RelativePath="..\src\iup_dlglist.h" - > - </File> - <File - RelativePath="..\src\iup_drv.h" - > - </File> - <File - RelativePath="..\src\iup_drvfont.h" - > - </File> - <File - RelativePath="..\src\iup_drvinfo.h" - > - </File> - <File - RelativePath="..\src\iup_focus.h" - > - </File> - <File - RelativePath="..\src\iup_func.h" - > - </File> - <File - RelativePath="..\src\iup_globalattrib.h" - > - </File> - <File - RelativePath="..\src\iup_key.h" - > - </File> - <File - RelativePath="..\src\iup_layout.h" - > - </File> - <File - RelativePath="..\src\iup_ledlex.h" - > - </File> - <File - RelativePath="..\src\iup_mask.h" - > - </File> - <File - RelativePath="..\src\iup_maskmatch.h" - > - </File> - <File - RelativePath="..\src\iup_maskparse.h" - > - </File> - <File - RelativePath="..\src\iup_names.h" - > - </File> - <File - RelativePath="..\src\iup_object.h" - > - </File> - <File - RelativePath="..\src\iup_predial.h" - > - </File> - <File - RelativePath="..\src\iup_register.h" - > - </File> - <File - RelativePath="..\src\iup_str.h" - > - </File> - <File - RelativePath="..\src\iup_strmessage.h" - > - </File> - <File - RelativePath="..\src\iup_table.h" - > - </File> - </Filter> - <Filter - Name="include" - Filter="h;hpp;hxx;hm;inl;inc" - > - <File - RelativePath="..\include\iup.h" - > - </File> - <File - RelativePath="..\include\iupcbs.h" - > - </File> - <File - RelativePath="..\include\iupkey.h" - > - </File> - <File - RelativePath="..\include\iupspin.h" - > - </File> - </Filter> - <Filter - Name="windows" - > - <File - RelativePath="..\src\win\iupwindows_help.c" - > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - PreprocessorDefinitions="_WIN32_WINNT=0x0500;_WIN32_IE=0x0500" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\src\win\iupwindows_info.c" - > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - PreprocessorDefinitions="_WIN32_WINNT=0x0500;_WIN32_IE=0x0500" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\src\win\iupwindows_main.c" - > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - PreprocessorDefinitions="_WIN32_WINNT=0x0500;_WIN32_IE=0x0500" - /> - </FileConfiguration> - </File> - </Filter> - <Filter - Name="src_controls" - > - <File - RelativePath="..\src\iup_box.c" - > - </File> - <File - RelativePath="..\src\iup_button.c" - > - </File> - <File - RelativePath="..\src\iup_canvas.c" - > - </File> - <File - RelativePath="..\src\iup_cbox.c" - > - </File> - <File - RelativePath="..\src\iup_colordlg.c" - > - </File> - <File - RelativePath="..\src\iup_dialog.c" - > - </File> - <File - RelativePath="..\src\iup_filedlg.c" - > - </File> - <File - RelativePath="..\src\iup_fill.c" - > - </File> - <File - RelativePath="..\src\iup_fontdlg.c" - > - </File> - <File - RelativePath="..\src\iup_frame.c" - > - </File> - <File - RelativePath="..\src\iup_getparam.c" - > - </File> - <File - RelativePath="..\src\iup_hbox.c" - > - </File> - <File - RelativePath="..\src\iup_image.c" - > - </File> - <File - RelativePath="..\src\iup_label.c" - > - </File> - <File - RelativePath="..\src\iup_list.c" - > - </File> - <File - RelativePath="..\src\iup_menu.c" - > - </File> - <File - RelativePath="..\src\iup_messagedlg.c" - > - </File> - <File - RelativePath="..\src\iup_normalizer.c" - > - </File> - <File - RelativePath="..\src\iup_predial.c" - > - </File> - <File - RelativePath="..\src\iup_progressbar.c" - > - </File> - <File - RelativePath="..\src\iup_radio.c" - > - </File> - <File - RelativePath="..\src\iup_sbox.c" - > - </File> - <File - RelativePath="..\src\iup_scanf.c" - > - </File> - <File - RelativePath="..\src\iup_spin.c" - > - </File> - <File - RelativePath="..\src\iup_split.c" - > - </File> - <File - RelativePath="..\src\iup_tabs.c" - > - </File> - <File - RelativePath="..\src\iup_text.c" - > - </File> - <File - RelativePath="..\src\iup_timer.c" - > - </File> - <File - RelativePath="..\src\iup_toggle.c" - > - </File> - <File - RelativePath="..\src\iup_tree.c" - > - </File> - <File - RelativePath="..\src\iup_user.c" - > - </File> - <File - RelativePath="..\src\iup_val.c" - > - </File> - <File - RelativePath="..\src\iup_vbox.c" - > - </File> - <File - RelativePath="..\src\iup_zbox.c" - > - </File> - </Filter> - <Filter - Name="inc_controls" - > - <File - RelativePath="..\src\iup_box.h" - > - </File> - <File - RelativePath="..\src\iup_button.h" - > - </File> - <File - RelativePath="..\src\iup_canvas.h" - > - </File> - <File - RelativePath="..\src\iup_dialog.h" - > - </File> - <File - RelativePath="..\src\iup_frame.h" - > - </File> - <File - RelativePath="..\src\iup_image.h" - > - </File> - <File - RelativePath="..\src\iup_label.h" - > - </File> - <File - RelativePath="..\src\iup_list.h" - > - </File> - <File - RelativePath="..\src\iup_menu.h" - > - </File> - <File - RelativePath="..\src\iup_progressbar.h" - > - </File> - <File - RelativePath="..\src\iup_stdcontrols.h" - > - </File> - <File - RelativePath="..\src\iup_tabs.h" - > - </File> - <File - RelativePath="..\src\iup_text.h" - > - </File> - <File - RelativePath="..\src\iup_timer.h" - > - </File> - <File - RelativePath="..\src\iup_toggle.h" - > - </File> - <File - RelativePath="..\src\iup_tree.h" - > - </File> - <File - RelativePath="..\src\iup_val.h" - > - </File> - </Filter> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/iup/mak.vc9/iupgl.vcproj b/iup/mak.vc9/iupgl.vcproj deleted file mode 100755 index e8d7b71..0000000 --- a/iup/mak.vc9/iupgl.vcproj +++ /dev/null @@ -1,127 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="9,00" - Name="iupgl" - ProjectGUID="{E251B4F4-0B0A-482B-BA18-2509ADC4B6AA}" - TargetFrameworkVersion="131072" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory="..\lib" - IntermediateDirectory="..\obj\Debug\$(ProjectName)" - ConfigurationType="4" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\include;..\src" - PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;IUP_ASSERT" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - UsePrecompiledHeader="0" - BrowseInformation="0" - WarningLevel="4" - SuppressStartupBanner="true" - DebugInformationFormat="1" - CompileAs="0" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" - Culture="1046" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - OutputFile="$(OutDir)/$(ProjectName).lib" - SuppressStartupBanner="true" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <File - RelativePath="..\srcgl\iup_glcanvas_win.c" - > - </File> - <File - RelativePath="..\srcgl\iup_glcanvas_x.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="d:\lng\x11inc" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\srcgl\iupgl.def" - > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\include\iupgl.h" - > - </File> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/iup/mak.vc9/iupgtk.vcproj b/iup/mak.vc9/iupgtk.vcproj deleted file mode 100755 index a84dd4a..0000000 --- a/iup/mak.vc9/iupgtk.vcproj +++ /dev/null @@ -1,225 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="9,00" - Name="iupgtk" - ProjectGUID="{2C7E83B9-7FE8-5555-97BA-FCF4D0728408}" - Keyword="Win32Proj" - TargetFrameworkVersion="131072" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory="..\lib" - IntermediateDirectory="..\obj\Debug\$(ProjectName)" - ConfigurationType="4" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\src;..\src\gtk;..\include;"d:\lng\gtk\include\atk-1.0";d:\lng\gtk\include\cairo;"d:\lng\gtk\include\glib-2.0";"d:\lng\gtk\include\gtk-2.0";"d:\lng\gtk\include\pango-1.0";"d:\lng\gtk\lib\gtk-2.0\include";"d:\lng\gtk\lib\glib-2.0\include"" - PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_WIN32_WINNT=0x0500;_WIN32_IE=0x0500;IUP_ASSERT;_CRT_SECURE_NO_DEPRECATE;GTK_DISABLE_DEPRECATED" - MinimalRebuild="false" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - UsePrecompiledHeader="0" - BrowseInformation="0" - WarningLevel="4" - Detect64BitPortabilityProblems="false" - DebugInformationFormat="1" - CompileAs="0" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - AdditionalDependencies="iupcore.lib" - AdditionalLibraryDirectories="$(OutDir)" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <Filter - Name="src" - > - <File - RelativePath="..\src\gtk\iupgtk_common.c" - > - </File> - <File - RelativePath="..\src\gtk\iupgtk_draw.c" - > - </File> - <File - RelativePath="..\src\gtk\iupgtk_focus.c" - > - </File> - <File - RelativePath="..\src\gtk\iupgtk_font.c" - > - </File> - <File - RelativePath="..\src\gtk\iupgtk_globalattrib.c" - > - </File> - <File - RelativePath="..\src\gtk\iupgtk_key.c" - > - </File> - <File - RelativePath="..\src\gtk\iupgtk_loop.c" - > - </File> - <File - RelativePath="..\src\gtk\iupgtk_open.c" - > - </File> - <File - RelativePath="..\src\gtk\iupgtk_tips.c" - > - </File> - </Filter> - <Filter - Name="inc" - > - <File - RelativePath="..\src\gtk\iupgtk_drv.h" - > - </File> - </Filter> - <Filter - Name="src_controls" - > - <File - RelativePath="..\src\gtk\iupgtk_button.c" - > - </File> - <File - RelativePath="..\src\gtk\iupgtk_canvas.c" - > - </File> - <File - RelativePath="..\src\gtk\iupgtk_clipboard.c" - > - </File> - <File - RelativePath="..\src\gtk\iupgtk_colordlg.c" - > - </File> - <File - RelativePath="..\src\gtk\iupgtk_dialog.c" - > - </File> - <File - RelativePath="..\src\gtk\iupgtk_filedlg.c" - > - </File> - <File - RelativePath="..\src\gtk\iupgtk_fontdlg.c" - > - </File> - <File - RelativePath="..\src\gtk\iupgtk_frame.c" - > - </File> - <File - RelativePath="..\src\gtk\iupgtk_image.c" - > - </File> - <File - RelativePath="..\src\gtk\iupgtk_label.c" - > - </File> - <File - RelativePath="..\src\gtk\iupgtk_list.c" - > - </File> - <File - RelativePath="..\src\gtk\iupgtk_menu.c" - > - </File> - <File - RelativePath="..\src\gtk\iupgtk_messagedlg.c" - > - </File> - <File - RelativePath="..\src\gtk\iupgtk_progressbar.c" - > - </File> - <File - RelativePath="..\src\gtk\iupgtk_tabs.c" - > - </File> - <File - RelativePath="..\src\gtk\iupgtk_text.c" - > - </File> - <File - RelativePath="..\src\gtk\iupgtk_timer.c" - > - </File> - <File - RelativePath="..\src\gtk\iupgtk_toggle.c" - > - </File> - <File - RelativePath="..\src\gtk\iupgtk_tree.c" - > - </File> - <File - RelativePath="..\src\gtk\iupgtk_val.c" - > - </File> - </Filter> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/iup/mak.vc9/iupim.vcproj b/iup/mak.vc9/iupim.vcproj deleted file mode 100755 index 103a318..0000000 --- a/iup/mak.vc9/iupim.vcproj +++ /dev/null @@ -1,103 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="9,00" - Name="iupim" - ProjectGUID="{E251B4F4-0B0A-482B-BA18-1234ADC4B6AA}" - TargetFrameworkVersion="0" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory="..\lib" - IntermediateDirectory="..\obj\Debug\$(ProjectName)" - ConfigurationType="4" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\include;..\src;..\..\im\include" - PreprocessorDefinitions="WIN32,_DEBUG,_CRT_SECURE_NO_DEPRECATE;IUP_ASSERT" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - UsePrecompiledHeader="0" - BrowseInformation="0" - WarningLevel="4" - SuppressStartupBanner="true" - DebugInformationFormat="1" - CompileAs="0" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" - Culture="1046" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - OutputFile="$(OutDir)/$(ProjectName).lib" - SuppressStartupBanner="true" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <File - RelativePath="..\srcim\iup_im.c" - > - </File> - <File - RelativePath="..\include\iupim.h" - > - </File> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/iup/mak.vc9/iupimglib.vcproj b/iup/mak.vc9/iupimglib.vcproj deleted file mode 100755 index 0a21853..0000000 --- a/iup/mak.vc9/iupimglib.vcproj +++ /dev/null @@ -1,142 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="9,00" - Name="iupimglib" - ProjectGUID="{E251B4F4-0B0A-482B-BB33-1234ADC4B6AA}" - TargetFrameworkVersion="131072" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory="..\lib" - IntermediateDirectory="..\obj\Debug\$(ProjectName)" - ConfigurationType="4" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\include;..\src" - PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - UsePrecompiledHeader="0" - BrowseInformation="0" - WarningLevel="4" - SuppressStartupBanner="true" - DebugInformationFormat="1" - CompileAs="0" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" - Culture="1046" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - OutputFile="$(OutDir)/$(ProjectName).lib" - SuppressStartupBanner="true" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <Filter - Name="inc" - > - <File - RelativePath="..\srcimglib\iup_imglib_bitmaps.h" - > - </File> - <File - RelativePath="..\srcimglib\iup_imglib_bitmaps8.h" - > - </File> - <File - RelativePath="..\srcimglib\iup_imglib_bitmapsgtk.h" - > - </File> - <File - RelativePath="..\srcimglib\iup_imglib_icons.h" - > - </File> - <File - RelativePath="..\srcimglib\iup_imglib_icons8.h" - > - </File> - <File - RelativePath="..\srcimglib\iup_imglib_logos.h" - > - </File> - <File - RelativePath="..\srcimglib\iup_imglib_logos8.h" - > - </File> - </Filter> - <File - RelativePath="..\srcimglib\iup_image_library.c" - > - </File> - <File - RelativePath="..\srcimglib\iupimglib.def" - > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - </File> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/iup/mak.vc9/iuplua3.vcproj b/iup/mak.vc9/iuplua3.vcproj deleted file mode 100755 index e46f316..0000000 --- a/iup/mak.vc9/iuplua3.vcproj +++ /dev/null @@ -1,202 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="9,00" - Name="iuplua3" - ProjectGUID="{1EBC7A53-4677-4C3A-8DFF-49D301F17D85}" - TargetFrameworkVersion="0" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory="..\lib" - IntermediateDirectory="..\obj\Debug\$(ProjectName)" - ConfigurationType="4" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\src;..\include;..\..\lua\include;..\..\cd\include;..\srclua3" - PreprocessorDefinitions="WIN32,_DEBUG,IUPLUA_USELOH,_CRT_SECURE_NO_DEPRECATE" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - UsePrecompiledHeader="0" - BrowseInformation="0" - WarningLevel="4" - SuppressStartupBanner="true" - DebugInformationFormat="1" - CompileAs="0" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - Culture="1046" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - OutputFile="$(OutDir)/$(ProjectName).lib" - SuppressStartupBanner="true" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <Filter - Name="Source Files" - Filter="cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90" - > - <File - RelativePath="..\srclua3\il_cbox.c" - > - </File> - <File - RelativePath="..\srclua3\il_getcolor.c" - > - </File> - <File - RelativePath="..\srclua3\il_getparam.c" - > - </File> - <File - RelativePath="..\srclua3\il_sbox.c" - > - </File> - <File - RelativePath="..\srclua3\il_scanf.c" - > - </File> - <File - RelativePath="..\srclua3\il_spin.c" - > - </File> - <File - RelativePath="..\srclua3\il_split.c" - > - </File> - <File - RelativePath="..\srclua3\il_tabs.c" - > - </File> - <File - RelativePath="..\srclua3\il_tree.c" - > - </File> - <File - RelativePath="..\srclua3\il_val.c" - > - </File> - <File - RelativePath="..\srclua3\iuplua.c" - > - </File> - <File - RelativePath="..\srclua3\iuplua_api.c" - > - </File> - <File - RelativePath="..\srclua3\iuplua_widgets.c" - > - </File> - </Filter> - <Filter - Name="Lua" - > - <File - RelativePath="..\srclua3\constants.lua" - > - </File> - <File - RelativePath="..\srclua3\iuplua.lua" - > - </File> - <File - RelativePath="..\srclua3\iuplua_widgets.lua" - > - </File> - <File - RelativePath="..\srclua3\sbox.lua" - > - </File> - <File - RelativePath="..\srclua3\spin.lua" - > - </File> - <File - RelativePath="..\srclua3\split.lua" - > - </File> - <File - RelativePath="..\srclua3\tabs.lua" - > - </File> - <File - RelativePath="..\srclua3\tree.lua" - > - </File> - <File - RelativePath="..\srclua3\val.lua" - > - </File> - </Filter> - <Filter - Name="Includes" - > - <File - RelativePath="..\srclua3\il.h" - > - </File> - <File - RelativePath="..\include\iuplua.h" - > - </File> - </Filter> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/iup/mak.vc9/iuplua5.vcproj b/iup/mak.vc9/iuplua5.vcproj deleted file mode 100755 index ad13650..0000000 --- a/iup/mak.vc9/iuplua5.vcproj +++ /dev/null @@ -1,478 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="9,00" - Name="iuplua5" - ProjectGUID="{1EBC7A53-4677-4C3A-8D4A-49D301F17D85}" - TargetFrameworkVersion="0" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory="..\lib" - IntermediateDirectory="..\obj\Debug\$(ProjectName)" - ConfigurationType="4" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\src;..\include;..\srclua5;..\..\lua5.1\include" - PreprocessorDefinitions="WIN32,_DEBUG,IUPLUA_USELOH,_CRT_SECURE_NO_DEPRECATE" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - UsePrecompiledHeader="0" - BrowseInformation="0" - WarningLevel="4" - SuppressStartupBanner="true" - DebugInformationFormat="1" - CompileAs="0" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - Culture="1046" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - OutputFile="$(OutDir)/$(ProjectName)1.lib" - SuppressStartupBanner="true" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <Filter - Name="Source Files" - Filter="cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90" - > - <File - RelativePath="..\srclua5\iuplua.c" - > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - WarningLevel="4" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\srclua5\iuplua_api.c" - > - </File> - <Filter - Name="controls" - > - <File - RelativePath="..\srclua5\il_button.c" - > - </File> - <File - RelativePath="..\srclua5\il_canvas.c" - > - </File> - <File - RelativePath="..\srclua5\il_cbox.c" - > - </File> - <File - RelativePath="..\srclua5\il_clipboard.c" - > - </File> - <File - RelativePath="..\srclua5\il_colordlg.c" - > - </File> - <File - RelativePath="..\srclua5\il_dialog.c" - > - </File> - <File - RelativePath="..\srclua5\il_filedlg.c" - > - </File> - <File - RelativePath="..\srclua5\il_fill.c" - > - </File> - <File - RelativePath="..\srclua5\il_fontdlg.c" - > - </File> - <File - RelativePath="..\srclua5\il_frame.c" - > - </File> - <File - RelativePath="..\srclua5\il_getcolor.c" - > - </File> - <File - RelativePath="..\srclua5\il_getparam.c" - > - </File> - <File - RelativePath="..\srclua5\il_hbox.c" - > - </File> - <File - RelativePath="..\srclua5\il_image.c" - > - </File> - <File - RelativePath="..\srclua5\il_imagergb.c" - > - </File> - <File - RelativePath="..\srclua5\il_imagergba.c" - > - </File> - <File - RelativePath="..\srclua5\il_item.c" - > - </File> - <File - RelativePath="..\srclua5\il_label.c" - > - </File> - <File - RelativePath="..\srclua5\il_list.c" - > - </File> - <File - RelativePath="..\srclua5\il_menu.c" - > - </File> - <File - RelativePath="..\srclua5\il_messagedlg.c" - > - </File> - <File - RelativePath="..\srclua5\il_multiline.c" - > - </File> - <File - RelativePath="..\srclua5\il_normalizer.c" - > - </File> - <File - RelativePath="..\srclua5\il_progressbar.c" - > - </File> - <File - RelativePath="..\srclua5\il_radio.c" - > - </File> - <File - RelativePath="..\srclua5\il_sbox.c" - > - </File> - <File - RelativePath="..\srclua5\il_scanf.c" - > - </File> - <File - RelativePath="..\srclua5\il_separator.c" - > - </File> - <File - RelativePath="..\srclua5\il_spin.c" - > - </File> - <File - RelativePath="..\srclua5\il_spinbox.c" - > - </File> - <File - RelativePath="..\srclua5\il_split.c" - > - </File> - <File - RelativePath="..\srclua5\il_submenu.c" - > - </File> - <File - RelativePath="..\srclua5\il_tabs.c" - > - </File> - <File - RelativePath="..\srclua5\il_text.c" - > - </File> - <File - RelativePath="..\srclua5\il_timer.c" - > - </File> - <File - RelativePath="..\srclua5\il_toggle.c" - > - </File> - <File - RelativePath="..\srclua5\il_tree.c" - > - </File> - <File - RelativePath="..\srclua5\il_tree_aux.c" - > - </File> - <File - RelativePath="..\srclua5\il_user.c" - > - </File> - <File - RelativePath="..\srclua5\il_val.c" - > - </File> - <File - RelativePath="..\srclua5\il_vbox.c" - > - </File> - <File - RelativePath="..\srclua5\il_zbox.c" - > - </File> - </Filter> - </Filter> - <Filter - Name="Lua" - > - <File - RelativePath="..\srclua5\constants.lua" - > - </File> - <File - RelativePath="..\srclua5\ctrl_template.lua" - > - </File> - <File - RelativePath="..\srclua5\generator.lua" - > - </File> - <File - RelativePath="..\srclua5\iuplua.lua" - > - </File> - <Filter - Name="controls" - > - <File - RelativePath="..\srclua5\button.lua" - > - </File> - <File - RelativePath="..\srclua5\canvas.lua" - > - </File> - <File - RelativePath="..\srclua5\cbox.lua" - > - </File> - <File - RelativePath="..\srclua5\clipboard.lua" - > - </File> - <File - RelativePath="..\srclua5\colordlg.lua" - > - </File> - <File - RelativePath="..\srclua5\dialog.lua" - > - </File> - <File - RelativePath="..\srclua5\filedlg.lua" - > - </File> - <File - RelativePath="..\srclua5\fill.lua" - > - </File> - <File - RelativePath="..\srclua5\fontdlg.lua" - > - </File> - <File - RelativePath="..\srclua5\frame.lua" - > - </File> - <File - RelativePath="..\srclua5\hbox.lua" - > - </File> - <File - RelativePath="..\srclua5\image.lua" - > - </File> - <File - RelativePath="..\srclua5\imagergb.lua" - > - </File> - <File - RelativePath="..\srclua5\imagergba.lua" - > - </File> - <File - RelativePath="..\srclua5\item.lua" - > - </File> - <File - RelativePath="..\srclua5\label.lua" - > - </File> - <File - RelativePath="..\srclua5\list.lua" - > - </File> - <File - RelativePath="..\srclua5\menu.lua" - > - </File> - <File - RelativePath="..\srclua5\messagedlg.lua" - > - </File> - <File - RelativePath="..\srclua5\multiline.lua" - > - </File> - <File - RelativePath="..\srclua5\normalizer.lua" - > - </File> - <File - RelativePath="..\srclua5\progressbar.lua" - > - </File> - <File - RelativePath="..\srclua5\radio.lua" - > - </File> - <File - RelativePath="..\srclua5\sbox.lua" - > - </File> - <File - RelativePath="..\srclua5\separator.lua" - > - </File> - <File - RelativePath="..\srclua5\spin.lua" - > - </File> - <File - RelativePath="..\srclua5\spinbox.lua" - > - </File> - <File - RelativePath="..\srclua5\split.lua" - > - </File> - <File - RelativePath="..\srclua5\submenu.lua" - > - </File> - <File - RelativePath="..\srclua5\tabs.lua" - > - </File> - <File - RelativePath="..\srclua5\text.lua" - > - </File> - <File - RelativePath="..\srclua5\timer.lua" - > - </File> - <File - RelativePath="..\srclua5\toggle.lua" - > - </File> - <File - RelativePath="..\srclua5\tree.lua" - > - </File> - <File - RelativePath="..\srclua5\user.lua" - > - </File> - <File - RelativePath="..\srclua5\val.lua" - > - </File> - <File - RelativePath="..\srclua5\vbox.lua" - > - </File> - <File - RelativePath="..\srclua5\zbox.lua" - > - </File> - </Filter> - </Filter> - <Filter - Name="Includes" - > - <File - RelativePath="..\srclua5\il.h" - > - </File> - <File - RelativePath="..\include\iuplua.h" - > - </File> - <File - RelativePath="..\srclua5\scanf.h" - > - </File> - </Filter> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/iup/mak.vc9/iuplua_pplot3.vcproj b/iup/mak.vc9/iuplua_pplot3.vcproj deleted file mode 100755 index 9965d01..0000000 --- a/iup/mak.vc9/iuplua_pplot3.vcproj +++ /dev/null @@ -1,110 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="9,00" - Name="iuplua_pplot3" - ProjectGUID="{1EBC7A53-4677-1234-DDDD-49DFF4417D85}" - TargetFrameworkVersion="0" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory="..\lib" - IntermediateDirectory="..\obj\Debug\$(ProjectName)" - ConfigurationType="4" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\src;..\include;..\..\lua\include;..\..\cd\include;..\srclua3" - PreprocessorDefinitions="WIN32,_DEBUG,IUPLUA_USELOH,_CRT_SECURE_NO_DEPRECATE" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - UsePrecompiledHeader="0" - BrowseInformation="0" - WarningLevel="4" - SuppressStartupBanner="true" - DebugInformationFormat="1" - CompileAs="0" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - Culture="1046" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - OutputFile="$(OutDir)/$(ProjectName).lib" - SuppressStartupBanner="true" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <Filter - Name="Source Files" - Filter="cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90" - > - <File - RelativePath="..\srclua3\iuplua_pplot.c" - > - </File> - </Filter> - <Filter - Name="Lua" - > - <File - RelativePath="..\srclua3\pplot.lua" - > - </File> - </Filter> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/iup/mak.vc9/iuplua_pplot5.vcproj b/iup/mak.vc9/iuplua_pplot5.vcproj deleted file mode 100755 index 0666045..0000000 --- a/iup/mak.vc9/iuplua_pplot5.vcproj +++ /dev/null @@ -1,122 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="9,00" - Name="iuplua_pplot5" - ProjectGUID="{1EBC7A53-4677-AAAA-1234-49D301F17D85}" - TargetFrameworkVersion="0" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory="..\lib" - IntermediateDirectory="..\obj\Debug\$(ProjectName)" - ConfigurationType="4" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\src;..\include;..\srclua5;..\..\lua5.1\include;..\..\cd\include" - PreprocessorDefinitions="WIN32,_DEBUG,IUPLUA_USELOH,_CRT_SECURE_NO_DEPRECATE" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - UsePrecompiledHeader="0" - BrowseInformation="0" - WarningLevel="4" - SuppressStartupBanner="true" - DebugInformationFormat="1" - CompileAs="0" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - Culture="1046" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - OutputFile="$(OutDir)/$(ProjectName)1.lib" - SuppressStartupBanner="true" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <Filter - Name="Source Files" - Filter="cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90" - > - <File - RelativePath="..\srclua5\il_pplot.c" - > - </File> - <File - RelativePath="..\srclua5\iuplua_pplot.c" - > - </File> - </Filter> - <Filter - Name="Lua" - > - <File - RelativePath="..\srclua5\pplot.lua" - > - </File> - </Filter> - <Filter - Name="Includes" - > - <File - RelativePath="..\include\iuplua_pplot.h" - > - </File> - </Filter> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/iup/mak.vc9/iupluacd3.vcproj b/iup/mak.vc9/iupluacd3.vcproj deleted file mode 100755 index 59a0d02..0000000 --- a/iup/mak.vc9/iupluacd3.vcproj +++ /dev/null @@ -1,99 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="9,00" - Name="iupluacd3" - ProjectGUID="{B4823266-DF8C-4EFB-91C0-C7E78C234EAC}" - TargetFrameworkVersion="0" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory="..\lib" - IntermediateDirectory="..\obj\Debug\$(ProjectName)" - ConfigurationType="4" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\include;..\..\lua\include;..\..\cd\include" - PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,CD_NO_OLD_INTERFACE,_CRT_SECURE_NO_DEPRECATE" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - PrecompiledHeaderFile="" - AssemblerListingLocation="" - ObjectFile="$(IntDir)\" - ProgramDataBaseFileName="$(IntDir)\vc90.pdb" - BrowseInformation="0" - WarningLevel="4" - SuppressStartupBanner="true" - DebugInformationFormat="1" - CompileAs="0" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - OutputFile="$(OutDir)/$(ProjectName).lib" - SuppressStartupBanner="true" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <File - RelativePath="..\srclua3\iuplua_cd.c" - > - </File> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/iup/mak.vc9/iupluacd5.vcproj b/iup/mak.vc9/iupluacd5.vcproj deleted file mode 100755 index 83aeede..0000000 --- a/iup/mak.vc9/iupluacd5.vcproj +++ /dev/null @@ -1,99 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="9,00" - Name="iupluacd5" - ProjectGUID="{B4823266-DF8C-4EFB-91C0-C7688C234EAC}" - TargetFrameworkVersion="0" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory="..\lib" - IntermediateDirectory="..\obj\Debug\$(ProjectName)" - ConfigurationType="4" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\include;..\..\lua5.1\include;..\..\cd\include" - PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,CD_NO_OLD_INTERFACE,_CRT_SECURE_NO_DEPRECATE" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - PrecompiledHeaderFile="" - AssemblerListingLocation="" - ObjectFile="$(IntDir)\" - ProgramDataBaseFileName="$(IntDir)\vc90.pdb" - BrowseInformation="0" - WarningLevel="4" - SuppressStartupBanner="true" - DebugInformationFormat="1" - CompileAs="0" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - OutputFile="$(OutDir)/$(ProjectName)1.lib" - SuppressStartupBanner="true" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <File - RelativePath="..\srclua5\iuplua_cd.c" - > - </File> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/iup/mak.vc9/iupluacontrols3.vcproj b/iup/mak.vc9/iupluacontrols3.vcproj deleted file mode 100755 index b2babd2..0000000 --- a/iup/mak.vc9/iupluacontrols3.vcproj +++ /dev/null @@ -1,170 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="9,00" - Name="iupluacontrols3" - ProjectGUID="{1EBC7A53-4677-4C3A-8DFF-49DFF4417D85}" - TargetFrameworkVersion="0" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory="..\lib" - IntermediateDirectory="..\obj\Debug\$(ProjectName)" - ConfigurationType="4" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\src;..\include;..\..\lua\include;..\..\cd\include;..\srclua3" - PreprocessorDefinitions="WIN32,_DEBUG,IUPLUA_USELOH,_CRT_SECURE_NO_DEPRECATE" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - UsePrecompiledHeader="0" - BrowseInformation="0" - WarningLevel="4" - SuppressStartupBanner="true" - DebugInformationFormat="1" - CompileAs="0" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - Culture="1046" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - OutputFile="$(OutDir)/$(ProjectName).lib" - SuppressStartupBanner="true" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <Filter - Name="Source Files" - Filter="cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90" - > - <File - RelativePath="..\srclua3\il_cells.c" - > - </File> - <File - RelativePath="..\srclua3\il_colorbar.c" - > - </File> - <File - RelativePath="..\srclua3\il_colorbrowser.c" - > - </File> - <File - RelativePath="..\srclua3\il_dial.c" - > - </File> - <File - RelativePath="..\srclua3\il_gauge.c" - > - </File> - <File - RelativePath="..\srclua3\il_mask.c" - > - </File> - <File - RelativePath="..\srclua3\il_matrix.c" - > - </File> - <File - RelativePath="..\srclua3\iuplua_controls.c" - > - </File> - </Filter> - <Filter - Name="Lua" - > - <File - RelativePath="..\srclua3\cells.lua" - > - </File> - <File - RelativePath="..\srclua3\colorbar.lua" - > - </File> - <File - RelativePath="..\srclua3\colorbrowser.lua" - > - </File> - <File - RelativePath="..\srclua3\dial.lua" - > - </File> - <File - RelativePath="..\srclua3\gauge.lua" - > - </File> - <File - RelativePath="..\srclua3\matrix.lua" - > - </File> - </Filter> - <Filter - Name="Includes" - > - <File - RelativePath="..\srclua3\il_controls.h" - > - </File> - <File - RelativePath="..\include\iupluacontrols.h" - > - </File> - </Filter> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/iup/mak.vc9/iupluacontrols5.vcproj b/iup/mak.vc9/iupluacontrols5.vcproj deleted file mode 100755 index bc1d6fe..0000000 --- a/iup/mak.vc9/iupluacontrols5.vcproj +++ /dev/null @@ -1,182 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="9,00" - Name="iupluacontrols5" - ProjectGUID="{1EBC7A53-4677-75D7-8D4A-49D301F17D85}" - TargetFrameworkVersion="0" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory="..\lib" - IntermediateDirectory="..\obj\Debug\$(ProjectName)" - ConfigurationType="4" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\src;..\include;..\srclua5;..\..\lua5.1\include;..\..\cd\include" - PreprocessorDefinitions="WIN32,_DEBUG,IUPLUA_USELOH,_CRT_SECURE_NO_DEPRECATE" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - UsePrecompiledHeader="0" - BrowseInformation="0" - WarningLevel="4" - SuppressStartupBanner="true" - DebugInformationFormat="1" - CompileAs="0" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - Culture="1046" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - OutputFile="$(OutDir)/$(ProjectName)1.lib" - SuppressStartupBanner="true" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <Filter - Name="Source Files" - Filter="cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90" - > - <File - RelativePath="..\srclua5\il_cells.c" - > - </File> - <File - RelativePath="..\srclua5\il_colorbar.c" - > - </File> - <File - RelativePath="..\srclua5\il_colorbrowser.c" - > - </File> - <File - RelativePath="..\srclua5\il_dial.c" - > - </File> - <File - RelativePath="..\srclua5\il_gauge.c" - > - </File> - <File - RelativePath="..\srclua5\il_mask.c" - > - </File> - <File - RelativePath="..\srclua5\il_matrix.c" - > - </File> - <File - RelativePath="..\srclua5\il_matrix_aux.c" - > - </File> - <File - RelativePath="..\srclua5\iuplua_controls.c" - > - </File> - </Filter> - <Filter - Name="Lua" - > - <File - RelativePath="..\srclua5\cells.lua" - > - </File> - <File - RelativePath="..\srclua5\colorbar.lua" - > - </File> - <File - RelativePath="..\srclua5\colorbrowser.lua" - > - </File> - <File - RelativePath="..\srclua5\dial.lua" - > - </File> - <File - RelativePath="..\srclua5\gauge.lua" - > - </File> - <File - RelativePath="..\srclua5\matrix.lua" - > - </File> - </Filter> - <Filter - Name="Includes" - > - <File - RelativePath="..\srclua5\il_controls.h" - > - </File> - <File - RelativePath="..\include\iupluacontrols.h" - > - </File> - <File - RelativePath="..\srclua5\luagetparam.h" - > - </File> - <File - RelativePath="..\srclua5\luamask.h" - > - </File> - </Filter> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/iup/mak.vc9/iupluaexe3.vcproj b/iup/mak.vc9/iupluaexe3.vcproj deleted file mode 100755 index 3ed6105..0000000 --- a/iup/mak.vc9/iupluaexe3.vcproj +++ /dev/null @@ -1,120 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="9,00" - Name="iuplua3_exe" - ProjectGUID="{A60D658D-766C-40DB-BAFF-59AB884D86FB}" - TargetFrameworkVersion="0" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory="..\bin" - IntermediateDirectory="..\obj\Debug\$(ProjectName)" - ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\include;..\src;..\..\lua\include;..\..\cd\include;..\..\im\include" - PreprocessorDefinitions="WIN32,_DEBUG,_CRT_SECURE_NO_DEPRECATE" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - UsePrecompiledHeader="0" - BrowseInformation="0" - WarningLevel="4" - SuppressStartupBanner="true" - DebugInformationFormat="1" - CompileAs="0" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" - Culture="1046" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - AdditionalOptions="/MACHINE:I386" - AdditionalDependencies="iup.lib comctl32.lib iupcontrols.lib iup_pplot.lib iuplua_pplot3.lib iupgl.lib cd.lib freetype6.lib iupcd.lib iupluagl3.lib iupim.lib iupluaim3.lib iupluacontrols3.lib lua.lib lualib.lib iuplua3.lib opengl32.lib glu32.lib im.lib cdlua3.lib iupluacd3.lib imlua3.lib" - OutputFile="$(OutDir)/iuplua3.exe" - LinkIncremental="1" - SuppressStartupBanner="true" - AdditionalLibraryDirectories="..\..\im\lib;..\..\cd\lib;..\lib;..\..\lua\lib\vc9" - GenerateManifest="false" - GenerateDebugInformation="true" - SubSystem="1" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <File - RelativePath="..\srcconsole\console3.lua" - > - </File> - <File - RelativePath="..\srcconsole\iup_lua3.c" - > - </File> - <File - RelativePath="..\srcconsole\iuplua3.rc" - > - </File> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/iup/mak.vc9/iupluaexe5.vcproj b/iup/mak.vc9/iupluaexe5.vcproj deleted file mode 100755 index 39d15f2..0000000 --- a/iup/mak.vc9/iupluaexe5.vcproj +++ /dev/null @@ -1,121 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="9,00" - Name="iuplua5_exe" - ProjectGUID="{A60D658D-766C-40DB-BAE4-59AB884D86FB}" - TargetFrameworkVersion="0" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory="..\bin" - IntermediateDirectory="..\obj\Debug\$(ProjectName)" - ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - TypeLibraryName="..\bin\iupluaexe5.tlb" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\include;..\srclua5;..\..\lua5.1\include;..\..\cd\include;..\..\im\include;..\..\luagl\include" - PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;IUPLUA_IMGLIB;USE_STATIC" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - UsePrecompiledHeader="0" - BrowseInformation="0" - WarningLevel="4" - SuppressStartupBanner="true" - DebugInformationFormat="1" - CompileAs="0" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" - Culture="1046" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - AdditionalOptions="/MACHINE:I386" - AdditionalDependencies="iup.lib comctl32.lib iupcontrols.lib iupimglib.lib iup_pplot.lib iupgl.lib cd.lib iupcd.lib freetype6.lib cdcontextplus.lib lua5.1.lib iuplua51.lib iupluaim51.lib iupluaimglib51.lib iupluagl51.lib iupluacontrols51.lib iuplua_pplot51.lib iupim.lib opengl32.lib glu32.lib gdiplus.lib im.lib cdlua51.lib iupluacd51.lib imlua51.lib imlua_process51.lib cdluaim51.lib im_process.lib" - OutputFile="$(OutDir)/iuplua51.exe" - LinkIncremental="1" - SuppressStartupBanner="true" - AdditionalLibraryDirectories="..\..\im\lib;..\..\cd\lib;..\lib;..\..\lua5.1\lib\vc9;..\..\luagl\lib\static;..\..\lfs\lib\vc9" - GenerateManifest="false" - GenerateDebugInformation="true" - SubSystem="1" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <File - RelativePath="..\srcconsole\console5.lua" - > - </File> - <File - RelativePath="..\srcconsole\iup_lua51.c" - > - </File> - <File - RelativePath="..\srcconsole\iuplua5.rc" - > - </File> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/iup/mak.vc9/iupluaexe5gtk.vcproj b/iup/mak.vc9/iupluaexe5gtk.vcproj deleted file mode 100755 index 038790d..0000000 --- a/iup/mak.vc9/iupluaexe5gtk.vcproj +++ /dev/null @@ -1,117 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="9,00" - Name="iuplua5gtk_exe" - ProjectGUID="{389DF3C9-A628-4F6D-8C52-8924FA01DE66}" - TargetFrameworkVersion="0" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory="..\bin" - IntermediateDirectory="..\obj\Debug\$(ProjectName)" - ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - TypeLibraryName="..\bin\iupluaexe5.tlb" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\include;..\srclua5;..\..\lua5.1\include;..\..\cd\include;..\..\im\include" - PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;IUPLUA_IMGLIB;USE_STATIC" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - UsePrecompiledHeader="0" - BrowseInformation="0" - WarningLevel="4" - SuppressStartupBanner="true" - DebugInformationFormat="1" - CompileAs="0" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" - Culture="1046" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - AdditionalOptions="/MACHINE:I386" - AdditionalDependencies="iupgtk.lib comctl32.lib gtk-win32-2.0.lib gdk-win32-2.0.lib gdk_pixbuf-2.0.lib pango-1.0.lib pangowin32-1.0.lib gobject-2.0.lib gmodule-2.0.lib glib-2.0.lib iupcontrols.lib iupimglib.lib iup_pplot.lib iupgl.lib cd.lib iupcd.lib freetype6.lib cdcontextplus.lib lua5.1.lib iuplua51.lib iupluaim51.lib iupluaimglib51.lib iupluagl51.lib iupluacontrols51.lib iuplua_pplot51.lib iupim.lib opengl32.lib glu32.lib gdiplus.lib im.lib cdlua51.lib iupluacd51.lib imlua51.lib imlua_process51.lib cdluaim51.lib im_process.lib" - OutputFile="$(OutDir)/iuplua51gtk.exe" - LinkIncremental="1" - SuppressStartupBanner="true" - AdditionalLibraryDirectories="..\..\im\lib;d:\lng\gtk\lib;..\..\cd\lib;..\lib;..\..\lua5.1\lib\vc9" - GenerateManifest="false" - GenerateDebugInformation="true" - SubSystem="1" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <File - RelativePath="..\srcconsole\console5.lua" - > - </File> - <File - RelativePath="..\srcconsole\iup_lua51.c" - > - </File> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/iup/mak.vc9/iupluagl3.vcproj b/iup/mak.vc9/iupluagl3.vcproj deleted file mode 100755 index f920704..0000000 --- a/iup/mak.vc9/iupluagl3.vcproj +++ /dev/null @@ -1,101 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="9,00" - Name="iupluagl3" - ProjectGUID="{1EBC7A53-33FF-4C3A-8DFF-49D301F17D85}" - TargetFrameworkVersion="0" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory="..\lib" - IntermediateDirectory="..\obj\Debug\$(ProjectName)" - ConfigurationType="4" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\src;..\include;..\..\lua\include;..\..\cd\include;..\srclua3" - PreprocessorDefinitions="WIN32,_DEBUG,_CRT_SECURE_NO_DEPRECATE" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - UsePrecompiledHeader="0" - BrowseInformation="0" - WarningLevel="4" - SuppressStartupBanner="true" - DebugInformationFormat="1" - CompileAs="0" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - Culture="1046" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - OutputFile="$(OutDir)/$(ProjectName).lib" - SuppressStartupBanner="true" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <File - RelativePath="..\srclua3\iuplua_glcanvas.c" - > - </File> - <File - RelativePath="..\include\iupluagl.h" - > - </File> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/iup/mak.vc9/iupluagl5.vcproj b/iup/mak.vc9/iupluagl5.vcproj deleted file mode 100755 index d8d08e4..0000000 --- a/iup/mak.vc9/iupluagl5.vcproj +++ /dev/null @@ -1,118 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="9,00" - Name="iupluagl5" - ProjectGUID="{1EBC7A53-4677-4C3A-8D4A-49D301157985}" - TargetFrameworkVersion="0" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory="..\lib" - IntermediateDirectory="..\obj\Debug\$(ProjectName)" - ConfigurationType="4" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\src;..\include;..\srclua5;..\..\lua5.1\include" - PreprocessorDefinitions="WIN32,_DEBUG,IUPLUA_USELOH,_CRT_SECURE_NO_DEPRECATE" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - UsePrecompiledHeader="0" - BrowseInformation="0" - WarningLevel="4" - SuppressStartupBanner="true" - DebugInformationFormat="1" - CompileAs="0" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - Culture="1046" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - OutputFile="$(OutDir)/$(ProjectName)1.lib" - SuppressStartupBanner="true" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <Filter - Name="Source Files" - Filter="cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90" - > - <File - RelativePath="..\srclua5\il_glcanvas.c" - > - </File> - <File - RelativePath="..\srclua5\iuplua_glcanvas.c" - > - </File> - <File - RelativePath="..\include\iupluagl.h" - > - </File> - </Filter> - <Filter - Name="Lua" - > - <File - RelativePath="..\srclua5\glcanvas.lua" - > - </File> - </Filter> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/iup/mak.vc9/iupluaim3.vcproj b/iup/mak.vc9/iupluaim3.vcproj deleted file mode 100755 index ee5ce8e..0000000 --- a/iup/mak.vc9/iupluaim3.vcproj +++ /dev/null @@ -1,101 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="9,00" - Name="iupluaim3" - ProjectGUID="{1EBC7A53-4677-4C3A-8DFF-269001F17D85}" - TargetFrameworkVersion="0" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory="..\lib" - IntermediateDirectory="..\obj\Debug\$(ProjectName)" - ConfigurationType="4" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\src;..\include;..\..\lua\include;..\..\cd\include;..\srclua3" - PreprocessorDefinitions="WIN32,_DEBUG,_CRT_SECURE_NO_DEPRECATE" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - UsePrecompiledHeader="0" - BrowseInformation="0" - WarningLevel="4" - SuppressStartupBanner="true" - DebugInformationFormat="1" - CompileAs="0" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - Culture="1046" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - OutputFile="$(OutDir)/$(ProjectName).lib" - SuppressStartupBanner="true" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <File - RelativePath="..\srclua3\iuplua_im.c" - > - </File> - <File - RelativePath="..\include\iupluaim.h" - > - </File> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/iup/mak.vc9/iupluaim5.vcproj b/iup/mak.vc9/iupluaim5.vcproj deleted file mode 100755 index f5c7a79..0000000 --- a/iup/mak.vc9/iupluaim5.vcproj +++ /dev/null @@ -1,101 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="9,00" - Name="iupluaim5" - ProjectGUID="{1EBC7A53-4677-ADF1-8D4A-49D301F17D85}" - TargetFrameworkVersion="0" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory="..\lib" - IntermediateDirectory="..\obj\Debug\$(ProjectName)" - ConfigurationType="4" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\src;..\include;..\srclua5;..\..\lua5.1\include" - PreprocessorDefinitions="WIN32,_DEBUG,IUPLUA_USELOH,_CRT_SECURE_NO_DEPRECATE" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - UsePrecompiledHeader="0" - BrowseInformation="0" - WarningLevel="4" - SuppressStartupBanner="true" - DebugInformationFormat="1" - CompileAs="0" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - Culture="1046" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - OutputFile="$(OutDir)/$(ProjectName)1.lib" - SuppressStartupBanner="true" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <File - RelativePath="..\srclua5\iuplua_im.c" - > - </File> - <File - RelativePath="..\include\iupluaim.h" - > - </File> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/iup/mak.vc9/iupluaimglib5.vcproj b/iup/mak.vc9/iupluaimglib5.vcproj deleted file mode 100755 index 8dc8a4d..0000000 --- a/iup/mak.vc9/iupluaimglib5.vcproj +++ /dev/null @@ -1,97 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="9,00" - Name="iupluaimglib5" - ProjectGUID="{1EBC7A53-4677-FFFF-1234-49D301F17D85}" - TargetFrameworkVersion="0" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory="..\lib" - IntermediateDirectory="..\obj\Debug\$(ProjectName)" - ConfigurationType="4" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\src;..\include;..\srclua5;..\..\lua5.1\include" - PreprocessorDefinitions="WIN32,_DEBUG,IUPLUA_USELOH,_CRT_SECURE_NO_DEPRECATE" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - UsePrecompiledHeader="0" - BrowseInformation="0" - WarningLevel="4" - SuppressStartupBanner="true" - DebugInformationFormat="1" - CompileAs="0" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - Culture="1046" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - OutputFile="$(OutDir)/$(ProjectName)1.lib" - SuppressStartupBanner="true" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <File - RelativePath="..\srclua5\iuplua_imglib.c" - > - </File> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/iup/mak.vc9/iupluaole3.vcproj b/iup/mak.vc9/iupluaole3.vcproj deleted file mode 100755 index dc60ae0..0000000 --- a/iup/mak.vc9/iupluaole3.vcproj +++ /dev/null @@ -1,101 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="9,00" - Name="iupluaole3" - ProjectGUID="{1EBC7A53-33FF-7890-7890-49D301F17D85}" - TargetFrameworkVersion="0" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory="..\lib" - IntermediateDirectory="..\obj\Debug\$(ProjectName)" - ConfigurationType="4" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\src;..\include;..\..\lua\include;..\..\cd\include;..\srclua3" - PreprocessorDefinitions="WIN32,_DEBUG,_CRT_SECURE_NO_DEPRECATE" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - UsePrecompiledHeader="0" - BrowseInformation="0" - WarningLevel="4" - SuppressStartupBanner="true" - DebugInformationFormat="1" - CompileAs="0" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - Culture="1046" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - OutputFile="$(OutDir)/$(ProjectName).lib" - SuppressStartupBanner="true" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <File - RelativePath="..\srclua3\iuplua_olecontrol.c" - > - </File> - <File - RelativePath="..\include\iupluaole.h" - > - </File> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/iup/mak.vc9/iupluaole5.vcproj b/iup/mak.vc9/iupluaole5.vcproj deleted file mode 100755 index bd86330..0000000 --- a/iup/mak.vc9/iupluaole5.vcproj +++ /dev/null @@ -1,114 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="9,00" - Name="iupluaole5" - ProjectGUID="{1EBC7A53-4677-5555-2222-49D301157985}" - TargetFrameworkVersion="0" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory="..\lib" - IntermediateDirectory="..\obj\Debug\$(ProjectName)" - ConfigurationType="4" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\src;..\include;..\srclua5;..\..\lua5.1\include" - PreprocessorDefinitions="WIN32,_DEBUG,IUPLUA_USELOH,_CRT_SECURE_NO_DEPRECATE" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - UsePrecompiledHeader="0" - BrowseInformation="0" - WarningLevel="4" - SuppressStartupBanner="true" - DebugInformationFormat="1" - CompileAs="0" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - Culture="1046" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - OutputFile="$(OutDir)/$(ProjectName)1.lib" - SuppressStartupBanner="true" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <Filter - Name="Source Files" - Filter="cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90" - > - <File - RelativePath="..\srclua5\il_olecontrol.c" - > - </File> - <File - RelativePath="..\include\iupluaole.h" - > - </File> - </Filter> - <Filter - Name="Lua" - > - <File - RelativePath="..\srclua5\olecontrol.lua" - > - </File> - </Filter> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/iup/mak.vc9/iupmot.vcproj b/iup/mak.vc9/iupmot.vcproj deleted file mode 100755 index 5c40695..0000000 --- a/iup/mak.vc9/iupmot.vcproj +++ /dev/null @@ -1,243 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="9,00" - Name="iupmot" - ProjectGUID="{2C7E83B9-1234-432A-97BA-FCF4D0728408}" - Keyword="Win32Proj" - TargetFrameworkVersion="131072" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory="..\lib" - IntermediateDirectory="..\obj\Debug\$(ProjectName)" - ConfigurationType="4" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\src;..\src\mot;..\include;d:\lng\x11inc;D:\_goodies\iup\_libs\openmotif2.1.30\lib" - PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_WIN32_WINNT=0x0500;_WIN32_IE=0x0500;IUP_ASSERT;_CRT_SECURE_NO_DEPRECATE" - MinimalRebuild="false" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - UsePrecompiledHeader="0" - BrowseInformation="0" - WarningLevel="4" - Detect64BitPortabilityProblems="false" - DebugInformationFormat="1" - CompileAs="0" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <Filter - Name="unix" - > - <File - RelativePath="..\src\mot\iupunix_help.c" - > - </File> - <File - RelativePath="..\src\mot\iupunix_info.c" - > - </File> - </Filter> - <Filter - Name="src" - > - <File - RelativePath="..\src\mot\iupmot_color.c" - > - </File> - <File - RelativePath="..\src\mot\iupmot_common.c" - > - </File> - <File - RelativePath="..\src\mot\iupmot_draw.c" - > - </File> - <File - RelativePath="..\src\mot\iupmot_focus.c" - > - </File> - <File - RelativePath="..\src\mot\iupmot_font.c" - > - </File> - <File - RelativePath="..\src\mot\iupmot_globalattrib.c" - > - </File> - <File - RelativePath="..\src\mot\iupmot_key.c" - > - </File> - <File - RelativePath="..\src\mot\iupmot_loop.c" - > - </File> - <File - RelativePath="..\src\mot\iupmot_open.c" - > - </File> - <File - RelativePath="..\src\mot\iupmot_tips.c" - > - </File> - </Filter> - <Filter - Name="inc" - > - <File - RelativePath="..\src\mot\iupmot_color.h" - > - </File> - <File - RelativePath="..\src\mot\iupmot_drv.h" - > - </File> - </Filter> - <Filter - Name="src_controls" - > - <File - RelativePath="..\src\mot\iupmot_button.c" - > - </File> - <File - RelativePath="..\src\mot\iupmot_canvas.c" - > - </File> - <File - RelativePath="..\src\mot\iupmot_clipboard.c" - > - </File> - <File - RelativePath="..\src\mot\iupmot_colordlg.c" - > - </File> - <File - RelativePath="..\src\mot\iupmot_dialog.c" - > - </File> - <File - RelativePath="..\src\mot\iupmot_filedlg.c" - > - </File> - <File - RelativePath="..\src\mot\iupmot_fontdlg.c" - > - </File> - <File - RelativePath="..\src\mot\iupmot_frame.c" - > - </File> - <File - RelativePath="..\src\mot\iupmot_image.c" - > - </File> - <File - RelativePath="..\src\mot\iupmot_label.c" - > - </File> - <File - RelativePath="..\src\mot\iupmot_list.c" - > - </File> - <File - RelativePath="..\src\mot\iupmot_menu.c" - > - </File> - <File - RelativePath="..\src\mot\iupmot_messagedlg.c" - > - </File> - <File - RelativePath="..\src\mot\iupmot_progressbar.c" - > - </File> - <File - RelativePath="..\src\mot\iupmot_tabs.c" - > - </File> - <File - RelativePath="..\src\mot\iupmot_text.c" - > - </File> - <File - RelativePath="..\src\mot\iupmot_timer.c" - > - </File> - <File - RelativePath="..\src\mot\iupmot_toggle.c" - > - </File> - <File - RelativePath="..\src\mot\iupmot_tree.c" - > - </File> - <File - RelativePath="..\src\mot\iupmot_val.c" - > - </File> - </Filter> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/iup/mak.vc9/iupole.vcproj b/iup/mak.vc9/iupole.vcproj deleted file mode 100755 index c1277a5..0000000 --- a/iup/mak.vc9/iupole.vcproj +++ /dev/null @@ -1,182 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="9,00" - Name="iupole" - ProjectGUID="{0C80BBEE-1B00-4567-1234-067292C84EDB}" - Keyword="Win32Proj" - TargetFrameworkVersion="131072" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory="..\lib" - IntermediateDirectory="..\obj\Debug\$(ProjectName)" - ConfigurationType="4" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\src;..\include" - PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE" - MinimalRebuild="false" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - UsePrecompiledHeader="0" - BrowseInformation="0" - WarningLevel="4" - Detect64BitPortabilityProblems="false" - DebugInformationFormat="1" - CompileAs="0" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - OutputFile="$(OutDir)/$(ProjectName).lib" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <Filter - Name="inc" - Filter="h;hpp;hxx;hm;inl;inc" - > - <File - RelativePath="..\srcole\tAmbientProperties.h" - > - </File> - <File - RelativePath="..\srcole\tDispatch.h" - > - </File> - <File - RelativePath="..\srcole\tLegacy.h" - > - </File> - <File - RelativePath="..\srcole\tOleClientSite.h" - > - </File> - <File - RelativePath="..\srcole\tOleControlSite.h" - > - </File> - <File - RelativePath="..\srcole\tOleHandler.h" - > - </File> - <File - RelativePath="..\srcole\tOleInPlaceFrame.h" - > - </File> - <File - RelativePath="..\srcole\tOleInPlaceSite.h" - > - </File> - </Filter> - <Filter - Name="src" - Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" - > - <File - RelativePath="..\srcole\iup_olecontrol.cpp" - > - </File> - <File - RelativePath="..\srcole\tAmbientProperties.cpp" - > - </File> - <File - RelativePath="..\srcole\tDispatch.cpp" - > - </File> - <File - RelativePath="..\srcole\tLegacy.cpp" - > - </File> - <File - RelativePath="..\srcole\tOleClientSite.cpp" - > - </File> - <File - RelativePath="..\srcole\tOleControlSite.cpp" - > - </File> - <File - RelativePath="..\srcole\tOleHandler.cpp" - > - </File> - <File - RelativePath="..\srcole\tOleInPlaceFrame.cpp" - > - </File> - <File - RelativePath="..\srcole\tOleInPlaceSite.cpp" - > - </File> - </Filter> - <Filter - Name="include" - > - <File - RelativePath="..\include\iupole.h" - > - </File> - </Filter> - <File - RelativePath="..\srcole\iupole.def" - > - </File> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/iup/mak.vc9/iupsample.vcproj b/iup/mak.vc9/iupsample.vcproj deleted file mode 100755 index 0e10bb6..0000000 --- a/iup/mak.vc9/iupsample.vcproj +++ /dev/null @@ -1,1179 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="9,00" - Name="iupsample" - ProjectGUID="{9462FDEA-3E53-4250-8710-DD50AF48607C}" - TargetFrameworkVersion="131072" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory="..\bin" - IntermediateDirectory="..\obj\Debug\$(ProjectName)" - ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - TypeLibraryName="..\bin\$(ProjectName).tlb" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\include;..\..\cd\include" - PreprocessorDefinitions="WIN32;_DEBUG;_WIN32_WINNT=0x0500;_WIN32_IE=0x0500;_CRT_SECURE_NO_DEPRECATE;__IUPDEF_H" - ExceptionHandling="1" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - UsePrecompiledHeader="0" - BrowseInformation="0" - WarningLevel="4" - SuppressStartupBanner="true" - DebugInformationFormat="1" - CompileAs="0" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" - Culture="1046" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="comctl32.lib ole32.lib opengl32.lib glu32.lib iup.lib iupgl.lib iupcontrols.lib iupimglib.lib cd.lib freetype6.lib iupcd.lib iup_pplot.lib" - LinkIncremental="1" - SuppressStartupBanner="true" - AdditionalLibraryDirectories="..\lib;..\..\cd\lib;d:\lng\SpeechSDK\Lib\i386" - GenerateManifest="false" - GenerateDebugInformation="true" - ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb" - SubSystem="1" - RandomizedBaseAddress="1" - DataExecutionPrevention="0" - TargetMachine="1" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <Filter - Name="C" - > - <File - RelativePath="..\html\examples\C\alarm.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\button.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\canvas1.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\canvas2.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\canvas3.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\cbox.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\cells_checkboard.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\cells_degrade.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\..\iup\html\examples\C\cells_numbering.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\colorbar.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\colorbrowser.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\dialog1.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\dialog2.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\filedlg.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\fill.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\frame.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\gauge.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\getattribute.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\getcolor.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\getfile.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\getparam.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\glcanvas.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\hbox.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\idle.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\image.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\item.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\label.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\list1.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\list2.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\listdialog.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\lua_init.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\mask.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\matrix.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\mdi.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\menu.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\message.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\multiline1.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\multiline2.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\ole_browser.cpp" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\pplot.cpp" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\progressbar.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\radio.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\sample.c" - > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\sbox1.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\sbox2.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\scanf.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\scrollbar.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\separator.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\submenu.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\tabs.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\text.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\timer.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\toggle.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\tree.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\val.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\vbox.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\zbox.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - </Filter> - <Filter - Name="Lua" - > - <File - RelativePath="..\html\examples\Lua\alarm.wlua" - > - </File> - <File - RelativePath="..\html\examples\Lua\button.wlua" - > - </File> - <File - RelativePath="..\html\examples\Lua\canvas.wlua" - > - </File> - <File - RelativePath="..\html\examples\Lua\colorbrowser.wlua" - > - </File> - <File - RelativePath="..\html\examples\Lua\console.wlua" - > - </File> - <File - RelativePath="..\html\examples\Lua\dial.wlua" - > - </File> - <File - RelativePath="..\html\examples\Lua\dialog.wlua" - > - </File> - <File - RelativePath="..\html\examples\Lua\filedlg.wlua" - > - </File> - <File - RelativePath="..\html\examples\Lua\fill.wlua" - > - </File> - <File - RelativePath="..\html\examples\Lua\fonts.wlua" - > - </File> - <File - RelativePath="..\html\examples\Lua\frame.wlua" - > - </File> - <File - RelativePath="..\html\examples\Lua\gauge.wlua" - > - </File> - <File - RelativePath="..\html\examples\Lua\getcolor.wlua" - > - </File> - <File - RelativePath="..\html\examples\Lua\getfile.wlua" - > - </File> - <File - RelativePath="..\html\examples\Lua\getparam.wlua" - > - </File> - <File - RelativePath="..\html\examples\Lua\glcanvas.wlua" - > - </File> - <File - RelativePath="..\html\examples\Lua\hbox.wlua" - > - </File> - <File - RelativePath="..\html\examples\Lua\idle.wlua" - > - </File> - <File - RelativePath="..\html\examples\Lua\image.wlua" - > - </File> - <File - RelativePath="..\html\examples\Lua\imagelib.wlua" - > - </File> - <File - RelativePath="..\html\examples\Lua\item.wlua" - > - </File> - <File - RelativePath="..\html\examples\Lua\label.wlua" - > - </File> - <File - RelativePath="..\html\examples\Lua\list.wlua" - > - </File> - <File - RelativePath="..\html\examples\Lua\listdialog.wlua" - > - </File> - <File - RelativePath="..\html\examples\Lua\luagl.wlua" - > - </File> - <File - RelativePath="..\html\examples\Lua\mask.wlua" - > - </File> - <File - RelativePath="..\html\examples\Lua\mask_matrix.wlua" - > - </File> - <File - RelativePath="..\html\examples\Lua\matrix.wlua" - > - </File> - <File - RelativePath="..\html\examples\Lua\matrix_cbmode.wlua" - > - </File> - <File - RelativePath="..\html\examples\Lua\menu.wlua" - > - </File> - <File - RelativePath="..\html\examples\Lua\message.wlua" - > - </File> - <File - RelativePath="..\html\examples\Lua\multiline.wlua" - > - </File> - <File - RelativePath="..\html\examples\Lua\radio.wlua" - > - </File> - <File - RelativePath="..\html\examples\Lua\sample.wlua" - > - </File> - <File - RelativePath="..\html\examples\Lua\sbox.wlua" - > - </File> - <File - RelativePath="..\html\examples\Lua\scanf.wlua" - > - </File> - <File - RelativePath="..\html\examples\Lua\separator.wlua" - > - </File> - <File - RelativePath="..\html\examples\Lua\submenu.wlua" - > - </File> - <File - RelativePath="..\html\examples\Lua\tabs.wlua" - > - </File> - <File - RelativePath="..\html\examples\Lua\text.wlua" - > - </File> - <File - RelativePath="..\html\examples\Lua\timer.wlua" - > - </File> - <File - RelativePath="..\html\examples\Lua\toggle.wlua" - > - </File> - <File - RelativePath="..\html\examples\Lua\tray.wlua" - > - </File> - <File - RelativePath="..\html\examples\Lua\tree1.wlua" - > - </File> - <File - RelativePath="..\html\examples\Lua\tree2.wlua" - > - </File> - <File - RelativePath="..\html\examples\Lua\tree3.wlua" - > - </File> - <File - RelativePath="..\html\examples\Lua\val.wlua" - > - </File> - <File - RelativePath="..\html\examples\Lua\vbox.wlua" - > - </File> - <File - RelativePath="..\html\examples\Lua\zbox.wlua" - > - </File> - </Filter> - <Filter - Name="LED" - > - <File - RelativePath="..\html\examples\LED\button.led" - > - </File> - <File - RelativePath="..\html\examples\LED\canvas.led" - > - </File> - <File - RelativePath="..\html\examples\LED\colorbrowser.led" - > - </File> - <File - RelativePath="..\html\examples\LED\dial.led" - > - </File> - <File - RelativePath="..\html\examples\LED\dialog.led" - > - </File> - <File - RelativePath="..\html\examples\LED\filedlg.led" - > - </File> - <File - RelativePath="..\html\examples\LED\fill.led" - > - </File> - <File - RelativePath="..\html\examples\LED\frame.led" - > - </File> - <File - RelativePath="..\html\examples\LED\gauge.led" - > - </File> - <File - RelativePath="..\html\examples\LED\hbox.led" - > - </File> - <File - RelativePath="..\html\examples\LED\image.led" - > - </File> - <File - RelativePath="..\html\examples\LED\label.led" - > - </File> - <File - RelativePath="..\html\examples\LED\list.led" - > - </File> - <File - RelativePath="..\html\examples\LED\matrix.led" - > - </File> - <File - RelativePath="..\html\examples\LED\menu.led" - > - </File> - <File - RelativePath="..\html\examples\LED\radio.led" - > - </File> - <File - RelativePath="..\html\examples\LED\sample.led" - > - </File> - <File - RelativePath="..\html\examples\LED\submenu.led" - > - </File> - <File - RelativePath="..\html\examples\LED\tabs.led" - > - </File> - <File - RelativePath="..\html\examples\LED\text.led" - > - </File> - <File - RelativePath="..\html\examples\LED\toggle.led" - > - </File> - <File - RelativePath="..\html\examples\LED\val.led" - > - </File> - <File - RelativePath="..\html\examples\LED\vbox.led" - > - </File> - <File - RelativePath="..\html\examples\LED\zbox.led" - > - </File> - <Filter - Name="src" - > - <File - RelativePath="..\html\examples\LED\dial.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\LED\filedlg.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\LED\gauge.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\LED\matrix.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\LED\tabs.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\LED\toggle.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - </Filter> - </Filter> - <File - RelativePath="..\test\iuptest.rc" - > - </File> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/iup/mak.vc9/iupsamplegtk.vcproj b/iup/mak.vc9/iupsamplegtk.vcproj deleted file mode 100755 index 485b773..0000000 --- a/iup/mak.vc9/iupsamplegtk.vcproj +++ /dev/null @@ -1,798 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="9,00" - Name="iupsamplegtk" - ProjectGUID="{C684B76D-52EC-49CE-84F2-B031509419A5}" - TargetFrameworkVersion="131072" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory="..\bin" - IntermediateDirectory="..\obj\Debug\$(ProjectName)" - ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - TypeLibraryName="..\bin\$(ProjectName).tlb" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\include;"d:\lng\gtk\include\atk-1.0";d:\lng\gtk\include\cairo;"d:\lng\gtk\include\glib-2.0";"d:\lng\gtk\include\gtk-2.0";"d:\lng\gtk\include\pango-1.0";"d:\lng\gtk\lib\gtk-2.0\include";"d:\lng\gtk\lib\glib-2.0\include";..\..\cd\include" - PreprocessorDefinitions="WIN32;_DEBUG;_WIN32_WINNT=0x0400;_CRT_SECURE_NO_DEPRECATE;USE_GTK" - ExceptionHandling="0" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - UsePrecompiledHeader="0" - BrowseInformation="0" - WarningLevel="4" - SuppressStartupBanner="true" - DebugInformationFormat="1" - CompileAs="0" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" - Culture="1046" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - AdditionalOptions="/MACHINE:I386" - AdditionalDependencies="comctl32.lib ole32.lib opengl32.lib glu32.lib gtk-win32-2.0.lib gdk-win32-2.0.lib gdk_pixbuf-2.0.lib pango-1.0.lib pangowin32-1.0.lib gobject-2.0.lib gmodule-2.0.lib glib-2.0.lib iupgtk.lib iupgl.lib iupcontrols.lib iupimglib.lib iup_pplot.lib cd.lib freetype6.lib iupcd.lib" - LinkIncremental="1" - SuppressStartupBanner="true" - AdditionalLibraryDirectories="..\lib;d:\lng\gtk\lib;..\..\cd\lib" - GenerateDebugInformation="true" - ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb" - SubSystem="1" - RandomizedBaseAddress="1" - DataExecutionPrevention="0" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <Filter - Name="C" - > - <File - RelativePath="..\html\examples\C\alarm.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\button.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\canvas1.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\canvas2.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\canvas3.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\cbox.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\cells_checkboard.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\cells_degrade.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\..\iup\html\examples\C\cells_numbering.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\colorbar.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\colorbrowser.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\dialog1.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\dialog2.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\filedlg.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\fill.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\frame.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\gauge.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\getattribute.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\getcolor.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\getfile.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\getparam.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\glcanvas.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\hbox.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\idle.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\image.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\item.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\label.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\list1.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\list2.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\listdialog.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\lua_init.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\mask.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\matrix.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\mdi.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\menu.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\message.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\multiline1.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\multiline2.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\ole_browser.cpp" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\pplot.cpp" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\progressbar.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\radio.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\sample.c" - > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\sbox1.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\sbox2.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\scanf.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\scrollbar.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\separator.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\submenu.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\tabs.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\text.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\timer.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\toggle.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\tree.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\val.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\vbox.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\html\examples\C\zbox.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - </Filter> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/iup/mak.vc9/iuptest.vcproj b/iup/mak.vc9/iuptest.vcproj deleted file mode 100755 index ac8f359..0000000 --- a/iup/mak.vc9/iuptest.vcproj +++ /dev/null @@ -1,324 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="9,00" - Name="iuptest" - ProjectGUID="{2F92EC58-D94C-40BF-8C82-77607C72E1E3}" - TargetFrameworkVersion="131072" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory="..\bin" - IntermediateDirectory="..\obj\Debug\$(ProjectName)" - ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - TypeLibraryName="..\bin\$(ProjectName).tlb" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\include;..\..\cd\include;D:\LNG\vld\include" - PreprocessorDefinitions="WIN32;_DEBUG;_WIN32_WINNT=0x0500;_WIN32_IE=0x0500;_CRT_SECURE_NO_DEPRECATE;__IUPDEF_H;BIG_TEST;USE_OPENGL;PPLOT_TEST" - ExceptionHandling="0" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - UsePrecompiledHeader="0" - BrowseInformation="0" - WarningLevel="4" - SuppressStartupBanner="true" - DebugInformationFormat="1" - CompileAs="0" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" - Culture="1046" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="comctl32.lib ole32.lib opengl32.lib glu32.lib iup.lib iupgl.lib iupcontrols.lib iupimglib.lib cd.lib freetype6.lib iupcd.lib iup_pplot.lib vld.lib" - LinkIncremental="1" - SuppressStartupBanner="true" - AdditionalLibraryDirectories="..\lib;..\..\cd\lib;d:\lng\SpeechSDK\Lib\i386;D:\LNG\vld\lib" - GenerateManifest="false" - GenerateDebugInformation="true" - ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb" - SubSystem="1" - RandomizedBaseAddress="1" - DataExecutionPrevention="0" - TargetMachine="1" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <Filter - Name="Resources" - > - <File - RelativePath="..\test\dial.led" - > - </File> - <File - RelativePath="..\test\iuptest.rc" - > - </File> - </Filter> - <File - RelativePath="..\test\bigtest.c" - > - </File> - <File - RelativePath="..\test\button.c" - > - </File> - <File - RelativePath="..\test\canvas.c" - > - </File> - <File - RelativePath="..\test\canvas_cddbuffer.c" - > - </File> - <File - RelativePath="..\test\canvas_cdsimple.c" - > - </File> - <File - RelativePath="..\test\canvas_scrollbar.c" - > - </File> - <File - RelativePath="..\test\cells_checkboard.c" - > - </File> - <File - RelativePath="..\test\cells_degrade.c" - > - </File> - <File - RelativePath="..\test\cells_numbering.c" - > - </File> - <File - RelativePath="..\test\class_conf.c" - > - </File> - <File - RelativePath="..\test\clipboard.c" - > - </File> - <File - RelativePath="..\test\colorbar.c" - > - </File> - <File - RelativePath="..\test\colorbrowser.c" - > - </File> - <File - RelativePath="..\test\dial.c" - > - </File> - <File - RelativePath="..\test\dialog.c" - > - </File> - <File - RelativePath="..\test\frame.c" - > - </File> - <File - RelativePath="..\test\gauge.c" - > - </File> - <File - RelativePath="..\test\getcolor.c" - > - </File> - <File - RelativePath="..\test\getparam.c" - > - </File> - <File - RelativePath="..\test\glcanvas.c" - > - </File> - <File - RelativePath="..\test\glcanvas_cube.c" - > - </File> - <File - RelativePath="..\test\hbox.c" - > - </File> - <File - RelativePath="..\test\idle.c" - > - </File> - <File - RelativePath="..\test\label.c" - > - </File> - <File - RelativePath="..\test\list.c" - > - </File> - <File - RelativePath="..\test\matrix.c" - > - </File> - <File - RelativePath="..\test\matrix_cbmode.c" - > - </File> - <File - RelativePath="..\test\matrix_cbs.c" - > - </File> - <File - RelativePath="..\test\mdi.c" - > - </File> - <File - RelativePath="..\test\menu.c" - > - </File> - <File - RelativePath="..\test\ole.cpp" - > - </File> - <File - RelativePath="..\test\pplot.c" - > - </File> - <File - RelativePath="..\test\predialogs.c" - > - </File> - <File - RelativePath="..\test\progressbar.c" - > - </File> - <File - RelativePath="..\test\sample.c" - > - </File> - <File - RelativePath="..\test\sbox.c" - > - </File> - <File - RelativePath="..\test\scanf.c" - > - </File> - <File - RelativePath="..\test\spin.c" - > - </File> - <File - RelativePath="..\test\split.c" - > - </File> - <File - RelativePath="..\test\sysinfo.c" - > - </File> - <File - RelativePath="..\test\tabs.c" - > - </File> - <File - RelativePath="..\test\text.c" - > - </File> - <File - RelativePath="..\test\text_spin.c" - > - </File> - <File - RelativePath="..\test\timer.c" - > - </File> - <File - RelativePath="..\test\toggle.c" - > - </File> - <File - RelativePath="..\test\tray.c" - > - </File> - <File - RelativePath="..\test\tree.c" - > - </File> - <File - RelativePath="..\test\val.c" - > - </File> - <File - RelativePath="..\test\vbox.c" - > - </File> - <File - RelativePath="..\test\zbox.c" - > - </File> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/iup/mak.vc9/iuptestgtk.vcproj b/iup/mak.vc9/iuptestgtk.vcproj deleted file mode 100755 index d8c092c..0000000 --- a/iup/mak.vc9/iuptestgtk.vcproj +++ /dev/null @@ -1,316 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="9,00" - Name="iuptestgtk" - ProjectGUID="{2F92EC58-1234-40BF-5678-77607C72E1E3}" - TargetFrameworkVersion="131072" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory="..\bin" - IntermediateDirectory="..\obj\Debug\$(ProjectName)" - ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - TypeLibraryName="..\bin\$(ProjectName).tlb" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\include;"d:\lng\gtk\include\atk-1.0";d:\lng\gtk\include\cairo;"d:\lng\gtk\include\glib-2.0";"d:\lng\gtk\include\gtk-2.0";"d:\lng\gtk\include\pango-1.0";"d:\lng\gtk\lib\gtk-2.0\include";"d:\lng\gtk\lib\glib-2.0\include";..\..\cd\include;D:\LNG\vld\include" - PreprocessorDefinitions="WIN32;_DEBUG;_WIN32_WINNT=0x0400;_CRT_SECURE_NO_DEPRECATE;BIG_TEST;USE_OPENGL;PPLOT_TEST" - ExceptionHandling="0" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - UsePrecompiledHeader="0" - BrowseInformation="0" - WarningLevel="4" - SuppressStartupBanner="true" - DebugInformationFormat="1" - CompileAs="0" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" - Culture="1046" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - AdditionalOptions="/MACHINE:I386" - AdditionalDependencies="comctl32.lib ole32.lib opengl32.lib glu32.lib gtk-win32-2.0.lib gdk-win32-2.0.lib gdk_pixbuf-2.0.lib pango-1.0.lib pangowin32-1.0.lib gobject-2.0.lib gmodule-2.0.lib glib-2.0.lib iupgtk.lib iupgl.lib iupcontrols.lib iupimglib.lib iup_pplot.lib cd.lib freetype6.lib iupcd.lib" - LinkIncremental="1" - SuppressStartupBanner="true" - AdditionalLibraryDirectories="..\lib;d:\lng\gtk\lib;..\..\cd\lib;D:\LNG\vld\lib" - GenerateManifest="false" - GenerateDebugInformation="true" - ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb" - SubSystem="1" - RandomizedBaseAddress="1" - DataExecutionPrevention="0" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <Filter - Name="Resources" - > - <File - RelativePath="..\test\dial.led" - > - </File> - </Filter> - <File - RelativePath="..\test\bigtest.c" - > - </File> - <File - RelativePath="..\test\button.c" - > - </File> - <File - RelativePath="..\test\canvas.c" - > - </File> - <File - RelativePath="..\test\canvas_cddbuffer.c" - > - </File> - <File - RelativePath="..\test\canvas_cdsimple.c" - > - </File> - <File - RelativePath="..\test\canvas_scrollbar.c" - > - </File> - <File - RelativePath="..\test\cells_checkboard.c" - > - </File> - <File - RelativePath="..\test\cells_degrade.c" - > - </File> - <File - RelativePath="..\test\cells_numbering.c" - > - </File> - <File - RelativePath="..\test\class_conf.c" - > - </File> - <File - RelativePath="..\test\clipboard.c" - > - </File> - <File - RelativePath="..\test\colorbar.c" - > - </File> - <File - RelativePath="..\test\colorbrowser.c" - > - </File> - <File - RelativePath="..\test\dial.c" - > - </File> - <File - RelativePath="..\test\dialog.c" - > - </File> - <File - RelativePath="..\test\frame.c" - > - </File> - <File - RelativePath="..\test\gauge.c" - > - </File> - <File - RelativePath="..\test\getcolor.c" - > - </File> - <File - RelativePath="..\test\getparam.c" - > - </File> - <File - RelativePath="..\test\glcanvas.c" - > - </File> - <File - RelativePath="..\test\glcanvas_cube.c" - > - </File> - <File - RelativePath="..\test\hbox.c" - > - </File> - <File - RelativePath="..\test\idle.c" - > - </File> - <File - RelativePath="..\test\label.c" - > - </File> - <File - RelativePath="..\test\list.c" - > - </File> - <File - RelativePath="..\test\matrix.c" - > - </File> - <File - RelativePath="..\test\matrix_cbmode.c" - > - </File> - <File - RelativePath="..\test\matrix_cbs.c" - > - </File> - <File - RelativePath="..\test\mdi.c" - > - </File> - <File - RelativePath="..\test\menu.c" - > - </File> - <File - RelativePath="..\test\pplot.c" - > - </File> - <File - RelativePath="..\test\predialogs.c" - > - </File> - <File - RelativePath="..\test\progressbar.c" - > - </File> - <File - RelativePath="..\test\sample.c" - > - </File> - <File - RelativePath="..\test\sbox.c" - > - </File> - <File - RelativePath="..\test\scanf.c" - > - </File> - <File - RelativePath="..\test\spin.c" - > - </File> - <File - RelativePath="..\test\split.c" - > - </File> - <File - RelativePath="..\test\sysinfo.c" - > - </File> - <File - RelativePath="..\test\tabs.c" - > - </File> - <File - RelativePath="..\test\text.c" - > - </File> - <File - RelativePath="..\test\text_spin.c" - > - </File> - <File - RelativePath="..\test\timer.c" - > - </File> - <File - RelativePath="..\test\toggle.c" - > - </File> - <File - RelativePath="..\test\tray.c" - > - </File> - <File - RelativePath="..\test\tree.c" - > - </File> - <File - RelativePath="..\test\val.c" - > - </File> - <File - RelativePath="..\test\vbox.c" - > - </File> - <File - RelativePath="..\test\zbox.c" - > - </File> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/iup/mak.vc9/iupview.vcproj b/iup/mak.vc9/iupview.vcproj deleted file mode 100755 index 440fbde..0000000 --- a/iup/mak.vc9/iupview.vcproj +++ /dev/null @@ -1,117 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="9,00" - Name="iupview" - ProjectGUID="{2F92EC58-D94C-40BF-4444-77607C72E1E3}" - TargetFrameworkVersion="0" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory="..\bin" - IntermediateDirectory="..\obj\Debug\$(ProjectName)" - ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - TypeLibraryName="..\bin\debug/iupview.tlb" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\include;..\src" - PreprocessorDefinitions="WIN32,_DEBUG,USE_IM,_CRT_SECURE_NO_DEPRECATE" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - UsePrecompiledHeader="0" - BrowseInformation="0" - WarningLevel="4" - SuppressStartupBanner="true" - DebugInformationFormat="1" - CompileAs="0" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" - Culture="1046" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - AdditionalOptions="/MACHINE:I386" - AdditionalDependencies="comctl32.lib ole32.lib iup.lib iupcontrols.lib cd.lib freetype6.lib iupcd.lib iupgl.lib opengl32.lib glu32.lib iupimglib.lib im.lib iupim.lib" - LinkIncremental="1" - SuppressStartupBanner="true" - AdditionalLibraryDirectories="..\..\im\lib;..\..\cd\lib;..\lib" - GenerateManifest="false" - GenerateDebugInformation="true" - ProgramDatabaseFile="..\bin\iupview.pdb" - SubSystem="1" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <File - RelativePath="..\etc\iup.rc" - > - </File> - <File - RelativePath="..\srcview\iup_view.c" - > - </File> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/iup/mak.vc9/iupviewgtk.vcproj b/iup/mak.vc9/iupviewgtk.vcproj deleted file mode 100755 index e622956..0000000 --- a/iup/mak.vc9/iupviewgtk.vcproj +++ /dev/null @@ -1,113 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="9,00" - Name="iupviewgtk" - ProjectGUID="{E7D19356-B0AB-44AD-ACCB-5FFFCC4837BE}" - TargetFrameworkVersion="0" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory="..\bin" - IntermediateDirectory="..\obj\Debug\$(ProjectName)" - ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - TypeLibraryName="..\bin\debug/iupviewgtk.tlb" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\include;..\src" - PreprocessorDefinitions="WIN32,_DEBUG,USE_IM,_CRT_SECURE_NO_DEPRECATE" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - UsePrecompiledHeader="0" - BrowseInformation="0" - WarningLevel="4" - SuppressStartupBanner="true" - DebugInformationFormat="1" - CompileAs="0" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" - Culture="1046" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - AdditionalOptions="/MACHINE:I386" - AdditionalDependencies="comctl32.lib ole32.lib gtk-win32-2.0.lib gdk-win32-2.0.lib gdk_pixbuf-2.0.lib pango-1.0.lib pangowin32-1.0.lib gobject-2.0.lib gmodule-2.0.lib glib-2.0.lib iupgtk.lib iupcontrols.lib cd.lib freetype6.lib iupcd.lib iupgl.lib opengl32.lib glu32.lib iupimglib.lib im.lib iupim.lib" - LinkIncremental="1" - SuppressStartupBanner="true" - AdditionalLibraryDirectories="..\..\im\lib;d:\lng\gtk\lib;..\..\cd\lib;..\lib" - GenerateManifest="true" - GenerateDebugInformation="true" - ProgramDatabaseFile="..\bin\iupviewgtk.pdb" - SubSystem="1" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <File - RelativePath="..\srcview\iup_view.c" - > - </File> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/iup/mak.vc9/iupwin.vcproj b/iup/mak.vc9/iupwin.vcproj deleted file mode 100755 index 94ef390..0000000 --- a/iup/mak.vc9/iupwin.vcproj +++ /dev/null @@ -1,258 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="9,00" - Name="iupwin" - ProjectGUID="{2C7E83B9-123A-BCDF-97BA-FCF4D0728408}" - Keyword="Win32Proj" - TargetFrameworkVersion="131072" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory="..\lib" - IntermediateDirectory="..\obj\Debug\$(ProjectName)" - ConfigurationType="4" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\src;..\include" - PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_WIN32_WINNT=0x0500;_WIN32_IE=0x0500;WINVER=0x0500;IUP_ASSERT;_CRT_SECURE_NO_DEPRECATE;NOTREEVIEW" - MinimalRebuild="false" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - UsePrecompiledHeader="0" - BrowseInformation="0" - WarningLevel="4" - Detect64BitPortabilityProblems="false" - DebugInformationFormat="1" - CompileAs="0" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - AdditionalDependencies="iupcore.lib" - OutputFile="$(OutDir)\iup.lib" - AdditionalLibraryDirectories="$(OutDir)" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <Filter - Name="inc" - > - <File - RelativePath="..\src\win\iupwin_brush.h" - > - </File> - <File - RelativePath="..\src\win\iupwin_draw.h" - > - </File> - <File - RelativePath="..\src\win\iupwin_drv.h" - > - </File> - <File - RelativePath="..\src\win\iupwin_handle.h" - > - </File> - <File - RelativePath="..\src\win\iupwin_info.h" - > - </File> - </Filter> - <Filter - Name="src" - > - <File - RelativePath="..\src\win\iupwin_brush.c" - > - </File> - <File - RelativePath="..\src\win\iupwin_common.c" - > - </File> - <File - RelativePath="..\src\win\iupwin_draw.c" - > - </File> - <File - RelativePath="..\src\win\iupwin_focus.c" - > - </File> - <File - RelativePath="..\src\win\iupwin_font.c" - > - </File> - <File - RelativePath="..\src\win\iupwin_globalattrib.c" - > - </File> - <File - RelativePath="..\src\win\iupwin_handle.c" - > - </File> - <File - RelativePath="..\src\win\iupwin_info.c" - > - </File> - <File - RelativePath="..\src\win\iupwin_key.c" - > - </File> - <File - RelativePath="..\src\win\iupwin_loop.c" - > - </File> - <File - RelativePath="..\src\win\iupwin_open.c" - > - </File> - <File - RelativePath="..\src\win\iupwin_tips.c" - > - </File> - </Filter> - <Filter - Name="src_controls" - > - <File - RelativePath="..\src\win\iupwin_button.c" - > - </File> - <File - RelativePath="..\src\win\iupwin_canvas.c" - > - </File> - <File - RelativePath="..\src\win\iupwin_clipboard.c" - > - </File> - <File - RelativePath="..\src\win\iupwin_colordlg.c" - > - </File> - <File - RelativePath="..\src\win\iupwin_dialog.c" - > - </File> - <File - RelativePath="..\src\win\iupwin_filedlg.c" - > - </File> - <File - RelativePath="..\src\win\iupwin_fontdlg.c" - > - </File> - <File - RelativePath="..\src\win\iupwin_frame.c" - > - </File> - <File - RelativePath="..\src\win\iupwin_image.c" - > - </File> - <File - RelativePath="..\src\win\iupwin_label.c" - > - </File> - <File - RelativePath="..\src\win\iupwin_list.c" - > - </File> - <File - RelativePath="..\src\win\iupwin_menu.c" - > - </File> - <File - RelativePath="..\src\win\iupwin_messagedlg.c" - > - </File> - <File - RelativePath="..\src\win\iupwin_progressbar.c" - > - </File> - <File - RelativePath="..\src\win\iupwin_tabs.c" - > - </File> - <File - RelativePath="..\src\win\iupwin_text.c" - > - </File> - <File - RelativePath="..\src\win\iupwin_timer.c" - > - </File> - <File - RelativePath="..\src\win\iupwin_toggle.c" - > - </File> - <File - RelativePath="..\src\win\iupwin_tree.c" - > - </File> - <File - RelativePath="..\src\win\iupwin_val.c" - > - </File> - </Filter> - <File - RelativePath="..\src\iup.def" - > - </File> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/iup/mak.vc9/ledc.vcproj b/iup/mak.vc9/ledc.vcproj deleted file mode 100755 index 8925c10..0000000 --- a/iup/mak.vc9/ledc.vcproj +++ /dev/null @@ -1,120 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="9,00" - Name="ledc" - ProjectGUID="{0F789DF8-22CC-4392-98DB-AC3960FAD4EA}" - Keyword="Win32Proj" - TargetFrameworkVersion="0" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory="..\bin" - IntermediateDirectory="..\obj\Debug\$(ProjectName)" - ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE" - MinimalRebuild="false" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - UsePrecompiledHeader="0" - BrowseInformation="0" - WarningLevel="4" - Detect64BitPortabilityProblems="false" - DebugInformationFormat="1" - CompileAs="0" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - OutputFile="$(OutDir)/ledc.exe" - LinkIncremental="1" - SuppressStartupBanner="true" - GenerateManifest="false" - GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)/ledc.pdb" - SubSystem="1" - TargetMachine="1" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <File - RelativePath="..\etc\iup.rc" - > - </File> - <File - RelativePath="..\srcledc\ledc.c" - > - </File> - <File - RelativePath="..\srcledc\lex.yy.c" - > - </File> - <File - RelativePath="..\srcledc\y.tab.c" - > - </File> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/iup/make_uname b/iup/make_uname deleted file mode 100755 index 2f0a48f..0000000 --- a/iup/make_uname +++ /dev/null @@ -1,49 +0,0 @@ -#This builds all the libraries for 1 uname - -cd src -./make_uname $1 $2 $3 $4 $5 $6 $7 $8 -cd .. - -cd srccd -./make_uname $1 $2 $3 $4 $5 $6 $7 $8 -cd .. - -cd srccontrols -./make_uname $1 $2 $3 $4 $5 $6 $7 $8 -cd .. - -cd srcgl -./make_uname $1 $2 $3 $4 $5 $6 $7 $8 -cd .. - -cd srcpplot -./make_uname $1 $2 $3 $4 $5 $6 $7 $8 -cd .. - -cd srcim -./make_uname $1 $2 $3 $4 $5 $6 $7 $8 -cd .. - -cd srcimglib -./make_uname $1 $2 $3 $4 $5 $6 $7 $8 -cd .. - -cd srcledc -./make_uname $1 $2 $3 $4 $5 $6 $7 $8 -cd .. - -cd srcview -./make_uname $1 $2 $3 $4 $5 $6 $7 $8 -cd .. - -#cd srclua3 -#./make_uname $1 $2 $3 $4 $5 $6 $7 $8 -#cd .. - -cd srclua5 -./make_uname $1 $2 $3 $4 $5 $6 $7 $8 -cd .. - -cd srcconsole -./make_uname $1 $2 $3 $4 $5 $6 $7 $8 -cd .. diff --git a/iup/make_uname.bat b/iup/make_uname.bat deleted file mode 100755 index 71d36d7..0000000 --- a/iup/make_uname.bat +++ /dev/null @@ -1,5 +0,0 @@ -@echo off -REM This builds all the libraries for 1 uname - -REM FOR %%u IN (src srccd srccontrols srcpplot srcgl srcim srcole srcledc srcview srclua3 srclua5 srcconsole) DO call make_uname_lib.bat %%u %1 %2 %3 %4 %5 %6 %7 %8 %9 -FOR %%u IN (src srccd srccontrols srcpplot srcgl srcim srcimglib srcole srcledc srcview srclua5 srcconsole) DO call make_uname_lib.bat %%u %1 %2 %3 %4 %5 %6 %7 %8 %9 diff --git a/iup/make_uname_lib.bat b/iup/make_uname_lib.bat deleted file mode 100755 index f155f22..0000000 --- a/iup/make_uname_lib.bat +++ /dev/null @@ -1,6 +0,0 @@ -@echo off -REM This builds 1 library for 1 uname - -cd %1 -call make_uname %2 %3 %4 %5 %6 %7 -cd .. diff --git a/iup/src/config.mak b/iup/src/config.mak deleted file mode 100755 index 82b8452..0000000 --- a/iup/src/config.mak +++ /dev/null @@ -1,132 +0,0 @@ -PROJNAME = iup -LIBNAME = iup -OPT = YES - -ifdef GTK_DEFAULT - ifdef USE_MOTIF - # Build Motif version in Linux,Darwin,FreeBSD - LIBNAME = iupmot - else - ifeq ($(findstring Win, $(TEC_SYSNAME)), ) - # Force definition if not in Windows - USE_GTK = Yes - endif - endif -else - ifdef USE_GTK - # Build GTK version in IRIX,SunOS,AIX,Win32 - LIBNAME = iupgtk - else - ifeq ($(findstring Win, $(TEC_SYSNAME)), ) - # Force definition if not in Windows - USE_MOTIF = Yes - endif - endif -endif - -ifdef DBG - DEFINES += IUP_ASSERT -endif - -INCLUDES = ../include . - -SRC = iup_array.c iup_callback.c iup_dlglist.c iup_attrib.c iup_focus.c iup_font.c \ - iup_globalattrib.c iup_object.c iup_key.c iup_layout.c iup_ledlex.c iup_names.c iup_open.c \ - iup_ledparse.c iup_predial.c iup_register.c iup_scanf.c iup_show.c iup_str.c iup_table.c \ - iup_func.c iup_childtree.c iup.c iup_classattrib.c iup_dialog.c iup_assert.c iup_canvas.c \ - iup_messagedlg.c iup_timer.c iup_image.c iup_label.c iup_fill.c iup_zbox.c \ - iup_colordlg.c iup_fontdlg.c iup_filedlg.c iup_strmessage.c iup_menu.c iup_frame.c \ - iup_user.c iup_button.c iup_radio.c iup_toggle.c iup_progressbar.c iup_text.c iup_val.c \ - iup_box.c iup_hbox.c iup_vbox.c iup_cbox.c iup_class.c iup_classbase.c iup_maskmatch.c \ - iup_mask.c iup_maskparse.c iup_tabs.c iup_spin.c iup_list.c iup_getparam.c \ - iup_sbox.c iup_normalizer.c iup_tree.c iup_split.c - -ifdef USE_GTK - DEFINES += GTK_DISABLE_DEPRECATED - INCLUDES += gtk - SRC += gtk/iupgtk_common.c gtk/iupgtk_focus.c gtk/iupgtk_font.c gtk/iupgtk_clipboard.c \ - gtk/iupgtk_globalattrib.c gtk/iupgtk_key.c gtk/iupgtk_tips.c \ - gtk/iupgtk_loop.c gtk/iupgtk_open.c gtk/iupgtk_messagedlg.c gtk/iupgtk_draw.c \ - gtk/iupgtk_dialog.c gtk/iupgtk_timer.c gtk/iupgtk_image.c gtk/iupgtk_label.c \ - gtk/iupgtk_colordlg.c gtk/iupgtk_fontdlg.c gtk/iupgtk_filedlg.c \ - gtk/iupgtk_button.c gtk/iupgtk_toggle.c gtk/iupgtk_progressbar.c \ - gtk/iupgtk_text.c gtk/iupgtk_val.c gtk/iupgtk_frame.c gtk/iupgtk_canvas.c \ - gtk/iupgtk_tabs.c gtk/iupgtk_menu.c gtk/iupgtk_list.c gtk/iupgtk_tree.c - - ifneq ($(findstring Win, $(TEC_SYSNAME)), ) - DEFINES += _WIN32_WINNT=0x0500 _WIN32_IE=0x0500 WINVER=0x0500 NOTREEVIEW - SRC += win/iupwindows_main.c win/iupwindows_help.c win/iupwindows_info.c - else - ifdef GTK_MAC - SRC += gtk/iupmac_help.c gtk/iupmac_info.c - else - SRC += gtk/iupgtk_help.c mot/iupunix_info.c - endif - endif - - ifdef USE_HILDON - DEFINES += HILDON - INCLUDES += /usr/include/hildon-1 - LIBS += hildon-1 - endif -else -ifdef USE_MOTIF - SRC += mot/iupmot_common.c mot/iupmot_color.c mot/iupmot_focus.c mot/iupmot_font.c \ - mot/iupmot_key.c mot/iupmot_loop.c mot/iupmot_open.c mot/iupmot_tips.c \ - mot/iupmot_globalattrib.c mot/iupmot_dialog.c mot/iupmot_messagedlg.c mot/iupmot_draw.c \ - mot/iupmot_timer.c mot/iupmot_image.c mot/iupmot_label.c mot/iupmot_canvas.c \ - mot/iupmot_colordlg.c mot/iupmot_fontdlg.c mot/iupmot_filedlg.c mot/iupmot_frame.c \ - mot/iupmot_button.c mot/iupmot_toggle.c mot/iupmot_progressbar.c mot/iupmot_clipboard.c \ - mot/iupmot_text.c mot/iupmot_val.c mot/iupmot_tabs.c mot/iupmot_menu.c \ - mot/iupmot_list.c mot/iupmot_tree.c - - SRC += mot/iupunix_help.c mot/iupunix_info.c - - INCLUDES += mot -else - SRC += win/iupwin_common.c win/iupwin_brush.c win/iupwin_focus.c win/iupwin_font.c \ - win/iupwin_globalattrib.c win/iupwin_handle.c win/iupwin_key.c \ - win/iupwin_loop.c win/iupwin_open.c win/iupwin_tips.c win/iupwin_info.c \ - win/iupwin_dialog.c win/iupwin_messagedlg.c win/iupwin_timer.c \ - win/iupwin_image.c win/iupwin_label.c win/iupwin_canvas.c win/iupwin_frame.c \ - win/iupwin_colordlg.c win/iupwin_fontdlg.c win/iupwin_filedlg.c \ - win/iupwin_button.c win/iupwin_draw.c win/iupwin_toggle.c win/iupwin_clipboard.c \ - win/iupwin_progressbar.c win/iupwin_text.c win/iupwin_val.c \ - win/iupwin_tabs.c win/iupwin_menu.c win/iupwin_list.c win/iupwin_tree.c - - SRC += win/iupwindows_main.c win/iupwindows_help.c win/iupwindows_info.c - - INCLUDES += win - DEFINES += _WIN32_WINNT=0x0500 _WIN32_IE=0x0500 WINVER=0x0500 NOTREEVIEW -endif -endif - -ifeq "$(TEC_SYSNAME)" "SunOS" - # Necessary or the fileopen will not work in SunOS (needs to be retested) - #DEFINES += NO_PATH_MODE_RELATIVE -endif - -ifneq ($(findstring dll, $(TEC_UNAME)), ) - DEFINES += IUP_DLL - SRC += iup_dll.rc - DEF_FILE = iup.def -endif - -ifeq "$(TEC_UNAME)" "vc6" - # Necessary because VC6 has an old WinSDK - #WINSDK = d:/lng/vc7/PlatformSDK - #INCLUDES += $(WINSDK)/include - #LDIR = $(WINSDK)/lib -endif - -ifeq "$(TEC_UNAME)" "dll" - # Necessary because VC6 has an old WinSDK - #WINSDK = d:/lng/vc7/PlatformSDK - #INCLUDES += $(WINSDK)/include - #LDIR = $(WINSDK)/lib -endif - -ifeq "$(TEC_UNAME)" "owc1" - # Necessary or IUP 3 will not work in Open Watcom - DBG=Yes -endif diff --git a/iup/src/gtk/iupgtk_canvas.c b/iup/src/gtk/iupgtk_canvas.c index 3af48a4..ed34d66 100755 --- a/iup/src/gtk/iupgtk_canvas.c +++ b/iup/src/gtk/iupgtk_canvas.c @@ -494,6 +494,10 @@ static int gtkCanvasMapMethod(Ihandle* ih) if (!ih->handle) return IUP_ERROR; +#if GTK_CHECK_VERSION(2, 18, 0) + gtk_widget_set_has_window(ih->handle, TRUE); /* CD will NOT work without this, but this is NOT working... */ +#endif + scrolled_window = (GtkScrolledWindow*)gtk_scrolled_window_new(NULL, NULL); if (!scrolled_window) return IUP_ERROR; diff --git a/iup/src/gtk/iupgtk_help.c b/iup/src/gtk/iupgtk_help.c index 270677f..7ac60c6 100755 --- a/iup/src/gtk/iupgtk_help.c +++ b/iup/src/gtk/iupgtk_help.c @@ -29,7 +29,7 @@ int IupHelp(const char *url) if (iupStrEqualNoCase(system, "Linux") || iupStrEqualNoCase(system, "FreeBSD")) browser = "firefox"; - else if (iupStrEqualNoCase(system, "Darwin")) + else if (iupStrEqualNoCase(system, "MacOS")) browser = "safari"; else if (iupStrEqualPartial(system, "CYGWIN")) browser = "iexplore"; diff --git a/iup/src/gtk/iupgtk_tree.c b/iup/src/gtk/iupgtk_tree.c index 9595ada..931c097 100755 --- a/iup/src/gtk/iupgtk_tree.c +++ b/iup/src/gtk/iupgtk_tree.c @@ -1446,7 +1446,7 @@ static int gtkTreeSetDelNodeAttrib(Ihandle* ih, const char* name_id, const char* iupAttribSetStr(ih, "_IUPTREE_IGNORE_SELECTION_CB", "1"); - for(i = 1; i < ih->data->node_count; /* increment only if not removed */) + for(i = 0; i < ih->data->node_count; /* increment only if not removed */) { gtkTreeIterInit(ih, &iterItem, ih->data->node_cache[i].node_handle); if (gtkTreeIsNodeSelected(model, &iterItem)) @@ -2141,6 +2141,24 @@ static void gtkTreeCallMultiUnSelectionCb(Ihandle* ih) } } +static void gtkTreeCallRightClickCb(Ihandle* ih, int x, int y) +{ + GtkTreePath* path; + if (gtk_tree_view_get_dest_row_at_pos(GTK_TREE_VIEW(ih->handle), x, y, &path, NULL)) + { + IFni cbRightClick = (IFni)IupGetCallback(ih, "RIGHTCLICK_CB"); + if (cbRightClick) + { + GtkTreeIter iterItem; + GtkTreeModel* model = gtk_tree_view_get_model(GTK_TREE_VIEW(ih->handle)); + gtk_tree_model_get_iter(model, &iterItem, path); + cbRightClick(ih, gtkTreeFindNodeId(ih, &iterItem)); + } + + gtk_tree_path_free (path); + } +} + static gboolean gtkTreeButtonEvent(GtkWidget *treeview, GdkEventButton *evt, Ihandle* ih) { if (iupgtkButtonEvent(treeview, evt, ih) == TRUE) @@ -2148,14 +2166,8 @@ static gboolean gtkTreeButtonEvent(GtkWidget *treeview, GdkEventButton *evt, Iha if (evt->type == GDK_BUTTON_PRESS && evt->button == 3) /* right single click */ { - IFni cbRightClick = (IFni)IupGetCallback(ih, "RIGHTCLICK_CB"); - if (cbRightClick) - { - int id = gtkTreeConvertXYToPos(ih, (int)evt->x, (int)evt->y); - if (id != -1) - cbRightClick(ih, id); - return TRUE; - } + gtkTreeCallRightClickCb(ih, (int)evt->x, (int)evt->y); + return TRUE; } else if (evt->type == GDK_2BUTTON_PRESS && evt->button == 1) /* left double click */ { diff --git a/iup/src/iup.c b/iup/src/iup.c index d103af5..0cb25f5 100755 --- a/iup/src/iup.c +++ b/iup/src/iup.c @@ -62,6 +62,7 @@ /* This appears only here to avoid changing the iup.h header fo bug fixes */ #define IUP_VERSION_FIX "" #define IUP_VERSION_FIX_NUMBER 0 +/*#define IUP_VERSION_FIX_DATE "2010/XX/XX" */ const char iup_ident[] = "$IUP: " IUP_VERSION IUP_VERSION_FIX " " IUP_COPYRIGHT " $\n" @@ -79,7 +80,11 @@ char* IupVersion(void) char* IupVersionDate(void) { +#ifdef IUP_VERSION_FIX_DATE + return IUP_VERSION_FIX_DATE; +#else return IUP_VERSION_DATE; +#endif } int IupVersionNumber(void) diff --git a/iup/src/iup.def b/iup/src/iup.def index 56e7225..acd93bb 100755 --- a/iup/src/iup.def +++ b/iup/src/iup.def @@ -55,6 +55,7 @@ IupOpen IupPopup IupPreviousField IupRadio +IupResetAttribute IupScanf IupSeparator IupSetAttribute diff --git a/iup/src/iup_attrib.c b/iup/src/iup_attrib.c index bf9576e..cc7ff02 100755 --- a/iup/src/iup_attrib.c +++ b/iup/src/iup_attrib.c @@ -264,6 +264,39 @@ void IupStoreAttribute(Ihandle *ih, const char* name, const char *value) } } +static void iAttribResetChildren(Ihandle *ih, const char* name) +{ + Ihandle* child = ih->firstchild; + while (child) + { + /* set only if an inheritable attribute at the child */ + if (iAttribIsInherit(child, name)) + { + iupAttribSetStr(child, name, NULL); + + iAttribResetChildren(child, name); + } + + child = child->brother; + } +} + +void IupResetAttribute(Ihandle *ih, const char* name) +{ + iupASSERT(name!=NULL); + if (!name) + return; + + iupASSERT(iupObjectCheck(ih)); + if (!iupObjectCheck(ih)) + return; + + iupAttribSetStr(ih, name, NULL); + + if (iAttribIsInherit(ih, name)) + iAttribResetChildren(ih, name); +} + char* IupGetAttribute(Ihandle *ih, const char* name) { int inherit; diff --git a/iup/src/iup_classattrib.c b/iup/src/iup_classattrib.c index 3ac780c..fc478bb 100755 --- a/iup/src/iup_classattrib.c +++ b/iup/src/iup_classattrib.c @@ -131,7 +131,8 @@ int iupClassObjectSetAttribute(Ihandle* ih, const char* name, const char * value *inherit = 1; /* default is inheritable */ if (afunc) { - *inherit = !(afunc->flags & IUPAF_NO_INHERIT) && !(afunc->flags & IUPAF_NO_STRING); + *inherit = !(afunc->flags & IUPAF_NO_INHERIT) && /* is inheritable */ + !(afunc->flags & IUPAF_NO_STRING); /* is a string */ if (afunc->flags & IUPAF_READONLY) { @@ -216,7 +217,8 @@ char* iupClassObjectGetAttribute(Ihandle* ih, const char* name, char* *def_value if (afunc) { *def_value = iClassGetDefaultValue(afunc); - *inherit = !(afunc->flags & IUPAF_NO_INHERIT) && !(afunc->flags & IUPAF_NO_STRING); + *inherit = !(afunc->flags & IUPAF_NO_INHERIT) && /* is inheritable */ + !(afunc->flags & IUPAF_NO_STRING); /* is a string */ if (afunc->flags & IUPAF_WRITEONLY) return NULL; @@ -267,7 +269,8 @@ void iupClassObjectGetAttributeInfo(Ihandle* ih, const char* name, char* *def_va if (afunc) { *def_value = iClassGetDefaultValue(afunc); - *inherit = !(afunc->flags & IUPAF_NO_INHERIT) && !(afunc->flags & IUPAF_NO_STRING); + *inherit = !(afunc->flags & IUPAF_NO_INHERIT) && /* is inheritable */ + !(afunc->flags & IUPAF_NO_STRING); /* is a string */ } } @@ -411,7 +414,9 @@ void IupSetClassDefaultAttribute(const char* classname, const char *name, const return; afunc = (IattribFunc*)iupTableGet(ic->attrib_func, name); - if (afunc && (!(afunc->flags & IUPAF_NO_DEFAULTVALUE) || !(afunc->flags & IUPAF_NO_STRING) || !(afunc->flags & IUPAF_HAS_ID))) + if (afunc && !(afunc->flags & IUPAF_NO_DEFAULTVALUE) && /* can has default */ + !(afunc->flags & IUPAF_NO_STRING) && /* is a string */ + !(afunc->flags & IUPAF_HAS_ID)) { if (default_value == IUPAF_SAMEASSYSTEM) afunc->default_value = afunc->system_default; @@ -423,7 +428,7 @@ void IupSetClassDefaultAttribute(const char* classname, const char *name, const else afunc->call_global_default = 0; } - else if (default_value) + else if (!afunc && default_value) iupClassRegisterAttribute(ic, name, NULL, NULL, default_value, NULL, IUPAF_DEFAULT); } @@ -442,12 +447,15 @@ void IupSaveClassAttributes(Ihandle* ih) while (name) { IattribFunc* afunc = (IattribFunc*)iupTableGet(ih->iclass->attrib_func, name); - if (afunc && !(afunc->flags & IUPAF_NO_STRING)) + if (afunc && !(afunc->flags & IUPAF_NO_STRING) && /* is a string */ + !(afunc->flags & IUPAF_HAS_ID)) { int inherit; char *def_value; char *value = iupClassObjectGetAttribute(ih, name, &def_value, &inherit); - if (value && value != iupAttribGet(ih, name)) + if (value && /* NOT NULL */ + !iupStrEqualNoCase(value, iupAttribGet(ih, name)) && /* NOT already stored */ + !iupStrEqualNoCase(value, def_value)) /* NOT equal to the default value */ iupAttribStoreStr(ih, name, value); } @@ -466,8 +474,11 @@ void iupClassObjectEnsureDefaultAttributes(Ihandle* ih) while (name) { IattribFunc* afunc = (IattribFunc*)iupTableGetCurr(ic->attrib_func); - if (afunc && afunc->set && (afunc->default_value || afunc->system_default) && - (!(afunc->flags & IUPAF_NO_DEFAULTVALUE) || !(afunc->flags & IUPAF_NO_STRING) || !(afunc->flags & IUPAF_HAS_ID))) + if (afunc && afunc->set && + (afunc->default_value || afunc->system_default) && + !(afunc->flags & IUPAF_NO_DEFAULTVALUE) && /* can has default */ + !(afunc->flags & IUPAF_NO_STRING) && /* is a string */ + !(afunc->flags & IUPAF_HAS_ID)) { if ((!iupStrEqualNoCase(afunc->default_value, afunc->system_default)) || (afunc->call_global_default && iupGlobalDefaultColorChanged(afunc->default_value))) @@ -505,7 +516,7 @@ char* iupClassGetDefaultAttribute(const char* classname, const char *attrib_name afunc = (IattribFunc*)iupTableGet(ic->attrib_func, attrib_name); if (afunc) - return (char*)afunc->default_value; + return iClassGetDefaultValue(afunc); else return NULL; } diff --git a/iup/src/iup_classbase.c b/iup/src/iup_classbase.c index 03a98d1..049b775 100755 --- a/iup/src/iup_classbase.c +++ b/iup/src/iup_classbase.c @@ -409,7 +409,7 @@ void iupBaseRegisterCommonAttrib(Iclass* ic) iupClassRegisterAttribute(ic, "FLOATING", iBaseGetFloatingAttrib, iBaseSetFloatingAttrib, NULL, NULL, IUPAF_NOT_MAPPED|IUPAF_NO_INHERIT); iupClassRegisterAttribute(ic, "EXPAND", iBaseGetExpandAttrib, iBaseSetExpandAttrib, NULL, NULL, IUPAF_NOT_MAPPED|IUPAF_NO_INHERIT); iupClassRegisterAttribute(ic, "NORMALIZERGROUP", NULL, iBaseSetNormalizerGroupAttrib, NULL, NULL, IUPAF_NOT_MAPPED|IUPAF_NO_INHERIT); - iupClassRegisterAttribute(ic, "EXPANDWEIGTH", NULL, NULL, NULL, NULL, IUPAF_NOT_MAPPED|IUPAF_NO_INHERIT); + iupClassRegisterAttribute(ic, "EXPANDWEIGHT", NULL, NULL, NULL, NULL, IUPAF_NOT_MAPPED|IUPAF_NO_INHERIT); /* make sure everyone has the correct default value */ iupClassRegisterAttribute(ic, "ACTIVE", NULL, NULL, IUPAF_SAMEASSYSTEM, "YES", IUPAF_DEFAULT); diff --git a/iup/src/iup_dialog.c b/iup/src/iup_dialog.c index 1aaf095..981e908 100755 --- a/iup/src/iup_dialog.c +++ b/iup/src/iup_dialog.c @@ -563,6 +563,32 @@ static int iDialogSetSizeAttrib(Ihandle* ih, const char* value) return 0; } +static char* iDialogGetSizeAttrib(Ihandle* ih) +{ + char* str; + int charwidth, charheight, width, height; + + if (ih->handle) + { + /* ih->currentwidth and/or ih->currentheight could have been reset in SetSize */ + iupdrvDialogGetSize(ih->handle, &width, &height); + } + else + { + width = ih->userwidth; + height = ih->userheight; + } + + iupdrvFontGetCharSize(ih, &charwidth, &charheight); + if (charwidth == 0 || charheight == 0) + return NULL; /* if font failed get from the hash table */ + + str = iupStrGetMemory(50); + sprintf(str, "%dx%d", iupRASTER2WIDTH(width, charwidth), + iupRASTER2HEIGHT(height, charheight)); + return str; +} + static int iDialogSetRasterSizeAttrib(Ihandle* ih, const char* value) { if (!value) @@ -588,6 +614,30 @@ static int iDialogSetRasterSizeAttrib(Ihandle* ih, const char* value) return 0; } +static char* iDialogGetRasterSizeAttrib(Ihandle* ih) +{ + char* str; + int width, height; + + if (ih->handle) + { + /* ih->currentwidth and/or ih->currentheight could have been reset in SetRasterSize */ + iupdrvDialogGetSize(ih->handle, &width, &height); + } + else + { + width = ih->userwidth; + height = ih->userheight; + } + + if (!width && !height) + return NULL; + + str = iupStrGetMemory(50); + sprintf(str, "%dx%d", width, height); + return str; +} + static int iDialogSetVisibleAttrib(Ihandle* ih, const char* value) { if (iupStrBoolean(value)) @@ -717,8 +767,8 @@ Iclass* iupDialogGetClass(void) iupBaseRegisterCommonAttrib(ic); /* Overwrite Common */ - iupClassRegisterAttribute(ic, "SIZE", iupBaseGetSizeAttrib, iDialogSetSizeAttrib, NULL, NULL, IUPAF_NOT_MAPPED|IUPAF_NO_INHERIT); - iupClassRegisterAttribute(ic, "RASTERSIZE", iupBaseGetRasterSizeAttrib, iDialogSetRasterSizeAttrib, NULL, NULL, IUPAF_NOT_MAPPED|IUPAF_NO_INHERIT); + iupClassRegisterAttribute(ic, "SIZE", iDialogGetSizeAttrib, iDialogSetSizeAttrib, NULL, NULL, IUPAF_NOT_MAPPED|IUPAF_NO_INHERIT); + iupClassRegisterAttribute(ic, "RASTERSIZE", iDialogGetRasterSizeAttrib, iDialogSetRasterSizeAttrib, NULL, NULL, IUPAF_NOT_MAPPED|IUPAF_NO_INHERIT); iupClassRegisterAttribute(ic, "POSITION", NULL, NULL, NULL, NULL, IUPAF_WRITEONLY|IUPAF_READONLY|IUPAF_NO_INHERIT); /* forbidden in dialog */ /* Base Container */ diff --git a/iup/src/iup_dll.rc b/iup/src/iup_dll.rc deleted file mode 100755 index a1c78d8..0000000 --- a/iup/src/iup_dll.rc +++ /dev/null @@ -1,41 +0,0 @@ -TECGRAF_ICON ICON "..\\etc\\tecgraf.ico" - -1 VERSIONINFO - FILEVERSION 3,0,0,0 - PRODUCTVERSION 3,0,0,0 -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" - BEGIN - VALUE "Comments", "www.tecgraf.puc-rio.br/iup\0" - VALUE "CompanyName", "Tecgraf/PUC-Rio\0" - VALUE "FileDescription", "IUP - Portable User Interface\0" - VALUE "FileVersion", "3.0.0\0" - VALUE "LegalCopyright", "Copyright © 1994-2009 Tecgraf, PUC-Rio.\0" - VALUE "OriginalFilename", "iup.dll\0" - VALUE "ProductName", "IUP for Windows\0" - VALUE "ProductVersion", "3.0.0\0" - END - END -END - -CURSOR_PEN CURSOR "..\\etc\\pen.cur" - -/* To avoid the inclusion of <winuser.h> */ -#define WS_CHILD 0x40000000L -#define WS_VISIBLE 0x10000000L -#define WS_CLIPSIBLINGS 0x04000000L -#define DS_3DLOOK 0x0004L -#define DS_CONTROL 0x0400L -#define SS_OWNERDRAW 0x0000000DL -#define WS_EX_STATICEDGE 0x00020000L - -#define IUP_PREVIEWCANVAS 3000 - -iupPreviewDlg DIALOG DISCARDABLE 0, 0, 250, 95 -STYLE WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | DS_3DLOOK | DS_CONTROL -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "", IUP_PREVIEWCANVAS, "STATIC", SS_OWNERDRAW, 70, 0, 120, 90, WS_EX_STATICEDGE -END diff --git a/iup/src/iup_getparam.c b/iup/src/iup_getparam.c index 7fd6a94..3680ed5 100755 --- a/iup/src/iup_getparam.c +++ b/iup/src/iup_getparam.c @@ -20,6 +20,7 @@ #define RAD2DEG 57.296f /* radians to degrees */ +enum {IPARAM_TYPE_STR, IPARAM_TYPE_INT, IPARAM_TYPE_FLOAT, IPARAM_TYPE_NONE=-1}; /******************************************************************************************* Internal Callbacks @@ -150,7 +151,7 @@ static int iParamValAction_CB(Ihandle *self) char* type = iupAttribGet(param, "TYPE"); if (iupStrEqual(type, "INTEGER")) { - iupAttribSetStrf(param, "VALUE", "%d", (int)val); + iupAttribSetInt(param, "VALUE", (int)val); } else { @@ -161,7 +162,7 @@ static int iParamValAction_CB(Ihandle *self) if (val == 0) { old_angle = iupAttribGetFloat(param, "VALUE"); - iupAttribSetStrf(param, "_IUPGP_OLD_ANGLE", "%g", old_angle); + iupAttribSetFloat(param, "_IUPGP_OLD_ANGLE", old_angle); } else old_angle = iupAttribGetFloat(param, "_IUPGP_OLD_ANGLE"); @@ -185,13 +186,13 @@ static int iParamValAction_CB(Ihandle *self) } } - iupAttribSetStrf(param, "VALUE", "%g", val); + iupAttribSetFloat(param, "VALUE", val); } if (cb && !cb(dlg, iupAttribGetInt(param, "INDEX"), (void*)iupAttribGet(dlg, "USER_DATA"))) { /* Undo */ - iupAttribSetStrf(param, "VALUE", "%g", old_value); + iupAttribSetFloat(param, "VALUE", old_value); if (!iupAttribGetInt(param, "ANGLE")) IupSetfAttribute(self, "VALUE", "%g", old_value); @@ -235,12 +236,12 @@ static int iParamListAction_CB(Ihandle *self, char *t, int i, int v) Iparamcb cb = (Iparamcb)IupGetCallback(dlg, "PARAM_CB"); int old_i = iupAttribGetInt(param, "VALUE"); - iupAttribSetStrf(param, "VALUE", "%d", i-1); + iupAttribSetInt(param, "VALUE", i-1); if (cb && !cb(dlg, iupAttribGetInt(param, "INDEX"), (void*)iupAttribGet(dlg, "USER_DATA"))) { /* Undo */ - iupAttribSetStrf(param, "VALUE", "%d", old_i); + iupAttribSetInt(param, "VALUE", old_i); IupSetfAttribute(self, "VALUE", "%d", old_i+1); /* there is no IUP_IGNORE for IupList */ @@ -327,7 +328,7 @@ static int iParamSpinReal_CB(Ihandle *self, int pos) if (val > max) val = max; - iupAttribSetStrf(param, "VALUE", "%g", (double)val); + iupAttribSetFloat(param, "VALUE", val); if (cb) { @@ -437,7 +438,6 @@ static Ihandle* iParamCreateBox(Ihandle* param) IupSetCallback(ctrl, "ACTION", (Icallback)iParamToggleAction_CB); IupAppend(box, ctrl); - iupAttribSetStr(param, "DATA_TYPE", "1"); } else if (iupStrEqual(type, "SEPARATOR")) { @@ -445,7 +445,6 @@ static Ihandle* iParamCreateBox(Ihandle* param) IupSetAttribute(ctrl, "SEPARATOR", "HORIZONTAL"); IupAppend(box, ctrl); - iupAttribSetStr(param, "DATA_TYPE", "-1"); } else if (iupStrEqual(type, "LIST")) { @@ -465,7 +464,6 @@ static Ihandle* iParamCreateBox(Ihandle* param) IupStoreAttribute(ctrl, str, NULL); IupAppend(box, ctrl); - iupAttribSetStr(param, "DATA_TYPE", "1"); } else if (iupStrEqual(type, "STRING")) { @@ -498,7 +496,6 @@ static Ihandle* iParamCreateBox(Ihandle* param) IupStoreAttribute(ctrl, "MASK", mask); } - iupAttribSetStr(param, "DATA_TYPE", "0"); iupAttribSetStr(param, "EXPAND", "1"); } else if (iupStrEqual(type, "FILE")) @@ -513,7 +510,6 @@ static Ihandle* iParamCreateBox(Ihandle* param) IupSetCallback(ctrl, "ACTION", (Icallback)iParamTextAction_CB); IupStoreAttribute(ctrl, "VALUE", iupAttribGet(param, "VALUE")); - iupAttribSetStr(param, "DATA_TYPE", "0"); iupAttribSetStr(param, "EXPAND", "1"); @@ -540,9 +536,7 @@ static Ihandle* iParamCreateBox(Ihandle* param) IupSetAttribute(ctrl, "MASK", "(/d|/d/d|1/d/d|2(0|1|2|3|4)/d|25(0|1|2|3|4|5)) (/d|/d/d|1/d/d|2(0|1|2|3|4)/d|25(0|1|2|3|4|5)) (/d|/d/d|1/d/d|2(0|1|2|3|4)/d|25(0|1|2|3|4|5)) (/d|/d/d|1/d/d|2(0|1|2|3|4)/d|25(0|1|2|3|4|5))"); IupStoreAttribute(ctrl, "VALUE", iupAttribGet(param, "VALUE")); - iupAttribSetStr(param, "DATA_TYPE", "0"); iupAttribSetStr(param, "EXPAND", "1"); - aux = IupCanvas(NULL); IupSetAttribute(aux, "SIZE", "20x10"); @@ -585,7 +579,7 @@ static Ihandle* iParamCreateBox(Ihandle* param) IupSetfAttribute(ctrl, "SPINMAX", "%d", (int)((max-min)/step + 0.5)); IupSetfAttribute(ctrl, "SPINVALUE", "%d", (int)((val-min)/step + 0.5)); - iupAttribSetStrf(ctrl, "_IUPGP_INCSTEP", "%g", step); + iupAttribSetFloat(ctrl, "_IUPGP_INCSTEP", step); iupAttribSetStr(ctrl, "_IUPGP_SPINREAL", "1"); } else if (iupAttribGetInt(param, "PARTIAL")) @@ -603,7 +597,6 @@ static Ihandle* iParamCreateBox(Ihandle* param) IupAppend(box, ctrl); } - iupAttribSetStr(param, "DATA_TYPE", "2"); IupSetAttribute(ctrl, "SIZE", "50x"); } else /* INTEGER*/ @@ -625,7 +618,7 @@ static Ihandle* iParamCreateBox(Ihandle* param) int step = iupAttribGetInt(param, "STEP"); if (step) { - iupAttribSetStrf(ctrl, "_IUPGP_INCSTEP", "%d", step); + iupAttribSetInt(ctrl, "_IUPGP_INCSTEP", step); IupSetfAttribute(ctrl, "SPININC", "%d", step); } IupSetfAttribute(ctrl, "SPINMAX", "%d", max); @@ -649,7 +642,6 @@ static Ihandle* iParamCreateBox(Ihandle* param) IupSetAttribute(ctrl, "MASK", IUP_MASK_INT); } - iupAttribSetStr(param, "DATA_TYPE", "1"); IupSetAttribute(ctrl, "SIZE", "50x"); } @@ -790,13 +782,12 @@ static Ihandle* IupParamDlgP(Ihandle** params) { int w; - char* type = iupAttribGet(params[i], "TYPE"); - if (!iupStrEqual(type, "SEPARATOR")) + if (IupGetInt(params[i], "DATA_TYPE") != IPARAM_TYPE_NONE) { char str[20]; sprintf(str, "PARAM%d", p); - IupSetAttribute(dlg, str, (char*)params[i]); - iupAttribSetStrf(params[i], "INDEX", "%d", p); + iupAttribSetStr(dlg, str, (char*)params[i]); + iupAttribSetInt(params[i], "INDEX", p); p++; } @@ -810,9 +801,9 @@ static Ihandle* IupParamDlgP(Ihandle** params) i = 0; while (params[i] != NULL) { - char* type = iupAttribGet(params[i], "TYPE"); - if (!iupStrEqual(type, "SEPARATOR")) + if (IupGetInt(params[i], "DATA_TYPE") != IPARAM_TYPE_NONE) { + char* type = iupAttribGet(params[i], "TYPE"); if (iupStrEqual(type, "LIST")) { /* set a minimum size for lists */ @@ -1040,6 +1031,7 @@ static int iParamCopyStrLine(char* line, const char* format) return i+1; } +/* Used in IupLua also */ char iupGetParamType(const char* format, int *line_size) { char* type = strchr(format, '%'); @@ -1072,19 +1064,19 @@ static Ihandle *IupParamf(const char* format, int *line_size) { case 'b': iupAttribSetStr(param, "TYPE", "BOOLEAN"); - iupAttribSetStr(param, "DATA_TYPE", "1"); /* integer */ + iupAttribSetInt(param, "DATA_TYPE", IPARAM_TYPE_INT); extra = iParamGetStrExtra(line_ptr, '[', ']', &count); line_ptr += count; iParamSetBoolNames(extra, param); break; case 'l': iupAttribSetStr(param, "TYPE", "LIST"); - iupAttribSetStr(param, "DATA_TYPE", "1"); /* integer */ + iupAttribSetInt(param, "DATA_TYPE", IPARAM_TYPE_INT); extra = iParamGetStrExtra(line_ptr, '|', '|', &count); line_ptr += count; iParamSetListItems(extra, param); break; case 'a': iupAttribSetStr(param, "TYPE", "REAL"); - iupAttribSetStr(param, "DATA_TYPE", "2"); /* real */ + iupAttribSetInt(param, "DATA_TYPE", IPARAM_TYPE_FLOAT); iupAttribSetStr(param, "ANGLE", "1"); extra = iParamGetStrExtra(line_ptr, '[', ']', &count); line_ptr += count; iParamSetInterval(extra, param); @@ -1094,7 +1086,7 @@ static Ihandle *IupParamf(const char* format, int *line_size) /* continue */ case 's': iupAttribSetStr(param, "TYPE", "STRING"); - iupAttribSetStr(param, "DATA_TYPE", "0"); /* string */ + iupAttribSetInt(param, "DATA_TYPE", IPARAM_TYPE_STR); mask = iParamGetNextStrItem(line_ptr, '{', &count); if (*mask) iupAttribStoreStr(param, "MASK", mask); @@ -1103,33 +1095,33 @@ static Ihandle *IupParamf(const char* format, int *line_size) break; case 'i': iupAttribSetStr(param, "TYPE", "INTEGER"); - iupAttribSetStr(param, "DATA_TYPE", "1"); /* integer */ + iupAttribSetInt(param, "DATA_TYPE", IPARAM_TYPE_INT); extra = iParamGetStrExtra(line_ptr, '[', ']', &count); line_ptr += count; iParamSetInterval(extra, param); break; case 'r': iupAttribSetStr(param, "TYPE", "REAL"); - iupAttribSetStr(param, "DATA_TYPE", "2"); /* real */ + iupAttribSetInt(param, "DATA_TYPE", IPARAM_TYPE_FLOAT); extra = iParamGetStrExtra(line_ptr, '[', ']', &count); line_ptr += count; iParamSetInterval(extra, param); break; case 'f': iupAttribSetStr(param, "TYPE", "FILE"); - iupAttribSetStr(param, "DATA_TYPE", "0"); /* string */ + iupAttribSetInt(param, "DATA_TYPE", IPARAM_TYPE_STR); extra = iParamGetStrExtra(line_ptr, '[', ']', &count); line_ptr += count; iParamSetFileOptions(extra, param); break; case 'c': iupAttribSetStr(param, "TYPE", "COLOR"); - iupAttribSetStr(param, "DATA_TYPE", "0"); /* string */ + iupAttribSetInt(param, "DATA_TYPE", IPARAM_TYPE_STR); break; case 't': iupAttribSetStr(param, "TYPE", "SEPARATOR"); - iupAttribSetStr(param, "DATA_TYPE", "-1"); /* NONE */ + iupAttribSetInt(param, "DATA_TYPE", IPARAM_TYPE_NONE); break; case 'u': iupAttribSetStr(param, "TYPE", "BUTTONNAMES"); - iupAttribSetStr(param, "DATA_TYPE", "-1"); /* NONE */ + iupAttribSetInt(param, "DATA_TYPE", IPARAM_TYPE_NONE); extra = iParamGetStrExtra(line_ptr, '[', ']', &count); line_ptr += count; iParamSetButtonNames(extra, param); break; @@ -1148,6 +1140,7 @@ static Ihandle *IupParamf(const char* format, int *line_size) Exported Functions *******************************************************************************************/ +/* Used in IupLua also */ int iupGetParamCount(const char *format, int *param_extra) { int param_count = 0, extra = 0; @@ -1211,21 +1204,21 @@ int IupGetParamv(const char* title, Iparamcb action, void* user_data, const char return 0; data_type = IupGetInt(params[i], "DATA_TYPE"); - if (data_type == 2) /* float */ + if (data_type == IPARAM_TYPE_FLOAT) { float *data_float = (float*)(param_data[p]); if (!data_float) return 0; - iupAttribSetStrf(params[i], "VALUE", "%g", *data_float); + iupAttribSetFloat(params[i], "VALUE", *data_float); p++; } - else if (data_type == 1) /* integer */ + else if (data_type == IPARAM_TYPE_INT) { int *data_int = (int*)(param_data[p]); if (!data_int) return 0; - iupAttribSetStrf(params[i], "VALUE", "%d", *data_int); + iupAttribSetInt(params[i], "VALUE", *data_int); p++; } - else if (data_type == 0) /* string */ + else if (data_type == IPARAM_TYPE_STR) { char *data_str = (char*)(param_data[p]); if (!data_str) return 0; @@ -1255,31 +1248,25 @@ int IupGetParamv(const char* title, Iparamcb action, void* user_data, const char } else { - for (i = 0, p = 0; i < param_count; i++) + for (i = 0, p = 0; i < param_count+param_extra; i++) { - Ihandle* param; - int data_type; - char str[20]; - - sprintf(str, "PARAM%d", i); - param = (Ihandle*)iupAttribGet(dlg, str); - - data_type = iupAttribGetInt(param, "DATA_TYPE"); - if (data_type == 1) + Ihandle* param = params[i]; + int data_type = iupAttribGetInt(param, "DATA_TYPE"); + if (data_type == IPARAM_TYPE_INT) { - int *data_int = (int*)(param_data[i]); + int *data_int = (int*)(param_data[p]); *data_int = iupAttribGetInt(param, "VALUE"); p++; } - else if (data_type == 2) + else if (data_type == IPARAM_TYPE_FLOAT) { - float *data_float = (float*)(param_data[i]); + float *data_float = (float*)(param_data[p]); *data_float = iupAttribGetFloat(param, "VALUE"); p++; } - else + else if (data_type == IPARAM_TYPE_STR) { - char *data_str = (char*)(param_data[i]); + char *data_str = (char*)(param_data[p]); strcpy(data_str, iupAttribGet(param, "VALUE")); p++; } diff --git a/iup/src/iup_hbox.c b/iup/src/iup_hbox.c index a8a93a3..aaa8e4d 100755 --- a/iup/src/iup_hbox.c +++ b/iup/src/iup_hbox.c @@ -213,12 +213,12 @@ static void iHboxSetChildrenCurrentSizeMethod(Ihandle* ih, int shrink) else { int empty = (child->expand & IUP_EXPAND_W1)? empty_w1: ((child->expand & IUP_EXPAND_W0)? empty_w0: 0); - char* weigth_str = iupAttribGet(child, "EXPANDWEIGTH"); - if (weigth_str) + char* weight_str = iupAttribGet(child, "EXPANDWEIGHT"); + if (weight_str) { - float weigth; - if (iupStrToFloat(weigth_str, &weigth)) - empty = iupROUND(empty * weigth); + float weight; + if (iupStrToFloat(weight_str, &weight)) + empty = iupROUND(empty * weight); } iupBaseSetCurrentSize(child, child->naturalwidth+empty, client_height, shrink); } diff --git a/iup/src/iup_layout.c b/iup/src/iup_layout.c index 0ccd496..9387135 100755 --- a/iup/src/iup_layout.c +++ b/iup/src/iup_layout.c @@ -143,8 +143,8 @@ void iupLayoutSetMinMaxSize(Ihandle* ih, int *w, int *h) char* value = iupAttribGet(ih, "MINSIZE"); int min_w = 0, min_h = 0; /* MINSIZE default value */ iupStrToIntInt(value, &min_w, &min_h, 'x'); - if (*w < min_w) *w = min_w; - if (*h < min_h) *h = min_h; + if (w && *w < min_w) *w = min_w; + if (h && *h < min_h) *h = min_h; } if (ih->has_maxsize) @@ -152,8 +152,8 @@ void iupLayoutSetMinMaxSize(Ihandle* ih, int *w, int *h) char* value = iupAttribGet(ih, "MAXSIZE"); int max_w = 65535, max_h = 65535; /* MAXSIZE default value */ iupStrToIntInt(value, &max_w, &max_h, 'x'); - if (*w > max_w) *w = max_w; - if (*h > max_h) *h = max_h; + if (w && *w > max_w) *w = max_w; + if (h && *h > max_h) *h = max_h; } } diff --git a/iup/src/iup_split.c b/iup/src/iup_split.c index 1829142..e8029cb 100644 --- a/iup/src/iup_split.c +++ b/iup/src/iup_split.c @@ -35,19 +35,71 @@ struct _IcontrolData int layoutdrag, autohide, showgrip, barsize; int direction; /* one of the types: ISPLIT_VERT, ISPLIT_HORIZ */ int val; /* split value: 0-1000, default 500 */ + int min, max; /* used only to crop val */ }; + +static void iSplitCropVal(Ihandle* ih) +{ + if (ih->data->val < ih->data->min) ih->data->val = ih->data->min; + if (ih->data->val > ih->data->max) ih->data->val = ih->data->max; +} + static int iSplitGetWidth1(Ihandle* ih) { + Ihandle *child1; + int width1 = ((ih->currentwidth-ih->data->barsize)*ih->data->val)/1000; if (width1 < 0) width1 = 0; + + child1 = ih->firstchild->brother; + if (child1) + { + Ihandle *child2 = child1->brother; + if (child2) + { + int width2 = (ih->currentwidth-ih->data->barsize)-width1; + if (width2 < 0) width2 = 0; + + iupLayoutSetMinMaxSize(child2, &width2, NULL); + + /* only check if child2 has a minsize */ + if (width2 > (ih->currentwidth-ih->data->barsize)-width1) + width1 = (ih->currentwidth-ih->data->barsize)-width2; + } + + iupLayoutSetMinMaxSize(child1, &width1, NULL); + } + return width1; } static int iSplitGetHeight1(Ihandle* ih) { + Ihandle *child1; + int height1 = ((ih->currentheight-ih->data->barsize)*ih->data->val)/1000; if (height1 < 0) height1 = 0; + + child1 = ih->firstchild->brother; + if (child1) + { + Ihandle *child2 = child1->brother; + if (child2) + { + int height2 = (ih->currentheight-ih->data->barsize)-height1; + if (height2 < 0) height2 = 0; + + iupLayoutSetMinMaxSize(child2, &height2, NULL); + + /* only check if child2 has a minsize */ + if (height2 > (ih->currentheight-ih->data->barsize)-height1) + height1 = (ih->currentheight-ih->data->barsize)-height2; + } + + iupLayoutSetMinMaxSize(child1, NULL, &height1); + } + return height1; } @@ -232,8 +284,7 @@ static int iSplitMotion_CB(Ihandle* bar, int x, int y, char *status) ih->data->val = (height1*1000)/(ih->currentheight-ih->data->barsize); } - if (ih->data->val < 0) ih->data->val = 0; - if (ih->data->val > 1000) ih->data->val = 1000; + iSplitCropVal(ih); if (ih->data->layoutdrag) { @@ -331,49 +382,49 @@ static int iSplitFocus_CB(Ihandle* bar, int focus) static char* iSplitGetClientSize1Attrib(Ihandle* ih) { - int width, height; + int width1, height1; char* str = iupStrGetMemory(20); if (ih->data->direction == ISPLIT_VERT) { - width = iSplitGetWidth1(ih); - height = ih->currentheight; + width1 = iSplitGetWidth1(ih); + height1 = ih->currentheight; } else /* ISPLIT_HORIZ */ { - height = iSplitGetHeight1(ih); - width = ih->currentwidth; + height1 = iSplitGetHeight1(ih); + width1 = ih->currentwidth; } - sprintf(str, "%dx%d", width, height); + sprintf(str, "%dx%d", width1, height1); return str; } static char* iSplitGetClientSize2Attrib(Ihandle* ih) { - int width, height; + int width2, height2; char* str = iupStrGetMemory(20); if (ih->data->direction == ISPLIT_VERT) { int width1 = iSplitGetWidth1(ih); - width = (ih->currentwidth-ih->data->barsize)-width1; - if (width < 0) width = 0; + width2 = (ih->currentwidth-ih->data->barsize)-width1; + if (width2 < 0) width2 = 0; - height = ih->currentheight; + height2 = ih->currentheight; } else /* ISPLIT_HORIZ */ { int height1 = iSplitGetHeight1(ih); - height = (ih->currentheight-ih->data->barsize)-height1; - if (height < 0) height = 0; + height2 = (ih->currentheight-ih->data->barsize)-height1; + if (height2 < 0) height2 = 0; - width = ih->currentwidth; + width2 = ih->currentwidth; } - sprintf(str, "%dx%d", width, height); + sprintf(str, "%dx%d", width2, height2); return str; } @@ -406,7 +457,7 @@ static int iSplitSetValueAttrib(Ihandle* ih, const char* value) { if (!value) { - ih->data->val = -1; + ih->data->val = -1; /* reset to calculate in Natural size */ if (ih->data->autohide) iSplitAutoHideVal(ih); @@ -420,6 +471,7 @@ static int iSplitSetValueAttrib(Ihandle* ih, const char* value) if (iupStrToInt(value, &val)) { ih->data->val = val; + iSplitCropVal(ih); if (ih->data->autohide) iSplitAutoHideVal(ih); @@ -459,6 +511,38 @@ static char* iSplitGetBarSizeAttrib(Ihandle* ih) return str; } +static int iSplitSetMinMaxAttrib(Ihandle* ih, const char* value) +{ + if (iupStrToIntInt(value, &ih->data->min, &ih->data->max, ':')) + { + if (ih->data->min > ih->data->max) + { + int t = ih->data->min; + ih->data->min = ih->data->max; + ih->data->max = t; + } + if (ih->data->min < 0) ih->data->min = 0; + if (ih->data->max > 1000) ih->data->max = 1000; + + if (ih->data->val != -1) + iSplitCropVal(ih); + + if (ih->data->autohide) + iSplitAutoHideVal(ih); + + if (ih->handle) + IupRefresh(ih); /* may affect all the elements in the dialog */ + } + return 0; /* do not store value in hash table */ +} + +static char* iSplitGetMinMaxAttrib(Ihandle* ih) +{ + char* str = iupStrGetMemory(30); + sprintf(str, "%d:%d", ih->data->min, ih->data->max); + return str; +} + static int iSplitSetLayoutDragAttrib(Ihandle* ih, const char* value) { if (iupStrBoolean(value)) @@ -600,11 +684,10 @@ static void iSplitComputeNaturalSizeMethod(Ihandle* ih, int *w, int *h, int *exp else ih->data->val = (child1->naturalheight*1000)/(natural_h-ih->data->barsize); - if (ih->data->val < 0) ih->data->val = 0; - if (ih->data->val > 1000) ih->data->val = 1000; + iSplitCropVal(ih); } else - ih->data->val = 0; + ih->data->val = ih->data->min; } *w = natural_w; @@ -707,6 +790,8 @@ static int iSplitCreateMethod(Ihandle* ih, void** params) ih->data->autohide = 0; ih->data->barsize = 5; ih->data->showgrip = 1; + ih->data->min = 0; + ih->data->max = 1000; bar = IupCanvas(NULL); iupChildTreeAppend(ih, bar); /* bar will always be the firstchild */ @@ -766,6 +851,7 @@ Iclass* iupSplitGetClass(void) iupClassRegisterAttribute(ic, "SHOWGRIP", iSplitGetShowGripAttrib, iSplitSetShowGripAttrib, IUPAF_SAMEASSYSTEM, "YES", IUPAF_NOT_MAPPED|IUPAF_NO_INHERIT); iupClassRegisterAttribute(ic, "AUTOHIDE", iSplitGetAutoHideAttrib, iSplitSetAutoHideAttrib, IUPAF_SAMEASSYSTEM, "NO", IUPAF_NOT_MAPPED|IUPAF_NO_INHERIT); iupClassRegisterAttribute(ic, "BARSIZE", iSplitGetBarSizeAttrib, iSplitSetBarSizeAttrib, IUPAF_SAMEASSYSTEM, "5", IUPAF_NOT_MAPPED|IUPAF_NO_INHERIT); + iupClassRegisterAttribute(ic, "MINMAX", iSplitGetMinMaxAttrib, iSplitSetMinMaxAttrib, IUPAF_SAMEASSYSTEM, "0:1000", IUPAF_NOT_MAPPED|IUPAF_NO_INHERIT); return ic; } diff --git a/iup/src/iup_text.c b/iup/src/iup_text.c index 6cd7235..d2e2e36 100755 --- a/iup/src/iup_text.c +++ b/iup/src/iup_text.c @@ -365,9 +365,9 @@ static void iTextComputeNaturalSizeMethod(Ihandle* ih, int *w, int *h, int *expa { int sb_size = iupdrvGetScrollbarSize(); if (ih->data->sb & IUP_SB_HORIZ) - natural_w += sb_size; + natural_h += sb_size; /* sb horizontal affects vertical size */ if (ih->data->sb & IUP_SB_VERT) - natural_h += sb_size; + natural_w += sb_size; /* sb vertical affects horizontal size */ } *w = natural_w; diff --git a/iup/src/iup_vbox.c b/iup/src/iup_vbox.c index 23e8e3a..5afd7e2 100755 --- a/iup/src/iup_vbox.c +++ b/iup/src/iup_vbox.c @@ -215,12 +215,12 @@ static void iVboxSetChildrenCurrentSizeMethod(Ihandle* ih, int shrink) else { int empty = (child->expand & IUP_EXPAND_H1)? empty_h1: ((child->expand & IUP_EXPAND_H0)? empty_h0: 0); - char* weigth_str = iupAttribGet(child, "EXPANDWEIGTH"); - if (weigth_str) + char* weight_str = iupAttribGet(child, "EXPANDWEIGHT"); + if (weight_str) { - float weigth; - if (iupStrToFloat(weigth_str, &weigth)) - empty = iupROUND(empty * weigth); + float weight; + if (iupStrToFloat(weight_str, &weight)) + empty = iupROUND(empty * weight); } iupBaseSetCurrentSize(child, client_width, child->naturalheight+empty, shrink); } diff --git a/iup/src/iupstub.mak b/iup/src/iupstub.mak deleted file mode 100755 index 9ca920f..0000000 --- a/iup/src/iupstub.mak +++ /dev/null @@ -1,12 +0,0 @@ -PROJNAME = iup -LIBNAME = iupstub -OPT = YES - -USE_DLL = Yes - -INCLUDES = ../include - -SRC = win/iupwindows_main.c - -iupstup-dll: - @move /y ..\lib\vc6\iupstub.lib ..\lib\dll diff --git a/iup/src/make_uname b/iup/src/make_uname deleted file mode 100755 index 6542234..0000000 --- a/iup/src/make_uname +++ /dev/null @@ -1,4 +0,0 @@ -#This builds all the libraries of the folder for 1 uname - -tecmake USE_MOTIF=Yes $1 $2 $3 $4 $5 $6 $7 -tecmake USE_GTK=Yes $1 $2 $3 $4 $5 $6 $7 diff --git a/iup/src/make_uname.bat b/iup/src/make_uname.bat deleted file mode 100755 index 1a79780..0000000 --- a/iup/src/make_uname.bat +++ /dev/null @@ -1,55 +0,0 @@ -@echo off -REM This builds all the libraries of the folder for 1 uname - -call tecmake %1 %2 %3 %4 %5 %6 -call tecmake %1 "USE_GTK=Yes" %2 %3 %4 %5 %6 - -if "%1"=="dll" goto stub_dll -if "%1"=="dll7" goto stub_dll7 -if "%1"=="dll8" goto stub_dll8 -if "%1"=="dll8_64" goto stub_dll8_64 -if "%1"=="dll9" goto stub_dll9 -if "%1"=="dll9_64" goto stub_dll9_64 -if "%1"=="all" goto all_dll -goto fim - -:stub_dll -call tecmake vc6 "MF=iupstub" %2 %3 %4 %5 %6 %7 -move /y ..\lib\vc6\iupstub.lib ..\lib\dll -goto fim - -:stub_dll7 -call tecmake vc7 "MF=iupstub" %2 %3 %4 %5 %6 %7 -move /y ..\lib\vc7\iupstub.lib ..\lib\dll7 -goto fim - -:stub_dll8 -call tecmake vc8 "MF=iupstub" %2 %3 %4 %5 %6 %7 -move /y ..\lib\vc8\iupstub.lib ..\lib\dll8 -goto fim - -:stub_dll8_64 -call tecmake vc8_64 "MF=iupstub" %2 %3 %4 %5 %6 %7 -move /y ..\lib\vc8_64\iupstub.lib ..\lib\dll8_64 -goto fim - -:stub_dll9 -call tecmake vc9 "MF=iupstub" %2 %3 %4 %5 %6 %7 -move /y ..\lib\vc9\iupstub.lib ..\lib\dll9 -goto fim - -:stub_dll9_64 -call tecmake vc9_64 "MF=iupstub" %2 %3 %4 %5 %6 %7 -move /y ..\lib\vc9_64\iupstub.lib ..\lib\dll9_64 -goto fim - -:all_dll -call make_uname dll %2 %3 %4 %5 %6 -call make_uname dll7 %2 %3 %4 %5 %6 -call make_uname dll8 %2 %3 %4 %5 %6 -call make_uname dll8_64 %2 %3 %4 %5 %6 -call make_uname dll9 %2 %3 %4 %5 %6 -call make_uname dll9_64 %2 %3 %4 %5 %6 -goto fim - -:fim diff --git a/iup/src/mot/iupmot_filedlg.c b/iup/src/mot/iupmot_filedlg.c index 0be6319..5d8ebe0 100755 --- a/iup/src/mot/iupmot_filedlg.c +++ b/iup/src/mot/iupmot_filedlg.c @@ -483,6 +483,7 @@ static int motFileDlgPopup(Ihandle* ih, int x, int y) XtVaSetValues(filebox, XmNdialogStyle, style, XmNautoUnmanage, False, + XmNresizePolicy, XmRESIZE_GROW, NULL); if (dialogtype == IUP_DIALOGDIR) @@ -620,6 +621,14 @@ static int motFileDlgPopup(Ihandle* ih, int x, int y) file_cb(ih, NULL, "INIT"); } + if (ih->userwidth && ih->userheight) + { + XtVaSetValues(dialog, + XmNwidth, (XtArgVal)(ih->userwidth), + XmNheight, (XtArgVal)(ih->userheight), + NULL); + } + if (style == XmDIALOG_MODELESS) XtPopup(dialog, XtGrabExclusive); diff --git a/iup/src/mot/iupmot_tree.c b/iup/src/mot/iupmot_tree.c index fa5ef09..0156974 100755 --- a/iup/src/mot/iupmot_tree.c +++ b/iup/src/mot/iupmot_tree.c @@ -1440,7 +1440,7 @@ static int motTreeSetDelNodeAttrib(Ihandle* ih, const char* name_id, const char* else if(iupStrEqualNoCase(value, "MARKED")) /* Delete the array of marked nodes */ { int i; - for(i = 1; i < ih->data->node_count; /* increment only if not removed */) + for(i = 0; i < ih->data->node_count; /* increment only if not removed */) { if (motTreeIsNodeSelected(ih->data->node_cache[i].node_handle)) motTreeRemoveNode(ih, ih->data->node_cache[i].node_handle, 1, 1); @@ -1770,13 +1770,13 @@ static int motTreeConvertXYToPos(Ihandle* ih, int x, int y) static void motTreeCallRightClickCb(Ihandle* ih, int x, int y) { - IFni cbRightClick = (IFni)IupGetCallback(ih, "RIGHTCLICK_CB"); - if (cbRightClick) + Widget wItem = XmObjectAtPoint(ih->handle, (Position)x, (Position)y); + if (wItem) { - int id = motTreeConvertXYToPos(ih, x, y); - if (id != -1) - cbRightClick(ih, id); - } + IFni cbRightClick = (IFni)IupGetCallback(ih, "RIGHTCLICK_CB"); + if (cbRightClick) + cbRightClick(ih, iupTreeFindNodeId(ih, wItem)); + } } static void motTreeCallRenameCb(Ihandle* ih) diff --git a/iup/src/mot/iupunix_help.c b/iup/src/mot/iupunix_help.c index 02be1da..ba268b7 100755 --- a/iup/src/mot/iupunix_help.c +++ b/iup/src/mot/iupunix_help.c @@ -26,7 +26,7 @@ int IupHelp(const char *url) if (iupStrEqualNoCase(system, "Linux") || iupStrEqualNoCase(system, "FreeBSD")) browser = "firefox"; - else if (iupStrEqualNoCase(system, "Darwin")) + else if (iupStrEqualNoCase(system, "MacOS")) browser = "safari"; else if (iupStrEqualPartial(system, "CYGWIN")) browser = "iexplore"; diff --git a/iup/src/mot/iupunix_info.c b/iup/src/mot/iupunix_info.c index f09573c..3bfee08 100755 --- a/iup/src/mot/iupunix_info.c +++ b/iup/src/mot/iupunix_info.c @@ -274,7 +274,10 @@ char *iupdrvGetSystemName(void) char *str = iupStrGetMemory(50); uname(&un); - strcpy(str, un.sysname); + if (iupStrEqualNoCase(un.sysname, "Darwin")) + strcpy(str, "MacOS"); + else + strcpy(str, un.sysname); return str; } @@ -285,9 +288,17 @@ char *iupdrvGetSystemVersion(void) char *str = iupStrGetMemory(100); uname(&un); - strcpy(str, un.release); - strcat(str, "."); - strcat(str, un.version); + if (iupStrEqualNoCase(un.sysname, "Darwin")) + { + int release = atoi(un.release); + sprintf(str, "%d", release-4); + } + else + { + strcpy(str, un.release); + strcat(str, "."); + strcat(str, un.version); + } return str; } diff --git a/iup/src/win/iupwin_clipboard.c b/iup/src/win/iupwin_clipboard.c index 1e0fab4..debad0d 100755 --- a/iup/src/win/iupwin_clipboard.c +++ b/iup/src/win/iupwin_clipboard.c @@ -20,6 +20,136 @@ #include "iupwin_drv.h" +typedef struct _APMFILEHEADER +{ + WORD key1, + key2, + hmf, + bleft, btop, bright, bbottom, + inch, + reserved1, + reserved2, + checksum; +} APMFILEHEADER; + +static WORD winAPMChecksum(APMFILEHEADER* papm) +{ + WORD* pw = (WORD*)papm; + WORD wSum = 0; + int i; + + /* The checksum in a Placeable Metafile header is calculated */ + /* by XOR-ing the first 10 words of the header. */ + + for (i = 0; i < 10; i++) + wSum ^= *pw++; + + return wSum; +} + +static void winWritePlacebleFile(HANDLE hFile, unsigned char* buffer, DWORD dwSize, LONG mm, LONG xExt, LONG yExt) +{ + DWORD nBytesWrite; + APMFILEHEADER APMHeader; + int w = xExt, h = yExt; + + if (mm == MM_ANISOTROPIC || mm == MM_ISOTROPIC) + { + int res = 30; + w = xExt / res; + h = yExt / res; + } + + APMHeader.key1 = 0xCDD7; + APMHeader.key2 = 0x9AC6; + APMHeader.hmf = 0; + APMHeader.bleft = 0; + APMHeader.btop = 0; + APMHeader.bright = (short)w; + APMHeader.bbottom = (short)h; + APMHeader.inch = 100; /* this number works fine in Word, etc.. */ + APMHeader.reserved1 = 0; + APMHeader.reserved2 = 0; + APMHeader.checksum = winAPMChecksum(&APMHeader); + + WriteFile(hFile, (LPSTR)&APMHeader, sizeof(APMFILEHEADER), &nBytesWrite, NULL); + WriteFile(hFile, buffer, dwSize, &nBytesWrite, NULL); +} + +static int winClipboardSetSaveEMFAttrib(Ihandle *ih, const char *value) +{ + HENHMETAFILE Handle; + DWORD dwSize, nBytesWrite; + unsigned char* buffer; + HANDLE hFile; + (void)ih; + + OpenClipboard(NULL); + Handle = (HENHMETAFILE)GetClipboardData(CF_ENHMETAFILE); + if (Handle == NULL) + { + CloseClipboard(); + return 0; + } + + dwSize = GetEnhMetaFileBits(Handle, 0, NULL); + + buffer = (unsigned char*)malloc(dwSize); + + GetEnhMetaFileBits(Handle, dwSize, buffer); + + hFile = CreateFile(value, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); + if (hFile) + { + WriteFile(hFile, buffer, dwSize, &nBytesWrite, NULL); + CloseHandle(hFile); + } + + free(buffer); + + CloseClipboard(); + return 0; +} + +static int winClipboardSetSaveWMFAttrib(Ihandle *ih, const char *value) +{ + DWORD dwSize; + unsigned char* buffer; + METAFILEPICT* lpMFP; + HANDLE Handle; + HANDLE hFile; + (void)ih; + + OpenClipboard(NULL); + Handle = (HENHMETAFILE)GetClipboardData(CF_METAFILEPICT); + if (Handle == NULL) + { + CloseClipboard(); + return 0; + } + + lpMFP = (METAFILEPICT*) GlobalLock(Handle); + + dwSize = GetMetaFileBitsEx(lpMFP->hMF, 0, NULL); + + buffer = (unsigned char*)malloc(dwSize); + + GetMetaFileBitsEx(lpMFP->hMF, dwSize, buffer); + + hFile = CreateFile(value, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); + if (hFile) + { + winWritePlacebleFile(hFile, buffer, dwSize, lpMFP->mm, lpMFP->xExt, lpMFP->yExt); + CloseHandle(hFile); + } + + GlobalUnlock(Handle); + free(buffer); + + CloseClipboard(); + return 0; +} + static int winClipboardSetTextAttrib(Ihandle *ih, const char *value) { HANDLE hHandle; @@ -162,6 +292,32 @@ static char* winClipboardGetImageAvailableAttrib(Ihandle *ih) return "NO"; } +static char* winClipboardGetWMFAvailableAttrib(Ihandle *ih) +{ + int check; + (void)ih; + OpenClipboard(NULL); + check = IsClipboardFormatAvailable(CF_METAFILEPICT); + CloseClipboard(); + if (check) + return "YES"; + else + return "NO"; +} + +static char* winClipboardGetEMFAvailableAttrib(Ihandle *ih) +{ + int check; + (void)ih; + OpenClipboard(NULL); + check = IsClipboardFormatAvailable(CF_ENHMETAFILE); + CloseClipboard(); + if (check) + return "YES"; + else + return "NO"; +} + /******************************************************************************/ Ihandle* IupClipboard(void) @@ -185,6 +341,10 @@ Iclass* iupClipboardGetClass(void) iupClassRegisterAttribute(ic, "IMAGE", NULL, winClipboardSetImageAttrib, NULL, NULL, IUPAF_WRITEONLY|IUPAF_NOT_MAPPED|IUPAF_NO_INHERIT); iupClassRegisterAttribute(ic, "TEXTAVAILABLE", winClipboardGetTextAvailableAttrib, NULL, NULL, NULL, IUPAF_READONLY|IUPAF_NOT_MAPPED|IUPAF_NO_INHERIT); iupClassRegisterAttribute(ic, "IMAGEAVAILABLE", winClipboardGetImageAvailableAttrib, NULL, NULL, NULL, IUPAF_READONLY|IUPAF_NOT_MAPPED|IUPAF_NO_INHERIT); + iupClassRegisterAttribute(ic, "WMFAVAILABLE", winClipboardGetWMFAvailableAttrib, NULL, NULL, NULL, IUPAF_READONLY|IUPAF_NOT_MAPPED|IUPAF_NO_INHERIT); + iupClassRegisterAttribute(ic, "EMFAVAILABLE", winClipboardGetEMFAvailableAttrib, NULL, NULL, NULL, IUPAF_READONLY|IUPAF_NOT_MAPPED|IUPAF_NO_INHERIT); + iupClassRegisterAttribute(ic, "SAVEEMF", NULL, winClipboardSetSaveEMFAttrib, NULL, NULL, IUPAF_WRITEONLY|IUPAF_NOT_MAPPED|IUPAF_NO_INHERIT); + iupClassRegisterAttribute(ic, "SAVEWMF", NULL, winClipboardSetSaveWMFAttrib, NULL, NULL, IUPAF_WRITEONLY|IUPAF_NOT_MAPPED|IUPAF_NO_INHERIT); return ic; } diff --git a/iup/src/win/iupwin_common.c b/iup/src/win/iupwin_common.c index ba68b78..0f53e68 100755 --- a/iup/src/win/iupwin_common.c +++ b/iup/src/win/iupwin_common.c @@ -372,7 +372,7 @@ int iupwinBaseContainerProc(Ihandle* ih, UINT msg, WPARAM wp, LPARAM lp, LRESULT case WM_CTLCOLORSTATIC: { Ihandle* child = iupwinHandleGet((void*)lp); - if (child) + if (child && iupChildTreeGetNativeParent(child)==ih) { IFctlColor cb = (IFctlColor)IupGetCallback(child, "_IUPWIN_CTLCOLOR_CB"); if (cb) @@ -390,7 +390,11 @@ int iupwinBaseContainerProc(Ihandle* ih, UINT msg, WPARAM wp, LPARAM lp, LRESULT if (wp == 0) /* a menu */ child = iupwinMenuGetItemHandle((HMENU)drawitem->hwndItem, drawitem->itemID); else + { child = iupwinHandleGet(drawitem->hwndItem); + if (child && iupChildTreeGetNativeParent(child)!=ih) + child = NULL; + } if (child) { @@ -408,7 +412,7 @@ int iupwinBaseContainerProc(Ihandle* ih, UINT msg, WPARAM wp, LPARAM lp, LRESULT case WM_VSCROLL: { Ihandle *child = iupwinHandleGet((void*)lp); - if (child) + if (child && iupChildTreeGetNativeParent(child)==ih) { IFni cb = (IFni)IupGetCallback(child, "_IUPWIN_CUSTOMSCROLL_CB"); if (cb) @@ -426,7 +430,7 @@ int iupwinBaseContainerProc(Ihandle* ih, UINT msg, WPARAM wp, LPARAM lp, LRESULT break; child = iupwinHandleGet(msg_info->hwndFrom); - if (child) + if (child && iupChildTreeGetNativeParent(child)==ih) { IFnotify cb = (IFnotify)IupGetCallback(child, "_IUPWIN_NOTIFY_CB"); if (cb) diff --git a/iup/src/win/iupwin_dialog.c b/iup/src/win/iupwin_dialog.c index c13b88d..93fe404 100755 --- a/iup/src/win/iupwin_dialog.c +++ b/iup/src/win/iupwin_dialog.c @@ -423,6 +423,13 @@ static int winDialogBaseProc(Ihandle* ih, UINT msg, WPARAM wp, LPARAM lp, LRESUL *result = 0; return 1; } + case WM_COPYDATA: /* usually from SetGlobal("SINGLEINSTANCE") */ + { + COPYDATASTRUCT* cds = (COPYDATASTRUCT*)lp; + IFnsi cb = (IFnsi)IupGetCallback(ih, "COPYDATA_CB"); + if (cb) cb(ih, cds->lpData, cds->cbData); + break; + } case WM_SETCURSOR: { if (ih->handle == (HWND)wp && LOWORD(lp)==HTCLIENT) diff --git a/iup/src/win/iupwin_globalattrib.c b/iup/src/win/iupwin_globalattrib.c index bcd6355..2d27ca5 100755 --- a/iup/src/win/iupwin_globalattrib.c +++ b/iup/src/win/iupwin_globalattrib.c @@ -17,13 +17,81 @@ #include "iupwin_drv.h" -static int win_monitor_index = 0; - /* Not defined in compilers older than VC9 */ #ifndef MAPVK_VK_TO_VSC #define MAPVK_VK_TO_VSC (0) #endif + +static int win_monitor_index = 0; +static HANDLE win_singleintance = NULL; +static HWND win_findwindow = NULL; + + +static int winGlobalSetMutex(const char* name) +{ + if (win_singleintance) + ReleaseMutex(win_singleintance); + + /* try to create a mutex (will fail if already one of that name) */ + win_singleintance = CreateMutex(NULL, FALSE, name); + + /* Return TRUE if existing semaphore opened */ + if (win_singleintance != NULL && GetLastError()==ERROR_ALREADY_EXISTS) + { + CloseHandle(win_singleintance); + return 1; + } + + /* wasn’t found, new one created therefore return FALSE */ + return (win_singleintance == NULL); +} + +static BOOL CALLBACK winGlobalEnumWindowProc(HWND hWnd, LPARAM lParam) +{ + char* name = (char*)lParam; + char str[256]; + int len = GetWindowText(hWnd, str, 256); + if (len) + { + if (iupStrEqualPartial(str, name)) + { + win_findwindow = hWnd; + return FALSE; + } + } + + return TRUE; /* continue searching */ +} + +static HWND winGlobalFindWindow(const char* name) +{ + win_findwindow = NULL; + EnumWindows(winGlobalEnumWindowProc, (LPARAM)name); + return win_findwindow; +} + +static void winGlobalFindInstance(const char* name) +{ + HWND hWnd = winGlobalFindWindow(name); + if (hWnd) + { + LPTSTR cmdLine = GetCommandLine(); + + SetForegroundWindow(hWnd); + + /* Command line is not empty. Send it to the first instance. */ + if (strlen(cmdLine) != 0) + { + COPYDATASTRUCT cds; + cds.dwData = (ULONG_PTR)"IUP_DATA"; + cds.cbData = strlen(cmdLine)+1; + cds.lpData = cmdLine; + SendMessage(hWnd, WM_COPYDATA, 0, (LPARAM)&cds); + } + } +} + static void winGlobalSendKey(int key, int press) { unsigned int keyval, state; @@ -103,7 +171,7 @@ static void winGlobalSendKey(int key, int press) } } -static BOOL CALLBACK winMonitorInfoEnum(HMONITOR handle, HDC handle_dc, LPRECT rect, LPARAM data) +static BOOL CALLBACK winGlobalMonitorInfoEnum(HMONITOR handle, HDC handle_dc, LPRECT rect, LPARAM data) { RECT* monitors_rect = (RECT*)data; monitors_rect[win_monitor_index] = *rect; @@ -153,6 +221,16 @@ int iupdrvSetGlobal(const char *name, const char *value) iupwin_dll_hinstance = (HINSTANCE)value; return 0; } + if (iupStrEqual(name, "SINGLEINSTANCE")) + { + if (winGlobalSetMutex(value)) + { + winGlobalFindInstance(value); + return 0; /* don't save the attribute, mutex already exist */ + } + else + return 1; /* save the attribute, this is the first instance */ + } return 1; } @@ -230,7 +308,7 @@ char *iupdrvGetGlobal(const char *name) char* pstr = str; win_monitor_index = 0; - EnumDisplayMonitors(NULL, NULL, winMonitorInfoEnum, (LPARAM)monitors_rect); + EnumDisplayMonitors(NULL, NULL, winGlobalMonitorInfoEnum, (LPARAM)monitors_rect); for (i=0; i < monitors_count; i++) pstr += sprintf(pstr, "%d %d %d %d\n", (int)monitors_rect[i].left, (int)monitors_rect[i].top, (int)(monitors_rect[i].right-monitors_rect[i].left), (int)(monitors_rect[i].bottom-monitors_rect[i].top)); @@ -245,6 +323,8 @@ char *iupdrvGetGlobal(const char *name) return "NO"; } if (iupStrEqual(name, "DLL_HINSTANCE")) + { return (char*)iupwin_dll_hinstance; + } return NULL; } diff --git a/iup/src/win/iupwin_loop.c b/iup/src/win/iupwin_loop.c index fd25537..4bcf38c 100755 --- a/iup/src/win/iupwin_loop.c +++ b/iup/src/win/iupwin_loop.c @@ -30,6 +30,19 @@ void iupdrvSetIdleFunction(Icallback f) win_idle_cb = (IFidle)f; } +static int winLoopCallIdle(void) +{ + int ret = win_idle_cb(); + if (ret == IUP_CLOSE) + { + win_idle_cb = NULL; + return IUP_CLOSE; + } + if (ret == IUP_IGNORE) + win_idle_cb = NULL; + return ret; +} + void IupExitLoop(void) { PostQuitMessage(0); @@ -74,15 +87,11 @@ int IupMainLoop(void) } else { - int ret = win_idle_cb(); - if (ret == IUP_CLOSE) + if (winLoopCallIdle() == IUP_CLOSE) { - win_idle_cb = NULL; win_main_loop--; return IUP_CLOSE; } - if (ret == IUP_IGNORE) - win_idle_cb = NULL; } } else @@ -123,6 +132,8 @@ int IupLoopStep(void) MSG msg; if (PeekMessage(&msg, 0, 0, 0, PM_REMOVE)) return winLoopProcessMessage(&msg); + else if (win_idle_cb) + return winLoopCallIdle(); return IUP_DEFAULT; } diff --git a/iup/src/win/iupwin_tree.c b/iup/src/win/iupwin_tree.c index 4a5f8be..4a8d331 100755 --- a/iup/src/win/iupwin_tree.c +++ b/iup/src/win/iupwin_tree.c @@ -3,7 +3,6 @@ * * See Copyright Notice in iup.h */ - #undef NOTREEVIEW #include <windows.h> #include <commctrl.h> @@ -85,16 +84,6 @@ static HTREEITEM winTreeFindNodeXY(Ihandle* ih, int x, int y) return (HTREEITEM)SendMessage(ih->handle, TVM_HITTEST, 0, (LPARAM)(LPTVHITTESTINFO)&info); } -static HTREEITEM winTreeFindNodePointed(Ihandle* ih) -{ - TVHITTESTINFO info; - DWORD pos = GetMessagePos(); - info.pt.x = LOWORD(pos); - info.pt.y = HIWORD(pos); - ScreenToClient(ih->handle, &info.pt); - return (HTREEITEM)SendMessage(ih->handle, TVM_HITTEST, 0, (LPARAM)(LPTVHITTESTINFO)&info); -} - int iupwinGetColor(const char* value, COLORREF *color) { unsigned char r, g, b; @@ -381,7 +370,7 @@ static void winTreeSelectRange(Ihandle* ih, HTREEITEM hItem1, HTREEITEM hItem2, int i; int id1 = iupTreeFindNodeId(ih, hItem1); int id2 = iupTreeFindNodeId(ih, hItem2); - if (id2 == -1) id2 = ih->data->node_count-1; + if (id1 > id2) { int tmp = id1; @@ -403,13 +392,19 @@ static void winTreeSelectRange(Ihandle* ih, HTREEITEM hItem1, HTREEITEM hItem2, static void winTreeSelectAll(Ihandle* ih) { - HTREEITEM hItemRoot = (HTREEITEM)SendMessage(ih->handle, TVM_GETNEXTITEM, TVGN_ROOT, 0); - winTreeSelectRange(ih, hItemRoot, NULL, 0); + int i; + for (i = 0; i < ih->data->node_count; i++) + winTreeSelectNode(ih, ih->data->node_cache[i].node_handle, 1); } static void winTreeClearSelection(Ihandle* ih, HTREEITEM hItemExcept) { - winTreeSelectRange(ih, hItemExcept, hItemExcept, 1); + int i; + for (i = 0; i < ih->data->node_count; i++) + { + if (ih->data->node_cache[i].node_handle != hItemExcept) + winTreeSelectNode(ih, ih->data->node_cache[i].node_handle, 0); + } } static int winTreeInvertSelectFunc(Ihandle* ih, HTREEITEM hItem, int id, void* userdata) @@ -1507,7 +1502,7 @@ static int winTreeSetDelNodeAttrib(Ihandle* ih, const char* name_id, const char* iupAttribSetStr(ih, "_IUPTREE_IGNORE_SELECTION_CB", "1"); hItemFocus = iupdrvTreeGetFocusNode(ih); - for(i = 1; i < ih->data->node_count; /* increment only if not removed */) + for(i = 0; i < ih->data->node_count; /* increment only if not removed */) { if (winTreeIsNodeSelected(ih, ih->data->node_cache[i].node_handle)) { @@ -2009,6 +2004,17 @@ static int winTreeMouseMultiSelect(Ihandle* ih, int x, int y) return 0; } +static void winTreeCallRightClickCb(Ihandle* ih, int x, int y) +{ + HTREEITEM hItem = winTreeFindNodeXY(ih, x, y); + if (hItem) + { + IFni cbRightClick = (IFni)IupGetCallback(ih, "RIGHTCLICK_CB"); + if (cbRightClick) + cbRightClick(ih, iupTreeFindNodeId(ih, hItem)); + } +} + static int winTreeProc(Ihandle* ih, UINT msg, WPARAM wp, LPARAM lp, LRESULT *result) { switch (msg) @@ -2150,8 +2156,11 @@ static int winTreeProc(Ihandle* ih, UINT msg, WPARAM wp, LPARAM lp, LRESULT *res } } break; - case WM_MBUTTONDOWN: case WM_RBUTTONDOWN: + winTreeCallRightClickCb(ih, (int)(short)LOWORD(lp), (int)(short)HIWORD(lp)); + *result = 0; + return 1; /* must abort the normal behavior, because it is weird and just causes trouble */ + case WM_MBUTTONDOWN: case WM_LBUTTONDBLCLK: case WM_MBUTTONDBLCLK: case WM_RBUTTONDBLCLK: @@ -2366,13 +2375,6 @@ static int winTreeWmNotify(Ihandle* ih, NMHDR* msg_info, int *result) return 1; } } - else if(msg_info->code == NM_RCLICK) - { - HTREEITEM hItem = winTreeFindNodePointed(ih); - IFni cbRightClick = (IFni)IupGetCallback(ih, "RIGHTCLICK_CB"); - if (cbRightClick) - cbRightClick(ih, iupTreeFindNodeId(ih, hItem)); - } else if (msg_info->code == NM_CUSTOMDRAW) { NMTVCUSTOMDRAW *customdraw = (NMTVCUSTOMDRAW*)msg_info; diff --git a/iup/srccd/config.mak b/iup/srccd/config.mak deleted file mode 100755 index 3e5a9fe..0000000 --- a/iup/srccd/config.mak +++ /dev/null @@ -1,14 +0,0 @@ -PROJNAME = iup -LIBNAME = iupcd -OPT = YES - -DEFINES = CD_NO_OLD_INTERFACE -SRC = iup_cd.c -DEF_FILE = iupcd.def - -USE_CD=YES -# Can not use USE_IUP because Tecmake will include "iupcd" in linker - -INCLUDES = ../include -LIBS = iup -LDIR = ../lib/$(TEC_UNAME) diff --git a/iup/srccd/make_uname b/iup/srccd/make_uname deleted file mode 100755 index cc4b881..0000000 --- a/iup/srccd/make_uname +++ /dev/null @@ -1,3 +0,0 @@ -#This builds all the libraries of the folder for 1 uname - -tecmake $1 $2 $3 $4 $5 $6 $7 diff --git a/iup/srccd/make_uname.bat b/iup/srccd/make_uname.bat deleted file mode 100755 index f0a0722..0000000 --- a/iup/srccd/make_uname.bat +++ /dev/null @@ -1,4 +0,0 @@ -@echo off -REM This builds all the libraries of the folder for 1 uname - -call tecmake %1 %2 %3 %4 %5 %6 diff --git a/iup/srcconsole/config.mak b/iup/srcconsole/config.mak deleted file mode 100755 index 568bed6..0000000 --- a/iup/srcconsole/config.mak +++ /dev/null @@ -1,155 +0,0 @@ -PROJNAME = iup -APPNAME = iuplua51 -APPTYPE = CONSOLE - -ifdef GTK_DEFAULT - ifdef USE_MOTIF - # Build Motif version in Linux,Darwin,FreeBSD - APPNAME = iuplua51mot - endif -else - ifdef USE_GTK - # Build GTK version in IRIX,SunOS,AIX,Win32 - APPNAME = iuplua51gtk - endif -endif - -LOHDIR = loh -SRCLUA = console5.lua -SRC = iup_lua51.c - -# Disable strip -STRIP = -# Optimize -OPT = YES - -# IM and IupPPlot uses C++ -LINKER = $(CPPC) - -USE_MOTIF = Yes - -ifdef USE_GTK - APPNAME = iuplua51gtk -endif - -ifdef USE_MOTIF - APPNAME = iuplua51mot -endif - -DBG = Yes - -ifdef DBG - # Statically link everything only when debugging - IUP := .. - USE_IUPLUA = Yes - USE_IUP3 = Yes - USE_STATIC = Yes - USE_LUA51 = Yes - - ifdef DBG_DIR - IUPLIB = $(IUP)/lib/$(TEC_UNAME)d - CDLIB = $(CD)/lib/$(TEC_UNAME)d - IMLIB = $(IM)/lib/$(TEC_UNAME)d - else - IUPLIB = $(IUP)/lib/$(TEC_UNAME) - CDLIB = $(CD)/lib/$(TEC_UNAME) - IMLIB = $(IM)/lib/$(TEC_UNAME) - endif - - DEFINES = USE_STATIC - - USE_CDLUA = Yes - USE_IUPCONTROLS = Yes - ifneq ($(findstring Win, $(TEC_SYSNAME)), ) - LIBS += iuplua_pplot$(LIBLUASUFX) iup_pplot - else - SLIB += $(IUPLIB)/libiuplua_pplot$(LIBLUASUFX).a $(IUPLIB)/libiup_pplot.a - endif - - ifndef IUPLUA_NO_IM - ifneq ($(findstring Win, $(TEC_SYSNAME)), ) - LIBS += cdluaim$(LIBLUASUFX) - else - SLIB += $(CDLIB)/libcdluaim$(LIBLUASUFX).a - endif - endif - ifneq ($(findstring Win, $(TEC_SYSNAME)), ) - USE_GDIPLUS=Yes - else - # USE_XRENDER=Yes - endif - - USE_IMLUA = Yes - - ifneq ($(findstring Win, $(TEC_SYSNAME)), ) - LIBS += imlua_process$(LIBLUASUFX) iupluaim$(LIBLUASUFX) im_process iupim - else - SLIB += $(IMLIB)/libimlua_process$(LIBLUASUFX).a $(IUPLIB)/libiupluaim$(LIBLUASUFX).a $(IMLIB)/libim_process.a $(IUPLIB)/libiupim.a - endif - - - IUPLUA_IMGLIB = Yes - ifdef IUPLUA_IMGLIB - DEFINES += IUPLUA_IMGLIB - ifneq ($(findstring Win, $(TEC_SYSNAME)), ) - LIBS += iupluaimglib$(LIBLUASUFX) iupimglib - else - SLIB += $(IUPLIB)/libiupluaimglib$(LIBLUASUFX).a $(IUPLIB)/libiupimglib.a - endif - endif -else - ifneq ($(findstring Win, $(TEC_SYSNAME)), ) - # Dinamically link in Windows, when not debugging - # Must call "tecmake dll8" so USE_* will use the correct TEC_UNAME - USE_LUA51 = Yes - USE_DLL = Yes - GEN_MANIFEST = No - else - # In UNIX Lua is always statically linked, late binding is used. - # Except in Cygwin and MacOSX - ifeq ($(findstring cygw, $(TEC_UNAME)), ) - ifeq ($(findstring Darwin, $(TEC_UNAME)), ) - USE_STATIC = Yes - endif - endif - USE_LUA51 = Yes - endif -endif - - -ifneq ($(findstring Win, $(TEC_SYSNAME)), ) - SLIB += setargv.obj - SRC += iuplua5.rc -endif - -ifneq ($(findstring cygw, $(TEC_UNAME)), ) - LIBS += readline history -endif - -ifneq ($(findstring Darwin, $(TEC_UNAME)), ) - LIBS += readline -endif - -ifneq ($(findstring Linux, $(TEC_UNAME)), ) - LIBS += dl - #To allow late binding - LFLAGS = -Wl,-E - LIBS += readline history curses ncurses -endif - -ifneq ($(findstring BSD, $(TEC_UNAME)), ) - #To allow late binding - LFLAGS = -Wl,-E - LIBS += readline history curses ncurses -endif - -ifneq ($(findstring SunOS, $(TEC_UNAME)), ) - LIBS += dl -endif - -ifneq ($(findstring AIX, $(TEC_UNAME)), ) - FLAGS += -mminimal-toc - OPTFLAGS = -mminimal-toc -ansi -pedantic - LFLAGS = -Xlinker "-bbigtoc" -endif - diff --git a/iup/srcconsole/console5.lua b/iup/srcconsole/console5.lua index 0b93641..8373500 100755 --- a/iup/srcconsole/console5.lua +++ b/iup/srcconsole/console5.lua @@ -22,6 +22,9 @@ function iup_console.print_version_info() local mot = iup.GetGlobal("MOTIFVERSION") if (mot) then str = iup_console.concat(str, " Motif Version: ", mot) end + + local gtk = iup.GetGlobal("GTKVERSION") + if (gtk) then str = iup_console.concat(str, " GTK Version: ", gtk) end str = iup_console.concat(str, " Screen Size: " .. iup.GetGlobal("SCREENSIZE")) str = iup_console.concat(str, " Screen Depth: " .. iup.GetGlobal("SCREENDEPTH")) @@ -36,7 +39,7 @@ end -- Console Dialog iup_console.lastfilename = nil -- Last file open -iup_console.mlCode = iup.multiline{expand="YES", size="200x120", font="COURIER_NORMAL_10"} +iup_console.mlCode = iup.multiline{expand="YES", size="200x120", font="Courier, 10"} iup_console.lblPosition = iup.label{title="0:0", size="50x"} iup_console.lblFileName = iup.label{title="", size="50x", expand="HORIZONTAL"} @@ -207,7 +210,7 @@ iup_console.dlgAbout = iup.dialog iup_console.dlgMain:show() iup.SetFocus(iup_console.mlCode) -if (not iup.MainLoopLevel or iup.MainLoopLevel()==0) then +if (iup.MainLoopLevel()==0) then iup.MainLoop() end diff --git a/iup/srcconsole/iup_lua51.c b/iup/srcconsole/iup_lua51.c index ed73ac0..c657363 100755 --- a/iup/srcconsole/iup_lua51.c +++ b/iup/srcconsole/iup_lua51.c @@ -113,7 +113,7 @@ static int report (lua_State *L, int status) { static int traceback (lua_State *L) { if (!lua_isstring(L, 1)) /* 'message' not a string? */ return 1; /* keep it intact */ - lua_getfield(L, LUA_GLOBALSINDEX, "debug"); + lua_getglobal(L, "debug"); if (!lua_istable(L, -1)) { lua_pop(L, 1); return 1; @@ -189,7 +189,7 @@ static int dolibrary (lua_State *L, const char *name) { static const char *get_prompt (lua_State *L, int firstline) { const char *p; - lua_getfield(L, LUA_GLOBALSINDEX, firstline ? "_PROMPT" : "_PROMPT2"); + lua_getglobal(L, firstline ? "_PROMPT" : "_PROMPT2"); p = lua_tostring(L, -1); if (p == NULL) p = (firstline ? LUA_PROMPT : LUA_PROMPT2); lua_pop(L, 1); /* remove global */ @@ -410,24 +410,17 @@ static void iuplua_openlibs (lua_State *L) { #endif } -static void iuplua_input (lua_State *L) { -#ifdef TEC_BIGENDIAN -#ifdef TEC_64 -#include "loh/console5_be64.loh" +static void iuplua_input (lua_State *L) +{ +#ifdef IUPLUA_USELOH +#include "console5.loh" #else -#include "loh/console5_be32.loh" -#endif +#ifdef IUPLUA_USELZH +#include "console5.lzh" #else -#ifdef TEC_64 -#ifdef WIN64 -#include "loh/console5_le64w.loh" -#else -#include "loh/console5_le64.loh" -#endif -#else -#include "loh/console5.loh" -#endif -#endif + luaL_dofile(L, "console5.lua"); +#endif +#endif } /******************* IUP *********************/ diff --git a/iup/srcconsole/iuplua3.mak b/iup/srcconsole/iuplua3.mak deleted file mode 100755 index e892496..0000000 --- a/iup/srcconsole/iuplua3.mak +++ /dev/null @@ -1,90 +0,0 @@ -PROJNAME = iup -APPNAME = iuplua3 -APPTYPE = console -OPT = YES - -IUP := .. - -# IM is a C++ library with a C API -LINKER = $(CPPC) - -SRC = iup_lua3.c -SRCLUA = console3.lua -LOHDIR = loh - -USE_LUA = Yes -USE_IUPLUA = Yes -USE_IUP3 = Yes - -USE_STATIC = Yes - -ifdef BUILD_64 - ifneq ($(findstring SunOS, $(TEC_UNAME)), ) - LINKER = cc - IUPLUA_NO_IM = Yes - endif - ifneq ($(findstring AIX, $(TEC_UNAME)), ) - LINKER = cc - IUPLUA_NO_IM = Yes - endif -endif - -ifeq "$(TEC_UNAME)" "SunOS510x86" - IUPLUA_NO_GL = Yes -endif - -#IUPLUA_NO_GL = Yes -ifndef IUPLUA_NO_GL - USE_OPENGL = Yes -else - DEFINES = IUPLUA_NO_GL -endif - -#IUPLUA_NO_CD = Yes -ifndef IUPLUA_NO_CD - USE_CD = Yes - USE_CDLUA = Yes - USE_IUPCONTROLS = Yes - ifneq ($(findstring Win, $(TEC_SYSNAME)), ) - LIBS += iup_pplot iuplua_pplot3 - else - IUPLIB = $(IUP)/lib/$(TEC_UNAME) - SLIB += $(IUPLIB)/libiuplua_pplot3.a $(IUPLIB)/libiup_pplot.a - endif -else - DEFINES += IUPLUA_NO_CD -endif - -#IUPLUA_NO_IM = Yes -ifndef IUPLUA_NO_IM - USE_IM = Yes - USE_IMLUA = Yes - - ifneq ($(findstring Win, $(TEC_SYSNAME)), ) - LIBS += iupim iupluaim3 - else - IUPLIB = $(IUP)/lib/$(TEC_UNAME) - SLIB += $(IUPLIB)/libiupluaim3.a $(IUPLIB)/libiupim.a - endif -else - DEFINES += IUPLUA_NO_IM -endif - -ifneq ($(findstring AIX, $(TEC_UNAME)), ) - FLAGS += -mminimal-toc - OPTFLAGS = -mminimal-toc -ansi -pedantic - LFLAGS = -Xlinker "-bbigtoc" -endif - -ifneq ($(findstring Win, $(TEC_SYSNAME)), ) - SRC += iuplua3.rc -endif - -ifeq ($(TEC_UNAME), vc8) - ifdef DBG - #debug info not working for vc8 linker - define DBG - endef - endif -endif - diff --git a/iup/srcconsole/iuplua3.rc b/iup/srcconsole/iuplua3.rc index 9fcc280..67676d0 100755 --- a/iup/srcconsole/iuplua3.rc +++ b/iup/srcconsole/iuplua3.rc @@ -2,8 +2,8 @@ TECGRAF_ICON ICON "..\\etc\\tecgraf.ico" 1 VERSIONINFO - FILEVERSION 3,0,0,0 - PRODUCTVERSION 3,0,0,0 + FILEVERSION 3,1,0,0 + PRODUCTVERSION 3,1,0,0 BEGIN BLOCK "StringFileInfo" BEGIN @@ -12,11 +12,11 @@ BEGIN VALUE "Comments", "www.tecgraf.puc-rio.br/iup\0" VALUE "CompanyName", "Tecgraf/PUC-Rio\0" VALUE "FileDescription", "Lua Windows Standalone Interpreter with IUP\0" - VALUE "FileVersion", "3.0.0\0" + VALUE "FileVersion", "3.1.0\0" VALUE "LegalCopyright", "Copyright © 1994-2010 Tecgraf, PUC-Rio.\0" VALUE "OriginalFilename", "iuplua51.exe\0" VALUE "ProductName", "IUP for Windows\0" - VALUE "ProductVersion", "3.0.0\0" + VALUE "ProductVersion", "3.1.0\0" END END END @@ -42,4 +42,8 @@ BEGIN END /* The following line enable Windows XP Visual Styles */ +#ifdef TEC_64 +1 24 "..\\etc\\iup64.manifest" +#else 1 24 "..\\etc\\iup.manifest" +#endif diff --git a/iup/srcconsole/iuplua5.rc b/iup/srcconsole/iuplua5.rc index 70e40a4..22e81f7 100755 --- a/iup/srcconsole/iuplua5.rc +++ b/iup/srcconsole/iuplua5.rc @@ -2,8 +2,8 @@ TECGRAF_ICON ICON "..\\etc\\tecgraf.ico" 1 VERSIONINFO - FILEVERSION 3,0,0,0 - PRODUCTVERSION 3,0,0,0 + FILEVERSION 3,1,0,0 + PRODUCTVERSION 3,1,0,0 BEGIN BLOCK "StringFileInfo" BEGIN @@ -12,11 +12,11 @@ BEGIN VALUE "Comments", "www.tecgraf.puc-rio.br/iup\0" VALUE "CompanyName", "Tecgraf/PUC-Rio\0" VALUE "FileDescription", "Lua Windows Standalone Interpreter with IUP\0" - VALUE "FileVersion", "3.0.0\0" + VALUE "FileVersion", "3.1.0\0" VALUE "LegalCopyright", "Copyright © 1994-2010 Tecgraf, PUC-Rio.\0" VALUE "OriginalFilename", "iuplua51.exe\0" VALUE "ProductName", "IUP for Windows\0" - VALUE "ProductVersion", "3.0.0\0" + VALUE "ProductVersion", "3.1.0\0" END END END @@ -55,5 +55,9 @@ END 1 24 "wlua_dll9_x86.manifest" #endif #else +#ifdef TEC_64 +1 24 "..\\etc\\iup64.manifest" +#else 1 24 "..\\etc\\iup.manifest" #endif +#endif diff --git a/iup/srcconsole/make_uname b/iup/srcconsole/make_uname deleted file mode 100755 index 6263490..0000000 --- a/iup/srcconsole/make_uname +++ /dev/null @@ -1,6 +0,0 @@ -#This builds all the libraries of the folder for 1 uname - -tecmake relink $1 $2 $3 $4 $5 $6 $7 $8 -#tecmake USE_GTK=Yes relink $1 $2 $3 $4 $5 $6 $7 $8 -#tecmake USE_MOTIF=Yes relink $1 $2 $3 $4 $5 $6 $7 $8 -#tecmake MF=iuplua3 relink $1 $2 $3 $4 $5 $6 $7 $8 diff --git a/iup/srcconsole/make_uname.bat b/iup/srcconsole/make_uname.bat deleted file mode 100755 index a0db110..0000000 --- a/iup/srcconsole/make_uname.bat +++ /dev/null @@ -1,32 +0,0 @@ -@echo off - -if "%1"=="" goto iupexe32 -if "%1"=="vc8" goto iupexe32 -if "%1"=="vc8_64" goto iupexe64 -if "%1"=="all" goto iupexe -goto end - -REM Must use dll8 so USE_* will use the correct TEC_UNAME - -:iupexe32 -call tecmake dll8 relink %2 %3 %4 %5 %6 %7 -REM call tecmake vc8 USE_GTK=Yes relink %2 %3 %4 %5 %6 %7 -REM call tecmake vc8 "MF=iuplua3" relink %2 %3 %4 %5 %6 %7 -goto end - -:iupexe64 -call tecmake dll8_64 relink %2 %3 %4 %5 %6 %7 -REM call tecmake vc8_64 USE_GTK=Yes relink %2 %3 %4 %5 %6 %7 -REM call tecmake vc8_64 "MF=iuplua3" relink %2 %3 %4 %5 %6 %7 -goto end - -:iupexe -call tecmake dll8 relink %2 %3 %4 %5 %6 %7 -REM call tecmake vc8 USE_GTK=Yes relink %2 %3 %4 %5 %6 %7 -REM call tecmake vc8 "MF=iuplua3" relink %2 %3 %4 %5 %6 %7 -call tecmake dll8_64 relink %2 %3 %4 %5 %6 %7 -REM call tecmake vc8_64 USE_GTK=Yes relink %2 %3 %4 %5 %6 %7 -REM call tecmake vc8_64 "MF=iuplua3" relink %2 %3 %4 %5 %6 %7 -goto end - -:end diff --git a/iup/srccontrols/config.mak b/iup/srccontrols/config.mak deleted file mode 100755 index 10f11e1..0000000 --- a/iup/srccontrols/config.mak +++ /dev/null @@ -1,48 +0,0 @@ -PROJNAME = iup -LIBNAME = iupcontrols -OPT = YES - -INCLUDES = ../include ../src . - -SRCCOLOR = iup_colorbrowser.c iup_colorhsi.c iup_colorbrowserdlg.c -SRCCOLOR := $(addprefix color/, $(SRCCOLOR)) - -SRCMATRIX = iupmat_key.c iupmat_mark.c iupmat_aux.c iupmat_mem.c iupmat_mouse.c iupmat_numlc.c \ - iupmat_colres.c iupmat_draw.c iupmat_focus.c iupmat_getset.c iupmatrix.c \ - iupmat_scroll.c iupmat_edit.c -SRCMATRIX := $(addprefix matrix/, $(SRCMATRIX)) - -SRC = iup_cdutil.c iup_gauge.c iup_cells.c iup_colorbar.c iup_controls.c \ - iup_dial.c iup_oldmask.c \ - $(SRCCOLOR) $(SRCMATRIX) - -LIBS = iup iupcd -LDIR = ../lib/$(TEC_UNAME) -USE_CD = Yes - -# force the definition of math functions using float -# Some compilers do not define them -ifeq ($(TEC_UNAME), dll) - DEFINES += IUP_DEFMATHFLOAT -endif -ifeq ($(TEC_UNAME), vc6) - DEFINES += IUP_DEFMATHFLOAT -endif -ifeq ($(TEC_UNAME), dll7) - DEFINES += IUP_DEFMATHFLOAT -endif -ifeq ($(TEC_UNAME), vc7) - DEFINES += IUP_DEFMATHFLOAT -endif -ifneq ($(findstring ow, $(TEC_UNAME)), ) - DEFINES += IUP_DEFMATHFLOAT -endif -ifneq ($(findstring bc, $(TEC_UNAME)), ) - DEFINES += IUP_DEFMATHFLOAT -endif -ifneq ($(findstring AIX, $(TEC_UNAME)), ) - DEFINES += IUP_DEFMATHFLOAT -endif -ifneq ($(findstring SunOS, $(TEC_UNAME)), ) - DEFINES += IUP_DEFMATHFLOAT -endif diff --git a/iup/srccontrols/make_uname b/iup/srccontrols/make_uname deleted file mode 100755 index cc4b881..0000000 --- a/iup/srccontrols/make_uname +++ /dev/null @@ -1,3 +0,0 @@ -#This builds all the libraries of the folder for 1 uname - -tecmake $1 $2 $3 $4 $5 $6 $7 diff --git a/iup/srccontrols/make_uname.bat b/iup/srccontrols/make_uname.bat deleted file mode 100755 index f0a0722..0000000 --- a/iup/srccontrols/make_uname.bat +++ /dev/null @@ -1,4 +0,0 @@ -@echo off -REM This builds all the libraries of the folder for 1 uname - -call tecmake %1 %2 %3 %4 %5 %6 diff --git a/iup/srccontrols/matrix/iupmat_def.h b/iup/srccontrols/matrix/iupmat_def.h index 225cc16..dd414c8 100755 --- a/iup/srccontrols/matrix/iupmat_def.h +++ b/iup/srccontrols/matrix/iupmat_def.h @@ -82,6 +82,7 @@ struct _IcontrolData int use_title_size; /* use title contents when calculating cell size */ int need_calcsize; int first_redraw; + int inside_markedit_cb; /* avoid recursion */ /* attributes */ int mark_continuous, mark_mode, mark_multiple; diff --git a/iup/srccontrols/matrix/iupmat_mark.c b/iup/srccontrols/matrix/iupmat_mark.c index 99aad32..bffd6ce 100755 --- a/iup/srccontrols/matrix/iupmat_mark.c +++ b/iup/srccontrols/matrix/iupmat_mark.c @@ -62,8 +62,12 @@ static void iMatrixMarkCellSet(Ihandle* ih, int lin, int col, int mark, IFniii m if (ih->data->callback_mode) { - if (markedit_cb) + if (markedit_cb && !ih->data->inside_markedit_cb) + { + ih->data->inside_markedit_cb = 1; markedit_cb(ih, lin, col, mark); + ih->data->inside_markedit_cb = 0; + } else { sprintf(str, "MARK%d:%d", lin, col); @@ -604,7 +608,7 @@ int iupMatrixSetMarkAttrib(Ihandle* ih, const char* name_id, const char* value) if (ih->data->mark_mode == IMAT_MARK_CELL) { - int mark; + int mark, ret = 0; if (lin == 0 || col == 0) /* title can NOT have a mark */ return 0; @@ -614,10 +618,24 @@ int iupMatrixSetMarkAttrib(Ihandle* ih, const char* name_id, const char* value) if (ih->data->callback_mode) { IFniii markedit_cb = (IFniii)IupGetCallback(ih, "MARKEDIT_CB"); - if (markedit_cb) + if (markedit_cb && !ih->data->inside_markedit_cb) + { + ih->data->inside_markedit_cb = 1; markedit_cb(ih, lin, col, mark); - else if (mark) - return 1; /* store the attribute */ + ih->data->inside_markedit_cb = 0; + } + else + { + char str[100] = "MARK"; + strcat(str, name_id); + if (mark) + { + iupAttribSetStr(ih, str, "1"); + ret = 1; + } + else + iupAttribSetStr(ih, str, NULL); + } } else { @@ -633,6 +651,8 @@ int iupMatrixSetMarkAttrib(Ihandle* ih, const char* name_id, const char* value) iupMatrixPrepareDrawData(ih); iupMatrixDrawCells(ih, lin, col, lin, col); } + + return ret; } else { diff --git a/iup/srccontrols/matrix/iupmatrix.c b/iup/srccontrols/matrix/iupmatrix.c index 9e379e2..c94fcdc 100755 --- a/iup/srccontrols/matrix/iupmatrix.c +++ b/iup/srccontrols/matrix/iupmatrix.c @@ -809,9 +809,9 @@ static void iMatrixComputeNaturalSizeMethod(Ihandle* ih, int *w, int *h, int *ex { int sb_size = iupdrvGetScrollbarSize(); if (ih->data->canvas.sb & IUP_SB_HORIZ) - natural_w += sb_size; + natural_h += sb_size; /* sb horizontal affects vertical size */ if (ih->data->canvas.sb & IUP_SB_VERT) - natural_h += sb_size; + natural_w += sb_size; /* sb vertical affects horizontal size */ } *w = natural_w + iMatrixGetNaturalWidth(ih); diff --git a/iup/srcgl/config.mak b/iup/srcgl/config.mak deleted file mode 100755 index 49599a5..0000000 --- a/iup/srcgl/config.mak +++ /dev/null @@ -1,20 +0,0 @@ -PROJNAME = iup -LIBNAME = iupgl -OPT = YES - -ifdef DBG - DEFINES += IUP_ASSERT -endif - -INCLUDES = ../include ../src -LDIR = ../lib/$(TEC_UNAME) -LIBS = iup - -USE_OPENGL = Yes - -ifneq ($(findstring Win, $(TEC_SYSNAME)), ) - SRC = iup_glcanvas_win.c -else - SRC = iup_glcanvas_x.c - USE_X11 = Yes -endif diff --git a/iup/srcgl/make_uname b/iup/srcgl/make_uname deleted file mode 100755 index cc4b881..0000000 --- a/iup/srcgl/make_uname +++ /dev/null @@ -1,3 +0,0 @@ -#This builds all the libraries of the folder for 1 uname - -tecmake $1 $2 $3 $4 $5 $6 $7 diff --git a/iup/srcgl/make_uname.bat b/iup/srcgl/make_uname.bat deleted file mode 100755 index f0a0722..0000000 --- a/iup/srcgl/make_uname.bat +++ /dev/null @@ -1,4 +0,0 @@ -@echo off -REM This builds all the libraries of the folder for 1 uname - -call tecmake %1 %2 %3 %4 %5 %6 diff --git a/iup/srcim/config.mak b/iup/srcim/config.mak deleted file mode 100755 index 8feb290..0000000 --- a/iup/srcim/config.mak +++ /dev/null @@ -1,15 +0,0 @@ -PROJNAME = iup -LIBNAME = iupim -OPT = YES - -USE_IM = Yes - -ifdef DBG - DEFINES += IUP_ASSERT -endif - -INCLUDES = ../include ../src -LDIR = ../lib/$(TEC_UNAME) -LIBS = iup - -SRC = iup_im.c diff --git a/iup/srcim/make_uname b/iup/srcim/make_uname deleted file mode 100755 index cc4b881..0000000 --- a/iup/srcim/make_uname +++ /dev/null @@ -1,3 +0,0 @@ -#This builds all the libraries of the folder for 1 uname - -tecmake $1 $2 $3 $4 $5 $6 $7 diff --git a/iup/srcim/make_uname.bat b/iup/srcim/make_uname.bat deleted file mode 100755 index f0a0722..0000000 --- a/iup/srcim/make_uname.bat +++ /dev/null @@ -1,4 +0,0 @@ -@echo off -REM This builds all the libraries of the folder for 1 uname - -call tecmake %1 %2 %3 %4 %5 %6 diff --git a/iup/srcimglib/config.mak b/iup/srcimglib/config.mak deleted file mode 100755 index 01cfefb..0000000 --- a/iup/srcimglib/config.mak +++ /dev/null @@ -1,14 +0,0 @@ -PROJNAME = iup -LIBNAME = iupimglib -#OPT = YES - -INCLUDES = ../include ../src - -SRC = iup_image_library.c - -LIBS = iup -LDIR = ../lib/$(TEC_UNAME) - -ifneq ($(findstring AIX, $(TEC_UNAME)), ) - DEFINES += IUP_IMGLIB_DUMMY -endif diff --git a/iup/srcimglib/make_uname b/iup/srcimglib/make_uname deleted file mode 100755 index cc4b881..0000000 --- a/iup/srcimglib/make_uname +++ /dev/null @@ -1,3 +0,0 @@ -#This builds all the libraries of the folder for 1 uname - -tecmake $1 $2 $3 $4 $5 $6 $7 diff --git a/iup/srcimglib/make_uname.bat b/iup/srcimglib/make_uname.bat deleted file mode 100755 index f0a0722..0000000 --- a/iup/srcimglib/make_uname.bat +++ /dev/null @@ -1,4 +0,0 @@ -@echo off -REM This builds all the libraries of the folder for 1 uname - -call tecmake %1 %2 %3 %4 %5 %6 diff --git a/iup/srcledc/config.mak b/iup/srcledc/config.mak deleted file mode 100755 index 670881e..0000000 --- a/iup/srcledc/config.mak +++ /dev/null @@ -1,22 +0,0 @@ -PROJNAME = iup -APPNAME = ledc -APPTYPE = console -OPT = YES - -#y.tab.c y.tab.h : ledc.y -# yacc -dv ledc.y - -#lex.yy.c : ledc.l -# lex ledc.l - -INCLUDES = . - -SRC = lex.yy.c y.tab.c ledc.c - -ifeq ($(TEC_UNAME), vc8) - ifdef DBG - #debug info not working for vc8 linker - define DBG - endef - endif -endif diff --git a/iup/srcledc/make_uname b/iup/srcledc/make_uname deleted file mode 100755 index ca4b499..0000000 --- a/iup/srcledc/make_uname +++ /dev/null @@ -1,3 +0,0 @@ -# This builds the executable for 1 uname - -tecmake relink $1 $2 $3 $4 $5 $6 $7 $8 diff --git a/iup/srcledc/make_uname.bat b/iup/srcledc/make_uname.bat deleted file mode 100755 index a6645a6..0000000 --- a/iup/srcledc/make_uname.bat +++ /dev/null @@ -1,22 +0,0 @@ -@echo off - -if "%1"=="" goto iupexe32 -if "%1"=="vc8" goto iupexe32 -if "%1"=="vc8_64" goto iupexe64 -if "%1"=="all" goto iupexe -goto end - -:iupexe32 -call tecmake vc8 relink %2 %3 %4 %5 %6 %7 -goto end - -:iupexe64 -call tecmake vc8_64 relink %2 %3 %4 %5 %6 %7 -goto end - -:iupexe -call tecmake vc8 relink %2 %3 %4 %5 %6 %7 -call tecmake vc8_64 relink %2 %3 %4 %5 %6 %7 -goto end - -:end diff --git a/iup/srclua3/config.mak b/iup/srclua3/config.mak deleted file mode 100755 index a3ffb1d..0000000 --- a/iup/srclua3/config.mak +++ /dev/null @@ -1,19 +0,0 @@ -BUILD_IUP3 = Yes - -PROJNAME = iup -LIBNAME = iuplua3 -OPT = YES - -LOHDIR = loh -SRCLUA = iuplua.lua iuplua_widgets.lua constants.lua spin.lua \ - sbox.lua split.lua val.lua tree.lua tabs.lua -SRC = iuplua.c iuplua_api.c iuplua_widgets.c il_scanf.c il_cbox.c \ - il_sbox.c il_split.c il_spin.c il_val.c il_tree.c il_tabs.c il_getcolor.c il_getparam.c - -USE_LUA = Yes - -DEFINES = IUPLUA_USELOH -INCLUDES = ../include ../src -LDIR = ../lib/$(TEC_UNAME) -LIBS = iup - diff --git a/iup/srclua3/iup_pplot.mak b/iup/srclua3/iup_pplot.mak deleted file mode 100755 index 66ee7db..0000000 --- a/iup/srclua3/iup_pplot.mak +++ /dev/null @@ -1,15 +0,0 @@ -PROJNAME = iup -LIBNAME = iuplua_pplot3 -OPT = YES - -USE_LUA = Yes -USE_CDLUA = Yes - -LOHDIR = loh -SRCLUA = pplot.lua -SRC = iuplua_pplot.c - -DEFINES = IUPLUA_USELOH -INCLUDES = ../include -LDIR = ../lib/$(TEC_UNAME) -LIBS = iup iuplua3 iup_pplot iupcd diff --git a/iup/srclua3/iupcd.mak b/iup/srclua3/iupcd.mak deleted file mode 100755 index 36db871..0000000 --- a/iup/srclua3/iupcd.mak +++ /dev/null @@ -1,19 +0,0 @@ -PROJNAME = iup -LIBNAME = iupluacd3 -OPT = YES - -DEF_FILE = iupluacd3.def -SRC = iuplua_cd.c - -# Can not use USE_IUPLUA because Tecmake will include "iupluacd3" in linker - -INCLUDES = ../include -LIBS = iuplua3 -LDIR = ../lib/$(TEC_UNAME) - -IUP := .. - -USE_CD = YES -USE_IUP3 = YES -USE_LUA = YES -USE_CDLUA = YES diff --git a/iup/srclua3/iupcontrols.mak b/iup/srclua3/iupcontrols.mak deleted file mode 100755 index 4498ddf..0000000 --- a/iup/srclua3/iupcontrols.mak +++ /dev/null @@ -1,19 +0,0 @@ -BUILD_IUP3 = Yes - -PROJNAME = iup -LIBNAME = iupluacontrols3 -OPT = YES - -USE_LUA = Yes -USE_CDLUA = Yes - -LOHDIR = loh -SRCLUA = dial.lua gauge.lua colorbar.lua \ - matrix.lua colorbrowser.lua cells.lua -SRC = il_dial.c il_gauge.c il_colorbrowser.c il_colorbar.c il_cells.c \ - il_mask.c il_matrix.c iuplua_controls.c - -DEFINES = IUPLUA_USELOH -INCLUDES = ../include -LDIR = ../lib/$(TEC_UNAME) -LIBS = iup iuplua3 iupcontrols iupcd diff --git a/iup/srclua3/iupgl.mak b/iup/srclua3/iupgl.mak deleted file mode 100755 index 3d65c48..0000000 --- a/iup/srclua3/iupgl.mak +++ /dev/null @@ -1,12 +0,0 @@ -PROJNAME = iup -LIBNAME = iupluagl3 -OPT = YES - -USE_LUA = Yes -USE_OPENGL = Yes - -SRC = iuplua_glcanvas.c - -INCLUDES = ../include -LDIR = ../lib/$(TEC_UNAME) -LIBS = iup iuplua3 iupgl diff --git a/iup/srclua3/iupim.mak b/iup/srclua3/iupim.mak deleted file mode 100755 index e4831ec..0000000 --- a/iup/srclua3/iupim.mak +++ /dev/null @@ -1,12 +0,0 @@ -PROJNAME = iup -LIBNAME = iupluaim3 -OPT = YES - -USE_LUA = Yes -USE_IM = Yes - -SRC = iuplua_im.c - -INCLUDES = ../include ../src -LDIR = ../lib/$(TEC_UNAME) -LIBS = iup iuplua3 iupim diff --git a/iup/srclua3/iuplua.c b/iup/srclua3/iuplua.c index 5563699..b243772 100755 --- a/iup/srclua3/iuplua.c +++ b/iup/srclua3/iuplua.c @@ -13,6 +13,7 @@ #include "iup.h" #include "iupkey.h" +#include "iup_str.h" #include "iuplua.h" #include "il.h" @@ -372,13 +373,10 @@ int iuplua_dofile(char *filename) return 0; else { - int len = strlen(dir); - char *full_name = malloc((len + strlen(filename) + 2) * sizeof(char)); + char* full_name = iupStrFileMakeFileName(dir, filename); if (!full_name) return 0; - strcpy(full_name, dir); - strcat(full_name, "/"); - strcat(full_name, filename); + if (lua_dofile(full_name)) { free(full_name); diff --git a/iup/srclua3/iuplua_widgets.c b/iup/srclua3/iuplua_widgets.c index 7591580..2186dea 100755 --- a/iup/srclua3/iuplua_widgets.c +++ b/iup/srclua3/iuplua_widgets.c @@ -200,6 +200,14 @@ static int dialog_trayclick(Ihandle *handle, int p1, int p2, int p3) lua_pushnumber(p3); return iuplua_call(); } + +static int dialog_copydata(Ihandle *handle, char* p1, int p2) +{ + iuplua_call_start(handle, "copydata"); + lua_pushstring(p1); + lua_pushnumber(p2); + return iuplua_call(); +} static int iupluaCanvasAction(Ihandle* handle, float x, float y) { @@ -619,6 +627,7 @@ int iupluawidgets_open(int tag) { "iup_destroy_cb", (lua_CFunction)iupluaDestroyCb}, { "iup_dropfiles_cb", (lua_CFunction)iupluaDropfilesCb}, { "iup_trayclick_cb", (lua_CFunction)dialog_trayclick}, + { "iup_copydata_cb", (lua_CFunction)dialog_copydata}, { "iup_getfocus_cb", (lua_CFunction)iupluaGetfocusCb}, { "iup_killfocus_cb", (lua_CFunction)iupluaKillfocusCb}, { "iup_k_any", (lua_CFunction)iupluaKanyCb}, diff --git a/iup/srclua3/iuplua_widgets.lua b/iup/srclua3/iuplua_widgets.lua index a59bde6..a2af3ee 100755 --- a/iup/srclua3/iuplua_widgets.lua +++ b/iup/srclua3/iuplua_widgets.lua @@ -871,6 +871,7 @@ iup_callbacks = scroll = {"SCROLL_CB", iup_scroll_cb}, trayclick = {"TRAYCLICK_CB", iup_trayclick_cb}, close = {"CLOSE_CB", iup_close_cb}, + copydata = {"COPYDATA_CB", iup_copydata_cb}, open = {"OPEN_CB", iup_open_cb}, showcb = {"SHOW_CB", iup_show_cb}, mapcb = {"MAP_CB", iup_map_cb}, @@ -918,6 +919,7 @@ iup_callbacks.keypress_cb = iup_callbacks.keypress iup_callbacks.scroll_cb = iup_callbacks.scroll iup_callbacks.trayclick_cb = iup_callbacks.trayclick iup_callbacks.close_cb = iup_callbacks.close +iup_callbacks.copydata_cb = iup_callbacks.copydata iup_callbacks.open_cb = iup_callbacks.open iup_callbacks.show_cb = iup_callbacks.showcb iup_callbacks.map_cb = iup_callbacks.mapcb diff --git a/iup/srclua3/iupole.mak b/iup/srclua3/iupole.mak deleted file mode 100755 index 30ea1f9..0000000 --- a/iup/srclua3/iupole.mak +++ /dev/null @@ -1,13 +0,0 @@ -PROJNAME = iup -LIBNAME = iupluaole3 -OPT = YES - -USE_LUA = Yes -USE_OPENGL = Yes - -SRC = iuplua_olecontrol.c - -INCLUDES = ../include -LDIR = ../lib/$(TEC_UNAME) -LIBS = iup iuplua3 iupole - diff --git a/iup/srclua3/make_uname b/iup/srclua3/make_uname deleted file mode 100755 index f87a836..0000000 --- a/iup/srclua3/make_uname +++ /dev/null @@ -1,8 +0,0 @@ -#This builds all the libraries of the folder for 1 uname - -tecmake $1 $2 $3 $4 $5 $6 $7 $8 -tecmake $1 MF=iupcd $2 $3 $4 $5 $6 $7 $8 -tecmake $1 MF=iupcontrols $2 $3 $4 $5 $6 $7 $8 -tecmake $1 MF=iup_pplot $2 $3 $4 $5 $6 $7 $8 -tecmake $1 MF=iupgl $2 $3 $4 $5 $6 $7 $8 -tecmake $1 MF=iupim $2 $3 $4 $5 $6 $7 $8 diff --git a/iup/srclua3/make_uname.bat b/iup/srclua3/make_uname.bat deleted file mode 100755 index 0cb97de..0000000 --- a/iup/srclua3/make_uname.bat +++ /dev/null @@ -1,10 +0,0 @@ -@echo off -REM This builds all the libraries of the folder for 1 uname - -call tecmake %1 %2 %3 %4 %5 %6 %7 %8 -call tecmake %1 "MF=iupcd" %2 %3 %4 %5 %6 %7 %8 -call tecmake %1 "MF=iupcontrols" %2 %3 %4 %5 %6 %7 %8 -call tecmake %1 "MF=iup_pplot" %2 %3 %4 %5 %6 %7 %8 -call tecmake %1 "MF=iupgl" %2 %3 %4 %5 %6 %7 %8 -call tecmake %1 "MF=iupim" %2 %3 %4 %5 %6 %7 %8 -call tecmake %1 "MF=iupole" %2 %3 %4 %5 %6 %7 %8 diff --git a/iup/srclua5/clua/dialog.clua b/iup/srclua5/clua/dialog.clua index 1af9ef1..9c1c277 100644 --- a/iup/srclua5/clua/dialog.clua +++ b/iup/srclua5/clua/dialog.clua @@ -24,31 +24,33 @@ static const unsigned char B1[] = { 0x20, 0x22, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x73, 0x68, 0x6f, 0x77, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x6e, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6d, 0x6f, 0x76, 0x65, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x6e, 0x6e, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, - 0x74, 0x72, 0x61, 0x79, 0x63, 0x6c, 0x69, 0x63, 0x6b, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, - 0x6e, 0x6e, 0x6e, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x64, 0x72, 0x6f, 0x70, 0x66, 0x69, - 0x6c, 0x65, 0x73, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x73, 0x6e, 0x6e, 0x6e, 0x22, 0x2c, - 0x0a, 0x20, 0x20, 0x7d, 0x0a, 0x7d, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, - 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x45, 0x6c, 0x65, 0x6d, - 0x65, 0x6e, 0x74, 0x28, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x2c, 0x20, 0x70, 0x61, 0x72, 0x61, 0x6d, - 0x29, 0x0a, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x2e, - 0x44, 0x69, 0x61, 0x6c, 0x6f, 0x67, 0x28, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x5b, 0x31, 0x5d, 0x29, - 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, - 0x74, 0x72, 0x6c, 0x2e, 0x70, 0x6f, 0x70, 0x75, 0x70, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, - 0x2c, 0x20, 0x78, 0x2c, 0x20, 0x79, 0x29, 0x0a, 0x20, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x50, 0x6f, - 0x70, 0x75, 0x70, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x78, 0x2c, 0x79, 0x29, 0x0a, - 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, 0x74, - 0x72, 0x6c, 0x2e, 0x73, 0x68, 0x6f, 0x77, 0x78, 0x79, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, - 0x2c, 0x20, 0x78, 0x2c, 0x20, 0x79, 0x29, 0x0a, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, - 0x20, 0x69, 0x75, 0x70, 0x2e, 0x53, 0x68, 0x6f, 0x77, 0x58, 0x59, 0x28, 0x68, 0x61, 0x6e, 0x64, - 0x6c, 0x65, 0x2c, 0x20, 0x78, 0x2c, 0x20, 0x79, 0x29, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x66, - 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x64, 0x65, 0x73, - 0x74, 0x72, 0x6f, 0x79, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x29, 0x0a, 0x20, 0x20, 0x72, - 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x44, 0x65, 0x73, 0x74, 0x72, 0x6f, - 0x79, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x29, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x69, - 0x75, 0x70, 0x2e, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x57, 0x69, 0x64, 0x67, 0x65, - 0x74, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x29, 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x53, 0x65, 0x74, 0x43, - 0x6c, 0x61, 0x73, 0x73, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x2c, 0x20, 0x22, 0x69, 0x75, 0x70, 0x20, - 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x29, 0x0a, + 0x63, 0x6f, 0x70, 0x79, 0x64, 0x61, 0x74, 0x61, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x73, + 0x6e, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x74, 0x72, 0x61, 0x79, 0x63, 0x6c, 0x69, 0x63, + 0x6b, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x6e, 0x6e, 0x6e, 0x22, 0x2c, 0x0a, 0x20, 0x20, + 0x20, 0x20, 0x64, 0x72, 0x6f, 0x70, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x5f, 0x63, 0x62, 0x20, 0x3d, + 0x20, 0x22, 0x73, 0x6e, 0x6e, 0x6e, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x7d, 0x0a, 0x7d, 0x0a, 0x0a, + 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x63, 0x72, + 0x65, 0x61, 0x74, 0x65, 0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x28, 0x63, 0x6c, 0x61, 0x73, + 0x73, 0x2c, 0x20, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, + 0x75, 0x72, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x44, 0x69, 0x61, 0x6c, 0x6f, 0x67, 0x28, 0x70, + 0x61, 0x72, 0x61, 0x6d, 0x5b, 0x31, 0x5d, 0x29, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x66, 0x75, + 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x70, 0x6f, 0x70, 0x75, + 0x70, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x78, 0x2c, 0x20, 0x79, 0x29, 0x0a, + 0x20, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x50, 0x6f, 0x70, 0x75, 0x70, 0x28, 0x68, 0x61, 0x6e, 0x64, + 0x6c, 0x65, 0x2c, 0x78, 0x2c, 0x79, 0x29, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x66, 0x75, 0x6e, + 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x73, 0x68, 0x6f, 0x77, 0x78, + 0x79, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x78, 0x2c, 0x20, 0x79, 0x29, 0x0a, + 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x53, 0x68, 0x6f, + 0x77, 0x58, 0x59, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x78, 0x2c, 0x20, 0x79, + 0x29, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, + 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x64, 0x65, 0x73, 0x74, 0x72, 0x6f, 0x79, 0x28, 0x68, 0x61, 0x6e, + 0x64, 0x6c, 0x65, 0x29, 0x0a, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x69, 0x75, + 0x70, 0x2e, 0x44, 0x65, 0x73, 0x74, 0x72, 0x6f, 0x79, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, + 0x29, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x52, 0x65, 0x67, 0x69, 0x73, + 0x74, 0x65, 0x72, 0x57, 0x69, 0x64, 0x67, 0x65, 0x74, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x29, 0x0a, + 0x69, 0x75, 0x70, 0x2e, 0x53, 0x65, 0x74, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x28, 0x63, 0x74, 0x72, + 0x6c, 0x2c, 0x20, 0x22, 0x69, 0x75, 0x70, 0x20, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x29, + 0x0a, }; if (luaL_loadbuffer(L, (const char *)B1, sizeof(B1), "dialog.lua") == 0) lua_call(L, 0, 0); diff --git a/iup/srclua5/clua/glcanvas.clua b/iup/srclua5/clua/glcanvas.clua index cb86316..e8f08ea 100644 --- a/iup/srclua5/clua/glcanvas.clua +++ b/iup/srclua5/clua/glcanvas.clua @@ -40,22 +40,15 @@ static const unsigned char B1[] = { 0x61, 0x67, 0x6c, 0x28, 0x6c, 0x75, 0x61, 0x5f, 0x53, 0x74, 0x61, 0x74, 0x65, 0x2a, 0x20, 0x4c, 0x29, 0x0a, 0x7b, 0x0a, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x67, 0x6c, 0x6c, 0x75, 0x61, 0x5f, 0x6f, 0x70, 0x65, 0x6e, 0x28, 0x4c, 0x29, 0x3b, 0x0a, 0x7d, - 0x0a, 0x0a, 0x2f, 0x2a, 0x20, 0x6f, 0x62, 0x6c, 0x69, 0x67, 0x61, 0x74, 0x6f, 0x72, 0x79, 0x20, - 0x74, 0x6f, 0x20, 0x75, 0x73, 0x65, 0x20, 0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x22, 0x69, - 0x75, 0x70, 0x6c, 0x75, 0x61, 0x67, 0x6c, 0x35, 0x31, 0x22, 0x20, 0x2a, 0x2f, 0x0a, 0x69, 0x6e, - 0x74, 0x20, 0x6c, 0x75, 0x61, 0x6f, 0x70, 0x65, 0x6e, 0x5f, 0x69, 0x75, 0x70, 0x6c, 0x75, 0x61, - 0x67, 0x6c, 0x35, 0x31, 0x28, 0x6c, 0x75, 0x61, 0x5f, 0x53, 0x74, 0x61, 0x74, 0x65, 0x2a, 0x20, - 0x4c, 0x29, 0x0a, 0x7b, 0x0a, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x69, 0x75, - 0x70, 0x67, 0x6c, 0x6c, 0x75, 0x61, 0x5f, 0x6f, 0x70, 0x65, 0x6e, 0x28, 0x4c, 0x29, 0x3b, 0x0a, - 0x7d, 0x0a, 0x0a, 0x5d, 0x5d, 0x0a, 0x7d, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, - 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x45, 0x6c, 0x65, - 0x6d, 0x65, 0x6e, 0x74, 0x28, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x2c, 0x20, 0x70, 0x61, 0x72, 0x61, - 0x6d, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x69, 0x75, 0x70, - 0x2e, 0x47, 0x4c, 0x43, 0x61, 0x6e, 0x76, 0x61, 0x73, 0x28, 0x29, 0x0a, 0x65, 0x6e, 0x64, 0x0a, - 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x57, 0x69, 0x64, - 0x67, 0x65, 0x74, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x29, 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x53, 0x65, - 0x74, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x2c, 0x20, 0x22, 0x69, 0x75, - 0x70, 0x20, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x29, 0x0a, + 0x0a, 0x0a, 0x5d, 0x5d, 0x0a, 0x7d, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, + 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x45, 0x6c, 0x65, 0x6d, + 0x65, 0x6e, 0x74, 0x28, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x2c, 0x20, 0x70, 0x61, 0x72, 0x61, 0x6d, + 0x29, 0x0a, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x2e, + 0x47, 0x4c, 0x43, 0x61, 0x6e, 0x76, 0x61, 0x73, 0x28, 0x29, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, + 0x69, 0x75, 0x70, 0x2e, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x57, 0x69, 0x64, 0x67, + 0x65, 0x74, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x29, 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x53, 0x65, 0x74, + 0x43, 0x6c, 0x61, 0x73, 0x73, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x2c, 0x20, 0x22, 0x69, 0x75, 0x70, + 0x20, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x29, 0x0a, }; if (luaL_loadbuffer(L, (const char *)B1, sizeof(B1), "glcanvas.lua") == 0) lua_call(L, 0, 0); diff --git a/iup/srclua5/clua/image.clua b/iup/srclua5/clua/image.clua index c22bdb9..16add8e 100644 --- a/iup/srclua5/clua/image.clua +++ b/iup/srclua5/clua/image.clua @@ -31,113 +31,114 @@ static const unsigned char B1[] = { 0x0a, 0x20, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x6e, 0x74, 0x20, 0x69, 0x2c, 0x20, 0x6a, 0x3b, 0x0a, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x2f, 0x2a, 0x20, 0x67, 0x65, 0x74, 0x20, 0x74, 0x68, 0x65, 0x20, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x20, 0x6f, 0x66, 0x20, 0x6c, 0x69, 0x6e, - 0x65, 0x73, 0x20, 0x2a, 0x2f, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x68, 0x20, 0x3d, 0x20, 0x6c, 0x75, - 0x61, 0x4c, 0x5f, 0x67, 0x65, 0x74, 0x6e, 0x28, 0x4c, 0x2c, 0x20, 0x31, 0x29, 0x3b, 0x20, 0x20, - 0x0a, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x2f, 0x2a, 0x20, 0x67, 0x65, 0x74, 0x20, 0x74, 0x68, 0x65, - 0x20, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x20, 0x6f, 0x66, 0x20, 0x63, 0x6f, 0x6c, 0x75, 0x6d, - 0x6e, 0x73, 0x20, 0x6f, 0x66, 0x20, 0x74, 0x68, 0x65, 0x20, 0x66, 0x69, 0x72, 0x73, 0x74, 0x20, - 0x6c, 0x69, 0x6e, 0x65, 0x20, 0x2a, 0x2f, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6c, 0x75, 0x61, 0x5f, - 0x70, 0x75, 0x73, 0x68, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x28, 0x4c, 0x2c, 0x20, 0x31, 0x29, - 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6c, 0x75, 0x61, 0x5f, 0x67, 0x65, 0x74, 0x74, 0x61, 0x62, - 0x6c, 0x65, 0x28, 0x4c, 0x2c, 0x20, 0x31, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x77, 0x20, - 0x3d, 0x20, 0x6c, 0x75, 0x61, 0x4c, 0x5f, 0x67, 0x65, 0x74, 0x6e, 0x28, 0x4c, 0x2c, 0x20, 0x2d, - 0x31, 0x29, 0x3b, 0x20, 0x20, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6c, 0x75, 0x61, 0x5f, 0x70, 0x6f, - 0x70, 0x28, 0x4c, 0x2c, 0x20, 0x31, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x0a, 0x20, 0x20, - 0x20, 0x20, 0x70, 0x69, 0x78, 0x65, 0x6c, 0x73, 0x20, 0x3d, 0x20, 0x28, 0x75, 0x6e, 0x73, 0x69, - 0x67, 0x6e, 0x65, 0x64, 0x20, 0x63, 0x68, 0x61, 0x72, 0x20, 0x2a, 0x29, 0x20, 0x6d, 0x61, 0x6c, - 0x6c, 0x6f, 0x63, 0x20, 0x28, 0x68, 0x2a, 0x77, 0x29, 0x3b, 0x0a, 0x0a, 0x20, 0x20, 0x20, 0x20, - 0x66, 0x6f, 0x72, 0x20, 0x28, 0x69, 0x3d, 0x31, 0x3b, 0x20, 0x69, 0x3c, 0x3d, 0x68, 0x3b, 0x20, - 0x69, 0x2b, 0x2b, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x6c, 0x75, 0x61, 0x5f, 0x70, 0x75, 0x73, 0x68, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x28, - 0x4c, 0x2c, 0x20, 0x69, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x6c, 0x75, 0x61, - 0x5f, 0x67, 0x65, 0x74, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x28, 0x4c, 0x2c, 0x20, 0x31, 0x29, 0x3b, - 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x28, 0x6a, 0x3d, 0x31, 0x3b, - 0x20, 0x6a, 0x3c, 0x3d, 0x77, 0x3b, 0x20, 0x6a, 0x2b, 0x2b, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x6e, 0x74, 0x20, - 0x69, 0x64, 0x78, 0x20, 0x3d, 0x20, 0x28, 0x69, 0x2d, 0x31, 0x29, 0x2a, 0x77, 0x2b, 0x28, 0x6a, - 0x2d, 0x31, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x6c, 0x75, 0x61, - 0x5f, 0x70, 0x75, 0x73, 0x68, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x28, 0x4c, 0x2c, 0x20, 0x6a, - 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x6c, 0x75, 0x61, 0x5f, 0x67, - 0x65, 0x74, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x28, 0x4c, 0x2c, 0x20, 0x2d, 0x32, 0x29, 0x3b, 0x0a, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x70, 0x69, 0x78, 0x65, 0x6c, 0x73, 0x5b, 0x69, - 0x64, 0x78, 0x5d, 0x20, 0x3d, 0x20, 0x28, 0x75, 0x6e, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x64, 0x20, - 0x63, 0x68, 0x61, 0x72, 0x29, 0x6c, 0x75, 0x61, 0x5f, 0x74, 0x6f, 0x6e, 0x75, 0x6d, 0x62, 0x65, - 0x72, 0x28, 0x4c, 0x2c, 0x20, 0x2d, 0x31, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x6c, 0x75, 0x61, 0x5f, 0x70, 0x6f, 0x70, 0x28, 0x4c, 0x2c, 0x20, 0x31, 0x29, 0x3b, - 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x7d, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x6c, + 0x65, 0x73, 0x20, 0x2a, 0x2f, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x68, 0x20, 0x3d, 0x20, 0x69, 0x75, + 0x70, 0x6c, 0x75, 0x61, 0x5f, 0x67, 0x65, 0x74, 0x6e, 0x28, 0x4c, 0x2c, 0x20, 0x31, 0x29, 0x3b, + 0x20, 0x20, 0x0a, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x2f, 0x2a, 0x20, 0x67, 0x65, 0x74, 0x20, 0x74, + 0x68, 0x65, 0x20, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x20, 0x6f, 0x66, 0x20, 0x63, 0x6f, 0x6c, + 0x75, 0x6d, 0x6e, 0x73, 0x20, 0x6f, 0x66, 0x20, 0x74, 0x68, 0x65, 0x20, 0x66, 0x69, 0x72, 0x73, + 0x74, 0x20, 0x6c, 0x69, 0x6e, 0x65, 0x20, 0x2a, 0x2f, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6c, 0x75, + 0x61, 0x5f, 0x70, 0x75, 0x73, 0x68, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x65, 0x72, 0x28, 0x4c, 0x2c, + 0x20, 0x31, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6c, 0x75, 0x61, 0x5f, 0x67, 0x65, 0x74, + 0x74, 0x61, 0x62, 0x6c, 0x65, 0x28, 0x4c, 0x2c, 0x20, 0x31, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, + 0x20, 0x77, 0x20, 0x3d, 0x20, 0x69, 0x75, 0x70, 0x6c, 0x75, 0x61, 0x5f, 0x67, 0x65, 0x74, 0x6e, + 0x28, 0x4c, 0x2c, 0x20, 0x2d, 0x31, 0x29, 0x3b, 0x20, 0x20, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6c, 0x75, 0x61, 0x5f, 0x70, 0x6f, 0x70, 0x28, 0x4c, 0x2c, 0x20, 0x31, 0x29, 0x3b, 0x0a, 0x20, 0x20, - 0x20, 0x20, 0x7d, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x68, 0x20, - 0x3d, 0x20, 0x49, 0x75, 0x70, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x28, 0x77, 0x2c, 0x68, 0x2c, 0x70, - 0x69, 0x78, 0x65, 0x6c, 0x73, 0x29, 0x3b, 0x20, 0x20, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x66, 0x72, - 0x65, 0x65, 0x28, 0x70, 0x69, 0x78, 0x65, 0x6c, 0x73, 0x29, 0x3b, 0x0a, 0x0a, 0x20, 0x20, 0x20, - 0x20, 0x6e, 0x75, 0x6d, 0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x73, 0x20, 0x3d, 0x20, 0x6c, 0x75, - 0x61, 0x4c, 0x5f, 0x67, 0x65, 0x74, 0x6e, 0x28, 0x4c, 0x2c, 0x20, 0x32, 0x29, 0x3b, 0x0a, 0x20, - 0x20, 0x20, 0x20, 0x6e, 0x75, 0x6d, 0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x73, 0x20, 0x3d, 0x20, - 0x6e, 0x75, 0x6d, 0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x73, 0x3e, 0x32, 0x35, 0x35, 0x3f, 0x20, - 0x32, 0x35, 0x35, 0x3a, 0x20, 0x6e, 0x75, 0x6d, 0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x73, 0x3b, - 0x0a, 0x20, 0x20, 0x20, 0x20, 0x66, 0x6f, 0x72, 0x28, 0x63, 0x3d, 0x31, 0x3b, 0x20, 0x63, 0x3c, - 0x3d, 0x6e, 0x75, 0x6d, 0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x73, 0x3b, 0x20, 0x63, 0x2b, 0x2b, - 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x6c, 0x75, - 0x61, 0x5f, 0x72, 0x61, 0x77, 0x67, 0x65, 0x74, 0x69, 0x28, 0x4c, 0x2c, 0x20, 0x32, 0x2c, 0x20, - 0x63, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x73, 0x70, 0x72, 0x69, 0x6e, 0x74, - 0x66, 0x28, 0x73, 0x74, 0x72, 0x2c, 0x20, 0x22, 0x25, 0x64, 0x22, 0x2c, 0x20, 0x63, 0x29, 0x3b, - 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x49, 0x75, 0x70, 0x53, 0x74, 0x6f, 0x72, 0x65, 0x41, - 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x28, 0x69, 0x68, 0x2c, 0x20, 0x73, 0x74, 0x72, - 0x2c, 0x20, 0x6c, 0x75, 0x61, 0x5f, 0x74, 0x6f, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x28, 0x4c, - 0x2c, 0x2d, 0x31, 0x29, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x6c, 0x75, 0x61, - 0x5f, 0x70, 0x6f, 0x70, 0x28, 0x4c, 0x2c, 0x20, 0x31, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, - 0x7d, 0x0a, 0x20, 0x20, 0x7d, 0x0a, 0x20, 0x20, 0x65, 0x6c, 0x73, 0x65, 0x0a, 0x20, 0x20, 0x7b, - 0x0a, 0x20, 0x20, 0x20, 0x20, 0x77, 0x20, 0x3d, 0x20, 0x6c, 0x75, 0x61, 0x4c, 0x5f, 0x63, 0x68, - 0x65, 0x63, 0x6b, 0x69, 0x6e, 0x74, 0x28, 0x4c, 0x2c, 0x20, 0x31, 0x29, 0x3b, 0x0a, 0x20, 0x20, - 0x20, 0x20, 0x68, 0x20, 0x3d, 0x20, 0x6c, 0x75, 0x61, 0x4c, 0x5f, 0x63, 0x68, 0x65, 0x63, 0x6b, - 0x69, 0x6e, 0x74, 0x28, 0x4c, 0x2c, 0x20, 0x32, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x70, - 0x69, 0x78, 0x65, 0x6c, 0x73, 0x20, 0x3d, 0x20, 0x69, 0x75, 0x70, 0x6c, 0x75, 0x61, 0x5f, 0x63, - 0x68, 0x65, 0x63, 0x6b, 0x75, 0x63, 0x68, 0x61, 0x72, 0x5f, 0x61, 0x72, 0x72, 0x61, 0x79, 0x28, - 0x4c, 0x2c, 0x20, 0x33, 0x2c, 0x20, 0x77, 0x2a, 0x68, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, - 0x69, 0x68, 0x20, 0x3d, 0x20, 0x49, 0x75, 0x70, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x28, 0x77, 0x2c, - 0x20, 0x68, 0x2c, 0x20, 0x70, 0x69, 0x78, 0x65, 0x6c, 0x73, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, - 0x20, 0x66, 0x72, 0x65, 0x65, 0x28, 0x70, 0x69, 0x78, 0x65, 0x6c, 0x73, 0x29, 0x3b, 0x0a, 0x0a, - 0x20, 0x20, 0x20, 0x20, 0x6e, 0x75, 0x6d, 0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x73, 0x20, 0x3d, - 0x20, 0x6c, 0x75, 0x61, 0x4c, 0x5f, 0x67, 0x65, 0x74, 0x6e, 0x28, 0x4c, 0x2c, 0x20, 0x34, 0x29, - 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6e, 0x75, 0x6d, 0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x73, - 0x20, 0x3d, 0x20, 0x6e, 0x75, 0x6d, 0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x73, 0x3e, 0x32, 0x35, - 0x36, 0x3f, 0x20, 0x32, 0x35, 0x36, 0x3a, 0x20, 0x6e, 0x75, 0x6d, 0x5f, 0x63, 0x6f, 0x6c, 0x6f, - 0x72, 0x73, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x66, 0x6f, 0x72, 0x28, 0x63, 0x3d, 0x31, 0x3b, - 0x20, 0x63, 0x3c, 0x3d, 0x6e, 0x75, 0x6d, 0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x73, 0x3b, 0x20, - 0x63, 0x2b, 0x2b, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x6c, 0x75, 0x61, 0x5f, 0x72, 0x61, 0x77, 0x67, 0x65, 0x74, 0x69, 0x28, 0x4c, 0x2c, 0x20, - 0x34, 0x2c, 0x20, 0x63, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x73, 0x70, 0x72, - 0x69, 0x6e, 0x74, 0x66, 0x28, 0x73, 0x74, 0x72, 0x2c, 0x20, 0x22, 0x25, 0x64, 0x22, 0x2c, 0x20, - 0x63, 0x2d, 0x31, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x49, 0x75, 0x70, 0x53, - 0x74, 0x6f, 0x72, 0x65, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x28, 0x69, 0x68, - 0x2c, 0x20, 0x73, 0x74, 0x72, 0x2c, 0x20, 0x6c, 0x75, 0x61, 0x5f, 0x74, 0x6f, 0x73, 0x74, 0x72, - 0x69, 0x6e, 0x67, 0x28, 0x4c, 0x2c, 0x2d, 0x31, 0x29, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x6c, 0x75, 0x61, 0x5f, 0x70, 0x6f, 0x70, 0x28, 0x4c, 0x2c, 0x20, 0x31, 0x29, 0x3b, - 0x0a, 0x20, 0x20, 0x20, 0x20, 0x7d, 0x0a, 0x20, 0x20, 0x7d, 0x0a, 0x0a, 0x20, 0x20, 0x69, 0x75, - 0x70, 0x6c, 0x75, 0x61, 0x5f, 0x70, 0x6c, 0x75, 0x67, 0x73, 0x74, 0x61, 0x74, 0x65, 0x28, 0x4c, - 0x2c, 0x20, 0x69, 0x68, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x69, 0x75, 0x70, 0x6c, 0x75, 0x61, 0x5f, - 0x70, 0x75, 0x73, 0x68, 0x69, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x5f, 0x72, 0x61, 0x77, 0x28, - 0x4c, 0x2c, 0x20, 0x69, 0x68, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, - 0x20, 0x31, 0x3b, 0x0a, 0x7d, 0x20, 0x0a, 0x20, 0x0a, 0x5d, 0x5d, 0x0a, 0x7d, 0x0a, 0x0a, 0x66, - 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x63, 0x72, 0x65, - 0x61, 0x74, 0x65, 0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x28, 0x63, 0x6c, 0x61, 0x73, 0x73, - 0x2c, 0x20, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x28, - 0x70, 0x61, 0x72, 0x61, 0x6d, 0x2e, 0x77, 0x69, 0x64, 0x74, 0x68, 0x20, 0x61, 0x6e, 0x64, 0x20, - 0x70, 0x61, 0x72, 0x61, 0x6d, 0x2e, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x20, 0x61, 0x6e, 0x64, - 0x20, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x2e, 0x70, 0x69, 0x78, 0x65, 0x6c, 0x73, 0x29, 0x20, 0x74, - 0x68, 0x65, 0x6e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, - 0x69, 0x75, 0x70, 0x2e, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x28, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x2e, - 0x77, 0x69, 0x64, 0x74, 0x68, 0x2c, 0x20, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x2e, 0x68, 0x65, 0x69, - 0x67, 0x68, 0x74, 0x2c, 0x20, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x2e, 0x70, 0x69, 0x78, 0x65, 0x6c, - 0x73, 0x2c, 0x20, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x2e, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x73, 0x29, - 0x0a, 0x20, 0x20, 0x20, 0x65, 0x6c, 0x73, 0x65, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, - 0x74, 0x75, 0x72, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x28, 0x70, - 0x61, 0x72, 0x61, 0x6d, 0x2c, 0x20, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x2e, 0x63, 0x6f, 0x6c, 0x6f, - 0x72, 0x73, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, - 0x69, 0x75, 0x70, 0x2e, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x57, 0x69, 0x64, 0x67, - 0x65, 0x74, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x29, 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x53, 0x65, 0x74, - 0x43, 0x6c, 0x61, 0x73, 0x73, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x2c, 0x20, 0x22, 0x69, 0x75, 0x70, - 0x20, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x29, 0x0a, + 0x20, 0x20, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x70, 0x69, 0x78, 0x65, 0x6c, 0x73, 0x20, 0x3d, 0x20, + 0x28, 0x75, 0x6e, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x64, 0x20, 0x63, 0x68, 0x61, 0x72, 0x20, 0x2a, + 0x29, 0x20, 0x6d, 0x61, 0x6c, 0x6c, 0x6f, 0x63, 0x20, 0x28, 0x68, 0x2a, 0x77, 0x29, 0x3b, 0x0a, + 0x0a, 0x20, 0x20, 0x20, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x28, 0x69, 0x3d, 0x31, 0x3b, 0x20, 0x69, + 0x3c, 0x3d, 0x68, 0x3b, 0x20, 0x69, 0x2b, 0x2b, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x7b, 0x0a, + 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x6c, 0x75, 0x61, 0x5f, 0x70, 0x75, 0x73, 0x68, 0x69, 0x6e, + 0x74, 0x65, 0x67, 0x65, 0x72, 0x28, 0x4c, 0x2c, 0x20, 0x69, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, + 0x20, 0x20, 0x20, 0x6c, 0x75, 0x61, 0x5f, 0x67, 0x65, 0x74, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x28, + 0x4c, 0x2c, 0x20, 0x31, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x66, 0x6f, 0x72, + 0x20, 0x28, 0x6a, 0x3d, 0x31, 0x3b, 0x20, 0x6a, 0x3c, 0x3d, 0x77, 0x3b, 0x20, 0x6a, 0x2b, 0x2b, + 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, + 0x20, 0x20, 0x69, 0x6e, 0x74, 0x20, 0x69, 0x64, 0x78, 0x20, 0x3d, 0x20, 0x28, 0x69, 0x2d, 0x31, + 0x29, 0x2a, 0x77, 0x2b, 0x28, 0x6a, 0x2d, 0x31, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, + 0x20, 0x20, 0x20, 0x6c, 0x75, 0x61, 0x5f, 0x70, 0x75, 0x73, 0x68, 0x69, 0x6e, 0x74, 0x65, 0x67, + 0x65, 0x72, 0x28, 0x4c, 0x2c, 0x20, 0x6a, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, + 0x20, 0x20, 0x6c, 0x75, 0x61, 0x5f, 0x67, 0x65, 0x74, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x28, 0x4c, + 0x2c, 0x20, 0x2d, 0x32, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x70, + 0x69, 0x78, 0x65, 0x6c, 0x73, 0x5b, 0x69, 0x64, 0x78, 0x5d, 0x20, 0x3d, 0x20, 0x28, 0x75, 0x6e, + 0x73, 0x69, 0x67, 0x6e, 0x65, 0x64, 0x20, 0x63, 0x68, 0x61, 0x72, 0x29, 0x6c, 0x75, 0x61, 0x5f, + 0x74, 0x6f, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x65, 0x72, 0x28, 0x4c, 0x2c, 0x20, 0x2d, 0x31, 0x29, + 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x6c, 0x75, 0x61, 0x5f, 0x70, 0x6f, + 0x70, 0x28, 0x4c, 0x2c, 0x20, 0x31, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x7d, + 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x6c, 0x75, 0x61, 0x5f, 0x70, 0x6f, 0x70, 0x28, 0x4c, + 0x2c, 0x20, 0x31, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x7d, 0x0a, 0x20, 0x20, 0x20, 0x20, + 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x68, 0x20, 0x3d, 0x20, 0x49, 0x75, 0x70, 0x49, 0x6d, 0x61, + 0x67, 0x65, 0x28, 0x77, 0x2c, 0x68, 0x2c, 0x70, 0x69, 0x78, 0x65, 0x6c, 0x73, 0x29, 0x3b, 0x20, + 0x20, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x66, 0x72, 0x65, 0x65, 0x28, 0x70, 0x69, 0x78, 0x65, 0x6c, + 0x73, 0x29, 0x3b, 0x0a, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6e, 0x75, 0x6d, 0x5f, 0x63, 0x6f, 0x6c, + 0x6f, 0x72, 0x73, 0x20, 0x3d, 0x20, 0x69, 0x75, 0x70, 0x6c, 0x75, 0x61, 0x5f, 0x67, 0x65, 0x74, + 0x6e, 0x28, 0x4c, 0x2c, 0x20, 0x32, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6e, 0x75, 0x6d, + 0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x73, 0x20, 0x3d, 0x20, 0x6e, 0x75, 0x6d, 0x5f, 0x63, 0x6f, + 0x6c, 0x6f, 0x72, 0x73, 0x3e, 0x32, 0x35, 0x35, 0x3f, 0x20, 0x32, 0x35, 0x35, 0x3a, 0x20, 0x6e, + 0x75, 0x6d, 0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x73, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x66, + 0x6f, 0x72, 0x28, 0x63, 0x3d, 0x31, 0x3b, 0x20, 0x63, 0x3c, 0x3d, 0x6e, 0x75, 0x6d, 0x5f, 0x63, + 0x6f, 0x6c, 0x6f, 0x72, 0x73, 0x3b, 0x20, 0x63, 0x2b, 0x2b, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, + 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x6c, 0x75, 0x61, 0x5f, 0x72, 0x61, 0x77, 0x67, + 0x65, 0x74, 0x69, 0x28, 0x4c, 0x2c, 0x20, 0x32, 0x2c, 0x20, 0x63, 0x29, 0x3b, 0x0a, 0x20, 0x20, + 0x20, 0x20, 0x20, 0x20, 0x73, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x66, 0x28, 0x73, 0x74, 0x72, 0x2c, + 0x20, 0x22, 0x25, 0x64, 0x22, 0x2c, 0x20, 0x63, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, + 0x20, 0x49, 0x75, 0x70, 0x53, 0x74, 0x6f, 0x72, 0x65, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, + 0x74, 0x65, 0x28, 0x69, 0x68, 0x2c, 0x20, 0x73, 0x74, 0x72, 0x2c, 0x20, 0x6c, 0x75, 0x61, 0x5f, + 0x74, 0x6f, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x28, 0x4c, 0x2c, 0x2d, 0x31, 0x29, 0x29, 0x3b, + 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x6c, 0x75, 0x61, 0x5f, 0x70, 0x6f, 0x70, 0x28, 0x4c, + 0x2c, 0x20, 0x31, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x7d, 0x0a, 0x20, 0x20, 0x7d, 0x0a, + 0x20, 0x20, 0x65, 0x6c, 0x73, 0x65, 0x0a, 0x20, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x77, + 0x20, 0x3d, 0x20, 0x6c, 0x75, 0x61, 0x4c, 0x5f, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x69, 0x6e, 0x74, + 0x28, 0x4c, 0x2c, 0x20, 0x31, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x68, 0x20, 0x3d, 0x20, + 0x6c, 0x75, 0x61, 0x4c, 0x5f, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x69, 0x6e, 0x74, 0x28, 0x4c, 0x2c, + 0x20, 0x32, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x70, 0x69, 0x78, 0x65, 0x6c, 0x73, 0x20, + 0x3d, 0x20, 0x69, 0x75, 0x70, 0x6c, 0x75, 0x61, 0x5f, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x75, 0x63, + 0x68, 0x61, 0x72, 0x5f, 0x61, 0x72, 0x72, 0x61, 0x79, 0x28, 0x4c, 0x2c, 0x20, 0x33, 0x2c, 0x20, + 0x77, 0x2a, 0x68, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x68, 0x20, 0x3d, 0x20, 0x49, + 0x75, 0x70, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x28, 0x77, 0x2c, 0x20, 0x68, 0x2c, 0x20, 0x70, 0x69, + 0x78, 0x65, 0x6c, 0x73, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x66, 0x72, 0x65, 0x65, 0x28, + 0x70, 0x69, 0x78, 0x65, 0x6c, 0x73, 0x29, 0x3b, 0x0a, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6e, 0x75, + 0x6d, 0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x73, 0x20, 0x3d, 0x20, 0x69, 0x75, 0x70, 0x6c, 0x75, + 0x61, 0x5f, 0x67, 0x65, 0x74, 0x6e, 0x28, 0x4c, 0x2c, 0x20, 0x34, 0x29, 0x3b, 0x0a, 0x20, 0x20, + 0x20, 0x20, 0x6e, 0x75, 0x6d, 0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x73, 0x20, 0x3d, 0x20, 0x6e, + 0x75, 0x6d, 0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x73, 0x3e, 0x32, 0x35, 0x36, 0x3f, 0x20, 0x32, + 0x35, 0x36, 0x3a, 0x20, 0x6e, 0x75, 0x6d, 0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x73, 0x3b, 0x0a, + 0x20, 0x20, 0x20, 0x20, 0x66, 0x6f, 0x72, 0x28, 0x63, 0x3d, 0x31, 0x3b, 0x20, 0x63, 0x3c, 0x3d, + 0x6e, 0x75, 0x6d, 0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x73, 0x3b, 0x20, 0x63, 0x2b, 0x2b, 0x29, + 0x0a, 0x20, 0x20, 0x20, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x6c, 0x75, 0x61, + 0x5f, 0x72, 0x61, 0x77, 0x67, 0x65, 0x74, 0x69, 0x28, 0x4c, 0x2c, 0x20, 0x34, 0x2c, 0x20, 0x63, + 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x73, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x66, + 0x28, 0x73, 0x74, 0x72, 0x2c, 0x20, 0x22, 0x25, 0x64, 0x22, 0x2c, 0x20, 0x63, 0x2d, 0x31, 0x29, + 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x49, 0x75, 0x70, 0x53, 0x74, 0x6f, 0x72, 0x65, + 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x28, 0x69, 0x68, 0x2c, 0x20, 0x73, 0x74, + 0x72, 0x2c, 0x20, 0x6c, 0x75, 0x61, 0x5f, 0x74, 0x6f, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x28, + 0x4c, 0x2c, 0x2d, 0x31, 0x29, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x6c, 0x75, + 0x61, 0x5f, 0x70, 0x6f, 0x70, 0x28, 0x4c, 0x2c, 0x20, 0x31, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, + 0x20, 0x7d, 0x0a, 0x20, 0x20, 0x7d, 0x0a, 0x0a, 0x20, 0x20, 0x69, 0x75, 0x70, 0x6c, 0x75, 0x61, + 0x5f, 0x70, 0x6c, 0x75, 0x67, 0x73, 0x74, 0x61, 0x74, 0x65, 0x28, 0x4c, 0x2c, 0x20, 0x69, 0x68, + 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x69, 0x75, 0x70, 0x6c, 0x75, 0x61, 0x5f, 0x70, 0x75, 0x73, 0x68, + 0x69, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x5f, 0x72, 0x61, 0x77, 0x28, 0x4c, 0x2c, 0x20, 0x69, + 0x68, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x31, 0x3b, 0x0a, + 0x7d, 0x20, 0x0a, 0x20, 0x0a, 0x5d, 0x5d, 0x0a, 0x7d, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, + 0x69, 0x6f, 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x45, + 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x28, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x2c, 0x20, 0x70, 0x61, + 0x72, 0x61, 0x6d, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x28, 0x70, 0x61, 0x72, 0x61, + 0x6d, 0x2e, 0x77, 0x69, 0x64, 0x74, 0x68, 0x20, 0x61, 0x6e, 0x64, 0x20, 0x70, 0x61, 0x72, 0x61, + 0x6d, 0x2e, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x20, 0x61, 0x6e, 0x64, 0x20, 0x70, 0x61, 0x72, + 0x61, 0x6d, 0x2e, 0x70, 0x69, 0x78, 0x65, 0x6c, 0x73, 0x29, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a, + 0x20, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x2e, + 0x49, 0x6d, 0x61, 0x67, 0x65, 0x28, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x2e, 0x77, 0x69, 0x64, 0x74, + 0x68, 0x2c, 0x20, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x2e, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x2c, + 0x20, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x2e, 0x70, 0x69, 0x78, 0x65, 0x6c, 0x73, 0x2c, 0x20, 0x70, + 0x61, 0x72, 0x61, 0x6d, 0x2e, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x73, 0x29, 0x0a, 0x20, 0x20, 0x20, + 0x65, 0x6c, 0x73, 0x65, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, + 0x20, 0x69, 0x75, 0x70, 0x2e, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x28, 0x70, 0x61, 0x72, 0x61, 0x6d, + 0x2c, 0x20, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x2e, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x73, 0x29, 0x0a, + 0x20, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x69, 0x75, 0x70, 0x2e, + 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x57, 0x69, 0x64, 0x67, 0x65, 0x74, 0x28, 0x63, + 0x74, 0x72, 0x6c, 0x29, 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x53, 0x65, 0x74, 0x43, 0x6c, 0x61, 0x73, + 0x73, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x2c, 0x20, 0x22, 0x69, 0x75, 0x70, 0x20, 0x77, 0x69, 0x64, + 0x67, 0x65, 0x74, 0x22, 0x29, 0x0a, }; if (luaL_loadbuffer(L, (const char *)B1, sizeof(B1), "image.lua") == 0) lua_call(L, 0, 0); diff --git a/iup/srclua5/clua/iuplua.clua b/iup/srclua5/clua/iuplua.clua index 08a0333..3400402 100644 --- a/iup/srclua5/clua/iuplua.clua +++ b/iup/srclua5/clua/iuplua.clua @@ -418,14 +418,14 @@ static const unsigned char B1[] = { 0x72, 0x6f, 0x72, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x5f, 0x70, 0x6f, 0x70, 0x75, 0x70, 0x20, 0x3d, 0x20, 0x6e, 0x69, 0x6c, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x5f, 0x45, 0x52, 0x52, 0x4f, 0x52, 0x4d, 0x45, 0x53, 0x53, - 0x41, 0x47, 0x45, 0x28, 0x65, 0x72, 0x72, 0x2c, 0x74, 0x72, 0x61, 0x63, 0x65, 0x62, 0x61, 0x63, - 0x6b, 0x29, 0x0a, 0x20, 0x20, 0x65, 0x72, 0x72, 0x20, 0x3d, 0x20, 0x65, 0x72, 0x72, 0x2e, 0x2e, + 0x41, 0x47, 0x45, 0x28, 0x6d, 0x73, 0x67, 0x2c, 0x74, 0x72, 0x61, 0x63, 0x65, 0x62, 0x61, 0x63, + 0x6b, 0x29, 0x0a, 0x20, 0x20, 0x6d, 0x73, 0x67, 0x20, 0x3d, 0x20, 0x6d, 0x73, 0x67, 0x2e, 0x2e, 0x28, 0x74, 0x72, 0x61, 0x63, 0x65, 0x62, 0x61, 0x63, 0x6b, 0x20, 0x6f, 0x72, 0x20, 0x22, 0x22, 0x29, 0x0a, 0x20, 0x20, 0x69, 0x66, 0x20, 0x28, 0x69, 0x75, 0x70, 0x2e, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x5f, 0x70, 0x6f, 0x70, 0x75, 0x70, 0x29, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x5f, 0x70, 0x6f, 0x70, 0x75, - 0x70, 0x2e, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x20, 0x3d, 0x20, 0x65, 0x72, 0x72, 0x0a, 0x20, 0x20, + 0x70, 0x2e, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x20, 0x3d, 0x20, 0x6d, 0x73, 0x67, 0x0a, 0x20, 0x20, 0x65, 0x6c, 0x73, 0x65, 0x20, 0x20, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x62, 0x74, 0x20, 0x3d, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x7b, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x3d, 0x22, 0x4f, 0x6b, 0x22, 0x2c, 0x20, 0x73, 0x69, 0x7a, @@ -437,7 +437,7 @@ static const unsigned char B1[] = { 0x20, 0x69, 0x75, 0x70, 0x2e, 0x6d, 0x75, 0x6c, 0x74, 0x69, 0x6c, 0x69, 0x6e, 0x65, 0x7b, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x3d, 0x22, 0x59, 0x45, 0x53, 0x22, 0x2c, 0x20, 0x72, 0x65, 0x61, 0x64, 0x6f, 0x6e, 0x6c, 0x79, 0x3d, 0x22, 0x59, 0x45, 0x53, 0x22, 0x2c, 0x20, 0x76, 0x61, 0x6c, - 0x75, 0x65, 0x3d, 0x65, 0x72, 0x72, 0x2c, 0x20, 0x73, 0x69, 0x7a, 0x65, 0x3d, 0x22, 0x33, 0x30, + 0x75, 0x65, 0x3d, 0x6d, 0x73, 0x67, 0x2c, 0x20, 0x73, 0x69, 0x7a, 0x65, 0x3d, 0x22, 0x33, 0x30, 0x30, 0x78, 0x31, 0x35, 0x30, 0x22, 0x7d, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x76, 0x62, 0x20, 0x3d, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x76, 0x62, 0x6f, 0x78, 0x7b, 0x6d, 0x6c, 0x2c, 0x20, 0x62, 0x74, 0x3b, 0x20, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x6d, 0x65, 0x6e, @@ -461,52 +461,56 @@ static const unsigned char B1[] = { 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x28, 0x2e, 0x2e, 0x2e, 0x29, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x7b, 0x2e, 0x2e, 0x2e, 0x7d, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x70, 0x72, 0x6f, - 0x74, 0x65, 0x63, 0x74, 0x65, 0x64, 0x63, 0x61, 0x6c, 0x6c, 0x5f, 0x28, 0x66, 0x2c, 0x20, 0x65, - 0x72, 0x72, 0x29, 0x0a, 0x20, 0x20, 0x69, 0x66, 0x20, 0x6e, 0x6f, 0x74, 0x20, 0x66, 0x20, 0x74, - 0x68, 0x65, 0x6e, 0x20, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x5f, 0x45, 0x52, - 0x52, 0x4f, 0x52, 0x4d, 0x45, 0x53, 0x53, 0x41, 0x47, 0x45, 0x28, 0x65, 0x72, 0x72, 0x29, 0x0a, - 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x0a, 0x20, 0x20, 0x65, 0x6e, - 0x64, 0x0a, 0x20, 0x20, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x72, 0x65, 0x74, 0x20, 0x3d, 0x20, - 0x69, 0x75, 0x70, 0x2e, 0x70, 0x61, 0x63, 0x6b, 0x28, 0x70, 0x63, 0x61, 0x6c, 0x6c, 0x28, 0x66, - 0x29, 0x29, 0x0a, 0x20, 0x20, 0x69, 0x66, 0x20, 0x6e, 0x6f, 0x74, 0x20, 0x72, 0x65, 0x74, 0x5b, - 0x31, 0x5d, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x20, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x75, 0x70, - 0x2e, 0x5f, 0x45, 0x52, 0x52, 0x4f, 0x52, 0x4d, 0x45, 0x53, 0x53, 0x41, 0x47, 0x45, 0x28, 0x72, - 0x65, 0x74, 0x5b, 0x32, 0x5d, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, - 0x6e, 0x0a, 0x20, 0x20, 0x65, 0x6c, 0x73, 0x65, 0x20, 0x20, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x74, - 0x61, 0x62, 0x6c, 0x65, 0x2e, 0x72, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x28, 0x72, 0x65, 0x74, 0x2c, - 0x20, 0x31, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x75, - 0x6e, 0x70, 0x61, 0x63, 0x6b, 0x28, 0x72, 0x65, 0x74, 0x29, 0x0a, 0x20, 0x20, 0x65, 0x6e, 0x64, - 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x69, - 0x75, 0x70, 0x2e, 0x64, 0x6f, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x28, 0x73, 0x29, 0x20, 0x72, - 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x65, 0x63, - 0x74, 0x65, 0x64, 0x63, 0x61, 0x6c, 0x6c, 0x5f, 0x28, 0x6c, 0x6f, 0x61, 0x64, 0x73, 0x74, 0x72, - 0x69, 0x6e, 0x67, 0x28, 0x73, 0x29, 0x29, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x66, 0x75, 0x6e, 0x63, - 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x64, 0x6f, 0x66, 0x69, 0x6c, 0x65, 0x28, - 0x66, 0x29, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x70, 0x72, - 0x6f, 0x74, 0x65, 0x63, 0x74, 0x65, 0x64, 0x63, 0x61, 0x6c, 0x6c, 0x5f, 0x28, 0x6c, 0x6f, 0x61, - 0x64, 0x66, 0x69, 0x6c, 0x65, 0x28, 0x66, 0x29, 0x29, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x66, - 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x52, 0x47, 0x42, 0x28, - 0x72, 0x2c, 0x20, 0x67, 0x2c, 0x20, 0x62, 0x29, 0x0a, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, - 0x6e, 0x20, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x2e, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x28, - 0x22, 0x25, 0x64, 0x20, 0x25, 0x64, 0x20, 0x25, 0x64, 0x22, 0x2c, 0x20, 0x32, 0x35, 0x35, 0x2a, - 0x72, 0x2c, 0x20, 0x32, 0x35, 0x35, 0x2a, 0x67, 0x2c, 0x20, 0x32, 0x35, 0x35, 0x2a, 0x62, 0x29, - 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x2d, 0x2d, 0x20, 0x54, 0x68, 0x69, 0x73, 0x20, 0x77, 0x69, - 0x6c, 0x6c, 0x20, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x20, 0x62, 0x6f, 0x74, 0x68, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x73, 0x20, 0x74, 0x6f, 0x20, 0x62, 0x65, 0x20, 0x75, 0x73, 0x65, 0x64, 0x20, 0x69, - 0x6e, 0x20, 0x74, 0x68, 0x65, 0x20, 0x73, 0x61, 0x6d, 0x65, 0x20, 0x61, 0x70, 0x70, 0x6c, 0x69, - 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x0a, 0x2d, 0x2d, 0x20, 0x61, 0x6c, 0x73, 0x6f, 0x20, 0x77, - 0x69, 0x6c, 0x6c, 0x20, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x20, 0x73, 0x74, 0x61, 0x74, 0x69, 0x63, - 0x20, 0x6c, 0x69, 0x6e, 0x6b, 0x69, 0x6e, 0x67, 0x20, 0x74, 0x6f, 0x20, 0x77, 0x6f, 0x72, 0x6b, - 0x20, 0x77, 0x69, 0x74, 0x68, 0x20, 0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x0a, 0x69, 0x66, - 0x20, 0x5f, 0x47, 0x2e, 0x70, 0x61, 0x63, 0x6b, 0x61, 0x67, 0x65, 0x20, 0x74, 0x68, 0x65, 0x6e, - 0x0a, 0x20, 0x20, 0x20, 0x5f, 0x47, 0x2e, 0x70, 0x61, 0x63, 0x6b, 0x61, 0x67, 0x65, 0x2e, 0x6c, - 0x6f, 0x61, 0x64, 0x65, 0x64, 0x5b, 0x22, 0x69, 0x75, 0x70, 0x6c, 0x75, 0x61, 0x22, 0x5d, 0x20, - 0x3d, 0x20, 0x69, 0x75, 0x70, 0x0a, 0x20, 0x20, 0x20, 0x5f, 0x47, 0x2e, 0x70, 0x61, 0x63, 0x6b, - 0x61, 0x67, 0x65, 0x2e, 0x6c, 0x6f, 0x61, 0x64, 0x65, 0x64, 0x5b, 0x22, 0x69, 0x75, 0x70, 0x6c, - 0x75, 0x61, 0x35, 0x31, 0x22, 0x5d, 0x20, 0x3d, 0x20, 0x69, 0x75, 0x70, 0x0a, 0x20, 0x20, 0x20, - 0x69, 0x75, 0x70, 0x2e, 0x5f, 0x4d, 0x20, 0x3d, 0x20, 0x69, 0x75, 0x70, 0x0a, 0x20, 0x20, 0x20, - 0x69, 0x75, 0x70, 0x2e, 0x5f, 0x50, 0x41, 0x43, 0x4b, 0x41, 0x47, 0x45, 0x20, 0x3d, 0x20, 0x22, - 0x69, 0x75, 0x70, 0x6c, 0x75, 0x61, 0x22, 0x0a, 0x65, 0x6e, 0x64, 0x0a, + 0x74, 0x65, 0x63, 0x74, 0x65, 0x64, 0x63, 0x61, 0x6c, 0x6c, 0x28, 0x66, 0x2c, 0x20, 0x6d, 0x73, + 0x67, 0x29, 0x0a, 0x20, 0x20, 0x69, 0x66, 0x20, 0x6e, 0x6f, 0x74, 0x20, 0x66, 0x20, 0x74, 0x68, + 0x65, 0x6e, 0x20, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x5f, 0x45, 0x52, 0x52, + 0x4f, 0x52, 0x4d, 0x45, 0x53, 0x53, 0x41, 0x47, 0x45, 0x28, 0x6d, 0x73, 0x67, 0x29, 0x0a, 0x20, + 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x0a, 0x20, 0x20, 0x65, 0x6e, 0x64, + 0x0a, 0x20, 0x20, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x72, 0x65, 0x74, 0x20, 0x3d, 0x20, 0x69, + 0x75, 0x70, 0x2e, 0x70, 0x61, 0x63, 0x6b, 0x28, 0x70, 0x63, 0x61, 0x6c, 0x6c, 0x28, 0x66, 0x29, + 0x29, 0x0a, 0x20, 0x20, 0x69, 0x66, 0x20, 0x6e, 0x6f, 0x74, 0x20, 0x72, 0x65, 0x74, 0x5b, 0x31, + 0x5d, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x20, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x75, 0x70, 0x2e, + 0x5f, 0x45, 0x52, 0x52, 0x4f, 0x52, 0x4d, 0x45, 0x53, 0x53, 0x41, 0x47, 0x45, 0x28, 0x72, 0x65, + 0x74, 0x5b, 0x32, 0x5d, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, + 0x0a, 0x20, 0x20, 0x65, 0x6c, 0x73, 0x65, 0x20, 0x20, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x74, 0x61, + 0x62, 0x6c, 0x65, 0x2e, 0x72, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x28, 0x72, 0x65, 0x74, 0x2c, 0x20, + 0x31, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x75, 0x6e, + 0x70, 0x61, 0x63, 0x6b, 0x28, 0x72, 0x65, 0x74, 0x29, 0x20, 0x20, 0x20, 0x2d, 0x2d, 0x6d, 0x75, + 0x73, 0x74, 0x20, 0x72, 0x65, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x20, 0x74, 0x68, 0x69, 0x73, 0x20, + 0x62, 0x79, 0x20, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x2e, 0x75, 0x6e, 0x70, 0x61, 0x63, 0x6b, 0x20, + 0x77, 0x68, 0x65, 0x6e, 0x20, 0x35, 0x2e, 0x31, 0x20, 0x69, 0x73, 0x20, 0x6e, 0x6f, 0x74, 0x20, + 0x73, 0x75, 0x70, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x0a, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, + 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x69, 0x75, + 0x70, 0x2e, 0x64, 0x6f, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x28, 0x73, 0x29, 0x20, 0x72, 0x65, + 0x74, 0x75, 0x72, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x65, 0x63, 0x74, + 0x65, 0x64, 0x63, 0x61, 0x6c, 0x6c, 0x28, 0x6c, 0x6f, 0x61, 0x64, 0x73, 0x74, 0x72, 0x69, 0x6e, + 0x67, 0x28, 0x73, 0x29, 0x29, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, + 0x6f, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x64, 0x6f, 0x66, 0x69, 0x6c, 0x65, 0x28, 0x66, 0x29, + 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74, + 0x65, 0x63, 0x74, 0x65, 0x64, 0x63, 0x61, 0x6c, 0x6c, 0x28, 0x6c, 0x6f, 0x61, 0x64, 0x66, 0x69, + 0x6c, 0x65, 0x28, 0x66, 0x29, 0x29, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, + 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x52, 0x47, 0x42, 0x28, 0x72, 0x2c, 0x20, + 0x67, 0x2c, 0x20, 0x62, 0x29, 0x0a, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x73, + 0x74, 0x72, 0x69, 0x6e, 0x67, 0x2e, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x28, 0x22, 0x25, 0x64, + 0x20, 0x25, 0x64, 0x20, 0x25, 0x64, 0x22, 0x2c, 0x20, 0x32, 0x35, 0x35, 0x2a, 0x72, 0x2c, 0x20, + 0x32, 0x35, 0x35, 0x2a, 0x67, 0x2c, 0x20, 0x32, 0x35, 0x35, 0x2a, 0x62, 0x29, 0x0a, 0x65, 0x6e, + 0x64, 0x0a, 0x0a, 0x2d, 0x2d, 0x20, 0x54, 0x68, 0x69, 0x73, 0x20, 0x77, 0x69, 0x6c, 0x6c, 0x20, + 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x20, 0x62, 0x6f, 0x74, 0x68, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x73, + 0x20, 0x74, 0x6f, 0x20, 0x62, 0x65, 0x20, 0x75, 0x73, 0x65, 0x64, 0x20, 0x69, 0x6e, 0x20, 0x74, + 0x68, 0x65, 0x20, 0x73, 0x61, 0x6d, 0x65, 0x20, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, + 0x69, 0x6f, 0x6e, 0x0a, 0x2d, 0x2d, 0x20, 0x61, 0x6c, 0x73, 0x6f, 0x20, 0x77, 0x69, 0x6c, 0x6c, + 0x20, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x20, 0x73, 0x74, 0x61, 0x74, 0x69, 0x63, 0x20, 0x6c, 0x69, + 0x6e, 0x6b, 0x69, 0x6e, 0x67, 0x20, 0x74, 0x6f, 0x20, 0x77, 0x6f, 0x72, 0x6b, 0x20, 0x77, 0x69, + 0x74, 0x68, 0x20, 0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x0a, 0x69, 0x66, 0x20, 0x5f, 0x47, + 0x2e, 0x70, 0x61, 0x63, 0x6b, 0x61, 0x67, 0x65, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a, 0x20, 0x20, + 0x20, 0x5f, 0x47, 0x2e, 0x70, 0x61, 0x63, 0x6b, 0x61, 0x67, 0x65, 0x2e, 0x6c, 0x6f, 0x61, 0x64, + 0x65, 0x64, 0x5b, 0x22, 0x69, 0x75, 0x70, 0x6c, 0x75, 0x61, 0x22, 0x5d, 0x20, 0x3d, 0x20, 0x69, + 0x75, 0x70, 0x0a, 0x20, 0x20, 0x20, 0x5f, 0x47, 0x2e, 0x70, 0x61, 0x63, 0x6b, 0x61, 0x67, 0x65, + 0x2e, 0x6c, 0x6f, 0x61, 0x64, 0x65, 0x64, 0x5b, 0x22, 0x69, 0x75, 0x70, 0x6c, 0x75, 0x61, 0x35, + 0x31, 0x22, 0x5d, 0x20, 0x3d, 0x20, 0x69, 0x75, 0x70, 0x0a, 0x20, 0x20, 0x20, 0x69, 0x75, 0x70, + 0x2e, 0x5f, 0x4d, 0x20, 0x3d, 0x20, 0x69, 0x75, 0x70, 0x0a, 0x20, 0x20, 0x20, 0x69, 0x75, 0x70, + 0x2e, 0x5f, 0x50, 0x41, 0x43, 0x4b, 0x41, 0x47, 0x45, 0x20, 0x3d, 0x20, 0x22, 0x69, 0x75, 0x70, + 0x6c, 0x75, 0x61, 0x22, 0x0a, 0x65, 0x6e, 0x64, 0x0a, }; if (luaL_loadbuffer(L, (const char *)B1, sizeof(B1), "iuplua.lua") == 0) lua_call(L, 0, 0); diff --git a/iup/srclua5/clua/menu.clua b/iup/srclua5/clua/menu.clua index 6d579a8..6d4a56d 100644 --- a/iup/srclua5/clua/menu.clua +++ b/iup/srclua5/clua/menu.clua @@ -14,6 +14,10 @@ static const unsigned char B1[] = { 0x61, 0x6c, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x20, 0x3d, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x6e, 0x69, 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x22, 0x6d, 0x65, 0x6e, 0x75, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x20, 0x3d, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x42, 0x4f, 0x58, 0x2c, + 0x20, 0x20, 0x2d, 0x2d, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x41, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x20, + 0x77, 0x69, 0x6c, 0x6c, 0x20, 0x62, 0x65, 0x20, 0x61, 0x75, 0x74, 0x6f, 0x6d, 0x61, 0x74, 0x69, + 0x63, 0x61, 0x6c, 0x6c, 0x79, 0x20, 0x63, 0x61, 0x6c, 0x6c, 0x65, 0x64, 0x20, 0x61, 0x66, 0x74, + 0x65, 0x72, 0x20, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x0a, 0x20, 0x20, 0x63, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x3d, 0x20, 0x22, 0x2d, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6f, 0x70, 0x65, 0x6e, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, @@ -28,63 +32,84 @@ static const unsigned char B1[] = { 0x65, 0x6c, 0x65, 0x6d, 0x29, 0x0a, 0x20, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x41, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x65, 0x6c, 0x65, 0x6d, 0x29, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, - 0x74, 0x72, 0x6c, 0x2e, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, - 0x74, 0x28, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x2c, 0x20, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x29, 0x0a, - 0x20, 0x20, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x6e, 0x20, 0x3d, 0x20, 0x23, 0x70, 0x61, 0x72, - 0x61, 0x6d, 0x0a, 0x20, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x69, 0x3d, 0x31, 0x2c, 0x6e, 0x20, 0x64, - 0x6f, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x74, 0x79, 0x70, 0x65, 0x28, 0x70, 0x61, - 0x72, 0x61, 0x6d, 0x5b, 0x69, 0x5d, 0x29, 0x20, 0x3d, 0x3d, 0x20, 0x22, 0x74, 0x61, 0x62, 0x6c, - 0x65, 0x22, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x20, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x6c, - 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x69, 0x74, 0x65, 0x6d, 0x61, 0x72, 0x67, 0x20, 0x3d, 0x20, 0x7b, - 0x7d, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x75, 0x2c, 0x76, 0x20, - 0x69, 0x6e, 0x20, 0x70, 0x61, 0x69, 0x72, 0x73, 0x28, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x5b, 0x69, - 0x5d, 0x29, 0x20, 0x64, 0x6f, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, - 0x20, 0x74, 0x79, 0x70, 0x65, 0x28, 0x75, 0x29, 0x20, 0x7e, 0x3d, 0x20, 0x22, 0x6e, 0x75, 0x6d, - 0x62, 0x65, 0x72, 0x22, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x69, 0x74, 0x65, 0x6d, 0x61, 0x72, 0x67, 0x5b, 0x75, 0x5d, 0x20, 0x3d, - 0x20, 0x76, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, - 0x66, 0x20, 0x74, 0x79, 0x70, 0x65, 0x28, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x5b, 0x69, 0x5d, 0x5b, - 0x31, 0x5d, 0x29, 0x20, 0x3d, 0x3d, 0x20, 0x22, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x22, 0x20, - 0x61, 0x6e, 0x64, 0x20, 0x28, 0x74, 0x79, 0x70, 0x65, 0x28, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x5b, - 0x69, 0x5d, 0x5b, 0x32, 0x5d, 0x29, 0x20, 0x3d, 0x3d, 0x20, 0x22, 0x66, 0x75, 0x6e, 0x63, 0x74, - 0x69, 0x6f, 0x6e, 0x22, 0x20, 0x6f, 0x72, 0x20, 0x74, 0x79, 0x70, 0x65, 0x28, 0x70, 0x61, 0x72, - 0x61, 0x6d, 0x5b, 0x69, 0x5d, 0x5b, 0x32, 0x5d, 0x29, 0x20, 0x3d, 0x3d, 0x20, 0x22, 0x73, 0x74, - 0x72, 0x69, 0x6e, 0x67, 0x22, 0x29, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x69, 0x74, 0x65, 0x6d, 0x61, 0x72, 0x67, 0x2e, 0x74, 0x69, 0x74, 0x6c, - 0x65, 0x20, 0x3d, 0x20, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x5b, 0x69, 0x5d, 0x5b, 0x31, 0x5d, 0x0a, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x74, 0x65, 0x6d, 0x61, 0x72, 0x67, 0x2e, - 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x3d, 0x20, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x5b, 0x69, - 0x5d, 0x5b, 0x32, 0x5d, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x70, 0x61, 0x72, - 0x61, 0x6d, 0x5b, 0x69, 0x5d, 0x20, 0x3d, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x69, 0x74, 0x65, 0x6d, - 0x28, 0x69, 0x74, 0x65, 0x6d, 0x61, 0x72, 0x67, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x65, 0x6c, 0x73, 0x65, 0x69, 0x66, 0x20, 0x74, 0x79, 0x70, 0x65, 0x28, 0x70, 0x61, 0x72, 0x61, - 0x6d, 0x5b, 0x69, 0x5d, 0x5b, 0x31, 0x5d, 0x29, 0x20, 0x3d, 0x3d, 0x20, 0x22, 0x73, 0x74, 0x72, - 0x69, 0x6e, 0x67, 0x22, 0x20, 0x61, 0x6e, 0x64, 0x20, 0x74, 0x79, 0x70, 0x65, 0x28, 0x70, 0x61, - 0x72, 0x61, 0x6d, 0x5b, 0x69, 0x5d, 0x5b, 0x32, 0x5d, 0x29, 0x20, 0x3d, 0x3d, 0x20, 0x22, 0x75, - 0x73, 0x65, 0x72, 0x64, 0x61, 0x74, 0x61, 0x22, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x74, 0x65, 0x6d, 0x61, 0x72, 0x67, 0x5b, 0x31, 0x5d, - 0x20, 0x3d, 0x20, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x5b, 0x69, 0x5d, 0x5b, 0x32, 0x5d, 0x0a, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x74, 0x65, 0x6d, 0x61, 0x72, 0x67, 0x2e, 0x74, - 0x69, 0x74, 0x6c, 0x65, 0x20, 0x3d, 0x20, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x5b, 0x69, 0x5d, 0x5b, - 0x31, 0x5d, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x70, 0x61, 0x72, 0x61, 0x6d, - 0x5b, 0x69, 0x5d, 0x20, 0x3d, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x73, 0x75, 0x62, 0x6d, 0x65, 0x6e, - 0x75, 0x28, 0x69, 0x74, 0x65, 0x6d, 0x61, 0x72, 0x67, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x65, - 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x2e, - 0x4d, 0x65, 0x6e, 0x75, 0x28, 0x29, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, - 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x73, 0x68, 0x6f, 0x77, 0x78, 0x79, - 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x78, 0x2c, 0x20, 0x79, 0x29, 0x0a, 0x20, - 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x53, 0x68, 0x6f, 0x77, - 0x58, 0x59, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x78, 0x2c, 0x20, 0x79, 0x29, - 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, - 0x74, 0x72, 0x6c, 0x2e, 0x64, 0x65, 0x73, 0x74, 0x72, 0x6f, 0x79, 0x28, 0x68, 0x61, 0x6e, 0x64, - 0x6c, 0x65, 0x29, 0x0a, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x69, 0x75, 0x70, - 0x2e, 0x44, 0x65, 0x73, 0x74, 0x72, 0x6f, 0x79, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x29, - 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, - 0x65, 0x72, 0x57, 0x69, 0x64, 0x67, 0x65, 0x74, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x29, 0x0a, 0x69, - 0x75, 0x70, 0x2e, 0x53, 0x65, 0x74, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x28, 0x63, 0x74, 0x72, 0x6c, - 0x2c, 0x20, 0x22, 0x69, 0x75, 0x70, 0x20, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x29, 0x0a, + 0x74, 0x72, 0x6c, 0x2e, 0x67, 0x65, 0x74, 0x61, 0x72, 0x67, 0x73, 0x28, 0x6d, 0x65, 0x6e, 0x75, + 0x5f, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x29, 0x0a, 0x20, 0x20, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, + 0x69, 0x74, 0x65, 0x6d, 0x61, 0x72, 0x67, 0x20, 0x3d, 0x20, 0x7b, 0x7d, 0x0a, 0x20, 0x20, 0x2d, + 0x2d, 0x20, 0x63, 0x6f, 0x70, 0x79, 0x20, 0x74, 0x68, 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x64, + 0x20, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x20, 0x74, 0x6f, 0x20, 0x74, + 0x68, 0x65, 0x20, 0x65, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x20, 0x70, 0x61, 0x72, 0x61, 0x6d, + 0x65, 0x74, 0x65, 0x72, 0x73, 0x0a, 0x20, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x75, 0x2c, 0x76, 0x20, + 0x69, 0x6e, 0x20, 0x70, 0x61, 0x69, 0x72, 0x73, 0x28, 0x6d, 0x65, 0x6e, 0x75, 0x5f, 0x70, 0x61, + 0x72, 0x61, 0x6d, 0x29, 0x20, 0x64, 0x6f, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x74, + 0x79, 0x70, 0x65, 0x28, 0x75, 0x29, 0x20, 0x7e, 0x3d, 0x20, 0x22, 0x6e, 0x75, 0x6d, 0x62, 0x65, + 0x72, 0x22, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x74, + 0x65, 0x6d, 0x61, 0x72, 0x67, 0x5b, 0x75, 0x5d, 0x20, 0x3d, 0x20, 0x76, 0x0a, 0x20, 0x20, 0x20, + 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x72, 0x65, 0x74, + 0x75, 0x72, 0x6e, 0x20, 0x69, 0x74, 0x65, 0x6d, 0x61, 0x72, 0x67, 0x0a, 0x65, 0x6e, 0x64, 0x0a, + 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x63, + 0x72, 0x65, 0x61, 0x74, 0x65, 0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x28, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x2c, 0x20, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x29, 0x0a, 0x20, 0x20, 0x6c, 0x6f, 0x63, + 0x61, 0x6c, 0x20, 0x6e, 0x20, 0x3d, 0x20, 0x23, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x0a, 0x20, 0x20, + 0x66, 0x6f, 0x72, 0x20, 0x69, 0x3d, 0x31, 0x2c, 0x6e, 0x20, 0x64, 0x6f, 0x0a, 0x20, 0x20, 0x20, + 0x20, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x6d, 0x65, 0x6e, 0x75, 0x5f, 0x70, 0x61, 0x72, 0x61, + 0x6d, 0x20, 0x3d, 0x20, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x5b, 0x69, 0x5d, 0x0a, 0x20, 0x20, 0x20, + 0x20, 0x69, 0x66, 0x20, 0x74, 0x79, 0x70, 0x65, 0x28, 0x6d, 0x65, 0x6e, 0x75, 0x5f, 0x70, 0x61, + 0x72, 0x61, 0x6d, 0x29, 0x20, 0x3d, 0x3d, 0x20, 0x22, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x22, 0x20, + 0x74, 0x68, 0x65, 0x6e, 0x20, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x2d, 0x2d, 0x20, 0x72, + 0x65, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x20, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x5b, 0x69, 0x5d, 0x2c, + 0x20, 0x73, 0x6f, 0x20, 0x69, 0x74, 0x20, 0x77, 0x69, 0x6c, 0x6c, 0x20, 0x62, 0x65, 0x20, 0x75, + 0x73, 0x65, 0x64, 0x20, 0x62, 0x79, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x41, 0x70, 0x70, 0x65, 0x6e, + 0x64, 0x20, 0x61, 0x66, 0x74, 0x65, 0x72, 0x20, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x45, 0x6c, + 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x2d, 0x2d, 0x20, 0x6f, + 0x74, 0x68, 0x65, 0x72, 0x20, 0x65, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x20, 0x61, 0x6c, + 0x72, 0x65, 0x61, 0x64, 0x79, 0x20, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x20, 0x63, 0x61, + 0x6e, 0x20, 0x61, 0x6c, 0x73, 0x6f, 0x20, 0x62, 0x65, 0x20, 0x75, 0x73, 0x65, 0x64, 0x0a, 0x20, + 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x74, 0x79, 0x70, 0x65, 0x28, 0x6d, 0x65, 0x6e, + 0x75, 0x5f, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x5b, 0x31, 0x5d, 0x29, 0x20, 0x3d, 0x3d, 0x20, 0x6e, + 0x69, 0x6c, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, + 0x70, 0x61, 0x72, 0x61, 0x6d, 0x5b, 0x69, 0x5d, 0x20, 0x3d, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x73, + 0x65, 0x70, 0x61, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x28, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, + 0x20, 0x65, 0x6c, 0x73, 0x65, 0x69, 0x66, 0x20, 0x74, 0x79, 0x70, 0x65, 0x28, 0x6d, 0x65, 0x6e, + 0x75, 0x5f, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x5b, 0x31, 0x5d, 0x29, 0x20, 0x3d, 0x3d, 0x20, 0x22, + 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x22, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a, 0x20, 0x20, 0x20, + 0x20, 0x20, 0x20, 0x20, 0x20, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x69, 0x74, 0x65, 0x6d, 0x61, + 0x72, 0x67, 0x20, 0x3d, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x67, 0x65, 0x74, 0x61, 0x72, 0x67, + 0x73, 0x28, 0x6d, 0x65, 0x6e, 0x75, 0x5f, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x29, 0x0a, 0x20, 0x20, + 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x74, 0x79, 0x70, 0x65, 0x28, 0x6d, 0x65, + 0x6e, 0x75, 0x5f, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x5b, 0x32, 0x5d, 0x29, 0x20, 0x3d, 0x3d, 0x20, + 0x22, 0x75, 0x73, 0x65, 0x72, 0x64, 0x61, 0x74, 0x61, 0x22, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a, + 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x74, 0x65, 0x6d, 0x61, 0x72, + 0x67, 0x5b, 0x31, 0x5d, 0x20, 0x3d, 0x20, 0x6d, 0x65, 0x6e, 0x75, 0x5f, 0x70, 0x61, 0x72, 0x61, + 0x6d, 0x5b, 0x32, 0x5d, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, + 0x74, 0x65, 0x6d, 0x61, 0x72, 0x67, 0x2e, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x20, 0x3d, 0x20, 0x6d, + 0x65, 0x6e, 0x75, 0x5f, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x5b, 0x31, 0x5d, 0x0a, 0x20, 0x20, 0x20, + 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x5b, 0x69, 0x5d, 0x20, + 0x3d, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x73, 0x75, 0x62, 0x6d, 0x65, 0x6e, 0x75, 0x28, 0x69, 0x74, + 0x65, 0x6d, 0x61, 0x72, 0x67, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x65, + 0x6c, 0x73, 0x65, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x74, + 0x65, 0x6d, 0x61, 0x72, 0x67, 0x2e, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x20, 0x3d, 0x20, 0x6d, 0x65, + 0x6e, 0x75, 0x5f, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x5b, 0x31, 0x5d, 0x0a, 0x20, 0x20, 0x20, 0x20, + 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x74, 0x65, 0x6d, 0x61, 0x72, 0x67, 0x2e, 0x61, 0x63, + 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x3d, 0x20, 0x6d, 0x65, 0x6e, 0x75, 0x5f, 0x70, 0x61, 0x72, 0x61, + 0x6d, 0x5b, 0x32, 0x5d, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x70, + 0x61, 0x72, 0x61, 0x6d, 0x5b, 0x69, 0x5d, 0x20, 0x3d, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x69, 0x74, + 0x65, 0x6d, 0x28, 0x69, 0x74, 0x65, 0x6d, 0x61, 0x72, 0x67, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, + 0x20, 0x20, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6e, + 0x64, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, + 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x4d, 0x65, 0x6e, + 0x75, 0x28, 0x29, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, + 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x73, 0x68, 0x6f, 0x77, 0x78, 0x79, 0x28, 0x68, 0x61, + 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x78, 0x2c, 0x20, 0x79, 0x29, 0x0a, 0x20, 0x20, 0x72, 0x65, + 0x74, 0x75, 0x72, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x53, 0x68, 0x6f, 0x77, 0x58, 0x59, 0x28, + 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x78, 0x2c, 0x20, 0x79, 0x29, 0x0a, 0x65, 0x6e, + 0x64, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, + 0x2e, 0x64, 0x65, 0x73, 0x74, 0x72, 0x6f, 0x79, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x29, + 0x0a, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x44, 0x65, + 0x73, 0x74, 0x72, 0x6f, 0x79, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x29, 0x0a, 0x65, 0x6e, + 0x64, 0x0a, 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x57, + 0x69, 0x64, 0x67, 0x65, 0x74, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x29, 0x0a, 0x69, 0x75, 0x70, 0x2e, + 0x53, 0x65, 0x74, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x2c, 0x20, 0x22, + 0x69, 0x75, 0x70, 0x20, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x29, 0x0a, }; if (luaL_loadbuffer(L, (const char *)B1, sizeof(B1), "menu.lua") == 0) lua_call(L, 0, 0); diff --git a/iup/srclua5/clua/olecontrol.clua b/iup/srclua5/clua/olecontrol.clua index 883b20b..7e2076c 100644 --- a/iup/srclua5/clua/olecontrol.clua +++ b/iup/srclua5/clua/olecontrol.clua @@ -38,41 +38,34 @@ static const unsigned char B1[] = { 0x65, 0x6e, 0x5f, 0x69, 0x75, 0x70, 0x6c, 0x75, 0x61, 0x6f, 0x6c, 0x65, 0x28, 0x6c, 0x75, 0x61, 0x5f, 0x53, 0x74, 0x61, 0x74, 0x65, 0x2a, 0x20, 0x4c, 0x29, 0x0a, 0x7b, 0x0a, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x6f, 0x6c, 0x65, 0x6c, 0x75, 0x61, 0x5f, - 0x6f, 0x70, 0x65, 0x6e, 0x28, 0x4c, 0x29, 0x3b, 0x0a, 0x7d, 0x0a, 0x0a, 0x2f, 0x2a, 0x20, 0x6f, - 0x62, 0x6c, 0x69, 0x67, 0x61, 0x74, 0x6f, 0x72, 0x79, 0x20, 0x74, 0x6f, 0x20, 0x75, 0x73, 0x65, - 0x20, 0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x22, 0x69, 0x75, 0x70, 0x6c, 0x75, 0x61, 0x6f, - 0x6c, 0x65, 0x35, 0x31, 0x22, 0x20, 0x2a, 0x2f, 0x0a, 0x69, 0x6e, 0x74, 0x20, 0x6c, 0x75, 0x61, - 0x6f, 0x70, 0x65, 0x6e, 0x5f, 0x69, 0x75, 0x70, 0x6c, 0x75, 0x61, 0x6f, 0x6c, 0x65, 0x35, 0x31, - 0x28, 0x6c, 0x75, 0x61, 0x5f, 0x53, 0x74, 0x61, 0x74, 0x65, 0x2a, 0x20, 0x4c, 0x29, 0x0a, 0x7b, - 0x0a, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x6f, 0x6c, 0x65, - 0x6c, 0x75, 0x61, 0x5f, 0x6f, 0x70, 0x65, 0x6e, 0x28, 0x4c, 0x29, 0x3b, 0x0a, 0x7d, 0x0a, 0x0a, - 0x5d, 0x5d, 0x0a, 0x7d, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, - 0x74, 0x72, 0x6c, 0x2e, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, - 0x74, 0x28, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x2c, 0x20, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x29, 0x0a, - 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x4f, 0x6c, 0x65, - 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x28, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x5b, 0x31, 0x5d, - 0x29, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, - 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4c, 0x75, 0x61, 0x43, 0x4f, - 0x4d, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x29, 0x0a, 0x20, 0x20, 0x2d, 0x2d, 0x20, 0x69, - 0x66, 0x20, 0x6c, 0x75, 0x61, 0x63, 0x6f, 0x6d, 0x20, 0x69, 0x73, 0x20, 0x6c, 0x6f, 0x61, 0x64, - 0x65, 0x64, 0x2c, 0x20, 0x75, 0x73, 0x65, 0x20, 0x69, 0x74, 0x20, 0x74, 0x6f, 0x20, 0x61, 0x63, - 0x63, 0x65, 0x73, 0x73, 0x20, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x73, 0x20, 0x61, 0x6e, 0x64, - 0x20, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x0a, 0x20, 0x20, 0x2d, 0x2d, - 0x20, 0x6f, 0x66, 0x20, 0x74, 0x68, 0x65, 0x20, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x0a, - 0x20, 0x20, 0x69, 0x66, 0x20, 0x6c, 0x75, 0x61, 0x63, 0x6f, 0x6d, 0x20, 0x74, 0x68, 0x65, 0x6e, - 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x70, 0x75, 0x6e, 0x6b, 0x20, - 0x3d, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2e, 0x69, 0x75, 0x6e, 0x6b, 0x6e, 0x6f, 0x77, - 0x6e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x70, 0x75, 0x6e, 0x6b, 0x20, 0x74, 0x68, - 0x65, 0x6e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2e, - 0x63, 0x6f, 0x6d, 0x20, 0x3d, 0x20, 0x6c, 0x75, 0x61, 0x63, 0x6f, 0x6d, 0x2e, 0x43, 0x72, 0x65, - 0x61, 0x74, 0x65, 0x4c, 0x75, 0x61, 0x43, 0x4f, 0x4d, 0x28, 0x6c, 0x75, 0x61, 0x63, 0x6f, 0x6d, - 0x2e, 0x49, 0x6d, 0x70, 0x6f, 0x72, 0x74, 0x49, 0x55, 0x6e, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x28, - 0x70, 0x75, 0x6e, 0x6b, 0x29, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x0a, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x69, - 0x75, 0x70, 0x2e, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x57, 0x69, 0x64, 0x67, 0x65, - 0x74, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x29, 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x53, 0x65, 0x74, 0x43, - 0x6c, 0x61, 0x73, 0x73, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x2c, 0x20, 0x22, 0x69, 0x75, 0x70, 0x20, - 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x29, 0x0a, + 0x6f, 0x70, 0x65, 0x6e, 0x28, 0x4c, 0x29, 0x3b, 0x0a, 0x7d, 0x0a, 0x0a, 0x5d, 0x5d, 0x0a, 0x7d, + 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, + 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x28, 0x63, 0x6c, + 0x61, 0x73, 0x73, 0x2c, 0x20, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x29, 0x0a, 0x20, 0x20, 0x72, 0x65, + 0x74, 0x75, 0x72, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x4f, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x74, + 0x72, 0x6f, 0x6c, 0x28, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x5b, 0x31, 0x5d, 0x29, 0x0a, 0x65, 0x6e, + 0x64, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, + 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4c, 0x75, 0x61, 0x43, 0x4f, 0x4d, 0x28, 0x68, 0x61, + 0x6e, 0x64, 0x6c, 0x65, 0x29, 0x0a, 0x20, 0x20, 0x2d, 0x2d, 0x20, 0x69, 0x66, 0x20, 0x6c, 0x75, + 0x61, 0x63, 0x6f, 0x6d, 0x20, 0x69, 0x73, 0x20, 0x6c, 0x6f, 0x61, 0x64, 0x65, 0x64, 0x2c, 0x20, + 0x75, 0x73, 0x65, 0x20, 0x69, 0x74, 0x20, 0x74, 0x6f, 0x20, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, + 0x20, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x73, 0x20, 0x61, 0x6e, 0x64, 0x20, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x0a, 0x20, 0x20, 0x2d, 0x2d, 0x20, 0x6f, 0x66, 0x20, + 0x74, 0x68, 0x65, 0x20, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x0a, 0x20, 0x20, 0x69, 0x66, + 0x20, 0x6c, 0x75, 0x61, 0x63, 0x6f, 0x6d, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a, 0x20, 0x20, 0x20, + 0x20, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x70, 0x75, 0x6e, 0x6b, 0x20, 0x3d, 0x20, 0x68, 0x61, + 0x6e, 0x64, 0x6c, 0x65, 0x2e, 0x69, 0x75, 0x6e, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x0a, 0x20, 0x20, + 0x20, 0x20, 0x69, 0x66, 0x20, 0x70, 0x75, 0x6e, 0x6b, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a, 0x20, + 0x20, 0x20, 0x20, 0x20, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2e, 0x63, 0x6f, 0x6d, 0x20, + 0x3d, 0x20, 0x6c, 0x75, 0x61, 0x63, 0x6f, 0x6d, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4c, + 0x75, 0x61, 0x43, 0x4f, 0x4d, 0x28, 0x6c, 0x75, 0x61, 0x63, 0x6f, 0x6d, 0x2e, 0x49, 0x6d, 0x70, + 0x6f, 0x72, 0x74, 0x49, 0x55, 0x6e, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x28, 0x70, 0x75, 0x6e, 0x6b, + 0x29, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x20, 0x20, 0x20, 0x20, 0x20, 0x0a, + 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x52, + 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x57, 0x69, 0x64, 0x67, 0x65, 0x74, 0x28, 0x63, 0x74, + 0x72, 0x6c, 0x29, 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x53, 0x65, 0x74, 0x43, 0x6c, 0x61, 0x73, 0x73, + 0x28, 0x63, 0x74, 0x72, 0x6c, 0x2c, 0x20, 0x22, 0x69, 0x75, 0x70, 0x20, 0x77, 0x69, 0x64, 0x67, + 0x65, 0x74, 0x22, 0x29, 0x0a, }; if (luaL_loadbuffer(L, (const char *)B1, sizeof(B1), "olecontrol.lua") == 0) lua_call(L, 0, 0); diff --git a/iup/srclua5/clua/radio.clua b/iup/srclua5/clua/radio.clua index d781c3d..93827a2 100644 --- a/iup/srclua5/clua/radio.clua +++ b/iup/srclua5/clua/radio.clua @@ -16,39 +16,43 @@ static const unsigned char B1[] = { 0x20, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x20, 0x3d, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x57, 0x49, 0x44, 0x47, 0x45, 0x54, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x3d, 0x20, 0x22, 0x49, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x61, 0x6c, 0x6c, 0x62, 0x61, - 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x7b, 0x7d, 0x0a, 0x7d, 0x20, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, - 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x53, 0x65, 0x74, 0x43, 0x68, 0x69, - 0x6c, 0x64, 0x72, 0x65, 0x6e, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x28, 0x6f, 0x62, 0x6a, 0x29, 0x0a, - 0x20, 0x20, 0x69, 0x66, 0x20, 0x6f, 0x62, 0x6a, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a, 0x20, 0x20, - 0x20, 0x20, 0x69, 0x66, 0x20, 0x6f, 0x62, 0x6a, 0x2e, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x2e, - 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x20, 0x3d, 0x3d, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x42, 0x4f, - 0x58, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x6c, 0x6f, 0x63, - 0x61, 0x6c, 0x20, 0x69, 0x20, 0x3d, 0x20, 0x31, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x77, - 0x68, 0x69, 0x6c, 0x65, 0x20, 0x6f, 0x62, 0x6a, 0x5b, 0x69, 0x5d, 0x20, 0x64, 0x6f, 0x0a, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x53, 0x65, 0x74, 0x43, - 0x68, 0x69, 0x6c, 0x64, 0x72, 0x65, 0x6e, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x20, 0x28, 0x6f, 0x62, - 0x6a, 0x5b, 0x69, 0x5d, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x20, - 0x3d, 0x20, 0x69, 0x2b, 0x31, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, - 0x20, 0x20, 0x20, 0x20, 0x65, 0x6c, 0x73, 0x65, 0x69, 0x66, 0x20, 0x6f, 0x62, 0x6a, 0x2e, 0x70, - 0x61, 0x72, 0x65, 0x6e, 0x74, 0x20, 0x3d, 0x3d, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x46, 0x52, 0x41, - 0x4d, 0x45, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x63, 0x74, - 0x72, 0x6c, 0x2e, 0x53, 0x65, 0x74, 0x43, 0x68, 0x69, 0x6c, 0x64, 0x72, 0x65, 0x6e, 0x4e, 0x61, - 0x6d, 0x65, 0x73, 0x20, 0x28, 0x6f, 0x62, 0x6a, 0x5b, 0x31, 0x5d, 0x29, 0x0a, 0x20, 0x20, 0x20, - 0x20, 0x65, 0x6c, 0x73, 0x65, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x75, 0x70, 0x2e, - 0x53, 0x65, 0x74, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x28, 0x6f, 0x62, - 0x6a, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x65, 0x6e, 0x64, - 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, - 0x74, 0x72, 0x6c, 0x2e, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, - 0x74, 0x28, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x2c, 0x20, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x29, 0x0a, - 0x20, 0x20, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x53, 0x65, 0x74, 0x43, 0x68, 0x69, 0x6c, 0x64, - 0x72, 0x65, 0x6e, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x28, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x5b, 0x31, - 0x5d, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x69, 0x75, 0x70, - 0x2e, 0x52, 0x61, 0x64, 0x69, 0x6f, 0x28, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x5b, 0x31, 0x5d, 0x29, - 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x20, 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x52, 0x65, 0x67, - 0x69, 0x73, 0x74, 0x65, 0x72, 0x57, 0x69, 0x64, 0x67, 0x65, 0x74, 0x28, 0x63, 0x74, 0x72, 0x6c, - 0x29, 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x53, 0x65, 0x74, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x28, 0x63, - 0x74, 0x72, 0x6c, 0x2c, 0x20, 0x22, 0x69, 0x75, 0x70, 0x20, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, - 0x22, 0x29, 0x0a, + 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x7b, 0x7d, 0x0a, 0x7d, 0x20, 0x0a, 0x0a, 0x2d, 0x2d, 0x20, 0x54, + 0x4f, 0x44, 0x4f, 0x3a, 0x20, 0x72, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x20, 0x74, 0x68, 0x69, 0x73, + 0x20, 0x63, 0x6f, 0x64, 0x65, 0x20, 0x69, 0x6e, 0x20, 0x74, 0x68, 0x65, 0x20, 0x66, 0x75, 0x74, + 0x75, 0x72, 0x65, 0x2c, 0x20, 0x69, 0x74, 0x20, 0x73, 0x65, 0x65, 0x6d, 0x73, 0x20, 0x74, 0x6f, + 0x20, 0x62, 0x65, 0x20, 0x75, 0x73, 0x65, 0x6c, 0x65, 0x73, 0x73, 0x20, 0x61, 0x6e, 0x20, 0x69, + 0x6e, 0x63, 0x6f, 0x72, 0x72, 0x65, 0x63, 0x74, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, + 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x53, 0x65, 0x74, 0x43, 0x68, 0x69, 0x6c, 0x64, 0x72, + 0x65, 0x6e, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x28, 0x6f, 0x62, 0x6a, 0x29, 0x0a, 0x20, 0x20, 0x69, + 0x66, 0x20, 0x6f, 0x62, 0x6a, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, + 0x66, 0x20, 0x6f, 0x62, 0x6a, 0x2e, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x2e, 0x70, 0x61, 0x72, + 0x65, 0x6e, 0x74, 0x20, 0x3d, 0x3d, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x42, 0x4f, 0x58, 0x20, 0x74, + 0x68, 0x65, 0x6e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, + 0x69, 0x20, 0x3d, 0x20, 0x31, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x77, 0x68, 0x69, 0x6c, + 0x65, 0x20, 0x6f, 0x62, 0x6a, 0x5b, 0x69, 0x5d, 0x20, 0x64, 0x6f, 0x0a, 0x20, 0x20, 0x20, 0x20, + 0x20, 0x20, 0x20, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x53, 0x65, 0x74, 0x43, 0x68, 0x69, 0x6c, + 0x64, 0x72, 0x65, 0x6e, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x20, 0x28, 0x6f, 0x62, 0x6a, 0x5b, 0x69, + 0x5d, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x20, 0x3d, 0x20, 0x69, + 0x2b, 0x31, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x20, + 0x20, 0x65, 0x6c, 0x73, 0x65, 0x69, 0x66, 0x20, 0x6f, 0x62, 0x6a, 0x2e, 0x70, 0x61, 0x72, 0x65, + 0x6e, 0x74, 0x20, 0x3d, 0x3d, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x46, 0x52, 0x41, 0x4d, 0x45, 0x20, + 0x74, 0x68, 0x65, 0x6e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, + 0x53, 0x65, 0x74, 0x43, 0x68, 0x69, 0x6c, 0x64, 0x72, 0x65, 0x6e, 0x4e, 0x61, 0x6d, 0x65, 0x73, + 0x20, 0x28, 0x6f, 0x62, 0x6a, 0x5b, 0x31, 0x5d, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6c, + 0x73, 0x65, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x53, 0x65, 0x74, + 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x28, 0x6f, 0x62, 0x6a, 0x29, 0x0a, + 0x20, 0x20, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x65, 0x6e, + 0x64, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, + 0x2e, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x28, 0x63, + 0x6c, 0x61, 0x73, 0x73, 0x2c, 0x20, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x29, 0x0a, 0x20, 0x20, 0x20, + 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x53, 0x65, 0x74, 0x43, 0x68, 0x69, 0x6c, 0x64, 0x72, 0x65, 0x6e, + 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x28, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x5b, 0x31, 0x5d, 0x29, 0x0a, + 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x52, 0x61, + 0x64, 0x69, 0x6f, 0x28, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x5b, 0x31, 0x5d, 0x29, 0x0a, 0x65, 0x6e, + 0x64, 0x0a, 0x20, 0x20, 0x20, 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, + 0x65, 0x72, 0x57, 0x69, 0x64, 0x67, 0x65, 0x74, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x29, 0x0a, 0x69, + 0x75, 0x70, 0x2e, 0x53, 0x65, 0x74, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x28, 0x63, 0x74, 0x72, 0x6c, + 0x2c, 0x20, 0x22, 0x69, 0x75, 0x70, 0x20, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x29, 0x0a, }; if (luaL_loadbuffer(L, (const char *)B1, sizeof(B1), "radio.lua") == 0) lua_call(L, 0, 0); diff --git a/iup/srclua5/clua/tree.clua b/iup/srclua5/clua/tree.clua index 42d4736..da9d391 100644 --- a/iup/srclua5/clua/tree.clua +++ b/iup/srclua5/clua/tree.clua @@ -46,186 +46,187 @@ static const unsigned char B1[] = { 0x20, 0x20, 0x20, 0x64, 0x72, 0x61, 0x67, 0x64, 0x72, 0x6f, 0x70, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x6e, 0x6e, 0x6e, 0x6e, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x7d, 0x2c, 0x0a, 0x20, 0x20, 0x65, 0x78, 0x74, 0x72, 0x61, 0x66, 0x75, 0x6e, 0x63, 0x73, 0x20, 0x3d, 0x20, 0x31, 0x2c, 0x0a, - 0x7d, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x2e, + 0x7d, 0x0a, 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x54, 0x52, 0x45, 0x45, 0x52, 0x45, 0x46, 0x54, 0x41, + 0x42, 0x4c, 0x45, 0x3d, 0x7b, 0x7d, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, + 0x20, 0x69, 0x75, 0x70, 0x2e, 0x54, 0x72, 0x65, 0x65, 0x53, 0x65, 0x74, 0x4e, 0x6f, 0x64, 0x65, + 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, + 0x65, 0x2c, 0x20, 0x69, 0x64, 0x2c, 0x20, 0x61, 0x74, 0x74, 0x72, 0x73, 0x29, 0x0a, 0x20, 0x20, + 0x66, 0x6f, 0x72, 0x20, 0x61, 0x74, 0x74, 0x72, 0x2c, 0x20, 0x76, 0x61, 0x6c, 0x20, 0x69, 0x6e, + 0x20, 0x70, 0x61, 0x69, 0x72, 0x73, 0x28, 0x61, 0x74, 0x74, 0x72, 0x73, 0x29, 0x20, 0x64, 0x6f, + 0x0a, 0x20, 0x20, 0x20, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x5b, 0x61, 0x74, 0x74, 0x72, + 0x2e, 0x2e, 0x69, 0x64, 0x5d, 0x20, 0x3d, 0x20, 0x76, 0x61, 0x6c, 0x0a, 0x20, 0x20, 0x65, 0x6e, + 0x64, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, + 0x69, 0x75, 0x70, 0x2e, 0x54, 0x72, 0x65, 0x65, 0x53, 0x65, 0x74, 0x41, 0x6e, 0x63, 0x65, 0x73, + 0x74, 0x6f, 0x72, 0x73, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x28, 0x68, + 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x69, 0x6e, 0x69, 0x2c, 0x20, 0x61, 0x74, 0x74, 0x72, + 0x73, 0x29, 0x0a, 0x20, 0x20, 0x69, 0x6e, 0x69, 0x20, 0x3d, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, + 0x65, 0x5b, 0x22, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x22, 0x2e, 0x2e, 0x69, 0x6e, 0x69, 0x5d, + 0x0a, 0x20, 0x20, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x73, 0x74, 0x61, 0x63, 0x6b, 0x20, 0x3d, + 0x20, 0x7b, 0x7d, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x77, 0x68, 0x69, 0x6c, 0x65, 0x20, 0x69, 0x6e, + 0x69, 0x20, 0x64, 0x6f, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x74, 0x61, 0x62, 0x6c, 0x65, + 0x2e, 0x69, 0x6e, 0x73, 0x65, 0x72, 0x74, 0x28, 0x73, 0x74, 0x61, 0x63, 0x6b, 0x2c, 0x20, 0x31, + 0x2c, 0x20, 0x69, 0x6e, 0x69, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x6e, 0x69, + 0x20, 0x3d, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x5b, 0x22, 0x70, 0x61, 0x72, 0x65, 0x6e, + 0x74, 0x22, 0x2e, 0x2e, 0x69, 0x6e, 0x69, 0x5d, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6e, 0x64, + 0x0a, 0x20, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x69, 0x20, 0x3d, 0x20, 0x31, 0x2c, 0x20, 0x23, 0x73, + 0x74, 0x61, 0x63, 0x6b, 0x20, 0x64, 0x6f, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x54, 0x72, 0x65, 0x65, 0x53, 0x65, 0x74, 0x4e, 0x6f, 0x64, 0x65, 0x41, 0x74, 0x74, 0x72, 0x69, - 0x62, 0x75, 0x74, 0x65, 0x73, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x69, 0x64, - 0x2c, 0x20, 0x61, 0x74, 0x74, 0x72, 0x73, 0x29, 0x0a, 0x20, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x61, - 0x74, 0x74, 0x72, 0x2c, 0x20, 0x76, 0x61, 0x6c, 0x20, 0x69, 0x6e, 0x20, 0x70, 0x61, 0x69, 0x72, - 0x73, 0x28, 0x61, 0x74, 0x74, 0x72, 0x73, 0x29, 0x20, 0x64, 0x6f, 0x0a, 0x20, 0x20, 0x20, 0x20, - 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x5b, 0x61, 0x74, 0x74, 0x72, 0x2e, 0x2e, 0x69, 0x64, 0x5d, - 0x20, 0x3d, 0x20, 0x76, 0x61, 0x6c, 0x0a, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x65, 0x6e, 0x64, - 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x54, - 0x72, 0x65, 0x65, 0x53, 0x65, 0x74, 0x41, 0x6e, 0x63, 0x65, 0x73, 0x74, 0x6f, 0x72, 0x73, 0x41, - 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, - 0x2c, 0x20, 0x69, 0x6e, 0x69, 0x2c, 0x20, 0x61, 0x74, 0x74, 0x72, 0x73, 0x29, 0x0a, 0x20, 0x20, - 0x69, 0x6e, 0x69, 0x20, 0x3d, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x5b, 0x22, 0x70, 0x61, - 0x72, 0x65, 0x6e, 0x74, 0x22, 0x2e, 0x2e, 0x69, 0x6e, 0x69, 0x5d, 0x0a, 0x20, 0x20, 0x6c, 0x6f, - 0x63, 0x61, 0x6c, 0x20, 0x73, 0x74, 0x61, 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x7b, 0x7d, 0x0a, 0x20, - 0x20, 0x20, 0x20, 0x77, 0x68, 0x69, 0x6c, 0x65, 0x20, 0x69, 0x6e, 0x69, 0x20, 0x64, 0x6f, 0x0a, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x2e, 0x69, 0x6e, 0x73, 0x65, - 0x72, 0x74, 0x28, 0x73, 0x74, 0x61, 0x63, 0x6b, 0x2c, 0x20, 0x31, 0x2c, 0x20, 0x69, 0x6e, 0x69, - 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x6e, 0x69, 0x20, 0x3d, 0x20, 0x68, 0x61, - 0x6e, 0x64, 0x6c, 0x65, 0x5b, 0x22, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x22, 0x2e, 0x2e, 0x69, - 0x6e, 0x69, 0x5d, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x66, 0x6f, - 0x72, 0x20, 0x69, 0x20, 0x3d, 0x20, 0x31, 0x2c, 0x20, 0x23, 0x73, 0x74, 0x61, 0x63, 0x6b, 0x20, - 0x64, 0x6f, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x54, 0x72, 0x65, 0x65, 0x53, - 0x65, 0x74, 0x4e, 0x6f, 0x64, 0x65, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, - 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x73, 0x74, 0x61, 0x63, 0x6b, 0x5b, 0x69, - 0x5d, 0x2c, 0x20, 0x61, 0x74, 0x74, 0x72, 0x73, 0x29, 0x0a, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, + 0x62, 0x75, 0x74, 0x65, 0x73, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x73, 0x74, + 0x61, 0x63, 0x6b, 0x5b, 0x69, 0x5d, 0x2c, 0x20, 0x61, 0x74, 0x74, 0x72, 0x73, 0x29, 0x0a, 0x20, + 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, + 0x6f, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x54, 0x72, 0x65, 0x65, 0x53, 0x65, 0x74, 0x44, 0x65, + 0x73, 0x63, 0x65, 0x6e, 0x74, 0x73, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, + 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x69, 0x6e, 0x69, 0x2c, 0x20, 0x61, 0x74, + 0x74, 0x72, 0x73, 0x29, 0x0a, 0x20, 0x20, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x69, 0x64, 0x20, + 0x3d, 0x20, 0x69, 0x6e, 0x69, 0x0a, 0x20, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x69, 0x20, 0x3d, 0x20, + 0x31, 0x2c, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x5b, 0x22, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x2e, 0x2e, 0x69, 0x6e, 0x69, 0x5d, 0x20, 0x64, 0x6f, 0x0a, + 0x20, 0x20, 0x20, 0x20, 0x69, 0x64, 0x20, 0x3d, 0x20, 0x69, 0x64, 0x2b, 0x31, 0x0a, 0x20, 0x20, + 0x20, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x54, 0x72, 0x65, 0x65, 0x53, 0x65, 0x74, 0x4e, 0x6f, 0x64, + 0x65, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x28, 0x68, 0x61, 0x6e, 0x64, + 0x6c, 0x65, 0x2c, 0x20, 0x69, 0x64, 0x2c, 0x20, 0x61, 0x74, 0x74, 0x72, 0x73, 0x29, 0x0a, 0x20, + 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x5b, 0x22, 0x6b, 0x69, + 0x6e, 0x64, 0x22, 0x2e, 0x2e, 0x69, 0x64, 0x5d, 0x20, 0x3d, 0x3d, 0x20, 0x22, 0x42, 0x52, 0x41, + 0x4e, 0x43, 0x48, 0x22, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, + 0x69, 0x64, 0x20, 0x3d, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x54, 0x72, 0x65, 0x65, 0x53, 0x65, 0x74, + 0x44, 0x65, 0x73, 0x63, 0x65, 0x6e, 0x74, 0x73, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, + 0x65, 0x73, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x69, 0x64, 0x2c, 0x20, 0x61, + 0x74, 0x74, 0x72, 0x73, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, + 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x69, 0x64, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x69, 0x75, - 0x70, 0x2e, 0x54, 0x72, 0x65, 0x65, 0x53, 0x65, 0x74, 0x44, 0x65, 0x73, 0x63, 0x65, 0x6e, 0x74, - 0x73, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x28, 0x68, 0x61, 0x6e, 0x64, - 0x6c, 0x65, 0x2c, 0x20, 0x69, 0x6e, 0x69, 0x2c, 0x20, 0x61, 0x74, 0x74, 0x72, 0x73, 0x29, 0x0a, - 0x20, 0x20, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x69, 0x64, 0x20, 0x3d, 0x20, 0x69, 0x6e, 0x69, - 0x0a, 0x20, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x69, 0x20, 0x3d, 0x20, 0x31, 0x2c, 0x20, 0x68, 0x61, - 0x6e, 0x64, 0x6c, 0x65, 0x5b, 0x22, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x63, 0x6f, 0x75, 0x6e, 0x74, - 0x22, 0x2e, 0x2e, 0x69, 0x6e, 0x69, 0x5d, 0x20, 0x64, 0x6f, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, - 0x64, 0x20, 0x3d, 0x20, 0x69, 0x64, 0x2b, 0x31, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x75, 0x70, - 0x2e, 0x54, 0x72, 0x65, 0x65, 0x53, 0x65, 0x74, 0x4e, 0x6f, 0x64, 0x65, 0x41, 0x74, 0x74, 0x72, - 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x69, - 0x64, 0x2c, 0x20, 0x61, 0x74, 0x74, 0x72, 0x73, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, - 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x5b, 0x22, 0x6b, 0x69, 0x6e, 0x64, 0x22, 0x2e, 0x2e, - 0x69, 0x64, 0x5d, 0x20, 0x3d, 0x3d, 0x20, 0x22, 0x42, 0x52, 0x41, 0x4e, 0x43, 0x48, 0x22, 0x20, - 0x74, 0x68, 0x65, 0x6e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x64, 0x20, 0x3d, 0x20, - 0x69, 0x75, 0x70, 0x2e, 0x54, 0x72, 0x65, 0x65, 0x53, 0x65, 0x74, 0x44, 0x65, 0x73, 0x63, 0x65, - 0x6e, 0x74, 0x73, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x28, 0x68, 0x61, - 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x69, 0x64, 0x2c, 0x20, 0x61, 0x74, 0x74, 0x72, 0x73, 0x29, - 0x0a, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20, - 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x69, 0x64, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, - 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x54, 0x72, 0x65, - 0x65, 0x53, 0x65, 0x74, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x48, 0x61, 0x6e, - 0x64, 0x6c, 0x65, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x2c, 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x69, - 0x75, 0x70, 0x2e, 0x47, 0x65, 0x74, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x28, 0x76, 0x61, 0x6c, 0x75, - 0x65, 0x29, 0x20, 0x3d, 0x3d, 0x20, 0x22, 0x69, 0x75, 0x70, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, - 0x65, 0x22, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x20, 0x3d, 0x20, - 0x69, 0x75, 0x70, 0x2e, 0x53, 0x65, 0x74, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x4e, 0x61, 0x6d, - 0x65, 0x28, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x29, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x20, - 0x69, 0x75, 0x70, 0x2e, 0x53, 0x65, 0x74, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, - 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x2c, 0x20, 0x76, - 0x61, 0x6c, 0x75, 0x65, 0x29, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x2d, 0x2d, 0x20, 0x6d, 0x75, - 0x73, 0x74, 0x20, 0x62, 0x65, 0x20, 0x61, 0x66, 0x74, 0x65, 0x72, 0x20, 0x74, 0x68, 0x65, 0x20, - 0x62, 0x72, 0x61, 0x6e, 0x63, 0x68, 0x20, 0x68, 0x61, 0x73, 0x20, 0x6e, 0x6f, 0x64, 0x65, 0x73, - 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x54, 0x72, - 0x65, 0x65, 0x53, 0x65, 0x74, 0x53, 0x74, 0x61, 0x74, 0x65, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, - 0x65, 0x2c, 0x20, 0x74, 0x6e, 0x6f, 0x64, 0x65, 0x2c, 0x20, 0x69, 0x64, 0x29, 0x0a, 0x20, 0x20, - 0x69, 0x66, 0x20, 0x74, 0x6e, 0x6f, 0x64, 0x65, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x65, 0x20, 0x74, - 0x68, 0x65, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x53, 0x65, 0x74, 0x41, 0x74, 0x74, 0x72, 0x69, - 0x62, 0x75, 0x74, 0x65, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x22, 0x53, 0x54, - 0x41, 0x54, 0x45, 0x22, 0x2e, 0x2e, 0x69, 0x64, 0x2c, 0x20, 0x74, 0x6e, 0x6f, 0x64, 0x65, 0x2e, - 0x73, 0x74, 0x61, 0x74, 0x65, 0x29, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, - 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x54, 0x72, 0x65, - 0x65, 0x53, 0x65, 0x74, 0x4e, 0x6f, 0x64, 0x65, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x28, 0x68, - 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x74, 0x6e, 0x6f, 0x64, 0x65, 0x2c, 0x20, 0x69, 0x64, - 0x29, 0x0a, 0x20, 0x20, 0x69, 0x66, 0x20, 0x74, 0x6e, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6f, 0x6c, - 0x6f, 0x72, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x53, 0x65, 0x74, 0x41, - 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, - 0x20, 0x22, 0x43, 0x4f, 0x4c, 0x4f, 0x52, 0x22, 0x2e, 0x2e, 0x69, 0x64, 0x2c, 0x20, 0x74, 0x6e, - 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x29, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20, - 0x20, 0x69, 0x66, 0x20, 0x74, 0x6e, 0x6f, 0x64, 0x65, 0x2e, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x66, - 0x6f, 0x6e, 0x74, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x53, 0x65, 0x74, - 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, - 0x2c, 0x20, 0x22, 0x54, 0x49, 0x54, 0x4c, 0x45, 0x46, 0x4f, 0x4e, 0x54, 0x22, 0x2e, 0x2e, 0x69, - 0x64, 0x2c, 0x20, 0x74, 0x6e, 0x6f, 0x64, 0x65, 0x2e, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x66, 0x6f, - 0x6e, 0x74, 0x29, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x69, 0x66, 0x20, 0x74, 0x6e, 0x6f, - 0x64, 0x65, 0x2e, 0x6d, 0x61, 0x72, 0x6b, 0x65, 0x64, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x20, 0x69, - 0x75, 0x70, 0x2e, 0x53, 0x65, 0x74, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x28, - 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x22, 0x4d, 0x41, 0x52, 0x4b, 0x45, 0x44, 0x22, - 0x2e, 0x2e, 0x69, 0x64, 0x2c, 0x20, 0x74, 0x6e, 0x6f, 0x64, 0x65, 0x2e, 0x6d, 0x61, 0x72, 0x6b, - 0x65, 0x64, 0x29, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x69, 0x66, 0x20, 0x74, 0x6e, 0x6f, - 0x64, 0x65, 0x2e, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x54, 0x72, 0x65, 0x65, 0x53, 0x65, 0x74, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, - 0x20, 0x22, 0x49, 0x4d, 0x41, 0x47, 0x45, 0x22, 0x2e, 0x2e, 0x69, 0x64, 0x2c, 0x20, 0x74, 0x6e, - 0x6f, 0x64, 0x65, 0x2e, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x29, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20, - 0x20, 0x69, 0x66, 0x20, 0x74, 0x6e, 0x6f, 0x64, 0x65, 0x2e, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x65, - 0x78, 0x70, 0x61, 0x6e, 0x64, 0x65, 0x64, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x20, 0x69, 0x75, 0x70, - 0x2e, 0x54, 0x72, 0x65, 0x65, 0x53, 0x65, 0x74, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, - 0x65, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, - 0x22, 0x49, 0x4d, 0x41, 0x47, 0x45, 0x45, 0x58, 0x50, 0x41, 0x4e, 0x44, 0x45, 0x44, 0x22, 0x2e, - 0x2e, 0x69, 0x64, 0x2c, 0x20, 0x74, 0x6e, 0x6f, 0x64, 0x65, 0x2e, 0x69, 0x6d, 0x61, 0x67, 0x65, - 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x65, 0x64, 0x29, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, - 0x69, 0x66, 0x20, 0x74, 0x6e, 0x6f, 0x64, 0x65, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x69, 0x64, 0x20, - 0x74, 0x68, 0x65, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x54, 0x72, 0x65, 0x65, 0x53, 0x65, 0x74, - 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x69, - 0x64, 0x2c, 0x20, 0x74, 0x6e, 0x6f, 0x64, 0x65, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x69, 0x64, 0x29, - 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, - 0x6f, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x54, 0x72, 0x65, 0x65, 0x41, 0x64, 0x64, 0x4e, 0x6f, - 0x64, 0x65, 0x73, 0x52, 0x65, 0x63, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x74, - 0x2c, 0x20, 0x69, 0x64, 0x29, 0x0a, 0x20, 0x20, 0x69, 0x66, 0x20, 0x74, 0x20, 0x3d, 0x3d, 0x20, - 0x6e, 0x69, 0x6c, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, - 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x63, 0x6f, 0x6e, 0x74, - 0x20, 0x3d, 0x20, 0x23, 0x74, 0x0a, 0x20, 0x20, 0x77, 0x68, 0x69, 0x6c, 0x65, 0x20, 0x63, 0x6f, - 0x6e, 0x74, 0x20, 0x3e, 0x3d, 0x20, 0x30, 0x20, 0x64, 0x6f, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6c, - 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x74, 0x6e, 0x6f, 0x64, 0x65, 0x20, 0x3d, 0x20, 0x74, 0x5b, 0x63, - 0x6f, 0x6e, 0x74, 0x5d, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x74, 0x79, 0x70, 0x65, - 0x28, 0x74, 0x6e, 0x6f, 0x64, 0x65, 0x29, 0x20, 0x3d, 0x3d, 0x20, 0x22, 0x74, 0x61, 0x62, 0x6c, - 0x65, 0x22, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, - 0x20, 0x74, 0x6e, 0x6f, 0x64, 0x65, 0x2e, 0x62, 0x72, 0x61, 0x6e, 0x63, 0x68, 0x6e, 0x61, 0x6d, - 0x65, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, - 0x75, 0x70, 0x2e, 0x53, 0x65, 0x74, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x28, - 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x22, 0x41, 0x44, 0x44, 0x42, 0x52, 0x41, 0x4e, - 0x43, 0x48, 0x22, 0x2e, 0x2e, 0x69, 0x64, 0x2c, 0x20, 0x74, 0x6e, 0x6f, 0x64, 0x65, 0x2e, 0x62, - 0x72, 0x61, 0x6e, 0x63, 0x68, 0x6e, 0x61, 0x6d, 0x65, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x54, 0x72, 0x65, 0x65, 0x53, 0x65, 0x74, 0x4e, 0x6f, - 0x64, 0x65, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, - 0x20, 0x74, 0x6e, 0x6f, 0x64, 0x65, 0x2c, 0x20, 0x69, 0x64, 0x2b, 0x31, 0x29, 0x0a, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x54, 0x72, 0x65, 0x65, 0x41, 0x64, - 0x64, 0x4e, 0x6f, 0x64, 0x65, 0x73, 0x52, 0x65, 0x63, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, - 0x2c, 0x20, 0x74, 0x6e, 0x6f, 0x64, 0x65, 0x2c, 0x20, 0x69, 0x64, 0x2b, 0x31, 0x29, 0x0a, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x54, 0x72, 0x65, 0x65, 0x53, - 0x65, 0x74, 0x53, 0x74, 0x61, 0x74, 0x65, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, - 0x74, 0x6e, 0x6f, 0x64, 0x65, 0x2c, 0x20, 0x69, 0x64, 0x2b, 0x31, 0x29, 0x0a, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x65, 0x6c, 0x73, 0x65, 0x69, 0x66, 0x20, 0x74, 0x6e, 0x6f, 0x64, 0x65, 0x2e, - 0x6c, 0x65, 0x61, 0x66, 0x6e, 0x61, 0x6d, 0x65, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x53, 0x65, 0x74, 0x41, 0x74, 0x74, - 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x22, - 0x41, 0x44, 0x44, 0x4c, 0x45, 0x41, 0x46, 0x22, 0x2e, 0x2e, 0x69, 0x64, 0x2c, 0x20, 0x74, 0x6e, - 0x6f, 0x64, 0x65, 0x2e, 0x6c, 0x65, 0x61, 0x66, 0x6e, 0x61, 0x6d, 0x65, 0x29, 0x0a, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x54, 0x72, 0x65, 0x65, 0x53, 0x65, - 0x74, 0x4e, 0x6f, 0x64, 0x65, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x28, 0x68, 0x61, 0x6e, 0x64, - 0x6c, 0x65, 0x2c, 0x20, 0x74, 0x6e, 0x6f, 0x64, 0x65, 0x2c, 0x20, 0x69, 0x64, 0x2b, 0x31, 0x29, - 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x65, - 0x6c, 0x73, 0x65, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x74, 0x6e, 0x6f, - 0x64, 0x65, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x69, 0x75, 0x70, 0x2e, 0x53, 0x65, 0x74, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, - 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x22, 0x41, 0x44, 0x44, 0x4c, 0x45, 0x41, - 0x46, 0x22, 0x2e, 0x2e, 0x69, 0x64, 0x2c, 0x20, 0x74, 0x6e, 0x6f, 0x64, 0x65, 0x29, 0x0a, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6e, 0x64, - 0x0a, 0x20, 0x20, 0x20, 0x20, 0x63, 0x6f, 0x6e, 0x74, 0x20, 0x3d, 0x20, 0x63, 0x6f, 0x6e, 0x74, - 0x20, 0x2d, 0x20, 0x31, 0x0a, 0x20, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x65, 0x6e, 0x64, 0x0a, - 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x54, 0x72, - 0x65, 0x65, 0x41, 0x64, 0x64, 0x4e, 0x6f, 0x64, 0x65, 0x73, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, - 0x65, 0x2c, 0x20, 0x74, 0x2c, 0x20, 0x69, 0x64, 0x29, 0x0a, 0x20, 0x20, 0x69, 0x66, 0x20, 0x28, - 0x6e, 0x6f, 0x74, 0x20, 0x69, 0x64, 0x29, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a, 0x20, 0x20, 0x20, - 0x20, 0x69, 0x64, 0x20, 0x3d, 0x20, 0x30, 0x20, 0x20, 0x2d, 0x2d, 0x20, 0x64, 0x65, 0x66, 0x61, - 0x75, 0x6c, 0x74, 0x20, 0x69, 0x73, 0x20, 0x74, 0x68, 0x65, 0x20, 0x72, 0x6f, 0x6f, 0x74, 0x0a, - 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x74, 0x2e, 0x62, 0x72, 0x61, 0x6e, 0x63, 0x68, 0x6e, - 0x61, 0x6d, 0x65, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x53, 0x65, 0x74, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x2c, 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x29, 0x0a, 0x20, 0x20, + 0x20, 0x69, 0x66, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x47, 0x65, 0x74, 0x43, 0x6c, 0x61, 0x73, 0x73, + 0x28, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x29, 0x20, 0x3d, 0x3d, 0x20, 0x22, 0x69, 0x75, 0x70, 0x20, + 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x22, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x20, 0x76, 0x61, 0x6c, + 0x75, 0x65, 0x20, 0x3d, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x53, 0x65, 0x74, 0x48, 0x61, 0x6e, 0x64, + 0x6c, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x28, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x29, 0x20, 0x65, 0x6e, + 0x64, 0x0a, 0x20, 0x20, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x53, 0x65, 0x74, 0x41, 0x74, 0x74, 0x72, + 0x69, 0x62, 0x75, 0x74, 0x65, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x2c, 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x29, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, + 0x2d, 0x2d, 0x20, 0x6d, 0x75, 0x73, 0x74, 0x20, 0x62, 0x65, 0x20, 0x61, 0x66, 0x74, 0x65, 0x72, + 0x20, 0x74, 0x68, 0x65, 0x20, 0x62, 0x72, 0x61, 0x6e, 0x63, 0x68, 0x20, 0x68, 0x61, 0x73, 0x20, + 0x6e, 0x6f, 0x64, 0x65, 0x73, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x69, + 0x75, 0x70, 0x2e, 0x54, 0x72, 0x65, 0x65, 0x53, 0x65, 0x74, 0x53, 0x74, 0x61, 0x74, 0x65, 0x28, + 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x74, 0x6e, 0x6f, 0x64, 0x65, 0x2c, 0x20, 0x69, + 0x64, 0x29, 0x0a, 0x20, 0x20, 0x69, 0x66, 0x20, 0x74, 0x6e, 0x6f, 0x64, 0x65, 0x2e, 0x73, 0x74, + 0x61, 0x74, 0x65, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x53, 0x65, 0x74, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, - 0x2c, 0x20, 0x22, 0x54, 0x49, 0x54, 0x4c, 0x45, 0x30, 0x22, 0x2c, 0x20, 0x74, 0x2e, 0x62, 0x72, - 0x61, 0x6e, 0x63, 0x68, 0x6e, 0x61, 0x6d, 0x65, 0x29, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, - 0x20, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x54, 0x72, 0x65, 0x65, 0x53, 0x65, 0x74, 0x4e, 0x6f, 0x64, - 0x65, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, - 0x74, 0x2c, 0x20, 0x30, 0x29, 0x0a, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x69, 0x75, - 0x70, 0x2e, 0x54, 0x72, 0x65, 0x65, 0x41, 0x64, 0x64, 0x4e, 0x6f, 0x64, 0x65, 0x73, 0x52, 0x65, - 0x63, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x74, 0x2c, 0x20, 0x69, 0x64, 0x29, - 0x0a, 0x20, 0x20, 0x69, 0x66, 0x20, 0x28, 0x69, 0x64, 0x20, 0x3d, 0x3d, 0x20, 0x30, 0x29, 0x20, - 0x74, 0x68, 0x65, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x54, 0x72, 0x65, 0x65, 0x53, 0x65, 0x74, - 0x53, 0x74, 0x61, 0x74, 0x65, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x74, 0x2c, - 0x20, 0x30, 0x29, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x2d, 0x2d, 0x20, - 0x62, 0x61, 0x63, 0x6b, 0x77, 0x61, 0x72, 0x64, 0x20, 0x63, 0x6f, 0x6d, 0x70, 0x61, 0x74, 0x69, - 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x54, 0x72, 0x65, 0x65, 0x53, - 0x65, 0x74, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x20, 0x3d, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x54, 0x72, - 0x65, 0x65, 0x41, 0x64, 0x64, 0x4e, 0x6f, 0x64, 0x65, 0x73, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, - 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, - 0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x28, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x2c, 0x20, 0x70, - 0x61, 0x72, 0x61, 0x6d, 0x29, 0x0a, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x69, - 0x75, 0x70, 0x2e, 0x54, 0x72, 0x65, 0x65, 0x28, 0x29, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x69, - 0x75, 0x70, 0x2e, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x57, 0x69, 0x64, 0x67, 0x65, - 0x74, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x29, 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x53, 0x65, 0x74, 0x43, - 0x6c, 0x61, 0x73, 0x73, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x2c, 0x20, 0x22, 0x69, 0x75, 0x70, 0x20, - 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x29, 0x0a, + 0x2c, 0x20, 0x22, 0x53, 0x54, 0x41, 0x54, 0x45, 0x22, 0x2e, 0x2e, 0x69, 0x64, 0x2c, 0x20, 0x74, + 0x6e, 0x6f, 0x64, 0x65, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x65, 0x29, 0x20, 0x65, 0x6e, 0x64, 0x0a, + 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x69, 0x75, + 0x70, 0x2e, 0x54, 0x72, 0x65, 0x65, 0x53, 0x65, 0x74, 0x4e, 0x6f, 0x64, 0x65, 0x41, 0x74, 0x74, + 0x72, 0x69, 0x62, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x74, 0x6e, 0x6f, 0x64, + 0x65, 0x2c, 0x20, 0x69, 0x64, 0x29, 0x0a, 0x20, 0x20, 0x69, 0x66, 0x20, 0x74, 0x6e, 0x6f, 0x64, + 0x65, 0x2e, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x20, 0x69, 0x75, 0x70, + 0x2e, 0x53, 0x65, 0x74, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x28, 0x68, 0x61, + 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x22, 0x43, 0x4f, 0x4c, 0x4f, 0x52, 0x22, 0x2e, 0x2e, 0x69, + 0x64, 0x2c, 0x20, 0x74, 0x6e, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x29, 0x20, + 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x69, 0x66, 0x20, 0x74, 0x6e, 0x6f, 0x64, 0x65, 0x2e, 0x74, + 0x69, 0x74, 0x6c, 0x65, 0x66, 0x6f, 0x6e, 0x74, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x20, 0x69, 0x75, + 0x70, 0x2e, 0x53, 0x65, 0x74, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x28, 0x68, + 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x22, 0x54, 0x49, 0x54, 0x4c, 0x45, 0x46, 0x4f, 0x4e, + 0x54, 0x22, 0x2e, 0x2e, 0x69, 0x64, 0x2c, 0x20, 0x74, 0x6e, 0x6f, 0x64, 0x65, 0x2e, 0x74, 0x69, + 0x74, 0x6c, 0x65, 0x66, 0x6f, 0x6e, 0x74, 0x29, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x69, + 0x66, 0x20, 0x74, 0x6e, 0x6f, 0x64, 0x65, 0x2e, 0x6d, 0x61, 0x72, 0x6b, 0x65, 0x64, 0x20, 0x74, + 0x68, 0x65, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x53, 0x65, 0x74, 0x41, 0x74, 0x74, 0x72, 0x69, + 0x62, 0x75, 0x74, 0x65, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x22, 0x4d, 0x41, + 0x52, 0x4b, 0x45, 0x44, 0x22, 0x2e, 0x2e, 0x69, 0x64, 0x2c, 0x20, 0x74, 0x6e, 0x6f, 0x64, 0x65, + 0x2e, 0x6d, 0x61, 0x72, 0x6b, 0x65, 0x64, 0x29, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x69, + 0x66, 0x20, 0x74, 0x6e, 0x6f, 0x64, 0x65, 0x2e, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x20, 0x74, 0x68, + 0x65, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x54, 0x72, 0x65, 0x65, 0x53, 0x65, 0x74, 0x41, 0x74, + 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x28, 0x68, 0x61, + 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x22, 0x49, 0x4d, 0x41, 0x47, 0x45, 0x22, 0x2e, 0x2e, 0x69, + 0x64, 0x2c, 0x20, 0x74, 0x6e, 0x6f, 0x64, 0x65, 0x2e, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x29, 0x20, + 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x69, 0x66, 0x20, 0x74, 0x6e, 0x6f, 0x64, 0x65, 0x2e, 0x69, + 0x6d, 0x61, 0x67, 0x65, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x65, 0x64, 0x20, 0x74, 0x68, 0x65, + 0x6e, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x54, 0x72, 0x65, 0x65, 0x53, 0x65, 0x74, 0x41, 0x74, 0x74, + 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x28, 0x68, 0x61, 0x6e, + 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x22, 0x49, 0x4d, 0x41, 0x47, 0x45, 0x45, 0x58, 0x50, 0x41, 0x4e, + 0x44, 0x45, 0x44, 0x22, 0x2e, 0x2e, 0x69, 0x64, 0x2c, 0x20, 0x74, 0x6e, 0x6f, 0x64, 0x65, 0x2e, + 0x69, 0x6d, 0x61, 0x67, 0x65, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x65, 0x64, 0x29, 0x20, 0x65, + 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x69, 0x66, 0x20, 0x74, 0x6e, 0x6f, 0x64, 0x65, 0x2e, 0x75, 0x73, + 0x65, 0x72, 0x69, 0x64, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x54, 0x72, + 0x65, 0x65, 0x53, 0x65, 0x74, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x28, 0x68, 0x61, 0x6e, 0x64, + 0x6c, 0x65, 0x2c, 0x20, 0x69, 0x64, 0x2c, 0x20, 0x74, 0x6e, 0x6f, 0x64, 0x65, 0x2e, 0x75, 0x73, + 0x65, 0x72, 0x69, 0x64, 0x29, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x66, + 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x54, 0x72, 0x65, 0x65, + 0x41, 0x64, 0x64, 0x4e, 0x6f, 0x64, 0x65, 0x73, 0x52, 0x65, 0x63, 0x28, 0x68, 0x61, 0x6e, 0x64, + 0x6c, 0x65, 0x2c, 0x20, 0x74, 0x2c, 0x20, 0x69, 0x64, 0x29, 0x0a, 0x20, 0x20, 0x69, 0x66, 0x20, + 0x74, 0x20, 0x3d, 0x3d, 0x20, 0x6e, 0x69, 0x6c, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x20, 0x72, 0x65, + 0x74, 0x75, 0x72, 0x6e, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x6c, 0x6f, 0x63, 0x61, 0x6c, + 0x20, 0x63, 0x6f, 0x6e, 0x74, 0x20, 0x3d, 0x20, 0x23, 0x74, 0x0a, 0x20, 0x20, 0x77, 0x68, 0x69, + 0x6c, 0x65, 0x20, 0x63, 0x6f, 0x6e, 0x74, 0x20, 0x3e, 0x3d, 0x20, 0x30, 0x20, 0x64, 0x6f, 0x0a, + 0x20, 0x20, 0x20, 0x20, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x74, 0x6e, 0x6f, 0x64, 0x65, 0x20, + 0x3d, 0x20, 0x74, 0x5b, 0x63, 0x6f, 0x6e, 0x74, 0x5d, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, + 0x20, 0x74, 0x79, 0x70, 0x65, 0x28, 0x74, 0x6e, 0x6f, 0x64, 0x65, 0x29, 0x20, 0x3d, 0x3d, 0x20, + 0x22, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x22, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a, 0x20, 0x20, 0x20, + 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x74, 0x6e, 0x6f, 0x64, 0x65, 0x2e, 0x62, 0x72, 0x61, 0x6e, + 0x63, 0x68, 0x6e, 0x61, 0x6d, 0x65, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a, 0x20, 0x20, 0x20, 0x20, + 0x20, 0x20, 0x20, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x53, 0x65, 0x74, 0x41, 0x74, 0x74, 0x72, 0x69, + 0x62, 0x75, 0x74, 0x65, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x22, 0x41, 0x44, + 0x44, 0x42, 0x52, 0x41, 0x4e, 0x43, 0x48, 0x22, 0x2e, 0x2e, 0x69, 0x64, 0x2c, 0x20, 0x74, 0x6e, + 0x6f, 0x64, 0x65, 0x2e, 0x62, 0x72, 0x61, 0x6e, 0x63, 0x68, 0x6e, 0x61, 0x6d, 0x65, 0x29, 0x0a, + 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x54, 0x72, 0x65, 0x65, + 0x53, 0x65, 0x74, 0x4e, 0x6f, 0x64, 0x65, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x28, 0x68, 0x61, + 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x74, 0x6e, 0x6f, 0x64, 0x65, 0x2c, 0x20, 0x69, 0x64, 0x2b, + 0x31, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x54, + 0x72, 0x65, 0x65, 0x41, 0x64, 0x64, 0x4e, 0x6f, 0x64, 0x65, 0x73, 0x52, 0x65, 0x63, 0x28, 0x68, + 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x74, 0x6e, 0x6f, 0x64, 0x65, 0x2c, 0x20, 0x69, 0x64, + 0x2b, 0x31, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x75, 0x70, 0x2e, + 0x54, 0x72, 0x65, 0x65, 0x53, 0x65, 0x74, 0x53, 0x74, 0x61, 0x74, 0x65, 0x28, 0x68, 0x61, 0x6e, + 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x74, 0x6e, 0x6f, 0x64, 0x65, 0x2c, 0x20, 0x69, 0x64, 0x2b, 0x31, + 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6c, 0x73, 0x65, 0x69, 0x66, 0x20, 0x74, + 0x6e, 0x6f, 0x64, 0x65, 0x2e, 0x6c, 0x65, 0x61, 0x66, 0x6e, 0x61, 0x6d, 0x65, 0x20, 0x74, 0x68, + 0x65, 0x6e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x53, + 0x65, 0x74, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x28, 0x68, 0x61, 0x6e, 0x64, + 0x6c, 0x65, 0x2c, 0x20, 0x22, 0x41, 0x44, 0x44, 0x4c, 0x45, 0x41, 0x46, 0x22, 0x2e, 0x2e, 0x69, + 0x64, 0x2c, 0x20, 0x74, 0x6e, 0x6f, 0x64, 0x65, 0x2e, 0x6c, 0x65, 0x61, 0x66, 0x6e, 0x61, 0x6d, + 0x65, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x54, + 0x72, 0x65, 0x65, 0x53, 0x65, 0x74, 0x4e, 0x6f, 0x64, 0x65, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, + 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x74, 0x6e, 0x6f, 0x64, 0x65, 0x2c, 0x20, + 0x69, 0x64, 0x2b, 0x31, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, + 0x20, 0x20, 0x20, 0x20, 0x65, 0x6c, 0x73, 0x65, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, + 0x66, 0x20, 0x74, 0x6e, 0x6f, 0x64, 0x65, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a, 0x20, 0x20, 0x20, + 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x53, 0x65, 0x74, 0x41, 0x74, 0x74, 0x72, + 0x69, 0x62, 0x75, 0x74, 0x65, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x22, 0x41, + 0x44, 0x44, 0x4c, 0x45, 0x41, 0x46, 0x22, 0x2e, 0x2e, 0x69, 0x64, 0x2c, 0x20, 0x74, 0x6e, 0x6f, + 0x64, 0x65, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, + 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x63, 0x6f, 0x6e, 0x74, 0x20, 0x3d, + 0x20, 0x63, 0x6f, 0x6e, 0x74, 0x20, 0x2d, 0x20, 0x31, 0x0a, 0x20, 0x20, 0x20, 0x65, 0x6e, 0x64, + 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x69, + 0x75, 0x70, 0x2e, 0x54, 0x72, 0x65, 0x65, 0x41, 0x64, 0x64, 0x4e, 0x6f, 0x64, 0x65, 0x73, 0x28, + 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x74, 0x2c, 0x20, 0x69, 0x64, 0x29, 0x0a, 0x20, + 0x20, 0x69, 0x66, 0x20, 0x28, 0x6e, 0x6f, 0x74, 0x20, 0x69, 0x64, 0x29, 0x20, 0x74, 0x68, 0x65, + 0x6e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x64, 0x20, 0x3d, 0x20, 0x30, 0x20, 0x20, 0x2d, 0x2d, + 0x20, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x20, 0x69, 0x73, 0x20, 0x74, 0x68, 0x65, 0x20, + 0x72, 0x6f, 0x6f, 0x74, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x74, 0x2e, 0x62, 0x72, + 0x61, 0x6e, 0x63, 0x68, 0x6e, 0x61, 0x6d, 0x65, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x20, 0x69, 0x75, + 0x70, 0x2e, 0x53, 0x65, 0x74, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x28, 0x68, + 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x22, 0x54, 0x49, 0x54, 0x4c, 0x45, 0x30, 0x22, 0x2c, + 0x20, 0x74, 0x2e, 0x62, 0x72, 0x61, 0x6e, 0x63, 0x68, 0x6e, 0x61, 0x6d, 0x65, 0x29, 0x20, 0x65, + 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x54, 0x72, 0x65, 0x65, 0x53, + 0x65, 0x74, 0x4e, 0x6f, 0x64, 0x65, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x28, 0x68, 0x61, 0x6e, + 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x74, 0x2c, 0x20, 0x30, 0x29, 0x0a, 0x20, 0x20, 0x65, 0x6e, 0x64, + 0x0a, 0x20, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x54, 0x72, 0x65, 0x65, 0x41, 0x64, 0x64, 0x4e, 0x6f, + 0x64, 0x65, 0x73, 0x52, 0x65, 0x63, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x74, + 0x2c, 0x20, 0x69, 0x64, 0x29, 0x0a, 0x20, 0x20, 0x69, 0x66, 0x20, 0x28, 0x69, 0x64, 0x20, 0x3d, + 0x3d, 0x20, 0x30, 0x29, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x54, 0x72, + 0x65, 0x65, 0x53, 0x65, 0x74, 0x53, 0x74, 0x61, 0x74, 0x65, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, + 0x65, 0x2c, 0x20, 0x74, 0x2c, 0x20, 0x30, 0x29, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x65, 0x6e, 0x64, + 0x0a, 0x0a, 0x2d, 0x2d, 0x20, 0x62, 0x61, 0x63, 0x6b, 0x77, 0x61, 0x72, 0x64, 0x20, 0x63, 0x6f, + 0x6d, 0x70, 0x61, 0x74, 0x69, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x0a, 0x69, 0x75, 0x70, 0x2e, + 0x54, 0x72, 0x65, 0x65, 0x53, 0x65, 0x74, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x20, 0x3d, 0x20, 0x69, + 0x75, 0x70, 0x2e, 0x54, 0x72, 0x65, 0x65, 0x41, 0x64, 0x64, 0x4e, 0x6f, 0x64, 0x65, 0x73, 0x0a, + 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x63, + 0x72, 0x65, 0x61, 0x74, 0x65, 0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x28, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x2c, 0x20, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x29, 0x0a, 0x20, 0x20, 0x72, 0x65, 0x74, + 0x75, 0x72, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x54, 0x72, 0x65, 0x65, 0x28, 0x29, 0x0a, 0x65, + 0x6e, 0x64, 0x0a, 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, + 0x57, 0x69, 0x64, 0x67, 0x65, 0x74, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x29, 0x0a, 0x69, 0x75, 0x70, + 0x2e, 0x53, 0x65, 0x74, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x2c, 0x20, + 0x22, 0x69, 0x75, 0x70, 0x20, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x29, 0x0a, }; if (luaL_loadbuffer(L, (const char *)B1, sizeof(B1), "tree.lua") == 0) lua_call(L, 0, 0); diff --git a/iup/srclua5/config.mak b/iup/srclua5/config.mak deleted file mode 100755 index 921aa29..0000000 --- a/iup/srclua5/config.mak +++ /dev/null @@ -1,31 +0,0 @@ -PROJNAME = iup -LIBNAME = iuplua51 -OPT = YES -DEF_FILE = iuplua5.def - -DEFINES = IUPLUA_USELOH - -USE_LUA51 = Yes -NO_LUALINK = Yes - -INCLUDES = ../include ../src -LDIR = ../lib/$(TEC_UNAME) -LIBS = iup - -CTRLUA = button.lua canvas.lua dialog.lua colordlg.lua clipboard.lua \ - filedlg.lua fill.lua frame.lua hbox.lua normalizer.lua \ - item.lua image.lua imagergb.lua imagergba.lua label.lua \ - menu.lua multiline.lua list.lua separator.lua user.lua \ - submenu.lua text.lua toggle.lua vbox.lua zbox.lua timer.lua \ - sbox.lua split.lua spin.lua spinbox.lua cbox.lua messagedlg.lua \ - radio.lua val.lua tabs.lua fontdlg.lua tree.lua progressbar.lua - -GC := $(addsuffix .c, $(basename $(CTRLUA))) -GC := $(addprefix il_, $(GC)) -SRCLUA = iuplua.lua constants.lua $(CTRLUA) -LOHDIR = loh - -$(GC) : il_%.c : %.lua generator.lua - $(LUABIN) generator.lua $< - -SRC = iuplua.c iuplua_api.c il_tree_aux.c il_scanf.c il_getparam.c il_getcolor.c $(GC) diff --git a/iup/srclua5/ctrl_template.lua b/iup/srclua5/ctrl_template.lua index d7f509e..0686a99 100755 --- a/iup/srclua5/ctrl_template.lua +++ b/iup/srclua5/ctrl_template.lua @@ -72,10 +72,6 @@ static int myControl (lua_State * L) ]] extracode = [[ -- [optional] extra fucntions to be defined in C. -int luaopen_iupluamycontrol51(lua_State* L) -{ - return iupmycontrollua_open(L); -} ]] } diff --git a/iup/srclua5/dialog.lua b/iup/srclua5/dialog.lua index ac9b786..4dace61 100755 --- a/iup/srclua5/dialog.lua +++ b/iup/srclua5/dialog.lua @@ -12,6 +12,7 @@ local ctrl = { close_cb = "", show_cb = "n", move_cb = "nn", + copydata_cb = "sn", trayclick_cb = "nnn", dropfiles_cb = "snnn", } diff --git a/iup/srclua5/generator.lua b/iup/srclua5/generator.lua index efbab5a..ef12534 100755 --- a/iup/srclua5/generator.lua +++ b/iup/srclua5/generator.lua @@ -126,7 +126,9 @@ function write_callbacks(o, c) io.write(' lua_State *L = iuplua_call_start(self, "', i, '");') aux.n = 0 string.gsub(s, "(.)", function(p) - if p == "n" or p == "f" or p == "d" or p == "c" then + if p == "n" or p == "c" then + io.write("\n lua_pushinteger(L, p"..aux.n..");") + elseif p == "f" or p == "d" then io.write("\n lua_pushnumber(L, p"..aux.n..");") elseif p == "s" then io.write("\n lua_pushstring(L, p"..aux.n..");") diff --git a/iup/srclua5/glcanvas.lua b/iup/srclua5/glcanvas.lua index 6a3fe75..f8c8891 100755 --- a/iup/srclua5/glcanvas.lua +++ b/iup/srclua5/glcanvas.lua @@ -28,12 +28,6 @@ int luaopen_iupluagl(lua_State* L) return iupgllua_open(L); } -/* obligatory to use require"iupluagl51" */ -int luaopen_iupluagl51(lua_State* L) -{ - return iupgllua_open(L); -} - ]] } diff --git a/iup/srclua5/il.h b/iup/srclua5/il.h index 5ef6b86..635d089 100755 --- a/iup/srclua5/il.h +++ b/iup/srclua5/il.h @@ -149,6 +149,13 @@ Ihandle *iuplua_checkihandleornil(lua_State *L, int pos); */ void iuplua_removeihandle(lua_State *L, Ihandle *ih); +#if LUA_VERSION_NUM > 501 +#define iuplua_getn(L,i) ((int)lua_rawlen(L, i)) +#else +#define LUA_OK 0 +#define iuplua_getn(L,i) ((int)lua_objlen(L, i)) +#endif + #ifdef __cplusplus } diff --git a/iup/srclua5/il_canvas.c b/iup/srclua5/il_canvas.c index 85c1f14..c8a6025 100755 --- a/iup/srclua5/il_canvas.c +++ b/iup/srclua5/il_canvas.c @@ -29,8 +29,8 @@ static int canvas_leavewindow_cb(Ihandle *self) static int canvas_resize_cb(Ihandle *self, int p0, int p1) { lua_State *L = iuplua_call_start(self, "resize_cb"); - lua_pushnumber(L, p0); - lua_pushnumber(L, p1); + lua_pushinteger(L, p0); + lua_pushinteger(L, p1); return iuplua_call(L, 2); } @@ -38,8 +38,8 @@ static int canvas_wheel_cb(Ihandle *self, float p0, int p1, int p2, char * p3) { lua_State *L = iuplua_call_start(self, "wheel_cb"); lua_pushnumber(L, p0); - lua_pushnumber(L, p1); - lua_pushnumber(L, p2); + lua_pushinteger(L, p1); + lua_pushinteger(L, p2); lua_pushstring(L, p3); return iuplua_call(L, 4); } @@ -59,17 +59,17 @@ static int canvas_enterwindow_cb(Ihandle *self) static int canvas_focus_cb(Ihandle *self, int p0) { lua_State *L = iuplua_call_start(self, "focus_cb"); - lua_pushnumber(L, p0); + lua_pushinteger(L, p0); return iuplua_call(L, 1); } static int canvas_button_cb(Ihandle *self, int p0, int p1, int p2, int p3, char * p4) { lua_State *L = iuplua_call_start(self, "button_cb"); - lua_pushnumber(L, p0); - lua_pushnumber(L, p1); - lua_pushnumber(L, p2); - lua_pushnumber(L, p3); + lua_pushinteger(L, p0); + lua_pushinteger(L, p1); + lua_pushinteger(L, p2); + lua_pushinteger(L, p3); lua_pushstring(L, p4); return iuplua_call(L, 5); } @@ -77,16 +77,16 @@ static int canvas_button_cb(Ihandle *self, int p0, int p1, int p2, int p3, char static int canvas_keypress_cb(Ihandle *self, int p0, int p1) { lua_State *L = iuplua_call_start(self, "keypress_cb"); - lua_pushnumber(L, p0); - lua_pushnumber(L, p1); + lua_pushinteger(L, p0); + lua_pushinteger(L, p1); return iuplua_call(L, 2); } static int canvas_motion_cb(Ihandle *self, int p0, int p1, char * p2) { lua_State *L = iuplua_call_start(self, "motion_cb"); - lua_pushnumber(L, p0); - lua_pushnumber(L, p1); + lua_pushinteger(L, p0); + lua_pushinteger(L, p1); lua_pushstring(L, p2); return iuplua_call(L, 3); } @@ -94,14 +94,14 @@ static int canvas_motion_cb(Ihandle *self, int p0, int p1, char * p2) static int canvas_wom_cb(Ihandle *self, int p0) { lua_State *L = iuplua_call_start(self, "wom_cb"); - lua_pushnumber(L, p0); + lua_pushinteger(L, p0); return iuplua_call(L, 1); } static int canvas_scroll_cb(Ihandle *self, int p0, float p1, float p2) { lua_State *L = iuplua_call_start(self, "scroll_cb"); - lua_pushnumber(L, p0); + lua_pushinteger(L, p0); lua_pushnumber(L, p1); lua_pushnumber(L, p2); return iuplua_call(L, 3); diff --git a/iup/srclua5/il_cells.c b/iup/srclua5/il_cells.c index 15ce5c9..ed0a368 100755 --- a/iup/srclua5/il_cells.c +++ b/iup/srclua5/il_cells.c @@ -16,17 +16,17 @@ static int cells_width_cb(Ihandle *self, int p0) { lua_State *L = iuplua_call_start(self, "width_cb"); - lua_pushnumber(L, p0); + lua_pushinteger(L, p0); return iuplua_call(L, 1); } static int cells_mousemotion_cb(Ihandle *self, int p0, int p1, int p2, int p3, char * p4) { lua_State *L = iuplua_call_start(self, "mousemotion_cb"); - lua_pushnumber(L, p0); - lua_pushnumber(L, p1); - lua_pushnumber(L, p2); - lua_pushnumber(L, p3); + lua_pushinteger(L, p0); + lua_pushinteger(L, p1); + lua_pushinteger(L, p2); + lua_pushinteger(L, p3); lua_pushstring(L, p4); return iuplua_call(L, 5); } @@ -34,12 +34,12 @@ static int cells_mousemotion_cb(Ihandle *self, int p0, int p1, int p2, int p3, c static int cells_mouseclick_cb(Ihandle *self, int p0, int p1, int p2, int p3, int p4, int p5, char * p6) { lua_State *L = iuplua_call_start(self, "mouseclick_cb"); - lua_pushnumber(L, p0); - lua_pushnumber(L, p1); - lua_pushnumber(L, p2); - lua_pushnumber(L, p3); - lua_pushnumber(L, p4); - lua_pushnumber(L, p5); + lua_pushinteger(L, p0); + lua_pushinteger(L, p1); + lua_pushinteger(L, p2); + lua_pushinteger(L, p3); + lua_pushinteger(L, p4); + lua_pushinteger(L, p5); lua_pushstring(L, p6); return iuplua_call(L, 7); } @@ -59,31 +59,31 @@ static int cells_nlines_cb(Ihandle *self) static int cells_scrolling_cb(Ihandle *self, int p0, int p1) { lua_State *L = iuplua_call_start(self, "scrolling_cb"); - lua_pushnumber(L, p0); - lua_pushnumber(L, p1); + lua_pushinteger(L, p0); + lua_pushinteger(L, p1); return iuplua_call(L, 2); } static int cells_height_cb(Ihandle *self, int p0) { lua_State *L = iuplua_call_start(self, "height_cb"); - lua_pushnumber(L, p0); + lua_pushinteger(L, p0); return iuplua_call(L, 1); } static int cells_hspan_cb(Ihandle *self, int p0, int p1) { lua_State *L = iuplua_call_start(self, "hspan_cb"); - lua_pushnumber(L, p0); - lua_pushnumber(L, p1); + lua_pushinteger(L, p0); + lua_pushinteger(L, p1); return iuplua_call(L, 2); } static int cells_vspan_cb(Ihandle *self, int p0, int p1) { lua_State *L = iuplua_call_start(self, "vspan_cb"); - lua_pushnumber(L, p0); - lua_pushnumber(L, p1); + lua_pushinteger(L, p0); + lua_pushinteger(L, p1); return iuplua_call(L, 2); } diff --git a/iup/srclua5/il_colorbar.c b/iup/srclua5/il_colorbar.c index d67608d..714c3a7 100755 --- a/iup/srclua5/il_colorbar.c +++ b/iup/srclua5/il_colorbar.c @@ -16,30 +16,30 @@ static int colorbar_switch_cb(Ihandle *self, int p0, int p1) { lua_State *L = iuplua_call_start(self, "switch_cb"); - lua_pushnumber(L, p0); - lua_pushnumber(L, p1); + lua_pushinteger(L, p0); + lua_pushinteger(L, p1); return iuplua_call(L, 2); } static int colorbar_select_cb(Ihandle *self, int p0, int p1) { lua_State *L = iuplua_call_start(self, "select_cb"); - lua_pushnumber(L, p0); - lua_pushnumber(L, p1); + lua_pushinteger(L, p0); + lua_pushinteger(L, p1); return iuplua_call(L, 2); } static char * colorbar_cell_cb(Ihandle *self, int p0) { lua_State *L = iuplua_call_start(self, "cell_cb"); - lua_pushnumber(L, p0); + lua_pushinteger(L, p0); return iuplua_call_rs(L, 1); } static int colorbar_extended_cb(Ihandle *self, int p0) { lua_State *L = iuplua_call_start(self, "extended_cb"); - lua_pushnumber(L, p0); + lua_pushinteger(L, p0); return iuplua_call(L, 1); } diff --git a/iup/srclua5/il_colorbrowser.c b/iup/srclua5/il_colorbrowser.c index 601fac9..1a9243d 100755 --- a/iup/srclua5/il_colorbrowser.c +++ b/iup/srclua5/il_colorbrowser.c @@ -16,18 +16,18 @@ static int colorbrowser_drag_cb(Ihandle *self, unsigned char p0, unsigned char p1, unsigned char p2) { lua_State *L = iuplua_call_start(self, "drag_cb"); - lua_pushnumber(L, p0); - lua_pushnumber(L, p1); - lua_pushnumber(L, p2); + lua_pushinteger(L, p0); + lua_pushinteger(L, p1); + lua_pushinteger(L, p2); return iuplua_call(L, 3); } static int colorbrowser_change_cb(Ihandle *self, unsigned char p0, unsigned char p1, unsigned char p2) { lua_State *L = iuplua_call_start(self, "change_cb"); - lua_pushnumber(L, p0); - lua_pushnumber(L, p1); - lua_pushnumber(L, p2); + lua_pushinteger(L, p0); + lua_pushinteger(L, p1); + lua_pushinteger(L, p2); return iuplua_call(L, 3); } diff --git a/iup/srclua5/il_dialog.c b/iup/srclua5/il_dialog.c index d3e8c29..09166f3 100755 --- a/iup/srclua5/il_dialog.c +++ b/iup/srclua5/il_dialog.c @@ -12,17 +12,29 @@ #include "il.h" -static int dialog_map_cb(Ihandle *self) +static int dialog_unmap_cb(Ihandle *self) { - lua_State *L = iuplua_call_start(self, "map_cb"); + lua_State *L = iuplua_call_start(self, "unmap_cb"); + return iuplua_call(L, 0); +} + +static int dialog_destroy_cb(Ihandle *self) +{ + lua_State *L = iuplua_call_start(self, "destroy_cb"); + return iuplua_call(L, 0); +} + +static int dialog_close_cb(Ihandle *self) +{ + lua_State *L = iuplua_call_start(self, "close_cb"); return iuplua_call(L, 0); } static int dialog_move_cb(Ihandle *self, int p0, int p1) { lua_State *L = iuplua_call_start(self, "move_cb"); - lua_pushnumber(L, p0); - lua_pushnumber(L, p1); + lua_pushinteger(L, p0); + lua_pushinteger(L, p1); return iuplua_call(L, 2); } @@ -30,43 +42,39 @@ static int dialog_dropfiles_cb(Ihandle *self, char * p0, int p1, int p2, int p3) { lua_State *L = iuplua_call_start(self, "dropfiles_cb"); lua_pushstring(L, p0); - lua_pushnumber(L, p1); - lua_pushnumber(L, p2); - lua_pushnumber(L, p3); + lua_pushinteger(L, p1); + lua_pushinteger(L, p2); + lua_pushinteger(L, p3); return iuplua_call(L, 4); } -static int dialog_unmap_cb(Ihandle *self) -{ - lua_State *L = iuplua_call_start(self, "unmap_cb"); - return iuplua_call(L, 0); -} - static int dialog_show_cb(Ihandle *self, int p0) { lua_State *L = iuplua_call_start(self, "show_cb"); - lua_pushnumber(L, p0); + lua_pushinteger(L, p0); return iuplua_call(L, 1); } -static int dialog_trayclick_cb(Ihandle *self, int p0, int p1, int p2) +static int dialog_copydata_cb(Ihandle *self, char * p0, int p1) { - lua_State *L = iuplua_call_start(self, "trayclick_cb"); - lua_pushnumber(L, p0); - lua_pushnumber(L, p1); - lua_pushnumber(L, p2); - return iuplua_call(L, 3); + lua_State *L = iuplua_call_start(self, "copydata_cb"); + lua_pushstring(L, p0); + lua_pushinteger(L, p1); + return iuplua_call(L, 2); } -static int dialog_destroy_cb(Ihandle *self) +static int dialog_trayclick_cb(Ihandle *self, int p0, int p1, int p2) { - lua_State *L = iuplua_call_start(self, "destroy_cb"); - return iuplua_call(L, 0); + lua_State *L = iuplua_call_start(self, "trayclick_cb"); + lua_pushinteger(L, p0); + lua_pushinteger(L, p1); + lua_pushinteger(L, p2); + return iuplua_call(L, 3); } -static int dialog_close_cb(Ihandle *self) +static int dialog_map_cb(Ihandle *self) { - lua_State *L = iuplua_call_start(self, "close_cb"); + lua_State *L = iuplua_call_start(self, "map_cb"); return iuplua_call(L, 0); } @@ -82,14 +90,15 @@ int iupdialoglua_open(lua_State * L) { iuplua_register(L, Dialog, "Dialog"); - iuplua_register_cb(L, "MAP_CB", (lua_CFunction)dialog_map_cb, NULL); + iuplua_register_cb(L, "UNMAP_CB", (lua_CFunction)dialog_unmap_cb, NULL); + iuplua_register_cb(L, "DESTROY_CB", (lua_CFunction)dialog_destroy_cb, NULL); + iuplua_register_cb(L, "CLOSE_CB", (lua_CFunction)dialog_close_cb, NULL); iuplua_register_cb(L, "MOVE_CB", (lua_CFunction)dialog_move_cb, NULL); iuplua_register_cb(L, "DROPFILES_CB", (lua_CFunction)dialog_dropfiles_cb, NULL); - iuplua_register_cb(L, "UNMAP_CB", (lua_CFunction)dialog_unmap_cb, NULL); iuplua_register_cb(L, "SHOW_CB", (lua_CFunction)dialog_show_cb, NULL); + iuplua_register_cb(L, "COPYDATA_CB", (lua_CFunction)dialog_copydata_cb, NULL); iuplua_register_cb(L, "TRAYCLICK_CB", (lua_CFunction)dialog_trayclick_cb, NULL); - iuplua_register_cb(L, "DESTROY_CB", (lua_CFunction)dialog_destroy_cb, NULL); - iuplua_register_cb(L, "CLOSE_CB", (lua_CFunction)dialog_close_cb, NULL); + iuplua_register_cb(L, "MAP_CB", (lua_CFunction)dialog_map_cb, NULL); #include "clua/dialog.clua" return 0; diff --git a/iup/srclua5/il_getcolor.c b/iup/srclua5/il_getcolor.c index 4d6cf71..e62e977 100755 --- a/iup/srclua5/il_getcolor.c +++ b/iup/srclua5/il_getcolor.c @@ -18,17 +18,17 @@ static int GetColor(lua_State *L) { - int x = (int)luaL_checknumber(L,1); - int y = (int)luaL_checknumber(L,2); + int x = luaL_checkinteger(L,1); + int y = luaL_checkinteger(L,2); unsigned char r = (unsigned char) luaL_optnumber(L,3,0); unsigned char g = (unsigned char) luaL_optnumber(L,4,0); unsigned char b = (unsigned char) luaL_optnumber(L,5,0); int ret = IupGetColor(x,y,&r,&g,&b); if (ret) { - lua_pushnumber(L, (int) r); - lua_pushnumber(L, (int) g); - lua_pushnumber(L, (int) b); + lua_pushinteger(L, r); + lua_pushinteger(L, g); + lua_pushinteger(L, b); return 3; } else diff --git a/iup/srclua5/il_getparam.c b/iup/srclua5/il_getparam.c index 72c4303..0e05b9a 100755 --- a/iup/srclua5/il_getparam.c +++ b/iup/srclua5/il_getparam.c @@ -38,10 +38,10 @@ static int param_action(Ihandle* dialog, int param_index, void* user_data) lua_State *L = gp->L; lua_getref(L, gp->func_ref); iuplua_pushihandle(L, dialog); - lua_pushnumber(L, param_index); + lua_pushinteger(L, param_index); if (iuplua_call_raw(L, 2, 1) != 0) /* 2 args, 1 return */ { - ret = (int)lua_tonumber(L,-1); + ret = lua_tointeger(L,-1); lua_pop(L, 1); } } @@ -84,10 +84,18 @@ static int GetParam(lua_State *L) switch(t) { case 'b': +/* TO DO: add this code some day: + if (lua_isboolean(L, lua_param_start)) + { + param_data[i] = malloc(sizeof(int)); + *(int*)(param_data[i]) = lua_toboolean(L, lua_param_start); lua_param_start++; + break; + } */ + /* else continuous and get an integer */ case 'i': case 'l': param_data[i] = malloc(sizeof(int)); - *(int*)(param_data[i]) = (int)luaL_checknumber(L, lua_param_start); lua_param_start++; + *(int*)(param_data[i]) = luaL_checkinteger(L, lua_param_start); lua_param_start++; break; case 'a': case 'r': @@ -132,7 +140,7 @@ static int GetParam(lua_State *L) case 'b': case 'i': case 'l': - lua_pushnumber(L, *(int*)(param_data[i])); + lua_pushinteger(L, *(int*)(param_data[i])); break; case 'a': case 'r': @@ -165,7 +173,7 @@ static int GetParam(lua_State *L) static int GetParamParam(lua_State *L) { Ihandle *dialog = iuplua_checkihandle(L, 1); - int param_index = (int)luaL_checknumber(L, 2); + int param_index = luaL_checkinteger(L, 2); Ihandle* param; char param_str[50]; sprintf(param_str, "PARAM%d", param_index); diff --git a/iup/srclua5/il_glcanvas.c b/iup/srclua5/il_glcanvas.c index 27f7277..933f06f 100755 --- a/iup/srclua5/il_glcanvas.c +++ b/iup/srclua5/il_glcanvas.c @@ -16,8 +16,8 @@ static int glcanvas_action(Ihandle *self, int p0, int p1) { lua_State *L = iuplua_call_start(self, "action"); - lua_pushnumber(L, p0); - lua_pushnumber(L, p1); + lua_pushinteger(L, p0); + lua_pushinteger(L, p1); return iuplua_call(L, 2); } @@ -60,9 +60,3 @@ int luaopen_iupluagl(lua_State* L) return iupgllua_open(L); } -/* obligatory to use require"iupluagl51" */ -int luaopen_iupluagl51(lua_State* L) -{ - return iupgllua_open(L); -} - diff --git a/iup/srclua5/il_image.c b/iup/srclua5/il_image.c index 4be480d..382f17a 100755 --- a/iup/srclua5/il_image.c +++ b/iup/srclua5/il_image.c @@ -25,26 +25,26 @@ static int Image (lua_State * L) int i, j; /* get the number of lines */ - h = luaL_getn(L, 1); + h = iuplua_getn(L, 1); /* get the number of columns of the first line */ - lua_pushnumber(L, 1); + lua_pushinteger(L, 1); lua_gettable(L, 1); - w = luaL_getn(L, -1); + w = iuplua_getn(L, -1); lua_pop(L, 1); pixels = (unsigned char *) malloc (h*w); for (i=1; i<=h; i++) { - lua_pushnumber(L, i); + lua_pushinteger(L, i); lua_gettable(L, 1); for (j=1; j<=w; j++) { int idx = (i-1)*w+(j-1); - lua_pushnumber(L, j); + lua_pushinteger(L, j); lua_gettable(L, -2); - pixels[idx] = (unsigned char)lua_tonumber(L, -1); + pixels[idx] = (unsigned char)lua_tointeger(L, -1); lua_pop(L, 1); } lua_pop(L, 1); @@ -53,7 +53,7 @@ static int Image (lua_State * L) ih = IupImage(w,h,pixels); free(pixels); - num_colors = luaL_getn(L, 2); + num_colors = iuplua_getn(L, 2); num_colors = num_colors>255? 255: num_colors; for(c=1; c<=num_colors; c++) { @@ -71,7 +71,7 @@ static int Image (lua_State * L) ih = IupImage(w, h, pixels); free(pixels); - num_colors = luaL_getn(L, 4); + num_colors = iuplua_getn(L, 4); num_colors = num_colors>256? 256: num_colors; for(c=1; c<=num_colors; c++) { diff --git a/iup/srclua5/il_list.c b/iup/srclua5/il_list.c index cec844b..b212d87 100755 --- a/iup/srclua5/il_list.c +++ b/iup/srclua5/il_list.c @@ -15,7 +15,7 @@ static int list_dropdown_cb(Ihandle *self, int p0) { lua_State *L = iuplua_call_start(self, "dropdown_cb"); - lua_pushnumber(L, p0); + lua_pushinteger(L, p0); return iuplua_call(L, 1); } @@ -23,15 +23,15 @@ static int list_action(Ihandle *self, char * p0, int p1, int p2) { lua_State *L = iuplua_call_start(self, "action"); lua_pushstring(L, p0); - lua_pushnumber(L, p1); - lua_pushnumber(L, p2); + lua_pushinteger(L, p1); + lua_pushinteger(L, p2); return iuplua_call(L, 3); } static int list_dblclick_cb(Ihandle *self, int p0, char * p1) { lua_State *L = iuplua_call_start(self, "dblclick_cb"); - lua_pushnumber(L, p0); + lua_pushinteger(L, p0); lua_pushstring(L, p1); return iuplua_call(L, 2); } @@ -39,7 +39,7 @@ static int list_dblclick_cb(Ihandle *self, int p0, char * p1) static int list_edit_cb(Ihandle *self, int p0, char * p1) { lua_State *L = iuplua_call_start(self, "edit_cb"); - lua_pushnumber(L, p0); + lua_pushinteger(L, p0); lua_pushstring(L, p1); return iuplua_call(L, 2); } diff --git a/iup/srclua5/il_matrix.c b/iup/srclua5/il_matrix.c index a0cb6fc..89895bd 100755 --- a/iup/srclua5/il_matrix.c +++ b/iup/srclua5/il_matrix.c @@ -16,76 +16,76 @@ static char * matrix_font_cb(Ihandle *self, int p0, int p1) { lua_State *L = iuplua_call_start(self, "font_cb"); - lua_pushnumber(L, p0); - lua_pushnumber(L, p1); + lua_pushinteger(L, p0); + lua_pushinteger(L, p1); return iuplua_call_rs(L, 2); } static int matrix_draw_cb(Ihandle *self, int p0, int p1, int p2, int p3, int p4, int p5, int p6) { lua_State *L = iuplua_call_start(self, "draw_cb"); - lua_pushnumber(L, p0); - lua_pushnumber(L, p1); - lua_pushnumber(L, p2); - lua_pushnumber(L, p3); - lua_pushnumber(L, p4); - lua_pushnumber(L, p5); - lua_pushnumber(L, p6); + lua_pushinteger(L, p0); + lua_pushinteger(L, p1); + lua_pushinteger(L, p2); + lua_pushinteger(L, p3); + lua_pushinteger(L, p4); + lua_pushinteger(L, p5); + lua_pushinteger(L, p6); return iuplua_call(L, 7); } static int matrix_edition_cb(Ihandle *self, int p0, int p1, int p2, int p3) { lua_State *L = iuplua_call_start(self, "edition_cb"); - lua_pushnumber(L, p0); - lua_pushnumber(L, p1); - lua_pushnumber(L, p2); - lua_pushnumber(L, p3); + lua_pushinteger(L, p0); + lua_pushinteger(L, p1); + lua_pushinteger(L, p2); + lua_pushinteger(L, p3); return iuplua_call(L, 4); } static int matrix_mark_cb(Ihandle *self, int p0, int p1) { lua_State *L = iuplua_call_start(self, "mark_cb"); - lua_pushnumber(L, p0); - lua_pushnumber(L, p1); + lua_pushinteger(L, p0); + lua_pushinteger(L, p1); return iuplua_call(L, 2); } static int matrix_markedit_cb(Ihandle *self, int p0, int p1, int p2) { lua_State *L = iuplua_call_start(self, "markedit_cb"); - lua_pushnumber(L, p0); - lua_pushnumber(L, p1); - lua_pushnumber(L, p2); + lua_pushinteger(L, p0); + lua_pushinteger(L, p1); + lua_pushinteger(L, p2); return iuplua_call(L, 3); } static int matrix_bgcolor_cb(Ihandle *self, int p0, int p1) { lua_State *L = iuplua_call_start(self, "bgcolor_cb"); - lua_pushnumber(L, p0); - lua_pushnumber(L, p1); + lua_pushinteger(L, p0); + lua_pushinteger(L, p1); return iuplua_call(L, 2); } static char * matrix_value_cb(Ihandle *self, int p0, int p1) { lua_State *L = iuplua_call_start(self, "value_cb"); - lua_pushnumber(L, p0); - lua_pushnumber(L, p1); + lua_pushinteger(L, p0); + lua_pushinteger(L, p1); return iuplua_call_rs(L, 2); } static int matrix_dropselect_cb(Ihandle *self, int p0, int p1, Ihandle * p2, char * p3, int p4, int p5) { lua_State *L = iuplua_call_start(self, "dropselect_cb"); - lua_pushnumber(L, p0); - lua_pushnumber(L, p1); + lua_pushinteger(L, p0); + lua_pushinteger(L, p1); iuplua_pushihandle(L, p2); lua_pushstring(L, p3); - lua_pushnumber(L, p4); - lua_pushnumber(L, p5); + lua_pushinteger(L, p4); + lua_pushinteger(L, p5); return iuplua_call(L, 6); } @@ -93,26 +93,26 @@ static int matrix_drop_cb(Ihandle *self, Ihandle * p0, int p1, int p2) { lua_State *L = iuplua_call_start(self, "drop_cb"); iuplua_pushihandle(L, p0); - lua_pushnumber(L, p1); - lua_pushnumber(L, p2); + lua_pushinteger(L, p1); + lua_pushinteger(L, p2); return iuplua_call(L, 3); } static int matrix_dropcheck_cb(Ihandle *self, int p0, int p1) { lua_State *L = iuplua_call_start(self, "dropcheck_cb"); - lua_pushnumber(L, p0); - lua_pushnumber(L, p1); + lua_pushinteger(L, p0); + lua_pushinteger(L, p1); return iuplua_call(L, 2); } static int matrix_action_cb(Ihandle *self, int p0, int p1, int p2, int p3, char * p4) { lua_State *L = iuplua_call_start(self, "action_cb"); - lua_pushnumber(L, p0); - lua_pushnumber(L, p1); - lua_pushnumber(L, p2); - lua_pushnumber(L, p3); + lua_pushinteger(L, p0); + lua_pushinteger(L, p1); + lua_pushinteger(L, p2); + lua_pushinteger(L, p3); lua_pushstring(L, p4); return iuplua_call(L, 5); } @@ -120,40 +120,40 @@ static int matrix_action_cb(Ihandle *self, int p0, int p1, int p2, int p3, char static int matrix_enteritem_cb(Ihandle *self, int p0, int p1) { lua_State *L = iuplua_call_start(self, "enteritem_cb"); - lua_pushnumber(L, p0); - lua_pushnumber(L, p1); + lua_pushinteger(L, p0); + lua_pushinteger(L, p1); return iuplua_call(L, 2); } static int matrix_leaveitem_cb(Ihandle *self, int p0, int p1) { lua_State *L = iuplua_call_start(self, "leaveitem_cb"); - lua_pushnumber(L, p0); - lua_pushnumber(L, p1); + lua_pushinteger(L, p0); + lua_pushinteger(L, p1); return iuplua_call(L, 2); } static int matrix_scrolltop_cb(Ihandle *self, int p0, int p1) { lua_State *L = iuplua_call_start(self, "scrolltop_cb"); - lua_pushnumber(L, p0); - lua_pushnumber(L, p1); + lua_pushinteger(L, p0); + lua_pushinteger(L, p1); return iuplua_call(L, 2); } static int matrix_fgcolor_cb(Ihandle *self, int p0, int p1) { lua_State *L = iuplua_call_start(self, "fgcolor_cb"); - lua_pushnumber(L, p0); - lua_pushnumber(L, p1); + lua_pushinteger(L, p0); + lua_pushinteger(L, p1); return iuplua_call(L, 2); } static int matrix_release_cb(Ihandle *self, int p0, int p1, char * p2) { lua_State *L = iuplua_call_start(self, "release_cb"); - lua_pushnumber(L, p0); - lua_pushnumber(L, p1); + lua_pushinteger(L, p0); + lua_pushinteger(L, p1); lua_pushstring(L, p2); return iuplua_call(L, 3); } @@ -161,16 +161,16 @@ static int matrix_release_cb(Ihandle *self, int p0, int p1, char * p2) static int matrix_mousemove_cb(Ihandle *self, int p0, int p1) { lua_State *L = iuplua_call_start(self, "mousemove_cb"); - lua_pushnumber(L, p0); - lua_pushnumber(L, p1); + lua_pushinteger(L, p0); + lua_pushinteger(L, p1); return iuplua_call(L, 2); } static int matrix_value_edit_cb(Ihandle *self, int p0, int p1, char * p2) { lua_State *L = iuplua_call_start(self, "value_edit_cb"); - lua_pushnumber(L, p0); - lua_pushnumber(L, p1); + lua_pushinteger(L, p0); + lua_pushinteger(L, p1); lua_pushstring(L, p2); return iuplua_call(L, 3); } @@ -178,8 +178,8 @@ static int matrix_value_edit_cb(Ihandle *self, int p0, int p1, char * p2) static int matrix_click_cb(Ihandle *self, int p0, int p1, char * p2) { lua_State *L = iuplua_call_start(self, "click_cb"); - lua_pushnumber(L, p0); - lua_pushnumber(L, p1); + lua_pushinteger(L, p0); + lua_pushinteger(L, p1); lua_pushstring(L, p2); return iuplua_call(L, 3); } diff --git a/iup/srclua5/il_matrix_aux.c b/iup/srclua5/il_matrix_aux.c index 240c837..f9f83a7 100755 --- a/iup/srclua5/il_matrix_aux.c +++ b/iup/srclua5/il_matrix_aux.c @@ -38,7 +38,7 @@ static int matrix_bgcolor_cb(Ihandle *self, int p0, int p1, unsigned int *p2, un ret = iuplua_call_raw(L, 2+2, LUA_MULTRET); /* 2 args + 2 args(errormsg, handle), variable number of returns */ if (ret || lua_isnil(L, -1)) return IUP_DEFAULT; - ret = (int)lua_tonumber(L,-1); + ret = lua_tointeger(L,-1); if (ret == IUP_IGNORE) { @@ -46,9 +46,9 @@ static int matrix_bgcolor_cb(Ihandle *self, int p0, int p1, unsigned int *p2, un return IUP_IGNORE; } - *p2 = (unsigned int)lua_tonumber(L, -4); - *p3 = (unsigned int)lua_tonumber(L, -3); - *p4 = (unsigned int)lua_tonumber(L, -2); + *p2 = (unsigned int)lua_tointeger(L, -4); + *p3 = (unsigned int)lua_tointeger(L, -3); + *p4 = (unsigned int)lua_tointeger(L, -2); lua_pop(L, 1); return IUP_DEFAULT; } @@ -62,7 +62,7 @@ static int matrix_fgcolor_cb(Ihandle *self, int p0, int p1, unsigned int *p2, un ret = iuplua_call_raw(L, 2+2, LUA_MULTRET); /* 2 args + 2 args(errormsg, handle), variable number of returns */ if (ret || lua_isnil(L, -1)) return IUP_DEFAULT; - ret = (int)lua_tonumber(L,-1); + ret = lua_tointeger(L,-1); if (ret == IUP_IGNORE) { @@ -70,9 +70,9 @@ static int matrix_fgcolor_cb(Ihandle *self, int p0, int p1, unsigned int *p2, un return IUP_IGNORE; } - *p2 = (unsigned int)lua_tonumber(L, -4); - *p3 = (unsigned int)lua_tonumber(L, -3); - *p4 = (unsigned int)lua_tonumber(L, -2); + *p2 = (unsigned int)lua_tointeger(L, -4); + *p3 = (unsigned int)lua_tointeger(L, -3); + *p4 = (unsigned int)lua_tointeger(L, -2); lua_pop(L, 1); return IUP_DEFAULT; } diff --git a/iup/srclua5/il_multiline.c b/iup/srclua5/il_multiline.c index a87f294..05f88d3 100755 --- a/iup/srclua5/il_multiline.c +++ b/iup/srclua5/il_multiline.c @@ -15,7 +15,7 @@ static int multiline_action(Ihandle *self, int p0, char * p1) { lua_State *L = iuplua_call_start(self, "action"); - lua_pushnumber(L, p0); + lua_pushinteger(L, p0); lua_pushstring(L, p1); return iuplua_call(L, 2); } diff --git a/iup/srclua5/il_olecontrol.c b/iup/srclua5/il_olecontrol.c index 0878e96..0e3c6d4 100755 --- a/iup/srclua5/il_olecontrol.c +++ b/iup/srclua5/il_olecontrol.c @@ -47,9 +47,3 @@ int luaopen_iupluaole(lua_State* L) return iupolelua_open(L); } -/* obligatory to use require"iupluaole51" */ -int luaopen_iupluaole51(lua_State* L) -{ - return iupolelua_open(L); -} - diff --git a/iup/srclua5/il_pplot.c b/iup/srclua5/il_pplot.c index 67e4b07..6fee50f 100755 --- a/iup/srclua5/il_pplot.c +++ b/iup/srclua5/il_pplot.c @@ -16,8 +16,8 @@ static int pplot_edit_cb(Ihandle *self, int p0, int p1, float p2, float p3, float p4, float p5) { lua_State *L = iuplua_call_start(self, "edit_cb"); - lua_pushnumber(L, p0); - lua_pushnumber(L, p1); + lua_pushinteger(L, p0); + lua_pushinteger(L, p1); lua_pushnumber(L, p2); lua_pushnumber(L, p3); lua_pushnumber(L, p4); @@ -40,15 +40,15 @@ static int pplot_selectbegin_cb(Ihandle *self) static int pplot_postdraw_cb(Ihandle *self, int p0) { lua_State *L = iuplua_call_start(self, "postdraw_cb"); - lua_pushnumber(L, p0); + lua_pushinteger(L, p0); return iuplua_call(L, 1); } static int pplot_delete_cb(Ihandle *self, int p0, int p1, float p2, float p3) { lua_State *L = iuplua_call_start(self, "delete_cb"); - lua_pushnumber(L, p0); - lua_pushnumber(L, p1); + lua_pushinteger(L, p0); + lua_pushinteger(L, p1); lua_pushnumber(L, p2); lua_pushnumber(L, p3); return iuplua_call(L, 4); @@ -57,7 +57,7 @@ static int pplot_delete_cb(Ihandle *self, int p0, int p1, float p2, float p3) static int pplot_predraw_cb(Ihandle *self, int p0) { lua_State *L = iuplua_call_start(self, "predraw_cb"); - lua_pushnumber(L, p0); + lua_pushinteger(L, p0); return iuplua_call(L, 1); } @@ -70,11 +70,11 @@ static int pplot_selectend_cb(Ihandle *self) static int pplot_select_cb(Ihandle *self, int p0, int p1, float p2, float p3, int p4) { lua_State *L = iuplua_call_start(self, "select_cb"); - lua_pushnumber(L, p0); - lua_pushnumber(L, p1); + lua_pushinteger(L, p0); + lua_pushinteger(L, p1); lua_pushnumber(L, p2); lua_pushnumber(L, p3); - lua_pushnumber(L, p4); + lua_pushinteger(L, p4); return iuplua_call(L, 5); } diff --git a/iup/srclua5/il_scanf.c b/iup/srclua5/il_scanf.c index 6f035a7..477ac9d 100755 --- a/iup/srclua5/il_scanf.c +++ b/iup/srclua5/il_scanf.c @@ -113,17 +113,17 @@ int iupluaScanf(lua_State *L) if (s[-3] == 'l') { long l = 0; sscanf(text[i], "%ld", &l); - lua_pushnumber(L, l); + lua_pushinteger(L, l); total++; } else if (s[-3] == 'h') { short l = 0; sscanf(text[i], "%hd", &l); - lua_pushnumber(L, l); + lua_pushinteger(L, l); total++; } else { int l = 0; sscanf(text[i], "%d", &l); - lua_pushnumber(L, l); + lua_pushinteger(L, l); total++; } break; @@ -134,17 +134,17 @@ int iupluaScanf(lua_State *L) if (s[-3] == 'l') { long l = 0; sscanf(text[i], "%li", &l); - lua_pushnumber(L, l); + lua_pushinteger(L, l); total++; } else if (s[-3] == 'h') { short l = 0; sscanf(text[i], "%hi", &l); - lua_pushnumber(L, l); + lua_pushinteger(L, l); total++; } else { int l = 0; sscanf(text[i], "%i", &l); - lua_pushnumber(L, l); + lua_pushinteger(L, l); total++; } break; diff --git a/iup/srclua5/il_spin.c b/iup/srclua5/il_spin.c index 23e2603..8fde78b 100755 --- a/iup/srclua5/il_spin.c +++ b/iup/srclua5/il_spin.c @@ -15,7 +15,7 @@ static int spin_spin_cb(Ihandle *self, int p0) { lua_State *L = iuplua_call_start(self, "spin_cb"); - lua_pushnumber(L, p0); + lua_pushinteger(L, p0); return iuplua_call(L, 1); } diff --git a/iup/srclua5/il_spinbox.c b/iup/srclua5/il_spinbox.c index 2f044fb..9a53574 100755 --- a/iup/srclua5/il_spinbox.c +++ b/iup/srclua5/il_spinbox.c @@ -15,7 +15,7 @@ static int spinbox_spin_cb(Ihandle *self, int p0) { lua_State *L = iuplua_call_start(self, "spin_cb"); - lua_pushnumber(L, p0); + lua_pushinteger(L, p0); return iuplua_call(L, 1); } diff --git a/iup/srclua5/il_text.c b/iup/srclua5/il_text.c index f654d2c..c82f933 100755 --- a/iup/srclua5/il_text.c +++ b/iup/srclua5/il_text.c @@ -15,16 +15,16 @@ static int text_caret_cb(Ihandle *self, int p0, int p1, int p2) { lua_State *L = iuplua_call_start(self, "caret_cb"); - lua_pushnumber(L, p0); - lua_pushnumber(L, p1); - lua_pushnumber(L, p2); + lua_pushinteger(L, p0); + lua_pushinteger(L, p1); + lua_pushinteger(L, p2); return iuplua_call(L, 3); } static int text_action(Ihandle *self, int p0, char * p1) { lua_State *L = iuplua_call_start(self, "action"); - lua_pushnumber(L, p0); + lua_pushinteger(L, p0); lua_pushstring(L, p1); return iuplua_call(L, 2); } diff --git a/iup/srclua5/il_toggle.c b/iup/srclua5/il_toggle.c index 45e3d93..e934f30 100755 --- a/iup/srclua5/il_toggle.c +++ b/iup/srclua5/il_toggle.c @@ -15,7 +15,7 @@ static int toggle_action(Ihandle *self, int p0) { lua_State *L = iuplua_call_start(self, "action"); - lua_pushnumber(L, p0); + lua_pushinteger(L, p0); return iuplua_call(L, 1); } diff --git a/iup/srclua5/il_tree.c b/iup/srclua5/il_tree.c index 4ddc1a4..9828397 100755 --- a/iup/srclua5/il_tree.c +++ b/iup/srclua5/il_tree.c @@ -15,32 +15,32 @@ static int tree_branchopen_cb(Ihandle *self, int p0) { lua_State *L = iuplua_call_start(self, "branchopen_cb"); - lua_pushnumber(L, p0); + lua_pushinteger(L, p0); return iuplua_call(L, 1); } static int tree_selection_cb(Ihandle *self, int p0, int p1) { lua_State *L = iuplua_call_start(self, "selection_cb"); - lua_pushnumber(L, p0); - lua_pushnumber(L, p1); + lua_pushinteger(L, p0); + lua_pushinteger(L, p1); return iuplua_call(L, 2); } static int tree_dragdrop_cb(Ihandle *self, int p0, int p1, int p2, int p3) { lua_State *L = iuplua_call_start(self, "dragdrop_cb"); - lua_pushnumber(L, p0); - lua_pushnumber(L, p1); - lua_pushnumber(L, p2); - lua_pushnumber(L, p3); + lua_pushinteger(L, p0); + lua_pushinteger(L, p1); + lua_pushinteger(L, p2); + lua_pushinteger(L, p3); return iuplua_call(L, 4); } static int tree_rename_cb(Ihandle *self, int p0, char * p1) { lua_State *L = iuplua_call_start(self, "rename_cb"); - lua_pushnumber(L, p0); + lua_pushinteger(L, p0); lua_pushstring(L, p1); return iuplua_call(L, 2); } @@ -48,44 +48,44 @@ static int tree_rename_cb(Ihandle *self, int p0, char * p1) static int tree_multiunselection_cb(Ihandle *self, int p0, int p1) { lua_State *L = iuplua_call_start(self, "multiunselection_cb"); - lua_pushnumber(L, p0); - lua_pushnumber(L, p1); + lua_pushinteger(L, p0); + lua_pushinteger(L, p1); return iuplua_call(L, 2); } static int tree_rightclick_cb(Ihandle *self, int p0) { lua_State *L = iuplua_call_start(self, "rightclick_cb"); - lua_pushnumber(L, p0); + lua_pushinteger(L, p0); return iuplua_call(L, 1); } static int tree_multiselection_cb(Ihandle *self, int p0, int p1) { lua_State *L = iuplua_call_start(self, "multiselection_cb"); - lua_pushnumber(L, p0); - lua_pushnumber(L, p1); + lua_pushinteger(L, p0); + lua_pushinteger(L, p1); return iuplua_call(L, 2); } static int tree_branchclose_cb(Ihandle *self, int p0) { lua_State *L = iuplua_call_start(self, "branchclose_cb"); - lua_pushnumber(L, p0); + lua_pushinteger(L, p0); return iuplua_call(L, 1); } static int tree_executeleaf_cb(Ihandle *self, int p0) { lua_State *L = iuplua_call_start(self, "executeleaf_cb"); - lua_pushnumber(L, p0); + lua_pushinteger(L, p0); return iuplua_call(L, 1); } static int tree_showrename_cb(Ihandle *self, int p0) { lua_State *L = iuplua_call_start(self, "showrename_cb"); - lua_pushnumber(L, p0); + lua_pushinteger(L, p0); return iuplua_call(L, 1); } diff --git a/iup/srclua5/il_tree_aux.c b/iup/srclua5/il_tree_aux.c index 6ebaa09..439d897 100755 --- a/iup/srclua5/il_tree_aux.c +++ b/iup/srclua5/il_tree_aux.c @@ -19,33 +19,33 @@ Given an ID, to retreive a Lua object is quite simple. But given a user_id to obtain the ID is more complicated. - The IUPTREEREFTABLE is used to do this mapping. + The iup.TREEREFTABLE is used to do this mapping. We use the object as the index to this table. */ -/* iup.IUPTREEREFTABLE[object at pos] = ref */ +/* iup.TREEREFTABLE[object at pos] = ref */ static void tree_settableref(lua_State *L, int pos, int ref) { lua_getglobal(L, "iup"); - lua_pushstring(L, "IUPTREEREFTABLE"); + lua_pushstring(L, "TREEREFTABLE"); lua_gettable(L, -2); - lua_remove(L, -2); + lua_remove(L, -2); /* remove "iup" from stack */ lua_pushvalue(L, pos); if(ref == LUA_NOREF) lua_pushnil(L); else - lua_pushnumber(L, ref); + lua_pushinteger(L, ref); lua_settable(L, -3); lua_pop(L, 1); } -/* ref = iup.IUPTREEREFTABLE[object at pos] */ +/* ref = iup.TREEREFTABLE[object at pos] */ static int tree_gettableref(lua_State *L, int pos) { lua_getglobal(L, "iup"); - lua_pushstring(L, "IUPTREEREFTABLE"); + lua_pushstring(L, "TREEREFTABLE"); lua_gettable(L, -2); - lua_remove(L, -2); + lua_remove(L, -2); /* remove "iup" from stack */ lua_pushvalue(L, pos); lua_gettable(L, -2); if (lua_isnil(L, -1)) @@ -55,7 +55,7 @@ static int tree_gettableref(lua_State *L, int pos) } else { - int ref = (int) lua_tonumber(L, -1); + int ref = lua_tointeger(L, -1); lua_pop(L, 1); return ref; } @@ -91,7 +91,7 @@ static int TreeGetId(lua_State *L) if (id == -1) lua_pushnil(L); else - lua_pushnumber(L, id); + lua_pushinteger(L, id); } return 1; } @@ -99,7 +99,7 @@ static int TreeGetId(lua_State *L) static int TreeGetUserId(lua_State *L) { Ihandle *ih = iuplua_checkihandle(L,1); - int id = (int)luaL_checknumber(L,2); + int id = luaL_checkinteger(L,2); tree_push_userid(L, IupTreeGetUserId(ih, id)); return 1; } @@ -107,7 +107,7 @@ static int TreeGetUserId(lua_State *L) static int TreeSetUserId(lua_State *L) { Ihandle *ih = iuplua_checkihandle(L,1); - int id = (int)luaL_checknumber(L,2); + int id = luaL_checkinteger(L,2); int ref = (int)IupTreeGetUserId(ih, id); if (ref != 0) /* userid is not NULL */ { @@ -130,7 +130,7 @@ static int TreeSetUserId(lua_State *L) tree_settableref(L, 3, ref); if (ref >= 0) ref++; /* only positive references are shifted */ - IupTreeSetUserId(ih, id, (char*)ref); + IupTreeSetUserId(ih, id, (void*)ref); } return 0; @@ -143,11 +143,11 @@ static int tree_multiselection_cb(Ihandle *ih, int* ids, int p1) lua_newtable(L); for (i = 0; i < p1; i++) { - lua_pushnumber(L,i+1); - lua_pushnumber(L,ids[i]); + lua_pushinteger(L,i+1); + lua_pushinteger(L,ids[i]); lua_settable(L,-3); } - lua_pushnumber(L, p1); + lua_pushinteger(L, p1); return iuplua_call(L, 2); } @@ -158,11 +158,11 @@ static int tree_multiunselection_cb(Ihandle *ih, int* ids, int p1) lua_newtable(L); for (i = 0; i < p1; i++) { - lua_pushnumber(L,i+1); - lua_pushnumber(L,ids[i]); + lua_pushinteger(L,i+1); + lua_pushinteger(L,ids[i]); lua_settable(L,-3); } - lua_pushnumber(L, p1); + lua_pushinteger(L, p1); return iuplua_call(L, 2); } @@ -175,8 +175,6 @@ static int tree_noderemoved_cb(Ihandle *ih, void* p1) void iuplua_treefuncs_open (lua_State *L) { - iuplua_dostring(L, "IUPTREEREFTABLE={}", ""); - iuplua_register_cb(L, "MULTISELECTION_CB", (lua_CFunction)tree_multiselection_cb, NULL); iuplua_register_cb(L, "MULTIUNSELECTION_CB", (lua_CFunction)tree_multiunselection_cb, NULL); iuplua_register_cb(L, "NODEREMOVED_CB", (lua_CFunction)tree_noderemoved_cb, NULL); diff --git a/iup/srclua5/image.lua b/iup/srclua5/image.lua index 3a82063..dffd8bd 100755 --- a/iup/srclua5/image.lua +++ b/iup/srclua5/image.lua @@ -19,26 +19,26 @@ static int Image (lua_State * L) int i, j; /* get the number of lines */ - h = luaL_getn(L, 1); + h = iuplua_getn(L, 1); /* get the number of columns of the first line */ - lua_pushnumber(L, 1); + lua_pushinteger(L, 1); lua_gettable(L, 1); - w = luaL_getn(L, -1); + w = iuplua_getn(L, -1); lua_pop(L, 1); pixels = (unsigned char *) malloc (h*w); for (i=1; i<=h; i++) { - lua_pushnumber(L, i); + lua_pushinteger(L, i); lua_gettable(L, 1); for (j=1; j<=w; j++) { int idx = (i-1)*w+(j-1); - lua_pushnumber(L, j); + lua_pushinteger(L, j); lua_gettable(L, -2); - pixels[idx] = (unsigned char)lua_tonumber(L, -1); + pixels[idx] = (unsigned char)lua_tointeger(L, -1); lua_pop(L, 1); } lua_pop(L, 1); @@ -47,7 +47,7 @@ static int Image (lua_State * L) ih = IupImage(w,h,pixels); free(pixels); - num_colors = luaL_getn(L, 2); + num_colors = iuplua_getn(L, 2); num_colors = num_colors>255? 255: num_colors; for(c=1; c<=num_colors; c++) { @@ -65,7 +65,7 @@ static int Image (lua_State * L) ih = IupImage(w, h, pixels); free(pixels); - num_colors = luaL_getn(L, 4); + num_colors = iuplua_getn(L, 4); num_colors = num_colors>256? 256: num_colors; for(c=1; c<=num_colors; c++) { diff --git a/iup/srclua5/iup_pplot.mak b/iup/srclua5/iup_pplot.mak deleted file mode 100755 index b353fe7..0000000 --- a/iup/srclua5/iup_pplot.mak +++ /dev/null @@ -1,26 +0,0 @@ -PROJNAME = iup -LIBNAME = iuplua_pplot51 -OPT = YES -DEF_FILE = iuplua_pplot5.def - -IUP := .. - -DEFINES = IUPLUA_USELOH - -USE_IUP3 = Yes -USE_IUPLUA = Yes -USE_CDLUA = Yes -LIBS = iup_pplot - -USE_LUA51 = Yes -NO_LUALINK = Yes - -LOHDIR = loh -SRCLUA = pplot.lua -GC := $(addsuffix .c, $(basename $(SRCLUA))) -GC := $(addprefix il_, $(GC)) - -$(GC) : il_%.c : %.lua generator.lua - $(LUABIN) generator.lua $< - -SRC := iuplua_pplot.c $(GC) diff --git a/iup/srclua5/iupcd.mak b/iup/srclua5/iupcd.mak deleted file mode 100755 index 26cf9b8..0000000 --- a/iup/srclua5/iupcd.mak +++ /dev/null @@ -1,21 +0,0 @@ -PROJNAME = iup -LIBNAME = iupluacd51 -OPT = YES - -DEFINES = CD_NO_OLD_INTERFACE -SRC = iuplua_cd.c -DEF_FILE = iupluacd5.def - -# Can not use USE_IUPLUA because Tecmake will include "iupluacd51" in linker - -INCLUDES = ../include -LIBS = iuplua51 -LDIR = ../lib/$(TEC_UNAME) - -IUP := .. - -USE_CD = YES -USE_IUP3 = YES -USE_LUA51 = Yes -NO_LUALINK = Yes -USE_CDLUA = YES diff --git a/iup/srclua5/iupcontrols.mak b/iup/srclua5/iupcontrols.mak deleted file mode 100755 index ea1e59f..0000000 --- a/iup/srclua5/iupcontrols.mak +++ /dev/null @@ -1,26 +0,0 @@ -PROJNAME = iup -LIBNAME = iupluacontrols51 -OPT = YES -DEF_FILE = iupluacontrols5.def - -IUP := .. - -DEFINES = IUPLUA_USELOH - -USE_IUP3 = Yes -USE_IUPLUA = Yes -USE_CDLUA = Yes -LIBS = iupcontrols - -USE_LUA51 = Yes -NO_LUALINK = Yes - -LOHDIR = loh -SRCLUA = dial.lua gauge.lua colorbrowser.lua colorbar.lua matrix.lua cells.lua -GC := $(addsuffix .c, $(basename $(SRCLUA))) -GC := $(addprefix il_, $(GC)) - -$(GC) : il_%.c : %.lua generator.lua - $(LUABIN) generator.lua $< - -SRC := iuplua_controls.c il_mask.c il_matrix_aux.c $(GC) diff --git a/iup/srclua5/iupgl.mak b/iup/srclua5/iupgl.mak deleted file mode 100755 index 6e9f45d..0000000 --- a/iup/srclua5/iupgl.mak +++ /dev/null @@ -1,27 +0,0 @@ -PROJNAME = iup -LIBNAME = iupluagl51 -OPT = YES - -DEF_FILE = iupluagl5.def -DEFINES = IUPLUA_USELOH - -IUP := .. - -# Can not use USE_IUPLUA because Tecmake will include "iupluagl51" in linker - -USE_IUP3 = Yes -USE_OPENGL = Yes -LIBS = iuplua51 - -USE_LUA51 = Yes -NO_LUALINK = Yes - -LOHDIR = loh -SRCLUA = glcanvas.lua -GC = $(addsuffix .c, $(basename $(SRCLUA))) -GC := $(addprefix il_, $(GC)) - -$(GC) : il_%.c : %.lua generator.lua - $(LUABIN) generator.lua $< - -SRC = iuplua_glcanvas.c $(GC) diff --git a/iup/srclua5/iupim.mak b/iup/srclua5/iupim.mak deleted file mode 100755 index 1355c42..0000000 --- a/iup/srclua5/iupim.mak +++ /dev/null @@ -1,17 +0,0 @@ -PROJNAME = iup -LIBNAME = iupluaim51 -OPT = YES - -DEF_FILE = iupluaim5.def -SRC = iuplua_im.c - -INCLUDES = ../src -LIBS = iupim - -IUP := .. - -USE_IUP3 = Yes -USE_IUPLUA = Yes -USE_IM = Yes -USE_LUA51 = Yes -NO_LUALINK = Yes diff --git a/iup/srclua5/iupimglib.mak b/iup/srclua5/iupimglib.mak deleted file mode 100755 index 5b74dfb..0000000 --- a/iup/srclua5/iupimglib.mak +++ /dev/null @@ -1,17 +0,0 @@ -PROJNAME = iup -LIBNAME = iupluaimglib51 -OPT = YES - -SRC = iuplua_imglib.c -DEF_FILE = iupluaimglib5.def - -INCLUDES = ../include -LIBS = iupimglib -LDIR = ../lib/$(TEC_UNAME) - -IUP := .. - -USE_IUP3 = Yes -USE_IUPLUA = Yes -USE_LUA51 = Yes -NO_LUALINK = Yes diff --git a/iup/srclua5/iuplua.c b/iup/srclua5/iuplua.c index 4158990..240d599 100755 --- a/iup/srclua5/iuplua.c +++ b/iup/srclua5/iuplua.c @@ -26,12 +26,14 @@ /*************************************/ /* iuplua_dostring and iuplua_dofile */ +/* report, traceback and docall were adapted from "lua.c" */ + static void error_message(lua_State *L, const char *msg, const char* traceback) { lua_getglobal(L, "iup"); lua_pushstring(L, "_ERRORMESSAGE"); lua_gettable(L, -2); - lua_remove(L, -2); + lua_remove(L, -2); /* remove "iup" from stack */ if(lua_isnil(L, -1)) { @@ -43,19 +45,18 @@ static void error_message(lua_State *L, const char *msg, const char* traceback) fflush(stderr); return; } + lua_pushstring(L, msg); lua_pushstring(L, traceback); - lua_call(L, 2, 0); + lua_call(L, 2, 0); /* iup._ERRORMESSAGE(msg, traceback) */ } static int report (lua_State *L, int status, int concat_traceback) { - if (status && !lua_isnil(L, -1)) + if (status != LUA_OK && !lua_isnil(L, -1)) { const char *msg = lua_tostring(L, -2); - - const char *traceback; if (msg == NULL) { msg = "(error with no message)"; @@ -70,13 +71,14 @@ static int report (lua_State *L, int status, int concat_traceback) traceback = lua_tostring(L, -1); } error_message(L, msg, traceback); - lua_pop(L, 2); + lua_pop(L, 2); /* remove msg and traceback from stack */ } return status; } -static int traceback (lua_State *L) { - lua_getfield(L, LUA_GLOBALSINDEX, "debug"); +static int traceback (lua_State *L) +{ + lua_getglobal(L, "debug"); if (!lua_istable(L, -1)) { lua_pop(L, 1); return 1; @@ -97,7 +99,7 @@ static int traceback (lua_State *L) { lua_pushvalue(L, -3); lua_settable(L, -3); - lua_pop(L, 2); + lua_pop(L, 2); /* remove "iup" and "iup._LASTTRACEBACK" from stack */ return 1; } @@ -109,15 +111,17 @@ static int docall (lua_State *L, int narg, int nret) lua_insert(L, base); /* put it under chunk and args */ status = lua_pcall(L, narg, nret, base); lua_remove(L, base); /* remove traceback function */ - if (status != 0) + if (status != LUA_OK) { /* force a complete garbage collection in case of errors */ lua_gc(L, LUA_GCCOLLECT, 0); + /* put _LASTTRACEBACK at stack position 2 */ lua_getglobal(L, "iup"); lua_pushliteral(L, "_LASTTRACEBACK"); lua_gettable(L, -2); - lua_remove(L, -2); + lua_remove(L, -2); /* remove "iup" from stack */ + if (!lua_isstring(L, -1)) { lua_pop(L, 1); @@ -129,7 +133,7 @@ static int docall (lua_State *L, int narg, int nret) lua_pushnil(L); lua_settable(L, -3); - lua_pop(L, 1); + lua_pop(L, 1); /* remove "iup" from stack */ } } return status; @@ -138,15 +142,33 @@ static int docall (lua_State *L, int narg, int nret) int iuplua_dofile(lua_State *L, const char *filename) { int status = luaL_loadfile(L, filename); - if (status == 0) + if (status == LUA_OK) status = docall(L, 0, 0); + else if (status == LUA_ERRFILE) + { + char *dir = getenv("IUPLUA_DIR"); + if (dir) + { + char* full_name = iupStrFileMakeFileName(dir, filename); + if (full_name) + { + /* remove the error string from the stack, and try again */ + lua_remove(L, -1); + + status = luaL_loadfile(L, full_name); + free(full_name); + if (status == LUA_OK) + status = docall(L, 0, 0); + } + } + } return report(L, status, 1); } int iuplua_dostring(lua_State *L, const char *s, const char *name) { int status = luaL_loadbuffer(L, s, strlen(s), name); - if (status == 0) + if (status == LUA_OK) status = docall(L, 0, 0); return report(L, status, 1); } @@ -167,7 +189,7 @@ Ihandle *iuplua_checkihandle(lua_State *L, int pos) lua_getmetatable(L, pos); /* t2 = metatable(stack(pos)) */ lua_pushstring(L, "iup handle"); lua_gettable(L, LUA_REGISTRYINDEX); /* t = registry["iup handle"] */ - if (lua_equal(L, -2, -1)) /* check (t2==t)? */ + if (lua_rawequal(L, -2, -1)) /* check (t2==t)? */ { lua_pop (L, 2); return *(Ihandle**)lua_touserdata(L, pos); @@ -198,17 +220,18 @@ void iuplua_pushihandle(lua_State *L, Ihandle *ih) char* sref = IupGetAttribute(ih, "_IUPLUA_WIDGET_TABLE_REF"); if (!sref) { - lua_getglobal(L,"iup"); + lua_getglobal(L, "iup"); lua_pushstring(L,"RegisterHandle"); - lua_gettable(L, -2); /* f = iup.RegisterHandle */ - lua_remove(L, -2); - iuplua_pushihandle_raw(L, ih); /* push ih */ - lua_pushstring(L, IupGetClassName(ih)); /* push type */ - lua_call(L, 2, 1); /* call f(ih, type) */ + lua_gettable(L, -2); + lua_remove(L, -2); /* remove "iup" from stack */ + + iuplua_pushihandle_raw(L, ih); + lua_pushstring(L, IupGetClassName(ih)); + lua_call(L, 2, 1); /* iup.RegisterHandle(ih, type) */ } else { - iuplua_pushihandle_raw(L, ih); /* push ih */ + iuplua_pushihandle_raw(L, ih); lua_pushstring(L, "iup handle"); lua_gettable(L, LUA_REGISTRYINDEX); /* t = registry["iup handle"] */ lua_setmetatable(L, -2); /* metatable(ih) = t */ @@ -254,11 +277,11 @@ char ** iuplua_checkstring_array(lua_State *L, int pos) { int i,n; char **v; - n = luaL_getn(L,pos); + n = iuplua_getn(L,pos); v = (char **) malloc (n*sizeof(char *)); for(i=1; i<=n; i++) { - lua_pushnumber(L,i); + lua_pushinteger(L,i); lua_gettable(L,pos); v[i-1] = (char*)lua_tostring(L, -1); lua_pop(L,1); @@ -270,13 +293,13 @@ int * iuplua_checkint_array(lua_State *L, int pos) { int i,n; int *v; - n = luaL_getn(L,pos); + n = iuplua_getn(L,pos); v = (int *) malloc (n*sizeof(int)); for(i=1; i<=n; i++) { - lua_pushnumber(L,i); + lua_pushinteger(L,i); lua_gettable(L,pos); - v[i-1] = (int)lua_tonumber(L, -1); + v[i-1] = lua_tointeger(L, -1); lua_pop(L,1); } return v; @@ -286,7 +309,7 @@ unsigned char* iuplua_checkuchar_array(lua_State *L, int pos, int count) { int i,n; unsigned char *v; - n = luaL_getn(L,pos); + n = iuplua_getn(L,pos); if (n != count) { lua_pushstring(L, "invalid number of elements in array"); @@ -295,9 +318,9 @@ unsigned char* iuplua_checkuchar_array(lua_State *L, int pos, int count) v = (unsigned char *) malloc (n*sizeof(unsigned char)); for(i=1; i<=n; i++) { - lua_pushnumber(L,i); + lua_pushinteger(L,i); lua_gettable(L,pos); - v[i-1] = (unsigned char)lua_tonumber(L, -1); + v[i-1] = (unsigned char)lua_tointeger(L, -1); lua_pop(L,1); } return v; @@ -306,11 +329,11 @@ unsigned char* iuplua_checkuchar_array(lua_State *L, int pos, int count) Ihandle ** iuplua_checkihandle_array(lua_State *L, int pos) { Ihandle **v; - int i, n = luaL_getn(L, pos); + int i, n = iuplua_getn(L, pos); v = (Ihandle **) malloc ((n+1)*sizeof(Ihandle *)); for (i=1; i<=n; i++) { - lua_pushnumber(L,i); + lua_pushinteger(L,i); lua_gettable(L,pos); v[i-1] = iuplua_checkihandle(L, -1); lua_pop(L,1); @@ -337,10 +360,10 @@ lua_State* iuplua_call_start(Ihandle *ih, const char* name) lua_State *L = iuplua_getstate(ih); /* prepare to call iup.CallMethod(name, handle, ...) */ - lua_getglobal(L,"iup"); + lua_getglobal(L, "iup"); lua_pushstring(L,"CallMethod"); lua_gettable(L, -2); - lua_remove(L, -2); + lua_remove(L, -2); /* remove "iup" from stack */ lua_pushstring(L, name); iuplua_pushihandle(L, ih); @@ -352,7 +375,7 @@ int iuplua_call(lua_State* L, int nargs) int status = docall(L, nargs+2, 1); report(L, status, 0); - if (status) + if (status != LUA_OK) return IUP_DEFAULT; else { @@ -367,7 +390,7 @@ char* iuplua_call_rs(lua_State *L, int nargs) int status = docall(L, nargs+2, 1); report(L, status, 0); - if (status) + if (status != LUA_OK) return NULL; else { @@ -386,13 +409,15 @@ int iuplua_call_raw(lua_State* L, int nargs, int nresults) void iuplua_register_cb(lua_State *L, const char* name, lua_CFunction func, const char* type) { - lua_getglobal(L,"iup"); + lua_getglobal(L, "iup"); lua_pushstring(L,"RegisterCallback"); lua_gettable(L, -2); + lua_remove(L, -2); /* remove "iup" from stack */ + lua_pushstring(L, name); lua_pushcfunction(L, func); lua_pushstring(L, type); - lua_call(L, 3, 0); + lua_call(L, 3, 0); /* iup.RegisterCallback(name, func, type) */ } /* iup.SetCallback(handle, name, func, value) */ @@ -563,7 +588,7 @@ int iuplua_opencall_internal(lua_State * L) s = lua_tostring(L, -1); if (s && strcmp(s, "INTERNAL")==0) ret = 1; - lua_pop(L,2); + lua_pop(L,2); /* remove "iup" and "iup._IUPOPEN_CALL" from stack */ return ret; } @@ -600,7 +625,7 @@ static int getfocus_cb(Ihandle *self) static int k_any(Ihandle *self, int c) { lua_State *L = iuplua_call_start(self, "k_any"); - lua_pushnumber(L, c); + lua_pushinteger(L, c); return iuplua_call(L, 1); } @@ -615,8 +640,8 @@ static int Idlecall(void) int ret = 0; lua_State *L = (lua_State *) IupGetGlobal("_IUP_LUA_DEFAULT_STATE"); lua_getglobal(L, "_IUP_LUA_IDLE_FUNC_"); - lua_call(L, 0, 1); - ret = (int) lua_tonumber(L, -1); + lua_call(L, 0, 1); /* _IUP_LUA_IDLE_FUNC_() */ + ret = lua_tointeger(L, -1); lua_pop(L, 1); return ret; } @@ -646,15 +671,15 @@ static int GetFromC(lua_State *L) const char *a; if (!lua_istable(L, -1)) { - lua_pushstring(L, "IupGetFromC: wrong arguments to function"); + lua_pushstring(L, "iup.GetFromC: wrong arguments to function"); lua_error(L); return 0; } - lua_pushnumber(L, 1); + lua_pushinteger(L, 1); lua_gettable(L, -2); if (!lua_isstring(L, -1)) { - lua_pushstring(L, "IupGetFromC: wrong arguments to function"); + lua_pushstring(L, "iup.GetFromC: wrong arguments to function"); lua_error(L); return 0; } @@ -676,7 +701,7 @@ static int GetFromC(lua_State *L) static void register_key(char *name, int code, void* user_data) { lua_State *L = (lua_State*)user_data; - lua_pushnumber(L, code); + lua_pushinteger(L, code); lua_setfield(L, -2, name); } @@ -705,11 +730,11 @@ static int il_open(lua_State * L) if (lua_istable(L, -1)) { int i; - argc = luaL_getn(L, -1); + argc = iuplua_getn(L, -1); argv = malloc(sizeof(char*)*argc); for(i=1; i<=argc; i++) { - lua_pushnumber(L,i); + lua_pushinteger(L,i); lua_gettable(L,-2); argv[i-1] = (char*)lua_tostring(L, -1); lua_pop(L,1); @@ -868,8 +893,3 @@ int luaopen_iuplua(lua_State* L) return iuplua_open(L); } -/* obligatory to use require"iuplua51" */ -int luaopen_iuplua51(lua_State* L) -{ - return iuplua_open(L); -} diff --git a/iup/srclua5/iuplua.lua b/iup/srclua5/iuplua.lua index 01465d5..a58656f 100755 --- a/iup/srclua5/iuplua.lua +++ b/iup/srclua5/iuplua.lua @@ -236,13 +236,13 @@ iup.SetClass(iup.BOX, "iup widget") iup.error_message_popup = nil -function iup._ERRORMESSAGE(err,traceback) - err = err..(traceback or "") +function iup._ERRORMESSAGE(msg,traceback) + msg = msg..(traceback or "") if (iup.error_message_popup) then - iup.error_message_popup.value = err + iup.error_message_popup.value = msg else local bt = iup.button{title="Ok", size="60", action="iup.error_message_popup = nil; return iup.CLOSE"} - local ml = iup.multiline{expand="YES", readonly="YES", value=err, size="300x150"} + local ml = iup.multiline{expand="YES", readonly="YES", value=msg, size="300x150"} local vb = iup.vbox{ml, bt; alignment="ACENTER", margin="10x10", gap="10"} local dg = iup.dialog{vb; title="Error Message",defaultesc=bt,defaultenter=bt,startfocus=bt} iup.error_message_popup = ml @@ -254,9 +254,9 @@ end iup.pack = function (...) return {...} end -function iup.protectedcall_(f, err) +function iup.protectedcall(f, msg) if not f then - iup._ERRORMESSAGE(err) + iup._ERRORMESSAGE(msg) return end local ret = iup.pack(pcall(f)) @@ -265,12 +265,12 @@ function iup.protectedcall_(f, err) return else table.remove(ret, 1) - return unpack(ret) + return unpack(ret) --must replace this by table.unpack when 5.1 is not supported end end -function iup.dostring(s) return iup.protectedcall_(loadstring(s)) end -function iup.dofile(f) return iup.protectedcall_(loadfile(f)) end +function iup.dostring(s) return iup.protectedcall(loadstring(s)) end +function iup.dofile(f) return iup.protectedcall(loadfile(f)) end function iup.RGB(r, g, b) return string.format("%d %d %d", 255*r, 255*g, 255*b) diff --git a/iup/srclua5/iuplua5.def b/iup/srclua5/iuplua5.def deleted file mode 100755 index 667f81d..0000000 --- a/iup/srclua5/iuplua5.def +++ /dev/null @@ -1,26 +0,0 @@ -EXPORTS - iuplua_open - iuplua_close - iuplua_plugstate - iuplua_getstate - iuplua_checkihandle - iuplua_checkihandle_array - iuplua_call - iuplua_call_rs - iuplua_call_raw - iuplua_get_env - iuplua_pushihandle - iuplua_pushihandle_raw - iuplua_dofile - iuplua_dostring - iupkey_open - iuplua_opencall_internal - luaopen_iuplua - luaopen_iuplua51 - iuplua_register - iuplua_regstring - iuplua_checkstring_array - iuplua_checkint_array - iuplua_call_start - iuplua_register_cb -
\ No newline at end of file diff --git a/iup/srclua5/iuplua_api.c b/iup/srclua5/iuplua_api.c index adf5383..27adffe 100755 --- a/iup/srclua5/iuplua_api.c +++ b/iup/srclua5/iuplua_api.c @@ -35,8 +35,8 @@ static int SaveImageAsText(lua_State *L) static int Reparent(lua_State *L) { - lua_pushnumber(L, IupReparent(iuplua_checkihandle(L,1), - iuplua_checkihandle(L,2))); + lua_pushinteger(L, IupReparent(iuplua_checkihandle(L,1), + iuplua_checkihandle(L,2))); return 1; } @@ -132,11 +132,11 @@ static int GetAllDialogs(lua_State *L) lua_newtable(L); for (i=0; i<n; i++) { - lua_pushnumber(L,i+1); + lua_pushinteger(L,i+1); lua_pushstring(L,names[i]); lua_settable(L,-3); } - lua_pushnumber(L,n); + lua_pushinteger(L,n); free(names); return 2; } @@ -149,11 +149,11 @@ static int GetAllNames(lua_State *L) lua_newtable(L); for (i=0; i<n; i++) { - lua_pushnumber(L,i+1); + lua_pushinteger(L,i+1); lua_pushstring(L,names[i]); lua_settable(L,-3); } - lua_pushnumber(L,n); + lua_pushinteger(L,n); free(names); return 2; } @@ -166,11 +166,11 @@ static int GetAllAttributes(lua_State *L) lua_newtable(L); for (i=0; i<n; i++) { - lua_pushnumber(L,i+1); + lua_pushinteger(L,i+1); lua_pushstring(L,names[i]); lua_settable(L,-3); } - lua_pushnumber(L,n); + lua_pushinteger(L,n); free(names); return 2; } @@ -190,11 +190,11 @@ static int GetClassAttributes(lua_State *L) lua_newtable(L); for (i=0; i<n; i++) { - lua_pushnumber(L,i+1); + lua_pushinteger(L,i+1); lua_pushstring(L,names[i]); lua_settable(L,-3); } - lua_pushnumber(L,n); + lua_pushinteger(L,n); free(names); return 2; } @@ -219,7 +219,7 @@ static int GetFile (lua_State *L) iupStrCopyN(returned_fname, 10240, fname); ret = IupGetFile(returned_fname); lua_pushstring(L, returned_fname); - lua_pushnumber(L, ret); + lua_pushinteger(L, ret); return 2; } @@ -287,7 +287,7 @@ static int Help(lua_State *L) static int Hide(lua_State *L) { Ihandle *ih = iuplua_checkihandle(L,1); - lua_pushnumber(L, IupHide(ih)); + lua_pushinteger(L, IupHide(ih)); return 1; } @@ -309,13 +309,13 @@ static int LoadBuffer(lua_State *L) static int LoopStep(lua_State *L) { - lua_pushnumber(L,IupLoopStep()); + lua_pushinteger(L,IupLoopStep()); return 1; } static int LoopStepWait(lua_State *L) { - lua_pushnumber(L,IupLoopStepWait()); + lua_pushinteger(L,IupLoopStepWait()); return 1; } @@ -328,20 +328,20 @@ static int ExitLoop(lua_State *L) static int MainLoop(lua_State *L) { - lua_pushnumber(L,IupMainLoop()); + lua_pushinteger(L,IupMainLoop()); return 1; } static int MainLoopLevel(lua_State *L) { - lua_pushnumber(L,IupMainLoopLevel()); + lua_pushinteger(L,IupMainLoopLevel()); return 1; } static int Map(lua_State *L) { Ihandle *ih = iuplua_checkihandle(L,1); - lua_pushnumber(L, IupMap(ih)); + lua_pushinteger(L, IupMap(ih)); return 1; } @@ -375,7 +375,7 @@ static int Alarm(lua_State *L) luaL_checkstring(L, 3), luaL_optstring(L, 4, NULL), luaL_optstring(L, 5, NULL)); - lua_pushnumber(L, n); + lua_pushinteger(L, n); return 1; } @@ -387,11 +387,11 @@ static int ListDialog(lua_State *L) int* marks = lua_isnoneornil(L, 8)? NULL: iuplua_checkint_array(L,8); int i, ret; - if (size != luaL_getn(L, 4)) + if (size != iuplua_getn(L, 4)) luaL_error(L, "invalid number of elements in the list."); if (!marks && type==2) luaL_error(L, "invalid marks, must not be nil."); - if (marks && type==2 && size != luaL_getn(L, 8)) + if (marks && type==2 && size != iuplua_getn(L, 8)) luaL_error(L, "invalid number of elements in the marks."); ret = IupListDialog(type, luaL_checkstring(L, 2), @@ -406,13 +406,13 @@ static int ListDialog(lua_State *L) { for (i=0; i<size; i++) { - lua_pushnumber(L, i+1); - lua_pushnumber(L, marks[i]); + lua_pushinteger(L, i+1); + lua_pushinteger(L, marks[i]); lua_settable(L, 8); } } - lua_pushnumber(L, ret); + lua_pushinteger(L, ret); if (marks) free(marks); free(list); @@ -455,21 +455,21 @@ static int Popup(lua_State *L) Ihandle *ih = iuplua_checkihandle(L,1); int x = luaL_optint(L,2, IUP_CURRENT); int y = luaL_optint(L,3, IUP_CURRENT); - lua_pushnumber(L,IupPopup(ih,x,y)); + lua_pushinteger(L,IupPopup(ih,x,y)); return 1; } static int cf_isprint(lua_State *L) { int value = luaL_checkint(L, 1); - lua_pushnumber(L, iup_isprint(value)); + lua_pushinteger(L, iup_isprint(value)); return 1; } static int cf_xCODE(lua_State *L) { int value = luaL_checkint(L, 1); - lua_pushnumber(L, IUPxCODE(value)); + lua_pushinteger(L, IUPxCODE(value)); return 1; } @@ -588,7 +588,7 @@ static int GetParent(lua_State *L) static int VersionNumber(lua_State *L) { - lua_pushnumber(L, IupVersionNumber()); + lua_pushinteger(L, IupVersionNumber()); return 1; } @@ -605,7 +605,7 @@ static int GetChildPos(lua_State *L) { Ihandle* ih = iuplua_checkihandle(L,1); Ihandle* child = iuplua_checkihandle(L,2); - lua_pushnumber(L, IupGetChildPos(ih, child)); + lua_pushinteger(L, IupGetChildPos(ih, child)); return 1; } @@ -691,13 +691,13 @@ static int SetLanguage(lua_State *L) static int GetChildCount (lua_State *L) { - lua_pushnumber(L, IupGetChildCount(iuplua_checkihandle(L,1))); + lua_pushinteger(L, IupGetChildCount(iuplua_checkihandle(L,1))); return 1; } static int Show (lua_State *L) { - lua_pushnumber(L, IupShow(iuplua_checkihandle(L,1))); + lua_pushinteger(L, IupShow(iuplua_checkihandle(L,1))); return 1; } @@ -730,10 +730,18 @@ static int ShowXY(lua_State *L) Ihandle *ih = iuplua_checkihandle(L,1); int x = luaL_optint(L,2, IUP_CURRENT); int y = luaL_optint(L,3, IUP_CURRENT); - lua_pushnumber(L,IupShowXY(ih,x,y)); + lua_pushinteger(L, IupShowXY(ih,x,y)); return 1; } +static int ResetAttribute(lua_State *L) +{ + Ihandle *ih = iuplua_checkihandle(L,1); + const char *a = luaL_checkstring(L,2); + IupResetAttribute(ih, a); + return 0; +} + static int StoreAttribute(lua_State *L) { Ihandle *ih = iuplua_checkihandle(L,1); @@ -826,6 +834,7 @@ void iupluaapi_open(lua_State * L) {"NextField", NextField}, {"Popup", Popup}, {"PreviousField", PreviousField}, + {"ResetAttribute", ResetAttribute}, {"SetAttribute", StoreAttribute}, {"SetAttributes", SetAttributes}, {"isbutton1", cf_isbutton1}, diff --git a/iup/srclua5/iuplua_cd.c b/iup/srclua5/iuplua_cd.c index c14932a..184ef84 100755 --- a/iup/srclua5/iuplua_cd.c +++ b/iup/srclua5/iuplua_cd.c @@ -39,8 +39,13 @@ static cdluaContext cdluaiupctx = int cdluaiup_open (lua_State *L) { cdluaLuaState* cdL = cdlua_getstate(L); + /* leave "cd" table at the top of the stack */ lua_pushstring(L, "cd"); - lua_gettable(L, LUA_GLOBALSINDEX); /* leave "cd" table at the top of the stack */ +#if LUA_VERSION_NUM > 501 + lua_pushglobaltable(L); +#else + lua_gettable(L, LUA_GLOBALSINDEX); +#endif cdlua_addcontext(L, cdL, &cdluaiupctx); return 1; } @@ -50,7 +55,3 @@ int luaopen_iupluacd(lua_State* L) return cdluaiup_open(L); } -int luaopen_iupluacd51(lua_State* L) -{ - return cdluaiup_open(L); -} diff --git a/iup/srclua5/iuplua_controls.c b/iup/srclua5/iuplua_controls.c index 22992f4..12b535b 100755 --- a/iup/srclua5/iuplua_controls.c +++ b/iup/srclua5/iuplua_controls.c @@ -46,8 +46,3 @@ int luaopen_iupluacontrols(lua_State* L) return iupcontrolslua_open(L); } -/* obligatory to use require"iupluacontrols51" */ -int luaopen_iupluacontrols51(lua_State* L) -{ - return iupcontrolslua_open(L); -} diff --git a/iup/srclua5/iuplua_im.c b/iup/srclua5/iuplua_im.c index 0d9005d..10a2eda 100755 --- a/iup/srclua5/iuplua_im.c +++ b/iup/srclua5/iuplua_im.c @@ -46,8 +46,3 @@ int luaopen_iupluaim(lua_State* L) return iupimlua_open(L); } -/* obligatory to use require"iupluaim51" */ -int luaopen_iupluaim51(lua_State* L) -{ - return iupimlua_open(L); -} diff --git a/iup/srclua5/iuplua_imglib.c b/iup/srclua5/iuplua_imglib.c index 9eb1123..f7b2755 100755 --- a/iup/srclua5/iuplua_imglib.c +++ b/iup/srclua5/iuplua_imglib.c @@ -37,7 +37,3 @@ int luaopen_iupluaimglib(lua_State* L) return iupluaimglib_open(L); } -int luaopen_iupluaimglib51(lua_State* L) -{ - return iupluaimglib_open(L); -} diff --git a/iup/srclua5/iuplua_pplot.c b/iup/srclua5/iuplua_pplot.c index 21b5090..63248fc 100755 --- a/iup/srclua5/iuplua_pplot.c +++ b/iup/srclua5/iuplua_pplot.c @@ -22,14 +22,14 @@ static int pplot_edit_cb(Ihandle *self, int p0, int p1, float p2, float p3, floa { int ret; lua_State *L = iuplua_call_start(self, "edit_cb"); - lua_pushnumber(L, p0); - lua_pushnumber(L, p1); + lua_pushinteger(L, p0); + lua_pushinteger(L, p1); lua_pushnumber(L, p2); lua_pushnumber(L, p3); ret = iuplua_call_raw(L, 4+2, LUA_MULTRET); /* 4 args + 2 args(errormsg, handle), variable number of returns */ if (ret || lua_isnil(L, -1)) return IUP_DEFAULT; - ret = (int)lua_tonumber(L,-1); + ret = lua_tointeger(L,-1); if (ret == IUP_IGNORE) { @@ -82,7 +82,7 @@ static int PPlotEnd(lua_State *L) { Ihandle *ih = iuplua_checkihandle(L,1); int ret = IupPPlotEnd(ih); - lua_pushnumber(L, ret); + lua_pushinteger(L, ret); return 1; } @@ -105,8 +105,8 @@ static int PPlotTransform(lua_State *L) Ihandle *ih = iuplua_checkihandle(L,1); int ix, iy; IupPPlotTransform(ih, (float)luaL_checknumber(L,2), (float)luaL_checknumber(L,3), &ix, &iy); - lua_pushnumber(L, ix); - lua_pushnumber(L, iy); + lua_pushinteger(L, ix); + lua_pushinteger(L, iy); return 2; } @@ -151,8 +151,3 @@ int luaopen_iuplua_pplot(lua_State* L) return iup_pplotlua_open(L); } -/* obligatory to use require"iuplua_pplot51" */ -int luaopen_iuplua_pplot51(lua_State* L) -{ - return iup_pplotlua_open(L); -} diff --git a/iup/srclua5/iuplua_pplot5.def b/iup/srclua5/iuplua_pplot5.def deleted file mode 100755 index 3b2ce41..0000000 --- a/iup/srclua5/iuplua_pplot5.def +++ /dev/null @@ -1,4 +0,0 @@ -EXPORTS - iup_pplotlua_open - luaopen_iuplua_pplot - luaopen_iuplua_pplot51 diff --git a/iup/srclua5/iupluacd5.def b/iup/srclua5/iupluacd5.def deleted file mode 100755 index c56c231..0000000 --- a/iup/srclua5/iupluacd5.def +++ /dev/null @@ -1,4 +0,0 @@ -EXPORTS - cdluaiup_open - luaopen_iupluacd - luaopen_iupluacd51
\ No newline at end of file diff --git a/iup/srclua5/iupluacontrols5.def b/iup/srclua5/iupluacontrols5.def deleted file mode 100755 index 0317d30..0000000 --- a/iup/srclua5/iupluacontrols5.def +++ /dev/null @@ -1,6 +0,0 @@ -EXPORTS - iupcontrolslua_open - iupcontrolslua_close - luaopen_iupluacontrols - luaopen_iupluacontrols51 -
\ No newline at end of file diff --git a/iup/srclua5/iupluagl5.def b/iup/srclua5/iupluagl5.def deleted file mode 100755 index 577d9cf..0000000 --- a/iup/srclua5/iupluagl5.def +++ /dev/null @@ -1,5 +0,0 @@ -EXPORTS - iupgllua_open - luaopen_iupluagl - luaopen_iupluagl51 -
\ No newline at end of file diff --git a/iup/srclua5/iupluaim5.def b/iup/srclua5/iupluaim5.def deleted file mode 100755 index 063df5a..0000000 --- a/iup/srclua5/iupluaim5.def +++ /dev/null @@ -1,5 +0,0 @@ -EXPORTS - iupimlua_open - luaopen_iupluaim - luaopen_iupluaim51 -
\ No newline at end of file diff --git a/iup/srclua5/iupluaimglib5.def b/iup/srclua5/iupluaimglib5.def deleted file mode 100755 index 134abb7..0000000 --- a/iup/srclua5/iupluaimglib5.def +++ /dev/null @@ -1,4 +0,0 @@ -EXPORTS - luaopen_iupluaimglib - luaopen_iupluaimglib51 -
\ No newline at end of file diff --git a/iup/srclua5/iupluaole5.def b/iup/srclua5/iupluaole5.def deleted file mode 100755 index ab781ed..0000000 --- a/iup/srclua5/iupluaole5.def +++ /dev/null @@ -1,5 +0,0 @@ -EXPORTS - iupolelua_open - luaopen_iupluaole - luaopen_iupluaole51 -
\ No newline at end of file diff --git a/iup/srclua5/iupole.mak b/iup/srclua5/iupole.mak deleted file mode 100755 index 6a3f9ec..0000000 --- a/iup/srclua5/iupole.mak +++ /dev/null @@ -1,23 +0,0 @@ -PROJNAME = iup -LIBNAME = iupluaole51 -OPT = YES -DEF_FILE = iupluaole5.def - -IUP := .. - -DEFINES = IUPLUA_USELOH - -USE_IUPLUA = Yes -LIBS = iupole -USE_LUA51 = Yes -NO_LUALINK = Yes - -LOHDIR = loh -SRCLUA = olecontrol.lua -GC = $(addsuffix .c, $(basename $(SRCLUA))) -GC := $(addprefix il_, $(GC)) - -$(GC) : il_%.c : %.lua generator.lua - $(LUABIN) generator.lua $< - -SRC = $(GC) diff --git a/iup/srclua5/make_uname b/iup/srclua5/make_uname deleted file mode 100755 index 4e01bd9..0000000 --- a/iup/srclua5/make_uname +++ /dev/null @@ -1,9 +0,0 @@ -#This builds all the libraries of the folder for 1 uname - -tecmake $1 $2 $3 $4 $5 $6 $7 $8 -tecmake $1 MF=iupcd $2 $3 $4 $5 $6 $7 $8 -tecmake $1 MF=iupcontrols $2 $3 $4 $5 $6 $7 $8 -tecmake $1 MF=iup_pplot $2 $3 $4 $5 $6 $7 $8 -tecmake $1 MF=iupgl $2 $3 $4 $5 $6 $7 $8 -tecmake $1 MF=iupim $2 $3 $4 $5 $6 $7 $8 -tecmake $1 MF=iupimglib $2 $3 $4 $5 $6 $7 $8 diff --git a/iup/srclua5/make_uname.bat b/iup/srclua5/make_uname.bat deleted file mode 100755 index ecf9de1..0000000 --- a/iup/srclua5/make_uname.bat +++ /dev/null @@ -1,11 +0,0 @@ -@echo off -REM This builds all the libraries of the folder for 1 uname - -call tecmake %1 %2 %3 %4 %5 %6 %7 %8 -call tecmake %1 "MF=iupcd" %2 %3 %4 %5 %6 %7 %8 -call tecmake %1 "MF=iupcontrols" %2 %3 %4 %5 %6 %7 %8 -call tecmake %1 "MF=iup_pplot" %2 %3 %4 %5 %6 %7 %8 -call tecmake %1 "MF=iupgl" %2 %3 %4 %5 %6 %7 %8 -call tecmake %1 "MF=iupim" %2 %3 %4 %5 %6 %7 %8 -call tecmake %1 "MF=iupimglib" %2 %3 %4 %5 %6 %7 %8 -call tecmake %1 "MF=iupole" %2 %3 %4 %5 %6 %7 %8 diff --git a/iup/srclua5/menu.lua b/iup/srclua5/menu.lua index 70be236..750494f 100755 --- a/iup/srclua5/menu.lua +++ b/iup/srclua5/menu.lua @@ -3,7 +3,7 @@ ------------------------------------------------------------------------------ local ctrl = { nick = "menu", - parent = iup.BOX, + parent = iup.BOX, -- iup.Append will be automatically called after createElement creation = "-", callback = { open_cb = "", @@ -19,25 +19,38 @@ function ctrl.append(handle, elem) iup.Append(handle, elem) end +function ctrl.getargs(menu_param) + local itemarg = {} + -- copy the named attributes to the element parameters + for u,v in pairs(menu_param) do + if type(u) ~= "number" then + itemarg[u] = v + end + end + return itemarg +end + function ctrl.createElement(class, param) local n = #param for i=1,n do - if type(param[i]) == "table" then - local itemarg = {} - for u,v in pairs(param[i]) do - if type(u) ~= "number" then - itemarg[u] = v + local menu_param = param[i] + if type(menu_param) == "table" then + -- replace param[i], so it will be used by iup.Append after createElement + -- other elements already created can also be used + if type(menu_param[1]) == nil then + param[i] = iup.separator() + elseif type(menu_param[1]) == "string" then + local itemarg = ctrl.getargs(menu_param) + if type(menu_param[2]) == "userdata" then + itemarg[1] = menu_param[2] + itemarg.title = menu_param[1] + param[i] = iup.submenu(itemarg) + else + itemarg.title = menu_param[1] + itemarg.action = menu_param[2] + param[i] = iup.item(itemarg) end end - if type(param[i][1]) == "string" and (type(param[i][2]) == "function" or type(param[i][2]) == "string") then - itemarg.title = param[i][1] - itemarg.action = param[i][2] - param[i] = iup.item(itemarg) - elseif type(param[i][1]) == "string" and type(param[i][2]) == "userdata" then - itemarg[1] = param[i][2] - itemarg.title = param[i][1] - param[i] = iup.submenu(itemarg) - end end end return iup.Menu() diff --git a/iup/srclua5/olecontrol.lua b/iup/srclua5/olecontrol.lua index ab7afd5..12c2ab8 100755 --- a/iup/srclua5/olecontrol.lua +++ b/iup/srclua5/olecontrol.lua @@ -25,12 +25,6 @@ int luaopen_iupluaole(lua_State* L) return iupolelua_open(L); } -/* obligatory to use require"iupluaole51" */ -int luaopen_iupluaole51(lua_State* L) -{ - return iupolelua_open(L); -} - ]] } diff --git a/iup/srclua5/radio.lua b/iup/srclua5/radio.lua index 7af6540..0431e91 100755 --- a/iup/srclua5/radio.lua +++ b/iup/srclua5/radio.lua @@ -8,6 +8,7 @@ local ctrl = { callback = {} } +-- TODO: remove this code in the future, it seems to be useless an incorrect function ctrl.SetChildrenNames(obj) if obj then if obj.parent.parent == iup.BOX then diff --git a/iup/srclua5/tree.lua b/iup/srclua5/tree.lua index 5bd21c4..2e07940 100755 --- a/iup/srclua5/tree.lua +++ b/iup/srclua5/tree.lua @@ -21,6 +21,8 @@ local ctrl = { extrafuncs = 1, } +iup.TREEREFTABLE={} + function iup.TreeSetNodeAttributes(handle, id, attrs) for attr, val in pairs(attrs) do handle[attr..id] = val diff --git a/iup/srcole/config.mak b/iup/srcole/config.mak deleted file mode 100755 index b1f223e..0000000 --- a/iup/srcole/config.mak +++ /dev/null @@ -1,22 +0,0 @@ -PROJNAME = iup -LIBNAME = iupole -OPT = YES - -INCLUDES = ../include ../src -LDIR = ../lib/$(TEC_UNAME) -LIBS = iup - -SRC = iup_olecontrol.cpp \ - tLegacy.cpp \ - tAmbientProperties.cpp \ - tDispatch.cpp \ - tOleClientSite.cpp \ - tOleControlSite.cpp \ - tOleHandler.cpp \ - tOleInPlaceFrame.cpp \ - tOleInPlaceSite.cpp - - -ifneq ($(findstring cygw, $(TEC_UNAME)), ) - LIBS += uuid ole32 gdi32 oleaut32 -endif diff --git a/iup/srcole/make_uname.bat b/iup/srcole/make_uname.bat deleted file mode 100755 index f0a0722..0000000 --- a/iup/srcole/make_uname.bat +++ /dev/null @@ -1,4 +0,0 @@ -@echo off -REM This builds all the libraries of the folder for 1 uname - -call tecmake %1 %2 %3 %4 %5 %6 diff --git a/iup/srcpplot/config.mak b/iup/srcpplot/config.mak deleted file mode 100755 index 7c3975b..0000000 --- a/iup/srcpplot/config.mak +++ /dev/null @@ -1,25 +0,0 @@ -PROJNAME = iup -LIBNAME = iup_pplot -OPT = YES - -USE_CD = Yes - -ifdef DBG - DEFINES += IUP_ASSERT -endif - -INCLUDES = ../include ../src -LDIR = ../lib/$(TEC_UNAME) -LIBS = iup iupcd - -DEFINES = _IUP_PPLOT_ CD_NO_OLD_INTERFACE - -SRC = iupPPlot.cpp iupPPlotInteraction.cpp iup_pplot.cpp - -ifneq ($(findstring owc, $(TEC_UNAME)), ) - CPPFLAGS = -xr -xst -endif - -ifeq "$(TEC_UNAME)" "vc6" - INCLUDES += C:\LNG\STLport\include -endif diff --git a/iup/srcpplot/make_uname b/iup/srcpplot/make_uname deleted file mode 100755 index cc4b881..0000000 --- a/iup/srcpplot/make_uname +++ /dev/null @@ -1,3 +0,0 @@ -#This builds all the libraries of the folder for 1 uname - -tecmake $1 $2 $3 $4 $5 $6 $7 diff --git a/iup/srcpplot/make_uname.bat b/iup/srcpplot/make_uname.bat deleted file mode 100755 index f0a0722..0000000 --- a/iup/srcpplot/make_uname.bat +++ /dev/null @@ -1,4 +0,0 @@ -@echo off -REM This builds all the libraries of the folder for 1 uname - -call tecmake %1 %2 %3 %4 %5 %6 diff --git a/iup/srcview/config.mak b/iup/srcview/config.mak deleted file mode 100755 index 9d03f3e..0000000 --- a/iup/srcview/config.mak +++ /dev/null @@ -1,62 +0,0 @@ -PROJNAME = iup -APPNAME = iupview -OPT = YES - -SRC = iup_view.c - -IUP := .. - -LINKER = $(CPPC) - -USE_CD = Yes -USE_IUPCONTROLS = Yes -USE_IUP3 = Yes - -ifdef GTK_DEFAULT - ifdef USE_MOTIF - # Build Motif version in Linux,Darwin,FreeBSD - APPNAME = iupviewmot - endif -else - ifdef USE_GTK - # Build GTK version in IRIX,SunOS,AIX,Win32 - APPNAME = iupviewgtk - endif -endif - -ifeq "$(TEC_UNAME)" "SunOS510x86" - DEFINES = USE_NO_OPENGL -else - USE_OPENGL = Yes -endif - -USE_IM = Yes -ifdef USE_IM - DEFINES += USE_IM - ifneq ($(findstring Win, $(TEC_SYSNAME)), ) - LIBS = iupim iupimglib - else - ifdef DBG_DIR - IUPLIB = $(IUP)/lib/$(TEC_UNAME)d - else - IUPLIB = $(IUP)/lib/$(TEC_UNAME) - endif - SLIB = $(IUPLIB)/libiupim.a $(IUPLIB)/libiupimglib.a - endif -endif - -USE_STATIC = Yes - -ifneq ($(findstring Win, $(TEC_SYSNAME)), ) - SRC += ../etc/iup.rc -endif - -INCLUDES = ../src - -ifeq ($(TEC_UNAME), vc8) - ifdef DBG - #debug info not working for vc8 linker - define DBG - endef - endif -endif diff --git a/iup/srcview/make_uname b/iup/srcview/make_uname deleted file mode 100755 index 153c2d7..0000000 --- a/iup/srcview/make_uname +++ /dev/null @@ -1,4 +0,0 @@ -# This builds the executable for 1 uname - -tecmake relink $1 $2 $3 $4 $5 $6 $7 $8 -#tecmake USE_GTK=Yes relink $1 $2 $3 $4 $5 $6 $7 $8 diff --git a/iup/srcview/make_uname.bat b/iup/srcview/make_uname.bat deleted file mode 100755 index 1a98efe..0000000 --- a/iup/srcview/make_uname.bat +++ /dev/null @@ -1,26 +0,0 @@ -@echo off - -if "%1"=="" goto iupexe32 -if "%1"=="vc8" goto iupexe32 -if "%1"=="vc8_64" goto iupexe64 -if "%1"=="all" goto iupexe -goto end - -:iupexe32 -call tecmake vc8 relink %2 %3 %4 %5 %6 %7 -REM call tecmake vc8 "USE_GTK=Yes" relink %2 %3 %4 %5 %6 %7 -goto end - -:iupexe64 -call tecmake vc8_64 relink %2 %3 %4 %5 %6 %7 -REM call tecmake vc8_64 "USE_GTK=Yes" relink %2 %3 %4 %5 %6 %7 -goto end - -:iupexe -call tecmake vc8 relink %2 %3 %4 %5 %6 %7 -REM call tecmake vc8 "USE_GTK=Yes" relink %2 %3 %4 %5 %6 %7 -call tecmake vc8_64 relink %2 %3 %4 %5 %6 %7 -REM call tecmake vc8_64 "USE_GTK=Yes" relink %2 %3 %4 %5 %6 %7 -goto end - -:end diff --git a/iup/test/button.c b/iup/test/button.c index f04f082..37c4e68 100755 --- a/iup/test/button.c +++ b/iup/test/button.c @@ -156,7 +156,8 @@ static char* get_name(Ihandle* ih) static int action_cb(Ihandle *ih) { - printf("ACTION(%s)\n", get_name(ih)); + static int count = 1; + printf("ACTION(%s) - %d\n", get_name(ih), count); count++; return IUP_DEFAULT; } @@ -366,6 +367,7 @@ void ButtonTest(void) // IupSetAttribute(button, "ALIGNMENT", "ALEFT"); // IupSetAttribute(button, "RASTERSIZE", "200x100"); IupSetAttribute(button, "FLAT", "YES"); +// IupSetAttribute(button, "CANFOCUS", "NO"); // IupSetAttributeHandle(button, "IMPRESS", image2); // IupSetAttribute(button, "FOCUSONCLICK", "NO"); // IupSetAttribute(button, "RASTERSIZE", "15x15"); diff --git a/iup/test/config.mak b/iup/test/config.mak deleted file mode 100755 index b97ae83..0000000 --- a/iup/test/config.mak +++ /dev/null @@ -1,127 +0,0 @@ -PROJNAME = iup -APPNAME = iuptest -APPTYPE = CONSOLE - -ifdef GTK_DEFAULT - ifdef USE_MOTIF - # Build Motif version in Linux,Darwin,FreeBSD - APPNAME = iuptestmot - endif -else - ifdef USE_GTK - # Build GTK version in IRIX,SunOS,AIX,Win32 - APPNAME = iuptestgtk - endif -endif - -ifdef USE_GDK - APPNAME = iuptestgdk -endif - -INCLUDES = ../include - -USE_IUP3 = Yes -USE_STATIC = Yes -IUP = .. - -ifdef DBG_DIR - IUPLIB = $(IUP)/lib/$(TEC_UNAME)d - CDLIB = $(CD)/lib/$(TEC_UNAME)d - IMLIB = $(IM)/lib/$(TEC_UNAME)d -else - IUPLIB = $(IUP)/lib/$(TEC_UNAME) - CDLIB = $(CD)/lib/$(TEC_UNAME) - IMLIB = $(IM)/lib/$(TEC_UNAME) -endif - -# Must uncomment all SRC lines -DEFINES = BIG_TEST -SRC += bigtest.c - -SRC += tray.c -SRC += dialog.c -SRC += predialogs.c -SRC += timer.c -SRC += label.c -SRC += canvas.c -SRC += frame.c -SRC += idle.c -SRC += button.c -SRC += toggle.c -SRC += vbox.c -SRC += hbox.c -SRC += progressbar.c -SRC += text.c -SRC += val.c -SRC += tabs.c -SRC += sample.c -SRC += menu.c -SRC += spin.c -SRC += text_spin.c -SRC += list.c -SRC += sysinfo.c -SRC += mdi.c -SRC += getparam.c -SRC += getcolor.c -SRC += class_conf.c -SRC += tree.c -SRC += zbox.c -SRC += scanf.c -SRC += sbox.c -SRC += clipboard.c -SRC += split.c - - -#ifneq ($(findstring Win, $(TEC_SYSNAME)), ) -# LIBS += iupimglib -#else -# SLIB += $(IUPLIB)/libiupimglib.a -#endif - -USE_CD = Yes -SRC += canvas_scrollbar.c -SRC += canvas_cddbuffer.c -SRC += canvas_cdsimple.c - -USE_OPENGL = Yes -DEFINES += USE_OPENGL -SRC += glcanvas.c -SRC += glcanvas_cube.c - -USE_IUPCONTROLS = Yes -SRC += colorbrowser.c -SRC += dial.c -SRC += colorbar.c -SRC += cells_numbering.c -SRC += cells_degrade.c -SRC += cells_checkboard.c -SRC += gauge.c -SRC += matrix.c -SRC += matrix_cbs.c -SRC += matrix_cbmode.c - -LINKER = g++ -DEFINES += PPLOT_TEST -SRC += pplot.c -ifneq ($(findstring Win, $(TEC_SYSNAME)), ) - LIBS += iup_pplot -# LIBS += cdpdflib -# LDIR += $(IUP)/lib/$(TEC_UNAME) -else - SLIB += $(IUPLIB)/libiup_pplot.a -# SLIB += $(CDLIB)/libcdpdflib.a -endif - -ifneq ($(findstring Win, $(TEC_SYSNAME)), ) - SRC += iuptest.rc -else - ifneq ($(findstring cygw, $(TEC_UNAME)), ) - SRC += iuptest.rc - endif -endif - -#ifneq ($(findstring Win, $(TEC_SYSNAME)), ) -# USE_GDIPLUS=Yes -#else -# USE_XRENDER=Yes -#endif diff --git a/iup/test/dialog.c b/iup/test/dialog.c index 334b1cc..b1b3d89 100755 --- a/iup/test/dialog.c +++ b/iup/test/dialog.c @@ -304,10 +304,10 @@ static void new_dialog(int test, char* tip) { IupSetAttribute(dlg, "BGCOLOR", "255 0 255"); IupSetAttribute(dlg, "RESIZE", "NO"); - IupSetAttribute(dlg, "MENUBOX", "NO"); - IupSetAttribute(dlg, "MAXBOX", "NO"); - IupSetAttribute(dlg, "MINBOX", "NO"); - IupSetAttribute(dlg, "BORDER", "NO"); +// IupSetAttribute(dlg, "MENUBOX", "NO"); + //IupSetAttribute(dlg, "MAXBOX", "NO"); +// IupSetAttribute(dlg, "MINBOX", "NO"); +// IupSetAttribute(dlg, "BORDER", "NO"); IupSetAttribute(dlg, "RASTERSIZE", "500x500"); } diff --git a/iup/test/glcanvas.c b/iup/test/glcanvas.c index 6a34c29..8c8fbd2 100755 --- a/iup/test/glcanvas.c +++ b/iup/test/glcanvas.c @@ -11,6 +11,12 @@ #include "iupgl.h" +static int button_cb(Ihandle *ih,int but,int pressed,int x,int y,char* status) +{ + printf("BUTTON_CB(but=%c (pressed=%d), x=%d, y=%d [%s])\n",(char)but,pressed,x,y, status); + return IUP_DEFAULT; +} + static int action(Ihandle *ih) { IupGLMakeCurrent(ih); @@ -45,6 +51,7 @@ void GLCanvasTest(void) IupSetAttribute(canvas, "BUFFER", "DOUBLE"); IupSetAttribute(canvas, "BORDER", "NO"); IupSetAttribute(canvas, "RASTERSIZE", "300x200"); + IupSetCallback(canvas, "BUTTON_CB", (Icallback)button_cb); IupAppend(box, canvas); dlg = IupDialog(box); diff --git a/iup/test/iuptest.rc b/iup/test/iuptest.rc index 94e5ca1..ef9ffbf 100755 --- a/iup/test/iuptest.rc +++ b/iup/test/iuptest.rc @@ -1,6 +1,5 @@ TECGRAF_ICON ICON "../etc/tecgraf.ico" -TECGRAF_BITMAP BITMAP "../test/tecgraf.bmp" - +TECGRAF_BITMAP BITMAP "tecgraf.bmp" CURSOR_PEN CURSOR "../etc/pen.cur" /* To avoid the inclusion of <winuser.h> */ @@ -23,7 +22,7 @@ END #ifndef IUP_DLL /* The following line will enable Windows XP Visual Styles */ -#ifdef WIN64 +#ifdef TEC_64 1 24 "../etc/iup64.manifest" #else 1 24 "../etc/iup.manifest" diff --git a/iup/test/make_uname b/iup/test/make_uname deleted file mode 100755 index 1df8629..0000000 --- a/iup/test/make_uname +++ /dev/null @@ -1,5 +0,0 @@ -#This builds all the libraries of the folder for 1 uname - -tecmake relink $1 $2 $3 $4 $5 $6 $7 -#tecmake USE_GTK=Yes USE_GDK=Yes relink $1 $2 $3 $4 $5 $6 $7 -tecmake USE_MOTIF=Yes relink $1 $2 $3 $4 $5 $6 $7 diff --git a/iup/test/matrix_cbmode.c b/iup/test/matrix_cbmode.c index 99ac21f..57e420d 100755 --- a/iup/test/matrix_cbmode.c +++ b/iup/test/matrix_cbmode.c @@ -5,13 +5,15 @@ #include "iup.h" #include "iupcontrols.h" -//static char data[3][3][50] = -//{ -// {"1:1", "1:2", "1:3"}, -// {"2:1", "2:2", "2:3"}, -// {"3:1", "3:2", "3:3"}, -//}; - +//#define BIG_MATRIX +#ifndef BIG_MATRIX +static char data[3][3][50] = +{ + {"1:1", "1:2", "1:3"}, + {"2:1", "2:2", "2:3"}, + {"3:1", "3:2", "3:3"}, +}; +#endif static int dropcheck_cb(Ihandle *self, int lin, int col) { @@ -40,15 +42,22 @@ static int drop(Ihandle *self, Ihandle *drop, int lin, int col) static char* value_cb(Ihandle *self, int lin, int col) { +#ifdef BIG_MATRIX if (lin == 0 || col == 0) return "Title"; return "cell"; -// return data[lin-1][col-1]; +#else + if (lin == 0 || col == 0) + return NULL; + return data[lin-1][col-1]; +#endif } static int value_edit_cb(Ihandle *self, int lin, int col, char* newvalue) { -// strcpy(data[lin-1][col-1], newvalue); +#ifndef BIG_MATRIX + strcpy(data[lin-1][col-1], newvalue); +#endif return IUP_DEFAULT; } @@ -57,8 +66,13 @@ static Ihandle* create_matrix(void) Ihandle* mat = IupMatrix(NULL); int lin, col; +#ifdef BIG_MATRIX IupSetAttribute(mat, "NUMCOL", "20"); IupSetAttribute(mat, "NUMLIN", "5000"); +#else + IupSetAttribute(mat, "NUMCOL", "3"); + IupSetAttribute(mat, "NUMLIN", "3"); +#endif IupSetAttribute(mat, "NUMCOL_VISIBLE", "3"); IupSetAttribute(mat, "NUMLIN_VISIBLE", "3"); @@ -85,9 +99,12 @@ static Ihandle* create_matrix(void) //IupSetAttribute(mat, "NUMLIN_VISIBLE_LAST", "YES"); // IupSetAttribute(mat, "WIDTHDEF", "15"); -// IupSetAttribute(mat,"FRAMEVERTCOLOR1:2","BGCOLOR"); -// IupSetAttribute(mat,"FRAMEHORIZCOLOR2:1","BGCOLOR"); + IupSetAttribute(mat,"FRAMEVERTCOLOR1:2","BGCOLOR"); + IupSetAttribute(mat,"FRAMEHORIZCOLOR2:1","BGCOLOR"); +// IupSetAttribute(mat,"FRAMEVERTCOLOR1:2","255 255 255"); +// IupSetAttribute(mat,"FRAMEHORIZCOLOR2:1","255 255 255"); +#ifdef BIG_MATRIX for (lin = 0; lin < 3000; lin++) { for (col = 0; col < 20; col++) @@ -96,6 +113,7 @@ static Ihandle* create_matrix(void) IupMatSetAttribute(mat,"FGCOLOR", lin, col, "1 1 1"); } } +#endif return mat; } diff --git a/iup/test/predialogs.c b/iup/test/predialogs.c index 570dffd..a0a7bea 100755 --- a/iup/test/predialogs.c +++ b/iup/test/predialogs.c @@ -246,6 +246,7 @@ static void new_file(char* dialogtype, int preview) // IupSetAttributes(dlg, "FILE = \"test.bmp\", DIRECTORY = \"\\tecgraf\\iup\""); // OK // IupSetAttribute(dlg, "NOCHANGEDIR", "NO"); IupSetAttribute(dlg, "MULTIPLEFILES", "YES"); +// IupSetAttribute(dlg, "RASTERSIZE", "800x600"); IupSetCallback(dlg, "FILE_CB", (Icallback)file_cb); if (preview) diff --git a/iup/test/sample.c b/iup/test/sample.c index 038cffd..3c00d8d 100755 --- a/iup/test/sample.c +++ b/iup/test/sample.c @@ -138,6 +138,12 @@ static unsigned char img_bits2[] = ,3,3,3,3,3,3,3,3,3,3,3,3,3,3,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2 }; +static int copydata_cb(Ihandle* ih, char* value, int size) +{ + printf("COPYDATA(%s, %d)\n", value, size); + return IUP_DEFAULT; +} + static int valuechanged_cb(Ihandle *ih) { printf("VALUECHANGED_CB(%s)=%s\n", IupGetClassName(ih), IupGetAttribute(ih, "VALUE")); @@ -397,6 +403,11 @@ void SampleTest(void) // IupSetAttribute(box, "FGCOLOR", "255 0 0"); +// IupSetAttribute(dlg,"RASTERSIZE","1000x800"); + + IupSetCallback(dlg, "COPYDATA_CB", (Icallback)copydata_cb); + + IupMap(dlg); IupSetAttribute(tree, "TITLE0", "Figures"); @@ -407,6 +418,8 @@ void SampleTest(void) IupSetAttribute(tree, "ADDLEAF4", "scalenus"); IupShow(dlg); + +// IupSetAttribute(dlg,"RASTERSIZE", NULL); } #ifndef BIG_TEST @@ -414,6 +427,13 @@ int main(int argc, char* argv[]) { IupOpen(&argc, &argv); + IupSetGlobal("SINGLEINSTANCE", "Iup Sample"); + if (!IupGetGlobal("SINGLEINSTANCE")) + { + IupClose(); + return EXIT_SUCCESS; + } + SampleTest(); IupMainLoop(); diff --git a/iup/test/split.c b/iup/test/split.c index 7b3208a..7576e78 100644 --- a/iup/test/split.c +++ b/iup/test/split.c @@ -7,6 +7,7 @@ void SplitTest(void) bt = IupButton("Button", NULL); IupSetAttribute(bt, "EXPAND", "YES"); +// IupSetAttribute(bt, "MINSIZE", "30x"); ml = IupMultiLine(NULL); IupSetAttribute(ml, "EXPAND", "YES"); @@ -20,6 +21,7 @@ void SplitTest(void) // IupSetAttribute(split, "LAYOUTDRAG", "NO"); // IupSetAttribute(split, "AUTOHIDE", "YES"); // IupSetAttribute(split, "SHOWGRIP", "NO"); +// IupSetAttribute(split, "MINMAX", "100:800"); vbox = IupVbox(split, NULL); IupSetAttribute(vbox, "MARGIN", "10x10"); diff --git a/iup/test/tree.c b/iup/test/tree.c index ed1f6aa..0fdb04b 100755 --- a/iup/test/tree.c +++ b/iup/test/tree.c @@ -458,7 +458,7 @@ static void init_tree(void) IupSetCallback(tree, "KILLFOCUS_CB", (Icallback) killfocus_cb); //IupSetCallback(tree, "ENTERWINDOW_CB", (Icallback) enterwindow_cb); //IupSetCallback(tree, "LEAVEWINDOW_CB", (Icallback)leavewindow_cb); - //IupSetCallback(tree, "BUTTON_CB", (Icallback)button_cb); + IupSetCallback(tree, "BUTTON_CB", (Icallback)button_cb); //IupSetCallback(tree, "MOTION_CB", (Icallback)motion_cb); IupSetCallback(tree, "NODEREMOVED_CB", (Icallback)noderemoved_cb); diff --git a/iup/test/vbox.c b/iup/test/vbox.c index ac53b6b..5587a3c 100755 --- a/iup/test/vbox.c +++ b/iup/test/vbox.c @@ -30,10 +30,10 @@ void VboxTest(void) IupSetAttribute(btn_11, "SIZE", "20x10"); // IupSetAttribute(btn_12, "SIZE", "30x20"); IupSetAttribute(btn_12, "EXPAND", "VERTICAL"); - IupSetAttribute(btn_12, "EXPANDWEIGTH", "1.3"); + IupSetAttribute(btn_12, "EXPANDWEIGHT", "1.3"); // IupSetAttribute(btn_13, "SIZE", "40x30"); IupSetAttribute(btn_13, "EXPAND", "VERTICAL"); - IupSetAttribute(btn_13, "EXPANDWEIGTH", "0.7"); + IupSetAttribute(btn_13, "EXPANDWEIGHT", "0.7"); IupSetAttribute(vbox_1, "ALIGNMENT", "ALEFT"); // IupSetAttribute(vbox_1, "MARGIN", "20x20"); // IupSetAttribute(vbox_1, "GAP", "10"); |