Some doc corrections (added blank lines at end of docs); corrected Forty sample

[wxWidgets.git] / utils / wxPython / src / helpers.cpp

diff --git a/utils/wxPython/src/helpers.cpp b/utils/wxPython/src/helpers.cpp
index 360162936994ea146208b19c9bdb5439e001d82b..ae7a8321aea6a16236aa717780aca749647ec418 100644 (file)
--- a/utils/wxPython/src/helpers.cpp
+++ b/utils/wxPython/src/helpers.cpp
@@ -17,15 +17,14 @@
 #undef LoadAccelerators
 #endif
 
 #undef LoadAccelerators
 #endif
 

+#ifdef __WXGTK__
+#include "gtk/gtk.h"
+#endif
+

 #undef DEBUG
 #include <Python.h>
 #include "helpers.h"
 #undef DEBUG
 #include <Python.h>
 #include "helpers.h"

-
-#ifdef __WXGTK__
-#ifdef wxUSE_GDK_IMLIB
-#include "gdk_imlib/gdk_imlib.h"
-#endif
-#endif
+#include <wx/module.h>

 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------
 


@@ -77,7 +76,6 @@ int  wxPyApp::MainLoop(void) {
 void wxPyApp::AfterMainLoop(void) {
     // more stuff from wxEntry...
 
 void wxPyApp::AfterMainLoop(void) {
     // more stuff from wxEntry...
 

-#ifdef __WXMSW__

     if (wxPythonApp->GetTopWindow()) {
         // Forcibly delete the window.
         if (wxPythonApp->GetTopWindow()->IsKindOf(CLASSINFO(wxFrame)) ||
     if (wxPythonApp->GetTopWindow()) {
         // Forcibly delete the window.
         if (wxPythonApp->GetTopWindow()->IsKindOf(CLASSINFO(wxFrame)) ||


@@ -91,18 +89,12 @@ void wxPyApp::AfterMainLoop(void) {
             wxPythonApp->SetTopWindow(NULL);
         }
     }
             wxPythonApp->SetTopWindow(NULL);
         }
     }

-#endif

 #ifdef __WXGTK__
       wxPythonApp->DeletePendingObjects();
 #endif
 
     wxPythonApp->OnExit();
 #ifdef __WXGTK__
       wxPythonApp->DeletePendingObjects();
 #endif
 
     wxPythonApp->OnExit();

-#ifdef __WXMSW__

     wxApp::CleanUp();
     wxApp::CleanUp();

-#endif
-#ifdef __WXGTK__
-    wxApp::CommonCleanUp();
-#endif

 //    delete wxPythonApp;
 }
 
 //    delete wxPythonApp;
 }
 


@@ -126,9 +118,8 @@ void __wxPreStart()
 #ifdef __WXMSW__
     wxApp::Initialize();
 #endif
 #ifdef __WXMSW__
     wxApp::Initialize();
 #endif

-#ifdef __WXGTK__
-    wxClassInfo::InitializeClasses();

 
 

+#ifdef __WXGTK__

     PyObject* sysargv = PySys_GetObject("argv");
     int argc = PyList_Size(sysargv);
     char** argv = new char*[argc+1];
     PyObject* sysargv = PySys_GetObject("argv");
     int argc = PyList_Size(sysargv);
     char** argv = new char*[argc+1];


@@ -137,16 +128,11 @@ void __wxPreStart()
         argv[x] = PyString_AsString(PyList_GetItem(sysargv, x));
     argv[argc] = NULL;
 
         argv[x] = PyString_AsString(PyList_GetItem(sysargv, x));
     argv[argc] = NULL;
 

+    gtk_set_locale();

     gtk_init( &argc, &argv );
     delete [] argv;
 
     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();
+    wxApp::Initialize();     // may return FALSE. Should we check?

 #endif
 
 }
 #endif
 
 }


@@ -195,12 +181,7 @@ PyObject* __wxStart(PyObject* /* self */, PyObject* args)
     if (! bResult) {
         wxPythonApp->DeletePendingObjects();
         wxPythonApp->OnExit();
     if (! bResult) {
         wxPythonApp->DeletePendingObjects();
         wxPythonApp->OnExit();

-#ifdef __WXMSW__

         wxApp::CleanUp();
         wxApp::CleanUp();

-#endif
-#ifdef __WXGTK__
-        wxApp::CommonCleanUp();
-#endif

         PyErr_SetString(PyExc_SystemExit, "OnInit returned false, exiting...");
         return NULL;
     }
         PyErr_SetString(PyExc_SystemExit, "OnInit returned false, exiting...");
         return NULL;
     }


@@ -602,6 +583,23 @@ wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source) {
 /////////////////////////////////////////////////////////////////////////////
 //
 // $Log$
 /////////////////////////////////////////////////////////////////////////////
 //
 // $Log$

+// Revision 1.18  1999/01/30 08:17:27  RD
+// Added wxSashWindow, wxSashEvent, wxLayoutAlgorithm, etc.
+//
+// Various cleanup, tweaks, minor additions, etc. to maintain
+// compatibility with the current wxWindows.
+//
+// Revision 1.17  1999/01/30 07:30:12  RD
+//
+// Added wxSashWindow, wxSashEvent, wxLayoutAlgorithm, etc.
+//
+// Various cleanup, tweaks, minor additions, etc. to maintain
+// compatibility with the current wxWindows.
+//
+// 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
 // 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