Hi,
I've done a fast patch for e16keyedit to gtk2. Now there's an configure
option --enable-gtk2 to activate gtk2 build. But it has a little bug
that "key" isn't displayed in label, but all works. I think it should be
easy to fix. If not I create a new Glade2 supported one in tools. And
there're a lot of gtk-warnings at start that could be ignored. I think
they are because of heavy use of the deprecated widgets.
If noboy cry I'll commit this:
? e16keyedit2_gtk2.patch
Index: configure.in
===================================================================
RCS file: /cvsroot/enlightenment/e16/e16keyedit/configure.in,v
retrieving revision 1.1
diff -u -u -r1.1 configure.in
--- configure.in 20 Jul 2004 20:21:57 -0000 1.1
+++ configure.in 25 Jul 2004 21:38:27 -0000
@@ -9,11 +9,23 @@
AC_PROG_MAKE_SET
dnl Checks for libraries.
-if !(gtk-config --version >/dev/null 2>&1); then
- AC_MSG_ERROR([Gtk+ is required.])
-else
- CFLAGS="$CFLAGS `gtk-config --cflags`"
- LIBS="$LIBS `gtk-config --libs`"
+AC_ARG_ENABLE(gtk2,
+ [ --enable-gtk2=[no/yes] enables the gtk2 GUI (default=yes)],,
+ enable_gtk2=no)
+
+if [ ! test "x$enable_gtk2" != "xyes"]; then
+ pkg_modules="gtk+-2.0 >= 2.0.0"
+ PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
+ CFLAGS="$CFLAGS $PACKAGE_CFLAGS"
+ LIBS="$LIBS $PACKAGE_LIBS"
+ AC_DEFINE(ENABLE_GTK2, , [Define to enable gtk2 support])
+else
+ if !(gtk-config --version >/dev/null 2>&1); then
+ AC_MSG_ERROR([Gtk+ is required.])
+ else
+ CFLAGS="$CFLAGS `gtk-config --cflags`"
+ LIBS="$LIBS `gtk-config --libs`"
+ fi
fi
dnl Checks for header files.
Index: ipc.c
===================================================================
RCS file: /cvsroot/enlightenment/e16/e16keyedit/ipc.c,v
retrieving revision 1.3
diff -u -u -r1.3 ipc.c
--- ipc.c 9 Feb 2000 00:02:14 -0000 1.3
+++ ipc.c 25 Jul 2004 21:38:27 -0000
@@ -141,7 +141,11 @@
if (!comms_win) {
GtkWidget *win, *label, *align, *frame, *button, *vbox;
+#ifdef ENABLE_GTK2
+ win = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+#else
win = gtk_window_new(GTK_WINDOW_DIALOG);
+#endif
gtk_window_set_policy(GTK_WINDOW(win), 0, 0, 1);
gtk_window_set_position(GTK_WINDOW(win),
GTK_WIN_POS_CENTER);
frame = gtk_frame_new(NULL);
@@ -166,7 +170,7 @@
gtk_container_add(GTK_CONTAINER(align), vbox);
gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE,
0);
gtk_box_pack_start(GTK_BOX(vbox), button, FALSE,
FALSE, 0);
- gtk_widget_show_all(win);
+ gtk_widget_show_all(win);
gtk_main();
exit(1);
}
Index: viewer.c
===================================================================
RCS file: /cvsroot/enlightenment/e16/e16keyedit/viewer.c,v
retrieving revision 1.19
diff -u -u -r1.19 viewer.c
--- viewer.c 23 Mar 2000 01:13:21 -0000 1.19
+++ viewer.c 25 Jul 2004 21:38:28 -0000
@@ -190,7 +190,11 @@
gdk_keyboard_grab(win->window, TRUE, CurrentTime);
XWindowEvent(GDK_DISPLAY(), GDK_WINDOW_XWINDOW(win->window),
KeyPressMask, &ev);
+#ifdef ENABLE_GTK2
+ gdk_keyboard_ungrab(GDK_CURRENT_TIME);
+#else
gdk_keyboard_ungrab(gdk_time_get());
+#endif
key = XKeysymToString(XKeycodeToKeysym(GDK_DISPLAY(),
ev.xkey.keycode, 0));
gtk_entry_set_text(GTK_ENTRY(act_key),key);
-------------------------------------------------------
This SF.Net email is sponsored by BEA Weblogic Workshop
FREE Java Enterprise J2EE developer tools!
Get your free copy of BEA WebLogic Workshop 8.1 today.
http://ads.osdn.com/?ad_id=4721&alloc_id=10040&op=click
_______________________________________________
enlightenment-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
