Copyright cleanup

Added shaped sample to scripts

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19863 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/Makefile.in b/Makefile.in
index 049f206a8b60e8874f302ef8ca7e15c07800379b..f356e0f9c70a131068c74f2941df2a049db85d4d 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -4,7 +4,7 @@
 # Author:   Julian Smart, Robert Roebling, Vadim Zeitlin, Ron Lee
 # Created:  1993
 # Version:  $Id$
 # 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
 # Copyright:(c) 1999, Vadim Zeitlin
 # Copyright:(c) 1999, Robert Roebling
 # Copyright:(c) 2001, Ron Lee

diff --git a/demos/makefile.b32 b/demos/makefile.b32
index 74a83ee628e2866585232e9e18c4a13fb96e12a0..089b13ec240c8c37b99aafdf8b6f6d77a55f1895 100644 (file)
--- a/demos/makefile.b32
+++ b/demos/makefile.b32
@@ -3,7 +3,7 @@
 # Author:      Julian Smart
 # Created:     1993
 # Updated:     
 # Author:      Julian Smart
 # Created:     1993
 # Updated:     

-# Copyright:   (c) 1993, AIAI, University of Edinburgh
+# Copyright:   

 #
 # "%W% %G%"
 #
 #
 # "%W% %G%"
 #

diff --git a/demos/makefile.vc b/demos/makefile.vc
index aa7d8e1e1b1c11a650debc2688470edfa66945ab..90fb158b0e388efa03578efe154fdadc800de296 100644 (file)
--- a/demos/makefile.vc
+++ b/demos/makefile.vc
@@ -3,7 +3,7 @@
 # Author:       Julian Smart
 # Created:      1993
 # Updated:
 # Author:       Julian Smart
 # Created:      1993
 # Updated:

-# Copyright:    (c) 1993, AIAI, University of Edinburgh
+# Copyright:    

 #
 # "%W% %G%"
 #
 #
 # "%W% %G%"
 #

