Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-26 06:11:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Changes for qnx(photon) platform only. They should not affect building/runtime other platforms.

Browse Source 
Dnd related changes. Also remove the flag that makes all the windows resizeable by default, since
now their size should be calculated correctly.
This commit is contained in:
amardare%qnx.com 2004-08-10 13:35:41 +00:00
parent 663acc74b8
commit 8dd42a87bd
2 changed files with 22 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
widget/src/photon/nsDragService.cpp
View File

@ -185,33 +185,30 @@ nsDragService::InvokeDragSession (nsIDOMNode *aDOMNode,
nsXPIDLCString flavorStr;
currentFlavor->ToString ( getter_Copies(flavorStr) );
const char *FlavourStr = ( const char * ) flavorStr;
if( !strcmp( FlavourStr, kUnicodeMime ) || !strcmp( FlavourStr, kTextMime ) ||
!strcmp( FlavourStr, kURLMime ) || !strcmp( FlavourStr, kHTMLMime ) ) {
nsCOMPtr<nsISupports> data;
PRUint32 tmpDataLen = 0;
nsresult rv = currItem->GetTransferData( FlavourStr, getter_AddRefs(data), &tmpDataLen );
if( NS_SUCCEEDED( rv ) ) {
/* insert FlavourStr, data into the PtTransportCtrl_t */
int len = sizeof( PRUint32 ) + sizeof( PRUint32 ) + strlen( FlavourStr ) + 1 + tmpDataLen;
/* we reserve space for itemIndex|tmpDataLen|flavorStr|data */
len = ( ( len + 3 ) / 4 ) * 4;
pdata = ( char * ) realloc( pdata, len + pDataLen );
if( pdata ) {
char *p = pdata + pDataLen;
PRUint32 *d = ( PRUint32 * ) p;
d[0] = itemIndex; /* copy itemIndex*/
d[1] = tmpDataLen; /* copy PRUint32 tmpDataLen */
strcpy( p + sizeof( PRUint32 ) + sizeof( PRUint32 ), FlavourStr ); /* copy flavorStr */
nsCOMPtr<nsISupports> data;
PRUint32 tmpDataLen = 0;
nsresult rv = currItem->GetTransferData( FlavourStr, getter_AddRefs(data), &tmpDataLen );
if( NS_SUCCEEDED( rv ) ) {
/* insert FlavourStr, data into the PtTransportCtrl_t */
int len = sizeof( PRUint32 ) + sizeof( PRUint32 ) + strlen( FlavourStr ) + 1 + tmpDataLen;
/* we reserve space for itemIndex|tmpDataLen|flavorStr|data */
len = ( ( len + 3 ) / 4 ) * 4;
pdata = ( char * ) realloc( pdata, len + pDataLen );
if( pdata ) {
char *p = pdata + pDataLen;
PRUint32 *d = ( PRUint32 * ) p;
d[0] = itemIndex; /* copy itemIndex*/
d[1] = tmpDataLen; /* copy PRUint32 tmpDataLen */
strcpy( p + sizeof( PRUint32 ) + sizeof( PRUint32 ), FlavourStr ); /* copy flavorStr */
void *mem_data;
nsPrimitiveHelpers::CreateDataFromPrimitive ( FlavourStr, data, &mem_data, tmpDataLen );
void *mem_data;
nsPrimitiveHelpers::CreateDataFromPrimitive ( FlavourStr, data, &mem_data, tmpDataLen );
memcpy( p + sizeof( PRUint32 ) + sizeof( PRUint32 ) + strlen( FlavourStr ) + 1, mem_data, tmpDataLen ); /* copy the data */
pDataLen += len;
totalItems++;
}
memcpy( p + sizeof( PRUint32 ) + sizeof( PRUint32 ) + strlen( FlavourStr ) + 1, mem_data, tmpDataLen ); /* copy the data */
pDataLen += len;
totalItems++;
}
}
}
}
}
}
@ -292,9 +289,6 @@ NS_IMETHODIMP nsDragService::IsDataFlavorSupported(const char *aDataFlavor, PRBo
if( !strcmp( aDataFlavor, kMimeCustom ) ) ask = kHTMLMime;
else ask = aDataFlavor;
if( strcmp( ask, kUnicodeMime ) && strcmp( ask, kTextMime ) &&
strcmp( ask, kURLMime ) && strcmp( ask, kHTMLMime ) ) return NS_OK;
if(!mSourceDataItems) return NS_OK;
PRUint32 numDragItems = 0;
mSourceDataItems->Count(&numDragItems);

2
widget/src/photon/nsWindow.cpp
View File

@ -274,7 +274,7 @@ NS_METHOD nsWindow::CreateNative( PtWidget_t *parentWidget ) {
else
{
// No border or decorations is the default
render_flags = Ph_WM_RENDER_RESIZE;
render_flags = 0; // Ph_WM_RENDER_RESIZE;
if( mWindowType != eWindowType_popup ) {