Update to version 1.1

Author: brummer10

XUiDesigner/Makefile

@@ -26,7 +26,7 @@
 	NAME = XUiDesigner
 	EXEC_NAME  = $(shell echo $(NAME) | tr A-Z a-z)
 	BUILD_DIR = build/
-	VER = 1.0
+	VER = 1.1
 
 	LIB_DIR := ../libxputty/libxputty/
 	HEADER_DIR := $(LIB_DIR)include/
@@ -43,10 +43,10 @@
 	# set compile flags
 	LDFLAGS += -fPIC -Wl,-z,noexecstack -Wl,--no-undefined -I./include/ -I../libxputty/libxputty/include/ \
 	`pkg-config --cflags --libs cairo x11 lilv-0` -lm -lpthread
-	CXXFLAGS += -O3 -D_FORTIFY_SOURCE=2 -Wall -Wextra -fstack-protector -fno-ident -Wno-unused-result \
+	MY_CFLAGS += -O3 $(CFLAGS) -D_FORTIFY_SOURCE=2 -Wall -Wextra -fstack-protector -fno-ident -Wno-unused-result \
 	-fno-asynchronous-unwind-tables -s -DNDEBUG -DSHARE_DIR=\"$(SHARE_DIR)\"
 	# -pedantic -Wextra -Wshadow -Wpadded -Wpointer-arith -Wcast-qual -Wstrict-prototypes -Wmissing-prototypes
-	DEBUG_CXXFLAGS += -g -D DEBUG -DSHARE_DIR=\"$(SHARE_DIR)\"
+	DEBUG_MY_CFLAGS += -g -D DEBUG -DSHARE_DIR=\"$(SHARE_DIR)\"
 	# invoke build files
 	SOURCE = $(wildcard $(SOURCE_DIR)*.c)
 	OBJECTS := $(addprefix $(BUILD_DIR),$(notdir $(patsubst %.c,%.o,$(SOURCE))))
@@ -67,7 +67,7 @@ all : check $(NAME)
 		$(R_ECHO)"sorry, build failed$(reset)"; \
 	fi 
 
-debug: CXXFLAGS = $(DEBUG_CXXFLAGS) 
+debug: MY_CFLAGS = $(DEBUG_MY_CFLAGS) 
 debug: all
 
 nls: LDFLAGS += -DENABLE_NLS -DGETTEXT_PACKAGE=\"$(EXEC_NAME)\" -DLOCAL_DIR=\"$(LOCAL_DIR)\"
@@ -150,11 +150,11 @@ uninstall :
 
 $(OBJECTS) : $(SOURCE)
 	@$(ECHO) "Building object file $@ $(reset)"
-	$(QUIET)$(CC) $(CXXFLAGS) -Wall -c $(addprefix $(SOURCE_DIR),$(notdir $(patsubst %.o,%.c,$@))) -o $@ $(LDFLAGS)
+	$(QUIET)$(CC) $(MY_CFLAGS) -Wall -c $(addprefix $(SOURCE_DIR),$(notdir $(patsubst %.o,%.c,$@))) -o $@ $(LDFLAGS)
 
 $(NAME) : $(OBJECTS)
 	@$(B_ECHO) "Compile $(EXEC_NAME) $(reset)"
-	$(QUIET)$(CC) $(CXXFLAGS) $(OBJECTS) -L. ../libxputty/libxputty/libxputty.a -o $(EXEC_NAME) $(LDFLAGS)
+	$(QUIET)$(CC) $(MY_CFLAGS) $(OBJECTS) -L. ../libxputty/libxputty/libxputty.a -o $(EXEC_NAME) $(LDFLAGS)
 
 doc:
 	#pass

XUiDesigner/include/XUiDesigner.h

@@ -143,6 +143,7 @@ typedef struct {
     bool is_atom_output;
     bool is_atom_input;
     bool have_adjustment;
+    char pad[4];
 } Controller;
 
 /*---------------------------------------------------------------------

XUiDesigner/include/XUiTextInput.h

@@ -48,6 +48,7 @@ typedef struct {
     int curser_mark2;
     int set_selection;
     bool in_double_click;
+    char pad[7];
 } TextBox_t;
 
 

XUiDesigner/src/XUiTextInput.c

@@ -251,7 +251,7 @@ static void box_entry_set_curser_pos(Widget_t *w, int s) {
     expose_widget(w);
 }
 
-void remove_trailing_zeros(char* s) {
+static void remove_trailing_zeros(char* s) {
     unsigned int l = strlen(s)-1;
     for(;l>0;l--) {
         if (strstr(&s[l],"0")) {

XUiDesigner/src/XUiWriteJson.c

@@ -292,7 +292,7 @@ static void check_for_Widget_color(XUiDesigner *designer, Widget_t * wid) {
     }
 }
 
-char *set_resource_path(XUiDesigner *designer, const char* image) {
+static char *set_resource_path(XUiDesigner *designer, const char* image) {
     char* tmp = strdup(image);
     char* xldl = strdup(basename(tmp));
     free(tmp);

XUiDesigner/src/XUiWriteUI.c

@@ -343,7 +343,7 @@ static void check_for_elem_colors(XUiDesigner *designer) {
 -----------------------------------------------------------------------
 ----------------------------------------------------------------------*/
 
-int format(float value) {
+static int format(float value) {
     float v = value - (int)value;
     char s[30] = {0};
     snprintf(s, 29, "%f", v);