clipboard fixes

src/BaseEngine.cpp

@@ -71,7 +71,9 @@ namespace ofxImGui
 	//--------------------------------------------------------------
 	const char* BaseEngine::getClipboardString(void * userData)
 	{
-		return &ofGetWindowPtr()->getClipboardString()[0];
+		static std::string clip;
+		clip = ofGetWindowPtr()->getClipboardString();
+		return clip.c_str();
 	}
 
 	//--------------------------------------------------------------

src/EngineGLFW.cpp

@@ -166,6 +166,10 @@ namespace ofxImGui
 		if (button >= 0 && button < 5)
 		{
 			remapToGLFWConvention(button);
+			//prevent ctrl + left click from becoming a right click on osx!
+			if(button == 1 && ( ofGetKeyPressed(OF_KEY_CONTROL) || ofGetKeyPressed(OF_KEY_RIGHT_CONTROL))){
+				button = 0;
+			}
 			mousePressed[button] = true;
 		}
 	}
@@ -177,6 +181,10 @@ namespace ofxImGui
 		if (button >= 0 && button < 5)
 		{
 			remapToGLFWConvention(button);
+			//prevent ctrl + left click from becoming a right click on osx!
+			if(button == 1 && ( ofGetKeyPressed(OF_KEY_CONTROL) || ofGetKeyPressed(OF_KEY_RIGHT_CONTROL))){
+				button = 0;
+			}
 			mousePressed[button] = false;
 		}
 	}