Enlightenment CVS committal
Author : moom
Project : e17
Module : proto
Dir : e17/proto/etk/src/lib
Modified Files:
Etk.h Makefile.am etk_main.c etk_types.h etk_window.c
Added Files:
etk_embed.c etk_embed.h
Log Message:
* Adds an embed widget so you can now include Etk widgets in your evas
programs.
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/lib/Etk.h,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -3 -r1.33 -r1.34
--- Etk.h 2 Jun 2006 18:46:34 -0000 1.33
+++ Etk.h 24 Jun 2006 15:59:12 -0000 1.34
@@ -70,6 +70,7 @@
#include "etk_tooltips.h"
#include "etk_message_dialog.h"
#include "etk_iconbox.h"
+#include "etk_embed.h"
#ifdef __cplusplus
}
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/lib/Makefile.am,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -3 -r1.38 -r1.39
--- Makefile.am 17 Jun 2006 12:01:26 -0000 1.38
+++ Makefile.am 24 Jun 2006 15:59:12 -0000 1.39
@@ -33,6 +33,7 @@
etk_dnd.h \
etk_drag.h \
etk_editable_text_object.h \
+etk_embed.h \
etk_entry.h \
etk_filechooser_widget.h \
etk_frame.h \
@@ -97,6 +98,7 @@
etk_dnd.c \
etk_drag.c \
etk_editable_text_object.c \
+etk_embed.c \
etk_entry.c \
etk_filechooser_widget.c \
etk_frame.c \
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_main.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- etk_main.c 12 May 2006 19:13:39 -0000 1.21
+++ etk_main.c 24 Jun 2006 15:59:12 -0000 1.22
@@ -238,13 +238,9 @@
Etk_Geometry geometry;
if (is_top_level)
- {
- geometry.x = 0;
- geometry.y = 0;
- etk_toplevel_widget_geometry_get(ETK_TOPLEVEL_WIDGET(widget), NULL,
NULL, &geometry.w, &geometry.h);
- }
+ etk_toplevel_widget_geometry_get(ETK_TOPLEVEL_WIDGET(widget),
&geometry.x, &geometry.y, &geometry.w, &geometry.h);
else
- geometry = widget->geometry;
+ etk_widget_geometry_get(widget, &geometry.x, &geometry.y, &geometry.w,
&geometry.h);
etk_widget_size_allocate(widget, geometry);
for (l = widget->children; l; l = l->next)
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_types.h,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -3 -r1.46 -r1.47
--- etk_types.h 17 Jun 2006 12:01:26 -0000 1.46
+++ etk_types.h 24 Jun 2006 15:59:12 -0000 1.47
@@ -45,6 +45,7 @@
typedef struct Etk_Container Etk_Container;
typedef struct Etk_Dialog Etk_Dialog;
typedef struct _Etk_Drag Etk_Drag;
+typedef struct Etk_Embed Etk_Embed;
typedef struct _Etk_Entry Etk_Entry;
typedef struct _Etk_Event_Key_Up_Down Etk_Event_Key_Up_Down;
typedef struct _Etk_Event_Mouse_In_Out Etk_Event_Mouse_In_Out;
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_window.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- etk_window.c 18 Apr 2006 12:33:55 -0000 1.20
+++ etk_window.c 24 Jun 2006 15:59:12 -0000 1.21
@@ -944,7 +944,11 @@
/* Gets the geometry of the window toplevel widget */
static void _etk_window_toplevel_geometry_get(Etk_Toplevel_Widget *toplevel,
int *x, int *y, int *w, int *h)
{
- etk_window_geometry_get(ETK_WINDOW(toplevel), x, y, w, h);
+ if (x)
+ *x = 0;
+ if (y)
+ *y = 0;
+ etk_window_geometry_get(ETK_WINDOW(toplevel), NULL, NULL, w, h);
}
/* Sets the mouse pointer of the window */
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
