mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-15 12:54:01 +02:00
Code Issues Projects Releases Wiki Activity

Updated map editor UI style on Windows

Browse Source
This commit is contained in:
mathusummut
2019-02-05 16:25:15 +01:00
parent 04e3404d0e
commit 90a0d5af25
2 changed files with 47 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
source/g3d_viewer/main.cpp
View File

@@ -2080,6 +2080,29 @@ namespace Shared {
bool App::OnInit() {
SystemFlags::VERBOSE_MODE_ENABLED = false;
#ifdef WIN32
/*It is recommended that you delay-load ComCtl32.dll (/DelayLoad:ComCtl32.dll)
and that you ensure this code runs before GUI components are loaded.
Otherwise, you may get weird issues, like black backgrounds in icons in image lists.*/
{
TCHAR dir[MAX_PATH];
ULONG_PTR ulpActivationCookie = FALSE;
ACTCTX actCtx =
{
sizeof(actCtx),
ACTCTX_FLAG_RESOURCE_NAME_VALID
| ACTCTX_FLAG_SET_PROCESS_DEFAULT
| ACTCTX_FLAG_ASSEMBLY_DIRECTORY_VALID,
TEXT("shell32.dll"), 0, 0, dir, (LPCTSTR) 124
};
UINT cch = GetSystemDirectory(dir, sizeof(dir) / sizeof(*dir));
if (cch >= sizeof(dir) / sizeof(*dir)) {
return FALSE; /*shouldn't happen*/
}
dir[cch] = TEXT('\0');
ActivateActCtx(CreateActCtx(&actCtx), &ulpActivationCookie);
}
#endif
#if defined(wxMAJOR_VERSION) && defined(wxMINOR_VERSION) && defined(wxRELEASE_NUMBER) && defined(wxSUBRELEASE_NUMBER)
printf("Using wxWidgets version [%d.%d.%d.%d]\n", wxMAJOR_VERSION, wxMINOR_VERSION, wxRELEASE_NUMBER, wxSUBRELEASE_NUMBER);

24
source/map_editor/main.cpp
View File

@@ -1628,6 +1628,30 @@ wxT("Help")).ShowModal();
SystemFlags::VERBOSE_MODE_ENABLED = false;
SystemFlags::ENABLE_THREADED_LOGGING = false;
#ifdef WIN32
/*It is recommended that you delay-load ComCtl32.dll (/DelayLoad:ComCtl32.dll)
and that you ensure this code runs before GUI components are loaded.
Otherwise, you may get weird issues, like black backgrounds in icons in image lists.*/
{
TCHAR dir[MAX_PATH];
ULONG_PTR ulpActivationCookie = FALSE;
ACTCTX actCtx =
{
sizeof(actCtx),
ACTCTX_FLAG_RESOURCE_NAME_VALID
| ACTCTX_FLAG_SET_PROCESS_DEFAULT
| ACTCTX_FLAG_ASSEMBLY_DIRECTORY_VALID,
TEXT("shell32.dll"), 0, 0, dir, (LPCTSTR) 124
};
UINT cch = GetSystemDirectory(dir, sizeof(dir) / sizeof(*dir));
if (cch >= sizeof(dir) / sizeof(*dir)) {
return FALSE; /*shouldn't happen*/
}
dir[cch] = TEXT('\0');
ActivateActCtx(CreateActCtx(&actCtx), &ulpActivationCookie);
}
#endif
string fileparam;
if (argc == 2) {
if (argv[1][0] == '-') { // any flag gives help and exits program.