Remove GTK2 code.

GLArea is only properly supported for GTK >= 3.16.
This commit is contained in:
Jarl Gullberg 2017-10-01 20:14:15 +02:00
parent 72dedf5018
commit 6e40aebeb3
No known key found for this signature in database
GPG key ID: FBB69BD7CAE095A0

View file

@ -144,36 +144,12 @@ namespace OpenTK
base.Destroy(); base.Destroy();
} }
#if !GTK3
/// <summary>
/// Disposes the current object, releasing any native resources it was using.
/// </summary>
/// <param name="disposing"></param>
public override void Dispose()
{
GC.SuppressFinalize(this);
Dispose(true);
base.Dispose();
}
#endif
#if GTK3
/// <summary> /// <summary>
/// Disposes the current object, releasing any native resources it was using. /// Disposes the current object, releasing any native resources it was using.
/// </summary> /// </summary>
/// <param name="disposing"></param> /// <param name="disposing"></param>
protected override void Dispose(bool disposing) protected override void Dispose(bool disposing)
{ {
base.Dispose(disposing);
#else
/// <summary>
/// Disposes the current object, releasing any native resources it was using.
/// </summary>
/// <param name="disposing"></param>
public virtual void Dispose(bool disposing)
{
#endif
if (disposing) if (disposing)
{ {
MakeCurrent(); MakeCurrent();
@ -254,34 +230,19 @@ namespace OpenTK
} }
} }
#if GTK3
/// <summary> /// <summary>
/// Called when the widget needs to be (fully or partially) redrawn. /// Called when the widget needs to be (fully or partially) redrawn.
/// </summary> /// </summary>
/// <param name="cr"></param> /// <param name="cr"></param>
/// <returns></returns> /// <returns></returns>
protected override bool OnDrawn(Cairo.Context cr) protected override bool OnDrawn(Cairo.Context cr)
#else
/// <summary>
/// Called when the widget is exposed.
/// </summary>
/// <param name="cr"></param>
/// <returns></returns>
protected override bool OnExposeEvent(Gdk.EventExpose evnt)
#endif
{ {
if (!_Initialized) if (!_Initialized)
{ {
Initialize(); Initialize();
} }
#if GTK3
var result = base.OnDrawn(cr); var result = base.OnDrawn(cr);
#else
bool result = base.OnExposeEvent(evnt);
#endif
#if !GTK3
evnt.Window.Display.Sync(); // Add Sync call to fix resize rendering problem (Jay L. T. Cornwall) - How does this affect VSync?
#endif
return result; return result;
} }