diff --git a/src/she/CMakeLists.txt b/src/she/CMakeLists.txt index 781312424..b813b5861 100644 --- a/src/she/CMakeLists.txt +++ b/src/she/CMakeLists.txt @@ -121,8 +121,8 @@ if(USE_SKIA_BACKEND) if(WIN32) list(APPEND SHE_SOURCES skia/skia_window_win.cpp + win/keys.cpp win/pen.cpp - win/vk.cpp win/winapi.cpp win/window.cpp win/window_dde.cpp) @@ -131,8 +131,8 @@ if(USE_SKIA_BACKEND) osx/app.mm osx/app_delegate.mm osx/event_queue.mm + osx/keys.mm osx/view.mm - osx/vk.mm osx/window.mm skia/skia_window_osx.mm) else() diff --git a/src/she/osx/vk.h b/src/she/osx/keys.h similarity index 82% rename from src/she/osx/vk.h rename to src/she/osx/keys.h index 6c0bea6d9..c9c51a3a3 100644 --- a/src/she/osx/vk.h +++ b/src/she/osx/keys.h @@ -1,11 +1,11 @@ // SHE library -// Copyright (C) 2017 David Capello +// Copyright (C) 2017-2018 David Capello // // This file is released under the terms of the MIT license. // Read LICENSE.txt for more information. -#ifndef SHE_OSX_VK_H_INCLUDED -#define SHE_OSX_VK_H_INCLUDED +#ifndef SHE_OSX_KEYS_H_INCLUDED +#define SHE_OSX_KEYS_H_INCLUDED #pragma once #include "she/keys.h" diff --git a/src/she/osx/vk.mm b/src/she/osx/keys.mm similarity index 99% rename from src/she/osx/vk.mm rename to src/she/osx/keys.mm index 7e2ea4fce..153780fe3 100644 --- a/src/she/osx/vk.mm +++ b/src/she/osx/keys.mm @@ -1,5 +1,5 @@ // SHE library -// Copyright (C) 2015-2017 David Capello +// Copyright (C) 2015-2018 David Capello // // This file is released under the terms of the MIT license. // Read LICENSE.txt for more information. @@ -11,7 +11,7 @@ #include "config.h" #endif -#include "she/osx/vk.h" +#include "she/osx/keys.h" #include #include // TIS functions diff --git a/src/she/osx/view.mm b/src/she/osx/view.mm index be47edf59..56823c4ba 100644 --- a/src/she/osx/view.mm +++ b/src/she/osx/view.mm @@ -1,5 +1,5 @@ // SHE library -// Copyright (C) 2015-2017 David Capello +// Copyright (C) 2015-2018 David Capello // // This file is released under the terms of the MIT license. // Read LICENSE.txt for more information. @@ -16,7 +16,7 @@ #include "she/event.h" #include "she/event_queue.h" #include "she/osx/generate_drop_files.h" -#include "she/osx/vk.h" +#include "she/osx/keys.h" #include "she/osx/window.h" #include "she/system.h" diff --git a/src/she/win/vk.cpp b/src/she/win/keys.cpp similarity index 99% rename from src/she/win/vk.cpp rename to src/she/win/keys.cpp index 5142feb05..7e7c65486 100644 --- a/src/she/win/vk.cpp +++ b/src/she/win/keys.cpp @@ -1,5 +1,5 @@ // SHE library -// Copyright (C) 2012-2016 David Capello +// Copyright (C) 2012-2018 David Capello // // This file is released under the terms of the MIT license. // Read LICENSE.txt for more information. @@ -8,7 +8,7 @@ #include "config.h" #endif -#include "she/win/vk.h" +#include "she/win/keys.h" namespace she { diff --git a/src/she/win/vk.h b/src/she/win/keys.h similarity index 97% rename from src/she/win/vk.h rename to src/she/win/keys.h index 39f0ffa39..b09dd52c4 100644 --- a/src/she/win/vk.h +++ b/src/she/win/keys.h @@ -1,5 +1,5 @@ // SHE library -// Copyright (C) 2012-2017 David Capello +// Copyright (C) 2012-2018 David Capello // // This file is released under the terms of the MIT license. // Read LICENSE.txt for more information. diff --git a/src/she/win/window.cpp b/src/she/win/window.cpp index 4c8844674..615c50713 100644 --- a/src/she/win/window.cpp +++ b/src/she/win/window.cpp @@ -21,8 +21,8 @@ #include "gfx/size.h" #include "she/event.h" #include "she/native_cursor.h" +#include "she/win/keys.h" #include "she/win/system.h" -#include "she/win/vk.h" #include "she/win/window_dde.h" #define SHE_WND_CLASS_NAME L"Aseprite.Window"