Enlightenment CVS committal Author : rbdpngn Project : e17 Module : libs/ewl
Dir : e17/libs/ewl/src/lib Modified Files: ewl_button.h ewl_debug.h ewl_misc.c ewl_object.c ewl_object.h Log Message: Remove explicit inlining and let the compiler make that decision, will hopefully make non-gcc compilers happier too. =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_button.h,v retrieving revision 1.15 retrieving revision 1.16 diff -u -3 -r1.15 -r1.16 --- ewl_button.h 9 Mar 2006 04:37:58 -0000 1.15 +++ ewl_button.h 13 Mar 2006 18:14:13 -0000 1.16 @@ -52,8 +52,10 @@ void ewl_button_image_set(Ewl_Button *b, const char *file, const char *key); const char *ewl_button_image_get(Ewl_Button *b); -void ewl_button_image_scale_set(Ewl_Button *b, int width, int height); -void ewl_button_image_scale_get(Ewl_Button *b, int *width, int *height); +void ewl_button_image_scale_set(Ewl_Button *b, double width, double height); +void ewl_button_image_scale_get(Ewl_Button *b, double *width, double *height); +void ewl_button_image_size_set(Ewl_Button *b, int width, int height); +void ewl_button_image_size_get(Ewl_Button *b, int *width, int *height); unsigned int ewl_button_alignment_get(Ewl_Button *b); void ewl_button_alignment_set(Ewl_Button *b, unsigned int align); unsigned int ewl_button_fill_policy_get(Ewl_Button *b); =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_debug.h,v retrieving revision 1.15 retrieving revision 1.16 diff -u -3 -r1.15 -r1.16 --- ewl_debug.h 22 Feb 2006 03:51:01 -0000 1.15 +++ ewl_debug.h 13 Mar 2006 18:14:14 -0000 1.16 @@ -10,11 +10,11 @@ #define DLEVEL_TESTING 10 #define DLEVEL_STABLE 20 -inline void ewl_print_warning(void); -inline void ewl_segv(void); -inline void ewl_backtrace(void); +void ewl_print_warning(void); +void ewl_segv(void); +void ewl_backtrace(void); -#define DEBUG 1 +// #define DEBUG 1 #ifdef DEBUG =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_misc.c,v retrieving revision 1.47 retrieving revision 1.48 diff -u -3 -r1.47 -r1.48 --- ewl_misc.c 22 Feb 2006 03:51:01 -0000 1.47 +++ ewl_misc.c 13 Mar 2006 18:14:14 -0000 1.48 @@ -47,7 +47,7 @@ * Set a breakpoint at this function in order to retrieve backtraces from * warning messages. */ -inline void +void ewl_print_warning(void) { fprintf(stderr, "\n***** Ewl Developer Warning ***** :\n" @@ -59,7 +59,7 @@ * @return Returns no value. * @brief This will cause EWL to SEGV. (Handy for debugging) */ -inline void +void ewl_segv(void) { if (ewl_config.debug.segv) { @@ -72,7 +72,7 @@ * @returns Returns no value. * @brief This will print a backtrace at the given point. */ -inline void +void ewl_backtrace(void) { #ifdef __GLIBC__ =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_object.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -3 -r1.11 -r1.12 --- ewl_object.c 22 Feb 2006 03:51:01 -0000 1.11 +++ ewl_object.c 13 Mar 2006 18:14:14 -0000 1.12 @@ -506,7 +506,7 @@ * The given x coordinate is stored to be applied to the object @a o at a later * time. */ -inline void +void ewl_object_x_request(Ewl_Object *o, int x) { DENTER_FUNCTION(DLEVEL_STABLE); @@ -527,7 +527,7 @@ * The given y coordinate is stored to be applied to the object @a o at a later * time. */ -inline void +void ewl_object_y_request(Ewl_Object *o, int y) { DENTER_FUNCTION(DLEVEL_STABLE); @@ -654,7 +654,7 @@ * maximum width are less than the new minimum, they are set to the new minimum * width. */ -inline void +void ewl_object_minimum_w_set(Ewl_Object *o, int w) { int old_size, new_size; @@ -695,7 +695,7 @@ * maximum height are less than the new minimum, they are set to the new minimum * height. */ -inline void +void ewl_object_minimum_h_set(Ewl_Object *o, int h) { int old_size, new_size; @@ -731,7 +731,7 @@ * @return Returns the minimum width of the object @a o. * @brief Get the minimum width of an object */ -inline int +int ewl_object_minimum_w_get(Ewl_Object *o) { int val; @@ -753,7 +753,7 @@ * @return Returns the minimum height of the object. * @brief Get the minimum height of an object */ -inline int +int ewl_object_minimum_h_get(Ewl_Object *o) { int val; @@ -775,7 +775,7 @@ * @return Returns the minimum width of the object @a o. * @brief Get the minimum width of an object */ -inline int +int ewl_object_minimum_inner_w_get(Ewl_Object *o) { int val; @@ -793,7 +793,7 @@ * @return Returns the minimum height of the object. * @brief Get the minimum height of an object */ -inline int +int ewl_object_minimum_inner_h_get(Ewl_Object *o) { int val; @@ -861,7 +861,7 @@ * minimum width are less than the new maximum, they are set to the new * maximum width. */ -inline void +void ewl_object_maximum_w_set(Ewl_Object *o, int w) { DENTER_FUNCTION(DLEVEL_STABLE); @@ -897,7 +897,7 @@ * current height or minimum width are less than the new maximum, they are set * to the new maximum height. */ -inline void +void ewl_object_maximum_h_set(Ewl_Object *o, int h) { DENTER_FUNCTION(DLEVEL_STABLE); @@ -928,7 +928,7 @@ * @return Returns the maximum width of the object. * @brief Get the maximum width of an object */ -inline int +int ewl_object_maximum_w_get(Ewl_Object *o) { int val; @@ -952,7 +952,7 @@ * @return Returns the maximum height of the object. * @brief Get the maximum height of an object */ -inline int +int ewl_object_maximum_h_get(Ewl_Object *o) { int val; @@ -976,7 +976,7 @@ * @return Returns the maximum width of the object. * @brief Get the maximum width of an object */ -inline int +int ewl_object_maximum_inner_w_get(Ewl_Object *o) { int val; @@ -994,7 +994,7 @@ * @return Returns the maximum height of the object. * @brief Get the maximum height of an object */ -inline int +int ewl_object_maximum_inner_h_get(Ewl_Object *o) { int val; @@ -1280,7 +1280,7 @@ * Stores the new alignment value into the object for use * when laying out the object. */ -inline void +void ewl_object_alignment_set(Ewl_Object *o, unsigned int align) { DENTER_FUNCTION(DLEVEL_STABLE); @@ -1356,7 +1356,7 @@ * Stores the new fill policy value into the object for use when laying out * the object. */ -inline void +void ewl_object_fill_policy_set(Ewl_Object *o, unsigned int fill) { unsigned int old_mask; =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_object.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- ewl_object.h 17 Feb 2006 06:43:33 -0000 1.6 +++ ewl_object.h 13 Mar 2006 18:14:14 -0000 1.7 @@ -118,33 +118,33 @@ int w, int h); void ewl_object_size_request(Ewl_Object *o, int w, int h); void ewl_object_position_request(Ewl_Object *o, int x, int y); -inline void ewl_object_x_request(Ewl_Object *o, int x); -inline void ewl_object_y_request(Ewl_Object *o, int y); +void ewl_object_x_request(Ewl_Object *o, int x); +void ewl_object_y_request(Ewl_Object *o, int y); void ewl_object_w_request(Ewl_Object *o, int w); void ewl_object_h_request(Ewl_Object *o, int h); void ewl_object_minimum_size_set(Ewl_Object *o, int w, int h); -inline void ewl_object_minimum_w_set(Ewl_Object *o, int w); -inline void ewl_object_minimum_h_set(Ewl_Object *o, int h); +void ewl_object_minimum_w_set(Ewl_Object *o, int w); +void ewl_object_minimum_h_set(Ewl_Object *o, int h); void ewl_object_minimum_size_get(Ewl_Object *o, int *w, int *h); -inline int ewl_object_minimum_w_get(Ewl_Object *o); -inline int ewl_object_minimum_h_get(Ewl_Object *o); +int ewl_object_minimum_w_get(Ewl_Object *o); +int ewl_object_minimum_h_get(Ewl_Object *o); void ewl_object_maximum_size_set(Ewl_Object *o, int w, int h); -inline void ewl_object_maximum_w_set(Ewl_Object *o, int w); -inline void ewl_object_maximum_h_set(Ewl_Object *o, int h); +void ewl_object_maximum_w_set(Ewl_Object *o, int w); +void ewl_object_maximum_h_set(Ewl_Object *o, int h); void ewl_object_maximum_size_get(Ewl_Object *o, int *w, int *h); -inline int ewl_object_maximum_w_get(Ewl_Object *o); -inline int ewl_object_maximum_h_get(Ewl_Object *o); +int ewl_object_maximum_w_get(Ewl_Object *o); +int ewl_object_maximum_h_get(Ewl_Object *o); unsigned int ewl_object_alignment_get(Ewl_Object *o); -inline void ewl_object_alignment_set(Ewl_Object *o, unsigned int align); +void ewl_object_alignment_set(Ewl_Object *o, unsigned int align); void ewl_object_place(Ewl_Object *o, int x, int y, int w, int h); unsigned int ewl_object_fill_policy_get(Ewl_Object *o); -inline void ewl_object_fill_policy_set(Ewl_Object *o, unsigned int fill); +void ewl_object_fill_policy_set(Ewl_Object *o, unsigned int fill); /* * Padding setting and retrieval functions. ------------------------------------------------------- This SF.Net email is sponsored by xPML, a groundbreaking scripting language that extends applications into web and mobile media. Attend the live webcast and join the prime developer group breaking into this new coding territory! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642 _______________________________________________ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs