[gtkglarea/jjardon/gtk3: 5/12] Remove deprecated API



commit 3f08a73ca94e08805ed04cc2d7d5ec6deee98f33
Author: Javier Jardón <jjardon gnome org>
Date:   Wed Mar 19 23:24:04 2014 +0000

    Remove deprecated API

 docs/HOWTO.txt     |   12 ------------
 docs/gdkgl.txt     |   45 ---------------------------------------------
 docs/gtkglarea.txt |   24 ------------------------
 gtkgl/gdkgl.h      |    7 -------
 gtkgl/gtkglarea.h  |   15 ---------------
 5 files changed, 0 insertions(+), 103 deletions(-)
---
diff --git a/docs/HOWTO.txt b/docs/HOWTO.txt
index 858fd6c..37aa796 100644
--- a/docs/HOWTO.txt
+++ b/docs/HOWTO.txt
@@ -68,15 +68,3 @@
     - Prevent possible default handlers from running:
         /* do this in the keypress handler and return TRUE from handler */
         g_signal_stop_emission_by_name (G_OBJECT(glarea), "key-press-event");
-
-
-
-7. Where are gtk_gl_area_begingl() and gtk_gl_area_endgl()?
-
-    These functions are deprecated. You should use gtk_gl_area_make_current()
-    instead of gtk_gl_area_begingl().
-
-    gtk_gl_area_endgl() is no longer required, but you may wish to call
-    glFlush() instead.
-
-    gtk_gl_area_swapbuffers() was renamed to gtk_gl_area_swap_buffers().
diff --git a/docs/gdkgl.txt b/docs/gdkgl.txt
index d3f492f..624193b 100644
--- a/docs/gdkgl.txt
+++ b/docs/gdkgl.txt
@@ -135,51 +135,6 @@ SEE ALSO
 ---------------------------------------------------------------
 
 NAME
-       gdk_gl_context_ref - increase reference count
-
-C SPECIFICATION
-       GdkGLContext *gdk_gl_context_ref( GdkGLContext *context )
-
-PARAMETERS
-
-context
-       Pointer to a GdkGLContext.
-
-DESCRIPTION
-       Increases reference count of context by one, returns context.
-
-SEE ALSO
-       gdk_gl_context_new
-       gdk_gl_context_share_new
-       gdk_gl_context_unref
-
----------------------------------------------------------------
-
-NAME
-       gdk_gl_context_unref - decrease reference count
-
-C SPECIFICATION
-       void gdk_gl_context_unref( GdkGLContext *context )
-
-
-PARAMETERS
-
-context        Pointer to a GdlGLContext.
-
-DESCRIPTION
-       gdk_gl_context_unref decreases reference count by 1 and
-       deletes context if it count drops to 0.
-
-
-SEE ALSO
-       glXDestroyContext
-       gdk_gl_context_new
-       gdk_gl_context_share_new
-       gdk_gl_context_ref
-
----------------------------------------------------------------
-
-NAME
        gdk_gl_make_current - attach context to drawable
 
 C SPECIFICATION
diff --git a/docs/gtkglarea.txt b/docs/gtkglarea.txt
index 7a3bdc7..98ef7aa 100644
--- a/docs/gtkglarea.txt
+++ b/docs/gtkglarea.txt
@@ -51,30 +51,6 @@ DESCRIPTION
 
 ---------------------------------------------------------
 
-
-C SPECIFICATION
-
-gint gtk_gl_area_begingl(GtkGLArea *gl_area)
-void gtk_gl_area_endgl(GtkGLArea *gl_area)
-
-PARAMETERS
-
-gl_area
-       Specifies a gtkglarea widget.
-
-DESCRIPTION
-       *** Deprecated, use gtk_gl_area_make_current instead ***
-       gtk_gl_area_begingl must be called before rendering into
-       OpenGL widget, it returns TRUE if rendering to widget is
-       possible. Rendering is not possible if widget is not
-       GtkGLArea widget or widget is not realized. gtk_gl_area_endgl
-       is called to end opengl rendering.
-
-
-
-
----------------------------------------------------------
-
 C SPECIFICATION
 void gtk_gl_area_swap_buffers(GtkGLArea *gl_area)
 void gtk_gl_area_swapbuffers(GtkGLArea *gl_area)
diff --git a/gtkgl/gdkgl.h b/gtkgl/gdkgl.h
index 4766bb3..ba7b8ac 100644
--- a/gtkgl/gdkgl.h
+++ b/gtkgl/gdkgl.h
@@ -98,13 +98,6 @@ void          gdk_gl_wait_gdk(void);
 void          gdk_gl_wait_gl(void);
 
 
-#ifndef GTKGL_DISABLE_DEPRECATED
-#  define gdk_gl_context_ref(context)   g_object_ref(context)
-#  define gdk_gl_context_unref(context) g_object_unref(context)
-#  define gdk_gl_pixmap_ref(pixmap)     g_object_ref(pixmap)
-#  define gdk_gl_pixmap_unref(pixmap)   g_object_unref(pixmap)
-#endif
-
 G_END_DECLS
 
 #endif /* __GDK_GL_H__ */
diff --git a/gtkgl/gtkglarea.h b/gtkgl/gtkglarea.h
index 0c58c26..40ff26a 100644
--- a/gtkgl/gtkglarea.h
+++ b/gtkgl/gtkglarea.h
@@ -60,24 +60,9 @@ GtkWidget* gtk_gl_area_new_vargs  (GtkGLArea *share,
 
 gint       gtk_gl_area_make_current(GtkGLArea *glarea);
 
-void       gtk_gl_area_endgl      (GtkGLArea *glarea); /* deprecated */
-
 void       gtk_gl_area_swap_buffers(GtkGLArea *glarea);
 
 
-#ifndef GTKGL_DISABLE_DEPRECATED
-
-#  define gtk_gl_area_begingl(glarea) \
-      gtk_gl_area_make_current(glarea)
-#  define gtk_gl_area_endgl(glarea) \
-      glFlush()
-#  define gtk_gl_area_swapbuffers(glarea) \
-      gtk_gl_area_swap_buffers(glarea)
-#  define gtk_gl_area_size(glarea, width, height) \
-      gtk_widget_set_size_request(GTK_WIDGET(glarea), (width), (height))
-
-#endif
-
 G_END_DECLS
 
 #endif /* __GTK_GL_AREA_H__ */


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]