fix(gtk4): wrap remaining Xt translations and context functions in GTK4_EXT macro

Author: Paramveersingh-S

src/libphigs/cp/cpm_tlkt.c

@@ -50,8 +50,10 @@ SOFTWARE.
 #include <stdio.h>
 #ifndef GTK4_EXT
 #include <X11/StringDefs.h>
+#ifndef GTK4_EXT
 #include <X11/Shell.h>
 #endif
+#endif
 #include "phg.h"
 #include "ws.h"
 #include "sin.h"

src/libphigs/input/sin_cho.c

@@ -59,17 +59,21 @@ SOFTWARE.
 #include "sin.h"
 #include "private/sinP.h"
 
+#ifndef GTK4_EXT
 #include <X11/StringDefs.h>
 #include <X11/Shell.h>
+#endif
 #ifdef MOTIF
 #include <stdbool.h>
 #include <Xm/Frame.h>
 #include <Xm/ToggleB.h>
 #include <Xm/RowColumn.h>
 #else
+#ifndef GTK4_EXT
 #include <X11/Xaw/Viewport.h>
 #include <X11/Xaw/List.h>
 #endif
+#endif
 /*******************************************************************************
  * choice_notify
  *

src/libphigs/input/sin_str.c

@@ -59,15 +59,19 @@ SOFTWARE.
 #include "sin.h"
 #include "private/sinP.h"
 
+#ifndef GTK4_EXT
 #include <X11/StringDefs.h>
 #include <X11/Shell.h>
+#endif
 #ifdef MOTIF
 #include <Xm/Frame.h>
 #include <Xm/Text.h>
 #else
+#ifndef GTK4_EXT
 #include <X11/Xaw/Viewport.h>
 #include <X11/Xaw/AsciiText.h>
 #endif
+#endif
 
 /*******************************************************************************
  * reset_string_measure
@@ -228,10 +232,12 @@ XtActionProc phg_sin_xt_string_event(
 }
 #endif
 
+#ifndef GTK4_EXT
 static XtTranslations		compiled_translations;
 static String translations = "\
           <Key>Return:	newline() StringEvent() RequestSatisfied() \n\
 	  ";
+#endif
 
 /*******************************************************************************
  * create_string
@@ -306,10 +312,12 @@ static void create_string(
 					      NULL );
 #endif
 
+#ifndef GTK4_EXT
     if ( !compiled_translations ) {
       compiled_translations = XtParseTranslationTable( translations );
     }
     XtOverrideTranslations( widgets->textw, compiled_translations );
+#endif
 #ifdef DEBUGINP
     printf("Done with create string.\n");
 #endif
@@ -343,9 +351,11 @@ static void enable_string(
 #ifdef DEBUGINP
       printf("Setting flags\n");
 #endif
+#ifndef GTK4_EXT
       XSaveContext( XtDisplay(device->item_handle.string.textw),
 		    XtWindow(device->item_handle.string.textw),
 		    phg_sin_device_context_id, (caddr_t)device );
+#endif
       device->flags.been_up_yet = 1;
     }
 #ifdef DEBUGINP
@@ -409,8 +419,13 @@ static void destroy_string(
 #ifdef DEBUGINP
      printf("Destroy string.\n");
 #endif
-    if ( device->item_handle.string.shell )
+    if ( device->item_handle.string.shell ) {
+#ifdef GTK4_EXT
+        gtk_window_destroy(GTK_WINDOW(device->item_handle.string.shell));
+#else
 	XtDestroyWidget( device->item_handle.string.shell );
+#endif
+    }
 }
 
 /*******************************************************************************

src/libphigs/input/sin_val.c

@@ -59,20 +59,24 @@ SOFTWARE.
 #include "sin.h"
 #include "private/sinP.h"
 
+#ifndef GTK4_EXT
 #include <X11/StringDefs.h>
 #include <X11/Shell.h>
+#endif
 #ifdef MOTIF
 #include <Xm/Frame.h>
 #include <Xm/Scale.h>
 #include <Xm/RowColumn.h>
 #include <Xm/PanedW.h>
 #include <Xm/Label.h>
 #else
+#ifndef GTK4_EXT
 #include <X11/Xaw/Paned.h>
 #include <X11/Xaw/Scrollbar.h>
 #include <X11/Xaw/Label.h>
 #include <X11/Xaw/Box.h>
 #endif
+#endif
 /*******************************************************************************
  * init_valuator
  *

src/libphigs/ws/ws_inp.c

@@ -50,8 +50,10 @@ SOFTWARE.
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#ifndef GTK4_EXT
 #include <X11/Intrinsic.h>
 #include <X11/StringDefs.h>
+#endif
 
 #include "phg.h"
 #include "ws.h"

src/libphigs/ws/ws_pm.c

@@ -57,19 +57,23 @@ SOFTWARE.
 #include "cp.h"
 #include "ws.h"
 #include "private/wsxP.h"
+#ifndef GTK4_EXT
 #include <X11/IntrinsicI.h>
 #include <X11/StringDefs.h>
 #include <X11/Shell.h>
+#endif
 #ifdef MOTIF
 #include <Xm/Frame.h>
 #include <Xm/Label.h>
 #include <Xm/PanedW.h>
 #include <Xm/PushB.h>
 #else
+#ifndef GTK4_EXT
 #include <X11/Xaw/Box.h>
 #include <X11/Xaw/Label.h>
 #include <X11/Xaw/Command.h>
 #endif
+#endif
 
 int done_pressed = 0;
 

src/libphigs/ws/wsb.c

@@ -55,8 +55,10 @@ SOFTWARE.
 #include <string.h>
 #include <assert.h>
 #include <stdio.h>
+#ifndef GTK4_EXT
 #include <X11/StringDefs.h>
 #include <X11/Shell.h>
+#endif
 
 #include "phg.h"
 #include "private/phgP.h"

src/libphigs/ws/wsx.c

@@ -23,8 +23,10 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#ifndef GTK4_EXT
 #include <X11/StringDefs.h>
 #include <X11/Shell.h>
+#endif
 #include <X11/Xlib.h>
 
 #ifdef GLEW

src/libphigs/ws/wsx_inp.c

@@ -28,8 +28,10 @@
 #include "private/evtP.h"
 #include "private/wsxP.h"
 
+#ifndef GTK4_EXT
 #include <X11/Shell.h>
 #include <X11/StringDefs.h>
+#endif
 
 /*******************************************************************************
  * phg_wsx_input_dispatch_next

src/libphigs/wsgl/wsgl_shaders.c

@@ -20,8 +20,10 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#ifndef GTK4_EXT
 #include <X11/StringDefs.h>
 #include <X11/Shell.h>
+#endif
 #include <X11/Xlib.h>
 #ifdef GLEW
 #include <GL/glew.h>