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

Copyright cleanup

Browse Source 
Added shaped sample to scripts


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19863 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2003-03-29 13:53:55 +00:00
parent f0f7bd8a4f
commit 4a9dba0e56
29 changed files with 69 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.in
View File

@@ -4,7 +4,7 @@
# Author: Julian Smart, Robert Roebling, Vadim Zeitlin, Ron Lee
# Created: 1993
# Version: $Id$
# Copyright:(c) 1993, AIAI, University of Edinburgh,
# Copyright:,
# Copyright:(c) 1999, Vadim Zeitlin
# Copyright:(c) 1999, Robert Roebling
# Copyright:(c) 2001, Ron Lee

2
demos/makefile.b32
View File

@@ -3,7 +3,7 @@
# Author: Julian Smart
# Created: 1993
# Updated:
# Copyright: (c) 1993, AIAI, University of Edinburgh
# Copyright:
#
# "%W% %G%"
#

2
demos/makefile.vc
View File

@@ -3,7 +3,7 @@
# Author: Julian Smart
# Created: 1993
# Updated:
# Copyright: (c) 1993, AIAI, University of Edinburgh
# Copyright:
#
# "%W% %G%"
#

33
distrib/msw/contrib.rsp
View File

@@ -1,32 +1,6 @@
contrib/configure.in
contrib/configure
contrib/samples/canvas/simple/*.cpp
contrib/samples/canvas/simple/*.h
contrib/samples/canvas/simple/*.def
contrib/samples/canvas/simple/makefile*
contrib/samples/canvas/simple/*.xbm
contrib/samples/canvas/simple/*.xpm
contrib/samples/canvas/simple/*.txt
contrib/samples/canvas/simple/*.ico
contrib/samples/canvas/simple/*.bmp
contrib/samples/canvas/simple/*.rc
contrib/samples/canvas/simple/SimpleVC.dsp
contrib/samples/canvas/simple/SimpleVC.dsw
contrib/samples/canvas/test/*.cpp
contrib/samples/canvas/test/*.h
contrib/samples/canvas/test/*.def
contrib/samples/canvas/test/makefile*
contrib/samples/canvas/test/*.xbm
contrib/samples/canvas/test/*.xpm
contrib/samples/canvas/test/*.txt
contrib/samples/canvas/test/*.ico
contrib/samples/canvas/test/*.bmp
contrib/samples/canvas/test/*.rc
contrib/samples/canvas/test/TestVC.dsp
contrib/samples/canvas/test/TestVC.dsw
contrib/samples/plot/*.cpp
contrib/samples/plot/*.h
contrib/samples/plot/*.def
@@ -211,13 +185,6 @@ contrib/samples/fl/fl_sample3/*.rc
contrib/samples/fl/fl_sample3/fl_demo.dsp
contrib/samples/fl/fl_sample3/fl_demo.dsw
contrib/src/canvas/*.cpp
contrib/src/canvas/*.h
contrib/src/canvas/make*
contrib/src/canvas/CanvasVC.dsp
contrib/src/canvas/CanvasVC.dsw
contrib/include/wx/canvas/*.h
contrib/src/plot/*.cpp
contrib/src/plot/*.h
contrib/src/plot/make*

1
distrib/msw/cw.rsp
View File

@@ -70,6 +70,7 @@ samples/rotate/*W7.xml
samples/sashtest/*W7.xml
samples/scroll/*W7.xml
samples/scrollsub/*W7.xml
samples/shaped/*W7.xml
samples/sockets/*W7.xml
samples/splitter/*W7.xml
samples/statbar/*W7.xml

2
distrib/msw/cw_mac.rsp
View File

@@ -127,6 +127,8 @@ samples/scroll/*M?.xml
samples/scroll/*.mcp
samples/scrollsub/*M?.xml
samples/scrollsub/*.mcp
samples/shaped/*M?.xml
samples/shaped/*.mcp
samples/sockets/*M?.xml
samples/sockets/*.mcp
samples/splitter/*M?.xml

13
distrib/msw/generic.rsp
View File

@@ -981,6 +981,19 @@ samples/scrollsub/*.ico
samples/scrollsub/*.txt
samples/scrollsub/*.pro
samples/shaped/*.cpp
samples/shaped/*.h
samples/shaped/makefile*
samples/shaped/*.rc
samples/shaped/*.def
samples/shaped/*.bmp
samples/shaped/*.xpm
samples/shaped/*.xbm
samples/shaped/*.png
samples/shaped/*.ico
samples/shaped/*.txt
samples/shaped/*.pro
samples/splitter/*.cpp
samples/splitter/*.h
samples/splitter/*.def

1
distrib/msw/makefile.rsp
View File

@@ -58,6 +58,7 @@ samples/rotate/Makefile.in
samples/sashtest/Makefile.in
samples/scroll/Makefile.in
samples/scrollsub/Makefile.in
samples/shaped/Makefile.in
samples/splitter/Makefile.in
samples/statbar/Makefile.in
samples/text/Makefile.in

3
distrib/msw/vc.rsp
View File

@@ -209,6 +209,9 @@ samples/scroll/scroll.dsw
samples/scrollsub/scrollsub.dsp
samples/scrollsub/scrollsub.dsw
samples/shaped/shaped.dsp
samples/shaped/shaped.dsw
samples/sockets/client.dsp
samples/sockets/server.dsp
samples/sockets/client.dsw

4
docs/html/index.htm
View File

@@ -342,8 +342,7 @@ dynamically.
<li><a href="../../samples/event">event</a>: demonstrates event handling.
<li><a href="../../samples/exec">exec</a>: demonstrates wxExecute.
<li><a href="../../samples/font">font</a>: tests fonts, font enumerator, font encodings.
<li><a href="../../samples/grid">grid</a>: demonstrates the wxGrid class. This demo should work
when the old grid implementation is compiled into wxWindows, and also with the new implementation.
<li><a href="../../samples/grid">grid</a>: demonstrates the wxGrid class.
Please see newgrid below for a full demo of the new implementation's capabilities.
<li><a href="../../samples/help">help</a>: shows how to use wxHelpController.
<li><a href="../../samples/html">html</a>: a number of demos for the wxHTML class library, used inside
@@ -379,7 +378,6 @@ small a wxWindows application as you can get.
<li><a href="../../samples/mobile">mobile</a>: mini applications for embedded platforms.
<li><a href="../../samples/nativdlg">nativdlg</a>: shows how wxWindows can load a standard Windows
dialog resource, translating the controls into wxWindows controls (Windows only).
<li><a href="../../samples/newgrid">newgrid</a>: demonstrates the new wxGrid implementation, by Michael Bedward and others.
<li><a href="../../samples/notebook">notebook</a>: shows the wxNotebook (tabbed window) control.
<li><a href="../../samples/oleauto">oleauto</a>: a little OLE automation controller (Windows only; requires
Excel to be present).

44
src/common/wxexpr.cpp
View File

@@ -196,12 +196,12 @@ wxExpr::wxExpr(wxList *the_list)
wxExpr *listExpr = new wxExpr(wxExprList);
wxNode *node = the_list->First();
wxNode *node = the_list->GetFirst();
while (node)
{
wxExpr *expr = (wxExpr *)node->Data();
wxExpr *expr = (wxExpr *)node->GetData();
listExpr->Append(expr);
node = node->Next();
node = node->GetNext();
}
Append(listExpr);
@@ -605,13 +605,13 @@ void wxExpr::AddAttributeValueStringList(const wxString& attribute, wxList *stri
// First make a list of wxExpr strings
wxExpr *listExpr = new wxExpr(wxExprList);
wxNode *node = string_list->First();
wxNode *node = string_list->GetFirst();
while (node)
{
wxChar *string = (wxChar*)node->GetData();
wxExpr *expr = new wxExpr(wxExprString, wxString(string));
listExpr->Append(expr);
node = node->Next();
node = node->GetNext();
}
// Now make an (=, Att, Value) triple
@@ -907,7 +907,7 @@ wxExprDatabase::~wxExprDatabase(void)
void wxExprDatabase::BeginFind(void) // Initialise a search
{
position = First();
position = GetFirst();
}
wxExpr *wxExprDatabase::FindClause(long id) // Find a term based on an integer id attribute
@@ -916,7 +916,7 @@ wxExpr *wxExprDatabase::FindClause(long id) // Find a term based on an integer
wxExpr *found = NULL;
while (position && !found)
{
wxExpr *term = (wxExpr *)position->Data();
wxExpr *term = (wxExpr *)position->GetData();
if (term->Type() == wxExprList)
{
@@ -924,7 +924,7 @@ wxExpr *wxExprDatabase::FindClause(long id) // Find a term based on an integer
if (value->Type() == wxExprInteger && value->IntegerValue() == id)
found = term;
}
position = position->Next();
position = position->GetNext();
}
return found;
}
@@ -935,7 +935,7 @@ wxExpr *wxExprDatabase::FindClause(const wxString& word, const wxString& val)
wxExpr *found = NULL;
while (position && !found)
{
wxExpr *term = (wxExpr *)position->Data();
wxExpr *term = (wxExpr *)position->GetData();
if (term->Type() == wxExprList)
{
@@ -944,7 +944,7 @@ wxExpr *wxExprDatabase::FindClause(const wxString& word, const wxString& val)
(value->Type() == wxExprString && value->StringValue() == val))
found = term;
}
position = position->Next();
position = position->GetNext();
}
return found;
}
@@ -954,7 +954,7 @@ wxExpr *wxExprDatabase::FindClause(const wxString& word, long val)
wxExpr *found = NULL;
while (position && !found)
{
wxExpr *term = (wxExpr *)position->Data();
wxExpr *term = (wxExpr *)position->GetData();
if (term->Type() == wxExprList)
{
@@ -962,7 +962,7 @@ wxExpr *wxExprDatabase::FindClause(const wxString& word, long val)
if ((value->Type() == wxExprInteger) && (value->IntegerValue() == val))
found = term;
}
position = position->Next();
position = position->GetNext();
}
return found;
}
@@ -972,7 +972,7 @@ wxExpr *wxExprDatabase::FindClause(const wxString& word, double val)
wxExpr *found = NULL;
while (position && !found)
{
wxExpr *term = (wxExpr *)position->Data();
wxExpr *term = (wxExpr *)position->GetData();
if (term->Type() == wxExprList)
{
@@ -980,7 +980,7 @@ wxExpr *wxExprDatabase::FindClause(const wxString& word, double val)
if ((value->Type() == wxExprReal) && (value->RealValue() == val))
found = term;
}
position = position->Next();
position = position->GetNext();
}
return found;
}
@@ -990,14 +990,14 @@ wxExpr *wxExprDatabase::FindClauseByFunctor(const wxString& functor)
wxExpr *found = NULL;
while (position && !found)
{
wxExpr *term = (wxExpr *)position->Data();
wxExpr *term = (wxExpr *)position->GetData();
if (term->Type() == wxExprList)
{
if (term->Functor() == functor)
found = term;
}
position = position->Next();
position = position->GetNext();
}
return found;
}
@@ -1048,13 +1048,13 @@ wxExpr *wxExprDatabase::HashFind(const wxString& functor, const wxString& value)
void wxExprDatabase::ClearDatabase(void)
{
noErrors = 0;
wxNode *node = First();
wxNode *node = GetFirst();
while (node)
{
wxExpr *expr = (wxExpr *)node->Data();
wxExpr *expr = (wxExpr *)node->GetData();
delete expr;
delete node;
node = First();
node = GetFirst();
}
if (hash_table)
@@ -1110,12 +1110,12 @@ bool wxExprDatabase::Write(const wxString& fileName)
bool wxExprDatabase::Write(FILE *stream)
{
noErrors = 0;
wxNode *node = First();
wxNode *node = GetFirst();
while (node)
{
wxExpr *expr = (wxExpr *)node->Data();
wxExpr *expr = (wxExpr *)node->GetData();
expr->WriteClause(stream);
node = node->Next();
node = node->GetNext();
}
return (noErrors == 0);
}

2
src/jpeg/MAKEFILE.VA
View File

@@ -3,7 +3,7 @@
# Author: David Webster
# Created: 1999
# Updated:
# Copyright: c) 1993, AIAI, University of Edinburgh
# Copyright:
#
# "%W% %G%"
#

2
src/make.env.in
View File

@@ -3,7 +3,7 @@
# Author: Julian Smart, Robert Roebling, Vadim Zeitlin, Ron Lee
# Created: 1993
# Updated: 2001
# Copyright:(c) 1993, AIAI, University of Edinburgh,
# Copyright:,
# Copyright:(c) 1999, Vadim Zeitlin
# Copyright:(c) 1999, Robert Roebling
# Copyright:(c) 2001, Ron Lee

2
src/makefile.bcc
View File

@@ -3,7 +3,7 @@
# Author: Julian Smart
# Created: 1993
# Updated:
# Copyright: (c) 1993, AIAI, University of Edinburgh
# Copyright:
#
# "%W% %G%"
#

2
src/makefile.dos
View File

@@ -3,7 +3,7 @@
# Author: Julian Smart
# Created: 1993
# Updated:
# Copyright: (c) 1993, AIAI, University of Edinburgh
# Copyright:
#
# "%W% %G%"
#

2
src/makemsc.env
View File

@@ -3,7 +3,7 @@
# Author: Julian Smart
# Created: 1993
# Updated:
# Copyright: (c) 1993, AIAI, University of Edinburgh
# Copyright:
#
# "%W% %G%"
#

12
src/msw/dc.cpp
View File

@@ -2186,10 +2186,10 @@ wxDCCacheEntry::~wxDCCacheEntry()
wxDCCacheEntry* wxDC::FindBitmapInCache(WXHDC dc, int w, int h)
{
int depth = ::GetDeviceCaps((HDC) dc, PLANES) * ::GetDeviceCaps((HDC) dc, BITSPIXEL);
wxNode* node = sm_bitmapCache.First();
wxNode* node = sm_bitmapCache.GetFirst();
while (node)
{
wxDCCacheEntry* entry = (wxDCCacheEntry*) node->Data();
wxDCCacheEntry* entry = (wxDCCacheEntry*) node->GetData();
if (entry->m_depth == depth)
{
@@ -2207,7 +2207,7 @@ wxDCCacheEntry* wxDC::FindBitmapInCache(WXHDC dc, int w, int h)
return entry;
}
node = node->Next();
node = node->GetNext();
}
WXHBITMAP hBitmap = (WXHBITMAP) ::CreateCompatibleBitmap((HDC) dc, w, h);
if ( !hBitmap)
@@ -2222,10 +2222,10 @@ wxDCCacheEntry* wxDC::FindBitmapInCache(WXHDC dc, int w, int h)
wxDCCacheEntry* wxDC::FindDCInCache(wxDCCacheEntry* notThis, WXHDC dc)
{
int depth = ::GetDeviceCaps((HDC) dc, PLANES) * ::GetDeviceCaps((HDC) dc, BITSPIXEL);
wxNode* node = sm_dcCache.First();
wxNode* node = sm_dcCache.GetFirst();
while (node)
{
wxDCCacheEntry* entry = (wxDCCacheEntry*) node->Data();
wxDCCacheEntry* entry = (wxDCCacheEntry*) node->GetData();
// Don't return the same one as we already have
if (!notThis || (notThis != entry))
@@ -2236,7 +2236,7 @@ wxDCCacheEntry* wxDC::FindDCInCache(wxDCCacheEntry* notThis, WXHDC dc)
}
}
node = node->Next();
node = node->GetNext();
}
WXHDC hDC = (WXHDC) ::CreateCompatibleDC((HDC) dc);
if ( !hDC)

2
src/msw/makefile.bcc
View File

@@ -8,7 +8,7 @@
# Author: Julian Smart
# Created: 1993
# Updated:
# Copyright:(c) 1993, AIAI, University of Edinburgh
# Copyright:
#
# "%W% %G%"
#

2
src/msw/makefile.g95
View File

@@ -6,7 +6,7 @@
# Author: Julian Smart, Robert Roebling, Vadim Zeitlin
# Created: 1993
# Updated: 1999
# Copyright:(c) 1993, AIAI, University of Edinburgh,
# Copyright:,
# Copyright:(c) 1999, Vadim Zeitlin
# Copyright:(c) 1999, Robert Roebling
#

2
src/png/MAKEFILE.VA
View File

@@ -3,7 +3,7 @@
# Author: David Webster
# Created: 1999
# Updated:
# Copyright: c) 1993, AIAI, University of Edinburgh
# Copyright:
#
# "%W% %G%"
#

2
src/png/makefile.dos
View File

@@ -3,7 +3,7 @@
# Author: Julian Smart
# Created: 1993
# Updated:
# Copyright: (c) 1993, AIAI, University of Edinburgh
# Copyright:
#
# "%W% %G%"
#

2
src/zlib/MAKEFILE.VA
View File

@@ -3,7 +3,7 @@
# Author: David Webster
# Created: 1999
# Updated:
# Copyright: c) 1993, AIAI, University of Edinburgh
# Copyright:
#
# "%W% %G%"
#

2
utils/dialoged/src/makefile.b32
View File

@@ -3,7 +3,7 @@
# Author: Patrick Halke
# Created: 1995
# Updated:
# Copyright: (c) 1993, AIAI, University of Edinburgh
# Copyright:
#
# "%W% %G%"
#

2
utils/dialoged/src/makefile.dos
View File

@@ -3,7 +3,7 @@
# Author: Julian Smart
# Created: 1995
# Updated:
# Copyright: (c) 1995, AIAI, University of Edinburgh
# Copyright:
#
# "%W% %G%"
#

2
utils/makefile.vc
View File

@@ -3,7 +3,7 @@
# Author: Julian Smart
# Created: 1993
# Updated:
# Copyright: (c) 1993, AIAI, University of Edinburgh
# Copyright:
#
# "%W% %G%"
#

2
utils/nplugin/makefile.vc
View File

@@ -3,7 +3,7 @@
# Author: Julian Smart
# Created: 1993
# Updated:
# Copyright: (c) 1993, AIAI, University of Edinburgh
# Copyright:
#
# "%W% %G%"
#

2
utils/nplugin/src/makefile.vc
View File

@@ -3,7 +3,7 @@
# Author: Julian Smart
# Created: 1993
# Updated:
# Copyright: (c) 1993, AIAI, University of Edinburgh
# Copyright:
#
# "%W% %G%"
#

2
utils/projgen/makefile.vc
View File

@@ -3,7 +3,7 @@
# Author: Julian Smart
# Created: 1993
# Updated:
# Copyright: (c) 1993, AIAI, University of Edinburgh
# Copyright:
#
# "%W% %G%"
#

2
utils/tex2rtf/src/makefile.vc
View File

@@ -2,7 +2,7 @@
# File: makefile.nt
# Author: Julian Smart
# Created: 1993
# Copyright: (c) 1993, AIAI, University of Edinburgh
# Copyright:
#
# "%W% %G%"
#