ryujinx-archive/GtkSharp
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Kill some unneeded #if GTK_SHARP_N checks

Browse source 
* 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.
This commit is contained in:
Mike Kestner 2011-02-09 10:28:31 -06:00
parent c4d06e4b7f
commit 3d8c4e25fd
5 changed files with 0 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gdk/Event.cs
View file

@ -141,14 +141,10 @@ namespace Gdk {
return new EventWindowState (raw); return new EventWindowState (raw);
case EventType.Setting: case EventType.Setting:
return new EventSetting (raw); return new EventSetting (raw);
#if GTK_SHARP_2_6
case EventType.OwnerChange: case EventType.OwnerChange:
return new EventOwnerChange (raw); return new EventOwnerChange (raw);
#endif
#if GTK_SHARP_2_8
case EventType.GrabBroken: case EventType.GrabBroken:
return new EventGrabBroken (raw); return new EventGrabBroken (raw);
#endif
case EventType.Map: case EventType.Map:
case EventType.Unmap: case EventType.Unmap:
case EventType.Delete: case EventType.Delete:

2
glib/Format.cs
View file

@ -24,7 +24,6 @@ using System;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
namespace GLib { namespace GLib {
#if GTK_SHARP_2_14
public class Format { public class Format {
[DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr g_format_size_for_display (long size); static extern IntPtr g_format_size_for_display (long size);
@ -35,5 +34,4 @@ namespace GLib {
return result; return result;
} }
} }
#endif
} }

2
gtk/Builder.custom
View file

@ -23,7 +23,6 @@
// Free Software Foundation, Inc., 59 Temple Place - Suite 330, // Free Software Foundation, Inc., 59 Temple Place - Suite 330,
// Boston, MA 02111-1307, USA. // Boston, MA 02111-1307, USA.
#if GTK_SHARP_2_14
[System.Serializable] [System.Serializable]
public class HandlerNotFoundException : SystemException public class HandlerNotFoundException : SystemException
@ -412,4 +411,3 @@ void BindFields (object target, Type type)
while (type != typeof(object) && type != null); while (type != typeof(object) && type != null);
} }
#endif

2
gtk/IconTheme.custom
View file

@ -115,7 +115,6 @@
SearchPath = path; SearchPath = path;
} }
#if GTK_SHARP_2_6
[DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr gtk_icon_theme_get_icon_sizes (IntPtr raw, IntPtr icon_name); static extern IntPtr gtk_icon_theme_get_icon_sizes (IntPtr raw, IntPtr icon_name);
@ -135,5 +134,4 @@
GLib.Marshaller.Free (raw_ret); GLib.Marshaller.Free (raw_ret);
return (int[]) result.ToArray (typeof (int)); return (int[]) result.ToArray (typeof (int));
} }
#endif

4
pango/Attribute.cs
View file

@ -73,20 +73,16 @@ namespace Pango {
return new AttrScale (raw); return new AttrScale (raw);
case Pango.AttrType.Fallback: case Pango.AttrType.Fallback:
return new AttrFallback (raw); return new AttrFallback (raw);
#if GTK_SHARP_2_6
case Pango.AttrType.LetterSpacing: case Pango.AttrType.LetterSpacing:
return new AttrLetterSpacing (raw); return new AttrLetterSpacing (raw);
case Pango.AttrType.UnderlineColor: case Pango.AttrType.UnderlineColor:
return new AttrUnderlineColor (raw); return new AttrUnderlineColor (raw);
case Pango.AttrType.StrikethroughColor: case Pango.AttrType.StrikethroughColor:
return new AttrStrikethroughColor (raw); return new AttrStrikethroughColor (raw);
#endif
#if GTK_SHARP_2_12
case Pango.AttrType.Gravity: case Pango.AttrType.Gravity:
return new AttrGravity (raw); return new AttrGravity (raw);
case Pango.AttrType.GravityHint: case Pango.AttrType.GravityHint:
return new AttrGravityHint (raw); return new AttrGravityHint (raw);
#endif
default: default:
return new Attribute (raw); return new Attribute (raw);
} }