Merge commit '26c8cc348eacea01237cd64e1a68d0df8141e848'
This commit is contained in:
		
							
								
								
									
										8
									
								
								deps/glfw/deps/nuklear_glfw_gl2.h
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										8
									
								
								deps/glfw/deps/nuklear_glfw_gl2.h
									
									
									
									
										vendored
									
									
								
							@@ -230,7 +230,7 @@ nk_glfw3_mouse_button_callback(GLFWwindow* window, int button, int action, int m
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
NK_INTERN void
 | 
			
		||||
nk_glfw3_clipbard_paste(nk_handle usr, struct nk_text_edit *edit)
 | 
			
		||||
nk_glfw3_clipboard_paste(nk_handle usr, struct nk_text_edit *edit)
 | 
			
		||||
{
 | 
			
		||||
    const char *text = glfwGetClipboardString(glfw.win);
 | 
			
		||||
    if (text) nk_textedit_paste(edit, text, nk_strlen(text));
 | 
			
		||||
@@ -238,7 +238,7 @@ nk_glfw3_clipbard_paste(nk_handle usr, struct nk_text_edit *edit)
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
NK_INTERN void
 | 
			
		||||
nk_glfw3_clipbard_copy(nk_handle usr, const char *text, int len)
 | 
			
		||||
nk_glfw3_clipboard_copy(nk_handle usr, const char *text, int len)
 | 
			
		||||
{
 | 
			
		||||
    char *str = 0;
 | 
			
		||||
    (void)usr;
 | 
			
		||||
@@ -261,8 +261,8 @@ nk_glfw3_init(GLFWwindow *win, enum nk_glfw_init_state init_state)
 | 
			
		||||
        glfwSetMouseButtonCallback(win, nk_glfw3_mouse_button_callback);
 | 
			
		||||
    }
 | 
			
		||||
    nk_init_default(&glfw.ctx, 0);
 | 
			
		||||
    glfw.ctx.clip.copy = nk_glfw3_clipbard_copy;
 | 
			
		||||
    glfw.ctx.clip.paste = nk_glfw3_clipbard_paste;
 | 
			
		||||
    glfw.ctx.clip.copy = nk_glfw3_clipboard_copy;
 | 
			
		||||
    glfw.ctx.clip.paste = nk_glfw3_clipboard_paste;
 | 
			
		||||
    glfw.ctx.clip.userdata = nk_handle_ptr(0);
 | 
			
		||||
    nk_buffer_init_default(&glfw.ogl.cmds);
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user