diff options
| author | chai <chaifix@163.com> | 2019-08-02 20:51:00 +0800 |
|---|---|---|
| committer | chai <chaifix@163.com> | 2019-08-02 20:51:00 +0800 |
| commit | bad78945ceba425f6a80e3b8dca2414d592970eb (patch) | |
| tree | 8bf7540766349c534bf9e5746b24fd7507ba034e /source/tests/win32 | |
| parent | 99b90496765df21c5f377f42b9ed073ccb34c1fd (diff) | |
*修改文件名格式
Diffstat (limited to 'source/tests/win32')
| -rw-r--r-- | source/tests/win32/01-window/02_multi_window.cpp | 2 | ||||
| -rw-r--r-- | source/tests/win32/01-window/03_sub_menu.cpp | 15 |
2 files changed, 10 insertions, 7 deletions
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(); |