[Easycalc-commits] PPCport EasyCalcppc.rc, 1.1, 1.2 result.cpp, 1.1, 1.2 result.h, 1.1, 1.2

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/easycalc/PPCport
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv13704

Modified Files:
	EasyCalcppc.rc result.cpp result.h 
Log Message:
Sync before a new set of updates

Index: result.cpp
===================================================================
RCS file: /cvsroot/easycalc/PPCport/result.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** result.cpp	26 May 2008 20:09:53 -0000	1.1
--- result.cpp	3 Sep 2008 20:24:52 -0000	1.2
***************
*** 57,67 ****
  Coord position;
  RectangleType resultBounds;
! char *displayedText=NULL;

  TresultPrefs resultPrefs;

! static void result_print_num(char *text) IFACE;
! static void result_print_pow(char *text) IFACE;
! static void result_print(char *text) IFACE;

--- 57,67 ----
  Coord position;
  RectangleType resultBounds;
! TCHAR *displayedText=NULL;

  TresultPrefs resultPrefs;

! static void result_print_num(TCHAR *text) IFACE;
! static void result_print_pow(TCHAR *text) IFACE;
! static void result_print(TCHAR *text) IFACE;

***************
*** 85,89 ****
  	Int16 count=0;
  	resSelection choices[SELECTION_COUNT];
! 	char *description[SELECTION_COUNT];
  	ListPtr list; 
  	Tdisp_mode oldmode;
--- 85,89 ----
  	Int16 count=0;
  	resSelection choices[SELECTION_COUNT];
! 	TCHAR *description[SELECTION_COUNT];
  	ListPtr list; 
  	Tdisp_mode oldmode;
