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

Removed references to DEBUG and WXDEBUG; cured Motif font problem; removed

Browse Source 
some warnings in OGL; fixed bug in wxChoice


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@974 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
1998-11-09 11:57:05 +00:00
parent 605c9c8318
commit ea57084d10
47 changed files with 205 additions and 321 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
utils/ogl/src/basic.cpp
View File

@@ -297,11 +297,11 @@ wxShape::wxShape(wxShapeCanvas *can)
m_parent = NULL;
m_formatMode = FORMAT_CENTRE_HORIZ | FORMAT_CENTRE_VERT;
m_shadowMode = SHADOW_NONE;
m_shadowOffsetX = 6.0;
m_shadowOffsetY = 6.0;
m_shadowOffsetX = 6;
m_shadowOffsetY = 6;
m_shadowBrush = wxBLACK_BRUSH;
m_textMarginX = 5.0;
m_textMarginY = 5.0;
m_textMarginX = 5;
m_textMarginY = 5;
m_regionName = "0";
m_centreResize = TRUE;
m_maintainAspectRatio = FALSE;
@@ -1907,8 +1907,8 @@ void wxShape::ReadAttributes(wxExpr *clause)
else if (string_expr->Type() == wxExprList)
{
wxExpr *first = string_expr->value.first;
wxExpr *second = first ? first->next : NULL;
wxExpr *third = second ? second->next : NULL;
wxExpr *second = first ? first->next : (wxExpr*) NULL;
wxExpr *third = second ? second->next : (wxExpr*) NULL;
if (first && second && third &&
(first->Type() == wxExprReal || first->Type() == wxExprInteger) &&
@@ -2076,7 +2076,7 @@ void wxShape::ReadRegions(wxExpr *clause)
m_formatted = TRUE; // Assume text is formatted unless we prove otherwise
while (regionExpr = clause->AttributeValue(regionNameBuf))
while ((regionExpr = clause->AttributeValue(regionNameBuf)))
{
/*
* Get the region information
@@ -2200,8 +2200,8 @@ void wxShape::ReadRegions(wxExpr *clause)
else if (string_expr->Type() == wxExprList)
{
wxExpr *first = string_expr->value.first;
wxExpr *second = first ? first->next : NULL;
wxExpr *third = second ? second->next : NULL;
wxExpr *second = first ? first->next : (wxExpr*) NULL;
wxExpr *third = second ? second->next : (wxExpr*) NULL;
if (first && second && third &&
(first->Type() == wxExprReal || first->Type() == wxExprInteger) &&