dx-gcc43.patch

   1 diff -up dx-4.4.4/src/uipp/startup/StartupApplication.C.gcc43 dx-4.4.4/src/uipp/startup/StartupApplication.C
   2 --- dx-4.4.4/src/uipp/startup/StartupApplication.C.gcc43        2005-11-10 20:48:22.000000000 +0100
   3 +++ dx-4.4.4/src/uipp/startup/StartupApplication.C      2008-01-07 21:55:03.000000000 +0100
   4 @@ -117,7 +117,7 @@ InitializeSignals(void)
   5  #endif
   6  }
   7
   8 -boolean StartupApplication::initialize(unsigned int* argcp,
   9 +boolean StartupApplication::initialize(int*  argcp,
  10                                char**        argv)
  11  {
  12      ASSERT(argcp);
  13 diff -up dx-4.4.4/src/uipp/startup/StartupApplication.h.gcc43 dx-4.4.4/src/uipp/startup/StartupApplication.h
  14 --- dx-4.4.4/src/uipp/startup/StartupApplication.h.gcc43        2003-09-20 07:33:56.000000000 +0200
  15 +++ dx-4.4.4/src/uipp/startup/StartupApplication.h      2008-01-07 21:50:47.000000000 +0100
  16 @@ -84,7 +84,7 @@ class StartupApplication : public IBMApp
  17      // Overrides the Application class version:
  18      //   Initializes Xt Intrinsics with option list (switches).
  19      //
  20 -    virtual boolean initialize(unsigned int* argcp, char**argv);
  21 +    virtual boolean initialize(int* argcp, char**argv);
  22
  23      CommandScope       *commandScope;   // command scope
  24
  25 diff -up dx-4.4.4/src/uipp/startup/Main.C.gcc43 dx-4.4.4/src/uipp/startup/Main.C
  26 --- dx-4.4.4/src/uipp/startup/Main.C.gcc43      2000-05-16 20:53:07.000000000 +0200
  27 +++ dx-4.4.4/src/uipp/startup/Main.C    2008-01-07 19:57:58.000000000 +0100
  28 @@ -14,7 +14,7 @@
  29  extern "C" void HCLXmInit();
  30  #endif
  31
  32 -int main(unsigned int argc,
  33 +int main( int          argc,
  34           char**       argv)
  35  {
  36  #if defined(HAVE_HCLXMINIT)
  37 diff -up dx-4.4.4/src/uipp/base/Application.C.gcc43 dx-4.4.4/src/uipp/base/Application.C
  38 --- dx-4.4.4/src/uipp/base/Application.C.gcc43  2005-11-09 19:56:17.000000000 +0100
  39 +++ dx-4.4.4/src/uipp/base/Application.C        2008-01-07 22:39:15.000000000 +0100
  40 @@ -136,7 +136,7 @@ void Application::installDefaultResource
  41      //this->setDefaultResources(baseWidget, Application::DefaultResources);
  42  }
  43
  44 -boolean Application::initializeWindowSystem(unsigned int *argcp, char **argv)
  45 +boolean Application::initializeWindowSystem(int *argcp, char **argv)
  46  {
  47
  48      //
  49 @@ -149,7 +149,7 @@ boolean Application::initializeWindowSys
  50              NULL,                      // command line options table
  51              0,                         // number of entries in options table
  52  #if XtSpecificationRelease > 4
  53 -            (int*)argcp,
  54 +            argcp,
  55  #else
  56              argcp,
  57  #endif
  58 @@ -235,7 +235,7 @@ boolean Application::initializeWindowSys
  59      return TRUE;
  60  }
  61
  62 -void Application::parseCommand(unsigned int* argcp, char** argv,
  63 +void Application::parseCommand(int* argcp, char** argv,
  64                                 XrmOptionDescList optlist, int optlistsize)
  65  {
  66      char res_file[256];
  67 @@ -280,7 +280,7 @@ void Application::parseCommand(unsigned
  68      //
  69  }
  70
  71 -boolean Application::initialize(unsigned int* argcp, char** argv)
  72 +boolean Application::initialize(int* argcp, char** argv)
  73  {
  74      //
  75      // Initialize the window system if not done already.
  76 diff -up dx-4.4.4/src/uipp/base/Application.h.gcc43 dx-4.4.4/src/uipp/base/Application.h
  77 --- dx-4.4.4/src/uipp/base/Application.h.gcc43  2005-11-09 19:26:29.000000000 +0100
  78 +++ dx-4.4.4/src/uipp/base/Application.h        2008-01-07 21:49:49.000000000 +0100
  79 @@ -49,7 +49,7 @@ class Application : public UIComponent,
  80      //
  81      // The main program needs to access protected member functions.
  82      //
  83 -    friend int main(unsigned int argc,
  84 +    friend int main( int          argc,
  85                      char**       argv);
  86
  87
  88 @@ -71,9 +71,9 @@ class Application : public UIComponent,
  89      //
  90      // Initialize the window system.
  91      //
  92 -    virtual boolean initializeWindowSystem(unsigned int *argcp, char **argv);
  93 +    virtual boolean initializeWindowSystem(int *argcp, char **argv);
  94
  95 -    virtual void parseCommand(unsigned int* argcp, char** argv,
  96 +    virtual void parseCommand(int* argcp, char** argv,
  97                                XrmOptionDescList optlist, int optlistsize);
  98
  99      //
 100 @@ -145,7 +145,7 @@ class Application : public UIComponent,
 101      // Initializes any Application specfic state.  This routine should
 102      // be called by main() or subclasses only.
 103      //
 104 -    virtual boolean initialize(unsigned int* argcp, char** argv);
 105 +    virtual boolean initialize(int* argcp, char** argv);
 106
 107      //
 108      // Allow others to access our event processing mechanism
 109 diff -up dx-4.4.4/src/uipp/base/IBMApplication.C.gcc43 dx-4.4.4/src/uipp/base/IBMApplication.C
 110 --- dx-4.4.4/src/uipp/base/IBMApplication.C.gcc43       2004-04-02 22:32:43.000000000 +0200
 111 +++ dx-4.4.4/src/uipp/base/IBMApplication.C     2008-01-07 21:53:29.000000000 +0100
 112 @@ -349,7 +349,7 @@ int status;
 113  }
 114
 115
 116 -boolean IBMApplication::initializeWindowSystem(unsigned int *argcp, char **argv)
 117 +boolean IBMApplication::initializeWindowSystem(int *argcp, char **argv)
 118  {
 119
 120      if (!this->Application::initializeWindowSystem(argcp, argv))
 121 @@ -375,7 +375,7 @@ boolean IBMApplication::initializeWindow
 122      return TRUE;
 123  }
 124
 125 -boolean IBMApplication::initialize(unsigned int* argcp,
 126 +boolean IBMApplication::initialize(int*          argcp,
 127                                    char**        argv)
 128  {
 129      if (!this->Application::initialize(argcp,argv))
 130 diff -up dx-4.4.4/src/uipp/base/IBMApplication.h.gcc43 dx-4.4.4/src/uipp/base/IBMApplication.h
 131 --- dx-4.4.4/src/uipp/base/IBMApplication.h.gcc43       2003-09-20 07:35:22.000000000 +0200
 132 +++ dx-4.4.4/src/uipp/base/IBMApplication.h     2008-01-07 21:50:19.000000000 +0100
 133 @@ -77,7 +77,7 @@ class IBMApplication : public Applicatio
 134      //
 135      // Initialize the window system.
 136      //
 137 -    virtual boolean initializeWindowSystem(unsigned int *argcp, char **argv);
 138 +    virtual boolean initializeWindowSystem(int *argcp, char **argv);
 139
 140      //
 141      // Protected member data:
 142 @@ -88,7 +88,7 @@ class IBMApplication : public Applicatio
 143
 144      HelpWin            *helpWindow;
 145
 146 -    boolean initialize(unsigned int* argcp, char** argv);
 147 +    boolean initialize(int* argcp, char** argv);
 148
 149      //
 150      // Load application specific action routines
 151 diff -up dx-4.4.4/src/uipp/tutor/TutorApplication.h.gcc43 dx-4.4.4/src/uipp/tutor/TutorApplication.h
 152 --- dx-4.4.4/src/uipp/tutor/TutorApplication.h.gcc43    1999-05-10 17:46:30.000000000 +0200
 153 +++ dx-4.4.4/src/uipp/tutor/TutorApplication.h  2008-01-07 21:49:29.000000000 +0100
 154 @@ -69,7 +69,7 @@ class TutorApplication : public IBMAppli
 155      // Overrides the Application class version:
 156      //   Initializes Xt Intrinsics with option list (switches).
 157      //
 158 -    virtual boolean initialize(unsigned int* argcp,
 159 +    virtual boolean initialize(int*       argcp,
 160                             char**        argv);
 161
 162      //
 163 diff -up dx-4.4.4/src/uipp/tutor/Main.C.gcc43 dx-4.4.4/src/uipp/tutor/Main.C
 164 --- dx-4.4.4/src/uipp/tutor/Main.C.gcc43        2000-05-16 20:53:15.000000000 +0200
 165 +++ dx-4.4.4/src/uipp/tutor/Main.C      2008-01-07 19:57:39.000000000 +0100
 166 @@ -31,7 +31,7 @@ extern "C" void HCLXmInit();
 167  //
 168  const char *AssertMsgString = "Internal error detected at \"%s\":%d.\n";
 169
 170 -int main(unsigned int argc,
 171 +int main( int          argc,
 172           char**       argv)
 173  {
 174  #if defined(HAVE_HCLXMINIT)
 175 diff -up dx-4.4.4/src/uipp/tutor/TutorApplication.C.gcc43 dx-4.4.4/src/uipp/tutor/TutorApplication.C
 176 --- dx-4.4.4/src/uipp/tutor/TutorApplication.C.gcc43    2006-05-08 18:20:14.000000000 +0200
 177 +++ dx-4.4.4/src/uipp/tutor/TutorApplication.C  2008-01-07 21:56:09.000000000 +0100
 178 @@ -196,7 +196,7 @@ InitializeSignals(void)
 179  #endif
 180  }
 181
 182 -boolean TutorApplication::initialize(unsigned int* argcp,
 183 +boolean TutorApplication::initialize(int*    argcp,
 184                                char**        argv)
 185  {
 186      ASSERT(argcp);
 187 diff -up dx-4.4.4/src/uipp/widgets/MultiText.h.gcc43 dx-4.4.4/src/uipp/widgets/MultiText.h
 188 --- dx-4.4.4/src/uipp/widgets/MultiText.h.gcc43 2006-01-03 01:12:34.000000000 +0100
 189 +++ dx-4.4.4/src/uipp/widgets/MultiText.h       2008-01-07 19:06:27.000000000 +0100
 190 @@ -91,7 +91,7 @@ typedef struct _XmMultiTextClassRec* XmM
 191  #define XmNsmoothScroll                "smoothScroll"
 192  #define XmNwaitCursorCount     "waitCursorCount"
 193
 194 -#if !(defined(_Xm_h) || defined(XM_H))
 195 +#if !(defined(_Xm_h) || defined(XM_H) || defined(_XM_XM_H))
 196  #define XmNmarginHeight                "marginHeight"
 197  #define XmNmarginWidth         "marginWidth"
 198  #define XmNwordWrap            "wordWrap"
 199 @@ -109,7 +109,7 @@ typedef struct _XmMultiTextClassRec* XmM
 200  #define XmCSmoothScroll                "SmoothScroll"
 201  #define XmCWaitCursorCount     "WaitCursorCount"
 202
 203 -#if !(defined(_Xm_h) || defined(XM_H))
 204 +#if !(defined(_Xm_h) || defined(XM_H) || defined(_XM_XM_H))
 205  #define XmCMarginHeight                "MarginHeight"
 206  #define XmCMarginWidth         "MarginWidth"
 207  #define XmCWordWrap            "WordWrap"
 208 diff -up dx-4.4.4/src/uipp/dxui/Main.C.gcc43 dx-4.4.4/src/uipp/dxui/Main.C
 209 --- dx-4.4.4/src/uipp/dxui/Main.C.gcc43 2005-12-07 18:50:53.000000000 +0100
 210 +++ dx-4.4.4/src/uipp/dxui/Main.C       2008-01-07 19:57:21.000000000 +0100
 211 @@ -48,7 +48,7 @@ extern unsigned long _etext;
 212  //
 213  const char *AssertMsgString = "Internal error detected at \"%s\":%d.\n";
 214
 215 -int main(unsigned int argc,
 216 +int main( int          argc,
 217           char**       argv)
 218  {
 219  #if defined(HAVE_HCLXMINIT)
 220 diff -up dx-4.4.4/src/uipp/prompter/GARApplication.h.gcc43 dx-4.4.4/src/uipp/prompter/GARApplication.h
 221 --- dx-4.4.4/src/uipp/prompter/GARApplication.h.gcc43   2003-09-20 07:33:21.000000000 +0200
 222 +++ dx-4.4.4/src/uipp/prompter/GARApplication.h 2008-01-07 21:49:05.000000000 +0100
 223 @@ -129,7 +129,7 @@ class GARApplication : public IBMApplica
 224      // Overrides the Application class version:
 225      //   Initializes Xt Intrinsics with option list (switches).
 226      //
 227 -    virtual boolean initialize(unsigned int* argcp,
 228 +    virtual boolean initialize(int*       argcp,
 229                             char**        argv);
 230
 231      CommandScope       *commandScope;   // command scope
 232 diff -up dx-4.4.4/src/uipp/prompter/Main.C.gcc43 dx-4.4.4/src/uipp/prompter/Main.C
 233 --- dx-4.4.4/src/uipp/prompter/Main.C.gcc43     2000-05-16 20:52:59.000000000 +0200
 234 +++ dx-4.4.4/src/uipp/prompter/Main.C   2008-01-07 19:57:01.000000000 +0100
 235 @@ -17,7 +17,7 @@ extern "C" void HCLXmInit();
 236  #endif
 237
 238
 239 -int main(unsigned int argc,
 240 +int main( int          argc,
 241           char**       argv)
 242  {
 243  #if defined(HAVE_HCLXMINIT)
 244 diff -up dx-4.4.4/src/uipp/prompter/GARApplication.C.gcc43 dx-4.4.4/src/uipp/prompter/GARApplication.C
 245 --- dx-4.4.4/src/uipp/prompter/GARApplication.C.gcc43   2006-05-08 18:20:13.000000000 +0200
 246 +++ dx-4.4.4/src/uipp/prompter/GARApplication.C 2008-01-07 21:54:28.000000000 +0100
 247 @@ -198,7 +198,7 @@ InitializeSignals(void)
 248      }
 249  }
 250
 251 -boolean GARApplication::initialize(unsigned int* argcp,
 252 +boolean GARApplication::initialize(int*      argcp,
 253                                char**        argv)
 254  {
 255      ASSERT(argcp);
 256 diff -up dx-4.4.4/src/uipp/dxuilib/DXApplication.h.gcc43 dx-4.4.4/src/uipp/dxuilib/DXApplication.h
 257 --- dx-4.4.4/src/uipp/dxuilib/DXApplication.h.gcc43     2006-05-08 18:20:10.000000000 +0200
 258 +++ dx-4.4.4/src/uipp/dxuilib/DXApplication.h   2008-01-07 21:14:12.000000000 +0100
 259 @@ -372,7 +372,7 @@ class DXApplication : public IBMApplicat
 260      // Overrides the Application class version:
 261      //   Initializes Xt Intrinsics with option list (switches).
 262      //
 263 -    virtual boolean initialize(unsigned int* argcp,
 264 +    virtual boolean initialize(int*       argcp,
 265                             char**        argv);
 266
 267      //
 268 diff -up dx-4.4.4/src/uipp/dxuilib/DXApplication.C.gcc43 dx-4.4.4/src/uipp/dxuilib/DXApplication.C
 269 --- dx-4.4.4/src/uipp/dxuilib/DXApplication.C.gcc43     2006-06-22 21:45:34.000000000 +0200
 270 +++ dx-4.4.4/src/uipp/dxuilib/DXApplication.C   2008-01-07 21:32:56.000000000 +0100
 271 @@ -2248,7 +2248,7 @@ void DXApplication::installDefaultResour
 272      this->setDefaultResources(baseWidget, _defaultDXResources);
 273      this->IBMApplication::installDefaultResources(baseWidget);
 274  }
 275 -boolean DXApplication::initialize(unsigned int* argcp,
 276 +boolean DXApplication::initialize(int* argcp,
 277                                                                   char**        argv)
 278  {
 279         boolean wasSetBusy = FALSE;
 280 diff -up dx-4.4.4/src/uipp/mb/Main.C.gcc43 dx-4.4.4/src/uipp/mb/Main.C
 281 --- dx-4.4.4/src/uipp/mb/Main.C.gcc43   2000-05-20 19:49:40.000000000 +0200
 282 +++ dx-4.4.4/src/uipp/mb/Main.C 2008-01-07 19:56:41.000000000 +0100
 283 @@ -22,7 +22,7 @@ extern "C" void HCLXmInit();
 284  //
 285  const char *AssertMsgString = "Internal error detected at \"%s\":%d.\n";
 286
 287 -int main(unsigned int argc,
 288 +int main( int          argc,
 289           char**       argv)
 290  {
 291  #if defined(HAVE_HCLXMINIT)
 292 diff -up dx-4.4.4/src/uipp/mb/MBApplication.C.gcc43 dx-4.4.4/src/uipp/mb/MBApplication.C
 293 --- dx-4.4.4/src/uipp/mb/MBApplication.C.gcc43  2006-05-08 18:20:13.000000000 +0200
 294 +++ dx-4.4.4/src/uipp/mb/MBApplication.C        2008-01-07 21:51:15.000000000 +0100
 295 @@ -117,7 +117,7 @@ InitializeSignals(void)
 296  #endif
 297  }
 298
 299 -boolean MBApplication::initialize(unsigned int* argcp,
 300 +boolean MBApplication::initialize(int*       argcp,
 301                                char**        argv)
 302  {
 303      ASSERT(argcp);
 304 diff -up dx-4.4.4/src/uipp/mb/MBApplication.h.gcc43 dx-4.4.4/src/uipp/mb/MBApplication.h
 305 --- dx-4.4.4/src/uipp/mb/MBApplication.h.gcc43  1999-05-10 17:46:25.000000000 +0200
 306 +++ dx-4.4.4/src/uipp/mb/MBApplication.h        2008-01-07 21:48:38.000000000 +0100
 307 @@ -51,7 +51,7 @@ class MBApplication : public IBMApplicat
 308      // Overrides the Application class version:
 309      //   Initializes Xt Intrinsics with option list (switches).
 310      //
 311 -    virtual boolean initialize(unsigned int* argcp,
 312 +    virtual boolean initialize(int*       argcp,
 313                             char**        argv);
 314
 315      static MBResource  resource;