Fixed the embedded smaple so that it actually works, wx-ified the

Python bits

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26561 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxPython/samples/embedded/embedded.cpp b/wxPython/samples/embedded/embedded.cpp
index c89a56e89658406f4a021cd3f2ed2022d30a6081..6a7df70ce320d3dd9b1dbcb193ac76aefa8659a7 100644 (file)
--- a/wxPython/samples/embedded/embedded.cpp
+++ b/wxPython/samples/embedded/embedded.cpp
@@ -82,8 +82,8 @@ void MyApp::Init_wxPython()
     Py_Initialize();
     PyEval_InitThreads();
 
-    // Load the wxPython core API.  Imports the wxPython.wxc
-    // module and sets a pointer to a function table located there.
+    // Load the wxPython core API.  Imports the wx._core module and sets a
+    // local pointer to a function table located there.
     wxPyCoreAPI_IMPORT();
 
     // Save the current Python thread state and release the
@@ -95,10 +95,12 @@ void MyApp::Init_wxPython()
 MyApp::~MyApp()
 {
     // Restore the thread state and tell Python to cleanup after itself.
+    // wxPython will do its own cleanup as part of that process.
     wxPyEndAllowThreads(m_mainTState);
     Py_Finalize();
 }
 
+
 IMPLEMENT_APP(MyApp)
 
 //----------------------------------------------------------------------
@@ -159,8 +161,8 @@ void MyFrame::OnExit(wxCommandEvent& event)
 
 
 char* python_code1 = "\
-from wxPython.wx import wxFrame\n\
-f = wxFrame(None, -1, 'Hello from wxPython!', size=(250, 150))\n\
+import wx\n\
+f = wx.Frame(None, -1, 'Hello from wxPython!', size=(250, 150))\n\
 f.Show()\n\
 ";
 
@@ -190,8 +192,8 @@ void MyFrame::RedirectStdio()
     // only on demand when something is printed, like a traceback.
     char* python_redirect = "\
 import sys\n\
-from wxPython.wx import wxPyOnDemandOutputWindow\n\
-output = wxPyOnDemandOutputWindow()\n\
+import wx\n\
+output = wx.PyOnDemandOutputWindow()\n\
 sys.stdin = sys.stderr = output\n\
 ";
     bool blocked = wxPyBeginBlockThreads();
@@ -253,7 +255,6 @@ wxWindow* MyFrame::DoPythonStuff(wxWindow* parent)
     // wxPython object that wraps it.
     PyObject* arg = wxPyMake_wxObject(parent);
     wxASSERT(arg != NULL);
-
     PyObject* tuple = PyTuple_New(1);
     PyTuple_SET_ITEM(tuple, 0, arg);
     result = PyEval_CallObject(func, tuple);

diff --git a/wxPython/samples/embedded/embedded_sample.py b/wxPython/samples/embedded/embedded_sample.py
index f98c3f3efb5e606a7c83e5eaff2132f78a517785..dc67ef6f454d0925442579f708078c51c98531be 100644 (file)
--- a/wxPython/samples/embedded/embedded_sample.py
+++ b/wxPython/samples/embedded/embedded_sample.py
@@ -1,24 +1,22 @@
-from wxPython.wx import *
-from wxPython.lib.PyCrust import shell, version
+import wx
+from wx.py import shell, version
 
-class MyPanel(wxPanel):
+class MyPanel(wx.Panel):
     def __init__(self, parent):
-        wxPanel.__init__(self, parent, -1)
+        wx.Panel.__init__(self, parent, -1)
         print parent
 
-        text = wxStaticText(self, -1,
+        text = wx.StaticText(self, -1,
                             "Everything on this side of the splitter comes from Python.")
-        text.SetFont(wxFont(12, wxSWISS, wxNORMAL, wxBOLD))
+        text.SetFont(wx.Font(12, wx.SWISS, wx.NORMAL, wx.BOLD))
 
         intro = 'Welcome To PyCrust %s - The Flakiest Python Shell' % version.VERSION
         pycrust = shell.Shell(self, -1, introText=intro)
         #pycrust = wxTextCtrl(self, -1, intro)
 
-        sizer = wxBoxSizer(wxVERTICAL)
-        sizer.Add(text, 0, wxEXPAND|wxALL, 10)
-        sizer.Add(pycrust, 1, wxEXPAND|wxBOTTOM|wxLEFT|wxRIGHT, 10)
+        sizer = wx.BoxSizer(wx.VERTICAL)
+        sizer.Add(text, 0, wx.EXPAND|wx.ALL, 10)
+        sizer.Add(pycrust, 1, wx.EXPAND|wx.BOTTOM|wx.LEFT|wx.RIGHT, 10)
 
         self.SetSizer(sizer)
-        #self.SetAutoLayout(true)
-        #self.Layout()
 

diff --git a/wxPython/samples/embedded/makefile.vc b/wxPython/samples/embedded/makefile.vc
index 44490bee7d37a459ee806f68dcb76b6dd2d74e41..b3bd9f97aa88b5938ad44be8434659f7d3d1367a 100644 (file)
--- a/wxPython/samples/embedded/makefile.vc
+++ b/wxPython/samples/embedded/makefile.vc
@@ -1,13 +1,30 @@
 #
 # Makefile for Windows and MS VIsual C++
 #
+# Currently just setup for the debug version, you'll need a debug
+# version of Python (*_d.*) and wxPython to run this.
+
 
 WXDIR = $(WXWIN)
-PYTHONDIR = d:\tools\Python22
+PYTHONDIR = c:\tools\Python23
+VER = 25d
+
+INCLUDES = -I$(WXDIR)\lib\vc_dll\mswd -I$(WXDIR)\include -I$(WXDIR)\wxPython\include -I$(PYTHONDIR)\include -I$(PYTHONDIR)\PC
+CXXFLAGS = /c /nologo /Od /MDd /W3 /GX /Z7 /D_DEBUG -DWIN32 -D_WINDOWS -D__WXMSW__ -DWXUSINGDLL=1 -DWXP_USE_THREAD=1 -UNDEBUG -D__WXDEBUG__ /Gy
+LIBFLAGS = /nologo /pdb:None /DEBUG /LIBPATH:$(WXDIR)\lib\vc_dll /LIBPATH:$(PYTHONDIR)\libs
+LIBS =     wxbase$(VER).lib wxmsw$(VER)_core.lib \
+          kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib \
+          shell32.lib oldnames.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib \
+          uuid.lib rpcrt4.lib advapi32.lib wsock32.lib
+
+
+all : embedded.exe
+clean : 
+       del *.obj
+       del *.exe
 
-PROGRAM = embedded
-OBJECTS = $(PROGRAM).obj
-EXTRAINC  = /I$(PYTHONDIR)\include /I$(WXDIR)/wxPython/src
-EXTRALIBS = /LIBPATH:$(PYTHONDIR)\libs
+embedded.obj : embedded.cpp
+       cl $(INCLUDES) $(CXXFLAGS) /Fo$@ embedded.cpp
 
-!include $(WXDIR)\src\makeprog.vc
+embedded.exe : embedded.obj
+       link $(LIBFLAGS) embedded.obj $(LIBS) /OUT:$@