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

compilation fixes for Unicode build

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@8037 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2000-08-11 19:39:16 +00:00
parent f7acd7dfc5
commit d42d40692b
6 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/intl.cpp
View File

@@ -665,11 +665,9 @@ const wxMB2WXbuf wxLocale::GetString(const wxChar *szOrigString,
return (wxMB2WXbuf)(szOrigString); return (wxMB2WXbuf)(szOrigString);
} }
else
{
return wxConvertMB2WX(pszTrans); // or preferably wxCSConv(charset).cMB2WX(pszTrans) or something, return wxConvertMB2WX(pszTrans); // or preferably wxCSConv(charset).cMB2WX(pszTrans) or something,
// a macro similar to wxConvertMB2WX could be written for that // a macro similar to wxConvertMB2WX could be written for that
}
#undef szOrgString #undef szOrgString
} }
@@ -677,7 +675,7 @@ const wxMB2WXbuf wxLocale::GetString(const wxChar *szOrigString,
// find catalog by name in a linked list, return NULL if !found // find catalog by name in a linked list, return NULL if !found
wxMsgCatalog *wxLocale::FindCatalog(const wxChar *szDomain) const wxMsgCatalog *wxLocale::FindCatalog(const wxChar *szDomain) const
{ {
// linear search in the linked list // linear search in the linked list
wxMsgCatalog *pMsgCat; wxMsgCatalog *pMsgCat;
for ( pMsgCat = m_pMsgCat; pMsgCat != NULL; pMsgCat = pMsgCat->m_pNext ) { for ( pMsgCat = m_pMsgCat; pMsgCat != NULL; pMsgCat = pMsgCat->m_pNext ) {
if ( wxStricmp(pMsgCat->GetName(), szDomain) == 0 ) if ( wxStricmp(pMsgCat->GetName(), szDomain) == 0 )

10
src/msw/clipbrd.cpp
View File

@@ -815,14 +815,14 @@ bool wxClipboard::GetData( wxDataObject& data )
} }
#endif // wxUSE_METAFILE #endif // wxUSE_METAFILE
} }
#else // !wxUSE_DATAOBJ
wxFAIL_MSG( wxT("no clipboard implementation") );
#endif // wxUSE_OLE_CLIPBOARD/wxUSE_DATAOBJ
return FALSE; return FALSE;
#else // !wxUSE_DATAOBJ
wxFAIL_MSG( wxT("no clipboard implementation") );
return FALSE;
#endif // wxUSE_OLE_CLIPBOARD/wxUSE_DATAOBJ
} }
#else
// #error "Please turn wxUSE_CLIPBOARD on to compile this file."
#endif // wxUSE_CLIPBOARD #endif // wxUSE_CLIPBOARD

2
src/msw/dialup.cpp
View File

@@ -551,7 +551,7 @@ void wxDialUpManagerMSW::CleanUpThreadData()
{ {
if ( !SetEvent(m_data.hEventQuit) ) if ( !SetEvent(m_data.hEventQuit) )
{ {
wxLogLastError("SetEvent(RasThreadQuit)"); wxLogLastError(_T("SetEvent(RasThreadQuit)"));
} }
CloseHandle(m_hThread); CloseHandle(m_hThread);

3
src/msw/ole/dropsrc.cpp
View File

@@ -222,8 +222,7 @@ wxDragResult wxDropSource::DoDragDrop(bool bAllowMove)
} }
else { else {
if ( FAILED(hr) ) { if ( FAILED(hr) ) {
wxLogApiError("DoDragDrop", hr); wxLogSysError(wxT("Drag & drop operation failed."));
wxLogError(wxT("Drag & drop operation failed."));
} }
else { else {
wxLogDebug(wxT("Unexpected success return code %08lx from DoDragDrop."), wxLogDebug(wxT("Unexpected success return code %08lx from DoDragDrop."),

6
src/msw/ole/droptgt.cpp
View File

@@ -309,7 +309,7 @@ bool wxDropTarget::Register(WXHWND hwnd)
{ {
HRESULT hr = ::CoLockObjectExternal(m_pIDropTarget, TRUE, FALSE); HRESULT hr = ::CoLockObjectExternal(m_pIDropTarget, TRUE, FALSE);
if ( FAILED(hr) ) { if ( FAILED(hr) ) {
wxLogApiError("CoLockObjectExternal", hr); wxLogApiError(_T("CoLockObjectExternal"), hr);
return FALSE; return FALSE;
} }
@@ -317,7 +317,7 @@ bool wxDropTarget::Register(WXHWND hwnd)
if ( FAILED(hr) ) { if ( FAILED(hr) ) {
::CoLockObjectExternal(m_pIDropTarget, FALSE, FALSE); ::CoLockObjectExternal(m_pIDropTarget, FALSE, FALSE);
wxLogApiError("RegisterDragDrop", hr); wxLogApiError(_T("RegisterDragDrop"), hr);
return FALSE; return FALSE;
} }
@@ -332,7 +332,7 @@ void wxDropTarget::Revoke(WXHWND hwnd)
HRESULT hr = ::RevokeDragDrop((HWND) hwnd); HRESULT hr = ::RevokeDragDrop((HWND) hwnd);
if ( FAILED(hr) ) { if ( FAILED(hr) ) {
wxLogApiError("RevokeDragDrop", hr); wxLogApiError(_T("RevokeDragDrop"), hr);
} }
::CoLockObjectExternal(m_pIDropTarget, FALSE, TRUE); ::CoLockObjectExternal(m_pIDropTarget, FALSE, TRUE);

3
src/msw/window.cpp
View File

@@ -1329,7 +1329,8 @@ void wxWindow::AdjustForParentClientOrigin(int& x, int& y, int sizeFlags)
if ( !(sizeFlags & wxSIZE_NO_ADJUSTMENTS) && parent ) if ( !(sizeFlags & wxSIZE_NO_ADJUSTMENTS) && parent )
{ {
wxPoint pt(parent->GetClientAreaOrigin()); wxPoint pt(parent->GetClientAreaOrigin());
x += pt.x; y += pt.y; x += pt.x;
y += pt.y;
} }
} }
} }