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

Include wx/list.h according to precompiled headers of wx/wx.h (with other minor cleaning).

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38857 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2006-04-20 07:31:44 +00:00
parent 40a0dc1b0e
commit 8ecff18117
32 changed files with 145 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/common/appbase.cpp
View File

@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
// Name: common/base/appbase.cpp
// Name: src/common/appbase.cpp
// Purpose: implements wxAppConsole class
// Author: Vadim Zeitlin
// Modified by:
@@ -25,9 +25,9 @@
#endif
#ifndef WX_PRECOMP
#include "wx/list.h"
#include "wx/app.h"
#include "wx/intl.h"
#include "wx/list.h"
#include "wx/log.h"
#endif //WX_PRECOMP
@@ -839,4 +839,3 @@ void ShowAssertDialog(const wxChar *szFile,
}
#endif // __WXDEBUG__

2
src/common/appcmn.cpp
View File

@@ -25,10 +25,10 @@
#endif
#ifndef WX_PRECOMP
#include "wx/list.h"
#include "wx/app.h"
#include "wx/bitmap.h"
#include "wx/intl.h"
#include "wx/list.h"
#include "wx/log.h"
#include "wx/msgdlg.h"
#include "wx/bitmap.h"

5
src/common/artprov.cpp
View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: artprov.cpp
// Name: src/common/artprov.cpp
// Purpose: wxArtProvider class
// Author: Vaclav Slavik
// Modified by:
@@ -21,13 +21,14 @@
#endif
#ifndef WX_PRECOMP
#include "wx/log.h"
#include "wx/list.h"
#include "wx/log.h"
#endif
#include "wx/artprov.h"
#include "wx/hashmap.h"
#include "wx/module.h"
#if wxUSE_IMAGE
#include "wx/image.h"
#endif

2
src/common/db.cpp
View File

@@ -31,8 +31,8 @@
#ifndef WX_PRECOMP
#include "wx/object.h"
#include "wx/string.h"
#include "wx/list.h"
#include "wx/string.h"
#include "wx/utils.h"
#include "wx/log.h"
#endif

2
src/common/dbtable.cpp
View File

@@ -21,8 +21,8 @@
#ifndef WX_PRECOMP
#include "wx/object.h"
#include "wx/string.h"
#include "wx/list.h"
#include "wx/string.h"
#include "wx/utils.h"
#include "wx/log.h"
#endif

2
src/common/docview.cpp
View File

@@ -27,13 +27,13 @@
#if wxUSE_DOC_VIEW_ARCHITECTURE
#ifndef WX_PRECOMP
#include "wx/list.h"
#include "wx/string.h"
#include "wx/utils.h"
#include "wx/app.h"
#include "wx/dc.h"
#include "wx/dialog.h"
#include "wx/menu.h"
#include "wx/list.h"
#include "wx/filedlg.h"
#include "wx/intl.h"
#include "wx/log.h"

2
src/common/event.cpp
View File

@@ -25,8 +25,8 @@
#endif
#ifndef WX_PRECOMP
#include "wx/app.h"
#include "wx/list.h"
#include "wx/app.h"
#if wxUSE_GUI
#include "wx/control.h"

2
src/common/imagpcx.cpp
View File

@@ -19,6 +19,7 @@
#ifndef WX_PRECOMP
#include "wx/object.h"
#include "wx/list.h"
#include "wx/log.h"
#include "wx/intl.h"
#include "wx/palette.h"
@@ -29,7 +30,6 @@
#include "wx/module.h"
#include "wx/hash.h"
#include "wx/list.h"
//-----------------------------------------------------------------------------
// wxPCXHandler

11
src/common/url.cpp
View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: url.cpp
// Name: src/common/url.cpp
// Purpose: URL parser
// Author: Guilhem Lavaux
// Modified by:
@@ -18,8 +18,11 @@
#if wxUSE_URL
#include "wx/string.h"
#ifndef WX_PRECOMP
#include "wx/list.h"
#endif
#include "wx/string.h"
#include "wx/utils.h"
#include "wx/module.h"
#include "wx/url.h"
@@ -328,7 +331,7 @@ void wxURL::SetDefaultProxy(const wxString& url_proxy)
return;
wxString hostname = tmp_str(0, pos),
port = tmp_str(pos+1, tmp_str.Length()-pos);
port = tmp_str(pos+1, tmp_str.length()-pos);
wxIPV4address addr;
if (!addr.Hostname(hostname))
@@ -371,7 +374,7 @@ void wxURL::SetProxy(const wxString& url_proxy)
return;
hostname = tmp_str(0, pos);
port = tmp_str(pos+1, tmp_str.Length()-pos);
port = tmp_str(pos+1, tmp_str.length()-pos);
addr.Hostname(hostname);
addr.Service(port);

