forked from enlightenment/efl
remove completely backends in ecore_win32
SVN revision: 34915
This commit is contained in:
parent
ceaf9fe151
commit
2ab4d7ad99
|
@ -35,7 +35,6 @@
|
|||
|
||||
typedef void Ecore_Win32_Window;
|
||||
typedef void Ecore_Win32_Cursor;
|
||||
typedef void Ecore_Win32_Glew_DC;
|
||||
|
||||
/* Window state */
|
||||
|
||||
|
@ -432,15 +431,5 @@ EAPI Ecore_Win32_Cursor *ecore_win32_cursor_shape_get(Ecore_Win32_Cursor_Shape s
|
|||
|
||||
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__ */
|
||||
|
|
|
@ -16,11 +16,10 @@ libecore_win32_la_SOURCES = \
|
|||
ecore_win32.c \
|
||||
ecore_win32_cursor.c \
|
||||
ecore_win32_event.c \
|
||||
ecore_win32_glew.c \
|
||||
ecore_win32_window.c
|
||||
|
||||
libecore_win32_la_LIBADD = \
|
||||
@ddraw_libs@ @direct3d_libs@ @glew_libs@ \
|
||||
@ecore_win32_libs@ \
|
||||
@WIN32_LIBS@ \
|
||||
$(top_builddir)/src/lib/ecore/libecore.la
|
||||
|
||||
|
|
|
@ -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"
|
||||
|
@ -119,17 +115,6 @@ ecore_win32_init()
|
|||
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++;
|
||||
|
||||
return _ecore_win32_init_count;
|
||||
|
|
|
@ -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
|
||||
|
@ -34,15 +27,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 */
|
||||
|
||||
|
|
|
@ -71,22 +71,6 @@ ecore_win32_window_del(Ecore_Win32_Window *window)
|
|||
{
|
||||
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");
|
||||
|
@ -885,8 +869,6 @@ ecore_win32_window_internal_new(Ecore_Win32_Window *parent,
|
|||
return NULL;
|
||||
}
|
||||
|
||||
w->backend = ECORE_WIN32_BACKEND_NONE;
|
||||
|
||||
w->min_width = 0;
|
||||
w->min_height = 0;
|
||||
w->max_width = 32767;
|
||||
|
|
Loading…
Reference in New Issue