Skip to content

Commit 3f8eb99

Browse files
jagtjagt
committed
update iup to 3.16 and set dpi aware in manifest
1 parent 6df6a1d commit 3f8eb99

File tree

597 files changed

+9854
-2680
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

597 files changed

+9854
-2680
lines changed

‎etc/clumsy.manifest

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
33
<!-- the funky thing is that the version MUST be x.x.x.x, see msdn for info -->
44
<assemblyIdentity
5-
version="0.1.0.0"
5+
version="0.2.0.0"
66
processorArchitecture="x86"
77
name="clumsy"
88
type="win32"
@@ -20,4 +20,34 @@
2020
/>
2121
</dependentAssembly>
2222
</dependency>
23+
<!-- copied from iup 3.16 manifest -->
24+
<asmv3:application>
25+
<asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
26+
<dpiAware>true</dpiAware>
27+
</asmv3:windowsSettings>
28+
</asmv3:application>
29+
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
30+
<security>
31+
<requestedPrivileges>
32+
<requestedExecutionLevel
33+
level="asInvoker"
34+
uiAccess="false"
35+
/>
36+
</requestedPrivileges>
37+
</security>
38+
</trustInfo>
39+
<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
40+
<application>
41+
<!-- Windows 10 -->
42+
<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
43+
<!-- Windows 8.1 -->
44+
<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
45+
<!-- Windows Vista -->
46+
<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
47+
<!-- Windows 7 -->
48+
<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
49+
<!-- Windows 8 -->
50+
<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
51+
</application>
52+
</compatibility>
2353
</assembly>

‎etc/clumsy64.manifest

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
33
<!-- the funky thing is that the version MUST be x.x.x.x, see msdn for info -->
44
<assemblyIdentity
5-
version="0.1.0.0"
5+
version="0.2.0.0"
66
processorArchitecture="amd64"
77
name="clumsy"
88
type="win32"
@@ -20,4 +20,34 @@
2020
/>
2121
</dependentAssembly>
2222
</dependency>
23+
<!-- copied from iup 3.16 manifest -->
24+
<asmv3:application>
25+
<asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
26+
<dpiAware>true</dpiAware>
27+
</asmv3:windowsSettings>
28+
</asmv3:application>
29+
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
30+
<security>
31+
<requestedPrivileges>
32+
<requestedExecutionLevel
33+
level="asInvoker"
34+
uiAccess="false"
35+
/>
36+
</requestedPrivileges>
37+
</security>
38+
</trustInfo>
39+
<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
40+
<application>
41+
<!-- Windows 10 -->
42+
<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
43+
<!-- Windows 8.1 -->
44+
<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
45+
<!-- Windows Vista -->
46+
<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
47+
<!-- Windows 7 -->
48+
<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
49+
<!-- Windows 8 -->
50+
<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
51+
</application>
52+
</compatibility>
2353
</assembly>

‎external/iup-3.8_Win32_dll11_lib/include/iup.h renamed to ‎external/iup-3.16_Win32_dll11_lib/include/iup.h

Lines changed: 122 additions & 65 deletions
Large diffs are not rendered by default.

‎external/iup-3.16_Win32_dll11_lib/include/iup_class_cbs.hpp

Lines changed: 470 additions & 0 deletions
Large diffs are not rendered by default.

