Skip to content

Commit 93f98fc

Browse files
committed
Updated to work with GTK+-3 version 3.8 to support Ubuntu 13.10 build.
1 parent e6ba203 commit 93f98fc

File tree

4 files changed

+10
-6
lines changed

4 files changed

+10
-6
lines changed

N3888_RefImpl/src/N3888_RefImpl.ui.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ library is available for download at:</property>
3030
<child internal-child="action_area">
3131
<object class="GtkButtonBox" id="dialog-action_area1">
3232
<property name="can_focus">False</property>
33-
<property name="baseline_position">bottom</property>
3433
<property name="layout_style">end</property>
3534
<child>
3635
<object class="GtkButton" id="about_ok_button">

N3888_RefImpl/src/entrypoint-gtk.cpp

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
#include <gtk/gtk.h>
44
#include "N3888_RefImpl.ui.h"
55
#include <assert.h>
6+
#include <stdexcept>
67

78
GtkBuilder* g_builder;
89
GtkWidget* g_main_window;
@@ -18,8 +19,13 @@ gboolean redraw_callback(gpointer user_data) {
1819
int main(int argc, char** argv) {
1920
gtk_init(&argc, &argv);
2021

21-
g_builder = gtk_builder_new_from_string(
22-
g_n3888_ui_as_string, -1);
22+
g_builder = gtk_builder_new();
23+
24+
auto result = gtk_builder_add_from_string(g_builder, g_n3888_ui_as_string, -1, nullptr);
25+
if (result == 0) {
26+
throw ::std::runtime_error("Failed call to gtk_builder_add_from_string.");
27+
}
28+
2329
g_main_window = GTK_WIDGET(gtk_builder_get_object(g_builder, "window"));
2430
assert(g_main_window != nullptr);
2531
g_drawingarea = GTK_WIDGET(gtk_builder_get_object(g_builder, "drawingarea"));

N3888_RefImpl/src/signals.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#include "signals.h"
2-
//#include <memory>
32
#include <string>
43
#include "drawing.h"
54
#include <cairo.h>
@@ -93,5 +92,5 @@ G_MODULE_EXPORT void on_edit_screencapture_menuitem_activate(GtkMenuItem* menuit
9392
}
9493

9594
G_MODULE_EXPORT void on_file_exit_menuitem_activate(GtkMenuItem* menuitem, gpointer user_data) {
96-
gtk_window_close(GTK_WINDOW(g_main_window));
95+
gtk_widget_destroy(GTK_WIDGET(g_main_window));
9796
}

configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ AC_CONFIG_MACRO_DIR([m4])
88
AC_LANG([C++])
99
AX_CXX_COMPILE_STDCXX_11([noext], [mandatory])
1010
AX_CXXFLAGS_WARN_ALL
11-
PKG_CHECK_MODULES([GTKCAIRO], [gtk+-3.0 >= 3.10.0 gmodule-2.0 gobject-2.0 cairo >= 1.12.16])
11+
PKG_CHECK_MODULES([GTKCAIRO], [gtk+-3.0 >= 3.8.0 gmodule-2.0 gobject-2.0 cairo >= 1.12.16])
1212
AC_OUTPUT

0 commit comments

Comments
 (0)