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

More deprecated class mods

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19900 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2003-03-31 10:24:36 +00:00
parent f2638c97a5
commit 7c9955d147
103 changed files with 466 additions and 11735 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/src/deprecated/Makefile.in
View File

@@ -4,7 +4,7 @@ top_srcdir = @top_srcdir@/..
top_builddir = ../../..
libsrc_dir = contrib/src/deprecated
TARGET_LIBNAME=lib@WX_LIBRARY_BASENAME@_deprecated-@WX_RELEASE@
TARGET_LIBNAME=lib@WX_LIBRARY_BASENAME@_wxdeprecated-@WX_RELEASE@
LIBVERSION_CURRENT=@WX_CURRENT@
LIBVERSION_REVISION=@WX_REVISION@
@@ -15,7 +15,7 @@ HEADER_SUBDIR=deprecated
HEADERS=prop.h propform.h proplist.h resource.h treelay.h wxexpr.h treelay.h
OBJECTS=prop.o propform.o proplist.o wxexpr.o parser.o treelay.cpp
OBJECTS=prop.o propform.o proplist.o wxexpr.o parser.o resource.o treelay.o
DEPFILES=$(OBJECTS:.o=.d)
APPEXTRADEFS=-I$(top_srcdir)/contrib/include

2
contrib/src/deprecated/makefile.b32
View File

@@ -11,7 +11,7 @@ WXDIR = $(WXWIN)
LIBTARGET=$(WXDIR)\lib\wxdeprecated.lib
OBJECTS = prop.obj propform.obj proplist.obj y_tab.obj resource.obj treelay.obj
OBJECTS = prop.obj propform.obj proplist.obj y_tab.obj wxexpr.obj resource.obj treelay.obj
!include $(WXDIR)\src\makelib.b32

2
contrib/src/deprecated/makefile.g95
View File

@@ -10,7 +10,7 @@
WXDIR = ../../..
LIBTARGET=$(WXDIR)/lib/libwxdeprecated.a
OBJECTS = prop.o propform.o proplist.o y_tab.o resource.o treelay.o
OBJECTS = prop.o propform.o proplist.o y_tab.o wxexpr.o resource.o treelay.o
include $(WXDIR)/src/makelib.g95

2
contrib/src/deprecated/makefile.vc
View File

@@ -32,7 +32,7 @@ LIBEXT=d
LIBTARGET=$(WXDIR)\lib\wxdeprecated$(LIBEXT).lib
EXTRATARGETS=$(D)
OBJECTS=$(D)\prop.obj $(D)\propform.obj $(D)\proplist.obj $(D)\y_tab.obj $(D)\resource.obj $(D)\treelay.obj
OBJECTS=$(D)\prop.obj $(D)\propform.obj $(D)\proplist.obj $(D)\y_tab.obj $(D)\wxexpr.obj $(D)\resource.obj $(D)\treelay.obj
!include $(WXDIR)\src\makelib.vc

44
contrib/src/ogl/basic.cpp
View File

