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_1'.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/tags/WX_2_4_1@21086 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Bryan Petty
2003-06-12 22:55:41 +00:00
parent 00fd036c18
commit c44e198b19
2863 changed files with 236967 additions and 114090 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
contrib/src/ogl/basic2.cpp
View File

@@ -30,12 +30,6 @@
#undef new
#endif
#if wxUSE_IOSTREAMH
#include <iostream.h>
#else
#include <iostream>
#endif
#include <stdio.h>
#include <ctype.h>
#include <math.h>
@@ -581,7 +575,7 @@ void wxPolygonShape::ResetControlPoints()
}
#ifdef PROLOGIO
#if wxUSE_PROLOGIO
void wxPolygonShape::WriteAttributes(wxExpr *clause)
{
wxShape::WriteAttributes(clause);
@@ -940,7 +934,7 @@ bool wxRectangleShape::GetPerimeterPoint(double x1, double y1,
return TRUE;
}
#ifdef PROLOGIO
#if wxUSE_PROLOGIO
void wxRectangleShape::WriteAttributes(wxExpr *clause)
{
wxShape::WriteAttributes(clause);
@@ -1013,7 +1007,7 @@ void wxTextShape::Copy(wxShape& copy)
wxRectangleShape::Copy(copy);
}
#ifdef PROLOGIO
#if wxUSE_PROLOGIO
void wxTextShape::WriteAttributes(wxExpr *clause)
{
wxRectangleShape::WriteAttributes(clause);
@@ -1080,7 +1074,7 @@ void wxEllipseShape::SetSize(double x, double y, bool recursive)
SetDefaultRegionSize();
}
#ifdef PROLOGIO
#if wxUSE_PROLOGIO
void wxEllipseShape::WriteAttributes(wxExpr *clause)
{
wxShape::WriteAttributes(clause);
@@ -1761,7 +1755,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxShapeRegion, wxObject)
wxShapeRegion::wxShapeRegion()
{
m_regionText = "";
m_regionText = wxEmptyString;
m_font = g_oglNormalFont;
m_minHeight = 5.0;
m_minWidth = 5.0;
@@ -1773,9 +1767,9 @@ wxShapeRegion::wxShapeRegion()
m_regionProportionX = -1.0;
m_regionProportionY = -1.0;
m_formatMode = FORMAT_CENTRE_HORIZ | FORMAT_CENTRE_VERT;
m_regionName = "";
m_textColour = "BLACK";
m_penColour = "BLACK";
m_regionName = wxEmptyString;
m_textColour = wxT("BLACK");
m_penColour = wxT("BLACK");
m_penStyle = wxSOLID;
m_actualColourObject = NULL;
m_actualPenObject = NULL;
@@ -1897,7 +1891,7 @@ wxPen *wxShapeRegion::GetActualPen()
return m_actualPenObject;
if (!m_penColour) return NULL;
if (m_penColour == "Invisible")
if (m_penColour == wxT("Invisible"))
return NULL;
m_actualPenObject = wxThePenList->FindOrCreatePen(m_penColour, 1, m_penStyle);
return m_actualPenObject;