claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Final cleanup

Browse Source
This commit is contained in:
Laci bá
2021-11-13 23:56:35 +01:00
parent 0ba4718fb7
commit b321679bde
4 changed files with 0 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/86box.c
View File

@@ -707,17 +707,14 @@ usage:
config_load(); config_load();
/* Load the desired language */ /* Load the desired language */
pclog("lang_init %u, lang_id: %u\n", lang_init, lang_id);
if (lang_init) if (lang_init)
lang_id = lang_init; lang_id = lang_init;
pclog("lang_init %u, lang_id: %u\n", lang_init, lang_id);
lang_init = lang_id; lang_init = lang_id;
lang_id = 0; lang_id = 0;
if (lang_init) if (lang_init)
set_language(lang_init); set_language(lang_init);
pclog("lang_init %u, lang_id: %u\n", lang_init, lang_id);
/* All good! */ /* All good! */
return(1); return(1);
} }

2
src/config.c
View File

@@ -2939,8 +2939,6 @@ save_other_removable_devices(void)
void void
config_save(void) config_save(void)
{ {
pclog("config_save");
save_general(); /* General */ save_general(); /* General */
save_machine(); /* Machine */ save_machine(); /* Machine */
save_video(); /* Video */ save_video(); /* Video */

2
src/win/win.c
View File

@@ -245,7 +245,6 @@ size_t c16stombs(char dst[], const uint16_t src[], int len)
int int
has_language_changed(uint32_t id) has_language_changed(uint32_t id)
{ {
pclog("has_language_changed? lang_id:%u == id:%u?\n", lang_id, id);
return (lang_id != id); return (lang_id != id);
} }
@@ -254,7 +253,6 @@ has_language_changed(uint32_t id)
void void
set_language(uint32_t id) set_language(uint32_t id)
{ {
pclog("set_language %u, lang_id %u\n", id, lang_id);
if (id == 0xFFFF) if (id == 0xFFFF)
{ {
set_language(lang_sys); set_language(lang_sys);

8
src/win/win_lang.c
View File

@@ -50,7 +50,6 @@ EnumResLangProc(HMODULE hModule, LPCTSTR lpszType, LPCTSTR lpszName, WORD wIDLan
SendMessage((HWND)lParam, CB_ADDSTRING, 0, (LPARAM)dispname); SendMessage((HWND)lParam, CB_ADDSTRING, 0, (LPARAM)dispname);
SendMessage((HWND)lParam, CB_SETITEMDATA, c, (LPARAM)wIDLanguage); SendMessage((HWND)lParam, CB_SETITEMDATA, c, (LPARAM)wIDLanguage);
pclog("widl: %u, langid: %u, c: %u\n", wIDLanguage, lang_id, c);
if (wIDLanguage == lang_id) if (wIDLanguage == lang_id)
enum_helper = c; enum_helper = c;
c++; c++;
@@ -73,10 +72,8 @@ progsett_fill_languages(HWND hdlg)
//if no one is selected, then it was 0xFFFF or unsupported language, in either case go with index enum_helper=0 //if no one is selected, then it was 0xFFFF or unsupported language, in either case go with index enum_helper=0
//also start enum index from c=1 //also start enum index from c=1
EnumResourceLanguages(hinstance, RT_MENU, L"MainMenu", &EnumResLangProc, (LPARAM)lang_combo); EnumResourceLanguages(hinstance, RT_MENU, L"MainMenu", &EnumResLangProc, (LPARAM)lang_combo);
pclog("enum_helper is %d\n", enum_helper);
SendMessage(lang_combo, CB_SETCURSEL, enum_helper, 0); SendMessage(lang_combo, CB_SETCURSEL, enum_helper, 0);
pclog("win_fill_languages\n");
} }
/* This returns 1 if any variable has changed, 0 if not. */ /* This returns 1 if any variable has changed, 0 if not. */
@@ -109,8 +106,6 @@ progsett_settings_save(void)
{ {
/* Language */ /* Language */
set_language(temp_language); set_language(temp_language);
pclog("done");
/* Update title bar */ /* Update title bar */
update_mouse_msg(); update_mouse_msg();
@@ -136,7 +131,6 @@ ProgSettDlgProcedure(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam)
hwndProgSett = hdlg; hwndProgSett = hdlg;
/* Language */ /* Language */
temp_language = lang_id; temp_language = lang_id;
pclog("temp_language is %u\n", lang_id);
progsett_fill_languages(hdlg); progsett_fill_languages(hdlg);
break; break;
@@ -157,7 +151,6 @@ ProgSettDlgProcedure(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam)
HWND combo = GetDlgItem(hdlg, IDC_COMBO_LANG); HWND combo = GetDlgItem(hdlg, IDC_COMBO_LANG);
int index = SendMessage(combo, CB_GETCURSEL, 0, 0); int index = SendMessage(combo, CB_GETCURSEL, 0, 0);
temp_language = SendMessage(combo, CB_GETITEMDATA, index, 0); temp_language = SendMessage(combo, CB_GETITEMDATA, index, 0);
pclog("combobox changed -> temp_language = %u", temp_language);
} }
break; break;
@@ -166,7 +159,6 @@ ProgSettDlgProcedure(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam)
int index = progsett_indexof(combo, DEFAULT_LANGUAGE); int index = progsett_indexof(combo, DEFAULT_LANGUAGE);
SendMessage(combo, CB_SETCURSEL, index, 0); SendMessage(combo, CB_SETCURSEL, index, 0);
temp_language = DEFAULT_LANGUAGE; temp_language = DEFAULT_LANGUAGE;
pclog("combobox changed -> temp_language = %u", temp_language);
break; break;
} }
default: default: