From 03184de73de4adf8fcba09b8eac6b8c0a3f06aab Mon Sep 17 00:00:00 2001
From: Burt P <pburt0@gmail.com>
Date: Tue, 25 Jul 2017 06:24:47 -0500
Subject: GTK3 updates

* Use gtk_widget_get_window() instead of ->window

cmake:
* add option to build against gtk3 `-DHARDINFO_GTK3=1`
* combine hardinfo-shell static library and hardinfo
* disable guibench for gtk3

hardinfo/util.c:
* widget_set_cursor() gtk3 changes
* For now, the whole function tree_view_save_image() is disabled
  for gtk3.

shell/shell.c:
* add gtk_notebook_set_page() compatibility macro if not defined
* shell_summary_add_item() fixes
* Disable RANGE_GET_VALUE() RANGE_SET_VALUE() macros for GTK3. This
  is a nigtmare onion to try and peel.

shell/callbacks.c:
* gtk_about_dialog_set_name() -> gtk_about_dialog_set_program_name()
  after GTK+2.12.

shell/loadgraph.c:
* builds, but not yet functioning under gtk3

Signed-off-by: Burt P <pburt0@gmail.com>
---
 includes/loadgraph.h | 64 ++++++++++++++++++++--------------------------------
 1 file changed, 24 insertions(+), 40 deletions(-)

(limited to 'includes')

diff --git a/includes/loadgraph.h b/includes/loadgraph.h
index 2854cf01..6ea29113 100755
--- a/includes/loadgraph.h
+++ b/includes/loadgraph.h
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with the Simple Load Graph; if not, write to the Free
  * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA. 
+ * 02111-1307 USA.
  */
 
 
@@ -24,12 +24,6 @@
 #include <stdlib.h>
 #include <gtk/gtk.h>
 #include <math.h>
-/*#include <libintl.h>
-#include <locale.h>
-#define _(STRING)    gettext(STRING)
-#define N_(STRING) (STRING)*/
-
-
 
 typedef struct _LoadGraph LoadGraph;
 
@@ -42,50 +36,40 @@ typedef enum {
 struct _LoadGraph {
 #if GTK_CHECK_VERSION(3, 0, 0)
     cairo_surface_t *buf;
-#else
-    GdkPixmap     *buf;
-#endif
-    GtkWidget     *area;
-
-#if GTK_CHECK_VERSION(3, 0, 0)
     cairo_t       *grid;
-#else
-    GdkGC         *grid;
-#endif
-#if GTK_CHECK_VERSION(3, 0, 0)
     cairo_t       *trace;
-#else
-    GdkGC         *trace;
-#endif
-#if GTK_CHECK_VERSION(3, 0, 0)
     cairo_t       *fill;
 #else
-    GdkGC	      *fill;
+    GdkPixmap     *buf;
+    GdkGC         *grid;
+    GdkGC         *trace;
+    GdkGC         *fill;
 #endif
+    GtkWidget     *area;
 
-    gint     	  *data;
+    gint          *data;
     gfloat         scale;
 
-    gint	   size;
-    gint	   width, height;
-    LoadGraphColor color;    
-    
-    gint	   max_value, remax_count;
-    
+    gint       size;
+    gint       width, height;
+    LoadGraphColor color;
+
+    gint       max_value, remax_count;
+
     PangoLayout   *layout;
-    gchar	  *suffix;
+    gchar     *suffix;
 };
 
-LoadGraph 	*load_graph_new(gint size);
-void 		 load_graph_destroy(LoadGraph *lg);
-void		 load_graph_configure_expose(LoadGraph *lg);
-GtkWidget 	*load_graph_get_framed(LoadGraph *lg);
+LoadGraph   *load_graph_new(gint size);
+void         load_graph_destroy(LoadGraph *lg);
+void         load_graph_configure_expose(LoadGraph *lg);
+GtkWidget   *load_graph_get_framed(LoadGraph *lg);
 
-void		 load_graph_update(LoadGraph *lg, gint value);
-void		 load_graph_set_color(LoadGraph *lg, LoadGraphColor color);
-void		 load_graph_clear(LoadGraph *lg);
+void         load_graph_update(LoadGraph *lg, gint value);
+void         load_graph_set_color(LoadGraph *lg, LoadGraphColor color);
+void         load_graph_clear(LoadGraph *lg);
 
-void		 load_graph_set_data_suffix(LoadGraph *lg, gchar *suffix);
-gchar 		*load_graph_get_data_suffix(LoadGraph *lg);
+void         load_graph_set_data_suffix(LoadGraph *lg, gchar *suffix);
+gchar       *load_graph_get_data_suffix(LoadGraph *lg);
 
-#endif	/* __LOADGRAPH_H__ */
+#endif  /* __LOADGRAPH_H__ */
-- 
cgit v1.2.3