***************
*** 110,114 ****

  	for (i=0;i<count;i++) {
! 		description[i] = MemPtrNew(MAX_RSCLEN);
  		SysStringByIndex(strMenuDescription,choices[i],
  				 description[i],MAX_RSCLEN-1);
--- 110,114 ----

  	for (i=0;i<count;i++) {
! 		description[i] = (TCHAR *) MemPtrNew(MAX_RSCLEN);
  		SysStringByIndex(strMenuDescription,choices[i],
  				 description[i],MAX_RSCLEN-1);
***************
*** 199,203 ****
  result_set(Trpn item)
  {
! 	char *text;
  	CError err;
  	Boolean freeitem = false;
--- 199,203 ----
  result_set(Trpn item)
  {
! 	TCHAR *text;
  	CError err;
  	Boolean freeitem = false;
***************
*** 233,237 ****
  	if (displayedText)
  		MemPtrFree(displayedText);
! 	displayedText = MemPtrNew(StrLen(text)+1);
  	StrCopy(displayedText,text); 

--- 233,237 ----
  	if (displayedText)
  		MemPtrFree(displayedText);
! 	displayedText = (TCHAR *) MemPtrNew(StrLen(text)+1);
  	StrCopy(displayedText,text); 

***************
*** 262,268 ****
   ***********************************************************************/
  void
! result_set_text(char *text,rpntype type) IFACE;
  void
! result_set_text(char *text,rpntype type)
  {
  	if (type != notype)
--- 262,268 ----
   ***********************************************************************/
  void
! result_set_text(TCHAR *text,rpntype type) IFACE;
  void
! result_set_text(TCHAR *text,rpntype type)
  {
  	if (type != notype)
***************
*** 272,276 ****
  	if (displayedText)
  		MemPtrFree(displayedText);
! 	displayedText = MemPtrNew(StrLen(text)+1);
  	StrCopy(displayedText,text); 
  	result_print(displayedText);
--- 272,276 ----
  	if (displayedText)
  		MemPtrFree(displayedText);
! 	displayedText = (TCHAR *) MemPtrNew(StrLen(text)+1);
  	StrCopy(displayedText,text); 
  	result_print(displayedText);
***************
*** 290,296 ****
   ***********************************************************************/
  void
! result_set_pow(char *text) IFACE;
  void
! result_set_pow(char *text)
  {
  	resultPrefs.formatType = powtext;
--- 290,296 ----
   ***********************************************************************/
  void
! result_set_pow(TCHAR *text) IFACE;
  void
! result_set_pow(TCHAR *text)
  {
  	resultPrefs.formatType = powtext;
***************
*** 298,302 ****
  	if (displayedText)
  		MemPtrFree(displayedText);
! 	displayedText = MemPtrNew(StrLen(text)+1);
  	StrCopy(displayedText,text); 
  	result_print_pow(displayedText);
--- 298,302 ----
  	if (displayedText)
  		MemPtrFree(displayedText);
! 	displayedText = (TCHAR *) MemPtrNew(StrLen(text)+1);
  	StrCopy(displayedText,text); 
  	result_print_pow(displayedText);
***************
*** 358,367 ****

  			if (resultPrefs.formatType == plaintext)
! 				result_set_text((char *)prefData+sizeof(resultPrefs),
  						resultPrefs.ansType);
  			else if (resultPrefs.formatType == powtext)
! 				result_set_pow((char *)prefData+sizeof(resultPrefs));
  			else {
! 				result_set_text((char *)prefData+sizeof(resultPrefs),
  						resultPrefs.ansType);
  				resultPrefs.formatType = fmtnumber;
--- 358,367 ----

  			if (resultPrefs.formatType == plaintext)
! 				result_set_text((TCHAR *)prefData+sizeof(resultPrefs),
  						resultPrefs.ansType);
  			else if (resultPrefs.formatType == powtext)
! 				result_set_pow((TCHAR *)prefData+sizeof(resultPrefs));
  			else {
! 				result_set_text((TCHAR *)prefData+sizeof(resultPrefs),
  						resultPrefs.ansType);
  				resultPrefs.formatType = fmtnumber;
***************
*** 399,403 ****
  	data = MemPtrNew(sizeof(resultPrefs)+StrLen(displayedText)+1);
  	*(TresultPrefs *)data = resultPrefs;
! 	StrCopy((char *)data+sizeof(resultPrefs),displayedText);

  	PrefSetAppPreferences(APP_ID,PREF_RESULT,PREF_RES_VERSION,
--- 399,403 ----
  	data = MemPtrNew(sizeof(resultPrefs)+StrLen(displayedText)+1);
  	*(TresultPrefs *)data = resultPrefs;
! 	StrCopy((TCHAR *)data+sizeof(resultPrefs),displayedText);

  	PrefSetAppPreferences(APP_ID,PREF_RESULT,PREF_RES_VERSION,
***************
*** 616,620 ****
   ***********************************************************************/
  static void
! result_print(char *text)
  {
  	Coord width,chrwidth;	
--- 616,620 ----
   ***********************************************************************/
  static void
! result_print(TCHAR *text)
  {
  	Coord width,chrwidth;	
***************
*** 663,669 ****
   ***********************************************************************/
  static void
! result_print_pow(char *text)
  {
! 	char *base,*expon;
  	Coord textwidth,width;
  	FontID oldfont;
--- 663,669 ----
   ***********************************************************************/
  static void
! result_print_pow(TCHAR *text)
  {
! 	TCHAR *base,*expon;
  	Coord textwidth,width;
  	FontID oldfont;
***************
*** 798,804 ****
   ***********************************************************************/
  static void
! result_print_num(char *text)
  {
! 	char *result;
  	Int16 spacing;
  	Int16 i,j,k;
--- 798,804 ----
   ***********************************************************************/
  static void
! result_print_num(TCHAR *text)
  {
! 	TCHAR *result;
  	Int16 spacing;
  	Int16 i,j,k;
***************
*** 870,874 ****
  result_error(CError errcode)
  {
! 	char *text;

  	text = print_error(errcode);
--- 870,874 ----
  result_error(CError errcode)
  {
! 	TCHAR *text;

  	text = print_error(errcode);

Index: result.h
===================================================================
RCS file: /cvsroot/easycalc/PPCport/result.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** result.h	26 May 2008 20:09:54 -0000	1.1
--- result.h	3 Sep 2008 20:24:52 -0000	1.2
***************
*** 26,30 ****
  #define _RESULT_H_

- #include "display.h"
  #include "skin.h"

--- 26,29 ----

Index: EasyCalcppc.rc
===================================================================
RCS file: /cvsroot/easycalc/PPCport/EasyCalcppc.rc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** EasyCalcppc.rc	26 May 2008 20:09:53 -0000	1.1
--- EasyCalcppc.rc	3 Sep 2008 20:24:52 -0000	1.2
***************
*** 95,98 ****
--- 95,121 ----
  END

+ IDD_OPT_GENERAL DIALOG  0, 0, 139, 181
+ STYLE DS_SETFONT | WS_POPUP | WS_CAPTION
+ CAPTION "General"
+ FONT 8, "System"
+ BEGIN
+     LTEXT           "General",IDC_TITLE,4,3,63,8
+     CONTROL         "Dynamic mouse",IDC_CHECK_MOUSE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,42,83,10
+ END
+ 
+ IDD_OPT_SKINS DIALOG  0, 0, 139, 181
+ STYLE DS_SETFONT | WS_POPUP | WS_CAPTION
+ CAPTION "Skins"
+ FONT 8, "System"
+ BEGIN
+     LTEXT           "Skins",IDC_TITLE,4,3,63,8
+     COMBOBOX        IDC_COMBO_SKIN1,9,40,48,30,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+     COMBOBOX        IDC_COMBO_SKIN2,9,59,48,30,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+     COMBOBOX        IDC_COMBO_SKIN3,9,78,48,30,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+     LTEXT           "Skin 1",IDC_SKIN1,62,42,39,10
+     LTEXT           "Skin 2",IDC_SKIN2,62,61,39,10
+     LTEXT           "Skin 3",IDC_SKIN3,62,80,39,10
+ END
+ 

  /////////////////////////////////////////////////////////////////////////////
***************
*** 180,220 ****

  /////////////////////////////////////////////////////////////////////////////
! // French (France) resources

! #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FRA)
  #ifdef _WIN32
! LANGUAGE LANG_FRENCH, SUBLANG_FRENCH
! #pragma code_page(1252)
  #endif //_WIN32

  /////////////////////////////////////////////////////////////////////////////
  //
! // Dialog
  //

! IDD_OPT_GENERAL DIALOG  0, 0, 139, 181
! STYLE DS_SETFONT | WS_POPUP | WS_CAPTION
! CAPTION "General"
! FONT 8, "System"
  BEGIN
!     LTEXT           "General",IDC_TITLE,4,3,63,8
!     CONTROL         "Dynamic mouse",IDC_CHECK_MOUSE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,42,83,10
  END

! IDD_OPT_SKINS DIALOG  0, 0, 139, 181
! STYLE DS_SETFONT | WS_POPUP | WS_CAPTION
! CAPTION "Skins"
! FONT 8, "System"
  BEGIN
!     LTEXT           "Skins",IDC_TITLE,4,3,63,8
!     COMBOBOX        IDC_COMBO_SKIN1,9,40,48,30,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP
!     COMBOBOX        IDC_COMBO_SKIN2,9,59,48,30,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP
!     COMBOBOX        IDC_COMBO_SKIN3,9,78,48,30,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP
!     LTEXT           "Skin 1",IDC_SKIN1,62,42,39,10
!     LTEXT           "Skin 2",IDC_SKIN2,62,61,39,10
!     LTEXT           "Skin 3",IDC_SKIN3,62,80,39,10
  END

! #endif    // French (France) resources
  /////////////////////////////////////////////////////////////////////////////

--- 203,233 ----

  /////////////////////////////////////////////////////////////////////////////
! // Farsi resources

! #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FAR)
  #ifdef _WIN32
! LANGUAGE LANG_FARSI, SUBLANG_DEFAULT
! #pragma code_page(1256)
  #endif //_WIN32

  /////////////////////////////////////////////////////////////////////////////
  //
! // String Table
  //

! STRINGTABLE 
  BEGIN
!     IDS_APP_TITLE           "EasyCalc"
!     IDC_EASYCALC            "EASYCALC"
  END

! STRINGTABLE 
  BEGIN
!     IDS_FILE                "Fichier"
!     IDS_HELP                "Aide"
!     IDS_EDIT                "Editer"
  END

! #endif    // Farsi resources
  /////////////////////////////////////////////////////////////////////////////