| diff -up dx-4.4.4/src/uipp/startup/StartupApplication.C.gcc43 dx-4.4.4/src/uipp/startup/StartupApplication.C |
| --- dx-4.4.4/src/uipp/startup/StartupApplication.C.gcc43 2005-11-10 20:48:22.000000000 +0100 |
| +++ dx-4.4.4/src/uipp/startup/StartupApplication.C 2008-01-07 21:55:03.000000000 +0100 |
| @@ -117,7 +117,7 @@ InitializeSignals(void) |
| #endif |
| } |
| |
| -boolean StartupApplication::initialize(unsigned int* argcp, |
| +boolean StartupApplication::initialize(int* argcp, |
| char** argv) |
| { |
| ASSERT(argcp); |
| diff -up dx-4.4.4/src/uipp/startup/StartupApplication.h.gcc43 dx-4.4.4/src/uipp/startup/StartupApplication.h |
| --- dx-4.4.4/src/uipp/startup/StartupApplication.h.gcc43 2003-09-20 07:33:56.000000000 +0200 |
| +++ dx-4.4.4/src/uipp/startup/StartupApplication.h 2008-01-07 21:50:47.000000000 +0100 |
| @@ -84,7 +84,7 @@ class StartupApplication : public IBMApp |
| // Overrides the Application class version: |
| // Initializes Xt Intrinsics with option list (switches). |
| // |
| - virtual boolean initialize(unsigned int* argcp, char**argv); |
| + virtual boolean initialize(int* argcp, char**argv); |
| |
| CommandScope *commandScope; // command scope |
| |
| diff -up dx-4.4.4/src/uipp/startup/Main.C.gcc43 dx-4.4.4/src/uipp/startup/Main.C |
| --- dx-4.4.4/src/uipp/startup/Main.C.gcc43 2000-05-16 20:53:07.000000000 +0200 |
| +++ dx-4.4.4/src/uipp/startup/Main.C 2008-01-07 19:57:58.000000000 +0100 |
| @@ -14,7 +14,7 @@ |
| extern "C" void HCLXmInit(); |
| #endif |
| |
| -int main(unsigned int argc, |
| +int main( int argc, |
| char** argv) |
| { |
| #if defined(HAVE_HCLXMINIT) |
| diff -up dx-4.4.4/src/uipp/base/Application.C.gcc43 dx-4.4.4/src/uipp/base/Application.C |
| --- dx-4.4.4/src/uipp/base/Application.C.gcc43 2005-11-09 19:56:17.000000000 +0100 |
| +++ dx-4.4.4/src/uipp/base/Application.C 2008-01-07 22:39:15.000000000 +0100 |
| @@ -136,7 +136,7 @@ void Application::installDefaultResource |
| //this->setDefaultResources(baseWidget, Application::DefaultResources); |
| } |
| |
| -boolean Application::initializeWindowSystem(unsigned int *argcp, char **argv) |
| +boolean Application::initializeWindowSystem(int *argcp, char **argv) |
| { |
| |
| // |
| @@ -149,7 +149,7 @@ boolean Application::initializeWindowSys |
| NULL, // command line options table |
| 0, // number of entries in options table |
| #if XtSpecificationRelease > 4 |
| - (int*)argcp, |
| + argcp, |
| #else |
| argcp, |
| #endif |
| @@ -235,7 +235,7 @@ boolean Application::initializeWindowSys |
| return TRUE; |
| } |
| |
| -void Application::parseCommand(unsigned int* argcp, char** argv, |
| +void Application::parseCommand(int* argcp, char** argv, |
| XrmOptionDescList optlist, int optlistsize) |
| { |
| char res_file[256]; |
| @@ -280,7 +280,7 @@ void Application::parseCommand(unsigned |
| // |
| } |
| |
| -boolean Application::initialize(unsigned int* argcp, char** argv) |
| +boolean Application::initialize(int* argcp, char** argv) |
| { |
| // |
| // Initialize the window system if not done already. |
| diff -up dx-4.4.4/src/uipp/base/Application.h.gcc43 dx-4.4.4/src/uipp/base/Application.h |
| --- dx-4.4.4/src/uipp/base/Application.h.gcc43 2005-11-09 19:26:29.000000000 +0100 |
| +++ dx-4.4.4/src/uipp/base/Application.h 2008-01-07 21:49:49.000000000 +0100 |
| @@ -49,7 +49,7 @@ class Application : public UIComponent, |
| // |
| // The main program needs to access protected member functions. |
| // |
| - friend int main(unsigned int argc, |
| + friend int main( int argc, |
| char** argv); |
| |
| |
| @@ -71,9 +71,9 @@ class Application : public UIComponent, |
| // |
| // Initialize the window system. |
| // |
| - virtual boolean initializeWindowSystem(unsigned int *argcp, char **argv); |
| + virtual boolean initializeWindowSystem(int *argcp, char **argv); |
| |
| - virtual void parseCommand(unsigned int* argcp, char** argv, |
| + virtual void parseCommand(int* argcp, char** argv, |
| XrmOptionDescList optlist, int optlistsize); |
| |
| // |
| @@ -145,7 +145,7 @@ class Application : public UIComponent, |
| // Initializes any Application specfic state. This routine should |
| // be called by main() or subclasses only. |
| // |
| - virtual boolean initialize(unsigned int* argcp, char** argv); |
| + virtual boolean initialize(int* argcp, char** argv); |
| |
| // |
| // Allow others to access our event processing mechanism |
| diff -up dx-4.4.4/src/uipp/base/IBMApplication.C.gcc43 dx-4.4.4/src/uipp/base/IBMApplication.C |
| --- dx-4.4.4/src/uipp/base/IBMApplication.C.gcc43 2004-04-02 22:32:43.000000000 +0200 |
| +++ dx-4.4.4/src/uipp/base/IBMApplication.C 2008-01-07 21:53:29.000000000 +0100 |
| @@ -349,7 +349,7 @@ int status; |
| } |
| |
| |
| -boolean IBMApplication::initializeWindowSystem(unsigned int *argcp, char **argv) |
| +boolean IBMApplication::initializeWindowSystem(int *argcp, char **argv) |
| { |
| |
| if (!this->Application::initializeWindowSystem(argcp, argv)) |
| @@ -375,7 +375,7 @@ boolean IBMApplication::initializeWindow |
| return TRUE; |
| } |
| |
| -boolean IBMApplication::initialize(unsigned int* argcp, |
| +boolean IBMApplication::initialize(int* argcp, |
| char** argv) |
| { |
| if (!this->Application::initialize(argcp,argv)) |
| diff -up dx-4.4.4/src/uipp/base/IBMApplication.h.gcc43 dx-4.4.4/src/uipp/base/IBMApplication.h |
| --- dx-4.4.4/src/uipp/base/IBMApplication.h.gcc43 2003-09-20 07:35:22.000000000 +0200 |
| +++ dx-4.4.4/src/uipp/base/IBMApplication.h 2008-01-07 21:50:19.000000000 +0100 |
| @@ -77,7 +77,7 @@ class IBMApplication : public Applicatio |
| // |
| // Initialize the window system. |
| // |
| - virtual boolean initializeWindowSystem(unsigned int *argcp, char **argv); |
| + virtual boolean initializeWindowSystem(int *argcp, char **argv); |
| |
| // |
| // Protected member data: |
| @@ -88,7 +88,7 @@ class IBMApplication : public Applicatio |
| |
| HelpWin *helpWindow; |
| |
| - boolean initialize(unsigned int* argcp, char** argv); |
| + boolean initialize(int* argcp, char** argv); |
| |
| // |
| // Load application specific action routines |
| diff -up dx-4.4.4/src/uipp/tutor/TutorApplication.h.gcc43 dx-4.4.4/src/uipp/tutor/TutorApplication.h |
| --- dx-4.4.4/src/uipp/tutor/TutorApplication.h.gcc43 1999-05-10 17:46:30.000000000 +0200 |
| +++ dx-4.4.4/src/uipp/tutor/TutorApplication.h 2008-01-07 21:49:29.000000000 +0100 |
| @@ -69,7 +69,7 @@ class TutorApplication : public IBMAppli |
| // Overrides the Application class version: |
| // Initializes Xt Intrinsics with option list (switches). |
| // |
| - virtual boolean initialize(unsigned int* argcp, |
| + virtual boolean initialize(int* argcp, |
| char** argv); |
| |
| // |
| diff -up dx-4.4.4/src/uipp/tutor/Main.C.gcc43 dx-4.4.4/src/uipp/tutor/Main.C |
| --- dx-4.4.4/src/uipp/tutor/Main.C.gcc43 2000-05-16 20:53:15.000000000 +0200 |
| +++ dx-4.4.4/src/uipp/tutor/Main.C 2008-01-07 19:57:39.000000000 +0100 |
| @@ -31,7 +31,7 @@ extern "C" void HCLXmInit(); |
| // |
| const char *AssertMsgString = "Internal error detected at \"%s\":%d.\n"; |
| |
| -int main(unsigned int argc, |
| +int main( int argc, |
| char** argv) |
| { |
| #if defined(HAVE_HCLXMINIT) |
| diff -up dx-4.4.4/src/uipp/tutor/TutorApplication.C.gcc43 dx-4.4.4/src/uipp/tutor/TutorApplication.C |
| --- dx-4.4.4/src/uipp/tutor/TutorApplication.C.gcc43 2006-05-08 18:20:14.000000000 +0200 |
| +++ dx-4.4.4/src/uipp/tutor/TutorApplication.C 2008-01-07 21:56:09.000000000 +0100 |
| @@ -196,7 +196,7 @@ InitializeSignals(void) |
| #endif |
| } |
| |
| -boolean TutorApplication::initialize(unsigned int* argcp, |
| +boolean TutorApplication::initialize(int* argcp, |
| char** argv) |
| { |
| ASSERT(argcp); |
| diff -up dx-4.4.4/src/uipp/widgets/MultiText.h.gcc43 dx-4.4.4/src/uipp/widgets/MultiText.h |
| --- dx-4.4.4/src/uipp/widgets/MultiText.h.gcc43 2006-01-03 01:12:34.000000000 +0100 |
| +++ dx-4.4.4/src/uipp/widgets/MultiText.h 2008-01-07 19:06:27.000000000 +0100 |
| @@ -91,7 +91,7 @@ typedef struct _XmMultiTextClassRec* XmM |
| #define XmNsmoothScroll "smoothScroll" |
| #define XmNwaitCursorCount "waitCursorCount" |
| |
| -#if !(defined(_Xm_h) || defined(XM_H)) |
| +#if !(defined(_Xm_h) || defined(XM_H) || defined(_XM_XM_H)) |
| #define XmNmarginHeight "marginHeight" |
| #define XmNmarginWidth "marginWidth" |
| #define XmNwordWrap "wordWrap" |
| @@ -109,7 +109,7 @@ typedef struct _XmMultiTextClassRec* XmM |
| #define XmCSmoothScroll "SmoothScroll" |
| #define XmCWaitCursorCount "WaitCursorCount" |
| |
| -#if !(defined(_Xm_h) || defined(XM_H)) |
| +#if !(defined(_Xm_h) || defined(XM_H) || defined(_XM_XM_H)) |
| #define XmCMarginHeight "MarginHeight" |
| #define XmCMarginWidth "MarginWidth" |
| #define XmCWordWrap "WordWrap" |
| diff -up dx-4.4.4/src/uipp/dxui/Main.C.gcc43 dx-4.4.4/src/uipp/dxui/Main.C |
| --- dx-4.4.4/src/uipp/dxui/Main.C.gcc43 2005-12-07 18:50:53.000000000 +0100 |
| +++ dx-4.4.4/src/uipp/dxui/Main.C 2008-01-07 19:57:21.000000000 +0100 |
| @@ -48,7 +48,7 @@ extern unsigned long _etext; |
| // |
| const char *AssertMsgString = "Internal error detected at \"%s\":%d.\n"; |
| |
| -int main(unsigned int argc, |
| +int main( int argc, |
| char** argv) |
| { |
| #if defined(HAVE_HCLXMINIT) |
| diff -up dx-4.4.4/src/uipp/prompter/GARApplication.h.gcc43 dx-4.4.4/src/uipp/prompter/GARApplication.h |
| --- dx-4.4.4/src/uipp/prompter/GARApplication.h.gcc43 2003-09-20 07:33:21.000000000 +0200 |
| +++ dx-4.4.4/src/uipp/prompter/GARApplication.h 2008-01-07 21:49:05.000000000 +0100 |
| @@ -129,7 +129,7 @@ class GARApplication : public IBMApplica |
| // Overrides the Application class version: |
| // Initializes Xt Intrinsics with option list (switches). |
| // |
| - virtual boolean initialize(unsigned int* argcp, |
| + virtual boolean initialize(int* argcp, |
| char** argv); |
| |
| CommandScope *commandScope; // command scope |
| diff -up dx-4.4.4/src/uipp/prompter/Main.C.gcc43 dx-4.4.4/src/uipp/prompter/Main.C |
| --- dx-4.4.4/src/uipp/prompter/Main.C.gcc43 2000-05-16 20:52:59.000000000 +0200 |
| +++ dx-4.4.4/src/uipp/prompter/Main.C 2008-01-07 19:57:01.000000000 +0100 |
| @@ -17,7 +17,7 @@ extern "C" void HCLXmInit(); |
| #endif |
| |
| |
| -int main(unsigned int argc, |
| +int main( int argc, |
| char** argv) |
| { |
| #if defined(HAVE_HCLXMINIT) |
| diff -up dx-4.4.4/src/uipp/prompter/GARApplication.C.gcc43 dx-4.4.4/src/uipp/prompter/GARApplication.C |
| --- dx-4.4.4/src/uipp/prompter/GARApplication.C.gcc43 2006-05-08 18:20:13.000000000 +0200 |
| +++ dx-4.4.4/src/uipp/prompter/GARApplication.C 2008-01-07 21:54:28.000000000 +0100 |
| @@ -198,7 +198,7 @@ InitializeSignals(void) |
| } |
| } |
| |
| -boolean GARApplication::initialize(unsigned int* argcp, |
| +boolean GARApplication::initialize(int* argcp, |
| char** argv) |
| { |
| ASSERT(argcp); |
| diff -up dx-4.4.4/src/uipp/dxuilib/DXApplication.h.gcc43 dx-4.4.4/src/uipp/dxuilib/DXApplication.h |
| --- dx-4.4.4/src/uipp/dxuilib/DXApplication.h.gcc43 2006-05-08 18:20:10.000000000 +0200 |
| +++ dx-4.4.4/src/uipp/dxuilib/DXApplication.h 2008-01-07 21:14:12.000000000 +0100 |
| @@ -372,7 +372,7 @@ class DXApplication : public IBMApplicat |
| // Overrides the Application class version: |
| // Initializes Xt Intrinsics with option list (switches). |
| // |
| - virtual boolean initialize(unsigned int* argcp, |
| + virtual boolean initialize(int* argcp, |
| char** argv); |
| |
| // |
| diff -up dx-4.4.4/src/uipp/dxuilib/DXApplication.C.gcc43 dx-4.4.4/src/uipp/dxuilib/DXApplication.C |
| --- dx-4.4.4/src/uipp/dxuilib/DXApplication.C.gcc43 2006-06-22 21:45:34.000000000 +0200 |
| +++ dx-4.4.4/src/uipp/dxuilib/DXApplication.C 2008-01-07 21:32:56.000000000 +0100 |
| @@ -2248,7 +2248,7 @@ void DXApplication::installDefaultResour |
| this->setDefaultResources(baseWidget, _defaultDXResources); |
| this->IBMApplication::installDefaultResources(baseWidget); |
| } |
| -boolean DXApplication::initialize(unsigned int* argcp, |
| +boolean DXApplication::initialize(int* argcp, |
| char** argv) |
| { |
| boolean wasSetBusy = FALSE; |
| diff -up dx-4.4.4/src/uipp/mb/Main.C.gcc43 dx-4.4.4/src/uipp/mb/Main.C |
| --- dx-4.4.4/src/uipp/mb/Main.C.gcc43 2000-05-20 19:49:40.000000000 +0200 |
| +++ dx-4.4.4/src/uipp/mb/Main.C 2008-01-07 19:56:41.000000000 +0100 |
| @@ -22,7 +22,7 @@ extern "C" void HCLXmInit(); |
| // |
| const char *AssertMsgString = "Internal error detected at \"%s\":%d.\n"; |
| |
| -int main(unsigned int argc, |
| +int main( int argc, |
| char** argv) |
| { |
| #if defined(HAVE_HCLXMINIT) |
| diff -up dx-4.4.4/src/uipp/mb/MBApplication.C.gcc43 dx-4.4.4/src/uipp/mb/MBApplication.C |
| --- dx-4.4.4/src/uipp/mb/MBApplication.C.gcc43 2006-05-08 18:20:13.000000000 +0200 |
| +++ dx-4.4.4/src/uipp/mb/MBApplication.C 2008-01-07 21:51:15.000000000 +0100 |
| @@ -117,7 +117,7 @@ InitializeSignals(void) |
| #endif |
| } |
| |
| -boolean MBApplication::initialize(unsigned int* argcp, |
| +boolean MBApplication::initialize(int* argcp, |
| char** argv) |
| { |
| ASSERT(argcp); |
| diff -up dx-4.4.4/src/uipp/mb/MBApplication.h.gcc43 dx-4.4.4/src/uipp/mb/MBApplication.h |
| --- dx-4.4.4/src/uipp/mb/MBApplication.h.gcc43 1999-05-10 17:46:25.000000000 +0200 |
| +++ dx-4.4.4/src/uipp/mb/MBApplication.h 2008-01-07 21:48:38.000000000 +0100 |
| @@ -51,7 +51,7 @@ class MBApplication : public IBMApplicat |
| // Overrides the Application class version: |
| // Initializes Xt Intrinsics with option list (switches). |
| // |
| - virtual boolean initialize(unsigned int* argcp, |
| + virtual boolean initialize(int* argcp, |
| char** argv); |
| |
| static MBResource resource; |