From 3d8c4e25fdc11f07ba5690f24e09e628126a0881 Mon Sep 17 00:00:00 2001
From: Mike Kestner <mkestner@gmail.com>
Date: Wed, 9 Feb 2011 10:28:31 -0600
Subject: [PATCH] Kill some unneeded #if GTK_SHARP_N checks

* gdk/Event.cs
* glib/Format.cs
* gtk/Builder.custom
* gtk/IconTheme.custom
* pango/Attribute.cs
Remove versioned code since it's all there in 3.0.
---
 gdk/Event.cs         | 4 ----
 glib/Format.cs       | 2 --
 gtk/Builder.custom   | 2 --
 gtk/IconTheme.custom | 2 --
 pango/Attribute.cs   | 4 ----
 5 files changed, 14 deletions(-)

diff --git a/gdk/Event.cs b/gdk/Event.cs
index 53fa77777..de4613896 100644
--- a/gdk/Event.cs
+++ b/gdk/Event.cs
@@ -141,14 +141,10 @@ namespace Gdk {
 				return new EventWindowState (raw);
 			case EventType.Setting:
 				return new EventSetting (raw);
-#if GTK_SHARP_2_6
 			case EventType.OwnerChange:
 				return new EventOwnerChange (raw);
-#endif
-#if GTK_SHARP_2_8
 			case EventType.GrabBroken:
 				return new EventGrabBroken (raw);
-#endif
 			case EventType.Map:
 			case EventType.Unmap:
 			case EventType.Delete:
diff --git a/glib/Format.cs b/glib/Format.cs
index d75fbe6d4..59e89369f 100644
--- a/glib/Format.cs
+++ b/glib/Format.cs
@@ -24,7 +24,6 @@ using System;
 using System.Runtime.InteropServices;
 
 namespace GLib {
-#if GTK_SHARP_2_14
 	public class Format {
 		[DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
 		static extern IntPtr g_format_size_for_display (long size);
@@ -35,5 +34,4 @@ namespace GLib {
 			return result;
 		}
 	}
-#endif
 }
diff --git a/gtk/Builder.custom b/gtk/Builder.custom
index 9d11df295..caf45d0d9 100644
--- a/gtk/Builder.custom
+++ b/gtk/Builder.custom
@@ -23,7 +23,6 @@
 // Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 // Boston, MA 02111-1307, USA.
 
-#if GTK_SHARP_2_14
 
 [System.Serializable]
 public class HandlerNotFoundException : SystemException
@@ -412,4 +411,3 @@ void BindFields (object target, Type type)
 	while (type != typeof(object) && type != null);
 }
 
-#endif
diff --git a/gtk/IconTheme.custom b/gtk/IconTheme.custom
index 46809d6f4..79440ec72 100644
--- a/gtk/IconTheme.custom
+++ b/gtk/IconTheme.custom
@@ -115,7 +115,6 @@
 			SearchPath = path;
 		}
 
-#if GTK_SHARP_2_6
 		[DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
 		static extern IntPtr gtk_icon_theme_get_icon_sizes (IntPtr raw, IntPtr icon_name);
 
@@ -135,5 +134,4 @@
 			GLib.Marshaller.Free (raw_ret);
 			return (int[]) result.ToArray (typeof (int));
 		}
-#endif
 
diff --git a/pango/Attribute.cs b/pango/Attribute.cs
index b44d785b7..39a4c62fe 100644
--- a/pango/Attribute.cs
+++ b/pango/Attribute.cs
@@ -73,20 +73,16 @@ namespace Pango {
 				return new AttrScale (raw);
 			case Pango.AttrType.Fallback:
 				return new AttrFallback (raw);
-#if GTK_SHARP_2_6
 			case Pango.AttrType.LetterSpacing:
 				return new AttrLetterSpacing (raw);
 			case Pango.AttrType.UnderlineColor:
 				return new AttrUnderlineColor (raw);
 			case Pango.AttrType.StrikethroughColor:
 				return new AttrStrikethroughColor (raw);
-#endif
-#if GTK_SHARP_2_12
 			case Pango.AttrType.Gravity:
 				return new AttrGravity (raw);
 			case Pango.AttrType.GravityHint:
 				return new AttrGravityHint (raw);
-#endif
 			default:
 				return new Attribute (raw);
 			}