code cleanup and comments

scripting/wx_python_helpers.cpp

@@ -33,141 +33,157 @@
 #include <wx/arrstr.h>
 
 
-
 #define WX_DEFAULTENCODING_SIZE 64
 
 static char wxPythonEncoding[WX_DEFAULTENCODING_SIZE] = "ascii";
 
 
-PyObject* wxArrayString2PyList(const wxArrayString& lst)
+PyObject* wxArrayString2PyList( const wxArrayString& lst )
 {
-    PyObject* list = PyList_New(0);
-    for (size_t i=0; i < lst.GetCount(); i++) {
+    PyObject* list = PyList_New( 0 );
+
+    for( size_t i = 0; i < lst.GetCount(); i++ )
+    {
 #if wxUSE_UNICODE
-        PyObject* pyStr = PyUnicode_FromWideChar(lst[i].c_str(), 
-                                                 lst[i].Len()
-                                                );
+        PyObject* pyStr = PyUnicode_FromWideChar( lst[i].c_str(),
+                                                  lst[i].Len()
+                                                  );
 #else
-        PyObject* pyStr = PyString_FromStringAndSize(lst[i].c_str(), 
-                                                     lst[i].Len()
-                                                    );
+        PyObject* pyStr = PyString_FromStringAndSize( lst[i].c_str(),
+                                                      lst[i].Len()
+                                                      );
 #endif
-        PyList_Append(list, pyStr);
-        Py_DECREF(pyStr);
+        PyList_Append( list, pyStr );
+        Py_DECREF( pyStr );
     }
+
     return list;
 }
 
 
+wxString* newWxStringFromPy( PyObject* src )
+{
+    bool        must_unref_str = false;
 
-wxString* newWxStringFromPy(PyObject* src) {
-
-    bool must_unref_str=false;
-
-    wxString* result = NULL;
-    PyObject *obj=src;
+    wxString*   result = NULL;
+    PyObject*   obj    = src;
 
 #if wxUSE_UNICODE
-    bool must_unref_obj=false;    
-    // Unicode string to python unicode string 
-    PyObject* uni_str = src;
+    bool        must_unref_obj = false;
+    // Unicode string to python unicode string
+    PyObject*   uni_str = src;
 
     // if not an str or unicode, try to str(src)
-    if (!PyString_Check(src) && !PyUnicode_Check(src)) 
+    if( !PyString_Check( src ) && !PyUnicode_Check( src ) )
     {
-        obj = PyObject_Str(src);
-	must_unref_obj = true;
-        if (PyErr_Occurred()) return NULL;
+        obj = PyObject_Str( src );
+        must_unref_obj = true;
+
+        if( PyErr_Occurred() )
+            return NULL;
     }
 
-    if (PyString_Check(obj)) 
+    if( PyString_Check( obj ) )
     {
-        uni_str = PyUnicode_FromEncodedObject(obj, wxPythonEncoding, "strict");
+        uni_str = PyUnicode_FromEncodedObject( obj, wxPythonEncoding, "strict" );
         must_unref_str = true;
-        if (PyErr_Occurred()) return NULL;
+
+        if( PyErr_Occurred() )
+            return NULL;
     }
 
     result = new wxString();
-    size_t len = PyUnicode_GET_SIZE(uni_str);
-    if (len) 
+    size_t len = PyUnicode_GET_SIZE( uni_str );
+
+    if( len )
     {
-        PyUnicode_AsWideChar((PyUnicodeObject*)uni_str,
-                             wxStringBuffer(*result, len),len);
+        PyUnicode_AsWideChar( (PyUnicodeObject*) uni_str,
+                              wxStringBuffer( *result, len ), len );
     }
 
-    if (must_unref_str) Py_DECREF(uni_str);
-    if (must_unref_obj) Py_DECREF(obj);
+    if( must_unref_str )
+        Py_DECREF( uni_str );
+
+    if( must_unref_obj )
+        Py_DECREF( obj );
+
 #else
-    // normal string (or object) to normal python string 
+    // normal string (or object) to normal python string
     PyObject* str = src;
 
-    if (PyUnicode_Check(src)) // if it's unicode convert to normal string
+    if( PyUnicode_Check( src ) ) // if it's unicode convert to normal string
     {
-        str = PyUnicode_AsEncodedString(src, wxPythonEncoding, "strict");
-        if (PyErr_Occurred()) return NULL;
+        str = PyUnicode_AsEncodedString( src, wxPythonEncoding, "strict" );
+
+        if( PyErr_Occurred() )
+            return NULL;
     }
-    else if (!PyString_Check(src)) // if it's not a string, str(obj)
+    else if( !PyString_Check( src ) ) // if it's not a string, str(obj)
     {
-        str = PyObject_Str(src);
- 	must_unref_str = true;
-        if (PyErr_Occurred()) return NULL;
+        str = PyObject_Str( src );
+        must_unref_str = true;
+
+        if( PyErr_Occurred() )
+            return NULL;
     }
 
     // get the string pointer and size
-    char* str_ptr; 
-    Py_ssize_t str_size;
-    PyString_AsStringAndSize(str, &str_ptr, &str_size);
+    char*       str_ptr;
+    Py_ssize_t  str_size;
+    PyString_AsStringAndSize( str, &str_ptr, &str_size );
 
     // build the wxString from our pointer / size
-    result = new wxString(str_ptr, str_size);
+    result = new wxString( str_ptr, str_size );
 
-    if (must_unref_str) Py_DECREF(str);
-#endif 
+    if( must_unref_str )
+        Py_DECREF( str );
+
+#endif
 
     return result;
 }
 
 
-wxString Py2wxString(PyObject* src)
+wxString Py2wxString( PyObject* src )
 {
-    wxString result;
-    wxString* resPtr = newWxStringFromPy(src);    
-    
-    // In case of exception clear it and return an empty string  
-    if (resPtr==NULL) 
+    wxString    result;
+    wxString*   resPtr = newWxStringFromPy( src );
+
+    // In case of exception clear it and return an empty string
+    if( resPtr==NULL )
     {
-	PyErr_Clear();
-	return wxEmptyString;
+        PyErr_Clear();
+        return wxEmptyString;
     }
-    
+
     result = *resPtr;
 
-    delete resPtr;    
+    delete resPtr;
 
     return result;
 }
 
 
-PyObject* wx2PyString(const wxString& src)
+PyObject* wx2PyString( const wxString& src )
 {
     PyObject* str;
+
 #if wxUSE_UNICODE
-    str = PyUnicode_FromWideChar(src.c_str(), src.Len());
+    str = PyUnicode_FromWideChar( src.c_str(), src.Len() );
 #else
-    str = PyString_FromStringAndSize(src.c_str(), src.Len());
+    str = PyString_FromStringAndSize( src.c_str(), src.Len() );
 #endif
     return str;
 }
 
 
-
-void wxSetDefaultPyEncoding(const char* encoding)
+void wxSetDefaultPyEncoding( const char* encoding )
 {
-    strncpy(wxPythonEncoding, encoding, WX_DEFAULTENCODING_SIZE);
+    strncpy( wxPythonEncoding, encoding, WX_DEFAULTENCODING_SIZE );
 }
 
+
 const char* wxGetDefaultPyEncoding()
 {
     return wxPythonEncoding;
 }
-