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

This commit was manufactured by cvs2svn to create tag 'WX_2_4_0'.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/tags/WX_2_4_0@18627 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Bryan Petty
2003-01-07 20:00:45 +00:00
parent 00fd036c18
commit 0416ad24a3
1646 changed files with 88418 additions and 56901 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
contrib/src/ogl/misc.cpp
View File

@@ -32,11 +32,6 @@
#undef new
#endif
#if wxUSE_IOSTREAMH
#include <iostream.h>
#else
#include <iostream>
#endif
#include <ctype.h>
#include <math.h>
#include <stdlib.h>
@@ -423,7 +418,7 @@ wxStringList *oglFormatText(wxDC& dc, const wxString& text, double width, double
{
wxString oldBuffer(buffer);
char *s = (char *)node->Data();
wxChar *s = (wxChar *)node->Data();
if (!s)
{
// FORCE NEW LINE
@@ -435,7 +430,7 @@ wxStringList *oglFormatText(wxDC& dc, const wxString& text, double width, double
else
{
if (buffer.Length() != 0)
buffer += " ";
buffer += wxT(" ");
buffer += s;
dc.GetTextExtent(buffer, &x, &y);
@@ -782,7 +777,7 @@ void UpdateListBox(wxListBox *item, wxList *list)
wxNode *node = list->First();
while (node)
{
char *s = (char *)node->Data();
wxChar *s = (wxChar *)node->Data();
item->Append(s);
node = node->Next();
}