Permalink
Browse files

Add gtk3 support for scim-setup.

svn commit r333
  • Loading branch information...
1 parent f94277f commit dc08e281cee42034e450805e634196f2c23d02e8 @tzhuan tzhuan committed Mar 20, 2012
Showing with 11 additions and 3 deletions.
  1. +4 −0 configure.ac
  2. +2 −2 extras/setup/Makefile.am
  3. +4 −0 extras/setup/scim_setup_ui.cpp
  4. +1 −1 scim-gtkutils.pc.in
View
@@ -449,23 +449,27 @@ if test "$USE_GTK_VERSION" = "3"; then
SCIM_HAS_GTK=yes
GTK_LIBDIR=$GTK3_LIBDIR
GTK_VERSION=$GTK3_VERSION
+ GTK_MAJOR_VERSION=3
GTK_BINARY_VERSION=$GTK3_BINARY_VERSION
GTK_CFLAGS=$GTK3_CFLAGS
GTK_LIBS=$GTK3_LIBS
AC_SUBST(GTK_LIBDIR)
AC_SUBST(GTK_VERSION)
+ AC_SUBST(GTK_MAJOR_VERSION)
AC_SUBST(GTK_BINARY_VERSION)
AC_SUBST(GTK_CFLAGS)
AC_SUBST(GTK_LIBS)
elif test "$USE_GTK_VERSION" = "2"; then
SCIM_HAS_GTK=yes
GTK_LIBDIR=$GTK2_LIBDIR
GTK_VERSION=$GTK2_VERSION
+ GTK_MAJOR_VERSION=2
GTK_BINARY_VERSION=$GTK2_BINARY_VERSION
GTK_CFLAGS=$GTK2_CFLAGS
GTK_LIBS=$GTK2_LIBS
AC_SUBST(GTK_LIBDIR)
AC_SUBST(GTK_VERSION)
+ AC_SUBST(GTK_MAJOR_VERSION)
AC_SUBST(GTK_BINARY_VERSION)
AC_SUBST(GTK_CFLAGS)
AC_SUBST(GTK_LIBS)
@@ -50,13 +50,13 @@ setup_la_SOURCES = scim_setup_ui.cpp \
scim_setup_module.cpp \
scim_setup_helper.cpp
-setup_la_CXXFLAGS = @GTK2_CFLAGS@
+setup_la_CXXFLAGS = @GTK_CFLAGS@
setup_la_LDFLAGS = -avoid-version \
-rpath $(moduledir) \
-module \
@LIBTOOL_EXPORT_OPTIONS@ \
- @GTK2_LIBS@ \
+ @GTK_LIBS@ \
@LTLIBINTL@
setup_la_LIBADD = $(top_builddir)/src/libscim@SCIM_EPOCH@.la
@@ -252,7 +252,11 @@ SetupUI::create_main_ui ()
// Create statusbar.
m_status_bar = gtk_statusbar_new ();
+#if GTK_CHECK_VERSION(3, 0, 0)
+ gtk_window_set_has_resize_grip (GTK_WINDOW(m_main_window), TRUE);
+#else
gtk_statusbar_set_has_resize_grip (GTK_STATUSBAR (m_status_bar), TRUE);
+#endif
gtk_widget_show (m_status_bar);
gtk_box_pack_start (GTK_BOX (vbox1), m_status_bar, FALSE, FALSE, 0);
View
@@ -9,6 +9,6 @@ sysconfdir=@sysconfdir@
Name: scim-gtkutils
Description: GTK Utilities for Smart Common Input Method platform
Version: @SCIM_VERSION@
-Requires: gtk+-2.0 scim
+Requires: gtk+-@GTK_MAJOR_VERSION@.0 scim
Libs: -L${libdir} -lscim-gtkutils@SCIM_EPOCH@
Cflags: -I${includedir}/scim@SCIM_EPOCH@

0 comments on commit dc08e28

Please sign in to comment.