зеркало из https://github.com/mozilla/pjs.git
remove warnings on Macintosh; clean up internal API calls
This commit is contained in:
brade%netscape.com
Родитель
5a14a053cb
Коммит
b6007dfca1
|
|
@ -1144,8 +1144,7 @@ void EDT_ResetLayoutElement( ED_Element* /* pElement */, intn /* iEditOffset */,
|
|||
}
|
||||
|
||||
#ifdef DEBUG
|
||||
void EDT_VerifyLayoutElement( MWContext *pContext, LO_Element *pLoElement,
|
||||
XP_Bool bPrint ){
|
||||
void EDT_VerifyLayoutElement( LO_Element *pLoElement ){
|
||||
CEditElement *pElement = pLoElement->lo_any.edit_element;
|
||||
if( pElement ){
|
||||
if( !pElement->IsLeaf() ){
|
||||
|
|
@ -2196,10 +2195,10 @@ void EDT_ImageLoadCancel( MWContext *pContext ){
|
|||
}
|
||||
}
|
||||
|
||||
void EDT_SetImageInfo(MWContext *pContext, int32 ele_id, int32 width, int32 height){
|
||||
void EDT_SetImageInfo(MWContext *pContext, int32 /* ele_id */, int32 width, int32 height){
|
||||
GET_WRITABLE_EDIT_BUF_OR_RETURN(pContext, pEditBuffer);
|
||||
if( pEditBuffer->m_pLoadingImage ){
|
||||
pEditBuffer->m_pLoadingImage->SetImageInfo( ele_id, width, height );
|
||||
pEditBuffer->m_pLoadingImage->SetImageInfo( width, height );
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1655,6 +1655,10 @@ void CEditBuffer::FixupInsertPoint(){
|
|||
}
|
||||
|
||||
void CEditBuffer::FixupInsertPoint(CEditInsertPoint& ip){
|
||||
XP_ASSERT(ip.m_pElement);
|
||||
if ( ip.m_pElement == NULL )
|
||||
return;
|
||||
|
||||
if( ip.m_iPos == 0 && ! IsPhantomInsertPoint(ip) ){
|
||||
CEditLeafElement *pPrev = ip.m_pElement->PreviousLeafInContainer();
|
||||
if( pPrev && pPrev->GetLen() != 0 ){
|
||||
|
|
@ -2120,7 +2124,7 @@ void CEditBuffer::Reflow( CEditElement* pStartElement,
|
|||
CEditTagCursor cursor(this, pEdStart, iOffset, pEndElement);
|
||||
//CEditTagCursor *pCursor = new CEditTagCursor(this, m_pRoot, iOffset);
|
||||
|
||||
LO_EditorReflow(m_pContext, &cursor, iLineNum, iOffset, m_bDisplayTables);
|
||||
LO_EditorReflow(m_pContext, &cursor, iLineNum, iOffset);
|
||||
|
||||
|
||||
#if defined( DEBUG_shannon )
|
||||
|
|
@ -12780,6 +12784,8 @@ EDT_ClipboardResult CEditBuffer::PasteCellsIntoTable( IStreamIn& stream, EEditCo
|
|||
|
||||
// Shouldn't be here if this is "normal" or entire table
|
||||
XP_ASSERT(iCopyType > eCopyTable);
|
||||
if ( iCopyType > eCopyTable )
|
||||
return EDT_COP_CLIPBOARD_BAD;
|
||||
|
||||
// Move caret into target cell
|
||||
if( m_pDragTableData )
|
||||
|
|
@ -12813,7 +12819,7 @@ EDT_ClipboardResult CEditBuffer::PasteCellsIntoTable( IStreamIn& stream, EEditCo
|
|||
int32 bMergeEnd = stream.ReadInt();
|
||||
CEditTableElement* pSourceTable =(CEditTableElement*)CEditElement::StreamCtor(&stream, this);
|
||||
|
||||
XP_ASSERT(pSourceTable->IsTable());
|
||||
XP_ASSERT(pSourceTable && pSourceTable->IsTable());
|
||||
|
||||
if( pTableCell && pSourceTable )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -110,7 +110,7 @@ void CEditImageLoader::LoadImage(){
|
|||
|
||||
// The image library is telling us the size of the image. Actually do the
|
||||
// insert now.
|
||||
void CEditImageLoader::SetImageInfo(int32 ele_id, int32 width, int32 height){
|
||||
void CEditImageLoader::SetImageInfo(int32 width, int32 height){
|
||||
if( m_pImageData->iHeight == 0 || m_pImageData->iWidth == 0 ){
|
||||
m_pImageData->iHeight = height;
|
||||
m_pImageData->iWidth = width;
|
||||
|
|
@ -140,7 +140,7 @@ extern "C"
|
|||
#else
|
||||
PRIVATE
|
||||
#endif
|
||||
unsigned int edt_file_save_stream_write_ready( NET_StreamClass *stream ){
|
||||
unsigned int edt_file_save_stream_write_ready( NET_StreamClass * /* stream */ ){
|
||||
return MAX_WRITE_READY;
|
||||
}
|
||||
|
||||
|
|
@ -159,7 +159,7 @@ extern "C"
|
|||
#else
|
||||
PRIVATE
|
||||
#endif
|
||||
void edt_file_save_stream_complete( NET_StreamClass *stream ){
|
||||
void edt_file_save_stream_complete( NET_StreamClass * /* stream */ ){
|
||||
}
|
||||
|
||||
#if defined(XP_OS2)
|
||||
|
|
@ -167,7 +167,7 @@ extern "C"
|
|||
#else
|
||||
PRIVATE
|
||||
#endif
|
||||
void edt_file_save_stream_abort (NET_StreamClass *stream, int status) {
|
||||
void edt_file_save_stream_abort (NET_StreamClass * /* stream */, int /* status */ ) {
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -176,10 +176,10 @@ extern "C"
|
|||
#else
|
||||
PRIVATE
|
||||
#endif
|
||||
void edt_UrlExit( URL_Struct *pURL, int status, MWContext *context )
|
||||
void edt_UrlExit( URL_Struct *pURL, int status, MWContext * /* context */ )
|
||||
{
|
||||
// hardts, changed from CEditSaveObject to CFileSaveObject
|
||||
((CFileSaveObject*)(pURL->fe_data))->NetFetchDone(pURL, status, context );
|
||||
((CFileSaveObject*)(pURL->fe_data))->NetFetchDone(status);
|
||||
|
||||
NET_FreeURLStruct(pURL);
|
||||
}
|
||||
|
|
@ -189,7 +189,7 @@ extern "C"
|
|||
#else
|
||||
PRIVATE
|
||||
#endif
|
||||
NET_StreamClass * edt_MakeFileSaveStream (int format_out, void *closure,
|
||||
NET_StreamClass * edt_MakeFileSaveStream (int /* format_out */, void * /* closure */,
|
||||
URL_Struct *url, MWContext *context ) {
|
||||
|
||||
NET_StreamClass *stream;
|
||||
|
|
@ -242,7 +242,7 @@ extern "C"
|
|||
// CFileSaveObject
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
CFileSaveObject::CFileSaveObject( MWContext *pContext, char *pSrcURL,
|
||||
CFileSaveObject::CFileSaveObject( MWContext *pContext,
|
||||
ITapeFileSystem *tapeFS, XP_Bool bAutoSave,
|
||||
CEditSaveToTempData *pSaveToTempData) :
|
||||
m_pContext( pContext ) ,
|
||||
|
|
@ -527,7 +527,7 @@ void CFileSaveObject::CheckFinishedSave(intn oneBased,ED_FileError iError) // on
|
|||
}
|
||||
}
|
||||
|
||||
void CFileSaveObject::NetFetchDone( URL_Struct *pUrl, int status, MWContext *pContext ){
|
||||
void CFileSaveObject::NetFetchDone( int status ){
|
||||
// close the file in any case.
|
||||
if( m_pOutStream ){
|
||||
m_tapeFS->CloseStream(m_iCurFile-1);
|
||||
|
|
@ -859,7 +859,7 @@ CEditSaveObject::CEditSaveObject( CEditBuffer *pBuffer,
|
|||
XP_Bool bAutoAdjustLinks,
|
||||
XP_Bool bAutoSave,
|
||||
CEditSaveToTempData *pSaveToTempData ) :
|
||||
CFileSaveObject( pBuffer->m_pContext,pSrcURL,tapeFS,bAutoSave, pSaveToTempData ),
|
||||
CFileSaveObject( pBuffer->m_pContext,tapeFS,bAutoSave, pSaveToTempData ),
|
||||
m_pBuffer( pBuffer ),
|
||||
m_pDocStateSave( 0 ),
|
||||
m_pSrcURL( XP_STRDUP( pSrcURL ) ),
|
||||
|
|
@ -1720,7 +1720,7 @@ typedef struct edtPrivStructStr {
|
|||
} edtPrivStruct;
|
||||
|
||||
static unsigned int
|
||||
edt_TapeIsReady(NET_StreamClass *stream) {
|
||||
edt_TapeIsReady(NET_StreamClass * /* stream */ ) {
|
||||
return MAX_WRITE_READY;
|
||||
}
|
||||
|
||||
|
|
@ -1733,7 +1733,7 @@ edt_TapeComplete(NET_StreamClass *stream) {
|
|||
}
|
||||
|
||||
static void
|
||||
edt_TapeAbort(NET_StreamClass *stream, int status) {
|
||||
edt_TapeAbort(NET_StreamClass *stream, int /* status */) {
|
||||
edt_TapeComplete(stream);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -863,7 +863,7 @@ LO_Element *lo_strip_mquotes(LO_Element **elist)
|
|||
}
|
||||
|
||||
void LO_EditorReflow(MWContext *context, ED_TagCursor *pCursor,
|
||||
int32 iStartLine, int iStartEditOffset, XP_Bool bDisplayTables)
|
||||
int32 iStartLine, int iStartEditOffset)
|
||||
{
|
||||
PA_Tag *pTag;
|
||||
PA_Tag *pNextTag = 0;
|
||||
|
|
@ -1576,9 +1576,11 @@ void LO_PositionCaretBounded(MWContext *context, int32 x, int32 y,
|
|||
}
|
||||
}
|
||||
|
||||
#if 0
|
||||
PRIVATE
|
||||
void LO_Resize( MWContext *pContext ){
|
||||
void LO_Resize( MWContext * pContext ){
|
||||
}
|
||||
#endif
|
||||
|
||||
void LO_RefetchWindowDimensions( MWContext *pContext ){
|
||||
int32 doc_id;
|
||||
|
|
@ -1674,7 +1676,7 @@ lo_VerifyList( MWContext *pContext, lo_TopState* top_state,
|
|||
*/
|
||||
if ( eptr->lo_any.edit_element != NULL )
|
||||
{
|
||||
/*EDT_VerifyLayoutElement( pContext, eptr, print );*/
|
||||
/*EDT_VerifyLayoutElement( eptr );*/
|
||||
}
|
||||
/*
|
||||
* Update our loop variables
|
||||
|
|
@ -1989,7 +1991,6 @@ lo_VerifyStateLayoutImplementation( MWContext *pContext, lo_TopState *top_state,
|
|||
* Prints information to stderr if the layout is invalid.
|
||||
*/
|
||||
Bool result;
|
||||
int32 doc_id;
|
||||
LO_Element **array;
|
||||
LO_Element *eptr;
|
||||
LO_Element *start;
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче