Blob Blame History Raw
diff -urN gcin-1.5.0.orig/anthy.cpp gcin-1.5.0/anthy.cpp
--- gcin-1.5.0.orig/anthy.cpp	2010-05-11 14:45:46.000000000 +0800
+++ gcin-1.5.0/anthy.cpp	2010-06-23 10:15:15.000000000 +0800
@@ -1031,7 +1031,11 @@
 
 int anthy_visible()
 {
-  return GTK_WIDGET_VISIBLE(win_anthy);
+#if GTK_CHECK_VERSION(2,18,0)
+	return gtk_widget_get_visible(win_anthy);
+#else
+	return GTK_WIDGET_VISIBLE(win_anthy);
+#endif
 }
 
 extern gboolean force_show;
diff -urN gcin-1.5.0.orig/eggtrayicon.cpp gcin-1.5.0/eggtrayicon.cpp
--- gcin-1.5.0.orig/eggtrayicon.cpp	2010-04-11 14:20:56.000000000 +0800
+++ gcin-1.5.0/eggtrayicon.cpp	2010-06-23 10:31:04.000000000 +0800
@@ -349,8 +349,12 @@
 
       gdk_window_add_filter (gdkwin, egg_tray_icon_manager_filter, icon);
 
-      if (dock_if_realized && GTK_WIDGET_REALIZED (GTK_WIDGET (icon)))
-	egg_tray_icon_send_dock_request (icon);
+#if GTK_CHECK_VERSION(2,20,0)
+      if (dock_if_realized && gtk_widget_get_realized (icon))
+#else
+	      if (dock_if_realized && GTK_WIDGET_REALIZED (icon))
+#endif
+		      egg_tray_icon_send_dock_request (icon);
 
       egg_tray_icon_get_orientation_property (icon);
     }
@@ -395,8 +399,8 @@
 static void
 make_transparent (GtkWidget *widget, gpointer user_data)
 {
-#if GTK_CHECK_VERSION(2,19,3)
-	if (GTK_WIDGET_NO_WINDOW (widget) || gtk_widget_get_app_paintable (widget))
+#if GTK_CHECK_VERSION(2,18,0)
+	if (!gtk_widget_get_has_window (widget) || gtk_widget_get_app_paintable (widget))
 #else
 	if (GTK_WIDGET_NO_WINDOW (widget) || GTK_WIDGET_APP_PAINTABLE (widget))
 #endif
diff -urN gcin-1.5.0.orig/eve.cpp gcin-1.5.0/eve.cpp
--- gcin-1.5.0.orig/eve.cpp	2010-06-19 20:03:42.000000000 +0800
+++ gcin-1.5.0/eve.cpp	2010-06-23 10:34:46.000000000 +0800
@@ -731,11 +731,19 @@
   if (!current_CS)
     return FALSE;
   switch (current_method_type()) {
-    case method_type_PHO:
-      return gwin_pho && GTK_WIDGET_VISIBLE(gwin_pho);
+	  case method_type_PHO:
+#if GTK_CHECK_VERSION(2,18,0)
+		  return gwin_pho && gtk_widget_get_visible(gwin_pho);
+#else
+		  return gwin_pho && GTK_WIDGET_VISIBLE(gwin_pho);
+#endif
 #if USE_TSIN
-    case method_type_TSIN:
-      return gwin0 && GTK_WIDGET_VISIBLE(gwin0);
+	  case method_type_TSIN:
+# if GTK_CHECK_VERSION(2,18,0)
+		  return gwin0 && gtk_widget_get_visible(gwin0);
+# else
+		  return gwin0 && GTK_WIDGET_VISIBLE(gwin0);
+# endif
 #endif
     case method_type_INT_CODE:
       break;
@@ -745,8 +753,12 @@
 #endif
     default:
       if (!gwin_gtab)
-        return FALSE;
+	      return FALSE;
+#if GTK_CHECK_VERSION(2,18,0)
+      return gwin_gtab && gtk_widget_get_visible(gwin_gtab);
+#else
       return gwin_gtab && GTK_WIDGET_VISIBLE(gwin_gtab);
+#endif
   }
 
   return FALSE;
diff -urN gcin-1.5.0.orig/gtab.cpp gcin-1.5.0/gtab.cpp
--- gcin-1.5.0.orig/gtab.cpp	2010-06-23 10:12:45.000000000 +0800
+++ gcin-1.5.0/gtab.cpp	2010-06-23 10:36:21.000000000 +0800
@@ -1318,7 +1318,11 @@
     return feedkey_pho(key, 0);
 
   if (poo.same_pho_query_state == SAME_PHO_QUERY_none && gwin_pho &&
-    GTK_WIDGET_VISIBLE(gwin_pho))
+#if GTK_CHECK_VERSION(2,18,0)
+	  gtk_widget_get_visible(gwin_pho))
+#else
+	  GTK_WIDGET_VISIBLE(gwin_pho))
+#endif
      hide_win_pho();
 
 
