diff options
| -rw-r--r-- | src/Callback.c | 10 | ||||
| -rw-r--r-- | src/Converters.c | 10 | ||||
| -rw-r--r-- | src/Display.c | 2 | ||||
| -rw-r--r-- | src/Manage.c | 12 | ||||
| -rw-r--r-- | src/TMaction.c | 2 |
5 files changed, 19 insertions, 17 deletions
diff --git a/src/Callback.c b/src/Callback.c index a1231ec..7413da0 100644 --- a/src/Callback.c +++ b/src/Callback.c @@ -73,11 +73,11 @@ in this Software without prior written authorization from The Open Group. #endif #include "IntrinsicI.h" -static String XtNinvalidCallbackList = "invalidCallbackList"; -static String XtNxtAddCallback = "xtAddCallback"; -static String XtNxtRemoveCallback = "xtRemoveCallback"; -static String XtNxtRemoveAllCallback = "xtRemoveAllCallback"; -static String XtNxtCallCallback = "xtCallCallback"; +static _Xconst _XtString XtNinvalidCallbackList = "invalidCallbackList"; +static _Xconst _XtString XtNxtAddCallback = "xtAddCallback"; +static _Xconst _XtString XtNxtRemoveCallback = "xtRemoveCallback"; +static _Xconst _XtString XtNxtRemoveAllCallback = "xtRemoveAllCallback"; +static _Xconst _XtString XtNxtCallCallback = "xtCallCallback"; /* However it doesn't contain a final NULL record */ #define ToList(p) ((XtCallbackList) ((p)+1)) diff --git a/src/Converters.c b/src/Converters.c index 8c8d8be..7020ca8 100644 --- a/src/Converters.c +++ b/src/Converters.c @@ -86,9 +86,9 @@ in this Software without prior written authorization from The Open Group. #define IsNewline(str) ((str) == '\n') #define IsWhitespace(str) ((str)== ' ' || (str) == '\t') -static const String XtNwrongParameters = "wrongParameters"; -static const String XtNconversionError = "conversionError"; -static const String XtNmissingCharsetList = "missingCharsetList"; +static _Xconst _XtString XtNwrongParameters = "wrongParameters"; +static _Xconst _XtString XtNconversionError = "conversionError"; +static _Xconst _XtString XtNmissingCharsetList = "missingCharsetList"; /* Representation types */ @@ -495,7 +495,9 @@ Boolean XtCvtStringToPixel( status = XAllocNamedColor(DisplayOfScreen(screen), colormap, (char*)str, &screenColor, &exactColor); if (status == 0) { - String msg, type; + _Xconst _XtString msg; + _Xconst _XtString type; + params[0] = str; /* Server returns a specific error code but Xlib discards it. Ugh */ if (XLookupColor(DisplayOfScreen(screen), colormap, (char*)str, diff --git a/src/Display.c b/src/Display.c index 0971735..ec01d29 100644 --- a/src/Display.c +++ b/src/Display.c @@ -84,7 +84,7 @@ void (*_XtProcessUnlock)(void) = NULL; void (*_XtInitAppLock)(XtAppContext) = NULL; #endif -static String XtNnoPerDisplay = "noPerDisplay"; +static _Xconst _XtString XtNnoPerDisplay = "noPerDisplay"; ProcessContext _XtGetProcessContext(void) { diff --git a/src/Manage.c b/src/Manage.c index 575be7d..4ff7219 100644 --- a/src/Manage.c +++ b/src/Manage.c @@ -73,10 +73,10 @@ in this Software without prior written authorization from The Open Group. #endif #include "IntrinsicI.h" -static String XtNinvalidChild = "invalidChild"; -static String XtNxtUnmanageChildren = "xtUnmanageChildren"; -static String XtNxtManageChildren = "xtManageChildren"; -static String XtNxtChangeManagedSet = "xtChangeManagedSet"; +static _Xconst _XtString XtNinvalidChild = "invalidChild"; +static _Xconst _XtString XtNxtUnmanageChildren = "xtUnmanageChildren"; +static _Xconst _XtString XtNxtManageChildren = "xtManageChildren"; +static _Xconst _XtString XtNxtChangeManagedSet = "xtChangeManagedSet"; static void UnmanageChildren( WidgetList children, @@ -84,7 +84,7 @@ static void UnmanageChildren( Widget parent, Cardinal* num_unique_children, Boolean call_change_managed, - String caller_func) + _Xconst _XtString caller_func) { Widget child; Cardinal i; @@ -210,7 +210,7 @@ static void ManageChildren( Cardinal num_children, Widget parent, Boolean call_change_managed, - String caller_func) + _Xconst _XtString caller_func) { #define MAXCHILDREN 100 Widget child; diff --git a/src/TMaction.c b/src/TMaction.c index 6f65e70..2e49ffc 100644 --- a/src/TMaction.c +++ b/src/TMaction.c @@ -86,7 +86,7 @@ in this Software without prior written authorization from The Open Group. #define RConst /**/ #endif -static String XtNtranslationError = "translationError"; +static _Xconst _XtString XtNtranslationError = "translationError"; typedef struct _CompiledAction{ XrmQuark signature; |