Enlightenment CVS committal
Author : andreas
Project : e17
Module : proto/eflpp
Dir : e17/proto/eflpp/src/ecore
Modified Files:
Makefile.am eflpp_ecore_window.cpp eflpp_ecore_window.h
Added Files:
eflpp_ecore_x_window.h
Log Message:
forgot some files while the last commit...
===================================================================
RCS file: /cvs/e/e17/proto/eflpp/src/ecore/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- Makefile.am 5 Sep 2007 22:22:03 -0000 1.3
+++ Makefile.am 10 Aug 2008 18:59:30 -0000 1.4
@@ -12,6 +12,7 @@
eflpp_ecoreconfig.cpp\
eflpp_ecore.cpp \
eflpp_ecore_window.cpp \
+ eflpp_ecore_x_window.cpp \
eflpp_ecore_data.cpp
libeflpp_includedir = $(pkgincludedir)
@@ -20,6 +21,7 @@
eflpp_ecoreconfig.h\
eflpp_ecore.h \
eflpp_ecore_window.h \
+ eflpp_ecore_x_window.h \
eflpp_ecore_data.h
EXTRA_DIST = $(libeflpp_include_DATA)
===================================================================
RCS file: /cvs/e/e17/proto/eflpp/src/ecore/eflpp_ecore_window.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- eflpp_ecore_window.cpp 19 Jun 2008 21:27:40 -0000 1.5
+++ eflpp_ecore_window.cpp 10 Aug 2008 18:59:30 -0000 1.6
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+ #include <config.h>
+#endif
+
#include "eflpp_ecore_window.h"
#include <errno.h>
#include <assert.h>
@@ -35,7 +39,7 @@
EcoreEvasWindow::EcoreEvasWindow()
:Trackable( "EcoreEvasWindow" )
{
- ecore_evas_init ();
+ ecore_evas_init ();
}
@@ -414,7 +418,14 @@
EcoreEvasWindowSoftwareX11::~EcoreEvasWindowSoftwareX11()
{
+}
+
+EcoreXWindow *EcoreEvasWindowSoftwareX11::getXWindow()
+{
+ Ecore_X_Window exw = ecore_evas_software_x11_window_get( _ee );
+ EcoreXWindow *exwin = new EcoreXWindow( exw );
+ return exwin;
}
EcoreEvasWindowGLX11::EcoreEvasWindowGLX11( int width, int height, const char*
display )
===================================================================
RCS file: /cvs/e/e17/proto/eflpp/src/ecore/eflpp_ecore_window.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- eflpp_ecore_window.h 23 Jul 2008 15:09:34 -0000 1.5
+++ eflpp_ecore_window.h 10 Aug 2008 18:59:30 -0000 1.6
@@ -1,11 +1,8 @@
#ifndef ECORE_WINDOW_H
#define ECORE_WINDOW_H
-#ifdef HAVE_CONFIG_H
- #include <config.h>
-#endif
-
#include <eflpp_ecore.h>
+#include <eflpp_ecore_x_window.h>
#include <Ecore_Evas.h>
//===============================================================================================
@@ -13,13 +10,15 @@
//===============================================================================================
namespace efl {
+
+class EcoreXWindow; // TODO: why is forward declaration needed?
// TODO: Test for supported backends?
class EcoreEvasWindow : public Trackable
{
public:
enum Event { Resize, Move, Show, Hide, DeleteRequest, Destroy,
- FocusIn, FocusOut, MouseIn, MouseOut, PreRender,
PostRender };
+ FocusIn, FocusOut, MouseIn, MouseOut, PreRender, PostRender };
enum EngineType
{
@@ -36,7 +35,7 @@
public:
virtual ~EcoreEvasWindow();
- EvasCanvas* canvas() const { return _canvas; };
+ EvasCanvas *canvas() const { return _canvas; };
/* Events */
void setEventEnabled( Event, bool );
@@ -129,8 +128,8 @@
int isSticky() const;
protected:
- EvasCanvas* _canvas;
- Ecore_Evas* _ee;
+ EvasCanvas *_canvas;
+ Ecore_Evas *_ee;
EcoreEvasWindow();
static EcoreEvasWindow* objectLink( Ecore_Evas* );
@@ -146,6 +145,8 @@
EcoreEvasWindowSoftwareX11( int width, int height, const char* display = 0
);
virtual ~EcoreEvasWindowSoftwareX11();
+ EcoreXWindow *getXWindow();
+
private:
EcoreEvasWindowSoftwareX11();
bool operator=( const EcoreEvasWindowSoftwareX11& );
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