diff -urN gcin-1.5.0.orig/tray.cpp gcin-1.5.0/tray.cpp
--- gcin-1.5.0.orig/tray.cpp	2010-06-18 06:07:58.000000000 +0800
+++ gcin-1.5.0/tray.cpp	2010-06-23 10:37:38.000000000 +0800
@@ -326,7 +326,11 @@
   gtk_widget_show_all (GTK_WIDGET (egg_tray_icon));
   tray_da_win = gtk_widget_get_window(da);
   // tray window is not ready ??
-  if (!tray_da_win || !GTK_WIDGET_DRAWABLE(da)) {
+#if GTK_CHECK_VERSION(2,18,0)
+  if (!tray_da_win || !gtk_widget_is_drawable(da)) {
+#else
+	  if (!tray_da_win || !GTK_WIDGET_DRAWABLE(da)) {
+#endif
     gtk_widget_destroy(GTK_WIDGET(egg_tray_icon));
     da = NULL;
     return FALSE;
diff -urN gcin-1.5.0.orig/win-gtab.cpp gcin-1.5.0/win-gtab.cpp
--- gcin-1.5.0.orig/win-gtab.cpp	2010-06-05 23:07:05.000000000 +0800
+++ gcin-1.5.0/win-gtab.cpp	2010-06-23 10:45:05.000000000 +0800
@@ -567,7 +567,11 @@
 
 //  dbg("show_win_gtab()\n");
 #if UNIX
-  if (!GTK_WIDGET_VISIBLE(gwin_gtab))
+# if GTK_CHECK_VERSION(2,18,0)
+  if (!gtk_widget_get_visible(gwin_gtab))
+# else
+	  if (!GTK_WIDGET_VISIBLE(gwin_gtab))
+# endif
 #endif
     gtk_widget_show(gwin_gtab);
 
diff -urN gcin-1.5.0.orig/win0.cpp gcin-1.5.0/win0.cpp
--- gcin-1.5.0.orig/win0.cpp	2010-06-21 09:07:23.000000000 +0800
+++ gcin-1.5.0/win0.cpp	2010-06-23 10:40:43.000000000 +0800
@@ -239,7 +239,11 @@
     return;
   }
 
-  if (button_pho && !GTK_WIDGET_VISIBLE(button_pho))
+#if GTK_CHECK_VERSION(2,18,0)
+  if (button_pho && !gtk_widget_get_visible(button_pho))
+#else
+	  if (button_pho && !GTK_WIDGET_VISIBLE(button_pho))
+#endif
     gtk_widget_show(button_pho);
 
   disp_pho_sub(label_pho, index, pho);
@@ -644,7 +648,11 @@
   if (gcin_pop_up_win && !tsin_has_input() && !force_show)
     return;
 #if UNIX
-  if (!GTK_WIDGET_VISIBLE(gwin0))
+# if GTK_CHECK_VERSION(2,18,0)
+  if (!gtk_widget_get_visible(gwin0))
+# else
+	  if (!GTK_WIDGET_VISIBLE(gwin0))
+# endif
 #endif
   {
     gtk_widget_show(gwin0);
diff -urN gcin-1.5.0.orig/win1.cpp gcin-1.5.0/win1.cpp
--- gcin-1.5.0.orig/win1.cpp	2010-04-26 17:25:28.000000000 +0800
+++ gcin-1.5.0/win1.cpp	2010-06-23 10:44:12.000000000 +0800
@@ -190,7 +190,11 @@
 
 void disp_selections(int x, int y)
 {
-  if (!GTK_WIDGET_VISIBLE(gwin1)) {
+#if GTK_CHECK_VERSION(2,18,0)
+	if (!gtk_widget_get_visible(gwin1)) {
+#else
+		if (!GTK_WIDGET_VISIBLE(gwin1)) {
+#endif
     gtk_widget_show(gwin1);
   }
 
@@ -210,7 +214,11 @@
 
 void raise_tsin_selection_win()
 {
-  if (gwin1 && GTK_WIDGET_VISIBLE(gwin1))
+#if GTK_CHECK_VERSION(2,18,0)
+	if (gwin1 && gtk_widget_get_visible(gwin1))
+#else
+		if (gwin1 && GTK_WIDGET_VISIBLE(gwin1))
+#endif
     gtk_window_present(GTK_WINDOW(gwin1));
 }