@@ -24,7 +24,7 @@
#include <wx/wx.h>
#endif
#include <wx/wxexpr.h>
#include <wx/deprecated/wxexpr.h>
#ifdef new
#undef new
@@ -2040,9 +2040,9 @@ void wxShape::ReadAttributes(wxExpr *clause)
wxExpr *pointExpr = attachmentList->GetFirst();
while (pointExpr)
{
wxExpr *idExpr = pointExpr->Item(0);
wxExpr *xExpr = pointExpr->Item(1);
wxExpr *yExpr = pointExpr->Item(2);
wxExpr *idExpr = pointExpr->Nth(0);
wxExpr *xExpr = pointExpr->Nth(1);
wxExpr *yExpr = pointExpr->Nth(2);
if (idExpr && xExpr && yExpr)
{
wxAttachmentPoint *point = new wxAttachmentPoint;
@@ -2104,24 +2104,24 @@ void wxShape::ReadRegions(wxExpr *clause)
if (regionExpr->Type() == wxExprList)
{
wxExpr *nameExpr = regionExpr->Item(0);
wxExpr *textExpr = regionExpr->Item(1);
wxExpr *xExpr = regionExpr->Item(2);
wxExpr *yExpr = regionExpr->Item(3);
wxExpr *widthExpr = regionExpr->Item(4);
wxExpr *heightExpr = regionExpr->Item(5);
wxExpr *minWidthExpr = regionExpr->Item(6);
wxExpr *minHeightExpr = regionExpr->Item(7);
wxExpr *propXExpr = regionExpr->Item(8);
wxExpr *propYExpr = regionExpr->Item(9);
wxExpr *formatExpr = regionExpr->Item(10);
wxExpr *sizeExpr = regionExpr->Item(11);
wxExpr *familyExpr = regionExpr->Item(12);
wxExpr *styleExpr = regionExpr->Item(13);
wxExpr *weightExpr = regionExpr->Item(14);
wxExpr *colourExpr = regionExpr->Item(15);
wxExpr *penColourExpr = regionExpr->Item(16);
wxExpr *penStyleExpr = regionExpr->Item(17);
wxExpr *nameExpr = regionExpr->Nth(0);
wxExpr *textExpr = regionExpr->Nth(1);
wxExpr *xExpr = regionExpr->Nth(2);
wxExpr *yExpr = regionExpr->Nth(3);
wxExpr *widthExpr = regionExpr->Nth(4);
wxExpr *heightExpr = regionExpr->Nth(5);
wxExpr *minWidthExpr = regionExpr->Nth(6);
wxExpr *minHeightExpr = regionExpr->Nth(7);
wxExpr *propXExpr = regionExpr->Nth(8);
wxExpr *propYExpr = regionExpr->Nth(9);
wxExpr *formatExpr = regionExpr->Nth(10);
wxExpr *sizeExpr = regionExpr->Nth(11);
wxExpr *familyExpr = regionExpr->Nth(12);
wxExpr *styleExpr = regionExpr->Nth(13);
wxExpr *weightExpr = regionExpr->Nth(14);
wxExpr *colourExpr = regionExpr->Nth(15);
wxExpr *penColourExpr = regionExpr->Nth(16);
wxExpr *penStyleExpr = regionExpr->Nth(17);
regionName = nameExpr->StringValue();
regionText = textExpr->StringValue();

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

@@ -24,7 +24,7 @@
#include <wx/wx.h>
#endif
#include <wx/wxexpr.h>
#include <wx/deprecated/wxexpr.h>
#ifdef new
#undef new

2
contrib/src/ogl/bmpshape.cpp
View File

@@ -24,7 +24,7 @@
#include <wx/wx.h>
#endif
#include <wx/wxexpr.h>
#include <wx/deprecated/wxexpr.h>
#include <wx/ogl/basic.h>
#include <wx/ogl/basicp.h>

2
contrib/src/ogl/canvas.cpp
View File

@@ -24,7 +24,7 @@
#include <wx/wx.h>
#endif
#include <wx/wxexpr.h>
#include <wx/deprecated/wxexpr.h>
#ifdef new
#undef new

20
contrib/src/ogl/composit.cpp
View File

@@ -24,7 +24,7 @@
#include <wx/wx.h>
#endif
#include <wx/wxexpr.h>
#include <wx/deprecated/wxexpr.h>
#include <wx/ogl/basic.h>
#include <wx/ogl/basicp.h>
@@ -706,13 +706,13 @@ void wxCompositeShape::ReadConstraints(wxExpr *clause, wxExprDatabase *database)
// Each constraint is stored in the form
// (type name id xspacing yspacing m_constrainingObjectId constrainedObjectIdList)
wxExpr *typeExpr = constraintExpr->Item(0);
wxExpr *nameExpr = constraintExpr->Item(1);
wxExpr *idExpr = constraintExpr->Item(2);
wxExpr *xExpr = constraintExpr->Item(3);
wxExpr *yExpr = constraintExpr->Item(4);
wxExpr *constrainingExpr = constraintExpr->Item(5);
wxExpr *constrainedExpr = constraintExpr->Item(6);
wxExpr *typeExpr = constraintExpr->Nth(0);
wxExpr *nameExpr = constraintExpr->Nth(1);
wxExpr *idExpr = constraintExpr->Nth(2);
wxExpr *xExpr = constraintExpr->Nth(3);
wxExpr *yExpr = constraintExpr->Nth(4);
wxExpr *constrainingExpr = constraintExpr->Nth(5);
wxExpr *constrainedExpr = constraintExpr->Nth(6);
cType = (int)typeExpr->IntegerValue();
cXSpacing = xExpr->RealValue();
@@ -727,7 +727,7 @@ void wxCompositeShape::ReadConstraints(wxExpr *clause, wxExprDatabase *database)
wxLogFatalError(wxT("Object graphics error: Couldn't find constraining image of composite."));
int i = 0;
wxExpr *currentIdExpr = constrainedExpr->Item(i);
wxExpr *currentIdExpr = constrainedExpr->Nth(i);
while (currentIdExpr)
{
long currentId = currentIdExpr->IntegerValue();
@@ -742,7 +742,7 @@ void wxCompositeShape::ReadConstraints(wxExpr *clause, wxExprDatabase *database)
}
i ++;
currentIdExpr = constrainedExpr->Item(i);
currentIdExpr = constrainedExpr->Nth(i);
}
wxOGLConstraint *newConstraint = AddConstraint(cType, m_constrainingObject, m_constrainedObjects);
newConstraint->SetSpacing(cXSpacing, cYSpacing);

2
contrib/src/ogl/constrnt.cpp
View File

@@ -24,7 +24,7 @@
#include <wx/wx.h>
#endif
#include <wx/wxexpr.h>
#include <wx/deprecated/wxexpr.h>
#include <wx/ogl/basic.h>
#include <wx/ogl/constrnt.h>

2
contrib/src/ogl/divided.cpp
View File

@@ -24,7 +24,7 @@
#include <wx/wx.h>
#endif
#include <wx/wxexpr.h>
#include <wx/deprecated/wxexpr.h>
#include <wx/ogl/basic.h>
#include <wx/ogl/basicp.h>

96
contrib/src/ogl/drawn.cpp
View File

@@ -25,7 +25,7 @@
#include <wx/wx.h>
#endif
#include <wx/wxexpr.h>
#include <wx/deprecated/wxexpr.h>
#include <wx/ogl/basic.h>
#include <wx/ogl/basicp.h>
@@ -563,20 +563,20 @@ void wxOpSetGDI::ReadExpr(wxPseudoMetaFile *image, wxExpr *expr)
case DRAWOP_SET_BRUSH:
case DRAWOP_SET_FONT:
{
m_gdiIndex = (int)expr->Item(1)->IntegerValue();
m_gdiIndex = (int)expr->Nth(1)->IntegerValue();
break;
}
case DRAWOP_SET_TEXT_COLOUR:
case DRAWOP_SET_BK_COLOUR:
{
m_r = (unsigned char)expr->Item(1)->IntegerValue();
m_g = (unsigned char)expr->Item(2)->IntegerValue();
m_b = (unsigned char)expr->Item(3)->IntegerValue();
m_r = (unsigned char)expr->Nth(1)->IntegerValue();
m_g = (unsigned char)expr->Nth(2)->IntegerValue();
m_b = (unsigned char)expr->Nth(3)->IntegerValue();
break;
}
case DRAWOP_SET_BK_MODE:
{
m_mode = (int)expr->Item(1)->IntegerValue();
m_mode = (int)expr->Nth(1)->IntegerValue();
break;
}
default:
@@ -665,10 +665,10 @@ void wxOpSetClipping::ReadExpr(wxPseudoMetaFile *image, wxExpr *expr)
{
case DRAWOP_SET_CLIPPING_RECT:
{
m_x1 = expr->Item(1)->RealValue();
m_y1 = expr->Item(2)->RealValue();
m_x2 = expr->Item(3)->RealValue();
m_y2 = expr->Item(4)->RealValue();
m_x1 = expr->Nth(1)->RealValue();
m_y1 = expr->Nth(2)->RealValue();
m_x2 = expr->Nth(3)->RealValue();
m_y2 = expr->Nth(4)->RealValue();
break;
}
default:
@@ -950,44 +950,44 @@ void wxOpDraw::ReadExpr(wxPseudoMetaFile *image, wxExpr *expr)
case DRAWOP_DRAW_RECT:
case DRAWOP_DRAW_ELLIPSE:
{
m_x1 = expr->Item(1)->RealValue();
m_y1 = expr->Item(2)->RealValue();
m_x2 = expr->Item(3)->RealValue();
m_y2 = expr->Item(4)->RealValue();
m_x1 = expr->Nth(1)->RealValue();
m_y1 = expr->Nth(2)->RealValue();
m_x2 = expr->Nth(3)->RealValue();
m_y2 = expr->Nth(4)->RealValue();
break;
}
case DRAWOP_DRAW_ROUNDED_RECT:
{
m_x1 = expr->Item(1)->RealValue();
m_y1 = expr->Item(2)->RealValue();
m_x2 = expr->Item(3)->RealValue();
m_y2 = expr->Item(4)->RealValue();
m_radius = expr->Item(5)->RealValue();
m_x1 = expr->Nth(1)->RealValue();
m_y1 = expr->Nth(2)->RealValue();
m_x2 = expr->Nth(3)->RealValue();
m_y2 = expr->Nth(4)->RealValue();
m_radius = expr->Nth(5)->RealValue();
break;
}
case DRAWOP_DRAW_POINT:
{
m_x1 = expr->Item(1)->RealValue();
m_y1 = expr->Item(2)->RealValue();
m_x1 = expr->Nth(1)->RealValue();
m_y1 = expr->Nth(2)->RealValue();
break;
}
case DRAWOP_DRAW_TEXT:
{
m_x1 = expr->Item(1)->RealValue();
m_y1 = expr->Item(2)->RealValue();
wxString str(expr->Item(3)->StringValue());
m_x1 = expr->Nth(1)->RealValue();
m_y1 = expr->Nth(2)->RealValue();
wxString str(expr->Nth(3)->StringValue());
m_textString = copystring(str);
break;
}
case DRAWOP_DRAW_ARC:
case DRAWOP_DRAW_ELLIPTIC_ARC:
{
m_x1 = expr->Item(1)->RealValue();
m_y1 = expr->Item(2)->RealValue();
m_x2 = expr->Item(3)->RealValue();
m_y2 = expr->Item(4)->RealValue();
m_x3 = expr->Item(5)->RealValue();
m_y3 = expr->Item(6)->RealValue();
m_x1 = expr->Nth(1)->RealValue();
m_y1 = expr->Nth(2)->RealValue();
m_x2 = expr->Nth(3)->RealValue();
m_y2 = expr->Nth(4)->RealValue();
m_x3 = expr->Nth(5)->RealValue();
m_y3 = expr->Nth(6)->RealValue();
break;
}
default:
@@ -1156,7 +1156,7 @@ wxExpr *wxOpPolyDraw::WriteExpr(wxPseudoMetaFile *image)
void wxOpPolyDraw::ReadExpr(wxPseudoMetaFile *image, wxExpr *expr)
{
m_noPoints = (int)expr->Item(1)->IntegerValue();
m_noPoints = (int)expr->Nth(1)->IntegerValue();
char buf1[5];
char buf2[5];
@@ -1164,7 +1164,7 @@ void wxOpPolyDraw::ReadExpr(wxPseudoMetaFile *image, wxExpr *expr)
m_points = new wxRealPoint[m_noPoints];
int i = 0;
int bufPtr = 0;
wxString hexString = expr->Item(2)->StringValue();
wxString hexString = expr->Nth(2)->StringValue();
while (i < m_noPoints)
{
buf1[0] = hexString[(size_t)bufPtr];
@@ -1621,16 +1621,16 @@ void wxPseudoMetaFile::ReadAttributes(wxExpr *clause, int whichAngle)
}
else
{
wxExpr *idExpr = expr->Item(0);
wxExpr *idExpr = expr->Nth(0);
switch (idExpr->IntegerValue())
{
case gyTYPE_PEN:
{
int penWidth = (int)expr->Item(1)->IntegerValue();
int penStyle = (int)expr->Item(2)->IntegerValue();
int penRed = (int)expr->Item(3)->IntegerValue();
int penGreen = (int)expr->Item(4)->IntegerValue();
int penBlue = (int)expr->Item(5)->IntegerValue();
int penWidth = (int)expr->Nth(1)->IntegerValue();
int penStyle = (int)expr->Nth(2)->IntegerValue();
int penRed = (int)expr->Nth(3)->IntegerValue();
int penGreen = (int)expr->Nth(4)->IntegerValue();
int penBlue = (int)expr->Nth(5)->IntegerValue();
wxColour col(penRed, penGreen, penBlue);
wxPen *p = wxThePenList->FindOrCreatePen(col, penWidth, penStyle);
if (!p)
@@ -1640,10 +1640,10 @@ void wxPseudoMetaFile::ReadAttributes(wxExpr *clause, int whichAngle)
}
case gyTYPE_BRUSH:
{
int brushStyle = (int)expr->Item(1)->IntegerValue();
int brushRed = (int)expr->Item(2)->IntegerValue();
int brushGreen = (int)expr->Item(3)->IntegerValue();
int brushBlue = (int)expr->Item(4)->IntegerValue();
int brushStyle = (int)expr->Nth(1)->IntegerValue();
int brushRed = (int)expr->Nth(2)->IntegerValue();
int brushGreen = (int)expr->Nth(3)->IntegerValue();
int brushBlue = (int)expr->Nth(4)->IntegerValue();
wxColour col(brushRed, brushGreen, brushBlue);
wxBrush *b = wxTheBrushList->FindOrCreateBrush(col, brushStyle);
if (!b)
@@ -1653,11 +1653,11 @@ void wxPseudoMetaFile::ReadAttributes(wxExpr *clause, int whichAngle)
}
case gyTYPE_FONT:
{
int fontPointSize = (int)expr->Item(1)->IntegerValue();
int fontFamily = (int)expr->Item(2)->IntegerValue();
int fontStyle = (int)expr->Item(3)->IntegerValue();
int fontWeight = (int)expr->Item(4)->IntegerValue();
int fontUnderlined = (int)expr->Item(5)->IntegerValue();
int fontPointSize = (int)expr->Nth(1)->IntegerValue();
int fontFamily = (int)expr->Nth(2)->IntegerValue();
int fontStyle = (int)expr->Nth(3)->IntegerValue();
int fontWeight = (int)expr->Nth(4)->IntegerValue();
int fontUnderlined = (int)expr->Nth(5)->IntegerValue();
m_gdiObjects.Append(wxTheFontList->FindOrCreateFont(fontPointSize,
fontFamily, fontStyle, fontWeight, (fontUnderlined != 0)));
break;
@@ -1687,7 +1687,7 @@ void wxPseudoMetaFile::ReadAttributes(wxExpr *clause, int whichAngle)
}
else
{
wxExpr *idExpr = expr->Item(0);
wxExpr *idExpr = expr->Nth(0);
int opId = (int)idExpr->IntegerValue();
switch (opId)
{

18
contrib/src/ogl/lines.cpp
View File

@@ -25,7 +25,7 @@
#include <wx/wx.h>
#endif
#include <wx/wxexpr.h>
#include <wx/deprecated/wxexpr.h>
#ifdef new
#undef new
@@ -1541,16 +1541,16 @@ void wxLineShape::ReadAttributes(wxExpr *clause)
wxString arrowName;
long arrowId = -1;
wxExpr *type_expr = node->Item(0);
wxExpr *end_expr = node->Item(1);
wxExpr *dist_expr = node->Item(2);
wxExpr *size_expr = node->Item(3);
wxExpr *name_expr = node->Item(4);
wxExpr *id_expr = node->Item(5);
wxExpr *type_expr = node->Nth(0);
wxExpr *end_expr = node->Nth(1);
wxExpr *dist_expr = node->Nth(2);
wxExpr *size_expr = node->Nth(3);
wxExpr *name_expr = node->Nth(4);
wxExpr *id_expr = node->Nth(5);
// New members of wxArrowHead
wxExpr *yOffsetExpr = node->Item(6);
wxExpr *spacingExpr = node->Item(7);
wxExpr *yOffsetExpr = node->Nth(6);
wxExpr *spacingExpr = node->Nth(7);
if (type_expr)
arrowType = (int)type_expr->IntegerValue();

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

@@ -24,7 +24,7 @@
#include <wx/wx.h>
#endif
#include <wx/wxexpr.h>
#include <wx/deprecated/wxexpr.h>
#include <wx/types.h>

6
contrib/src/ogl/ogldiag.cpp
View File

@@ -24,7 +24,7 @@
#include <wx/wx.h>
#endif
#include <wx/wxexpr.h>
#include <wx/deprecated/wxexpr.h>
#ifdef new
#undef new
@@ -453,7 +453,7 @@ void wxDiagram::ReadContainerGeometry(wxExprDatabase& database)
if (divisionExpr)
{
int i = 0;
wxExpr *idExpr = divisionExpr->Item(i);
wxExpr *idExpr = divisionExpr->Nth(i);
while (idExpr)
{
long divisionId = idExpr->IntegerValue();
@@ -510,7 +510,7 @@ void wxDiagram::ReadContainerGeometry(wxExprDatabase& database)
}
}
i ++;
idExpr = divisionExpr->Item(i);
idExpr = divisionExpr->Nth(i);
}
}
}

2
contrib/src/ogl/oglmisc.cpp
View File

@@ -24,7 +24,7 @@
#include <wx/wx.h>
#endif
#include <wx/wxexpr.h>
#include <wx/deprecated/wxexpr.h>
#include <wx/types.h>