[glom/glom-1-32] Avoid a indirect gtksourceviewmm include
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glom/glom-1-32] Avoid a indirect gtksourceviewmm include
- Date: Mon, 28 Oct 2019 13:37:15 +0000 (UTC)
commit f73bd15a818531e81dac4f81f3ac8e659f9c84bf
Author: Murray Cumming <murrayc murrayc com>
Date: Mon Oct 28 13:44:34 2019 +0100
Avoid a indirect gtksourceviewmm include
Because it currently causes so many warnings about #warning (in the
gtksourceview headers) being a GNU-only extension.
glom/appwindow.cc | 1 +
glom/mode_design/fields/box_db_table_definition.cc | 1 +
glom/mode_design/fields/box_db_table_definition.h | 5 ++++-
glom/mode_design/fields/dialog_fielddefinition.cc | 1 +
4 files changed, 7 insertions(+), 1 deletion(-)
---
diff --git a/glom/appwindow.cc b/glom/appwindow.cc
index b6ad9105..c37a218e 100644
--- a/glom/appwindow.cc
+++ b/glom/appwindow.cc
@@ -46,6 +46,7 @@
#include <giomm/menu.h>
#include <gtkmm/main.h>
+#include <gtkmm/textview.h>
#include <giomm/file.h>
#include <glibmm/spawn.h>
diff --git a/glom/mode_design/fields/box_db_table_definition.cc
b/glom/mode_design/fields/box_db_table_definition.cc
index 410eace9..dadbdb49 100644
--- a/glom/mode_design/fields/box_db_table_definition.cc
+++ b/glom/mode_design/fields/box_db_table_definition.cc
@@ -19,6 +19,7 @@
*/
#include "box_db_table_definition.h"
+#include <glom/mode_design/fields/dialog_fielddefinition.h>
#include <glom/frame_glom.h>
#include <glom/glade_utils.h>
#include <glom/utils_ui.h> //For bold_message()).
diff --git a/glom/mode_design/fields/box_db_table_definition.h
b/glom/mode_design/fields/box_db_table_definition.h
index 08882a22..0c431671 100644
--- a/glom/mode_design/fields/box_db_table_definition.h
+++ b/glom/mode_design/fields/box_db_table_definition.h
@@ -22,12 +22,15 @@
#define GLOM_MODE_DESIGN_BOX_DB_TABLE_DEFINITION_H
#include <glom/box_db_table.h>
-#include <glom/mode_design/fields/dialog_fielddefinition.h>
#include <glom/mode_design/fields/dialog_defaultformatting.h>
namespace Glom
{
+// Avoid including dialog_fielddefinition,
+// which includes some messy gtksourceview headers.
+class Dialog_FieldDefinition;
+
class Box_DB_Table_Definition : public Box_DB_Table
{
public:
diff --git a/glom/mode_design/fields/dialog_fielddefinition.cc
b/glom/mode_design/fields/dialog_fielddefinition.cc
index 66a03f76..74984a7d 100644
--- a/glom/mode_design/fields/dialog_fielddefinition.cc
+++ b/glom/mode_design/fields/dialog_fielddefinition.cc
@@ -23,6 +23,7 @@
#include <glom/glade_utils.h>
#include <glom/utils_ui.h>
#include <glom/appwindow.h>
+#include <glom/mode_design/fields/dialog_fielddefinition.h>
#include "../../box_db_table.h"
#include <libglom/db_utils.h>
//#include <libgnome/gnome-i18n.h>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]