Changed so it doesn't use the deprecated functions in GTK 3.10.

Signed-off-by: Dan Printzell <xwildn00bx@gmail.com>
Fixed GTK2/windows building

Signed-off-by: Dan Printzell <xwildn00bx@gmail.com>
Merge pull request #12 from WildN00b/FixGTK3.10

Changed so it doesn't use the deprecated functions in GTK 3.10.
Added all new colors, although it\'s quite buggy right now
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of git://github.com/WolfieMario/ImageToMap-X into WolfieMario-master

Conflicts:
	resources/colors
	src/data_structures.h
	src/generate.c
	src/main.c
Merge branch 'master' of git://github.com/WolfieMario/ImageToMap-X into WolfieMario-master

Conflicts:
	resources/colors
	src/data_structures.h
	src/generate.c
	src/main.c
Merge branch 'WolfieMario-master'
Forgot to manuelly merge our colors
Merge pull request #15 from WolfieMario/master

Added support for 13w42b's new shades and white
Fixed reading images without alpha channel
Added checkbox for old colors
Fix: use alpha only if four channels exist - not if they don't!