[openvrml-commit] openvrml/mozilla-plugin/src/openvrml-player gtkglviewer.cpp,1.1,1.2

[Braden M. <br...@us...>]

Update of /cvsroot/openvrml/openvrml/mozilla-plugin/src/openvrml-player
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32633/mozilla-plugin/src/openvrml-player

Modified Files:
	gtkglviewer.cpp 
Log Message:
Disambiguate externally linked functions by prefixing with "gtk_gl_viewer_".

Index: gtkglviewer.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/mozilla-plugin/src/openvrml-player/gtkglviewer.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** gtkglviewer.cpp	9 Jan 2006 00:21:09 -0000	1.1
--- gtkglviewer.cpp	22 Jan 2006 21:21:19 -0000	1.2
***************
*** 26,42 ****
  
  extern "C" {
!     gboolean realize(GtkWidget * widget, GdkEvent * event, gpointer data);
!     gboolean expose_event(GtkWidget * widget, GdkEventExpose * event,
!                           gpointer data);
!     gboolean configure_event(GtkWidget * widget, GdkEventConfigure * event,
!                              gpointer data);
!     gboolean key_press_event(GtkWidget * widget, GdkEventKey * event,
!                              gpointer data);
!     gboolean button_press_event(GtkWidget * widget, GdkEventButton * event,
!                                 gpointer data);
!     gboolean button_release_event(GtkWidget * widget, GdkEventButton * event,
!                                   gpointer data);
!     gboolean motion_notify_event(GtkWidget * widget, GdkEventMotion * event,
!                                  gpointer data);
  }
  
--- 26,50 ----
  
  extern "C" {
!     gboolean gtk_gl_viewer_realize(GtkWidget * widget,
!                                    GdkEvent * event,
!                                    gpointer data);
!     gboolean gtk_gl_viewer_expose_event(GtkWidget * widget,
!                                         GdkEventExpose * event,
!                                         gpointer data);
!     gboolean gtk_gl_viewer_configure_event(GtkWidget * widget,
!                                            GdkEventConfigure * event,
!                                            gpointer data);
!     gboolean gtk_gl_viewer_key_press_event(GtkWidget * widget,
!                                            GdkEventKey * event,
!                                            gpointer data);
!     gboolean gtk_gl_viewer_button_press_event(GtkWidget * widget,
!                                               GdkEventButton * event,
!                                               gpointer data);
!     gboolean gtk_gl_viewer_button_release_event(GtkWidget * widget,
!                                                 GdkEventButton * event,
!                                                 gpointer data);
!     gboolean gtk_gl_viewer_motion_notify_event(GtkWidget * widget,
!                                                GdkEventMotion * event,
!                                                gpointer data);
  }
  
***************
*** 78,102 ****
      g_signal_connect(G_OBJECT((this->drawing_area)),
                       "expose_event",
!                      G_CALLBACK(expose_event),
                       this);
      g_signal_connect(G_OBJECT(this->drawing_area),
                       "configure_event",
!                      G_CALLBACK(configure_event),
                       this);
      g_signal_connect(G_OBJECT(this->drawing_area),
                       "key_press_event",
!                      G_CALLBACK(key_press_event),
                       this);
      g_signal_connect(G_OBJECT(this->drawing_area),
                       "button_press_event",
!                      G_CALLBACK(button_press_event),
                       this);
      g_signal_connect(G_OBJECT(this->drawing_area),
                       "button_release_event",
!                      G_CALLBACK(button_release_event),
                       this);
      g_signal_connect(G_OBJECT(this->drawing_area),
                       "motion_notify_event",
!                      G_CALLBACK(motion_notify_event),
                       this);
  
