mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-04-10 21:44:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename she::Window -> she::WinWindow

Browse Source
This commit is contained in:
David Capello 2015-06-01 14:33:47 -03:00
parent 4c8cea53df
commit e1b55395d5
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/she/skia/skia_window_win.h
View File

@ -21,7 +21,7 @@ namespace she {
class EventQueue;
class SkiaDisplay;
class SkiaWindow : public Window<SkiaWindow> {
class SkiaWindow : public WinWindow<SkiaWindow> {
public:
enum class Backend { NONE, GL, ANGLE };

14
src/she/win/window.h
View File

@ -29,9 +29,9 @@ namespace she {
#define SHE_WND_CLASS_NAME L"Aseprite.Window"
template<typename T>
class Window {
class WinWindow {
public:
Window() {
WinWindow() {
registerClass();
m_hwnd = createHwnd(this);
m_hcursor = NULL;
@ -459,7 +459,7 @@ namespace she {
wcex.cbSize = sizeof(WNDCLASSEX);
wcex.style = CS_DBLCLKS;
wcex.lpfnWndProc = &Window::staticWndProc;
wcex.lpfnWndProc = &WinWindow::staticWndProc;
wcex.cbClsExtra = 0;
wcex.cbWndExtra = 0;
wcex.hInstance = instance;
@ -474,7 +474,7 @@ namespace she {
throw std::runtime_error("Error registering window class");
}
static HWND createHwnd(Window* self) {
static HWND createHwnd(WinWindow* self) {
HWND hwnd = CreateWindowEx(
WS_EX_APPWINDOW | WS_EX_ACCEPTFILES,
SHE_WND_CLASS_NAME,
@ -494,12 +494,12 @@ namespace she {
}
static LRESULT CALLBACK staticWndProc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) {
Window* wnd;
WinWindow* wnd;
if (msg == WM_CREATE)
wnd = (Window*)lparam;
wnd = (WinWindow*)lparam;
else
wnd = (Window*)GetWindowLongPtr(hwnd, GWLP_USERDATA);
wnd = (WinWindow*)GetWindowLongPtr(hwnd, GWLP_USERDATA);
if (wnd)
return wnd->wndProc(msg, wparam, lparam);