Merged GTK3 Stuff

CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required (VERSION 2.8.8)
 
 project ("Xournal++" CXX C)
-set (PROJECT_VERSION "1.0.1")
+set (PROJECT_VERSION "1.0.2")
 set (PROJECT_PACKAGE "xournalpp")
 
 set (PROJECT_STRING "${PROJECT_NAME} ${PROJECT_VERSION}")
@@ -82,7 +82,16 @@ endif (BUILD_BOOST)
 add_includes_ldflags ("${Boost_LIBRARIES}" "${Boost_INCLUDE_DIRS}")
 
 # GTK+/Gnome
-pkg_check_modules (Gnome REQUIRED "gtk+-2.0 >= 2.18.3" "libglade-2.0 >= 2.6.4" "glib-2.0 >= 2.32.0" "gthread-2.0 >= 2.4.0")
+option (USE_GTK3 "Use GTK3 instead of GTK2" OFF)
+if (USE_GTK3)
+  pkg_check_modules (GTK REQUIRED "gtk+-3.0 >= 3.18.9")
+  add_includes_ldflags ("${GTK_LDFLAGS}" "${GTK_INCLUDE_DIRS}")
+else (USE_GTK3)
+  pkg_check_modules (GTK REQUIRED "gtk+-2.0 >= 2.18.3")
+  add_includes_ldflags ("${GTK_LDFLAGS}" "${GTK_INCLUDE_DIRS}")
+endif (USE_GTK3)
+
+pkg_check_modules (Gnome REQUIRED "libglade-2.0 >= 2.6.4" "glib-2.0 >= 2.32.0" "gthread-2.0 >= 2.4.0" "libxml-2.0 >= 2.0.0")
 add_includes_ldflags ("${Gnome_LDFLAGS}" "${Gnome_INCLUDE_DIRS}")
 
 # Poppler
@@ -241,6 +250,11 @@ if (DEV_CHECK_GTK3_COMPAT)
     add_definitions (-DGTK_DISABLE_SINGLE_INCLUDES -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGSEAL_ENABLE)
 endif ()
 
+if (USE_GTK3)
+    add_definitions (-DGTK3_ENABLED=true)
+endif (USE_GTK3)
+
+
 mark_as_advanced (FORCE
   DEV_CONFIG_DIR DEV_TOOLBAR_CONFIG DEV_SETTINGS_XML_FILE DEV_PRINT_CONFIG_FILE DEV_METADATA_FILE DEV_METADATA_MAX_ITEMS
   DEV_ENABLE_GCOV DEV_CHECK_GTK3_COMPAT

src/model/Element.cpp

@@ -99,6 +99,11 @@ double Element::getElementHeight()
 	return this->height;
 }
 
+Rectangle Element::boundingRect()
+{
+	return Rectangle(getX(), getY(), getElementWidth(), getElementHeight());
+}
+
 void Element::setColor(int color)
 {
 	XOJ_CHECK_TYPE(Element);

src/model/Element.h

@@ -12,6 +12,7 @@
 #pragma once
 
 #include <serializing/Serializeable.h>
+#include <Rectangle.h>
 #include <XournalType.h>
 
 #include <gtk/gtk.h>
@@ -54,6 +55,8 @@ public:
 	double getElementWidth();
 	double getElementHeight();
 
+	Rectangle boundingRect();
+
 	virtual bool intersectsArea(const GdkRectangle* src);
 	virtual bool intersectsArea(double x, double y, double width, double height);
 

src/model/Stroke.cpp

@@ -146,6 +146,11 @@ void Stroke::setLastPoint(double x, double y)
 	}
 }
 
+void Stroke::setLastPoint(Point p)
+{
+	setLastPoint(p.x, p.y);
+}
+
 void Stroke::addPoint(Point p)
 {
 	XOJ_CHECK_TYPE(Stroke);

src/model/Stroke.h

@@ -38,6 +38,7 @@ public:
 
 	void addPoint(Point p);
 	void setLastPoint(double x, double y);
+	void setLastPoint(Point p);
 	int getPointCount() const;
 	void freeUnusedPointItems();
 	ArrayIterator<Point> pointIterator() const;