From bad78945ceba425f6a80e3b8dca2414d592970eb Mon Sep 17 00:00:00 2001
From: chai <chaifix@163.com>
Date: Fri, 2 Aug 2019 20:51:00 +0800
Subject: =?UTF-8?q?*=E4=BF=AE=E6=94=B9=E6=96=87=E4=BB=B6=E5=90=8D=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 source/tests/win32/01-window/02_multi_window.cpp |  2 +-
 source/tests/win32/01-window/03_sub_menu.cpp     | 15 +++++++++------
 2 files changed, 10 insertions(+), 7 deletions(-)

(limited to 'source/tests')

diff --git a/source/tests/win32/01-window/02_multi_window.cpp b/source/tests/win32/01-window/02_multi_window.cpp
index a57c9d4..e83f1a3 100644
--- a/source/tests/win32/01-window/02_multi_window.cpp
+++ b/source/tests/win32/01-window/02_multi_window.cpp
@@ -3,7 +3,7 @@
 #if _run_app == _multi_window
 
 #include <windows.h>
-#include <GL/gfx_device.h>
+#include <GL/GfxDevice.h>
 #include <GL/glu.h>
 #define MAX_LOADSTRING 100
 HINSTANCE hInstance;
diff --git a/source/tests/win32/01-window/03_sub_menu.cpp b/source/tests/win32/01-window/03_sub_menu.cpp
index 86bcc76..ccf62c0 100644
--- a/source/tests/win32/01-window/03_sub_menu.cpp
+++ b/source/tests/win32/01-window/03_sub_menu.cpp
@@ -1,12 +1,12 @@
 #include "config.h"
 #if _run_app == _sub_menu
 
-#include <asura-utils/io/file_system.h>
-#include <asura-utils/io/data_buffer.h>
+#include <asura-utils/IO/FileSystem.h>
+#include <asura-utils/IO/DataBuffer.h>
 #include <asura-core/graphics/image.h>
 #include <asura-core/graphics/shader.h>
-#include <asura-core/image/image_data.h>
-#include <asura-core/graphics/vertex_buffer.h>
+#include <asura-core/image/ImageData.h>
+#include <asura-core/graphics/VertexBuffer.h>
 #include <SDL2/SDL.h>
 #include <string>
 
@@ -111,7 +111,11 @@ int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, PWSTR lpCmdLin
 	DWORD extendedStyle = 0;
 	windowStyle = WS_POPUP | WS_CLIPCHILDREN | WS_THICKFRAME | WS_VISIBLE;
 	extendedStyle = WS_EX_TOOLWINDOW;
-	//windowStyle = WS_OVERLAPPEDWINDOW | WS_VISIBLE;
+
+	windowStyle = WS_OVERLAPPED | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME | WS_CLIPCHILDREN | WS_MAXIMIZEBOX | WS_MINIMIZEBOX | WS_VISIBLE;
+	extendedStyle = 0;
+
+	//windowStyle = WS_OVERLAPPEDWINDOW | WS_VISIBLE;WS_VISIBLE
 
 	RECT rect = { 100, 100, 500, 500 };
 	AdjustWindowRectEx(&rect, windowStyle, true, extendedStyle);
@@ -332,7 +336,6 @@ LRESULT CALLBACK WndProc(HWND hwnd, UINT msg,
 }
 
 void AddMenus(HWND hwnd) {
-	return;
 	HMENU hMenubar = CreateMenu();
 	HMENU hMenu = CreateMenu();
 	HMENU hSubMenu = CreatePopupMenu();
-- 
cgit v1.1-26-g67d0