SWIGged updates

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

diff --git a/wxPython/contrib/stc/msw/stc_.py b/wxPython/contrib/stc/msw/stc_.py
index f2434e55412a2b7ee64d45504987ca7c02a6502f..6450b0d0ff11208a56a6ba8f7ccfbf2ff1fb8164 100644 (file)
--- 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 0f17d0f88582cddb3947e76f5c449264b257ca5f..cda64768c944780b15069a53decf8b1310609573 100644 (file)
--- 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 2c2c6c31cda4355727e75592cf153e2509b77359..b2db058c73552c22c849e2c6335ce25c35fc9b85 100644 (file)
--- 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 b7c5e95d9cc365c5588c3e16d48453ea4c1a2106..7df23d9cd0e9aae56eec3d720193f8de602f3717 100644 (file)
--- 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 59779e933e2c977a628f2b516563c1ca8c42bcbc..9d3d2d20ee9941adaa8dcac242dd0a0ea0992b24 100644 (file)
--- 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