‎external/iup-3.16_Win32_dll11_lib/include/iup_config.h

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
/** \file
2+
* \brief Configuration file Utilities
3+
*
4+
* See Copyright Notice in "iup.h"
5+
*/
6+
7+
#ifndef IUP_CONFIG_H
8+
#define IUP_CONFIG_H
9+
10+
#if defined(__cplusplus)
11+
extern "C" {
12+
#endif
13+
14+
Ihandle* IupConfig(void);
15+
16+
int IupConfigLoad(Ihandle* ih);
17+
int IupConfigSave(Ihandle* ih);
18+
19+
/****************************************************************/
20+
21+
void IupConfigSetVariableStr(Ihandle* ih, const char* group, const char* key, const char* value);
22+
void IupConfigSetVariableStrId(Ihandle* ih, const char* group, const char* key, int id, const char* value);
23+
void IupConfigSetVariableInt(Ihandle* ih, const char* group, const char* key, int value);
24+
void IupConfigSetVariableIntId(Ihandle* ih, const char* group, const char* key, int id, int value);
25+
void IupConfigSetVariableDouble(Ihandle* ih, const char* group, const char* key, double value);
26+
void IupConfigSetVariableDoubleId(Ihandle* ih, const char* group, const char* key, int id, double value);
27+
28+
const char* IupConfigGetVariableStr(Ihandle* ih, const char* group, const char* key);
29+
const char* IupConfigGetVariableStrId(Ihandle* ih, const char* group, const char* key, int id);
30+
int IupConfigGetVariableInt(Ihandle* ih, const char* group, const char* key);
31+
int IupConfigGetVariableIntId(Ihandle* ih, const char* group, const char* key, int id);
32+
double IupConfigGetVariableDouble(Ihandle* ih, const char* group, const char* key);
33+
double IupConfigGetVariableDoubleId(Ihandle* ih, const char* group, const char* key, int id);
34+
35+
const char* IupConfigGetVariableStrDef(Ihandle* ih, const char* group, const char* key, const char* def);
36+
const char* IupConfigGetVariableStrIdDef(Ihandle* ih, const char* group, const char* key, int id, const char* def);
37+
int IupConfigGetVariableIntDef(Ihandle* ih, const char* group, const char* key, int def);
38+
int IupConfigGetVariableIntIdDef(Ihandle* ih, const char* group, const char* key, int id, int def);
39+
double IupConfigGetVariableDoubleDef(Ihandle* ih, const char* group, const char* key, double def);
40+
double IupConfigGetVariableDoubleIdDef(Ihandle* ih, const char* group, const char* key, int id, double def);
41+
42+
/****************************************************************/
43+
44+
void IupConfigRecentInit(Ihandle* ih, Ihandle* menu, Icallback recent_cb, int max_recent);
45+
void IupConfigRecentUpdate(Ihandle* ih, const char* filename);
46+
47+
void IupConfigDialogShow(Ihandle* ih, Ihandle* dialog, const char* name);
48+
void IupConfigDialogClosed(Ihandle* ih, Ihandle* dialog, const char* name);
49+
50+
51+
#if defined(__cplusplus)
52+
}
53+
#endif
54+
55+
#endif

‎external/iup-3.16_Win32_dll11_lib/include/iup_mglplot.h

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
/** \file
2+
* \brief Plot component for Iup.
3+
*
4+
* See Copyright Notice in "iup.h"
5+
*/
6+
7+
#ifndef __IUP_MGLPLOT_H
8+
#define __IUP_MGLPLOT_H
9+
10+
#ifdef __cplusplus
11+
extern "C" {
12+
#endif
13+
14+
/* Initialize IupMglPlot widget class */
15+
void IupMglPlotOpen(void);
16+
17+
/* Create an IupMglPlot widget instance */
18+
Ihandle* IupMglPlot(void);
19+
20+
/***********************************************/
21+
/* Additional API */
22+
23+
/* Linear Data Only */
24+
void IupMglPlotBegin(Ihandle *ih, int dim);
25+
void IupMglPlotAdd1D(Ihandle *ih, const char* name, double y);
26+
void IupMglPlotAdd2D(Ihandle *ih, double x, double y);
27+
void IupMglPlotAdd3D(Ihandle *ih, double x, double y, double z);
28+
int IupMglPlotEnd(Ihandle *ih);
29+
30+
/* Linear (dim=1,2,3), Planar (dim=1), Volumetric (dim=1) */
31+
int IupMglPlotNewDataSet(Ihandle *ih, int dim);
32+
33+
/* Linear Data Only */
34+
void IupMglPlotInsert1D(Ihandle* ih, int ds_index, int sample_index, const char** names, const double* y, int count);
35+
void IupMglPlotInsert2D(Ihandle* ih, int ds_index, int sample_index, const double* x, const double* y, int count);
36+
void IupMglPlotInsert3D(Ihandle* ih, int ds_index, int sample_index, const double* x, const double* y, const double* z, int count);
37+
38+
/* Linear Data Only */
39+
void IupMglPlotSet1D(Ihandle* ih, int ds_index, const char** names, const double* y, int count);
40+
void IupMglPlotSet2D(Ihandle* ih, int ds_index, const double* x, const double* y, int count);
41+
void IupMglPlotSet3D(Ihandle* ih, int ds_index, const double* x, const double* y, const double* z, int count);
42+
void IupMglPlotSetFormula(Ihandle* ih, int ds_index, const char* formulaX, const char* formulaY, const char* formulaZ, int count);
43+
44+
/* Linear (dim=1), Planar (dim=1), Volumetric (dim=1) */
45+
void IupMglPlotSetData(Ihandle* ih, int ds_index, const double* data, int count_x, int count_y, int count_z);
46+
void IupMglPlotLoadData(Ihandle* ih, int ds_index, const char* filename, int count_x, int count_y, int count_z);
47+
void IupMglPlotSetFromFormula(Ihandle* ih, int ds_index, const char* formula, int count_x, int count_y, int count_z);
48+
49+
/* Only inside callbacks */
50+
void IupMglPlotTransform(Ihandle* ih, double x, double y, double z, int *ix, int *iy);
51+
void IupMglPlotTransformTo(Ihandle* ih, int ix, int iy, double *x, double *y, double *z);
52+
53+
/* Only inside callbacks */
54+
void IupMglPlotDrawMark(Ihandle* ih, double x, double y, double z);
55+
void IupMglPlotDrawLine(Ihandle* ih, double x1, double y1, double z1, double x2, double y2, double z2);
56+
void IupMglPlotDrawText(Ihandle* ih, const char* text, double x, double y, double z);
57+
58+
void IupMglPlotPaintTo(Ihandle *ih, const char* format, int w, int h, double dpi, void *data);
59+
60+
/***********************************************/
61+
62+
/* Utility label for showing TeX labels */
63+
Ihandle* IupMglLabel(const char* title);
64+
65+
66+
#ifdef __cplusplus
67+
}
68+
#endif
69+
70+
#endif

