# HG changeset patch
# User bsmith@81767d24-ef19-dc11-ae90-00e081727c95
# Date 1613438810 0
# Node ID ada8f7610df02dd5f8815ce29bdb4a4e2cd59cb3
# Parent  f6a6ea6b28fe57c8fa0499b77d24b5c1800ed58d
GTK4: Fix building with -D_DW_SINGLE_THREADED and code cleanup.

diff -r f6a6ea6b28fe -r ada8f7610df0 gtk4/dw.c
--- a/gtk4/dw.c	Wed Feb 10 10:26:31 2021 +0000
+++ b/gtk4/dw.c	Tue Feb 16 01:26:50 2021 +0000
@@ -305,7 +305,7 @@
 #define DW_FUNCTION_ADD_PARAM7(param1, param2, param3, param4, param5, param6, param7)
 #define DW_FUNCTION_ADD_PARAM8(param1, param2, param3, param4, param5, param6, param7, param8)
 #define DW_FUNCTION_ADD_PARAM9(param1, param2, param3, param4, param5, param6, param7, param8, param9)
-#define DW_FUNCTION_ADD_PARAM10(param1, param2, param3, param4, param5, param6, param7, param8, param9. param10)
+#define DW_FUNCTION_ADD_PARAM10(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10)
 #define DW_FUNCTION_ADD_PARAM11(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11)
 #define DW_FUNCTION_ADD_PARAM12(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12)
 #define DW_FUNCTION_RESTORE_PARAM1(param1, vartype1)
@@ -359,7 +359,7 @@
  * List those icons that have transparency first
  */
 #define NUM_EXTS 9
-char *image_exts[NUM_EXTS] =
+char *_dw_image_exts[NUM_EXTS+1] =
 {
    ".xpm",
    ".png",
@@ -369,7 +369,8 @@
    ".jpg",
    ".jpeg",
    ".tiff",
-   ".bmp"
+   ".bmp",
+   NULL
 };
 
 #ifndef max
@@ -384,8 +385,6 @@
 pthread_key_t _dw_bg_color_key;
 pthread_key_t _dw_event_key;
 
-GtkWidget *last_window = NULL, *popup = NULL;
-
 static int _dw_ignore_expand = 0;
 static pthread_t _dw_thread = (pthread_t)-1;
 
@@ -3595,7 +3594,7 @@
          for(i=0; i<NUM_EXTS; i++)
          {
             strcpy(file, filename);
-            strcat(file, image_exts[i]);
+            strcat(file, _dw_image_exts[i]);
             if(access(file, 04) == 0)
             {
                found_ext = 1;
@@ -5134,7 +5133,7 @@
       for ( i = 0; i < NUM_EXTS; i++ )
       {
          strcpy( file, filename );
-         strcat( file, image_exts[i] );
+         strcat( file, _dw_image_exts[i] );
          if ( access( file, 04 ) == 0 )
          {
             found_ext = 1;
@@ -6799,7 +6798,7 @@
       for ( i = 0; i < NUM_EXTS; i++ )
       {
          strcpy( file, filename );
-         strcat( file, image_exts[i] );
+         strcat( file, _dw_image_exts[i] );
          if ( access( file, 04 ) == 0 )
          {
             found_ext = 1;