diff --git a/distrib/msw/contrib.rsp b/distrib/msw/contrib.rsp
index 55e3f264bb226fa0482286ce16054e54bbe6c0e0..1a9cee95b4b20d81919b37edc2fbb6d299d754f8 100644 (file)
--- a/distrib/msw/contrib.rsp
+++ b/distrib/msw/contrib.rsp
@@ -1,32 +1,6 @@
 contrib/configure.in
 contrib/configure
 
 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
 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/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*
 contrib/src/plot/*.cpp
 contrib/src/plot/*.h
 contrib/src/plot/make*

diff --git a/distrib/msw/cw.rsp b/distrib/msw/cw.rsp
index 82869a191bdd055fcf052aa56855996bb91c33fb..7c167d55971e90d6cf68aa36b10c364709bb0f12 100644 (file)
--- a/distrib/msw/cw.rsp
+++ b/distrib/msw/cw.rsp
@@ -70,6 +70,7 @@ samples/rotate/*W7.xml
 samples/sashtest/*W7.xml
 samples/scroll/*W7.xml
 samples/scrollsub/*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
 samples/sockets/*W7.xml
 samples/splitter/*W7.xml
 samples/statbar/*W7.xml

diff --git a/distrib/msw/cw_mac.rsp b/distrib/msw/cw_mac.rsp
index f1140ac3697280d91124784edcc70974ca0d4e51..b345bc36f28f9357e80b06f93715aa3ba62dd892 100644 (file)
--- a/distrib/msw/cw_mac.rsp
+++ b/distrib/msw/cw_mac.rsp
@@ -127,6 +127,8 @@ samples/scroll/*M?.xml
 samples/scroll/*.mcp
 samples/scrollsub/*M?.xml
 samples/scrollsub/*.mcp
 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
 samples/sockets/*M?.xml
 samples/sockets/*.mcp
 samples/splitter/*M?.xml

diff --git a/distrib/msw/generic.rsp b/distrib/msw/generic.rsp
index 1b179cf4ef5057679f49abfbb224a5750f5db2d8..206172a1c3adc3800b6bbfc4852064820dbe912b 100644 (file)
--- a/distrib/msw/generic.rsp
+++ b/distrib/msw/generic.rsp
@@ -981,6 +981,19 @@ samples/scrollsub/*.ico
 samples/scrollsub/*.txt
 samples/scrollsub/*.pro
 
 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
 samples/splitter/*.cpp
 samples/splitter/*.h
 samples/splitter/*.def

diff --git a/distrib/msw/makefile.rsp b/distrib/msw/makefile.rsp
index cee12e6042b6fa32933dbc2750514339341ce68c..db9ac53c120806146e6100fd30ca0fcded955860 100644 (file)
--- a/distrib/msw/makefile.rsp
+++ b/distrib/msw/makefile.rsp
@@ -58,6 +58,7 @@ samples/rotate/Makefile.in
 samples/sashtest/Makefile.in
 samples/scroll/Makefile.in
 samples/scrollsub/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
 samples/splitter/Makefile.in
 samples/statbar/Makefile.in
 samples/text/Makefile.in

diff --git a/distrib/msw/vc.rsp b/distrib/msw/vc.rsp
index 71a22b26c3a4686893bdd2ee3e0e22c8c5cb6a67..6e3095deb6d1029ed1d89bd27f83e349a4a4699e 100644 (file)
--- a/distrib/msw/vc.rsp
+++ b/distrib/msw/vc.rsp
@@ -209,6 +209,9 @@ samples/scroll/scroll.dsw
 samples/scrollsub/scrollsub.dsp
 samples/scrollsub/scrollsub.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
 samples/sockets/client.dsp
 samples/sockets/server.dsp
 samples/sockets/client.dsw

diff --git a/docs/html/index.htm b/docs/html/index.htm
index 808bfe3bb28331ea85840f6749189a2c77f8926f..2e1d6ebfe78dbdc8d8d0b7db596cd2dd66a9fb11 100644 (file)
--- a/docs/html/index.htm
+++ b/docs/html/index.htm
@@ -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/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
 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/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).
 <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).

diff --git a/src/common/wxexpr.cpp b/src/common/wxexpr.cpp
index 63b821bd7b2ece058de829ceb25af4bab3606e71..70fb548e140379cd829e39ddaeb980bcf3d86459 100644 (file)
--- a/src/common/wxexpr.cpp
+++ b/src/common/wxexpr.cpp
@@ -196,12 +196,12 @@ wxExpr::wxExpr(wxList *the_list)
 
   wxExpr *listExpr = new wxExpr(wxExprList);
 
 
   wxExpr *listExpr = new wxExpr(wxExprList);
 

-  wxNode *node = the_list->First();
+  wxNode *node = the_list->GetFirst();

   while (node)
   {
   while (node)
   {

-    wxExpr *expr = (wxExpr *)node->Data();
+    wxExpr *expr = (wxExpr *)node->GetData();

     listExpr->Append(expr);
     listExpr->Append(expr);

-    node = node->Next();
+    node = node->GetNext();

   }
   Append(listExpr);
 
   }
   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);
 
   // 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);
   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
   }
 
   // Now make an (=, Att, Value) triple


@@ -907,7 +907,7 @@ wxExprDatabase::~wxExprDatabase(void)
 
 void wxExprDatabase::BeginFind(void)          // Initialise a search
 {
 
 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
 }
 
 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 *found = NULL;
   while (position && !found)
   {

-    wxExpr *term = (wxExpr *)position->Data();
+    wxExpr *term = (wxExpr *)position->GetData();

     
     if (term->Type() == wxExprList)
     {
     
     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;
     }
       if (value->Type() == wxExprInteger && value->IntegerValue() == id)
         found = term;
     }

-    position = position->Next();
+    position = position->GetNext();

   }
   return found;
 }
   }
   return found;
 }


@@ -935,7 +935,7 @@ wxExpr *wxExprDatabase::FindClause(const wxString& word, const wxString& val)
   wxExpr *found = NULL;
   while (position && !found)
   {
   wxExpr *found = NULL;
   while (position && !found)
   {

-    wxExpr *term = (wxExpr *)position->Data();
+    wxExpr *term = (wxExpr *)position->GetData();

     
     if (term->Type() == wxExprList)
     {
     
     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;
     }
           (value->Type() == wxExprString && value->StringValue() == val))
         found = term;
     }

-    position = position->Next();
+    position = position->GetNext();

   }
   return found;
 }
   }
   return found;
 }


@@ -954,7 +954,7 @@ wxExpr *wxExprDatabase::FindClause(const wxString& word, long val)
   wxExpr *found = NULL;
   while (position && !found)
   {
   wxExpr *found = NULL;
   while (position && !found)
   {

-    wxExpr *term = (wxExpr *)position->Data();
+    wxExpr *term = (wxExpr *)position->GetData();

     
     if (term->Type() == wxExprList)
     {
     
     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;
     }
       if ((value->Type() == wxExprInteger) && (value->IntegerValue() == val))
         found = term;
     }

-    position = position->Next();
+    position = position->GetNext();

   }
   return found;
 }
   }
   return found;
 }


@@ -972,7 +972,7 @@ wxExpr *wxExprDatabase::FindClause(const wxString& word, double val)
   wxExpr *found = NULL;
   while (position && !found)
   {
   wxExpr *found = NULL;
   while (position && !found)
   {

-    wxExpr *term = (wxExpr *)position->Data();
+    wxExpr *term = (wxExpr *)position->GetData();

     
     if (term->Type() == wxExprList)
     {
     
     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;
     }
       if ((value->Type() == wxExprReal) && (value->RealValue() == val))
         found = term;
     }

-    position = position->Next();
+    position = position->GetNext();

   }
   return found;
 }
   }
   return found;
 }


@@ -990,14 +990,14 @@ wxExpr *wxExprDatabase::FindClauseByFunctor(const wxString& functor)
   wxExpr *found = NULL;
   while (position && !found)
   {
   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;
     }
     
     if (term->Type() == wxExprList)
     {
       if (term->Functor() == functor)
         found = term;
     }

-    position = position->Next();
+    position = position->GetNext();

   }
   return found;
 }
   }
   return found;
 }


@@ -1048,13 +1048,13 @@ wxExpr *wxExprDatabase::HashFind(const wxString& functor, const wxString& value)
 void wxExprDatabase::ClearDatabase(void)
 {
   noErrors = 0;
 void wxExprDatabase::ClearDatabase(void)
 {
   noErrors = 0;

-  wxNode *node = First();
+  wxNode *node = GetFirst();

   while (node)
   {
   while (node)
   {

-    wxExpr *expr = (wxExpr *)node->Data();
+    wxExpr *expr = (wxExpr *)node->GetData();

     delete expr;
     delete node;
     delete expr;
     delete node;

-    node = First();
+    node = GetFirst();

   }
 
   if (hash_table)
   }
 
   if (hash_table)


@@ -1110,12 +1110,12 @@ bool wxExprDatabase::Write(const wxString& fileName)
 bool wxExprDatabase::Write(FILE *stream)
 {
   noErrors = 0;
 bool wxExprDatabase::Write(FILE *stream)
 {
   noErrors = 0;

-  wxNode *node = First();
+  wxNode *node = GetFirst();

   while (node)
   {
   while (node)
   {

-    wxExpr *expr = (wxExpr *)node->Data();
+    wxExpr *expr = (wxExpr *)node->GetData();

     expr->WriteClause(stream);
     expr->WriteClause(stream);

-    node = node->Next();
+    node = node->GetNext();

   }
   return (noErrors == 0);
 }
   }
   return (noErrors == 0);
 }

diff --git a/src/jpeg/MAKEFILE.VA b/src/jpeg/MAKEFILE.VA
index 803a38b09e4b949e8a8087ed3662521db3f3395a..72b5cbc8afce497cbf195ccd469e6ba05edc8d33 100644 (file)
--- a/src/jpeg/MAKEFILE.VA
+++ b/src/jpeg/MAKEFILE.VA
@@ -3,7 +3,7 @@
 # Author:    David Webster
 # Created:   1999
 # Updated:
 # Author:    David Webster
 # Created:   1999
 # Updated:

-# Copyright: c) 1993, AIAI, University of Edinburgh
+# Copyright:

 #
 # "%W% %G%"
 #
 #
 # "%W% %G%"
 #

diff --git a/src/make.env.in b/src/make.env.in
index 036ee92a966931bc8c3cc358bf146578fedd2015..d72dc2c558fe7e2116bacaad90beb07123670a8a 100644 (file)
--- a/src/make.env.in
+++ b/src/make.env.in
@@ -3,7 +3,7 @@
 # Author:   Julian Smart, Robert Roebling, Vadim Zeitlin, Ron Lee
 # Created:  1993
 # Updated:  2001
 # 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
 # Copyright:(c) 1999, Vadim Zeitlin
 # Copyright:(c) 1999, Robert Roebling
 # Copyright:(c) 2001, Ron Lee

diff --git a/src/makefile.bcc b/src/makefile.bcc
index b85f2aeac20991e777a58110fb588879945c50df..71a35b0cad92d08ecddbbb7c5355dae8ea429ffa 100644 (file)
--- a/src/makefile.bcc
+++ b/src/makefile.bcc
@@ -3,7 +3,7 @@
 # Author:      Julian Smart
 # Created:     1993
 # Updated:     
 # Author:      Julian Smart
 # Created:     1993
 # Updated:     

-# Copyright:   (c) 1993, AIAI, University of Edinburgh
+# Copyright:   

 #
 # "%W% %G%"
 #
 #
 # "%W% %G%"
 #

diff --git a/src/makefile.dos b/src/makefile.dos
index 4e5afd4ce702547a57f1f610bd81b79d5c49a71a..dbc9928c9654b57d4c0d33c46eafe42326e17fee 100644 (file)
--- a/src/makefile.dos
+++ b/src/makefile.dos
@@ -3,7 +3,7 @@
 # Author:      Julian Smart
 # Created:     1993
 # Updated:     
 # Author:      Julian Smart
 # Created:     1993
 # Updated:     

-# Copyright:   (c) 1993, AIAI, University of Edinburgh
+# Copyright:   

 #
 # "%W% %G%"
 #
 #
 # "%W% %G%"
 #

diff --git a/src/makemsc.env b/src/makemsc.env
index 70d41d4cf531232bac5449a3ac2e7d2967e038b3..b896b1852f38c79c8493960312eee50152dd2f35 100644 (file)
--- a/src/makemsc.env
+++ b/src/makemsc.env
@@ -3,7 +3,7 @@
 # Author:      Julian Smart
 # Created:     1993
 # Updated:     
 # Author:      Julian Smart
 # Created:     1993
 # Updated:     

-# Copyright:   (c) 1993, AIAI, University of Edinburgh
+# Copyright:   

 #
 # "%W% %G%"
 #
 #
 # "%W% %G%"
 #

diff --git a/src/msw/dc.cpp b/src/msw/dc.cpp
index e36e35dfc86b902334f0724ae70a7bb7cf7f0bbd..191d5c33961cb691993506c889eea22f2f30c13e 100644 (file)
--- a/src/msw/dc.cpp
+++ b/src/msw/dc.cpp
@@ -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);
 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)
     {
     while (node)
     {

-        wxDCCacheEntry* entry = (wxDCCacheEntry*) node->Data();
+        wxDCCacheEntry* entry = (wxDCCacheEntry*) node->GetData();

 
         if (entry->m_depth == depth)
         {
 
         if (entry->m_depth == depth)
         {


@@ -2207,7 +2207,7 @@ wxDCCacheEntry* wxDC::FindBitmapInCache(WXHDC dc, int w, int h)
             return entry;
         }
 
             return entry;
         }
 

-        node = node->Next();
+        node = node->GetNext();

     }
     WXHBITMAP hBitmap = (WXHBITMAP) ::CreateCompatibleBitmap((HDC) dc, w, h);
     if ( !hBitmap)
     }
     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);
 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)
     {
     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))
 
         // 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)
     }
     WXHDC hDC = (WXHDC) ::CreateCompatibleDC((HDC) dc);
     if ( !hDC)

diff --git a/src/msw/makefile.bcc b/src/msw/makefile.bcc
index c56e5a1b337f077eb02f96882f88f9f6dfd9e67c..e7a470453c8ce46359d07e45bc97dce376fd5b14 100644 (file)
--- a/src/msw/makefile.bcc
+++ b/src/msw/makefile.bcc
@@ -8,7 +8,7 @@
 # Author:   Julian Smart
 # Created:  1993
 # Updated:
 # Author:   Julian Smart
 # Created:  1993
 # Updated:

-# Copyright:(c) 1993, AIAI, University of Edinburgh
+# Copyright:

 #
 # "%W% %G%"
 #
 #
 # "%W% %G%"
 #

diff --git a/src/msw/makefile.g95 b/src/msw/makefile.g95
index 06fcb7e6bae77a6118d2f6dc50591143137f1f18..3fd9b2624008d0bfba5325ca111ea3d8b87536bc 100644 (file)
--- a/src/msw/makefile.g95
+++ b/src/msw/makefile.g95
@@ -6,7 +6,7 @@
 # Author:   Julian Smart, Robert Roebling, Vadim Zeitlin
 # Created:  1993
 # Updated:  1999
 # 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
 #
 # Copyright:(c) 1999, Vadim Zeitlin
 # Copyright:(c) 1999, Robert Roebling
 #

diff --git a/src/png/MAKEFILE.VA b/src/png/MAKEFILE.VA
index d51c88a25b7bdf8cc5a499eee53f32a10324b93c..35fd3a9398b454af27afa2e6c442a830a5725ee9 100644 (file)
--- a/src/png/MAKEFILE.VA
+++ b/src/png/MAKEFILE.VA
@@ -3,7 +3,7 @@
 # Author:    David Webster
 # Created:   1999
 # Updated:
 # Author:    David Webster
 # Created:   1999
 # Updated:

-# Copyright: c) 1993, AIAI, University of Edinburgh
+# Copyright:

 #
 # "%W% %G%"
 #
 #
 # "%W% %G%"
 #

diff --git a/src/png/makefile.dos b/src/png/makefile.dos
index 41f1712e65b7ea62080331b35f077f45afb73f2e..ad3425896d8c2916fd385deba10215747595304e 100644 (file)
--- a/src/png/makefile.dos
+++ b/src/png/makefile.dos
@@ -3,7 +3,7 @@
 # Author:      Julian Smart
 # Created:     1993
 # Updated:     
 # Author:      Julian Smart
 # Created:     1993
 # Updated:     

-# Copyright:   (c) 1993, AIAI, University of Edinburgh
+# Copyright:   

 #
 # "%W% %G%"
 #
 #
 # "%W% %G%"
 #

diff --git a/src/zlib/MAKEFILE.VA b/src/zlib/MAKEFILE.VA
index 0a5251c2e39a61cc95928c6490cccb87ce6351ee..f6508d8cff52502352b10c11657837e8297a4734 100644 (file)
--- a/src/zlib/MAKEFILE.VA
+++ b/src/zlib/MAKEFILE.VA
@@ -3,7 +3,7 @@
 # Author:    David Webster
 # Created:   1999
 # Updated:
 # Author:    David Webster
 # Created:   1999
 # Updated:

-# Copyright: c) 1993, AIAI, University of Edinburgh
+# Copyright:

 #
 # "%W% %G%"
 #
 #
 # "%W% %G%"
 #

diff --git a/utils/dialoged/src/makefile.b32 b/utils/dialoged/src/makefile.b32
index 39c14b5720045df8dd2dccd7d627a5a322ebd035..d41b6d3de925128e8e0b23738da6615dc977f3b2 100644 (file)
--- a/utils/dialoged/src/makefile.b32
+++ b/utils/dialoged/src/makefile.b32
@@ -3,7 +3,7 @@
 # Author:      Patrick Halke
 # Created:     1995
 # Updated:     
 # Author:      Patrick Halke
 # Created:     1995
 # Updated:     

-# Copyright:   (c) 1993, AIAI, University of Edinburgh
+# Copyright:   

 #
 # "%W% %G%"
 #
 #
 # "%W% %G%"
 #

diff --git a/utils/dialoged/src/makefile.dos b/utils/dialoged/src/makefile.dos
index 04fa91936afeee90263f7aefc0379300619d5c4b..054025947ddc0a1218eb8b6cbca0f0913b5b0f48 100644 (file)
--- a/utils/dialoged/src/makefile.dos
+++ b/utils/dialoged/src/makefile.dos
@@ -3,7 +3,7 @@
 # Author:      Julian Smart
 # Created:     1995
 # Updated:     
 # Author:      Julian Smart
 # Created:     1995
 # Updated:     

-# Copyright:   (c) 1995, AIAI, University of Edinburgh
+# Copyright:

 #
 # "%W% %G%"
 #
 #
 # "%W% %G%"
 #

diff --git a/utils/makefile.vc b/utils/makefile.vc
index ece8395fe1fa0cef38fe6f2a072e5ddd7a6395a2..1e13159387493201576599ef0207995494fa203f 100644 (file)
--- a/utils/makefile.vc
+++ b/utils/makefile.vc
@@ -3,7 +3,7 @@
 # Author:      Julian Smart
 # Created:     1993
 # Updated:     
 # Author:      Julian Smart
 # Created:     1993
 # Updated:     

-# Copyright:   (c) 1993, AIAI, University of Edinburgh
+# Copyright:   

 #
 # "%W% %G%"
 #
 #
 # "%W% %G%"
 #

diff --git a/utils/nplugin/makefile.vc b/utils/nplugin/makefile.vc
index a35290b4afb3e363c0859bead1e99589c859ac8c..c5ebbfe48908cc06705faad4ea86e928379440e4 100644 (file)
--- a/utils/nplugin/makefile.vc
+++ b/utils/nplugin/makefile.vc
@@ -3,7 +3,7 @@
 # Author:      Julian Smart
 # Created:     1993
 # Updated:     
 # Author:      Julian Smart
 # Created:     1993
 # Updated:     

-# Copyright:   (c) 1993, AIAI, University of Edinburgh
+# Copyright:   

 #
 # "%W% %G%"
 #
 #
 # "%W% %G%"
 #

diff --git a/utils/nplugin/src/makefile.vc b/utils/nplugin/src/makefile.vc
index 8493ca372380b370fcb3cab4b56e60187f4a753f..5d0c12d39a957b0da30ebca7634fde16595cbc52 100644 (file)
--- a/utils/nplugin/src/makefile.vc
+++ b/utils/nplugin/src/makefile.vc
@@ -3,7 +3,7 @@
 # Author:      Julian Smart
 # Created:     1993
 # Updated:     
 # Author:      Julian Smart
 # Created:     1993
 # Updated:     

-# Copyright:   (c) 1993, AIAI, University of Edinburgh
+# Copyright:   

 #
 # "%W% %G%"
 #
 #
 # "%W% %G%"
 #

diff --git a/utils/projgen/makefile.vc b/utils/projgen/makefile.vc
index 5a8ef5201c76ef3f7c86c67e0a5dbe43716b6116..681f529efe336e0b29997f69919c07c1d21f1eb2 100644 (file)
--- a/utils/projgen/makefile.vc
+++ b/utils/projgen/makefile.vc
@@ -3,7 +3,7 @@
 # Author:      Julian Smart
 # Created:     1993
 # Updated:     
 # Author:      Julian Smart
 # Created:     1993
 # Updated:     

-# Copyright:   (c) 1993, AIAI, University of Edinburgh
+# Copyright:   

 #
 # "%W% %G%"
 #
 #
 # "%W% %G%"
 #

diff --git a/utils/tex2rtf/src/makefile.vc b/utils/tex2rtf/src/makefile.vc
index 5732870d0ffe6052393fee0d5ef96920ad71366c..10baac17907f27e1c398c1b3597f162923afc8f4 100644 (file)
--- a/utils/tex2rtf/src/makefile.vc
+++ b/utils/tex2rtf/src/makefile.vc
@@ -2,7 +2,7 @@
 # File:                makefile.nt
 # Author:      Julian Smart
 # Created:     1993
 # File:                makefile.nt
 # Author:      Julian Smart
 # Created:     1993

-# Copyright:   (c) 1993, AIAI, University of Edinburgh
+# Copyright:   

 #
 # "%W% %G%"
 #
 #
 # "%W% %G%"
 #