MapForge (http://www.mapforge-software.com/) runs on both Windows and Mac OS X. Good for both indoor and outdoor battlemaps.
I use Adobe Illustrator but that's a bit pricey and takes a bit of experience to get nice results. Hexographer has a companion program called Dungoenographer that might be worth a look.
MapTool from RPTools may be something for you to consider: http://www.rptools.net/downloadsw/
I like this one a lot Illwinter's Floorplan Generator:https://store.steampowered.com/app/630900/Illwinters_Floorplan_Generator/http://www.illwinter.com/floorplan/MapForge was a big let down for me. Not good.
How so, alfarobl?