Some distrib updates for wxPythonOSX, and reSWIGged a bit

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16803 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2002-08-27 01:11:04 +00:00
parent bffe56c5d1
commit 9c6b482464
6 changed files with 65 additions and 19 deletions

View File

@@ -127,7 +127,7 @@ fi
#-----------------------------------
msg configuring wxWindows
buildDir="$srcPath/build-pkg"
dFlag=
dFlag="--enable-optimise --enable-debug_flag"
if [ $debug ]; then
buildDir="$srcPath/build-pkg-debug"
dFlag="--enable-debug"
@@ -141,7 +141,7 @@ if [ $force ]; then
fi
msgdo mkdir -m 775 "$buildDir"
msgdo cd "$buildDir"
msgdo ../configure --with-mac --with-opengl $dFlag
msgdo ../configure --with-mac --with-opengl --enable-precomp=no $dFlag
cd $curDir
else
@@ -153,12 +153,14 @@ fi
msg building wxWindows
msgdo cd $buildDir
msgdo make
msgdo cd ../locale
msgdo make allmo
cd $curDir
#-----------------------------------
msg installing wxWindows
msgdo mkdir -p -m 755 "$dstPath/$temp/$wxWindowsInst"
msgdo mkdir -p -m 1755 "$dstPath/$temp/$wxWindowsInst"
msgdo cd "$buildDir"
# install once to the package directory, and once to the
@@ -207,13 +209,20 @@ msg copying additional wxPython files
msgdo cp -pR "$srcPath/wxPython/samples" "$dstPath/$temp/$dmgRoot"
msgdo cp -pR "$srcPath/wxPython/demo" "$dstPath/$temp/$dmgRoot"
msgdo cp -pR "$srcPath/wxPython/licence" "$dstPath/$temp/$dmgRoot"
msgdo cp -pR "$srcPath/wxPython/tools" "$dstPath/$temp/$dmgRoot"
find "$dstPath/$temp/$dmgRoot" -name "CVS" -type d -print0 | xargs -0 rm -rf
find "$dstPath/$temp/$dmgRoot" -name ".DS_Store" -type f -print0 | xargs -0 rm
find "$dstPath/$temp/$dmgRoot" -name ".cvsignore" -type f -print0 | xargs -0 rm
find "$dstPath/$temp/$dmgRoot" -name ".#*" -type f -print0 | xargs -0 rm
find "$dstPath/$temp/$dmgRoot" -name "b" -type f -print0 | xargs -0 rm
find "$dstPath/$temp/$dmgRoot" -name "*~*~" -type f -print0 | xargs -0 rm
msgdo cd "$srcPath/wxPython/scripts"
sFiles=`$pythonExec CreateMacScripts.py`
for f in $sFiles; do
msgdo cp $f "$dstPath/$temp/$wxWindowsInst/bin"
done
cd $curDir
msgdo chown -R ${user}:staff "$dstPath/$temp/$dmgRoot"

View File

@@ -38,7 +38,7 @@ sub make_dmg
(my $dmgsize) = split( /\s+/, <MYPIPE>);
close( MYPIPE);
$dmgsize /= 1024;
$dmgsize = int($dmgsize + 2);
$dmgsize = int($dmgsize + 4);
if( $dmgsize < 5 ) {
$dmgsize = 5
}

View File

@@ -1,6 +1,6 @@
Title wxMacPython
Title wxPythonOSX
Version 2.3.3
Description wxMac and wxPython
Description wxMac and wxPython for OSX
DefaultLocation /
DeleteWarning

View File

@@ -1,5 +1,5 @@
#----------------------------------------------------------------------
# Name: CreateMacScriptspy
# Name: CreateMacScripts.py
# Purpose: Massages the scripts to be usable with MachoPython
#
# Author: Robin Dunn
@@ -16,6 +16,9 @@ destdir = os.path.split(python)[0]
pythonw = os.path.join(destdir, 'pythonw')
scriptdir = os.getcwd()
if len(sys.argv) > 1:
destdir = sys.argv[1]
from CreateBatchFiles import scripts
repltxt = "#!/usr/bin/env python"
@@ -27,19 +30,21 @@ exec /Applications/Python.app/Contents/MacOS/python %s.py
def main():
for script, usegui in scripts:
destfile = os.path.join(destdir, script)
print "Creating", destfile
thescript = open(script).read()
if usegui:
f = open(destfile+'.py', 'w')
print destfile+'.py'
f.write(thescript.replace(repltxt, ''))
f.close()
f = open(destfile, 'w')
print destfile
f.write(gui_template % destfile)
f.close()
else:
thescript = thescript.replace(repltxt, '#!'+python)
f = open(destfile, 'w')
print destfile
f.write(thescript)
f.close()

View File

@@ -1529,6 +1529,34 @@ static PyObject *_wrap_wxFrame_SetToolBar(PyObject *self, PyObject *args, PyObje
return _resultobj;
}
#define wxFrame_SendSizeEvent(_swigobj) (_swigobj->SendSizeEvent())
static PyObject *_wrap_wxFrame_SendSizeEvent(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxFrame * _arg0;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxFrame_SendSizeEvent",_kwnames,&_argo0))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFrame_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFrame_SendSizeEvent. Expected _wxFrame_p.");
return NULL;
}
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxFrame_SendSizeEvent(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} Py_INCREF(Py_None);
_resultobj = Py_None;
return _resultobj;
}
static void *SwigwxDialogTowxTopLevelWindow(void *ptr) {
wxDialog *src;
wxTopLevelWindow *dest;
@@ -2620,6 +2648,7 @@ static PyMethodDef framescMethods[] = {
{ "wxDialog_Create", (PyCFunction) _wrap_wxDialog_Create, METH_VARARGS | METH_KEYWORDS },
{ "new_wxPreDialog", (PyCFunction) _wrap_new_wxPreDialog, METH_VARARGS | METH_KEYWORDS },
{ "new_wxDialog", (PyCFunction) _wrap_new_wxDialog, METH_VARARGS | METH_KEYWORDS },
{ "wxFrame_SendSizeEvent", (PyCFunction) _wrap_wxFrame_SendSizeEvent, METH_VARARGS | METH_KEYWORDS },
{ "wxFrame_SetToolBar", (PyCFunction) _wrap_wxFrame_SetToolBar, METH_VARARGS | METH_KEYWORDS },
{ "wxFrame_GetToolBar", (PyCFunction) _wrap_wxFrame_GetToolBar, METH_VARARGS | METH_KEYWORDS },
{ "wxFrame_CreateToolBar", (PyCFunction) _wrap_wxFrame_CreateToolBar, METH_VARARGS | METH_KEYWORDS },

View File

@@ -140,6 +140,9 @@ class wxFramePtr(wxTopLevelWindowPtr):
def SetToolBar(self, *_args, **_kwargs):
val = apply(framesc.wxFrame_SetToolBar,(self,) + _args, _kwargs)
return val
def SendSizeEvent(self, *_args, **_kwargs):
val = apply(framesc.wxFrame_SendSizeEvent,(self,) + _args, _kwargs)
return val
def __repr__(self):
return "<C wxFrame instance at %s>" % (self.this,)
class wxFrame(wxFramePtr):