tag 336053 patch
thanks
A patch for this issue is attached.
Gruesse,
--
Frank Lichtenheld <[EMAIL PROTECTED]>
www: http://www.djpig.de/
diff -Nur --exclude batch amaya-9.2.1/Amaya/amaya/AHTURLTools.c
amaya-9.2.1.new/Amaya/amaya/AHTURLTools.c
--- amaya-9.2.1/Amaya/amaya/AHTURLTools.c 2005-08-13 00:29:15.000000000
+0000
+++ amaya-9.2.1.new/Amaya/amaya/AHTURLTools.c 2005-10-30 14:49:45.000000000
+0000
@@ -1296,7 +1296,7 @@
----------------------------------------------------------------------*/
void ExtractTarget (char *aName, char *target)
{
- int lg, i;
+ intptr_t lg, i;
char *ptr;
char *oldptr;
@@ -1318,7 +1318,7 @@
}
while (ptr);
- i = (int) (oldptr) - (int) (aName); /* name length */
+ i = (intptr_t) (oldptr) - (intptr_t) (aName); /* name length */
if (i > 1)
{
aName[i - 1] = EOS;
diff -Nur --exclude batch amaya-9.2.1/Amaya/amaya/EDITimage.c
amaya-9.2.1.new/Amaya/amaya/EDITimage.c
--- amaya-9.2.1/Amaya/amaya/EDITimage.c 2005-08-13 00:29:16.000000000 +0000
+++ amaya-9.2.1.new/Amaya/amaya/EDITimage.c 2005-10-30 14:51:51.000000000
+0000
@@ -97,11 +97,11 @@
char tempname[MAX_LENGTH];
char *name;
int i, c1, cN;
- int val;
+ intptr_t val;
ThotBool change, isHTML;
isHTML = FALSE;
- val = (int) data;
+ val = (intptr_t) data;
switch (ref - BaseImage)
{
case FormAlt:
diff -Nur --exclude batch amaya-9.2.1/Amaya/amaya/EDITstyle.c
amaya-9.2.1.new/Amaya/amaya/EDITstyle.c
--- amaya-9.2.1/Amaya/amaya/EDITstyle.c 2005-08-13 00:29:16.000000000 +0000
+++ amaya-9.2.1.new/Amaya/amaya/EDITstyle.c 2005-10-30 14:52:46.000000000
+0000
@@ -1918,9 +1918,9 @@
----------------------------------------------------------------------*/
void StyleCallbackDialogue (int ref, int typedata, char *data)
{
- int val;
+ intptr_t val;
- val = (int) data;
+ val = (intptr_t) data;
#ifdef DEBUG_CLASS_INTERF
if (typedata == INTEGER_DATA)
fprintf (stderr, "StyleCallbackDialogue(%d,%d) \n", ref, (int) data);
Binary files amaya-9.2.1/Amaya/amaya/HTML.STR and
amaya-9.2.1.new/Amaya/amaya/HTML.STR differ
Binary files amaya-9.2.1/Amaya/amaya/HTMLP.PRS and
amaya-9.2.1.new/Amaya/amaya/HTMLP.PRS differ
Binary files amaya-9.2.1/Amaya/amaya/HTMLPBW.PRS and
amaya-9.2.1.new/Amaya/amaya/HTMLPBW.PRS differ
Binary files amaya-9.2.1/Amaya/amaya/HTMLPL.PRS and
amaya-9.2.1.new/Amaya/amaya/HTMLPL.PRS differ
Binary files amaya-9.2.1/Amaya/amaya/HTMLPLL.PRS and
amaya-9.2.1.new/Amaya/amaya/HTMLPLL.PRS differ
Binary files amaya-9.2.1/Amaya/amaya/HTMLPLP.PRS and
amaya-9.2.1.new/Amaya/amaya/HTMLPLP.PRS differ
Binary files amaya-9.2.1/Amaya/amaya/HTMLPLPUS.PRS and
amaya-9.2.1.new/Amaya/amaya/HTMLPLPUS.PRS differ
Binary files amaya-9.2.1/Amaya/amaya/HTMLPP.PRS and
amaya-9.2.1.new/Amaya/amaya/HTMLPP.PRS differ
Binary files amaya-9.2.1/Amaya/amaya/HTMLPPUS.PRS and
amaya-9.2.1.new/Amaya/amaya/HTMLPPUS.PRS differ
Binary files amaya-9.2.1/Amaya/amaya/HTMLT.TRA and
amaya-9.2.1.new/Amaya/amaya/HTMLT.TRA differ
Binary files amaya-9.2.1/Amaya/amaya/HTMLT11.TRA and
amaya-9.2.1.new/Amaya/amaya/HTMLT11.TRA differ
Binary files amaya-9.2.1/Amaya/amaya/HTMLTT.TRA and
amaya-9.2.1.new/Amaya/amaya/HTMLTT.TRA differ
Binary files amaya-9.2.1/Amaya/amaya/HTMLTX.TRA and
amaya-9.2.1.new/Amaya/amaya/HTMLTX.TRA differ
Binary files amaya-9.2.1/Amaya/amaya/HTMLUSL.PRS and
amaya-9.2.1.new/Amaya/amaya/HTMLUSL.PRS differ
Binary files amaya-9.2.1/Amaya/amaya/HTMLUSLL.PRS and
amaya-9.2.1.new/Amaya/amaya/HTMLUSLL.PRS differ
diff -Nur --exclude batch amaya-9.2.1/Amaya/amaya/HTMLbook.c
amaya-9.2.1.new/Amaya/amaya/HTMLbook.c
--- amaya-9.2.1/Amaya/amaya/HTMLbook.c 2005-08-13 00:29:16.000000000 +0000
+++ amaya-9.2.1.new/Amaya/amaya/HTMLbook.c 2005-10-30 14:53:55.000000000
+0000
@@ -568,9 +568,9 @@
----------------------------------------------------------------------*/
void CallbackPrint (int ref, int typedata, char *data)
{
- int val;
+ intptr_t val;
- val = (int) data;
+ val = (intptr_t) data;
switch (ref - BasePrint)
{
case FormPrint:
diff -Nur --exclude batch amaya-9.2.1/Amaya/amaya/MENUconf.c
amaya-9.2.1.new/Amaya/amaya/MENUconf.c
--- amaya-9.2.1/Amaya/amaya/MENUconf.c 2005-08-13 00:29:16.000000000 +0000
+++ amaya-9.2.1.new/Amaya/amaya/MENUconf.c 2005-10-30 15:04:42.000000000
+0000
@@ -1072,7 +1072,7 @@
----------------------------------------------------------------------*/
static void CacheCallbackDialog (int ref, int typedata, char *data)
{
- int val;
+ intptr_t val;
if (ref == -1)
{
@@ -1082,7 +1082,7 @@
else
{
/* has the user changed the options? */
- val = (int) data;
+ val = (intptr_t) data;
switch (ref - CacheBase)
{
case CacheMenu:
@@ -1394,7 +1394,7 @@
----------------------------------------------------------------------*/
static void ProxyCallbackDialog (int ref, int typedata, char *data)
{
- int val;
+ intptr_t val;
if (ref == -1)
{
@@ -1404,7 +1404,7 @@
else
{
/* has the user changed the options? */
- val = (int) data;
+ val = (intptr_t) data;
switch (ref - ProxyBase)
{
case ProxyMenu:
@@ -2102,7 +2102,7 @@
----------------------------------------------------------------------*/
static void GeneralCallbackDialog (int ref, int typedata, char *data)
{
- int val;
+ intptr_t val;
if (ref == -1)
{
@@ -2112,7 +2112,7 @@
else
{
/* has the user changed the options? */
- val = (int) data;
+ val = (intptr_t) data;
switch (ref - GeneralBase)
{
case GeneralMenu:
@@ -2585,7 +2585,7 @@
----------------------------------------------------------------------*/
static void PublishCallbackDialog (int ref, int typedata, char *data)
{
- int val;
+ intptr_t val;
if (ref == -1)
{
@@ -2595,7 +2595,7 @@
else
{
/* has the user changed the options? */
- val = (int) data;
+ val = (intptr_t) data;
switch (ref - PublishBase)
{
case PublishMenu:
@@ -3051,7 +3051,7 @@
----------------------------------------------------------------------*/
static void BrowseCallbackDialog (int ref, int typedata, char *data)
{
- int val;
+ intptr_t val;
if (ref == -1)
/* removes the network conf menu */
@@ -3059,7 +3059,7 @@
else
{
/* has the user changed the options? */
- val = (int) data;
+ val = (intptr_t) data;
switch (ref - BrowseBase)
{
case BrowseMenu:
@@ -3415,7 +3415,7 @@
----------------------------------------------------------------------*/
static void ColorCallbackDialog (int ref, int typedata, char *data)
{
- int val;
+ intptr_t val;
if (ref == -1)
{
@@ -3425,7 +3425,7 @@
else
{
/* has the user changed the options? */
- val = (int) data;
+ val = (intptr_t) data;
switch (ref - ColorBase)
{
case ColorMenu:
@@ -3776,7 +3776,7 @@
----------------------------------------------------------------------*/
static void GeometryCallbackDialog (int ref, int typedata, char *data)
{
- int val;
+ intptr_t val;
TtaDestroyDialogue (GeometryBase + GeometryMenu);
if (ref == -1)
@@ -3787,7 +3787,7 @@
else
{
/* has the user changed the options? */
- val = (int) data;
+ val = (intptr_t) data;
switch (ref - GeometryBase)
{
case GeometryMenu:
@@ -4056,7 +4056,7 @@
----------------------------------------------------------------------*/
static void AnnotCallbackDialog (int ref, int typedata, char *data)
{
- int val;
+ intptr_t val;
if (ref == -1)
{
@@ -4066,7 +4066,7 @@
else
{
/* has the user changed the options? */
- val = (int) data;
+ val = (intptr_t) data;
switch (ref - AnnotBase)
{
case AnnotMenu:
@@ -4549,14 +4549,14 @@
static void PreferenceCallbackDialog (int ref, int typedata, char *data)
{
#ifdef _WX
- int val;
+ intptr_t val;
if (ref == -1)
TtaDestroyDialogue (PreferenceBase);
else
{
/* has the user changed the options? */
- val = (int) data;
+ val = (intptr_t) data;
switch (ref - PreferenceBase)
{
case 0:
Binary files amaya-9.2.1/Amaya/amaya/MathML.STR and
amaya-9.2.1.new/Amaya/amaya/MathML.STR differ
Binary files amaya-9.2.1/Amaya/amaya/MathMLP.PRS and
amaya-9.2.1.new/Amaya/amaya/MathMLP.PRS differ
Binary files amaya-9.2.1/Amaya/amaya/MathMLT.TRA and
amaya-9.2.1.new/Amaya/amaya/MathMLT.TRA differ
Binary files amaya-9.2.1/Amaya/amaya/MathMLTX.TRA and
amaya-9.2.1.new/Amaya/amaya/MathMLTX.TRA differ
diff -Nur --exclude batch amaya-9.2.1/Amaya/amaya/Mathedit.c
amaya-9.2.1.new/Amaya/amaya/Mathedit.c
--- amaya-9.2.1/Amaya/amaya/Mathedit.c 2005-08-13 00:29:17.000000000 +0000
+++ amaya-9.2.1.new/Amaya/amaya/Mathedit.c 2005-10-30 15:12:01.000000000
+0000
@@ -1681,7 +1681,7 @@
static void CallbackMaths (int ref, int typedata, char *data)
{
Document doc;
- int val = (int) data;
+ intptr_t val = (intptr_t) data;
ref -= MathsDialogue;
if (ref == MenuMaths1)
Binary files amaya-9.2.1/Amaya/amaya/SVG.STR and
amaya-9.2.1.new/Amaya/amaya/SVG.STR differ
Binary files amaya-9.2.1/Amaya/amaya/SVGP.PRS and
amaya-9.2.1.new/Amaya/amaya/SVGP.PRS differ
Binary files amaya-9.2.1/Amaya/amaya/SVGT.TRA and
amaya-9.2.1.new/Amaya/amaya/SVGT.TRA differ
Binary files amaya-9.2.1/Amaya/amaya/SVGTX.TRA and
amaya-9.2.1.new/Amaya/amaya/SVGTX.TRA differ
diff -Nur --exclude batch amaya-9.2.1/Amaya/amaya/SVGedit.c
amaya-9.2.1.new/Amaya/amaya/SVGedit.c
--- amaya-9.2.1/Amaya/amaya/SVGedit.c 2005-08-13 00:29:19.000000000 +0000
+++ amaya-9.2.1.new/Amaya/amaya/SVGedit.c 2005-10-30 15:10:44.000000000
+0000
@@ -2059,7 +2059,7 @@
static void CallbackGraph (int ref, int typedata, char *data)
{
Document doc;
- int val = (int) data;
+ intptr_t val = (intptr_t) data;
ref -= GraphDialogue;
if (ref == MenuGraph1)
Binary files amaya-9.2.1/Amaya/amaya/TextFile.STR and
amaya-9.2.1.new/Amaya/amaya/TextFile.STR differ
Binary files amaya-9.2.1/Amaya/amaya/TextFileP.PRS and
amaya-9.2.1.new/Amaya/amaya/TextFileP.PRS differ
Binary files amaya-9.2.1/Amaya/amaya/TextFilePL.PRS and
amaya-9.2.1.new/Amaya/amaya/TextFilePL.PRS differ
Binary files amaya-9.2.1/Amaya/amaya/TextFilePP.PRS and
amaya-9.2.1.new/Amaya/amaya/TextFilePP.PRS differ
Binary files amaya-9.2.1/Amaya/amaya/TextFilePPUS.PRS and
amaya-9.2.1.new/Amaya/amaya/TextFilePPUS.PRS differ
Binary files amaya-9.2.1/Amaya/amaya/TextFileT.TRA and
amaya-9.2.1.new/Amaya/amaya/TextFileT.TRA differ
Binary files amaya-9.2.1/Amaya/amaya/TextFileUSL.PRS and
amaya-9.2.1.new/Amaya/amaya/TextFileUSL.PRS differ
Binary files amaya-9.2.1/Amaya/amaya/Timeline.STR and
amaya-9.2.1.new/Amaya/amaya/Timeline.STR differ
Binary files amaya-9.2.1/Amaya/amaya/TimelineP.PRS and
amaya-9.2.1.new/Amaya/amaya/TimelineP.PRS differ
Binary files amaya-9.2.1/Amaya/amaya/TimelineT.TRA and
amaya-9.2.1.new/Amaya/amaya/TimelineT.TRA differ
Binary files amaya-9.2.1/Amaya/amaya/TimelineTX.TRA and
amaya-9.2.1.new/Amaya/amaya/TimelineTX.TRA differ
diff -Nur --exclude batch amaya-9.2.1/Amaya/amaya/UIcss.c
amaya-9.2.1.new/Amaya/amaya/UIcss.c
--- amaya-9.2.1/Amaya/amaya/UIcss.c 2005-08-13 00:29:19.000000000 +0000
+++ amaya-9.2.1.new/Amaya/amaya/UIcss.c 2005-10-30 15:07:32.000000000 +0000
@@ -668,12 +668,12 @@
Element el;
Element firstSel, lastSel;
char *ptr = NULL, *localname = NULL;
- int j, firstChar, lastChar;
- int val, sty;
+ int j, firstChar, lastChar, sty;
+ intptr_t val;
CSSCategory category;
ThotBool found;
- val = (int) data;
+ val = (intptr_t) data;
category = CSS_Unknown;
sty = 0; /* document style order */
switch (ref - BaseCSS)
Binary files amaya-9.2.1/Amaya/amaya/XLink.STR and
amaya-9.2.1.new/Amaya/amaya/XLink.STR differ
Binary files amaya-9.2.1/Amaya/amaya/XLinkP.PRS and
amaya-9.2.1.new/Amaya/amaya/XLinkP.PRS differ
Binary files amaya-9.2.1/Amaya/amaya/XLinkT.TRA and
amaya-9.2.1.new/Amaya/amaya/XLinkT.TRA differ
Binary files amaya-9.2.1/Amaya/amaya/XML.STR and
amaya-9.2.1.new/Amaya/amaya/XML.STR differ
Binary files amaya-9.2.1/Amaya/amaya/XMLP.PRS and
amaya-9.2.1.new/Amaya/amaya/XMLP.PRS differ
Binary files amaya-9.2.1/Amaya/amaya/XMLPL.PRS and
amaya-9.2.1.new/Amaya/amaya/XMLPL.PRS differ
Binary files amaya-9.2.1/Amaya/amaya/XMLPP.PRS and
amaya-9.2.1.new/Amaya/amaya/XMLPP.PRS differ
Binary files amaya-9.2.1/Amaya/amaya/XMLPPUS.PRS and
amaya-9.2.1.new/Amaya/amaya/XMLPPUS.PRS differ
Binary files amaya-9.2.1/Amaya/amaya/XMLT.TRA and
amaya-9.2.1.new/Amaya/amaya/XMLT.TRA differ
Binary files amaya-9.2.1/Amaya/amaya/XMLUSL.PRS and
amaya-9.2.1.new/Amaya/amaya/XMLUSL.PRS differ
diff -Nur --exclude batch amaya-9.2.1/Amaya/amaya/init.c
amaya-9.2.1.new/Amaya/amaya/init.c
--- amaya-9.2.1/Amaya/amaya/init.c 2005-08-13 00:29:20.000000000 +0000
+++ amaya-9.2.1.new/Amaya/amaya/init.c 2005-10-30 14:57:38.000000000 +0000
@@ -620,7 +620,7 @@
----------------------------------------------------------------------*/
void ExtractParameters (char *aName, char *parameters)
{
- int lg, i;
+ intptr_t lg, i;
char *ptr;
char *oldptr;
@@ -642,7 +642,7 @@
}
while (ptr);
- i = (int) (oldptr) - (int) (aName); /* name length */
+ i = (intptr_t) (oldptr) - (intptr_t) (aName); /* name length */
if (i > 1)
{
aName[i - 1] = EOS;
@@ -5794,7 +5794,7 @@
char tempfile[MAX_LENGTH];
char tempname[MAX_LENGTH];
char sep, *ptr;
- int val;
+ intptr_t val;
#if defined(_WINGUI) || defined(_WX)
int i;
#endif /* defined(_WINGUI) || defined(_WX) */
@@ -5804,7 +5804,7 @@
sep = URL_SEP;
else
sep = DIR_SEP;
- val = (int) data;
+ val = (intptr_t) data;
if (ref - BaseDialog == OptionMenu)
/* a popup menu corresponding to a SELECT element */
ReturnOption = val;
diff -Nur --exclude batch amaya-9.2.1/Amaya/amaya/libmanag.c
amaya-9.2.1.new/Amaya/amaya/libmanag.c
--- amaya-9.2.1/Amaya/amaya/libmanag.c 2005-08-13 00:29:20.000000000 +0000
+++ amaya-9.2.1.new/Amaya/amaya/libmanag.c 2005-10-30 14:59:08.000000000
+0000
@@ -606,7 +606,7 @@
void CallbackLibrary (int ref, int typedata, char *data)
{
#ifdef _SVG
- int val;
+ intptr_t val;
Document svgDoc, res, libDoc;
char *id, *buffer;
char tempname[MAX_LENGTH], pathname[MAX_LENGTH];
@@ -615,7 +615,7 @@
Element copiedElement, el = NULL;
PRule PRuleSearch;
- val = (int) data + 1;
+ val = (intptr_t) data + 1;
switch (ref - BaseLibrary)
{
case FormLibrary:
diff -Nur --exclude batch amaya-9.2.1/Amaya/amaya/trans.c
amaya-9.2.1.new/Amaya/amaya/trans.c
--- amaya-9.2.1/Amaya/amaya/trans.c 2005-08-13 00:29:20.000000000 +0000
+++ amaya-9.2.1.new/Amaya/amaya/trans.c 2005-10-30 15:05:48.000000000 +0000
@@ -2394,9 +2394,9 @@
void TransCallbackDialog (int ref, int typedata, char* data)
{
strTransDesc *trans = NULL;
- int val;
+ intptr_t val;
- val = (int) data;
+ val = (intptr_t) data;
switch (ref - TransBaseDialog)
{
case TransMenu:
diff -Nur --exclude batch amaya-9.2.1/Amaya/annotlib/ANNOTmenu.c
amaya-9.2.1.new/Amaya/annotlib/ANNOTmenu.c
--- amaya-9.2.1/Amaya/annotlib/ANNOTmenu.c 2005-08-13 00:29:21.000000000
+0000
+++ amaya-9.2.1.new/Amaya/annotlib/ANNOTmenu.c 2005-10-30 14:41:34.000000000
+0000
@@ -85,7 +85,7 @@
----------------------------------------------------------------------*/
static void CustomQueryCallbackDialog (int ref, int typedata, char *data)
{
- int val;
+ intptr_t val;
if (ref == -1)
{
@@ -95,7 +95,7 @@
else
{
/* has the user changed the options? */
- val = (int) data;
+ val = (intptr_t) data;
switch (ref - CustomQueryBase)
{
case CustomQueryMenu:
@@ -775,7 +775,7 @@
----------------------------------------------------------------------*/
static void AnnotFilterCallbackDialog (int ref, int typedata, char * data)
{
- int val;
+ intptr_t val;
if (ref == -1)
{
@@ -785,7 +785,7 @@
else
{
/* has the user changed the options? */
- val = (int) data;
+ val = (intptr_t) data;
switch (ref - AnnotFilterBase)
{
case AnnotFilterMenu:
Binary files amaya-9.2.1/Amaya/annotlib/Annot.STR and
amaya-9.2.1.new/Amaya/annotlib/Annot.STR differ
Binary files amaya-9.2.1/Amaya/annotlib/AnnotP.PRS and
amaya-9.2.1.new/Amaya/annotlib/AnnotP.PRS differ
Binary files amaya-9.2.1/Amaya/annotlib/AnnotT.TRA and
amaya-9.2.1.new/Amaya/annotlib/AnnotT.TRA differ
Binary files amaya-9.2.1/Amaya/annotlib/Topics.STR and
amaya-9.2.1.new/Amaya/annotlib/Topics.STR differ
Binary files amaya-9.2.1/Amaya/annotlib/TopicsP.PRS and
amaya-9.2.1.new/Amaya/annotlib/TopicsP.PRS differ
diff -Nur --exclude batch
amaya-9.2.1/Amaya/thotlib/dialogue/AmayaApplyClassPanel.cpp
amaya-9.2.1.new/Amaya/thotlib/dialogue/AmayaApplyClassPanel.cpp
--- amaya-9.2.1/Amaya/thotlib/dialogue/AmayaApplyClassPanel.cpp 2005-08-13
00:29:30.000000000 +0000
+++ amaya-9.2.1.new/Amaya/thotlib/dialogue/AmayaApplyClassPanel.cpp
2005-10-30 13:44:22.000000000 +0000
@@ -124,16 +124,16 @@
*/
void AmayaApplyClassPanel::SendDataToPanel( AmayaParams& p )
{
- int nb_class = (long int)p.param1;
+ intptr_t nb_class = (intptr_t)p.param1;
const char * listBuffer = (char *)p.param2;
const char * currentClass = (char *)p.param3;
- int ref = (int)p.param4;;
+ intptr_t ref = (intptr_t)p.param4;;
m_ApplyClassRef = ref;
/* fill the list */
m_pClassList->Clear();
- int i = 0;
+ intptr_t i = 0;
int index = 0;
while (i < nb_class && listBuffer[index] != EOS)
{
diff -Nur --exclude batch
amaya-9.2.1/Amaya/thotlib/dialogue/AmayaAttributePanel.cpp
amaya-9.2.1.new/Amaya/thotlib/dialogue/AmayaAttributePanel.cpp
--- amaya-9.2.1/Amaya/thotlib/dialogue/AmayaAttributePanel.cpp 2005-08-13
00:29:30.000000000 +0000
+++ amaya-9.2.1.new/Amaya/thotlib/dialogue/AmayaAttributePanel.cpp
2005-10-30 14:01:57.000000000 +0000
@@ -125,18 +125,18 @@
----------------------------------------------------------------------*/
void AmayaAttributePanel::SendDataToPanel( AmayaParams& p )
{
- int action_id = (int)p.param1;
+ intptr_t action_id = (intptr_t)p.param1;
switch ( action_id )
{
case wxATTR_ACTION_LISTUPDATE:
ShowAttributValue( wxATTR_TYPE_NONE );
- SetupListValue( (const char *)p.param2, (int)p.param3, (const int
*)p.param4, (const char *)p.param5, (int)p.param6, (const int *)p.param7 );
+ SetupListValue( (const char *)p.param2, (intptr_t)p.param3, (const int
*)p.param4, (const char *)p.param5, (intptr_t)p.param6, (const int *)p.param7 );
break;
case wxATTR_ACTION_SETUPLANG:
m_CurrentAttType = wxATTR_TYPE_LANG;
ShowAttributValue( wxATTR_TYPE_LANG );
SetMandatoryState( p.param2 != NULL );
- SetupLangValue( (const char *)p.param3,(const char *)p.param4, (const
char *)p.param5, (int)p.param6, (int)p.param7 );
+ SetupLangValue( (const char *)p.param3,(const char *)p.param4, (const
char *)p.param5, (intptr_t)p.param6, (intptr_t)p.param7 );
break;
case wxATTR_ACTION_SETUPTEXT:
m_CurrentAttType = wxATTR_TYPE_TEXT;
@@ -148,13 +148,13 @@
m_CurrentAttType = wxATTR_TYPE_ENUM;
ShowAttributValue( wxATTR_TYPE_ENUM );
SetMandatoryState( p.param2 != NULL );
- SetupEnumValue( (const char *)p.param3, (int)p.param4, (int)p.param5 );
+ SetupEnumValue( (const char *)p.param3, (intptr_t)p.param4,
(intptr_t)p.param5 );
break;
case wxATTR_ACTION_SETUPNUM:
m_CurrentAttType = wxATTR_TYPE_NUM;
ShowAttributValue( wxATTR_TYPE_NUM );
SetMandatoryState( p.param2 != NULL );
- SetupNumValue( (int)p.param3 );
+ SetupNumValue( (intptr_t)p.param3 );
break;
}
}
diff -Nur --exclude batch
amaya-9.2.1/Amaya/thotlib/dialogue/AmayaCharStylePanel.cpp
amaya-9.2.1.new/Amaya/thotlib/dialogue/AmayaCharStylePanel.cpp
--- amaya-9.2.1/Amaya/thotlib/dialogue/AmayaCharStylePanel.cpp 2005-08-13
00:29:30.000000000 +0000
+++ amaya-9.2.1.new/Amaya/thotlib/dialogue/AmayaCharStylePanel.cpp
2005-10-30 14:04:34.000000000 +0000
@@ -160,11 +160,11 @@
*/
void AmayaCharStylePanel::SendDataToPanel( AmayaParams& p )
{
- int font_family = (int)p.param1;
- int font_style = (int)p.param2;
- int font_weight = (int)p.param3;
- int font_underline = (int)p.param4;
- int font_size = (int)p.param5;
+ intptr_t font_family = (intptr_t)p.param1;
+ intptr_t font_style = (intptr_t)p.param2;
+ intptr_t font_weight = (intptr_t)p.param3;
+ intptr_t font_underline = (intptr_t)p.param4;
+ intptr_t font_size = (intptr_t)p.param5;
XRCCTRL(*m_pPanelContentDetach, "wxID_CHOICE_FONTFAMILY",
wxChoice)->SetSelection(font_family);
XRCCTRL(*m_pPanelContentDetach, "wxID_CHOICE_UNDERLINE",
wxChoice)->SetSelection(font_underline);
diff -Nur --exclude batch
amaya-9.2.1/Amaya/thotlib/dialogue/AmayaFormatPanel.cpp
amaya-9.2.1.new/Amaya/thotlib/dialogue/AmayaFormatPanel.cpp
--- amaya-9.2.1/Amaya/thotlib/dialogue/AmayaFormatPanel.cpp 2005-08-13
00:29:30.000000000 +0000
+++ amaya-9.2.1.new/Amaya/thotlib/dialogue/AmayaFormatPanel.cpp 2005-10-30
14:06:07.000000000 +0000
@@ -129,10 +129,10 @@
*/
void AmayaFormatPanel::SendDataToPanel( AmayaParams& p )
{
- int modif_type = (int)p.param1;
- int align_num = (int)p.param2;
- int indent_value = (int)p.param3;
- int line_space_value = (int)p.param4;
+ intptr_t modif_type = (intptr_t)p.param1;
+ intptr_t align_num = (intptr_t)p.param2;
+ intptr_t indent_value = (intptr_t)p.param3;
+ intptr_t line_space_value = (intptr_t)p.param4;
if ( modif_type & wxFORMAT_MODIF_FORMAT)
{
diff -Nur --exclude batch
amaya-9.2.1/Amaya/thotlib/dialogue/AmayaSpeCharPanel.cpp
amaya-9.2.1.new/Amaya/thotlib/dialogue/AmayaSpeCharPanel.cpp
--- amaya-9.2.1/Amaya/thotlib/dialogue/AmayaSpeCharPanel.cpp 2005-08-13
00:29:30.000000000 +0000
+++ amaya-9.2.1.new/Amaya/thotlib/dialogue/AmayaSpeCharPanel.cpp
2005-10-30 14:10:56.000000000 +0000
@@ -354,7 +354,7 @@
*/
void AmayaSpeCharPanel::SendDataToPanel( AmayaParams& p )
{
- int action = (int)p.param1;
+ intptr_t action = (intptr_t)p.param1;
if (action == wxSPECHAR_ACTION_INIT)
{
XmlEntity *MathEntityTable = (XmlEntity *)p.param2;
diff -Nur --exclude batch amaya-9.2.1/Amaya/thotlib/dialogue/AmayaXMLPanel.cpp
amaya-9.2.1.new/Amaya/thotlib/dialogue/AmayaXMLPanel.cpp
--- amaya-9.2.1/Amaya/thotlib/dialogue/AmayaXMLPanel.cpp 2005-08-13
00:29:30.000000000 +0000
+++ amaya-9.2.1.new/Amaya/thotlib/dialogue/AmayaXMLPanel.cpp 2005-10-30
14:08:20.000000000 +0000
@@ -109,18 +109,18 @@
*/
void AmayaXMLPanel::SendDataToPanel( AmayaParams& p )
{
- int nb_el = (int)p.param1;
+ intptr_t nb_el = (intptr_t)p.param1;
const char * listBuffer = (char *)p.param2;
const char * currentEl = (char *)p.param3;
- int ref = (int)p.param4;;
+ intptr_t ref = (intptr_t)p.param4;;
m_XMLRef = ref;
/* fill the list */
m_pXMLList->Clear();
- int i = 0;
+ intptr_t i = 0;
int index = 0;
- int sel = 0;
+ intptr_t sel = 0;
while (i < nb_el && listBuffer[index] != EOS)
{
m_pXMLList->Append( TtaConvMessageToWX( &listBuffer[index] ) );
diff -Nur --exclude batch amaya-9.2.1/Amaya/thotlib/dialogue/appdialogue.c
amaya-9.2.1.new/Amaya/thotlib/dialogue/appdialogue.c
--- amaya-9.2.1/Amaya/thotlib/dialogue/appdialogue.c 2005-08-13
00:29:30.000000000 +0000
+++ amaya-9.2.1.new/Amaya/thotlib/dialogue/appdialogue.c 2005-10-30
14:16:26.000000000 +0000
@@ -4295,23 +4295,23 @@
(*(Proc3)ThotLocalActions[T_rcinsertpaste]) (
(void *)TRUE,
(void *)FALSE,
- (void *)((int) data + 1) );
+ (void *)((intptr_t) data + 1) );
break;
case NumMenuPaste:
(*(Proc3)ThotLocalActions[T_rcinsertpaste]) (
(void *)FALSE,
(void *)TRUE,
- (void *)((int) data + 1));
+ (void *)((intptr_t) data + 1));
break;
case NumMenuInclude:
(*(Proc3)ThotLocalActions[T_rcinsertpaste]) (
(void *)FALSE,
(void *)FALSE,
- (void *)((int) data + 1));
+ (void *)((intptr_t) data + 1));
break;
case NumMenuElChoice:
(*(Proc2)ThotLocalActions[T_rchoice]) (
- (void *)((int) data + 1),
+ (void *)((intptr_t) data + 1),
(void *)NULL);
break;
case NumSelectNatureName:
@@ -4326,7 +4326,7 @@
case NumMenuAttrEnumNeeded:
(*(Proc3)ThotLocalActions[T_rattrreq]) (
(void *)ref,
- (void *)((int) data),
+ (void *)((intptr_t) data),
(void *)data);
break;
case NumMenuAttr:
@@ -4335,7 +4335,7 @@
case NumMenuAttrEnum:
(*(Proc3)ThotLocalActions[T_rattrval]) (
(void *)ref,
- (void *)((int) data),
+ (void *)((intptr_t) data),
(void *)data);
break;
@@ -4349,7 +4349,7 @@
case NumMenuAlphaLanguage:
(*(Proc3)ThotLocalActions[T_rattrlang]) (
(void *)ref,
- (void *)((int) data),
+ (void *)((intptr_t) data),
(void *)NULL);
break;
case NumFormClose:
@@ -4380,7 +4380,7 @@
case NumTogglePatternUnchanged:
(*(Proc3)ThotLocalActions[T_present]) (
(void *)ref,
- (void *)(int) data,
+ (void *)(intptr_t) data,
(void *)NULL);
break;
case NumSelectPattern:
@@ -4395,7 +4395,7 @@
case NumMenuPresentStandard:
(*(Proc2)ThotLocalActions[T_presentstd]) (
(void *)ref,
- (void *)((int) data));
+ (void *)((intptr_t) data));
break;
case NumFormSearchText:
case NumMenuReplaceMode:
@@ -4404,7 +4404,7 @@
/* sous-menu mode de remplacement */
(*(Proc3)ThotLocalActions[T_searchtext]) (
(void *)ref,
- (void *)((int) data),
+ (void *)((intptr_t) data),
(void *)NULL);
break;
case NumZoneTextSearch:
@@ -4420,10 +4420,10 @@
case NumMenuOrSearchText:
(*(Proc2)ThotLocalActions[T_locatesearch]) (
(void *)ref,
- (void *)((int) data));
+ (void *)((intptr_t) data));
break;
case NumFormElemToBeCreated:
- CallbackElemToBeCreated (ref, (int)data, NULL);
+ CallbackElemToBeCreated (ref, (intptr_t)data, NULL);
break;
case NumSelectElemToBeCreated:
CallbackElemToBeCreated (ref, 0, data);
@@ -4438,7 +4438,7 @@
#endif /* #if defined(_GTK) */
(*(Proc3)ThotLocalActions[T_rattr]) (
(void *)ref,
- (void *)((int) data),
+ (void *)((intptr_t) data),
(void *)ActiveFrame);
}
break;
@@ -4477,7 +4477,7 @@
#endif /* #if defined(_GTK) */
(*(Proc3)ThotLocalActions[T_rattr]) (
(void *)ref,
- (void *)((int) data),
+ (void *)((intptr_t) data),
(void *)frame);
return;
}
@@ -4493,7 +4493,7 @@
TtaSetDialoguePosition ();
#endif /* #if defined(_GTK) */
(*(Proc3)ThotLocalActions[T_rselect]) ((void *)ref,
- (void *)((int) data + 1),
+ (void *)((intptr_t) data +
1),
(void *)frame);
return;
}
@@ -4523,7 +4523,7 @@
if (ptrmenu)
{
- item = (int) data;
+ item = (intptr_t) data;
if (item < ptrmenu->ItemsNb && ptrmenu->ItemsList != NULL)
{
for (i = 0; i <= item; i++)
@@ -4534,7 +4534,7 @@
item++;
}
}
- /*action = GetActionItem(frame, menu, (int)data); */
+ /*action = GetActionItem(frame, menu, (intptr_t)data); */
if (action > 0 && action < MaxMenuAction)
/* l'action existe et le menu est actif */
#ifdef _WX
diff -Nur --exclude batch amaya-9.2.1/Amaya/thotlib/dialogue/printmenu.c
amaya-9.2.1.new/Amaya/thotlib/dialogue/printmenu.c
--- amaya-9.2.1/Amaya/thotlib/dialogue/printmenu.c 2005-08-13
00:29:30.000000000 +0000
+++ amaya-9.2.1.new/Amaya/thotlib/dialogue/printmenu.c 2005-10-30
14:20:25.000000000 +0000
@@ -357,9 +357,9 @@
printArgc++;
#else /* _WINDOWS */
#ifndef _WX
- sprintf (&cmd[i], " -w%u", (unsigned int) FrRef[0]);
+ sprintf (&cmd[i], " -w%u", (uintptr_t) FrRef[0]);
#else /* _WX */
- sprintf (&cmd[i], " -w%u", (unsigned int) FrameTable[0].WdFrame);
+ sprintf (&cmd[i], " -w%u", (uintptr_t) FrameTable[0].WdFrame);
#endif /* _WX */
#endif /* _WINDOWS */
}
diff -Nur --exclude batch amaya-9.2.1/Amaya/thotlib/editing/checkermenu.c
amaya-9.2.1.new/Amaya/thotlib/editing/checkermenu.c
--- amaya-9.2.1/Amaya/thotlib/editing/checkermenu.c 2005-08-13
00:29:31.000000000 +0000
+++ amaya-9.2.1.new/Amaya/thotlib/editing/checkermenu.c 2005-10-30
14:25:03.000000000 +0000
@@ -786,7 +786,7 @@
switch (ref - SpellingBase)
{
case ChkrMenuIgnore:
- switch ((int) data)
+ switch ((intptr_t) data)
{
case 0:
/* ignorer les mots ecrits en majuscule */
@@ -820,7 +820,7 @@
break;
case ChkrMenuOR:
/* definition du sens de correction OU? */
- switch ((int) data)
+ switch ((intptr_t) data)
{
case 0: /* ElemIsBefore la selection */
ChkrRange->SStartToEnd = FALSE;
@@ -838,7 +838,7 @@
/* La premiere fois on initialise le domaine de recherche */
if (FirstStep)
{
- InitSearchDomain ((int) data, ChkrRange);
+ InitSearchDomain ((intptr_t) data, ChkrRange);
/* On prepare la recheche suivante */
#ifdef _GTK
if (ChkrRange->SStartToEnd)
@@ -878,7 +878,7 @@
case ChkrFormCorrect:
/* retour de la feuille de dialogue CORRECTION */
/* effectuer l'action demandee */
- ApplyCommand ((int) data);
+ ApplyCommand ((intptr_t) data);
break;
}
}
