From 181526acadbce6498481a423c0ed3b541471be97 Mon Sep 17 00:00:00 2001
From: Robin Dunn <robin@alldunn.com>
Date: Tue, 20 Nov 2001 02:06:31 +0000
Subject: [PATCH 1/1] SWIGged updates

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12503 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 wxPython/contrib/stc/msw/stc_.py | 4 ++--
 wxPython/src/msw/gdi.cpp         | 7 +++++--
 wxPython/src/msw/html.py         | 4 ++--
 wxPython/src/msw/htmlhelp.py     | 4 ++--
 wxPython/src/msw/wx.py           | 4 ++--
 5 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/wxPython/contrib/stc/msw/stc_.py b/wxPython/contrib/stc/msw/stc_.py
index f2434e5541..6450b0d0ff 100644
--- a/wxPython/contrib/stc/msw/stc_.py
+++ b/wxPython/contrib/stc/msw/stc_.py
@@ -15,6 +15,8 @@ from events import *
 
 from streams import *
 
+from utils import *
+
 from mdi import *
 
 from frames import *
@@ -39,8 +41,6 @@ from sizers import *
 
 from filesys import *
 
-from utils import *
-
 def EVT_STC_CHANGE(win, id, func):
     win.Connect(id, -1, wxEVT_STC_CHANGE, func)
 
diff --git a/wxPython/src/msw/gdi.cpp b/wxPython/src/msw/gdi.cpp
index 0f17d0f885..cda64768c9 100644
--- a/wxPython/src/msw/gdi.cpp
+++ b/wxPython/src/msw/gdi.cpp
@@ -190,13 +190,16 @@ public:
         { m_dash = NULL; }
     ~wxPyPen() {
         if (m_dash)
-            delete m_dash;
+            delete [] m_dash;
     }
 
     void SetDashes(int nb_dashes, const wxDash *dash) {
+        if (m_dash)
+            delete [] m_dash;
         m_dash = new wxDash[nb_dashes];
-        for (int i=0; i<nb_dashes; i++)
+        for (int i=0; i<nb_dashes; i++) {
             m_dash[i] = dash[i];
+        }
         wxPen::SetDashes(nb_dashes, m_dash);
     }
 
diff --git a/wxPython/src/msw/html.py b/wxPython/src/msw/html.py
index 2c2c6c31cd..b2db058c73 100644
--- a/wxPython/src/msw/html.py
+++ b/wxPython/src/msw/html.py
@@ -15,6 +15,8 @@ from events import *
 
 from streams import *
 
+from utils import *
+
 from mdi import *
 
 from frames import *
@@ -38,8 +40,6 @@ from printfw import *
 from sizers import *
 
 from filesys import *
-
-from utils import *
 import wx
 class wxHtmlLinkInfoPtr(wxObjectPtr):
     def __init__(self,this):
diff --git a/wxPython/src/msw/htmlhelp.py b/wxPython/src/msw/htmlhelp.py
index b7c5e95d9c..7df23d9cd0 100644
--- a/wxPython/src/msw/htmlhelp.py
+++ b/wxPython/src/msw/htmlhelp.py
@@ -15,6 +15,8 @@ from events import *
 
 from streams import *
 
+from utils import *
+
 from mdi import *
 
 from frames import *
@@ -38,8 +40,6 @@ from printfw import *
 from sizers import *
 
 from filesys import *
-
-from utils import *
 class wxHtmlBookRecordPtr :
     def __init__(self,this):
         self.this = this
diff --git a/wxPython/src/msw/wx.py b/wxPython/src/msw/wx.py
index 59779e933e..9d3d2d20ee 100644
--- a/wxPython/src/msw/wx.py
+++ b/wxPython/src/msw/wx.py
@@ -15,6 +15,8 @@ from events import *
 
 from streams import *
 
+from utils import *
+
 from mdi import *
 
 from frames import *
@@ -38,8 +40,6 @@ from printfw import *
 from sizers import *
 
 from filesys import *
-
-from utils import *
 class wxPyAppPtr(wxEvtHandlerPtr):
     def __init__(self,this):
         self.this = this
-- 
2.45.2