From b07db736c618bc9b57b9e3f613db8efd3a8768ed Mon Sep 17 00:00:00 2001
From: Blanchard ARnaud <arnaud.blanchard@ensea.fr>
Date: Thu, 16 Nov 2017 17:47:29 +0100
Subject: [PATCH] Remove references to blibs/blgtk
---
o_gtk_image/CMakeLists.txt | 1 -
o_gtk_image/src/common.h | 2 +-
o_gtk_image/src/histogram.cpp | 2 --
o_gtk_image/src/image_display.cpp | 25 ++++++++++++++++++++++++-
4 files changed, 25 insertions(+), 5 deletions(-)
diff --git a/o_gtk_image/CMakeLists.txt b/o_gtk_image/CMakeLists.txt
index f57f750..15bd5a7 100644
--- a/o_gtk_image/CMakeLists.txt
+++ b/o_gtk_image/CMakeLists.txt
@@ -8,7 +8,6 @@ project(o_gtk_image)
find_package(blc_channel REQUIRED)
find_package(blc_image REQUIRED)
find_package(blc_program REQUIRED)
-find_package(blgtk REQUIRED)
find_package(PkgConfig REQUIRED)
pkg_check_modules(GTK3 REQUIRED gtk+-3.0)
diff --git a/o_gtk_image/src/common.h b/o_gtk_image/src/common.h
index ae24106..90eef34 100644
--- a/o_gtk_image/src/common.h
+++ b/o_gtk_image/src/common.h
@@ -19,7 +19,7 @@ extern uint32_t g_colors[256];
extern uint32_t b_colors[256];
extern uint32_t *color_map;
-extern GtkWidget *paned;
+extern GtkWidget *window, *paned;
extern GdkDevice *pointer_device;
extern blc_channel mouse_channel;
diff --git a/o_gtk_image/src/histogram.cpp b/o_gtk_image/src/histogram.cpp
index b1e496f..7f9464a 100644
--- a/o_gtk_image/src/histogram.cpp
+++ b/o_gtk_image/src/histogram.cpp
@@ -1,7 +1,5 @@
#include "common.h"
-#include "blgtk.h"
-
#include <fcntl.h> // O_RDONLY ...
#include <stdio.h>
#include <gtk/gtk.h>
diff --git a/o_gtk_image/src/image_display.cpp b/o_gtk_image/src/image_display.cpp
index 837b297..a4c6d36 100644
--- a/o_gtk_image/src/image_display.cpp
+++ b/o_gtk_image/src/image_display.cpp
@@ -1,5 +1,4 @@
#include "common.h"
-#include "blgtk.h"
#include <fcntl.h> // O_RDONLY ...
#include <stdio.h>
@@ -51,6 +50,30 @@ static int g_source_continue=G_SOURCE_CONTINUE;
#define SWAP_RGBA_TO_CAIRO_ARGB32(x) ((((x) & 0x000000FF) << 16) | (((x) & 0x00FF0000) >> 16) | ((x) & 0xFF00FF00) )
+
+static GtkToggleToolButton *blgtk_add_toggle_tool_button(GtkWidget *toolbar, char const *label, char const *icon_name, GCallback callback, void *user_data)
+{
+ GtkToggleToolButton *toggle_tool_button;
+
+ toggle_tool_button=GTK_TOGGLE_TOOL_BUTTON(gtk_toggle_tool_button_new());
+
+ gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(toggle_tool_button), icon_name);
+ gtk_tool_button_set_label(GTK_TOOL_BUTTON(toggle_tool_button), label);
+ gtk_container_add(GTK_CONTAINER(toolbar), GTK_WIDGET(toggle_tool_button));
+ if (callback) g_signal_connect(G_OBJECT(toggle_tool_button), "clicked", callback, user_data);
+ return toggle_tool_button;
+}
+
+static GtkWidget *blgtk_add_tool_button(GtkWidget *toolbar, gchar const *label, gchar const *icon_name, GCallback callback, gpointer user_data)
+{
+ GtkWidget *tool_button;
+
+ tool_button=GTK_WIDGET(gtk_tool_button_new(gtk_image_new_from_icon_name(icon_name, GTK_ICON_SIZE_SMALL_TOOLBAR), label));
+ gtk_container_add(GTK_CONTAINER(toolbar), tool_button);
+ if (callback) g_signal_connect(G_OBJECT(tool_button), "clicked", callback, user_data);
+ return tool_button;
+}
+
static void toggle_fullscreen(GtkWidget *widget, GdkEventWindowState *event, gpointer user_data){
if (event->new_window_state & GDK_WINDOW_STATE_FULLSCREEN ){
--
GitLab