diff --git a/src/OpenTK.GLWidget/GLWidget.cs b/src/OpenTK.GLWidget/GLWidget.cs index afe0ffe7..dc59efa1 100644 --- a/src/OpenTK.GLWidget/GLWidget.cs +++ b/src/OpenTK.GLWidget/GLWidget.cs @@ -144,36 +144,12 @@ namespace OpenTK base.Destroy(); } -#if !GTK3 - /// - /// Disposes the current object, releasing any native resources it was using. - /// - /// - public override void Dispose() - { - GC.SuppressFinalize(this); - Dispose(true); - - base.Dispose(); - } -#endif - -#if GTK3 /// /// Disposes the current object, releasing any native resources it was using. /// /// protected override void Dispose(bool disposing) { - base.Dispose(disposing); -#else - /// - /// Disposes the current object, releasing any native resources it was using. - /// - /// - public virtual void Dispose(bool disposing) - { -#endif if (disposing) { MakeCurrent(); @@ -254,34 +230,19 @@ namespace OpenTK } } -#if GTK3 /// /// Called when the widget needs to be (fully or partially) redrawn. /// /// /// protected override bool OnDrawn(Cairo.Context cr) -#else - /// - /// Called when the widget is exposed. - /// - /// - /// - protected override bool OnExposeEvent(Gdk.EventExpose evnt) -#endif { if (!_Initialized) { Initialize(); } -#if GTK3 + 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; }