Enlightenment CVS committal
Author : moom16
Project : e17
Module : proto
Dir : e17/proto/etk/src/lib
Modified Files:
etk_separator.c etk_separator.h etk_utils.h
Log Message:
* Fix the separator
* Better implementation of gettext
----------------------------------------------------------------------
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/lib/etk_separator.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- etk_separator.c 23 Oct 2005 09:06:53 -0000 1.1
+++ etk_separator.c 23 Oct 2005 09:30:06 -0000 1.2
@@ -1,14 +1,12 @@
-/** @file etk_hseparator.c */
-#include "etk_hseparator.h"
+/** @file etk_separator.c */
+#include "etk_separator.h"
#include <stdlib.h>
-#include <string.h>
/**
* @addtogroup Etk_Separator
* @{
*/
-
/**************************
*
* Implementation
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/lib/etk_separator.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- etk_separator.h 23 Oct 2005 09:06:53 -0000 1.1
+++ etk_separator.h 23 Oct 2005 09:30:06 -0000 1.2
@@ -1,6 +1,6 @@
-/** @file etk_hseparator.h */
-#ifndef _ETK_HSEPARATOR_H_
-#define _ETK_HSEPARATOR_H_
+/** @file etk_separator.h */
+#ifndef _ETK_SEPARATOR_H_
+#define _ETK_SEPARATOR_H_
#include "etk_widget.h"
#include "etk_types.h"
@@ -17,18 +17,6 @@
/** @brief Checks if the object is an Etk_HSeparator */
#define ETK_IS_HSEPARATOR(obj) (ETK_OBJECT_CHECK_TYPE((obj),
ETK_HSEPARATOR_TYPE))
-struct _Etk_HSeparator
-{
- /* private: */
- /* Inherit from Etk_Widget */
- Etk_Widget widget;
-};
-
-Etk_Type *etk_hseparator_type_get();
-Etk_Widget *etk_hseparator_new();
-
-
-
/** @brief Gets the type of a vseparator */
#define ETK_VSEPARATOR_TYPE (etk_vseparator_type_get())
/** @brief Casts the object to an Etk_VSeparator */
@@ -36,6 +24,13 @@
/** @brief Checks if the object is an Etk_VSeparator */
#define ETK_IS_VSEPARATOR(obj) (ETK_OBJECT_CHECK_TYPE((obj),
ETK_VSEPARATOR_TYPE))
+struct _Etk_HSeparator
+{
+ /* private: */
+ /* Inherit from Etk_Widget */
+ Etk_Widget widget;
+};
+
struct _Etk_VSeparator
{
/* private: */
@@ -43,10 +38,12 @@
Etk_Widget widget;
};
+Etk_Type *etk_hseparator_type_get();
+Etk_Widget *etk_hseparator_new();
+
Etk_Type *etk_vseparator_type_get();
Etk_Widget *etk_vseparator_new();
-
/** @} */
#endif
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/lib/etk_utils.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- etk_utils.h 23 Oct 2005 08:05:35 -0000 1.3
+++ etk_utils.h 23 Oct 2005 09:30:06 -0000 1.4
@@ -3,16 +3,14 @@
#define _ETK_UTILS_H_
#include <stdio.h>
-#include <libintl.h>
#include "config.h"
/* Gettext */
-#ifndef _
- #ifdef HAVE_GETTEXT
- #define _(string) gettext(string)
- #else
- #define _(string) (string)
- #endif
+#ifdef HAVE_GETTEXT
+ #include <libintl.h>
+ #define _(string) gettext(string)
+#else
+ #define _(string) string
#endif
/** @brief Gets the max of the two values */
-------------------------------------------------------
This SF.Net email is sponsored by the JBoss Inc.
Get Certified Today * Register for a JBoss Training Course
Free Certification Exam for All Training Attendees Through End of 2005
Visit http://www.jboss.com/services/certification for more information
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