--- 86,110 ----
      g_signal_connect(G_OBJECT((this->drawing_area)),
                       "expose_event",
!                      G_CALLBACK(gtk_gl_viewer_expose_event),
                       this);
      g_signal_connect(G_OBJECT(this->drawing_area),
                       "configure_event",
!                      G_CALLBACK(gtk_gl_viewer_configure_event),
                       this);
      g_signal_connect(G_OBJECT(this->drawing_area),
                       "key_press_event",
!                      G_CALLBACK(gtk_gl_viewer_key_press_event),
                       this);
      g_signal_connect(G_OBJECT(this->drawing_area),
                       "button_press_event",
!                      G_CALLBACK(gtk_gl_viewer_button_press_event),
                       this);
      g_signal_connect(G_OBJECT(this->drawing_area),
                       "button_release_event",
!                      G_CALLBACK(gtk_gl_viewer_button_release_event),
                       this);
      g_signal_connect(G_OBJECT(this->drawing_area),
                       "motion_notify_event",
!                      G_CALLBACK(gtk_gl_viewer_motion_notify_event),
                       this);
  
***************
*** 189,200 ****
  }
  
! gboolean realize(GtkWidget *, GdkEvent *, gpointer)
  {
      return true;
  }
  
! gboolean expose_event(GtkWidget * const widget,
!                       GdkEventExpose * const event,
!                       const gpointer data)
  {
      using openvrml_player::GtkGLViewer;
--- 197,208 ----
  }
  
! gboolean gtk_gl_viewer_realize(GtkWidget *, GdkEvent *, gpointer)
  {
      return true;
  }
  
! gboolean gtk_gl_viewer_expose_event(GtkWidget * const widget,
!                                     GdkEventExpose * const event,
!                                     const gpointer data)
  {
      using openvrml_player::GtkGLViewer;
***************
*** 214,220 ****
  }
  
! gboolean configure_event(GtkWidget * const widget,
!                          GdkEventConfigure *,
!                          const gpointer data)
  {
      GdkGLDrawable * const gl_drawable = gtk_widget_get_gl_drawable(widget);
--- 222,228 ----
  }
  
! gboolean gtk_gl_viewer_configure_event(GtkWidget * const widget,
!                                        GdkEventConfigure *,
!                                        const gpointer data)
  {
      GdkGLDrawable * const gl_drawable = gtk_widget_get_gl_drawable(widget);
***************
*** 231,237 ****
  }
  
! gboolean key_press_event(GtkWidget * const widget,
!                          GdkEventKey * const event,
!                          const gpointer data)
  {
      using openvrml::gl::viewer;
--- 239,245 ----
  }
  
! gboolean gtk_gl_viewer_key_press_event(GtkWidget * const widget,
!                                        GdkEventKey * const event,
!                                        const gpointer data)
  {
      using openvrml::gl::viewer;
***************
*** 287,293 ****
  }
  
! gboolean button_press_event(GtkWidget * const widget,
!                             GdkEventButton * const event,
!                             const gpointer data)
  {
      using openvrml::gl::viewer;
--- 295,301 ----
  }
  
! gboolean gtk_gl_viewer_button_press_event(GtkWidget * const widget,
!                                           GdkEventButton * const event,
!                                           const gpointer data)
  {
      using openvrml::gl::viewer;
***************
*** 325,331 ****
  }
  
! gboolean button_release_event(GtkWidget * const widget,
!                               GdkEventButton * const event,
!                               const gpointer data)
  {
      using openvrml::gl::viewer;
--- 333,339 ----
  }
  
! gboolean gtk_gl_viewer_button_release_event(GtkWidget * const widget,
!                                             GdkEventButton * const event,
!                                             const gpointer data)
  {
      using openvrml::gl::viewer;
***************
*** 363,369 ****
  }
  
! gboolean motion_notify_event(GtkWidget * const widget,
!                              GdkEventMotion * const event,
!                              const gpointer data)
  {
      using openvrml::gl::viewer;
--- 371,377 ----
  }
  
! gboolean gtk_gl_viewer_motion_notify_event(GtkWidget * const widget,
!                                            GdkEventMotion * const event,
!                                            const gpointer data)
  {
      using openvrml::gl::viewer;