2
src/common/xti.cpp
View File

@@ -21,13 +21,13 @@
#ifndef WX_PRECOMP
#include "wx/object.h"
#include "wx/list.h"
#include "wx/hash.h"
#endif
#include "wx/xti.h"
#include "wx/xml/xml.h"
#include "wx/tokenzr.h"
#include "wx/list.h"
#include <string.h>
#include "wx/beforestd.h"

5
src/generic/accel.cpp
View File

@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
// Name: generic/accel.cpp
// Name: src/generic/accel.cpp
// Purpose: generic implementation of wxAcceleratorTable class
// Author: Robert Roebling
// Modified: VZ pn 31.05.01: use typed lists, Unicode cleanup, Add/Remove
@@ -26,8 +26,8 @@
#if wxUSE_ACCEL
#ifndef WX_PRECOMP
#include "wx/event.h"
#include "wx/list.h"
#include "wx/event.h"
#endif // WX_PRECOMP
#include "wx/accel.h"
@@ -218,4 +218,3 @@ wxObjectRefData *wxAcceleratorTable::CloneRefData(const wxObjectRefData *data) c
}
#endif // wxUSE_ACCEL

2
src/generic/helpext.cpp
View File

@@ -18,9 +18,9 @@
#if wxUSE_HELP && !defined(__WXWINCE__) && (!defined(__WXMAC__) || defined(__WXMAC_OSX__))
#ifndef WX_PRECOMP
#include "wx/list.h"
#include "wx/string.h"
#include "wx/utils.h"
#include "wx/list.h"
#include "wx/intl.h"
#include "wx/msgdlg.h"
#include "wx/choicdlg.h"

