Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Python bits


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26561 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2004-04-01 19:22:09 +00:00
parent 6b7e0a8639
commit 2620b36e03
3 changed files with 40 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
wxPython/samples/embedded/embedded.cpp
View File

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

20
wxPython/samples/embedded/embedded_sample.py
View File

@@ -1,24 +1,22 @@
from wxPython.wx import * import wx
from wxPython.lib.PyCrust import shell, version from wx.py import shell, version
class MyPanel(wxPanel): class MyPanel(wx.Panel):
def __init__(self, parent): def __init__(self, parent):
wxPanel.__init__(self, parent, -1) wx.Panel.__init__(self, parent, -1)
print parent print parent
text = wxStaticText(self, -1, text = wx.StaticText(self, -1,
"Everything on this side of the splitter comes from Python.") "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 intro = 'Welcome To PyCrust %s - The Flakiest Python Shell' % version.VERSION
pycrust = shell.Shell(self, -1, introText=intro) pycrust = shell.Shell(self, -1, introText=intro)
#pycrust = wxTextCtrl(self, -1, intro) #pycrust = wxTextCtrl(self, -1, intro)
sizer = wxBoxSizer(wxVERTICAL) sizer = wx.BoxSizer(wx.VERTICAL)
sizer.Add(text, 0, wxEXPAND|wxALL, 10) sizer.Add(text, 0, wx.EXPAND|wx.ALL, 10)
sizer.Add(pycrust, 1, wxEXPAND|wxBOTTOM|wxLEFT|wxRIGHT, 10) sizer.Add(pycrust, 1, wx.EXPAND|wx.BOTTOM|wx.LEFT|wx.RIGHT, 10)
self.SetSizer(sizer) self.SetSizer(sizer)
#self.SetAutoLayout(true)
#self.Layout()

29
wxPython/samples/embedded/makefile.vc
View File

@@ -1,13 +1,30 @@
# #
# Makefile for Windows and MS VIsual C++ # 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) WXDIR = $(WXWIN)
PYTHONDIR = d:\tools\Python22 PYTHONDIR = c:\tools\Python23
VER = 25d
PROGRAM = embedded INCLUDES = -I$(WXDIR)\lib\vc_dll\mswd -I$(WXDIR)\include -I$(WXDIR)\wxPython\include -I$(PYTHONDIR)\include -I$(PYTHONDIR)\PC
OBJECTS = $(PROGRAM).obj 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
EXTRAINC = /I$(PYTHONDIR)\include /I$(WXDIR)/wxPython/src LIBFLAGS = /nologo /pdb:None /DEBUG /LIBPATH:$(WXDIR)\lib\vc_dll /LIBPATH:$(PYTHONDIR)\libs
EXTRALIBS = /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
!include $(WXDIR)\src\makeprog.vc
all : embedded.exe
clean :
del *.obj
del *.exe
embedded.obj : embedded.cpp
cl $(INCLUDES) $(CXXFLAGS) /Fo$@ embedded.cpp
embedded.exe : embedded.obj
link $(LIBFLAGS) embedded.obj $(LIBS) /OUT:$@