X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/faf3cb3590e7bead27735c94014df39025cfc12b..d3b4d1131395d0413bd904579a310f6d9f7382f7:/utils/wxPython/src/helpers.cpp

diff --git a/utils/wxPython/src/helpers.cpp b/utils/wxPython/src/helpers.cpp
index a89b3502e8..834319f037 100644
--- a/utils/wxPython/src/helpers.cpp
+++ b/utils/wxPython/src/helpers.cpp
@@ -21,12 +21,6 @@
 #include <Python.h>
 #include "helpers.h"
 
-#ifdef __WXGTK__
-#ifdef wxUSE_GDK_IMLIB
-#include "gdk_imlib/gdk_imlib.h"
-#endif
-#endif
-
 //---------------------------------------------------------------------------
 
 //wxHashTable*  wxPyWindows = NULL;
@@ -103,7 +97,7 @@ void wxPyApp::AfterMainLoop(void) {
 #ifdef __WXGTK__
     wxApp::CommonCleanUp();
 #endif
-    delete wxPythonApp;
+//    delete wxPythonApp;
 }
 
 
@@ -140,12 +134,6 @@ void __wxPreStart()
     gtk_init( &argc, &argv );
     delete [] argv;
 
-#ifdef wxUSE_GDK_IMLIB
-    gdk_imlib_init();
-    gtk_widget_push_visual(gdk_imlib_get_visual());
-    gtk_widget_push_colormap(gdk_imlib_get_colormap());
-#endif
-
     wxApp::CommonInit();
 #endif
 
@@ -370,6 +358,29 @@ void wxPyTimer::Notify() {
 // imcluded in every file...
 
 
+byte* byte_LIST_helper(PyObject* source) {
+    if (!PyList_Check(source)) {
+        PyErr_SetString(PyExc_TypeError, "Expected a list object.");
+        return NULL;
+    }
+    int count = PyList_Size(source);
+    byte* temp = new byte[count];
+    if (! temp) {
+        PyErr_SetString(PyExc_MemoryError, "Unable to allocate temporary array");
+        return NULL;
+    }
+    for (int x=0; x<count; x++) {
+        PyObject* o = PyList_GetItem(source, x);
+        if (! PyInt_Check(o)) {
+            PyErr_SetString(PyExc_TypeError, "Expected a list of integers.");
+            return NULL;
+        }
+        temp[x] = (byte)PyInt_AsLong(o);
+    }
+    return temp;
+}
+
+
 int* int_LIST_helper(PyObject* source) {
     if (!PyList_Check(source)) {
         PyErr_SetString(PyExc_TypeError, "Expected a list object.");
@@ -579,6 +590,34 @@ wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source) {
 /////////////////////////////////////////////////////////////////////////////
 //
 // $Log$
+// Revision 1.16  1998/12/17 14:07:39  RR
+//   Removed minor differences between wxMSW and wxGTK
+//
+// Revision 1.15  1998/12/15 20:41:19  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.
+//
+// Revision 1.14  1998/11/25 08:45:25  RD
+//
+// Added wxPalette, wxRegion, wxRegionIterator, wxTaskbarIcon
+// Added events for wxGrid
+// Other various fixes and additions
+//
 // Revision 1.13  1998/11/15 23:03:45  RD
 // Removing some ifdef's for wxGTK
 //