Skip to content

Commit c76dae4

Browse files
committed
some deprecated and inicialization
1 parent 4f046e0 commit c76dae4

File tree

2 files changed

+33
-26
lines changed

2 files changed

+33
-26
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ endif
110110
GTKFLAGS = `pkg-config --cflags gtk+-3.0 gladeui-2.0 gtksourceview-3.0 ${MAC_INTEGRATIONFLAGS} ${LIBWNCKFLAGS}`
111111
GTKLIBS = `pkg-config --libs gtk+-3.0 gladeui-2.0 gtksourceview-3.0 ${MAC_INTEGRATIONLIBS} ${LIBWNCKLIBS}`
112112

113-
COMPILER_FLAGS += -Wall -Woverloaded-virtual -c -std=c++11 -fpic -o
113+
COMPILER_FLAGS += -Wall -Wdeprecated-declarations -Woverloaded-virtual -c -std=c++11 -fpic -o
114114
LINKER_FLAGS = -shared ${GTKLIBS}
115115
LINKER_DEPENDENCIES = -lphpcpp ${GTKLIBS}
116116

main.cpp

Lines changed: 32 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,14 @@ extern "C"
307307
gapplication.method<&GApplication_::get_is_busy>("get_is_busy");
308308
gapplication.method<&GApplication_::bind_busy_property>("bind_busy_property");
309309
gapplication.method<&GApplication_::unbind_busy_property>("unbind_busy_property");
310-
gapplication.constant("FLAGS_NONE", G_APPLICATION_FLAGS_NONE);
310+
311+
#if GLIB_CHECK_VERSION(2, 74, 0)
312+
gapplication.constant("DEFAULT_FLAGS", G_APPLICATION_DEFAULT_FLAGS);
313+
#else
314+
gapplication.constant("FLAGS_NONE", G_APPLICATION_FLAGS_NONE);
315+
#endif
316+
317+
311318
gapplication.constant("IS_SERVICE", G_APPLICATION_IS_SERVICE);
312319
gapplication.constant("IS_LAUNCHER", G_APPLICATION_IS_LAUNCHER);
313320
gapplication.constant("HANDLES_OPEN", G_APPLICATION_HANDLES_OPEN);
@@ -531,23 +538,23 @@ extern "C"
531538
Php::Class<GdkEvent_> gdkevent("GdkEvent");
532539
gdkevent.method<&GdkEvent_::__construct>("__construct");
533540
// gdkevent.method<&GdkEvent_::__get>("__get");
534-
gdkevent.property("type", NULL);
535-
gdkevent.property("button", NULL);
536-
gdkevent.property("key", NULL);
541+
gdkevent.property("type", nullptr);
542+
gdkevent.property("button", nullptr);
543+
gdkevent.property("key", nullptr);
537544

538545
// GdkEventButton
539546
Php::Class<GdkEventButton_> gdkeventbutton("GdkEventButton");
540547
gdkeventbutton.method<&GdkEventButton_::__construct>("__construct");
541-
gdkeventbutton.property("type", NULL);
542-
gdkeventbutton.property("send_event", NULL);
543-
gdkeventbutton.property("time", NULL);
544-
gdkeventbutton.property("x", NULL);
545-
gdkeventbutton.property("y", NULL);
546-
gdkeventbutton.property("axes", NULL);
547-
gdkeventbutton.property("state", NULL);
548-
gdkeventbutton.property("button", NULL);
549-
gdkeventbutton.property("x_root", NULL);
550-
gdkeventbutton.property("y_root", NULL);
548+
gdkeventbutton.property("type", nullptr);
549+
gdkeventbutton.property("send_event", nullptr);
550+
gdkeventbutton.property("time", nullptr);
551+
gdkeventbutton.property("x", nullptr);
552+
gdkeventbutton.property("y", nullptr);
553+
gdkeventbutton.property("axes", nullptr);
554+
gdkeventbutton.property("state", nullptr);
555+
gdkeventbutton.property("button", nullptr);
556+
gdkeventbutton.property("x_root", nullptr);
557+
gdkeventbutton.property("y_root", nullptr);
551558

552559
// GdkCursor
553560
Php::Class<GdkCursor_> gdkcursor("GdkCursor");
@@ -701,17 +708,17 @@ extern "C"
701708
// GdkEventKey
702709
Php::Class<GdkEventKey_> gdkeventkey("GdkEventKey");
703710
gdkeventkey.method<&GdkEventKey_::__construct>("__construct");
704-
gdkeventkey.property("type", NULL);
705-
gdkeventkey.property("send_event", NULL);
706-
gdkeventkey.property("time", NULL);
707-
gdkeventkey.property("state", NULL);
708-
gdkeventkey.property("keyval", NULL);
709-
gdkeventkey.property("length", NULL);
710-
gdkeventkey.property("string", NULL);
711-
gdkeventkey.property("hardware_keycode", NULL);
712-
gdkeventkey.property("keycode", NULL);
713-
gdkeventkey.property("group", NULL);
714-
gdkeventkey.property("is_modifier", NULL);
711+
gdkeventkey.property("type", nullptr);
712+
gdkeventkey.property("send_event", nullptr);
713+
gdkeventkey.property("time", nullptr);
714+
gdkeventkey.property("state", nullptr);
715+
gdkeventkey.property("keyval", nullptr);
716+
gdkeventkey.property("length", nullptr);
717+
gdkeventkey.property("string", nullptr);
718+
gdkeventkey.property("hardware_keycode", nullptr);
719+
gdkeventkey.property("keycode", nullptr);
720+
gdkeventkey.property("group", nullptr);
721+
gdkeventkey.property("is_modifier", nullptr);
715722

716723
// GdkEventType
717724
Php::Class<Php::Base> gdkeventtype("GdkEventType");

0 commit comments

Comments
 (0)