Merge tag 'upstream/4.3.0'

Upstream version 4.3.0

1 files changed, 41 insertions, 15 deletions

diff --git a/app/wlib/gtklib/CMakeLists.txt b/app/wlib/gtklib/CMakeLists.txt
index cce9866..a8cae9f 100644
--- a/app/wlib/gtklib/CMakeLists.txt
+++ b/app/wlib/gtklib/CMakeLists.txt
@@ -4,26 +4,51 @@ FILE(GLOB HEADERS *.h)
 INCLUDE (FindGTKUnixPrint.cmake)
 
 SET(SOURCES
-	gtkbitmap.c
-	gtkbutton.c
-	gtkcolor.c
-	gtkdraw-cairo.c
+	bitmap.c
+	boxes.c
+	button.c
+	color.c
+	control.c
+	droplist.c	
 	filesel.c
-	gtkfont.c
-	gtkhelp.c
-	gtklist.c
-	gtkmenu.c
-	gtkmisc.c
-	gtksimple.c
-	gtksingle.c
-	gtksplash.c
-	gtktext.c
-	gtkwindow.c
-	gtkxpm.c
+	font.c
+	help.c
+	lines.c
+	list.c
+	liststore.c
+	main.c
+	menu.c	
+	message.c
+	notice.c
+	pixbuf.c
+	png.c
 	print.c
+	single.c
+	splash.c
+	text.c
+	timer.c
+	tooltip.c	
+	treeview.c
+	util.c
+	window.c
 	wpref.c
+# cproto and cppcheck
+
+# end of refactored sources	
+	gtkdraw-cairo.c
 	)
 
+IF(APPLE)
+	SET(SOURCES 
+		${SOURCES}
+		osxhelp.c)
+	
+ELSE(APPLE)
+	SET(SOURCES 
+		${SOURCES}
+		ixhelp.c)
+ENDIF(APPLE)
+
 SET_SOURCE_FILES_PROPERTIES(wpref.c PROPERTIES COMPILE_FLAGS -DEXPORT=)
 
 INCLUDE_DIRECTORIES(${XTrkCAD_BINARY_DIR})
@@ -35,3 +60,4 @@ ADD_LIBRARY(xtrkcad-wlib ${HEADERS} ${SOURCES})
 TARGET_LINK_LIBRARIES(xtrkcad-wlib ${GTK_LIBRARIES})
 TARGET_LINK_LIBRARIES(xtrkcad-wlib ${GTK_UNIX_PRINT_LIBRARIES})
 TARGET_LINK_LIBRARIES(xtrkcad-wlib ${GTK_WEBKIT_LIBRARIES})
+