Swapped contents of rb_software_x11.[ch] and rb_gl_x11.[ch].

diff --git a/src/ecore_evas/rb_gl_x11.c b/src/ecore_evas/rb_gl_x11.c
index d8e7a386ee1b5939125edb629468bcb0ff9f6446..134da28bc58eb16bfcf53afd03bf802e497a3f29 100644 (file)
--- a/src/ecore_evas/rb_gl_x11.c
+++ b/src/ecore_evas/rb_gl_x11.c
@@ -1,5 +1,5 @@
 /*
 /*

- * $Id: rb_gl_x11.c 14 2004-06-20 10:33:13Z tilman $
+ * $Id: rb_gl_x11.c 15 2004-06-20 13:23:07Z tilman $

  *
  * Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
  *
  *
  * Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
  *


@@ -25,7 +25,7 @@
 #include "rb_ecore_evas_main.h"
 #include "rb_ecore_evas.h"
 
 #include "rb_ecore_evas_main.h"
 #include "rb_ecore_evas.h"
 

-VALUE cSoftwareX11;
+VALUE cGlX11;

 
 static VALUE c_init (int argc, VALUE *argv, VALUE self)
 {
 
 static VALUE c_init (int argc, VALUE *argv, VALUE self)
 {


@@ -50,9 +50,9 @@ static VALUE c_init (int argc, VALUE *argv, VALUE self)
                        igeom[i] = NUM2INT (geom[i]);
                }
 
                        igeom[i] = NUM2INT (geom[i]);
                }
 

-       *ee = ecore_evas_software_x11_new (cdisp, 0,
-                                          igeom[0], igeom[1],
-                                          igeom[2], igeom[3]);
+       *ee = ecore_evas_gl_x11_new (cdisp, 0,
+                                    igeom[0], igeom[1],
+                                    igeom[2], igeom[3]);

 
        return self;
 }
 
        return self;
 }


@@ -70,13 +70,11 @@ static VALUE c_new (int argc, VALUE *argv, VALUE klass)
        return self;
 }
 
        return self;
 }
 

-void Init_SoftwareX11 (void)
+void Init_GlX11 (void)

 {
 {

-       cSoftwareX11 = rb_define_class_under (mEvas,
-                                             "SoftwareX11",
-                                             cEcoreEvas);
+       cGlX11 = rb_define_class_under (mEvas, "GlX11", cEcoreEvas);

 
 

-       rb_define_singleton_method (cSoftwareX11, "new", c_new, -1);
-       rb_define_method (cSoftwareX11, "initialize", c_init, -1);
+       rb_define_singleton_method (cGlX11, "new", c_new, -1);
+       rb_define_method (cGlX11, "initialize", c_init, -1);

 }
 
 }
 

diff --git a/src/ecore_evas/rb_gl_x11.h b/src/ecore_evas/rb_gl_x11.h
index 70ae0e840aeadd57c84ce3985943940aa2478e87..5e52755f16460271e871f63e058de4324d56c0f3 100644 (file)
--- a/src/ecore_evas/rb_gl_x11.h
+++ b/src/ecore_evas/rb_gl_x11.h
@@ -1,5 +1,5 @@
 /*
 /*

- * $Id: rb_gl_x11.h 9 2004-06-19 19:53:47Z tilman $
+ * $Id: rb_gl_x11.h 15 2004-06-20 13:23:07Z tilman $

  *
  * Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
  *
  *
  * Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
  *


@@ -18,9 +18,9 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 

-#ifndef __RB_SOFTWARE_X11_H
-#define __RB_SOFTWARE_X11_H
+#ifndef __RB_GL_X11_H
+#define __RB_GL_X11_H

 
 

-void Init_SoftwareX11 (void);
+void Init_GlX11 (void);

 
 #endif
 
 #endif

diff --git a/src/ecore_evas/rb_software_x11.c b/src/ecore_evas/rb_software_x11.c
index b077335b3bc684e252e85991c4c70693f95fc8f5..eae769ff56fb6e56a09ac1be835d22f75531ba3c 100644 (file)
--- a/src/ecore_evas/rb_software_x11.c
+++ b/src/ecore_evas/rb_software_x11.c
@@ -1,5 +1,5 @@
 /*
 /*

- * $Id: rb_software_x11.c 14 2004-06-20 10:33:13Z tilman $
+ * $Id: rb_software_x11.c 15 2004-06-20 13:23:07Z tilman $

  *
  * Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
  *
  *
  * Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
  *


@@ -25,7 +25,7 @@
 #include "rb_ecore_evas_main.h"
 #include "rb_ecore_evas.h"
 
 #include "rb_ecore_evas_main.h"
 #include "rb_ecore_evas.h"
 

-VALUE cGlX11;
+VALUE cSoftwareX11;

 
 static VALUE c_init (int argc, VALUE *argv, VALUE self)
 {
 
 static VALUE c_init (int argc, VALUE *argv, VALUE self)
 {


@@ -50,9 +50,9 @@ static VALUE c_init (int argc, VALUE *argv, VALUE self)
                        igeom[i] = NUM2INT (geom[i]);
                }
 
                        igeom[i] = NUM2INT (geom[i]);
                }
 

-       *ee = ecore_evas_gl_x11_new (cdisp, 0,
-                                    igeom[0], igeom[1],
-                                    igeom[2], igeom[3]);
+       *ee = ecore_evas_software_x11_new (cdisp, 0,
+                                          igeom[0], igeom[1],
+                                          igeom[2], igeom[3]);

 
        return self;
 }
 
        return self;
 }


@@ -70,11 +70,13 @@ static VALUE c_new (int argc, VALUE *argv, VALUE klass)
        return self;
 }
 
        return self;
 }
 

-void Init_GlX11 (void)
+void Init_SoftwareX11 (void)

 {
 {

-       cGlX11 = rb_define_class_under (mEvas, "GlX11", cEcoreEvas);
+       cSoftwareX11 = rb_define_class_under (mEvas,
+                                             "SoftwareX11",
+                                             cEcoreEvas);

 
 

-       rb_define_singleton_method (cGlX11, "new", c_new, -1);
-       rb_define_method (cGlX11, "initialize", c_init, -1);
+       rb_define_singleton_method (cSoftwareX11, "new", c_new, -1);
+       rb_define_method (cSoftwareX11, "initialize", c_init, -1);

 }
 
 }
 

diff --git a/src/ecore_evas/rb_software_x11.h b/src/ecore_evas/rb_software_x11.h
index cb409c081adc2cb0615afc849e61dc2539cbfc67..4a867631284b8215b280c7ba8936fd90c44a3a77 100644 (file)
--- a/src/ecore_evas/rb_software_x11.h
+++ b/src/ecore_evas/rb_software_x11.h
@@ -1,5 +1,5 @@
 /*
 /*

- * $Id: rb_software_x11.h 9 2004-06-19 19:53:47Z tilman $
+ * $Id: rb_software_x11.h 15 2004-06-20 13:23:07Z tilman $

  *
  * Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
  *
  *
  * Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
  *


@@ -18,9 +18,9 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 

-#ifndef __RB_GL_X11_H
-#define __RB_GL_X11_H
+#ifndef __RB_SOFTWARE_X11_H
+#define __RB_SOFTWARE_X11_H

 
 

-void Init_GlX11 (void);
+void Init_SoftwareX11 (void);

 
 #endif
 
 #endif