Enlightenment CVS committal
Author : doursse
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_win32
Modified Files:
Ecore_Win32.h Makefile.am ecore_win32.c ecore_win32_private.h
ecore_win32_window.c
Log Message:
remove completely backends in ecore_win32
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_win32/Ecore_Win32.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- Ecore_Win32.h 26 Jun 2008 04:30:28 -0000 1.7
+++ Ecore_Win32.h 26 Jun 2008 09:54:35 -0000 1.8
@@ -35,7 +35,6 @@
typedef void Ecore_Win32_Window;
typedef void Ecore_Win32_Cursor;
-typedef void Ecore_Win32_Glew_DC;
/* Window state */
@@ -431,16 +430,6 @@
EAPI Ecore_Win32_Cursor *ecore_win32_cursor_shape_get(Ecore_Win32_Cursor_Shape
shape);
EAPI int ecore_win32_cursor_size_get(void);
-
-/* OpenGL Glew */
-
-EAPI int ecore_win32_glew_init(Ecore_Win32_Window *window);
-
-EAPI void ecore_win32_glew_shutdown(Ecore_Win32_Window
*window);
-
-EAPI Ecore_Win32_Glew_DC *ecore_win32_glew_dc_get(Ecore_Win32_Window *window);
-
-EAPI int ecore_win32_glew_depth_get(Ecore_Win32_Window
*window);
#endif /* __ECORE_WIN32_H__ */
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_win32/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- Makefile.am 26 Jun 2008 04:30:29 -0000 1.6
+++ Makefile.am 26 Jun 2008 09:54:35 -0000 1.7
@@ -16,11 +16,10 @@
ecore_win32.c \
ecore_win32_cursor.c \
ecore_win32_event.c \
-ecore_win32_glew.c \
ecore_win32_window.c
libecore_win32_la_LIBADD = \
[EMAIL PROTECTED]@ @direct3d_libs@ @glew_libs@ \
[EMAIL PROTECTED]@ \
@WIN32_LIBS@ \
$(top_builddir)/src/lib/ecore/libecore.la
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_win32/ecore_win32.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- ecore_win32.c 26 Jun 2008 05:11:16 -0000 1.7
+++ ecore_win32.c 26 Jun 2008 09:54:35 -0000 1.8
@@ -14,10 +14,6 @@
#undef WIN32_LEAN_AND_MEAN
#include <windowsx.h>
-#ifdef HAVE_OPENGL_GLEW
-# include <GL/glew.h>
-#endif /* HAVE_OPENGL_GLEW */
-
#include "Ecore.h"
#include "Ecore_Win32.h"
#include "ecore_win32_private.h"
@@ -118,17 +114,6 @@
ECORE_WIN32_EVENT_WINDOW_RESIZE = ecore_event_type_new();
ECORE_WIN32_EVENT_WINDOW_DELETE_REQUEST = ecore_event_type_new();
}
-
-#ifdef HAVE_OPENGL_GLEW
- if (GLEW_VERSION_2_0)
- {
- printf ("pas 2.0\n");
- return 0;
- }
- else {
- printf ("2.0 !!\n");
- }
-#endif /* HAVE_OPENGL_GLEW */
_ecore_win32_init_count++;
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_win32/ecore_win32_private.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- ecore_win32_private.h 26 Jun 2008 05:11:16 -0000 1.6
+++ ecore_win32_private.h 26 Jun 2008 09:54:35 -0000 1.7
@@ -9,13 +9,6 @@
#define ECORE_WIN32_WINDOW_CLASS "Ecore_Win32_Window_Class"
-typedef enum
-{
- ECORE_WIN32_BACKEND_DIRECTDRAW_16,
- ECORE_WIN32_BACKEND_GLEW,
- ECORE_WIN32_BACKEND_NONE
-}Ecore_Win32_Backend;
-
typedef struct _Ecore_Win32_Callback_Data Ecore_Win32_Callback_Data;
struct _Ecore_Win32_Callback_Data
@@ -33,15 +26,6 @@
struct _Ecore_Win32_Window
{
HWND window;
-
- Ecore_Win32_Backend backend;
-
-#ifdef HAVE_OPENGL_GLEW
- struct {
- HDC dc;
- int depth;
- } glew;
-#endif /* HAVE_OPENGL_GLEW */
DWORD style; /* used to go fullscreen to normal */
RECT rect; /* used to go fullscreen to normal */
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_win32/ecore_win32_window.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- ecore_win32_window.c 26 Jun 2008 05:11:16 -0000 1.7
+++ ecore_win32_window.c 26 Jun 2008 09:54:35 -0000 1.8
@@ -71,22 +71,6 @@
{
if (!window) return;
- switch (((struct _Ecore_Win32_Window *)window)->backend)
- {
- case ECORE_WIN32_BACKEND_DIRECTDRAW_16:
-#ifdef HAVE_DIRECTDRAW
-/* ecore_win32_ddraw_shutdown(window); */
-#endif /* HAVE_DIRECTDRAW */
- break;
- case ECORE_WIN32_BACKEND_GLEW:
-#ifdef HAVE_OPENGL_GLEW
- ecore_win32_glew_shutdown(window);
-#endif /* HAVE_OPENGL_GLEW */
- break;
- default:
- break;
- }
-
DestroyWindow(((struct _Ecore_Win32_Window *)window)->window);
free(window);
printf ("ecore_win32_window_del\n");
@@ -884,8 +868,6 @@
free(w);
return NULL;
}
-
- w->backend = ECORE_WIN32_BACKEND_NONE;
w->min_width = 0;
w->min_height = 0;
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
