[sword-svn] r99 - in trunk/src: gui simplegui
dtrotzjr at www.crosswire.org
dtrotzjr at www.crosswire.org
Sun Mar 16 11:24:38 MST 2008
Author: dtrotzjr
Date: 2008-03-16 11:24:37 -0700 (Sun, 16 Mar 2008)
New Revision: 99
Added:
trunk/src/gui/WCString.cpp
trunk/src/gui/WCString.h
Modified:
trunk/src/gui/TextControl.cpp
trunk/src/gui/gui.vcp
trunk/src/simplegui/simplegui.vcp
Log:
Added a new WCString class. This now appears to be fully working.
-- dctrotz
Modified: trunk/src/gui/TextControl.cpp
===================================================================
--- trunk/src/gui/TextControl.cpp 2008-03-16 05:27:55 UTC (rev 98)
+++ trunk/src/gui/TextControl.cpp 2008-03-16 18:24:37 UTC (rev 99)
@@ -113,7 +113,7 @@
if(!preview && !primed && buffer.length() > 1500){
clearHtml(htmlPrimed);
- addHtml(htmlPrimed,buffer.c_str());
+ addHtml(htmlPrimed,buffer.w_str());
addHtml(htmlPrimed, L"</body></html>");
endHtml(htmlPrimed);
ShowWindow(htmlPrimed,SW_SHOW);
@@ -126,10 +126,10 @@
void TextControl::endOfText() {
if(preview){
- addHtml(htmlPrimed,buffer.c_str());
+ addHtml(htmlPrimed,buffer.w_str());
endHtml(htmlPrimed);
}else{
- addHtml(htmlFull,buffer.c_str());
+ addHtml(htmlFull,buffer.w_str());
endHtml(htmlFull);
ShowWindow(htmlPrimed,SW_HIDE);
ShowWindow(htmlFull,SW_SHOW);
Added: trunk/src/gui/WCString.cpp
===================================================================
--- trunk/src/gui/WCString.cpp (rev 0)
+++ trunk/src/gui/WCString.cpp 2008-03-16 18:24:37 UTC (rev 99)
@@ -0,0 +1,236 @@
+#include "WCString.h"
+#include <string.h>
+
+WCString::WCString(void)
+: char_copy(NULL)
+{
+
+}
+
+WCString::~WCString(void)
+{
+ if(char_copy)
+ delete [] char_copy;
+}
+
+WCString::WCString(const char * rhs)
+: char_copy(NULL)
+{
+ unsigned int len = strlen(rhs);
+ unsigned int i = 0;
+ if(data.size() < len)
+ data.resize(len);
+
+ for(i = 0; i < len; i++){
+ data[i] = (wchar_t)rhs[i];
+ }
+}
+
+WCString::WCString(const WCString &rhs)
+: data(rhs.data)
+, char_copy(NULL)
+{
+
+}
+
+WCString::WCString(const wchar_t * rhs)
+: char_copy(NULL)
+{
+ unsigned int len = 0;
+ unsigned int i = 0;
+
+ // This is so dangerous...
+ while(rhs[len]) len++;
+
+ if(data.size() < len)
+ data.resize(len);
+
+ for(i = 0; i < len; i++){
+ data[i] = rhs[i];
+ }
+}
+
+WCString::WCString(const std::string &rhs)
+: char_copy(NULL)
+{
+ unsigned int len = rhs.length();
+ unsigned int i = 0;
+ if(data.size() < len)
+ data.resize(len);
+
+ for(i = 0; i < len; i++){
+ data[i] = (wchar_t)rhs[i];
+ }
+}
+
+std::string WCString::to_string()
+{
+ unsigned int i = 0;
+ std::string retval;
+ retval.resize(data.length());
+ for(i = 0; i < data.length(); i++)
+ retval[i] = (char)data[i];
+ retval[i] = 0;
+ return retval;
+}
+
+WCString &WCString::operator=(const WCString &rhs)
+{
+ if(this != &rhs)
+ data = rhs.data;
+
+ return *this;
+}
+
+const wchar_t *WCString::w_str() const
+{
+ return data.c_str();
+}
+
+const char *WCString::c_str() const
+{
+ unsigned int i = 0;
+ if(char_copy)
+ delete [] char_copy;
+ char_copy = new char[data.length() + 1];
+ for(i = 0; i < data.length(); i++)
+ char_copy[i] = (char)data[i];
+ char_copy[i] = 0;
+
+ return char_copy;
+}
+WCString &WCString::operator=(const std::string &rhs)
+{
+ unsigned int i = 0;
+ if(rhs.length() > data.size())
+ data.resize(rhs.length());
+ for(i = 0; i < rhs.length(); i++)
+ data[i] = (wchar_t)rhs[i];
+
+ return *this;
+}
+
+WCString &WCString::operator=(const wchar_t *rhs)
+{
+ unsigned int i = 0;
+ unsigned int len = 0;
+ // This is so dangerous...
+ while(rhs[len]) len++;
+
+ if(len > data.size())
+ data.resize(len);
+ for(i = 0; i < len; i++)
+ data[i] = rhs[i];
+
+ return *this;
+}
+
+WCString &WCString::operator=(const char *rhs)
+{
+ unsigned int i = 0;
+ unsigned int len = 0;
+ // This is so dangerous...
+ while(rhs[len]) len++;
+
+ if(len > data.size())
+ data.resize(len);
+ for(i = 0; i < len; i++)
+ data[i] = (wchar_t)rhs[i];
+
+ return *this;
+}
+
+WCString &WCString::operator+=(const WCString &rhs)
+{
+ unsigned int i = 0;
+ unsigned int di = data.length();
+ unsigned int ri = rhs.length();
+
+ if(this == &rhs)
+ return *this;
+ if(data.size() < rhs.length() + di)
+ data.resize(rhs.length() + di);
+
+ for(i = 0; i < rhs.length(); i++){
+ data[di + i] = rhs.data[i];
+ }
+
+ return *this;
+}
+
+WCString &WCString::operator+=(const std::string &rhs)
+{
+ unsigned int i = 0;
+ unsigned int di = data.length();
+ if(rhs.length() + di > data.size())
+ data.resize(rhs.length() + di);
+ for(i = 0; i < rhs.length(); i++)
+ data[di + i] = (wchar_t)rhs[i];
+ return *this;
+}
+
+WCString &WCString::operator+=(const wchar_t *rhs)
+{
+ unsigned int i = 0;
+ unsigned int len = 0;
+ unsigned int di = data.length();
+ // This is so dangerous...
+ while(rhs[len]) len++;
+
+ if(len + di > data.size())
+ data.resize(len + di);
+ for(i = 0; i < len; i++)
+ data[di + i] = rhs[i];
+ //data[di + i] = 0;
+ return *this;
+}
+
+WCString &WCString::operator+=(const char *rhs)
+{
+ unsigned int i = 0;
+ unsigned int len = 0;
+ unsigned int di = data.length();
+
+ // This is so dangerous...
+ while(rhs[len]) len++;
+
+ if(len + di > data.size())
+ data.resize(len + di);
+ for(i = 0; i < len; i++)
+ data[di + i] = (wchar_t)rhs[i];
+
+ return *this;
+}
+
+
+WCString WCString::operator+(const WCString &rhs)
+{
+ WCString retval = *this;
+ retval += rhs;
+
+ return retval;
+}
+
+WCString WCString::operator+(const std::string &rhs)
+{
+ WCString retval = *this;
+ retval += rhs;
+
+ return retval;
+}
+
+WCString WCString::operator+(const wchar_t *rhs)
+{
+ WCString retval = *this;
+ retval += rhs;
+
+ return retval;
+}
+
+WCString WCString::operator+(const char *rhs)
+{
+ WCString retval = *this;
+ retval += rhs;
+
+ return retval;
+}
\ No newline at end of file
Added: trunk/src/gui/WCString.h
===================================================================
--- trunk/src/gui/WCString.h (rev 0)
+++ trunk/src/gui/WCString.h 2008-03-16 18:24:37 UTC (rev 99)
@@ -0,0 +1,42 @@
+#pragma once
+
+#include <string>
+
+class WCString
+{
+public:
+ WCString(void);
+ WCString(const char *rhs);
+ WCString(const wchar_t *rhs);
+ WCString(const std::string &rhs);
+ WCString(const WCString &rhs);
+
+ ~WCString(void);
+
+ std::string to_string();
+ const wchar_t *w_str() const;
+ const char *c_str() const;
+
+ unsigned int length() const
+ { return data.length(); }
+ void clear() { data.clear(); }
+
+ WCString &operator=(const WCString &rhs);
+ WCString &operator=(const std::string &rhs);
+ WCString &operator=(const wchar_t *rhs);
+ WCString &operator=(const char *rhs);
+
+ WCString &operator+=(const WCString &rhs);
+ WCString &operator+=(const std::string &rhs);
+ WCString &operator+=(const wchar_t *rhs);
+ WCString &operator+=(const char *rhs);
+
+ WCString operator+(const WCString &rhs);
+ WCString operator+(const std::string &rhs);
+ WCString operator+(const wchar_t *rhs);
+ WCString operator+(const char *rhs);
+
+protected:
+ std::basic_string<wchar_t> data;
+ mutable char *char_copy;
+};
Modified: trunk/src/gui/gui.vcp
===================================================================
--- trunk/src/gui/gui.vcp 2008-03-16 05:27:55 UTC (rev 98)
+++ trunk/src/gui/gui.vcp 2008-03-16 18:24:37 UTC (rev 99)
@@ -95,7 +95,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 commctrl.lib coredll.lib aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-# ADD LINK32 ..\Dll1\ARMDbg\sword.lib htmlview.lib oleaut32.lib commctrl.lib coredll.lib aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\STL_eVC" /libpath:"C:\IpaqProgs\SwordReader\src\STL_eVC\\" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
+# ADD LINK32 ..\Dll1\ARMDbg\sword.lib htmlview.lib oleaut32.lib commctrl.lib coredll.lib aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\STL_eVC" /libpath:"C:\IpaqProgs\SwordReader\src\STL_eVC\\" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
!ELSEIF "$(CFG)" == "gui - Win32 (WCE x86) Release"
@@ -185,9 +185,11 @@
"..\..\..\sword\include\swbuf.h"\
".\ApplicationInterface.h"\
".\Utils.h"\
- {$(INCLUDE)}"aygshell.h"\
- {$(INCLUDE)}"sipapi.h"\
+NODEP_CPP_APPLI=\
+ ".\ipapi.h"\
+ ".\ygshell.h"\
+
!ELSEIF "$(CFG)" == "gui - Win32 (WCE ARM) Debug"
@@ -196,9 +198,11 @@
"..\..\..\sword\include\swbuf.h"\
".\ApplicationInterface.h"\
".\Utils.h"\
- {$(INCLUDE)}"aygshell.h"\
- {$(INCLUDE)}"sipapi.h"\
+NODEP_CPP_APPLI=\
+ ".\ipapi.h"\
+ ".\ygshell.h"\
+
!ELSEIF "$(CFG)" == "gui - Win32 (WCE x86) Release"
@@ -207,9 +211,11 @@
"..\..\..\sword\include\swbuf.h"\
".\ApplicationInterface.h"\
".\Utils.h"\
- {$(INCLUDE)}"aygshell.h"\
- {$(INCLUDE)}"sipapi.h"\
+NODEP_CPP_APPLI=\
+ ".\ipapi.h"\
+ ".\ygshell.h"\
+
!ELSEIF "$(CFG)" == "gui - Win32 (WCE x86) Debug"
@@ -218,9 +224,11 @@
"..\..\..\sword\include\swbuf.h"\
".\ApplicationInterface.h"\
".\Utils.h"\
- {$(INCLUDE)}"aygshell.h"\
- {$(INCLUDE)}"sipapi.h"\
+NODEP_CPP_APPLI=\
+ ".\ipapi.h"\
+ ".\ygshell.h"\
+
!ENDIF
@@ -262,10 +270,12 @@
".\SimpleNavigator.h"\
".\SwordIndex.h"\
".\Utils.h"\
- {$(INCLUDE)}"aygshell.h"\
- {$(INCLUDE)}"htmlctrl.h"\
- {$(INCLUDE)}"sipapi.h"\
+NODEP_CPP_MAIN_=\
+ ".\ipapi.h"\
+ ".\tmlctrl.h"\
+ ".\ygshell.h"\
+
!ELSEIF "$(CFG)" == "gui - Win32 (WCE ARM) Debug"
@@ -300,10 +310,12 @@
".\SimpleNavigator.h"\
".\SwordIndex.h"\
".\Utils.h"\
- {$(INCLUDE)}"aygshell.h"\
- {$(INCLUDE)}"htmlctrl.h"\
- {$(INCLUDE)}"sipapi.h"\
+NODEP_CPP_MAIN_=\
+ ".\ipapi.h"\
+ ".\tmlctrl.h"\
+ ".\ygshell.h"\
+
!ELSEIF "$(CFG)" == "gui - Win32 (WCE x86) Release"
@@ -338,10 +350,12 @@
".\SimpleNavigator.h"\
".\SwordIndex.h"\
".\Utils.h"\
- {$(INCLUDE)}"aygshell.h"\
- {$(INCLUDE)}"htmlctrl.h"\
- {$(INCLUDE)}"sipapi.h"\
+NODEP_CPP_MAIN_=\
+ ".\ipapi.h"\
+ ".\tmlctrl.h"\
+ ".\ygshell.h"\
+
!ELSEIF "$(CFG)" == "gui - Win32 (WCE x86) Debug"
@@ -376,10 +390,12 @@
".\SimpleNavigator.h"\
".\SwordIndex.h"\
".\Utils.h"\
- {$(INCLUDE)}"aygshell.h"\
- {$(INCLUDE)}"htmlctrl.h"\
- {$(INCLUDE)}"sipapi.h"\
+NODEP_CPP_MAIN_=\
+ ".\ipapi.h"\
+ ".\tmlctrl.h"\
+ ".\ygshell.h"\
+
!ENDIF
@@ -710,9 +726,11 @@
".\SwordIndex.h"\
".\TextControl.h"\
".\Utils.h"\
- {$(INCLUDE)}"aygshell.h"\
- {$(INCLUDE)}"sipapi.h"\
+NODEP_CPP_NAVFI=\
+ ".\ipapi.h"\
+ ".\ygshell.h"\
+
!ELSEIF "$(CFG)" == "gui - Win32 (WCE ARM) Debug"
@@ -746,9 +764,11 @@
".\SwordIndex.h"\
".\TextControl.h"\
".\Utils.h"\
- {$(INCLUDE)}"aygshell.h"\
- {$(INCLUDE)}"sipapi.h"\
+NODEP_CPP_NAVFI=\
+ ".\ipapi.h"\
+ ".\ygshell.h"\
+
!ELSEIF "$(CFG)" == "gui - Win32 (WCE x86) Release"
@@ -782,9 +802,11 @@
".\SwordIndex.h"\
".\TextControl.h"\
".\Utils.h"\
- {$(INCLUDE)}"aygshell.h"\
- {$(INCLUDE)}"sipapi.h"\
+NODEP_CPP_NAVFI=\
+ ".\ipapi.h"\
+ ".\ygshell.h"\
+
!ELSEIF "$(CFG)" == "gui - Win32 (WCE x86) Debug"
@@ -818,9 +840,11 @@
".\SwordIndex.h"\
".\TextControl.h"\
".\Utils.h"\
- {$(INCLUDE)}"aygshell.h"\
- {$(INCLUDE)}"sipapi.h"\
+NODEP_CPP_NAVFI=\
+ ".\ipapi.h"\
+ ".\ygshell.h"\
+
!ENDIF
@@ -1141,9 +1165,11 @@
".\TextControl.h"\
".\Utils.h"\
".\VerseTextControl.h"\
- {$(INCLUDE)}"aygshell.h"\
- {$(INCLUDE)}"sipapi.h"\
+NODEP_CPP_NAVRE=\
+ ".\ipapi.h"\
+ ".\ygshell.h"\
+
!ELSEIF "$(CFG)" == "gui - Win32 (WCE ARM) Debug"
@@ -1179,9 +1205,11 @@
".\TextControl.h"\
".\Utils.h"\
".\VerseTextControl.h"\
- {$(INCLUDE)}"aygshell.h"\
- {$(INCLUDE)}"sipapi.h"\
+NODEP_CPP_NAVRE=\
+ ".\ipapi.h"\
+ ".\ygshell.h"\
+
!ELSEIF "$(CFG)" == "gui - Win32 (WCE x86) Release"
@@ -1217,9 +1245,11 @@
".\TextControl.h"\
".\Utils.h"\
".\VerseTextControl.h"\
- {$(INCLUDE)}"aygshell.h"\
- {$(INCLUDE)}"sipapi.h"\
+NODEP_CPP_NAVRE=\
+ ".\ipapi.h"\
+ ".\ygshell.h"\
+
!ELSEIF "$(CFG)" == "gui - Win32 (WCE x86) Debug"
@@ -1255,9 +1285,11 @@
".\TextControl.h"\
".\Utils.h"\
".\VerseTextControl.h"\
- {$(INCLUDE)}"aygshell.h"\
- {$(INCLUDE)}"sipapi.h"\
+NODEP_CPP_NAVRE=\
+ ".\ipapi.h"\
+ ".\ygshell.h"\
+
!ENDIF
@@ -1752,8 +1784,10 @@
".\ApplicationInterface.h"\
".\TextControl.h"\
".\Utils.h"\
- {$(INCLUDE)}"htmlctrl.h"\
+NODEP_CPP_TEXTC=\
+ ".\tmlctrl.h"\
+
!ELSEIF "$(CFG)" == "gui - Win32 (WCE ARM) Debug"
@@ -1764,8 +1798,10 @@
".\ApplicationInterface.h"\
".\TextControl.h"\
".\Utils.h"\
- {$(INCLUDE)}"htmlctrl.h"\
+NODEP_CPP_TEXTC=\
+ ".\tmlctrl.h"\
+
!ELSEIF "$(CFG)" == "gui - Win32 (WCE x86) Release"
@@ -1776,8 +1812,10 @@
".\ApplicationInterface.h"\
".\TextControl.h"\
".\Utils.h"\
- {$(INCLUDE)}"htmlctrl.h"\
+NODEP_CPP_TEXTC=\
+ ".\tmlctrl.h"\
+
!ELSEIF "$(CFG)" == "gui - Win32 (WCE x86) Debug"
@@ -1788,8 +1826,10 @@
".\ApplicationInterface.h"\
".\TextControl.h"\
".\Utils.h"\
- {$(INCLUDE)}"htmlctrl.h"\
+NODEP_CPP_TEXTC=\
+ ".\tmlctrl.h"\
+
!ENDIF
@@ -1851,8 +1891,10 @@
".\TextControl.h"\
".\Utils.h"\
".\VerseTextControl.h"\
- {$(INCLUDE)}"htmlctrl.h"\
+NODEP_CPP_VERSE=\
+ ".\tmlctrl.h"\
+
!ELSEIF "$(CFG)" == "gui - Win32 (WCE ARM) Debug"
@@ -1864,8 +1906,10 @@
".\TextControl.h"\
".\Utils.h"\
".\VerseTextControl.h"\
- {$(INCLUDE)}"htmlctrl.h"\
+NODEP_CPP_VERSE=\
+ ".\tmlctrl.h"\
+
!ELSEIF "$(CFG)" == "gui - Win32 (WCE x86) Release"
@@ -1877,8 +1921,10 @@
".\TextControl.h"\
".\Utils.h"\
".\VerseTextControl.h"\
- {$(INCLUDE)}"htmlctrl.h"\
+NODEP_CPP_VERSE=\
+ ".\tmlctrl.h"\
+
!ELSEIF "$(CFG)" == "gui - Win32 (WCE x86) Debug"
@@ -1890,12 +1936,45 @@
".\TextControl.h"\
".\Utils.h"\
".\VerseTextControl.h"\
- {$(INCLUDE)}"htmlctrl.h"\
+NODEP_CPP_VERSE=\
+ ".\tmlctrl.h"\
+
!ENDIF
# End Source File
+# Begin Source File
+
+SOURCE=.\WCString.cpp
+
+!IF "$(CFG)" == "gui - Win32 (WCE ARM) Release"
+
+DEP_CPP_WCSTR=\
+ ".\WCString.h"\
+
+
+!ELSEIF "$(CFG)" == "gui - Win32 (WCE ARM) Debug"
+
+DEP_CPP_WCSTR=\
+ ".\WCString.h"\
+
+
+!ELSEIF "$(CFG)" == "gui - Win32 (WCE x86) Release"
+
+DEP_CPP_WCSTR=\
+ ".\WCString.h"\
+
+
+!ELSEIF "$(CFG)" == "gui - Win32 (WCE x86) Debug"
+
+DEP_CPP_WCSTR=\
+ ".\WCString.h"\
+
+
+!ENDIF
+
+# End Source File
# End Group
# Begin Group "Header Files"
@@ -1956,6 +2035,10 @@
SOURCE=.\VerseTextControl.h
# End Source File
+# Begin Source File
+
+SOURCE=.\WCString.h
+# End Source File
# End Group
# Begin Group "Resource Files"
Modified: trunk/src/simplegui/simplegui.vcp
===================================================================
--- trunk/src/simplegui/simplegui.vcp 2008-03-16 05:27:55 UTC (rev 98)
+++ trunk/src/simplegui/simplegui.vcp 2008-03-16 18:24:37 UTC (rev 99)
@@ -186,6 +186,7 @@
"..\..\..\sword\include\swbuf.h"\
"..\gui\ApplicationInterface.h"\
"..\gui\Utils.h"\
+ "..\gui\WCString.h"\
{$(INCLUDE)}"aygshell.h"\
{$(INCLUDE)}"sipapi.h"\
@@ -197,9 +198,11 @@
"..\..\..\sword\include\swbuf.h"\
"..\gui\ApplicationInterface.h"\
"..\gui\Utils.h"\
- {$(INCLUDE)}"aygshell.h"\
- {$(INCLUDE)}"sipapi.h"\
+NODEP_CPP_APPLI=\
+ ".\ipapi.h"\
+ ".\ygshell.h"\
+
!ELSEIF "$(CFG)" == "simplegui - Win32 (WCE x86) Release"
@@ -208,9 +211,11 @@
"..\..\..\sword\include\swbuf.h"\
"..\gui\ApplicationInterface.h"\
"..\gui\Utils.h"\
- {$(INCLUDE)}"aygshell.h"\
- {$(INCLUDE)}"sipapi.h"\
+NODEP_CPP_APPLI=\
+ ".\ipapi.h"\
+ ".\ygshell.h"\
+
!ELSEIF "$(CFG)" == "simplegui - Win32 (WCE x86) Debug"
@@ -219,9 +224,11 @@
"..\..\..\sword\include\swbuf.h"\
"..\gui\ApplicationInterface.h"\
"..\gui\Utils.h"\
- {$(INCLUDE)}"aygshell.h"\
- {$(INCLUDE)}"sipapi.h"\
+NODEP_CPP_APPLI=\
+ ".\ipapi.h"\
+ ".\ygshell.h"\
+
!ENDIF
@@ -263,6 +270,7 @@
"..\gui\SimpleNavigator.h"\
"..\gui\SwordIndex.h"\
"..\gui\Utils.h"\
+ "..\gui\WCString.h"\
{$(INCLUDE)}"aygshell.h"\
{$(INCLUDE)}"htmlctrl.h"\
{$(INCLUDE)}"sipapi.h"\
@@ -301,10 +309,12 @@
"..\gui\SimpleNavigator.h"\
"..\gui\SwordIndex.h"\
"..\gui\Utils.h"\
- {$(INCLUDE)}"aygshell.h"\
- {$(INCLUDE)}"htmlctrl.h"\
- {$(INCLUDE)}"sipapi.h"\
+NODEP_CPP_MAIN_=\
+ ".\ipapi.h"\
+ ".\tmlctrl.h"\
+ ".\ygshell.h"\
+
!ELSEIF "$(CFG)" == "simplegui - Win32 (WCE x86) Release"
@@ -339,10 +349,12 @@
"..\gui\SimpleNavigator.h"\
"..\gui\SwordIndex.h"\
"..\gui\Utils.h"\
- {$(INCLUDE)}"aygshell.h"\
- {$(INCLUDE)}"htmlctrl.h"\
- {$(INCLUDE)}"sipapi.h"\
+NODEP_CPP_MAIN_=\
+ ".\ipapi.h"\
+ ".\tmlctrl.h"\
+ ".\ygshell.h"\
+
!ELSEIF "$(CFG)" == "simplegui - Win32 (WCE x86) Debug"
@@ -377,10 +389,12 @@
"..\gui\SimpleNavigator.h"\
"..\gui\SwordIndex.h"\
"..\gui\Utils.h"\
- {$(INCLUDE)}"aygshell.h"\
- {$(INCLUDE)}"htmlctrl.h"\
- {$(INCLUDE)}"sipapi.h"\
+NODEP_CPP_MAIN_=\
+ ".\ipapi.h"\
+ ".\tmlctrl.h"\
+ ".\ygshell.h"\
+
!ENDIF
@@ -420,6 +434,7 @@
"..\gui\SimpleNavigator.h"\
"..\gui\SwordIndex.h"\
"..\gui\Utils.h"\
+ "..\gui\WCString.h"\
!ELSEIF "$(CFG)" == "simplegui - Win32 (WCE ARM) Debug"
@@ -562,6 +577,7 @@
"..\gui\SwordIndex.h"\
"..\gui\TextControl.h"\
"..\gui\Utils.h"\
+ "..\gui\WCString.h"\
!ELSEIF "$(CFG)" == "simplegui - Win32 (WCE ARM) Debug"
@@ -711,6 +727,7 @@
"..\gui\SwordIndex.h"\
"..\gui\TextControl.h"\
"..\gui\Utils.h"\
+ "..\gui\WCString.h"\
{$(INCLUDE)}"aygshell.h"\
{$(INCLUDE)}"sipapi.h"\
@@ -747,9 +764,11 @@
"..\gui\SwordIndex.h"\
"..\gui\TextControl.h"\
"..\gui\Utils.h"\
- {$(INCLUDE)}"aygshell.h"\
- {$(INCLUDE)}"sipapi.h"\
+NODEP_CPP_NAVFI=\
+ ".\ipapi.h"\
+ ".\ygshell.h"\
+
!ELSEIF "$(CFG)" == "simplegui - Win32 (WCE x86) Release"
@@ -783,9 +802,11 @@
"..\gui\SwordIndex.h"\
"..\gui\TextControl.h"\
"..\gui\Utils.h"\
- {$(INCLUDE)}"aygshell.h"\
- {$(INCLUDE)}"sipapi.h"\
+NODEP_CPP_NAVFI=\
+ ".\ipapi.h"\
+ ".\ygshell.h"\
+
!ELSEIF "$(CFG)" == "simplegui - Win32 (WCE x86) Debug"
@@ -819,9 +840,11 @@
"..\gui\SwordIndex.h"\
"..\gui\TextControl.h"\
"..\gui\Utils.h"\
- {$(INCLUDE)}"aygshell.h"\
- {$(INCLUDE)}"sipapi.h"\
+NODEP_CPP_NAVFI=\
+ ".\ipapi.h"\
+ ".\ygshell.h"\
+
!ENDIF
@@ -861,6 +884,7 @@
"..\gui\SimpleNavigator.h"\
"..\gui\SwordIndex.h"\
"..\gui\Utils.h"\
+ "..\gui\WCString.h"\
!ELSEIF "$(CFG)" == "simplegui - Win32 (WCE ARM) Debug"
@@ -1003,6 +1027,7 @@
"..\gui\TextControl.h"\
"..\gui\Utils.h"\
"..\gui\VerseTextControl.h"\
+ "..\gui\WCString.h"\
{$(INCLUDE)}"aygshell.h"\
{$(INCLUDE)}"sipapi.h"\
@@ -1041,9 +1066,11 @@
"..\gui\TextControl.h"\
"..\gui\Utils.h"\
"..\gui\VerseTextControl.h"\
- {$(INCLUDE)}"aygshell.h"\
- {$(INCLUDE)}"sipapi.h"\
+NODEP_CPP_NAVRE=\
+ ".\ipapi.h"\
+ ".\ygshell.h"\
+
!ELSEIF "$(CFG)" == "simplegui - Win32 (WCE x86) Release"
@@ -1079,9 +1106,11 @@
"..\gui\TextControl.h"\
"..\gui\Utils.h"\
"..\gui\VerseTextControl.h"\
- {$(INCLUDE)}"aygshell.h"\
- {$(INCLUDE)}"sipapi.h"\
+NODEP_CPP_NAVRE=\
+ ".\ipapi.h"\
+ ".\ygshell.h"\
+
!ELSEIF "$(CFG)" == "simplegui - Win32 (WCE x86) Debug"
@@ -1117,9 +1146,11 @@
"..\gui\TextControl.h"\
"..\gui\Utils.h"\
"..\gui\VerseTextControl.h"\
- {$(INCLUDE)}"aygshell.h"\
- {$(INCLUDE)}"sipapi.h"\
+NODEP_CPP_NAVRE=\
+ ".\ipapi.h"\
+ ".\ygshell.h"\
+
!ENDIF
@@ -1162,6 +1193,7 @@
"..\gui\SwordIndex.h"\
"..\gui\TextControl.h"\
"..\gui\Utils.h"\
+ "..\gui\WCString.h"\
!ELSEIF "$(CFG)" == "simplegui - Win32 (WCE ARM) Debug"
@@ -1319,6 +1351,7 @@
"..\gui\TextControl.h"\
"..\gui\Utils.h"\
"..\gui\VerseTextControl.h"\
+ "..\gui\WCString.h"\
!ELSEIF "$(CFG)" == "simplegui - Win32 (WCE ARM) Debug"
@@ -1488,6 +1521,7 @@
"..\gui\ApplicationInterface.h"\
"..\gui\SwordIndex.h"\
"..\gui\Utils.h"\
+ "..\gui\WCString.h"\
!ELSEIF "$(CFG)" == "simplegui - Win32 (WCE ARM) Debug"
@@ -1614,6 +1648,7 @@
"..\gui\ApplicationInterface.h"\
"..\gui\TextControl.h"\
"..\gui\Utils.h"\
+ "..\gui\WCString.h"\
{$(INCLUDE)}"htmlctrl.h"\
@@ -1626,8 +1661,10 @@
"..\gui\ApplicationInterface.h"\
"..\gui\TextControl.h"\
"..\gui\Utils.h"\
- {$(INCLUDE)}"htmlctrl.h"\
+NODEP_CPP_TEXTC=\
+ ".\tmlctrl.h"\
+
!ELSEIF "$(CFG)" == "simplegui - Win32 (WCE x86) Release"
@@ -1638,8 +1675,10 @@
"..\gui\ApplicationInterface.h"\
"..\gui\TextControl.h"\
"..\gui\Utils.h"\
- {$(INCLUDE)}"htmlctrl.h"\
+NODEP_CPP_TEXTC=\
+ ".\tmlctrl.h"\
+
!ELSEIF "$(CFG)" == "simplegui - Win32 (WCE x86) Debug"
@@ -1650,8 +1689,10 @@
"..\gui\ApplicationInterface.h"\
"..\gui\TextControl.h"\
"..\gui\Utils.h"\
- {$(INCLUDE)}"htmlctrl.h"\
+NODEP_CPP_TEXTC=\
+ ".\tmlctrl.h"\
+
!ENDIF
@@ -1667,6 +1708,7 @@
"..\..\..\sword\include\swbuf.h"\
"..\gui\ApplicationInterface.h"\
"..\gui\Utils.h"\
+ "..\gui\WCString.h"\
!ELSEIF "$(CFG)" == "simplegui - Win32 (WCE ARM) Debug"
@@ -1713,6 +1755,7 @@
"..\gui\TextControl.h"\
"..\gui\Utils.h"\
"..\gui\VerseTextControl.h"\
+ "..\gui\WCString.h"\
{$(INCLUDE)}"htmlctrl.h"\
@@ -1726,8 +1769,10 @@
"..\gui\TextControl.h"\
"..\gui\Utils.h"\
"..\gui\VerseTextControl.h"\
- {$(INCLUDE)}"htmlctrl.h"\
+NODEP_CPP_VERSE=\
+ ".\tmlctrl.h"\
+
!ELSEIF "$(CFG)" == "simplegui - Win32 (WCE x86) Release"
@@ -1739,8 +1784,10 @@
"..\gui\TextControl.h"\
"..\gui\Utils.h"\
"..\gui\VerseTextControl.h"\
- {$(INCLUDE)}"htmlctrl.h"\
+NODEP_CPP_VERSE=\
+ ".\tmlctrl.h"\
+
!ELSEIF "$(CFG)" == "simplegui - Win32 (WCE x86) Debug"
@@ -1752,12 +1799,45 @@
"..\gui\TextControl.h"\
"..\gui\Utils.h"\
"..\gui\VerseTextControl.h"\
- {$(INCLUDE)}"htmlctrl.h"\
+NODEP_CPP_VERSE=\
+ ".\tmlctrl.h"\
+
!ENDIF
# End Source File
+# Begin Source File
+
+SOURCE=..\gui\WCString.cpp
+
+!IF "$(CFG)" == "simplegui - Win32 (WCE ARM) Release"
+
+DEP_CPP_WCSTR=\
+ "..\gui\WCString.h"\
+
+
+!ELSEIF "$(CFG)" == "simplegui - Win32 (WCE ARM) Debug"
+
+DEP_CPP_WCSTR=\
+ "..\gui\WCString.h"\
+
+
+!ELSEIF "$(CFG)" == "simplegui - Win32 (WCE x86) Release"
+
+DEP_CPP_WCSTR=\
+ "..\gui\WCString.h"\
+
+
+!ELSEIF "$(CFG)" == "simplegui - Win32 (WCE x86) Debug"
+
+DEP_CPP_WCSTR=\
+ "..\gui\WCString.h"\
+
+
+!ENDIF
+
+# End Source File
# End Group
# Begin Group "Header Files"
@@ -1818,6 +1898,10 @@
SOURCE=..\gui\VerseTextControl.h
# End Source File
+# Begin Source File
+
+SOURCE=..\gui\WCString.h
+# End Source File
# End Group
# Begin Group "Resource Files"
More information about the sword-cvs
mailing list