Fixed incompatible pointer type: NSButton * -> RikWindowButton
Merge confict solving