From: Robin Dunn Date: Wed, 11 May 2005 17:02:20 +0000 (+0000) Subject: compile fixes X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/9ca5a18a01a7d87870427cb0fc1962db2f11a45d compile fixes git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34016 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/wxPython/samples/embedded/embedded_sample.py b/wxPython/samples/embedded/embedded_sample.py index beed13cbb0..56e46926d8 100644 --- a/wxPython/samples/embedded/embedded_sample.py +++ b/wxPython/samples/embedded/embedded_sample.py @@ -10,7 +10,7 @@ class MyPanel(wx.Panel): intro = 'Welcome To PyCrust %s - The Flakiest Python Shell' % version.VERSION pycrust = shell.Shell(self, -1, introText=intro) - #pycrust = wxTextCtrl(self, -1, intro) + #pycrust = wx.TextCtrl(self, -1, intro) sizer = wx.BoxSizer(wx.VERTICAL) sizer.Add(text, 0, wx.EXPAND|wx.ALL, 10) diff --git a/wxPython/samples/embedded/makefile.vc b/wxPython/samples/embedded/makefile.vc index b3bd9f97aa..0fd80fb0b4 100644 --- a/wxPython/samples/embedded/makefile.vc +++ b/wxPython/samples/embedded/makefile.vc @@ -6,13 +6,13 @@ WXDIR = $(WXWIN) -PYTHONDIR = c:\tools\Python23 -VER = 25d +PYTHONDIR = c:\tools\Python24 +VER = 26d 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 \ +LIBFLAGS = /nologo /DEBUG /LIBPATH:$(WXDIR)\lib\vc_dll /LIBPATH:$(PYTHONDIR)\libs +LIBS = wxmsw$(VER).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