Add wxAnyScrollHelperBase to reduce code duplication in wxVarScrollHelperBase.

[wxWidgets.git] / src / generic / regiong.cpp

diff --git a/src/generic/regiong.cpp b/src/generic/regiong.cpp
index 67190870b9e47034092c89515c9f34aee579dd26..7580c44432d49b29450042da5c5c8f62eb2bd7c9 100644 (file)
--- a/src/generic/regiong.cpp
+++ b/src/generic/regiong.cpp
@@ -1,10 +1,9 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        src/generic/region.cpp
+// Name:        src/generic/regiong.cpp

 // Purpose:     generic wxRegion class
 // Author:      David Elliott
 // Modified by:
 // Created:     2004/04/12
 // Purpose:     generic wxRegion class
 // Author:      David Elliott
 // Modified by:
 // Created:     2004/04/12

-// RCS-ID:      $Id$

 // Copyright:   (c) 2004 David Elliott
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2004 David Elliott
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -617,7 +616,7 @@ Region REGION::XCreateRegion(void)
 
     if (!temp->rects)
     {
 
     if (!temp->rects)
     {

-        free((char *) temp);
+        delete temp;

         return (Region) NULL;
     }
     temp->numRects = 0;
         return (Region) NULL;
     }
     temp->numRects = 0;


@@ -1645,7 +1644,7 @@ miSubtractO (
         else if (r2->x1 <= x1)
         {
             /*
         else if (r2->x1 <= x1)
         {
             /*

-             * Subtrahend preceeds minuend: nuke left edge of minuend.
+             * Subtrahend precedes minuend: nuke left edge of minuend.

              */
             x1 = r2->x2;
             if (x1 >= r1->x2)
              */
             x1 = r2->x2;
             if (x1 >= r1->x2)