(harmless) Borland release build warning fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60348 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -904,9 +904,13 @@ wxActiveXContainer::~wxActiveXContainer()
|
||||
}
|
||||
|
||||
// VZ: we might want to really report an error instead of just asserting here
|
||||
#if wxDEBUG_LEVEL
|
||||
#define CHECK_HR(hr) \
|
||||
wxASSERT_LEVEL_2_MSG( SUCCEEDED(hr), \
|
||||
wxString::Format("HRESULT = %X", (unsigned)(hr)) )
|
||||
#else
|
||||
#define CHECK_HR(hr) wxUnusedVar(hr)
|
||||
#endif
|
||||
|
||||
//---------------------------------------------------------------------------
|
||||
// wxActiveXContainer::CreateActiveX
|
||||
|
@@ -424,7 +424,9 @@ bool wxTextCtrl::MSWCreateText(const wxString& value,
|
||||
}
|
||||
#endif
|
||||
|
||||
#if wxUSE_INKEDIT
|
||||
if (!IsInkEdit())
|
||||
#endif // wxUSE_INKEDIT
|
||||
{
|
||||
if ( m_verRichEdit == 2 )
|
||||
{
|
||||
|
@@ -451,7 +451,7 @@ wxString wxTextEntry::GetHint() const
|
||||
wchar_t buf[256];
|
||||
if ( ::SendMessage(GetEditHwnd(), EM_GETCUEBANNER,
|
||||
(WPARAM)buf, WXSIZEOF(buf)) )
|
||||
return buf;
|
||||
return wxString(buf);
|
||||
}
|
||||
|
||||
return wxTextEntryBase::GetHint();
|
||||
|
@@ -3372,7 +3372,6 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
|
||||
return MSWHandleTreeKeyDownEvent(
|
||||
info->wVKey, (wxIsAltDown() ? KF_ALTDOWN : 0) << 16);
|
||||
}
|
||||
break;
|
||||
|
||||
|
||||
// Vista's tree control has introduced some problems with our
|
||||
|
Reference in New Issue
Block a user