Merges from Scitech Branch (George Davison):
Added wxDisplayChangedEvent and triggering in MSW, when display mode changes this event gets triggered. I don't know what should happen with other OS's since I am not familiar with how they handle mode changes. Watcome Version 11 now compiles with wide character support. Fixed watcom warnings in html/htmlwin.h imagbmp.h listctrl.h imagbmp.cpp quantize.cpp strconv.cpp variant.cpp dirctrlg.cpp treectlg.cpp m_style.cpp fontenum.cpp listctrl.cpp ole\dataobj.cpp textctrl.cpp window.cpp xml.cpp msw/setup.h with watcom version 11 it now compiles with wide character support. xrc/xml.cpp fixed memory leak and compile warnings git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14057 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -685,13 +685,13 @@ void wxDataObject::SetAutoDelete()
|
||||
m_pIDataObject = NULL;
|
||||
}
|
||||
|
||||
size_t wxDataObject::GetBufferOffset( const wxDataFormat& format )
|
||||
size_t wxDataObject::GetBufferOffset( const wxDataFormat& WXUNUSED(format) )
|
||||
{
|
||||
return sizeof(size_t);
|
||||
}
|
||||
|
||||
const void* wxDataObject::GetSizeFromBuffer( const void* buffer, size_t* size,
|
||||
const wxDataFormat& format )
|
||||
const wxDataFormat& WXUNUSED(format) )
|
||||
{
|
||||
size_t* p = (size_t*)buffer;
|
||||
*size = *p;
|
||||
@@ -700,7 +700,7 @@ const void* wxDataObject::GetSizeFromBuffer( const void* buffer, size_t* size,
|
||||
}
|
||||
|
||||
void* wxDataObject::SetSizeInBuffer( void* buffer, size_t size,
|
||||
const wxDataFormat& format )
|
||||
const wxDataFormat& WXUNUSED(format) )
|
||||
{
|
||||
size_t* p = (size_t*)buffer;
|
||||
*p = size;
|
||||
@@ -1070,13 +1070,13 @@ class CFSTR_SHELLURLDataObject:public wxCustomDataObject
|
||||
public:
|
||||
CFSTR_SHELLURLDataObject() : wxCustomDataObject(CFSTR_SHELLURL) {}
|
||||
protected:
|
||||
virtual size_t GetBufferOffset( const wxDataFormat& format )
|
||||
virtual size_t GetBufferOffset( const wxDataFormat& WXUNUSED(format) )
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
virtual const void* GetSizeFromBuffer( const void* buffer, size_t* size,
|
||||
const wxDataFormat& format )
|
||||
const wxDataFormat& WXUNUSED(format) )
|
||||
{
|
||||
// CFSTR_SHELLURL is _always_ ANSI text
|
||||
*size = strlen( (const char*)buffer );
|
||||
@@ -1084,8 +1084,8 @@ protected:
|
||||
return buffer;
|
||||
}
|
||||
|
||||
virtual void* SetSizeInBuffer( void* buffer, size_t size,
|
||||
const wxDataFormat& format )
|
||||
virtual void* SetSizeInBuffer( void* buffer, size_t WXUNUSED(size),
|
||||
const wxDataFormat& WXUNUSED(format) )
|
||||
{
|
||||
return buffer;
|
||||
}
|
||||
|
Reference in New Issue
Block a user