Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(harmless) Borland release build warning fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60348 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-04-25 14:07:38 +00:00
parent a2d03e4c51
commit d2f434e428
4 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/msw/ole/activex.cpp
View File

@@ -904,9 +904,13 @@ wxActiveXContainer::~wxActiveXContainer()
} }
// VZ: we might want to really report an error instead of just asserting here // VZ: we might want to really report an error instead of just asserting here
#define CHECK_HR(hr) \ #if wxDEBUG_LEVEL
wxASSERT_LEVEL_2_MSG( SUCCEEDED(hr), \ #define CHECK_HR(hr) \
wxString::Format("HRESULT = %X", (unsigned)(hr)) ) wxASSERT_LEVEL_2_MSG( SUCCEEDED(hr), \
wxString::Format("HRESULT = %X", (unsigned)(hr)) )
#else
#define CHECK_HR(hr) wxUnusedVar(hr)
#endif
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// wxActiveXContainer::CreateActiveX // wxActiveXContainer::CreateActiveX

2
src/msw/textctrl.cpp
View File

@@ -424,7 +424,9 @@ bool wxTextCtrl::MSWCreateText(const wxString& value,
} }
#endif #endif
#if wxUSE_INKEDIT
if (!IsInkEdit()) if (!IsInkEdit())
#endif // wxUSE_INKEDIT
{ {
if ( m_verRichEdit == 2 ) if ( m_verRichEdit == 2 )
{ {

2
src/msw/textentry.cpp
View File

@@ -451,7 +451,7 @@ wxString wxTextEntry::GetHint() const
wchar_t buf[256]; wchar_t buf[256];
if ( ::SendMessage(GetEditHwnd(), EM_GETCUEBANNER, if ( ::SendMessage(GetEditHwnd(), EM_GETCUEBANNER,
(WPARAM)buf, WXSIZEOF(buf)) ) (WPARAM)buf, WXSIZEOF(buf)) )
return buf; return wxString(buf);
} }
return wxTextEntryBase::GetHint(); return wxTextEntryBase::GetHint();

1
src/msw/treectrl.cpp
View File

@@ -3372,7 +3372,6 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
return MSWHandleTreeKeyDownEvent( return MSWHandleTreeKeyDownEvent(
info->wVKey, (wxIsAltDown() ? KF_ALTDOWN : 0) << 16); info->wVKey, (wxIsAltDown() ? KF_ALTDOWN : 0) << 16);
} }
break;
// Vista's tree control has introduced some problems with our // Vista's tree control has introduced some problems with our