30
src/gtk/utilsres.cpp
View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: utilres.cpp
// Name: src/gtk/utilsres.cpp
// Purpose:
// Author: Robert Roebling
// Id: $Id$
@@ -10,9 +10,12 @@
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#ifndef WX_PRECOMP
#include "wx/list.h"
#endif
#include "wx/utils.h"
#include "wx/string.h"
#include "wx/list.h"
#include "wx/log.h"
#include "wx/config.h"
#include "wx/app.h"
@@ -24,7 +27,7 @@
bool wxWriteResource(const wxString& section, const wxString& entry, const wxString& value, const wxString& file )
{
wxString filename( file );
if (filename.IsEmpty()) filename = wxT(".wxWindows");
if (filename.empty()) filename = wxT(".wxWindows");
wxFileConfig conf( wxTheApp->GetAppName(), wxTheApp->GetVendorName(), filename );
@@ -60,7 +63,7 @@ bool wxWriteResource(const wxString& section, const wxString& entry, int value,
bool wxGetResource(const wxString& section, const wxString& entry, wxChar **value, const wxString& file )
{
wxString filename( file );
if (filename.IsEmpty()) filename = wxT(".wxWindows");
if (filename.empty()) filename = wxT(".wxWindows");
wxFileConfig conf( wxTheApp->GetAppName(), wxTheApp->GetVendorName(), filename );
@@ -69,16 +72,16 @@ bool wxGetResource(const wxString& section, const wxString& entry, wxChar **valu
wxString result;
if (conf.Read( entry, &result ))
{
if (!result.IsEmpty())
if (!result.empty())
{
wxChar *s = new wxChar[result.Len()+1];
wxStrcpy( s, result.c_str() );
*value = s;
return TRUE;
return true;
}
}
return FALSE;
return false;
}
bool wxGetResource(const wxString& section, const wxString& entry, float *value, const wxString& file )
@@ -89,9 +92,9 @@ bool wxGetResource(const wxString& section, const wxString& entry, float *value,
{
*value = (float)wxStrtod(s, NULL);
delete[] s;
return TRUE;
return true;
}
else return FALSE;
else return false;
}
bool wxGetResource(const wxString& section, const wxString& entry, long *value, const wxString& file )
@@ -102,9 +105,9 @@ bool wxGetResource(const wxString& section, const wxString& entry, long *value,
{
*value = wxStrtol(s, NULL, 10);
delete[] s;
return TRUE;
return true;
}
else return FALSE;
else return false;
}
bool wxGetResource(const wxString& section, const wxString& entry, int *value, const wxString& file )
@@ -115,8 +118,7 @@ bool wxGetResource(const wxString& section, const wxString& entry, int *value, c
{
*value = (int)wxStrtol(s, NULL, 10);
delete[] s;
return TRUE;
return true;
}
else return FALSE;
else return false;
}

30
src/gtk1/utilsres.cpp
View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: utilres.cpp
// Name: src/gtk1/utilsres.cpp
// Purpose:
// Author: Robert Roebling
// Id: $Id$
@@ -10,9 +10,12 @@
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#ifndef WX_PRECOMP
#include "wx/list.h"
#endif
#include "wx/utils.h"
#include "wx/string.h"
#include "wx/list.h"
#include "wx/log.h"
#include "wx/config.h"
#include "wx/app.h"
@@ -24,7 +27,7 @@
bool wxWriteResource(const wxString& section, const wxString& entry, const wxString& value, const wxString& file )
{
wxString filename( file );
if (filename.IsEmpty()) filename = wxT(".wxWindows");
if (filename.empty()) filename = wxT(".wxWindows");
wxFileConfig conf( wxTheApp->GetAppName(), wxTheApp->GetVendorName(), filename );
@@ -60,7 +63,7 @@ bool wxWriteResource(const wxString& section, const wxString& entry, int value,
bool wxGetResource(const wxString& section, const wxString& entry, wxChar **value, const wxString& file )
{
wxString filename( file );
if (filename.IsEmpty()) filename = wxT(".wxWindows");
if (filename.empty()) filename = wxT(".wxWindows");
wxFileConfig conf( wxTheApp->GetAppName(), wxTheApp->GetVendorName(), filename );
@@ -69,16 +72,16 @@ bool wxGetResource(const wxString& section, const wxString& entry, wxChar **valu
wxString result;
if (conf.Read( entry, &result ))
{
if (!result.IsEmpty())
if (!result.empty())
{
wxChar *s = new wxChar[result.Len()+1];
wxStrcpy( s, result.c_str() );
*value = s;
return TRUE;
return true;
}
}
return FALSE;
return false;
}
bool wxGetResource(const wxString& section, const wxString& entry, float *value, const wxString& file )
@@ -89,9 +92,9 @@ bool wxGetResource(const wxString& section, const wxString& entry, float *value,
{
*value = (float)wxStrtod(s, NULL);
delete[] s;
return TRUE;
return true;
}
else return FALSE;
else return false;
}
bool wxGetResource(const wxString& section, const wxString& entry, long *value, const wxString& file )
@@ -102,9 +105,9 @@ bool wxGetResource(const wxString& section, const wxString& entry, long *value,
{
*value = wxStrtol(s, NULL, 10);
delete[] s;
return TRUE;
return true;
}
else return FALSE;
else return false;
}
bool wxGetResource(const wxString& section, const wxString& entry, int *value, const wxString& file )
@@ -115,8 +118,7 @@ bool wxGetResource(const wxString& section, const wxString& entry, int *value, c
{
*value = (int)wxStrtol(s, NULL, 10);
delete[] s;
return TRUE;
return true;
}
else return FALSE;
else return false;
}

3
src/html/htmlwin.cpp
View File

@@ -16,6 +16,7 @@
#if wxUSE_HTML && wxUSE_STREAMS
#ifndef WXPRECOMP
#include "wx/list.h"
#include "wx/log.h"
#include "wx/intl.h"
#include "wx/dcclient.h"
@@ -24,7 +25,6 @@
#include "wx/html/htmlwin.h"
#include "wx/html/htmlproc.h"
#include "wx/list.h"
#include "wx/clipbrd.h"
#include "wx/dataobj.h"
#include "wx/timer.h"
@@ -1612,4 +1612,3 @@ IMPLEMENT_DYNAMIC_CLASS(wxHtmlWinModule, wxModule)
FORCE_WXHTML_MODULES()
#endif // wxUSE_HTML

6
src/motif/cursor.cpp
View File

@@ -12,11 +12,15 @@
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#ifndef WX_PRECOMP
#include "wx/list.h"
#endif
#include "wx/cursor.h"
#include "wx/app.h"
#include "wx/utils.h"
#include "wx/list.h"
#include "wx/window.h"
#if wxUSE_IMAGE
#include "wx/image.h"
#endif

2
src/msw/bitmap.cpp
View File

@@ -1,5 +1,5 @@
////////////////////////////////////////////////////////////////////////////
// Name: bitmap.cpp
// Name: src/msw/bitmap.cpp
// Purpose: wxBitmap
// Author: Julian Smart
// Modified by:

1
src/msw/icon.cpp
View File

@@ -25,7 +25,6 @@
#endif
#ifndef WX_PRECOMP
#include "wx/defs.h"
#include "wx/list.h"
#include "wx/utils.h"
#include "wx/app.h"

5
src/msw/timer.cpp
View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: msw/timer.cpp
// Name: src/msw/timer.cpp
// Purpose: wxTimer implementation
// Author: Julian Smart
// Modified by: Vadim Zeitlin (use hash map instead of list, global rewrite)
@@ -19,8 +19,8 @@
#if wxUSE_TIMER
#ifndef WX_PRECOMP
#include "wx/window.h"
#include "wx/list.h"
#include "wx/window.h"
#include "wx/event.h"
#include "wx/app.h"
#include "wx/intl.h"
@@ -162,4 +162,3 @@ wxTimerProc(HWND WXUNUSED(hwnd),
}
#endif // wxUSE_TIMER

5
src/msw/urlmsw.cpp
View File

@@ -18,6 +18,10 @@
#if wxUSE_URL_NATIVE
#ifndef WX_PRECOMP
#include "wx/list.h"
#endif
#if !wxUSE_PROTOCOL_HTTP
#include "wx/protocol/protocol.h"
@@ -60,7 +64,6 @@ USE_PROTOCOL(wxHTTPDummyProto)
#endif
#include "wx/string.h"
#include "wx/list.h"
#include "wx/utils.h"
#include "wx/module.h"
#include "wx/url.h"

7
src/os2/bitmap.cpp
View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: bitmap.cpp
// Name: src/os2/bitmap.cpp
// Purpose: wxBitmap
// Author: David Webster
// Modified by:
@@ -27,7 +27,6 @@
#include "wx/os2/private.h"
#include "wx/log.h"
//#include "wx/msw/dib.h"
#include "wx/image.h"
#include "wx/xpmdecod.h"
@@ -90,9 +89,7 @@ void wxBitmap::Init()
//
} // end of wxBitmap::Init
bool wxBitmap::CopyFromIconOrCursor(
const wxGDIImage& rIcon
)
bool wxBitmap::CopyFromIconOrCursor(const wxGDIImage& rIcon)
{
HPOINTER hIcon = (HPOINTER)rIcon.GetHandle();
POINTERINFO SIconInfo;

8
src/os2/brush.cpp
View File

@@ -34,9 +34,7 @@ wxBrushRefData::wxBrushRefData()
memset(&m_vBundle, '\0', sizeof(AREABUNDLE));
} // end of wxBrushRefData::wxBrushRefData
wxBrushRefData::wxBrushRefData(
const wxBrushRefData& rData
)
wxBrushRefData::wxBrushRefData(const wxBrushRefData& rData)
{
m_nStyle = rData.m_nStyle;
m_vStipple = rData.m_vStipple;
@@ -75,9 +73,7 @@ wxBrush::wxBrush(
RealizeResource();
} // end of wxBrush::wxBrush
wxBrush::wxBrush(
const wxBitmap& rStipple
)
wxBrush::wxBrush(const wxBitmap& rStipple)
{
m_refData = new wxBrushRefData;

30
src/os2/font.cpp
View File

@@ -323,10 +323,10 @@ void wxFontRefData::Init(
m_vEncoding = vEncoding;
m_hFont = 0;
m_bNativeFontInfoOk = FALSE;
m_bNativeFontInfoOk = false;
m_nFontId = 0;
m_bTemporary = FALSE;
m_bTemporary = false;
m_pFM = (PFONTMETRICS)NULL;
m_hPS = NULLHANDLE;
m_nNumFonts = 0;
@@ -359,7 +359,7 @@ void wxFontRefData::Init(
m_hPS = (HPS)hPS;
m_nFontId = 0;
m_bTemporary = FALSE;
m_bTemporary = false;
m_pFM = (PFONTMETRICS)NULL;
m_nNumFonts = 0;
} // end of wxFontRefData::Init
@@ -782,56 +782,56 @@ bool wxNativeFontInfo::FromString( const wxString& rsStr )
wxString sToken = vTokenizer.GetNextToken();
if (sToken != _T('0'))
return FALSE;
return false;
sToken = vTokenizer.GetNextToken();
if (!sToken.ToLong(&lVal))
return FALSE;
return false;
fm.lEmHeight = lVal;
sToken = vTokenizer.GetNextToken();
if (!sToken.ToLong(&lVal))
return FALSE;
return false;
fa.lAveCharWidth = lVal;
sToken = vTokenizer.GetNextToken();
if (!sToken.ToLong(&lVal))
return FALSE;
return false;
fa.fsSelection = (USHORT)lVal;
sToken = vTokenizer.GetNextToken();
if (!sToken.ToLong(&lVal))
return FALSE;
return false;
fa.fsType = (USHORT)lVal;
sToken = vTokenizer.GetNextToken();
if (!sToken.ToLong(&lVal))
return FALSE;
return false;
fa.fsFontUse = (USHORT)lVal;
sToken = vTokenizer.GetNextToken();
if (!sToken.ToLong(&lVal))
return FALSE;
return false;
fa.idRegistry = (USHORT)lVal;
sToken = vTokenizer.GetNextToken();
if (!sToken.ToLong(&lVal))
return FALSE;
return false;
fa.usCodePage = (USHORT)lVal;
sToken = vTokenizer.GetNextToken();
if (!sToken.ToLong(&lVal))
return FALSE;
return false;
fa.lMatch = lVal;
sToken = vTokenizer.GetNextToken();
if (!sToken.ToLong(&lVal))
return FALSE;
return false;
fn.usWeightClass = (USHORT)lVal;
sToken = vTokenizer.GetNextToken();
if(!sToken)
return FALSE;
return false;
wxStrcpy((wxChar*)fa.szFacename, sToken.c_str());
return true;
} // end of wxNativeFontInfo::FromString
@@ -1103,7 +1103,7 @@ int wxFont::GetWeight() const
bool wxFont::GetUnderlined() const
{
wxCHECK_MSG( Ok(), FALSE, wxT("invalid font") );
wxCHECK_MSG( Ok(), false, wxT("invalid font") );
return M_FONTDATA->GetUnderlined();
} // end of wxFont::GetUnderlined

4
src/os2/print.cpp
View File

@@ -11,6 +11,8 @@
#include "wx/wxprec.h"
#if wxUSE_PRINTING_ARCHITECTURE
#ifndef WX_PRECOMP
#include <stdio.h>
#include "wx/list.h"
@@ -18,8 +20,6 @@
#include "wx/app.h"
#endif
#if wxUSE_PRINTING_ARCHITECTURE
#include "wx/os2/printos2.h"
#include "wx/generic/prntdlgg.h"

15
src/os2/timer.cpp
View File

@@ -13,8 +13,8 @@
#include "wx/wxprec.h"
#ifndef WX_PRECOMP
#include "wx/window.h"
#include "wx/list.h"
#include "wx/window.h"
#include "wx/event.h"
#include "wx/app.h"
#endif
@@ -96,16 +96,11 @@ void wxTimer::Notify()
(void)m_owner->ProcessEvent(vEvent);
} // end of wxTimer::Notify
bool wxTimer::Start(
int nMilliseconds
, bool bOneShot
)
bool wxTimer::Start( int nMilliseconds, bool bOneShot )
{
(void)wxTimerBase::Start( nMilliseconds
,bOneShot
);
(void)wxTimerBase::Start( nMilliseconds, bOneShot );
wxCHECK_MSG( m_milli > 0L, FALSE, wxT("invalid value for timer") );
wxCHECK_MSG( m_milli > 0L, false, wxT("invalid value for timer") );
wxWindow* pWin = NULL;
@@ -148,7 +143,7 @@ bool wxTimer::Start(
{
wxLogSysError(_("Couldn't create a timer"));
return(FALSE);
return false;
}
}

11
src/palmos/gdiobj.cpp
View File

@@ -26,14 +26,3 @@
#include "wx/gdiobj.h"
IMPLEMENT_DYNAMIC_CLASS(wxGDIObject, wxObject)
/*
void wxGDIObject::IncrementResourceUsage(void)
{
};
void wxGDIObject::DecrementResourceUsage(void)
{
};
*/

3
src/palmos/timer.cpp
View File

@@ -19,8 +19,8 @@
#if wxUSE_TIMER
#ifndef WX_PRECOMP
#include "wx/window.h"
#include "wx/list.h"
#include "wx/window.h"
#include "wx/event.h"
#include "wx/app.h"
#include "wx/intl.h"
@@ -98,4 +98,3 @@ void WINAPI wxTimerProc(HWND WXUNUSED(hwnd), WORD, int idTimer, DWORD)
}
#endif // wxUSE_TIMER