No changes, just removed hard tabs and trailing white space.
This commit is huge but there are no non-white-space changes in it. Some files containing third-party sources (src/msw/wince/time.cpp, src/x11/pango*.cpp) were left unchanged. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61724 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -917,7 +917,7 @@ wxImage wxBitmap::ConvertToImage() const
|
||||
// May already be selected into a PS
|
||||
//
|
||||
pDC = GetSelectedInto();
|
||||
const wxPMDCImpl *impl;
|
||||
const wxPMDCImpl *impl;
|
||||
if (pDC != NULL &&
|
||||
(impl = wxDynamicCast( pDC->GetImpl(), wxPMDCImpl )) != NULL)
|
||||
{
|
||||
|
@@ -2160,10 +2160,10 @@ void wxPMDCImpl::DoGetTextExtent(
|
||||
//
|
||||
if (!m_hPS)
|
||||
{
|
||||
(void)wxMessageBox( wxT("wxWidgets core library")
|
||||
,"Using uninitialized DC for measuring text!\n"
|
||||
,wxICON_INFORMATION
|
||||
);
|
||||
(void)wxMessageBox( wxT("wxWidgets core library")
|
||||
,"Using uninitialized DC for measuring text!\n"
|
||||
,wxICON_INFORMATION
|
||||
);
|
||||
}
|
||||
|
||||
bRc = ::GpiQueryTextBox( m_hPS
|
||||
|
@@ -29,23 +29,23 @@ IMPLEMENT_ABSTRACT_CLASS(wxMemoryDCImpl, wxPMDCImpl)
|
||||
// Memory DC
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
wxMemoryDCImpl::wxMemoryDCImpl( wxMemoryDC *owner )
|
||||
wxMemoryDCImpl::wxMemoryDCImpl( wxMemoryDC *owner )
|
||||
: wxPMDCImpl( owner )
|
||||
{
|
||||
CreateCompatible(NULL);
|
||||
Init();
|
||||
CreateCompatible(NULL);
|
||||
Init();
|
||||
}
|
||||
|
||||
wxMemoryDCImpl::wxMemoryDCImpl( wxMemoryDC *owner, wxBitmap& bitmap )
|
||||
: wxPMDCImpl( owner )
|
||||
{
|
||||
CreateCompatible(NULL);
|
||||
Init();
|
||||
wxMemoryDCImpl::wxMemoryDCImpl( wxMemoryDC *owner, wxBitmap& bitmap )
|
||||
: wxPMDCImpl( owner )
|
||||
{
|
||||
CreateCompatible(NULL);
|
||||
Init();
|
||||
DoSelect(bitmap);
|
||||
}
|
||||
|
||||
wxMemoryDCImpl::wxMemoryDCImpl( wxMemoryDC *owner, wxDC *pOldDC)
|
||||
: wxPMDCImpl( owner )
|
||||
: wxPMDCImpl( owner )
|
||||
{
|
||||
wxCHECK_RET( pOldDC, wxT("NULL dc in wxMemoryDC ctor") );
|
||||
|
||||
|
@@ -404,7 +404,7 @@ bool wxGUIEventLoop::YieldFor(long eventsToProcess)
|
||||
if (wxTheApp)
|
||||
{
|
||||
wxTheApp->ProcessPendingEvents();
|
||||
wxTheApp->HandleSockets();
|
||||
wxTheApp->HandleSockets();
|
||||
}
|
||||
|
||||
//
|
||||
|
@@ -305,7 +305,7 @@ int wxListBox::DoInsertItems(const wxArrayStringsAdapter & items,
|
||||
{
|
||||
wxOwnerDrawn* pNewItem = CreateItem(n); // dummy argument
|
||||
wxScreenDC vDc; // FIXME: is it really needed here?
|
||||
|
||||
|
||||
pNewItem->SetName(items[i]);
|
||||
m_aItems.Insert(pNewItem, n);
|
||||
pNewItem->SetFont(GetFont());
|
||||
|
@@ -156,7 +156,7 @@ bool wxOwnerDrawn::OnMeasureItem( size_t* pWidth,
|
||||
// Make sure that this item is at least as
|
||||
// tall as the user's system settings specify
|
||||
//
|
||||
const size_t heightStd = 6; // FIXME: get value from the system
|
||||
const size_t heightStd = 6; // FIXME: get value from the system
|
||||
if ( *pHeight < heightStd )
|
||||
*pHeight = heightStd;
|
||||
m_nHeight = *pHeight; // remember height for use in OnDrawItem
|
||||
|
@@ -84,7 +84,7 @@ bool wxGetHostName( wxChar* zBuf, int nMaxSize )
|
||||
const wxChar* zDefaultHost = wxT("noname");
|
||||
|
||||
if ((zSysname = wxGetenv(wxT("SYSTEM_NAME"))) == NULL &&
|
||||
(zSysname = wxGetenv(wxT("HOSTNAME"))) == NULL)
|
||||
(zSysname = wxGetenv(wxT("HOSTNAME"))) == NULL)
|
||||
{
|
||||
::PrfQueryProfileString( HINI_PROFILE
|
||||
,(PSZ)WX_SECTION
|
||||
@@ -240,14 +240,14 @@ bool wxGetEnv(const wxString& var, wxString *value)
|
||||
static bool wxDoSetEnv(const wxString& variable, const char *value)
|
||||
{
|
||||
#if defined(HAVE_SETENV)
|
||||
if ( !value )
|
||||
{
|
||||
#ifdef HAVE_UNSETENV
|
||||
return unsetenv(variable.mb_str()) == 0;
|
||||
#else
|
||||
value = wxT(""); // mustn't pass NULL to setenv()
|
||||
#endif
|
||||
}
|
||||
if ( !value )
|
||||
{
|
||||
#ifdef HAVE_UNSETENV
|
||||
return unsetenv(variable.mb_str()) == 0;
|
||||
#else
|
||||
value = wxT(""); // mustn't pass NULL to setenv()
|
||||
#endif
|
||||
}
|
||||
return setenv(variable.mb_str(), value, 1 /* overwrite */) == 0;
|
||||
#elif defined(HAVE_PUTENV)
|
||||
wxString s = variable;
|
||||
@@ -474,7 +474,7 @@ bool wxGetDiskSpace(const wxString& path,
|
||||
{
|
||||
// to try to avoid 32-bit overflow, let's not multiply right away
|
||||
// (num of alloc units)
|
||||
*pTotal = fsaBuf.cUnit;
|
||||
*pTotal = fsaBuf.cUnit;
|
||||
// * (num of sectors per alloc unit) * (num of bytes per sector)
|
||||
(*pTotal) *= fsaBuf.cSectorUnit * fsaBuf.cbSector;
|
||||
}
|
||||
@@ -486,7 +486,7 @@ bool wxGetDiskSpace(const wxString& path,
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
wxString wxPMErrorToStr(ERRORID vError)
|
||||
{
|
||||
wxString sError;
|
||||
|
@@ -3224,7 +3224,7 @@ bool wxWindowOS2::OS2OnDrawItem( int vId,
|
||||
,pMeasureStruct->rclItem.yTop - pMeasureStruct->rclItem.yBottom
|
||||
);
|
||||
|
||||
wxPMDCImpl *impl = (wxPMDCImpl*) vDc.GetImpl();
|
||||
wxPMDCImpl *impl = (wxPMDCImpl*) vDc.GetImpl();
|
||||
impl->SetHDC( hDC, false );
|
||||
impl->SetHPS( pMeasureStruct->hps );
|
||||
//
|
||||
|
Reference in New Issue
Block a user