master 391c1289e2 2/2: Some adjustments to last change

[Po Lu]

branch: master
commit 391c1289e28ce11d5639a4d754ec36e7b26aa6ac
Author: Po Lu <luangruo@yahoo.com>
Commit: Po Lu <luangruo@yahoo.com>

    Some adjustments to last change
    
    * src/gtkutil.c (xg_set_undecorated): Only set ARGB visual on
    Cairo builds wtihout PGTK.
    * src/xfns.c (select_visual): Likewise.
---
 src/gtkutil.c | 2 ++
 src/xfns.c    | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/gtkutil.c b/src/gtkutil.c
index 8b8123c807..067df216a4 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -1593,12 +1593,14 @@ xg_create_frame_widgets (struct frame *f)
 
   GdkScreen *screen = gtk_widget_get_screen (wtop);
 
+#if !defined HAVE_PGTK && defined USE_CAIRO
   if (FRAME_DISPLAY_INFO (f)->n_planes == 32)
     {
       GdkVisual *visual = gdk_screen_get_rgba_visual (screen);
       gtk_widget_set_visual (wtop, visual);
       gtk_widget_set_visual (wfixed, visual);
     }
+#endif
 
 #ifndef HAVE_PGTK
   /* Must realize the windows so the X window gets created.  It is used
diff --git a/src/xfns.c b/src/xfns.c
index 2f2e33fa69..b37ba139a2 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -6375,7 +6375,7 @@ select_visual (struct x_display_info *dpyinfo)
 
       vinfo_template.screen = XScreenNumberOfScreen (screen);
 
-#if defined (USE_GTK)
+#if defined (USE_GTK) && defined (USE_CAIRO)
       /* First attempt to use 32-bit visual if available */
 
       vinfo_template.depth = 32;
@@ -6391,7 +6391,7 @@ select_visual (struct x_display_info *dpyinfo)
          return;
        }
 
-#endif /* defined (USE_GTK) */
+#endif /* USE_GTK && USE_CAIRO */
 
       /* 32-bit visual not available, fallback to default visual */
       dpyinfo->visual = DefaultVisualOfScreen (screen);