What I mean is that it is not that important who Gibraltar belongs to as far as the desire of their population and the surrounding territories are respected. I add the surrounding territories because they are their natural hinterland, independently to who they belong, and therefore there should cooperation for the common good. I could not care less whether it is part of Spain or not, if you are happier with it.
Take your colonial desires and stuff them back in the 18th century where they belong