livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Windows build based on API change to handleDragNDrop()

master
Rick Pasetto 2009-12-03 12:19:02 -08:00
parent 0a2a52c3b1
commit ff53d4ff9b
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/llwindow/lldragdropwin32.cpp
View File

@ -158,7 +158,7 @@ class LLDragDropWin32Target:
window_imp->convertCoords(cursor_coord_window, &gl_coord);
MASK mask = gKeyboard->currentMask(TRUE);
bool allowed_to_drop = window_imp->completeDragNDropRequest( gl_coord, mask, FALSE, std::string( "" ), mIsSlurl );
bool allowed_to_drop = window_imp->completeDragNDropRequest( gl_coord, mask, FALSE, std::string( "" ) );
if ( allowed_to_drop )
*pdwEffect = DROPEFFECT_COPY;
else
@ -214,7 +214,7 @@ class LLDragDropWin32Target:
MASK mask = gKeyboard->currentMask( TRUE );
// actually do the drop
window_imp->completeDragNDropRequest( gl_coord, mask, TRUE, mDropUrl, mIsSlurl );
window_imp->completeDragNDropRequest( gl_coord, mask, TRUE, mDropUrl );
};
*pdwEffect = DROPEFFECT_COPY;

4
indra/llwindow/llwindowwin32.cpp
View File

@ -3581,9 +3581,9 @@ static LLWString find_context(const LLWString & wtext, S32 focus, S32 focus_leng
// final stage of handling drop requests - both from WM_DROPFILES message
// for files and via IDropTarget interface requests.
BOOL LLWindowWin32::completeDragNDropRequest( const LLCoordGL gl_coord, const MASK mask, BOOL drop, const std::string url, BOOL is_slurl )
BOOL LLWindowWin32::completeDragNDropRequest( const LLCoordGL gl_coord, const MASK mask, BOOL drop, const std::string url )
{
return mCallbacks->handleDragNDrop( this, gl_coord, mask, drop, url, is_slurl );
return mCallbacks->handleDragNDrop( this, gl_coord, mask, drop, url );
}
// Handle WM_IME_REQUEST message.

2
indra/llwindow/llwindowwin32.h
View File

@ -113,7 +113,7 @@ public:
/*virtual*/ void interruptLanguageTextInput();
/*virtual*/ void spawnWebBrowser(const std::string& escaped_url);
BOOL completeDragNDropRequest( const LLCoordGL gl_coord, const MASK mask, BOOL drop, const std::string url, BOOL is_slurl );
BOOL completeDragNDropRequest( const LLCoordGL gl_coord, const MASK mask, BOOL drop, const std::string url );
static std::vector<std::string> getDynamicFallbackFontList();