Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

latest sources from M

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@233 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Karsten Ballüder
1998-07-12 15:02:44 +00:00
parent 4414cc1db8
commit 23f641681f
7 changed files with 115 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
user/wxLayout/wxlparser.cpp
View File

@@ -15,7 +15,7 @@
#define BASE_SIZE 12
void wxLayoutImportText(wxLayoutList &list, wxString const &str)
void wxLayoutImportText(wxLayoutList &list, String const &str)
{
char * cptr = (char *)str.c_str(); // string gets changed only temporarily
const char * begin = cptr;
@@ -39,11 +39,11 @@ void wxLayoutImportText(wxLayoutList &list, wxString const &str)
}
static
wxString wxLayoutExportCmdAsHTML(wxLayoutObjectCmd const & cmd,
String wxLayoutExportCmdAsHTML(wxLayoutObjectCmd const & cmd,
wxLayoutStyleInfo **lastStylePtr)
{
static char buffer[20];
wxString html;
String html;
wxLayoutStyleInfo *si = cmd.GetStyle();
wxLayoutStyleInfo *last_si = NULL;
@@ -152,7 +152,7 @@ wxString wxLayoutExportCmdAsHTML(wxLayoutObjectCmd const & cmd,
return export;
}
wxString *str = new wxString();
String *str = new String();
// text must be concatenated
while(from != list.end() && WXLO_IS_TEXT(type))