Previous 15994 Revisions Next

r7403 Wednesday 17th February, 2010 at 20:17:08 UTC by Firewave
[MESSUI] Avoid shadowed variables
[src/osd/winui]dialogs.c mui_opts.c properties.c winui.c

src/osd/winui/mui_opts.c
r7402r7403
25442544}
25452545
25462546// Adds our folder flags to a temporarty core_options, for saving.
2547static core_options * AddFolderFlags(core_options *settings)
2547static core_options * AddFolderFlags(core_options *opts_param)
25482548{
25492549   core_options *opts;
25502550   int numFolders;
r7402r7403
25612561   }
25622562
25632563   options_add_entries(opts, regSettings);
2564   copy_options_ex(opts, settings);
2564   copy_options_ex(opts, opts_param);
25652565
25662566   memcpy(entries, filterOptions, sizeof(filterOptions));
25672567   entries[0].name = NULL;
src/osd/winui/dialogs.c
r7402r7403
365365          }
366366         nCurSelection = ComboBox_GetCurSel(GetDlgItem(hDlg,IDC_SNAPNAME));
367367         if (nCurSelection != CB_ERR) {
368            const char* snapname = (const char*)ComboBox_GetItemData(GetDlgItem(hDlg,IDC_SNAPNAME), nCurSelection);
369            if (snapname) {
370               SetSnapName(snapname);
368            const char* snapname_selection = (const char*)ComboBox_GetItemData(GetDlgItem(hDlg,IDC_SNAPNAME), nCurSelection);
369            if (snapname_selection) {
370               SetSnapName(snapname_selection);
371371            }
372372         }
373373         EndDialog(hDlg, 0);
src/osd/winui/winui.c
r7402r7403
691691
692692/* Tool and Status bar variables */
693693static HWND hStatusBar = 0;
694static HWND hToolBar   = 0;
694static HWND s_hToolBar   = 0;
695695
696696/* Column Order as Displayed */
697697static BOOL oldControl = FALSE;
r7402r7403
13351335   {
13361336      //nWidth = nSplitterOffset[GetSplitterCount() - 1];
13371337      CheckMenuItem(GetMenu(hMain),ID_VIEW_PICTURE_AREA, MF_CHECKED);
1338      ToolBar_CheckButton(hToolBar, ID_VIEW_PICTURE_AREA, MF_CHECKED);
1338      ToolBar_CheckButton(s_hToolBar, ID_VIEW_PICTURE_AREA, MF_CHECKED);
13391339   }
13401340   else
13411341   {
13421342      //nWidth = rect.right;
13431343      CheckMenuItem(GetMenu(hMain),ID_VIEW_PICTURE_AREA, MF_UNCHECKED);
1344      ToolBar_CheckButton(hToolBar, ID_VIEW_PICTURE_AREA, MF_UNCHECKED);
1344      ToolBar_CheckButton(s_hToolBar, ID_VIEW_PICTURE_AREA, MF_UNCHECKED);
13451345   }
13461346
13471347   ResizeTreeAndListViews(FALSE);
r7402r7403
14321432
14331433      GetWindowRect(hStatusBar, &rWindow);
14341434      bottomMargin = rWindow.bottom - rWindow.top;
1435      GetWindowRect(hToolBar, &rWindow);
1435      GetWindowRect(s_hToolBar, &rWindow);
14361436      topMargin = rWindow.bottom - rWindow.top;
14371437      /*buttonMargin = (sRect.bottom + 4); */
14381438
r7402r7403
18681868   /* Stash hInstance for later use */
18691869   hInst = hInstance;
18701870
1871   hToolBar   = InitToolbar(hMain);
1871   s_hToolBar   = InitToolbar(hMain);
18721872   hStatusBar = InitStatusBar(hMain);
18731873   hProgWnd   = InitProgressBar(hStatusBar);
18741874
1875   main_resize_items[0].u.hwnd = hToolBar;
1875   main_resize_items[0].u.hwnd = s_hToolBar;
18761876   main_resize_items[1].u.hwnd = hStatusBar;
18771877
18781878   /* In order to handle 'Large Fonts' as the Windows
r7402r7403
19281928   bShowTabCtrl   = GetShowTabCtrl();
19291929
19301930   CheckMenuItem(GetMenu(hMain), ID_VIEW_FOLDERS, (bShowTree) ? MF_CHECKED : MF_UNCHECKED);
1931   ToolBar_CheckButton(hToolBar, ID_VIEW_FOLDERS, (bShowTree) ? MF_CHECKED : MF_UNCHECKED);
1931   ToolBar_CheckButton(s_hToolBar, ID_VIEW_FOLDERS, (bShowTree) ? MF_CHECKED : MF_UNCHECKED);
19321932   CheckMenuItem(GetMenu(hMain), ID_VIEW_TOOLBARS, (bShowToolBar) ? MF_CHECKED : MF_UNCHECKED);
1933   ShowWindow(hToolBar, (bShowToolBar) ? SW_SHOW : SW_HIDE);
1933   ShowWindow(s_hToolBar, (bShowToolBar) ? SW_SHOW : SW_HIDE);
19341934   CheckMenuItem(GetMenu(hMain), ID_VIEW_STATUS, (bShowStatusBar) ? MF_CHECKED : MF_UNCHECKED);
19351935   ShowWindow(hStatusBar, (bShowStatusBar) ? SW_SHOW : SW_HIDE);
19361936   CheckMenuItem(GetMenu(hMain), ID_VIEW_PAGETAB, (bShowTabCtrl) ? MF_CHECKED : MF_UNCHECKED);
r7402r7403
38163816
38173817   // first uncheck previous menu item, check new one
38183818   CheckMenuRadioItem(GetMenu(hMain), ID_VIEW_LARGE_ICON, ID_VIEW_GROUPED, menu_id, MF_CHECKED);
3819   ToolBar_CheckButton(hToolBar, menu_id, MF_CHECKED);
3819   ToolBar_CheckButton(s_hToolBar, menu_id, MF_CHECKED);
38203820
38213821   if (Picker_GetViewID(hwndList) == VIEW_GROUPED || menu_id == ID_VIEW_GROUPED)
38223822   {
r7402r7403
41824182      bShowTree = !bShowTree;
41834183      SetShowFolderList(bShowTree);
41844184      CheckMenuItem(GetMenu(hMain), ID_VIEW_FOLDERS, (bShowTree) ? MF_CHECKED : MF_UNCHECKED);
4185      ToolBar_CheckButton(hToolBar, ID_VIEW_FOLDERS, (bShowTree) ? MF_CHECKED : MF_UNCHECKED);
4185      ToolBar_CheckButton(s_hToolBar, ID_VIEW_FOLDERS, (bShowTree) ? MF_CHECKED : MF_UNCHECKED);
41864186      UpdateScreenShot();
41874187      break;
41884188
r7402r7403
41904190      bShowToolBar = !bShowToolBar;
41914191      SetShowToolBar(bShowToolBar);
41924192      CheckMenuItem(GetMenu(hMain), ID_VIEW_TOOLBARS, (bShowToolBar) ? MF_CHECKED : MF_UNCHECKED);
4193      ToolBar_CheckButton(hToolBar, ID_VIEW_TOOLBARS, (bShowToolBar) ? MF_CHECKED : MF_UNCHECKED);
4194      ShowWindow(hToolBar, (bShowToolBar) ? SW_SHOW : SW_HIDE);
4193      ToolBar_CheckButton(s_hToolBar, ID_VIEW_TOOLBARS, (bShowToolBar) ? MF_CHECKED : MF_UNCHECKED);
4194      ShowWindow(s_hToolBar, (bShowToolBar) ? SW_SHOW : SW_HIDE);
41954195      ResizePickerControls(hMain);
41964196      UpdateScreenShot();
41974197      break;
r7402r7403
42004200      bShowStatusBar = !bShowStatusBar;
42014201      SetShowStatusBar(bShowStatusBar);
42024202      CheckMenuItem(GetMenu(hMain), ID_VIEW_STATUS, (bShowStatusBar) ? MF_CHECKED : MF_UNCHECKED);
4203      ToolBar_CheckButton(hToolBar, ID_VIEW_STATUS, (bShowStatusBar) ? MF_CHECKED : MF_UNCHECKED);
4203      ToolBar_CheckButton(s_hToolBar, ID_VIEW_STATUS, (bShowStatusBar) ? MF_CHECKED : MF_UNCHECKED);
42044204      ShowWindow(hStatusBar, (bShowStatusBar) ? SW_SHOW : SW_HIDE);
42054205      ResizePickerControls(hMain);
42064206      UpdateScreenShot();
r7402r7403
42334233         switch (codeNotify)
42344234         {
42354235         case TOOLBAR_EDIT_ACCELERATOR_PRESSED:
4236            hToolbarEdit = GetDlgItem( hToolBar, ID_TOOLBAR_EDIT);
4236            hToolbarEdit = GetDlgItem( s_hToolBar, ID_TOOLBAR_EDIT);
42374237            SetFocus(hToolbarEdit);
42384238            break;
42394239         case EN_CHANGE:
r7402r7403
69016901   BOOL res;
69026902
69036903   htree = TreeView_GetSelection(hTreeView);
6904
69056904   if (htree != NULL)
69066905   {
69076906      tvi.hItem = htree;
src/osd/winui/properties.c
r7402r7403
201201static void InitializeEffectUI(HWND hWnd);
202202static void InitializeBIOSUI(HWND hwnd);
203203static void InitializeControllerMappingUI(HWND hwnd);
204static void UpdateOptions(HWND hDlg, datamap *properties_datamap, core_options *opts);
205static void UpdateProperties(HWND hDlg, datamap *properties_datamap, core_options *opts);
204static void UpdateOptions(HWND hDlg, datamap *map, core_options *opts);
205static void UpdateProperties(HWND hDlg, datamap *map, core_options *opts);
206206static void PropToOptions(HWND hWnd, core_options *o);
207207static void OptionsToProp(HWND hWnd, core_options *o);
208208static void SetPropEnabledControls(HWND hWnd);
r7402r7403
15821582}
15831583
15841584/* Update options from the dialog */
1585static void UpdateOptions(HWND hDlg, datamap *properties_datamap, core_options *opts)
1585static void UpdateOptions(HWND hDlg, datamap *map, core_options *opts)
15861586{
15871587   /* These are always called together, so make one conveniece function. */
1588   datamap_read_all_controls(properties_datamap, hDlg, opts);
1588   datamap_read_all_controls(map, hDlg, opts);
15891589   PropToOptions(hDlg, opts);
15901590}
15911591
15921592/* Update the dialog from the options */
1593static void UpdateProperties(HWND hDlg, datamap *properties_datamap, core_options *opts)
1593static void UpdateProperties(HWND hDlg, datamap *map, core_options *opts)
15941594{
15951595   /* These are always called together, so make one conviniece function. */
1596   datamap_populate_all_controls(properties_datamap, hDlg, opts);
1596   datamap_populate_all_controls(map, hDlg, opts);
15971597   OptionsToProp(hDlg, opts);
15981598   SetPropEnabledControls(hDlg);
15991599}

Previous 15994 Revisions Next

© 1998-2018 The MESS Team