[Easycalc-commits] PPCport/system - UI EasyCalc.cpp,1.10,1.11

[Mapi B. <ma...@us...>]

Update of /cvsroot/easycalc/PPCport/system - UI
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv21460

Modified Files:
	EasyCalc.cpp 
Log Message:
1.25f, full skin support

Index: EasyCalc.cpp
===================================================================
RCS file: /cvsroot/easycalc/PPCport/system - UI/EasyCalc.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** EasyCalc.cpp	24 Dec 2009 16:40:25 -0000	1.10
--- EasyCalc.cpp	24 Dec 2009 17:15:16 -0000	1.11
***************
*** 2161,2166 ****
                              // Set chosen language, and tell WndProc to modify menus
                              // and propSheets accordingly.
!                             new_lang = (TCHAR *) libLang->getLangByIndex(cur_sel); // Force "const" off
!                             screen_redraw = true;
                              processed = TRUE;
                              break;
--- 2161,2168 ----
                              // Set chosen language, and tell WndProc to modify menus
                              // and propSheets accordingly.
!                             if (cur_sel != CB_ERR) {
!                                 new_lang = (TCHAR *) libLang->getLangByIndex(cur_sel); // Force "const" off
!                                 screen_redraw = true;
!                             }
                              processed = TRUE;
                              break;
***************
*** 2298,2302 ****
                  if (state->skinName[i][0] != 0) {
                      TCHAR numText[2];
!                     numText[0] = _T('0'+i);
                      numText[1] = 0;
                      SendMessage(hWnd, CB_ADDSTRING, (WPARAM) 0, (LPARAM) numText);
--- 2300,2304 ----
                  if (state->skinName[i][0] != 0) {
                      TCHAR numText[2];
!                     numText[0] = _T('1'+i);
                      numText[1] = 0;
                      SendMessage(hWnd, CB_ADDSTRING, (WPARAM) 0, (LPARAM) numText);
***************
*** 2338,2342 ****
                          case CBN_CLOSEUP:
                              int numSel = SendMessage(hWnd, CB_GETCURSEL, (WPARAM) 0, (LPARAM) 0);
!                             for (int i=0 ; i<3 ; i++) {
                                  if (state->skinName[i][0] != 0) {
                                      if (numSel-- == 0) {
--- 2340,2344 ----
                          case CBN_CLOSEUP:
                              int numSel = SendMessage(hWnd, CB_GETCURSEL, (WPARAM) 0, (LPARAM) 0);
!                             for (int i=0 ; i<NB_SKINS ; i++) {
                                  if (state->skinName[i][0] != 0) {
                                      if (numSel-- == 0) {
***************
*** 2352,2355 ****
--- 2354,2393 ----
                      }
                      break;
+                 case IDC_COMBO_SKIN1:
+                     switch (notify_msg) {
+                         case CBN_CLOSEUP:
+                             int numSel = SendMessage(hWnd, CB_GETCURSEL, (WPARAM) 0, (LPARAM) 0);
+                             if (numSel != CB_ERR) {
+                                 SendMessage(hWnd, CB_GETLBTEXT, (WPARAM) numSel, (LPARAM) state->skinName[0]);
+                                 screen_redraw = true;
+                             }
+                             processed = TRUE;
+                             break;
+                     }
+                     break;
+                 case IDC_COMBO_SKIN2:
+                     switch (notify_msg) {
+                         case CBN_CLOSEUP:
+                             int numSel = SendMessage(hWnd, CB_GETCURSEL, (WPARAM) 0, (LPARAM) 0);
+                             if (numSel != CB_ERR) {
+                                 SendMessage(hWnd, CB_GETLBTEXT, (WPARAM) numSel, (LPARAM) state->skinName[1]);
+                                 screen_redraw = true;
+                             }
+                             processed = TRUE;
+                             break;
+                     }
+                     break;
+                 case IDC_COMBO_SKIN3:
+                     switch (notify_msg) {
+                         case CBN_CLOSEUP:
+                             int numSel = SendMessage(hWnd, CB_GETCURSEL, (WPARAM) 0, (LPARAM) 0);
+                             if (numSel != CB_ERR) {
+                                 SendMessage(hWnd, CB_GETLBTEXT, (WPARAM) numSel, (LPARAM) state->skinName[2]);
+                                 screen_redraw = true;
+                             }
+                             processed = TRUE;
+                             break;
+                     }
+                     break;
              }
              }