From 53e8635cdb099746ea3977443b506b7fe16fdc59 Mon Sep 17 00:00:00 2001
From: daleclack <daleclack1@foxmail.com>
Date: Sun, 11 Apr 2021 16:51:08 +0800
Subject: [PATCH] Update gtk65

---
 Gtk3/gtk65_menu3/.vscode/c_cpp_properties.json | 12 ++++++------
 Gtk3/gtk65_menu3/.vscode/tasks.json            | 12 ++++++------
 Gtk3/gtk65_menu3/src/main.cpp                  |  6 +++---
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/Gtk3/gtk65_menu3/.vscode/c_cpp_properties.json b/Gtk3/gtk65_menu3/.vscode/c_cpp_properties.json
index 649ee3a..ed87b1d 100644
--- a/Gtk3/gtk65_menu3/.vscode/c_cpp_properties.json
+++ b/Gtk3/gtk65_menu3/.vscode/c_cpp_properties.json
@@ -6,27 +6,27 @@
                 //For linux amd64 and linux on arm64,some include path may different
                 //Commet and uncomment these lines to compile on a specificed archtiecture
                 //Arm64 linux libs
-                
+                /*
                 "/usr/lib/aarch64-linux-gnu/dbus-1.0/include/**",
                 "/usr/lib/aarch64-linux-gnu/glib-2.0/include",
-                
+                */
                 //amd64 linux libs(For ubuntu)
                 /*
                 "/usr/lib/x86_64-linux-gnu/dbus-1.0/include",
                 "/usr/lib/x86_64-linux-gnu/glib-2.0/include",
                 */
                 //For debian and ubuntu,kali
-                
+                /*
                 "/usr/include/gtk-3.0/gtk/**",
                 "/usr/include/uuid/**",
-                
+                */
                 //For manjaro(Arch linux)
-                /*
+                
                 "/usr/lib/dbus-1.0/include/**",
                 "/usr/lib/glib-2.0/include/**",
                 "/usr/include/lzo/**",
                 "/usr/include/cloudproviders/**",
-                */
+                
                 "${workspaceFolder}/**",
                 "/usr/include/gtk-3.0/**",
                 "/usr/include/at-spi2-atk/2.0/**",
diff --git a/Gtk3/gtk65_menu3/.vscode/tasks.json b/Gtk3/gtk65_menu3/.vscode/tasks.json
index 33daa40..74f6edb 100644
--- a/Gtk3/gtk65_menu3/.vscode/tasks.json
+++ b/Gtk3/gtk65_menu3/.vscode/tasks.json
@@ -11,10 +11,10 @@
                 "${workspaceFolder}/bin/gtk65",
                 "-pthread",
                 //For Arm64 linux 
-                
+                /*
                 "-I/usr/lib/aarch64-linux-gnu/dbus-1.0/include",
                 "-I/usr/lib/aarch64-linux-gnu/glib-2.0/include",
-                
+                */
                 //For amd64 linux
                 /*
                 "-I/usr/lib/x86_64-linux-gnu/dbus-1.0/include",
@@ -22,17 +22,17 @@
                 */
                 //Ubuntu and kali include paths
                 
-                "-I/usr/include/uuid",
+                //"-I/usr/include/uuid",
                 
                 //Manjaro linux and Arch linux include args
 
                 "-I${workspaceFolder}",
-                /*
+                
                 "-I/usr/lib/glib-2.0/include",
                 "-I/usr/lib/dbus-1.0/include",
                 "-I/usr/include/lzo",
                 "-I/usr/include/cloudproviders",
-                */
+                
                 "-I/usr/include/gtk-3.0",
                 "-I/usr/include/at-spi2-atk/2.0",
                 "-I/usr/include/at-spi-2.0",
@@ -51,7 +51,7 @@
                 "-I/usr/include/blkid",
                 "-I/usr/include/glib-2.0",
                 //Manjaro linux lib args
-                //"-lz",
+                "-lz",
 
                 "-lgtk-3",
                 "-lgdk-3",
diff --git a/Gtk3/gtk65_menu3/src/main.cpp b/Gtk3/gtk65_menu3/src/main.cpp
index 22978c1..c5065d2 100644
--- a/Gtk3/gtk65_menu3/src/main.cpp
+++ b/Gtk3/gtk65_menu3/src/main.cpp
@@ -85,8 +85,8 @@ static void about_activated(GSimpleAction *action,
     char *version;
     version=g_strdup_printf("1.0\nRunning Against GTK %d.%d.%d",
                             gtk_get_major_version(),
-                            gtk_get_micro_version(),
-                            gtk_get_minor_version());
+                            gtk_get_minor_version(),
+                            gtk_get_micro_version());
     GtkWidget *dialog;
     dialog=gtk_about_dialog_new();
     gtk_show_about_dialog(win,
@@ -117,7 +117,7 @@ static void button_press(GtkGesture *gesture,guint n_press,
     rectangle.y=y;
     rectangle.width=1;
     rectangle.height=1;
-    g_print("%f %f\n",x,y);
+    //g_print("%f %f\n",x,y);
     gtk_popover_set_pointing_to(GTK_POPOVER(popover),&rectangle);
     //gtk_popover_present(GTK_POPOVER(popover));
     gtk_popover_popup(GTK_POPOVER(popover));