Drop MqScrolledWindow and stop use in MqTabChrome

4 files changed, 3 insertions, 119 deletions

diff --git a/src/local.mk b/src/local.mk
index a776c38..ca2e0b0 100644
--- a/src/local.mk
+++ b/src/local.mk
@@ -3,5 +3,4 @@ marquee_SOURCES += \
 	%reldir%/window.c \
 	%reldir%/tab.c \
 	%reldir%/tab-chrome.c \
-	%reldir%/tab-body.c \
-	%reldir%/scrolled-window.c
+	%reldir%/tab-body.c
diff --git a/src/scrolled-window.c b/src/scrolled-window.c
deleted file mode 100644
index 96d0eba..0000000
--- a/src/scrolled-window.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * GtkScrolledWindow subclass with natural size propagation
- *
- * Copyright (C) 2017  Patrick McDermott
- *
- * This file is part of Marquee.
- *
- * Marquee is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Marquee is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Marquee.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "src/scrolled-window.h"
-
-struct _MqScrolledWindow {
-	GtkScrolledWindow parent_instance;
-};
-
-struct _MqScrolledWindowClass {
-	GtkScrolledWindowClass parent_class;
-};
-
-G_DEFINE_TYPE(MqScrolledWindow, mq_scrolled_window, GTK_TYPE_SCROLLED_WINDOW)
-
-static void
-mq_scrolled_window_size_allocate(GtkWidget *widget, GtkAllocation *allocation)
-{
-}
-
-static void
-mq_scrolled_window_init(MqScrolledWindow *scrolled_window)
-{
-}
-
-static void
-mq_scrolled_window_class_init(MqScrolledWindowClass *class)
-{
-	GtkWidgetClass *widget_class;
-
-	widget_class = (GtkWidgetClass *) class;
-
-	widget_class->size_allocate = mq_scrolled_window_size_allocate;
-}
-
-MqScrolledWindow *
-mq_scrolled_window_new(GtkAdjustment *hadjustment, GtkAdjustment *vadjustment)
-{
-	return g_object_new(MQ_TYPE_SCROLLED_WINDOW,
-		"hadjustment", hadjustment, "vadjustment", vadjustment, NULL);
-}
diff --git a/src/scrolled-window.h b/src/scrolled-window.h
deleted file mode 100644
index 933b45a..0000000
--- a/src/scrolled-window.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * GtkScrolledWindow subclass with natural size propagation
- *
- * Copyright (C) 2017  Patrick McDermott
- *
- * This file is part of Marquee.
- *
- * Marquee is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Marquee is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Marquee.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef MQ_SCROLLED_WINDOW_H
-#define MQ_SCROLLED_WINDOW_H
-
-#include <gtk/gtk.h>
-
-G_BEGIN_DECLS
-
-#define MQ_TYPE_SCROLLED_WINDOW            (mq_scrolled_window_get_type())
-#define MQ_SCROLLED_WINDOW(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), \
-                                           MQ_TYPE_SCROLLED_WINDOW, \
-                                           MqScrolledWindow))
-#define MQ_IS_SCROLLED_WINDOW(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), \
-                                           MQ_TYPE_SCROLLED_WINDOW))
-#define MQ_SCROLLED_WINDOW_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass), \
-                                           MQ_TYPE_SCROLLED_WINDOW, \
-                                           MqScrolledWindowClass))
-#define MQ_IS_SCROLLED_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), \
-                                           MQ_TYPE_SCROLLED_WINDOW))
-#define MQ_SCROLLED_WINDOW_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), \
-                                           MQ_TYPE_SCROLLED_WINDOW, \
-                                           MqScrolledWindowClass))
-
-typedef struct _MqScrolledWindow      MqScrolledWindow;
-typedef struct _MqScrolledWindowClass MqScrolledWindowClass;
-
-GType
-mq_scrolled_window_get_type(void);
-
-MqScrolledWindow *
-mq_scrolled_window_new(GtkAdjustment *hadjustment, GtkAdjustment *vadjustment);
-
-G_END_DECLS
-
-#endif
diff --git a/src/tab-chrome.c b/src/tab-chrome.c
index 5361906..a42ff26 100644
--- a/src/tab-chrome.c
+++ b/src/tab-chrome.c
@@ -25,7 +25,6 @@
 #include <webkit2/webkit2.h>
 
 #include "tab-chrome.h"
-#include "scrolled-window.h"
 
 static void
 back_clicked_cb(GtkButton __attribute__((unused)) *toolbutton,
@@ -221,7 +220,7 @@ back_forward_box_button_press_cb(GtkWidget *widget, GdkEvent *event,
 	}
 
 	/* Set up the list scrolled window. */
-	list_scrolled_window = mq_scrolled_window_new(NULL, NULL);
+	list_scrolled_window = gtk_scrolled_window_new(NULL, NULL);
 	gtk_scrolled_window_set_policy(
 		GTK_SCROLLED_WINDOW(list_scrolled_window),
 		GTK_POLICY_NEVER, GTK_POLICY_NEVER);
@@ -233,7 +232,7 @@ back_forward_box_button_press_cb(GtkWidget *widget, GdkEvent *event,
 		NULL);
 
 	/* Set up the text scrolled window. */
-	text_scrolled_window = mq_scrolled_window_new(NULL, NULL);
+	text_scrolled_window = gtk_scrolled_window_new(NULL, NULL);
 	gtk_scrolled_window_set_policy(
 		GTK_SCROLLED_WINDOW(text_scrolled_window),
 		GTK_POLICY_NEVER, GTK_POLICY_NEVER);