* wxStream fixes (integer/line parsing).

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

diff --git a/utils/wxPython/src/utils.i b/utils/wxPython/src/utils.i
index c5ce6f4de9e5f6e816b6d3494270be93f0d50327..d3c46612ca7ce444d72bab9d828b2695f8ea6656 100644 (file)
--- a/utils/wxPython/src/utils.i
+++ b/utils/wxPython/src/utils.i
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        utils.i
-// Purpose:     SWIG definitions of various utility classes classes
+// Purpose:     SWIG definitions of various utility classes
 //
 // Author:      Robin Dunn
 //
@@ -24,11 +24,11 @@
 %include my_typemaps.i
 
 
-#ifdef SEPARATE
 %{
-    static wxString wxPyEmptyStr("");
-%}
+#ifdef SEPARATE
+    wxString wxPyEmptyStr("");
 #endif
+%}
 
 
 %{
@@ -54,14 +54,9 @@ public:
              long style = 0);
     ~wxConfig();
 
-    //static wxConfigBase * Create();
-    //static wxConfigBase * Get();
-    //static wxConfigBase * Set(wxConfigBase *pConfig);
-
-
 
     void DontCreateOnDemand();
-    // **** DANGER Will Robinson! DANGER!  bool DeleteAll();
+    bool DeleteAll();  // This is supposed to have been fixed...
     bool DeleteEntry(const wxString& key, bool bDeleteGroupIfEmpty = TRUE);
     bool DeleteGroup(const wxString& key);
     bool Exists(wxString& strName);
@@ -121,11 +116,9 @@ public:
     %name(ReadInt)long Read(const wxString& key, long defaultVal = 0);
     %name(ReadFloat)double Read(const wxString& key, double defaultVal = 0.0);
 
-    void SetAppName(const wxString& appName);
     void SetExpandEnvVars (bool bDoIt = TRUE);
     void SetPath(const wxString& strPath);
     void SetRecordDefaults(bool bDoIt = TRUE);
-    void SetVendorName(const wxString& vendorName);
 
     bool Write(const wxString& key, const wxString& value);
     %name(WriteInt)bool Write(const wxString& key, long value);
@@ -135,25 +128,12 @@ public:
 
 
 //---------------------------------------------------------------------------
-/////////////////////////////////////////////////////////////////////////////
-//
-// $Log$
-// Revision 1.1  1998/12/15 20:41:23  RD
-// Changed the import semantics from "from wxPython import *" to "from
-// wxPython.wx import *"  This is for people who are worried about
-// namespace pollution, they can use "from wxPython import wx" and then
-// prefix all the wxPython identifiers with "wx."
-//
-// Added wxTaskbarIcon for wxMSW.
-//
-// Made the events work for wxGrid.
-//
-// Added wxConfig.
-//
-// Added wxMiniFrame for wxGTK, (untested.)
-//
-// Changed many of the args and return values that were pointers to gdi
-// objects to references to reflect changes in the wxWindows API.
-//
-// Other assorted fixes and additions.
-//
+
+%init %{
+
+    wxClassInfo::CleanUpClasses();
+    wxClassInfo::InitializeClasses();
+
+%}
+
+//---------------------------------------------------------------------------