‎external/iup-3.16_Win32_dll11_lib/include/iup_plot.h

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
/** \file
2+
* \brief Plot component for Iup.
3+
*
4+
* See Copyright Notice in "iup.h"
5+
*/
6+
7+
#ifndef __IUP_PLOT_H
8+
#define __IUP_PLOT_H
9+
10+
#ifdef __cplusplus
11+
extern "C" {
12+
#endif
13+
14+
/* Initialize IupPlot widget class */
15+
void IupPlotOpen(void);
16+
17+
/* Create an IupPlot widget instance */
18+
Ihandle* IupPlot(void);
19+
20+
/***********************************************/
21+
/* Additional API */
22+
23+
void IupPlotBegin(Ihandle *ih, int strXdata);
24+
void IupPlotAdd(Ihandle *ih, double x, double y);
25+
void IupPlotAddStr(Ihandle *ih, const char* x, double y);
26+
void IupPlotAddSegment(Ihandle *ih, double x, double y);
27+
int IupPlotEnd(Ihandle *ih);
28+
29+
int IupPlotLoadData(Ihandle* ih, const char* filename, int strXdata);
30+
31+
/* available only when linking with "iupluaplot" */
32+
int IupPlotSetFormula(Ihandle* ih, int sample_count, const char* formula, const char* init);
33+
34+
void IupPlotInsert(Ihandle *ih, int ds_index, int sample_index, double x, double y);
35+
void IupPlotInsertStr(Ihandle *ih, int ds_index, int sample_index, const char* x, double y);
36+
void IupPlotInsertSegment(Ihandle *ih, int ds_index, int sample_index, double x, double y);
37+
38+
void IupPlotInsertStrSamples(Ihandle* ih, int ds_index, int sample_index, const char** x, double* y, int count);
39+
void IupPlotInsertSamples(Ihandle* ih, int ds_index, int sample_index, double *x, double *y, int count);
40+
41+
void IupPlotAddSamples(Ihandle* ih, int ds_index, double *x, double *y, int count);
42+
void IupPlotAddStrSamples(Ihandle* ih, int ds_index, const char** x, double* y, int count);
43+
44+
void IupPlotGetSample(Ihandle* ih, int ds_index, int sample_index, double *x, double *y);
45+
void IupPlotGetSampleStr(Ihandle* ih, int ds_index, int sample_index, const char* *x, double *y);
46+
int IupPlotGetSampleSelection(Ihandle* ih, int ds_index, int sample_index);
47+
void IupPlotSetSample(Ihandle* ih, int ds_index, int sample_index, double x, double y);
48+
void IupPlotSetSampleStr(Ihandle* ih, int ds_index, int sample_index, const char* x, double y);
49+
void IupPlotSetSampleSelection(Ihandle* ih, int ds_index, int sample_index, int selected);
50+
51+
void IupPlotTransform(Ihandle* ih, double x, double y, double *cnv_x, double *cnv_y);
52+
void IupPlotTransformTo(Ihandle* ih, double cnv_x, double cnv_y, double *x, double *y);
53+
54+
int IupPlotFindSample(Ihandle* ih, double cnv_x, double cnv_y, int *ds_index, int *sample_index);
55+
56+
struct _cdCanvas;
57+
58+
void IupPlotPaintTo(Ihandle *ih, struct _cdCanvas* cnv);
59+
60+
/***********************************************/
61+
62+
63+
#ifdef __cplusplus
64+
}
65+
#endif
66+
67+
#endif

0 commit comments

Comments
 (0)