correction for memory leak

[wxWidgets.git] / wxPython / src / utils.i

diff --git a/wxPython/src/utils.i b/wxPython/src/utils.i
index 03fad77f9f94dec72f6b3ad0474324eba809ad6e..dc975a793843b2fa67be496537edeffea242967d 100644 (file)
--- a/wxPython/src/utils.i
+++ b/wxPython/src/utils.i
@@ -4,7 +4,7 @@
 //
 // Author:      Robin Dunn
 //
 //
 // Author:      Robin Dunn
 //

-// Created:     25-nov-1998
+// Created:     25-Nov-1998

 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 by Total Control Software
 // Licence:     wxWindows license
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 by Total Control Software
 // Licence:     wxWindows license


@@ -14,7 +14,7 @@
 %module utils
 
 %{
 %module utils
 
 %{

-#include "helpers.h"
+#include "export.h"

 #include <wx/config.h>
 #include <wx/fileconf.h>
 #include <wx/datetime.h>
 #include <wx/config.h>
 #include <wx/fileconf.h>
 #include <wx/datetime.h>


@@ -25,12 +25,17 @@
 %include typemaps.i
 %include my_typemaps.i
 
 %include typemaps.i
 %include my_typemaps.i
 

+// Import some definitions of other classes, etc.
+%import _defs.i
+

 %pragma(python) code = "import string"
 
 
 //---------------------------------------------------------------------------
 
 %{
 %pragma(python) code = "import string"
 
 
 //---------------------------------------------------------------------------
 
 %{

+    static wxString wxPyEmptyStr("");
+

     static PyObject* __EnumerationHelper(bool flag, wxString& str, long index) {
         PyObject* ret = PyTuple_New(3);
         if (ret) {
     static PyObject* __EnumerationHelper(bool flag, wxString& str, long index) {
         PyObject* ret = PyTuple_New(3);
         if (ret) {


@@ -511,10 +516,10 @@ public:
                       int n = 1,
                       Month month = Inv_Month,
                       int year = Inv_Year);
                       int n = 1,
                       Month month = Inv_Month,
                       int year = Inv_Year);

-    wxDateTime GetWeekDay(WeekDay weekday,
-                          int n = 1,
-                          Month month = Inv_Month,
-                          int year = Inv_Year);
+//      wxDateTime GetWeekDay(WeekDay weekday,
+//                            int n = 1,
+//                            Month month = Inv_Month,
+//                            int year = Inv_Year);

 
         // sets to the last weekday in the given month, year
     bool SetToLastWeekDay(WeekDay weekday,
 
         // sets to the last weekday in the given month, year
     bool SetToLastWeekDay(WeekDay weekday,


@@ -1027,10 +1032,8 @@ wxLongLong wxGetLocalTimeMillis();
 //---------------------------------------------------------------------------
 
 %init %{
 //---------------------------------------------------------------------------
 
 %init %{

-
-//    wxClassInfo::CleanUpClasses();
-//    wxClassInfo::InitializeClasses();
-
+    wxClassInfo::CleanUpClasses();
+    wxClassInfo::InitializeClasses();

 %}
 
 //---------------------------------------------------------------------------
 %}
 
 //---------------------------------------------------------------------------