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

Source cleaning: whitespaces, tabs, FALSE/false, TRUE/true, -1/wxDefaultCoord, !!/!IsEmpty().

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29143 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2004-09-15 13:20:18 +00:00
parent 9eace708fc
commit 5d3e7b52d8
16 changed files with 259 additions and 259 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/gauge.h
View File

@@ -77,7 +77,7 @@ public:
virtual int GetBezelFace() const;
// overriden base class virtuals
virtual bool AcceptsFocus() const { return FALSE; }
virtual bool AcceptsFocus() const { return false; }
protected:
// the max position

16
include/wx/gdicmn.h
View File

@@ -117,7 +117,7 @@ enum wxStockCursor
wxCURSOR_DEFAULT, // standard X11 cursor
#endif
#ifdef __WXMAC__
wxCURSOR_COPY_ARROW , // MacOS Theme Plus arrow
wxCURSOR_COPY_ARROW , // MacOS Theme Plus arrow
#endif
#ifdef __X__
// Not yet implemented for Windows
@@ -234,15 +234,15 @@ public:
int GetWidth() const { return x; }
int GetHeight() const { return y; }
bool IsFullySpecified() const { return x != -1 && y != -1; }
bool IsFullySpecified() const { return x != wxDefaultCoord && y != wxDefaultCoord; }
// combine this size with the other one replacing the default (i.e. equal
// to -1) components of this object with those of the other
// to wxDefaultCoord) components of this object with those of the other
void SetDefaults(const wxSize& size)
{
if ( x == -1 )
if ( x == wxDefaultCoord )
x = size.x;
if ( y == -1 )
if ( y == wxDefaultCoord )
y = size.y;
}
@@ -392,11 +392,11 @@ public:
bool operator==(const wxRect& rect) const;
bool operator!=(const wxRect& rect) const { return !(*this == rect); }
// return TRUE if the point is (not strcitly) inside the rect
// return true if the point is (not strcitly) inside the rect
bool Inside(int x, int y) const;
bool Inside(const wxPoint& pt) const { return Inside(pt.x, pt.y); }
// return TRUE if the rectangles have a non empty intersection
// return true if the rectangles have a non empty intersection
bool Intersects(const wxRect& rect) const;
public:
@@ -440,7 +440,7 @@ public:
void AddFont(wxFont *font);
void RemoveFont(wxFont *font);
wxFont *FindOrCreateFont(int pointSize, int family, int style, int weight,
bool underline = FALSE,
bool underline = false,
const wxString& face = wxEmptyString,
wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
};

14
include/wx/geometry.h
View File

@@ -301,9 +301,9 @@ public :
inline wxPoint2DDouble( wxDouble x , wxDouble y );
inline wxPoint2DDouble( const wxPoint2DDouble &pt );
wxPoint2DDouble( const wxPoint2DInt &pt )
{ m_x = (wxDouble) pt.m_x ; m_y = (wxDouble) pt.m_y ; }
wxPoint2DDouble( const wxPoint &pt )
{ m_x = (wxDouble) pt.x ; m_y = (wxDouble) pt.y ; }
{ m_x = (wxDouble) pt.m_x ; m_y = (wxDouble) pt.m_y ; }
wxPoint2DDouble( const wxPoint &pt )
{ m_x = (wxDouble) pt.x ; m_y = (wxDouble) pt.y ; }
// two different conversions to integers, floor and rounding
inline void GetFloor( wxInt32 *x , wxInt32 *y ) const;
@@ -590,8 +590,8 @@ public:
( ( pt.m_x > m_x + m_width ) ? wxOutRight : 0 ) +
( ( pt.m_y < m_y ) ? wxOutTop : 0 ) +
( ( pt.m_y > m_y + m_height ) ? wxOutBottom : 0 )); }
inline wxOutCode GetOutcode(const wxPoint2DDouble &pt) const
{ return GetOutCode(pt) ; }
inline wxOutCode GetOutcode(const wxPoint2DDouble &pt) const
{ return GetOutCode(pt) ; }
inline bool Contains( const wxPoint2DDouble &pt ) const
{ return GetOutCode( pt ) == wxInside; }
inline bool Contains( const wxRect2DDouble &rect ) const
@@ -702,8 +702,8 @@ public:
( ( pt.m_x >= m_x + m_width ) ? wxOutRight : 0 ) +
( ( pt.m_y < m_y ) ? wxOutTop : 0 ) +
( ( pt.m_y >= m_y + m_height ) ? wxOutBottom : 0 )); }
inline wxOutCode GetOutcode( const wxPoint2DInt &pt ) const
{ return GetOutCode( pt ) ; }
inline wxOutCode GetOutcode( const wxPoint2DInt &pt ) const
{ return GetOutCode( pt ) ; }
inline bool Contains( const wxPoint2DInt &pt ) const
{ return GetOutCode( pt ) == wxInside; }
inline bool Contains( const wxRect2DInt &rect ) const

6
include/wx/gifdecod.h
View File

@@ -136,13 +136,13 @@ public:
// move through the animation
bool GoFirstFrame();
bool GoLastFrame();
bool GoNextFrame(bool cyclic = FALSE);
bool GoPrevFrame(bool cyclic = FALSE);
bool GoNextFrame(bool cyclic = false);
bool GoPrevFrame(bool cyclic = false);
bool GoFrame(int which);
public:
// constructor, destructor, etc.
wxGIFDecoder(wxInputStream *s, bool anim = FALSE);
wxGIFDecoder(wxInputStream *s, bool anim = false);
~wxGIFDecoder();
bool CanRead();
int ReadGIF();

2
include/wx/glcanvas.h
View File

@@ -30,7 +30,7 @@ public:
// use this in the constructor of the user-derived wxGLApp class to
// determine if an OpenGL rendering context with these attributes
// is available - returns TRUE if so, FALSE if not.
// is available - returns true if so, false if not.
bool InitGLVisual(int *attribList);
private:

6
include/wx/hash.h
View File

@@ -281,10 +281,10 @@ public:
void Put(long key, const wxString& value);
// get the string from the key: if not found, an empty string is returned
// and the wasFound is set to FALSE if not NULL
// and the wasFound is set to false if not NULL
wxString Get(long key, bool *wasFound = NULL) const;
// remove the item, returning TRUE if the item was found and deleted
// remove the item, returning true if the item was found and deleted
bool Delete(long key) const;
// clean up
@@ -584,7 +584,7 @@ private:
{ \
m_hashTable[slot] = new listclass(m_keyType); \
if ( m_deleteContents ) \
m_hashTable[slot]->DeleteContents(TRUE); \
m_hashTable[slot]->DeleteContents(true); \
} \
\
((listclass *)m_hashTable[slot])->Append(value, data); \

4
include/wx/hashmap.h
View File

@@ -433,8 +433,8 @@ public: \
};
// grow/shrink predicates
inline bool never_grow( size_t, size_t ) { return FALSE; }
inline bool never_shrink( size_t, size_t ) { return FALSE; }
inline bool never_grow( size_t, size_t ) { return false; }
inline bool never_shrink( size_t, size_t ) { return false; }
inline bool grow_lf70( size_t buckets, size_t items )
{
return float(items)/float(buckets) >= 0.85;

12
include/wx/helpbase.h
View File

@@ -6,7 +6,7 @@
// Created: 04/01/98
// RCS-ID: $Id$
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_HELPBASEH__
@@ -45,8 +45,8 @@ public:
// Must call this to set the filename and server name.
// server is only required when implementing TCP/IP-based
// help controllers.
virtual bool Initialize(const wxString& WXUNUSED(file), int WXUNUSED(server) ) { return FALSE; }
virtual bool Initialize(const wxString& WXUNUSED(file)) { return FALSE; }
virtual bool Initialize(const wxString& WXUNUSED(file), int WXUNUSED(server) ) { return false; }
virtual bool Initialize(const wxString& WXUNUSED(file)) { return false; }
// Set viewer: only relevant to some kinds of controller
virtual void SetViewer(const wxString& WXUNUSED(viewer), long WXUNUSED(flags) = 0) {}
@@ -61,10 +61,10 @@ public:
virtual bool DisplaySection(int sectionNo) = 0;
// Display the section using a context id
virtual bool DisplayContextPopup(int WXUNUSED(contextId)) { return FALSE; };
virtual bool DisplayContextPopup(int WXUNUSED(contextId)) { return false; };
// Display the text in a popup, if possible
virtual bool DisplayTextPopup(const wxString& WXUNUSED(text), const wxPoint& WXUNUSED(pos)) { return FALSE; }
virtual bool DisplayTextPopup(const wxString& WXUNUSED(text), const wxPoint& WXUNUSED(pos)) { return false; }
// By default, uses KeywordSection to display a topic. Implementations
// may override this for more specific behaviour.
@@ -76,7 +76,7 @@ public:
virtual void SetFrameParameters(const wxString& WXUNUSED(title),
const wxSize& WXUNUSED(size),
const wxPoint& WXUNUSED(pos) = wxDefaultPosition,
bool WXUNUSED(newFrameEachTime) = FALSE)
bool WXUNUSED(newFrameEachTime) = false)
{
// does nothing by default
}

4
src/common/gaugecmn.cpp
View File

@@ -58,7 +58,7 @@ bool wxGaugeBase::Create(wxWindow *parent,
const wxString& name)
{
if ( !wxControl::Create(parent, id, pos, size, style, validator, name) )
return FALSE;
return false;
SetName(name);
@@ -69,7 +69,7 @@ bool wxGaugeBase::Create(wxWindow *parent,
SetRange(range);
SetValue(0);
return TRUE;
return true;
}
// ----------------------------------------------------------------------------

280
src/common/gdicmn.cpp
View File

@@ -71,24 +71,24 @@
template<> void wxStringReadValue(const wxString &s , wxPoint &data )
{
wxSscanf(s, wxT("%d,%d"), &data.x , &data.y ) ;
wxSscanf(s, wxT("%d,%d"), &data.x , &data.y ) ;
}
template<> void wxStringWriteValue(wxString &s , const wxPoint &data )
{
s = wxString::Format(wxT("%d,%d"), data.x , data.y ) ;
s = wxString::Format(wxT("%d,%d"), data.x , data.y ) ;
}
wxCUSTOM_TYPE_INFO(wxPoint, wxToStringConverter<wxPoint> , wxFromStringConverter<wxPoint>)
template<> void wxStringReadValue(const wxString &s , wxSize &data )
{
wxSscanf(s, wxT("%d,%d"), &data.x , &data.y ) ;
wxSscanf(s, wxT("%d,%d"), &data.x , &data.y ) ;
}
template<> void wxStringWriteValue(wxString &s , const wxSize &data )
{
s = wxString::Format(wxT("%d,%d"), data.x , data.y ) ;
s = wxString::Format(wxT("%d,%d"), data.x , data.y ) ;
}
wxCUSTOM_TYPE_INFO(wxSize, wxToStringConverter<wxSize> , wxFromStringConverter<wxSize>)
@@ -99,24 +99,24 @@ IMPLEMENT_ABSTRACT_CLASS(wxDCBase, wxObject)
wxRect::wxRect(const wxPoint& point1, const wxPoint& point2)
{
x = point1.x;
y = point1.y;
width = point2.x - point1.x;
height = point2.y - point1.y;
x = point1.x;
y = point1.y;
width = point2.x - point1.x;
height = point2.y - point1.y;
if (width < 0)
{
width = -width;
x = point2.x;
}
width++;
if (width < 0)
{
width = -width;
x = point2.x;
}
width++;
if (height < 0)
{
height = -height;
y = point2.y;
}
height++;
if (height < 0)
{
height = -height;
y = point2.y;
}
height++;
}
wxRect::wxRect(const wxPoint& point, const wxSize& size)
@@ -127,10 +127,10 @@ wxRect::wxRect(const wxPoint& point, const wxSize& size)
bool wxRect::operator==(const wxRect& rect) const
{
return ((x == rect.x) &&
(y == rect.y) &&
(width == rect.width) &&
(height == rect.height));
return ((x == rect.x) &&
(y == rect.y) &&
(width == rect.width) &&
(height == rect.height));
}
wxRect& wxRect::operator += (const wxRect& rect)
@@ -536,8 +536,8 @@ void wxInitializeStockObjects ()
SInt16 fontSize ;
Style fontStyle ;
GetThemeFont(kThemeSystemFont , GetApplicationScript() , fontName , &fontSize , &fontStyle ) ;
sizeFont = fontSize ;
GetThemeFont(kThemeSystemFont , GetApplicationScript() , fontName , &fontSize , &fontStyle ) ;
sizeFont = fontSize ;
#if __WXMAC_CLASSIC__
wxNORMAL_FONT = new wxFont (fontSize, wxMODERN, wxNORMAL, wxNORMAL , false , wxMacMakeStringFromPascal(fontName) );
#else
@@ -545,120 +545,120 @@ void wxInitializeStockObjects ()
wxNORMAL_FONT->MacCreateThemeFont( kThemeSystemFont );
#endif
#elif defined(__WXPM__)
static const int sizeFont = 12;
static const int sizeFont = 12;
#else
wxNORMAL_FONT = new wxFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
static const int sizeFont = wxNORMAL_FONT->GetPointSize();
wxNORMAL_FONT = new wxFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
static const int sizeFont = wxNORMAL_FONT->GetPointSize();
#endif
#if defined(__WXPM__)
/*
// Basic OS/2 has a fairly limited number of fonts and these are as good
// as I can do to get something that looks halfway "wx" normal
*/
wxNORMAL_FONT = new wxFont (sizeFont, wxMODERN, wxNORMAL, wxBOLD);
wxSMALL_FONT = new wxFont (sizeFont - 4, wxSWISS, wxNORMAL, wxNORMAL); /* Helv */
wxITALIC_FONT = new wxFont (sizeFont, wxROMAN, wxITALIC, wxNORMAL);
wxSWISS_FONT = new wxFont (sizeFont, wxSWISS, wxNORMAL, wxNORMAL); /* Helv */
/*
// Basic OS/2 has a fairly limited number of fonts and these are as good
// as I can do to get something that looks halfway "wx" normal
*/
wxNORMAL_FONT = new wxFont (sizeFont, wxMODERN, wxNORMAL, wxBOLD);
wxSMALL_FONT = new wxFont (sizeFont - 4, wxSWISS, wxNORMAL, wxNORMAL); /* Helv */
wxITALIC_FONT = new wxFont (sizeFont, wxROMAN, wxITALIC, wxNORMAL);
wxSWISS_FONT = new wxFont (sizeFont, wxSWISS, wxNORMAL, wxNORMAL); /* Helv */
#elif defined(__WXMAC__)
wxSWISS_FONT = new wxFont (sizeFont, wxSWISS, wxNORMAL, wxNORMAL); /* Helv */
wxITALIC_FONT = new wxFont (sizeFont, wxROMAN, wxITALIC, wxNORMAL);
#if __WXMAC_CLASSIC__
GetThemeFont(kThemeSmallSystemFont , GetApplicationScript() , fontName , &fontSize , &fontStyle ) ;
GetThemeFont(kThemeSmallSystemFont , GetApplicationScript() , fontName , &fontSize , &fontStyle ) ;
wxSMALL_FONT = new wxFont (fontSize, wxSWISS, wxNORMAL, wxNORMAL , false , wxMacMakeStringFromPascal( fontName ) );
#else
wxSMALL_FONT = new wxFont () ;
wxSMALL_FONT->MacCreateThemeFont( kThemeSmallSystemFont );
#endif
#else
wxSMALL_FONT = new wxFont (sizeFont - 2, wxSWISS, wxNORMAL, wxNORMAL);
wxITALIC_FONT = new wxFont (sizeFont, wxROMAN, wxITALIC, wxNORMAL);
wxSWISS_FONT = new wxFont (sizeFont, wxSWISS, wxNORMAL, wxNORMAL);
wxSMALL_FONT = new wxFont (sizeFont - 2, wxSWISS, wxNORMAL, wxNORMAL);
wxITALIC_FONT = new wxFont (sizeFont, wxROMAN, wxITALIC, wxNORMAL);
wxSWISS_FONT = new wxFont (sizeFont, wxSWISS, wxNORMAL, wxNORMAL);
#endif
wxRED_PEN = new wxPen (wxT("RED"), 1, wxSOLID);
wxCYAN_PEN = new wxPen (wxT("CYAN"), 1, wxSOLID);
wxGREEN_PEN = new wxPen (wxT("GREEN"), 1, wxSOLID);
wxBLACK_PEN = new wxPen (wxT("BLACK"), 1, wxSOLID);
wxWHITE_PEN = new wxPen (wxT("WHITE"), 1, wxSOLID);
wxTRANSPARENT_PEN = new wxPen (wxT("BLACK"), 1, wxTRANSPARENT);
wxBLACK_DASHED_PEN = new wxPen (wxT("BLACK"), 1, wxSHORT_DASH);
wxGREY_PEN = new wxPen (wxT("GREY"), 1, wxSOLID);
wxMEDIUM_GREY_PEN = new wxPen (wxT("MEDIUM GREY"), 1, wxSOLID);
wxLIGHT_GREY_PEN = new wxPen (wxT("LIGHT GREY"), 1, wxSOLID);
wxRED_PEN = new wxPen (wxT("RED"), 1, wxSOLID);
wxCYAN_PEN = new wxPen (wxT("CYAN"), 1, wxSOLID);
wxGREEN_PEN = new wxPen (wxT("GREEN"), 1, wxSOLID);
wxBLACK_PEN = new wxPen (wxT("BLACK"), 1, wxSOLID);
wxWHITE_PEN = new wxPen (wxT("WHITE"), 1, wxSOLID);
wxTRANSPARENT_PEN = new wxPen (wxT("BLACK"), 1, wxTRANSPARENT);
wxBLACK_DASHED_PEN = new wxPen (wxT("BLACK"), 1, wxSHORT_DASH);
wxGREY_PEN = new wxPen (wxT("GREY"), 1, wxSOLID);
wxMEDIUM_GREY_PEN = new wxPen (wxT("MEDIUM GREY"), 1, wxSOLID);
wxLIGHT_GREY_PEN = new wxPen (wxT("LIGHT GREY"), 1, wxSOLID);
wxBLUE_BRUSH = new wxBrush (wxT("BLUE"), wxSOLID);
wxGREEN_BRUSH = new wxBrush (wxT("GREEN"), wxSOLID);
wxWHITE_BRUSH = new wxBrush (wxT("WHITE"), wxSOLID);
wxBLACK_BRUSH = new wxBrush (wxT("BLACK"), wxSOLID);
wxTRANSPARENT_BRUSH = new wxBrush (wxT("BLACK"), wxTRANSPARENT);
wxCYAN_BRUSH = new wxBrush (wxT("CYAN"), wxSOLID);
wxRED_BRUSH = new wxBrush (wxT("RED"), wxSOLID);
wxGREY_BRUSH = new wxBrush (wxT("GREY"), wxSOLID);
wxMEDIUM_GREY_BRUSH = new wxBrush (wxT("MEDIUM GREY"), wxSOLID);
wxLIGHT_GREY_BRUSH = new wxBrush (wxT("LIGHT GREY"), wxSOLID);
wxBLUE_BRUSH = new wxBrush (wxT("BLUE"), wxSOLID);
wxGREEN_BRUSH = new wxBrush (wxT("GREEN"), wxSOLID);
wxWHITE_BRUSH = new wxBrush (wxT("WHITE"), wxSOLID);
wxBLACK_BRUSH = new wxBrush (wxT("BLACK"), wxSOLID);
wxTRANSPARENT_BRUSH = new wxBrush (wxT("BLACK"), wxTRANSPARENT);
wxCYAN_BRUSH = new wxBrush (wxT("CYAN"), wxSOLID);
wxRED_BRUSH = new wxBrush (wxT("RED"), wxSOLID);
wxGREY_BRUSH = new wxBrush (wxT("GREY"), wxSOLID);
wxMEDIUM_GREY_BRUSH = new wxBrush (wxT("MEDIUM GREY"), wxSOLID);
wxLIGHT_GREY_BRUSH = new wxBrush (wxT("LIGHT GREY"), wxSOLID);
wxBLACK = new wxColour (wxT("BLACK"));
wxWHITE = new wxColour (wxT("WHITE"));
wxRED = new wxColour (wxT("RED"));
wxBLUE = new wxColour (wxT("BLUE"));
wxGREEN = new wxColour (wxT("GREEN"));
wxCYAN = new wxColour (wxT("CYAN"));
wxLIGHT_GREY = new wxColour (wxT("LIGHT GREY"));
wxBLACK = new wxColour (wxT("BLACK"));
wxWHITE = new wxColour (wxT("WHITE"));
wxRED = new wxColour (wxT("RED"));
wxBLUE = new wxColour (wxT("BLUE"));
wxGREEN = new wxColour (wxT("GREEN"));
wxCYAN = new wxColour (wxT("CYAN"));
wxLIGHT_GREY = new wxColour (wxT("LIGHT GREY"));
wxSTANDARD_CURSOR = new wxCursor (wxCURSOR_ARROW);
wxHOURGLASS_CURSOR = new wxCursor (wxCURSOR_WAIT);
wxCROSS_CURSOR = new wxCursor (wxCURSOR_CROSS);
wxSTANDARD_CURSOR = new wxCursor (wxCURSOR_ARROW);
wxHOURGLASS_CURSOR = new wxCursor (wxCURSOR_WAIT);
wxCROSS_CURSOR = new wxCursor (wxCURSOR_CROSS);
}
void wxDeleteStockObjects ()
{
wxDELETE(wxNORMAL_FONT);
wxDELETE(wxSMALL_FONT);
wxDELETE(wxITALIC_FONT);
wxDELETE(wxSWISS_FONT);
wxDELETE(wxNORMAL_FONT);
wxDELETE(wxSMALL_FONT);
wxDELETE(wxITALIC_FONT);
wxDELETE(wxSWISS_FONT);
wxDELETE(wxRED_PEN);
wxDELETE(wxCYAN_PEN);
wxDELETE(wxGREEN_PEN);
wxDELETE(wxBLACK_PEN);
wxDELETE(wxWHITE_PEN);
wxDELETE(wxTRANSPARENT_PEN);
wxDELETE(wxBLACK_DASHED_PEN);
wxDELETE(wxGREY_PEN);
wxDELETE(wxMEDIUM_GREY_PEN);
wxDELETE(wxLIGHT_GREY_PEN);
wxDELETE(wxRED_PEN);
wxDELETE(wxCYAN_PEN);
wxDELETE(wxGREEN_PEN);
wxDELETE(wxBLACK_PEN);
wxDELETE(wxWHITE_PEN);
wxDELETE(wxTRANSPARENT_PEN);
wxDELETE(wxBLACK_DASHED_PEN);
wxDELETE(wxGREY_PEN);
wxDELETE(wxMEDIUM_GREY_PEN);
wxDELETE(wxLIGHT_GREY_PEN);
wxDELETE(wxBLUE_BRUSH);
wxDELETE(wxGREEN_BRUSH);
wxDELETE(wxWHITE_BRUSH);
wxDELETE(wxBLACK_BRUSH);
wxDELETE(wxTRANSPARENT_BRUSH);
wxDELETE(wxCYAN_BRUSH);
wxDELETE(wxRED_BRUSH);
wxDELETE(wxGREY_BRUSH);
wxDELETE(wxMEDIUM_GREY_BRUSH);
wxDELETE(wxLIGHT_GREY_BRUSH);
wxDELETE(wxBLUE_BRUSH);
wxDELETE(wxGREEN_BRUSH);
wxDELETE(wxWHITE_BRUSH);
wxDELETE(wxBLACK_BRUSH);
wxDELETE(wxTRANSPARENT_BRUSH);
wxDELETE(wxCYAN_BRUSH);
wxDELETE(wxRED_BRUSH);
wxDELETE(wxGREY_BRUSH);
wxDELETE(wxMEDIUM_GREY_BRUSH);
wxDELETE(wxLIGHT_GREY_BRUSH);
wxDELETE(wxBLACK);
wxDELETE(wxWHITE);
wxDELETE(wxRED);
wxDELETE(wxBLUE);
wxDELETE(wxGREEN);
wxDELETE(wxCYAN);
wxDELETE(wxLIGHT_GREY);
wxDELETE(wxBLACK);
wxDELETE(wxWHITE);
wxDELETE(wxRED);
wxDELETE(wxBLUE);
wxDELETE(wxGREEN);
wxDELETE(wxCYAN);
wxDELETE(wxLIGHT_GREY);
wxDELETE(wxSTANDARD_CURSOR);
wxDELETE(wxHOURGLASS_CURSOR);
wxDELETE(wxCROSS_CURSOR);
wxDELETE(wxSTANDARD_CURSOR);
wxDELETE(wxHOURGLASS_CURSOR);
wxDELETE(wxCROSS_CURSOR);
}
void wxDeleteStockLists()
{
wxDELETE(wxTheBrushList);
wxDELETE(wxThePenList);
wxDELETE(wxTheFontList);
wxDELETE(wxTheBitmapList);
wxDELETE(wxTheBrushList);
wxDELETE(wxThePenList);
wxDELETE(wxTheFontList);
wxDELETE(wxTheBitmapList);
}
// ============================================================================
@@ -671,39 +671,39 @@ wxBitmapList::wxBitmapList()
wxBitmapList::~wxBitmapList ()
{
wxList::compatibility_iterator node = GetFirst ();
while (node)
wxList::compatibility_iterator node = GetFirst ();
while (node)
{
wxBitmap *bitmap = (wxBitmap *) node->GetData ();
wxList::compatibility_iterator next = node->GetNext ();
if (bitmap->GetVisible())
delete bitmap;
node = next;
wxBitmap *bitmap = (wxBitmap *) node->GetData ();
wxList::compatibility_iterator next = node->GetNext ();
if (bitmap->GetVisible())
delete bitmap;
node = next;
}
}
// Pen and Brush lists
wxPenList::~wxPenList ()
{
wxList::compatibility_iterator node = GetFirst ();
while (node)
wxList::compatibility_iterator node = GetFirst ();
while (node)
{
wxPen *pen = (wxPen *) node->GetData ();
wxList::compatibility_iterator next = node->GetNext ();
if (pen->GetVisible())
delete pen;
node = next;
wxPen *pen = (wxPen *) node->GetData ();
wxList::compatibility_iterator next = node->GetNext ();
if (pen->GetVisible())
delete pen;
node = next;
}
}
void wxPenList::AddPen (wxPen * pen)
{
Append (pen);
Append (pen);
}
void wxPenList::RemovePen (wxPen * pen)
{
DeleteObject (pen);
DeleteObject (pen);
}
wxPen *wxPenList::FindOrCreatePen (const wxColour& colour, int width, int style)
@@ -733,27 +733,27 @@ wxPen *wxPenList::FindOrCreatePen (const wxColour& colour, int width, int style)
AddPen(pen);
// we'll delete it ourselves later
pen->SetVisible(TRUE);
pen->SetVisible(true);
return pen;
}
wxBrushList::~wxBrushList ()
{
wxList::compatibility_iterator node = GetFirst ();
while (node)
wxList::compatibility_iterator node = GetFirst ();
while (node)
{
wxBrush *brush = (wxBrush *) node->GetData ();
wxList::compatibility_iterator next = node->GetNext ();
if (brush && brush->GetVisible())
delete brush;
node = next;
wxBrush *brush = (wxBrush *) node->GetData ();
wxList::compatibility_iterator next = node->GetNext ();
if (brush && brush->GetVisible())
delete brush;
node = next;
}
}
void wxBrushList::AddBrush (wxBrush * brush)
{
Append (brush);
Append (brush);
}
wxBrush *wxBrushList::FindOrCreateBrush (const wxColour& colour, int style)
@@ -783,14 +783,14 @@ wxBrush *wxBrushList::FindOrCreateBrush (const wxColour& colour, int style)
AddBrush(brush);
// we'll delete it ourselves later
brush->SetVisible(TRUE);
brush->SetVisible(true);
return brush;
}
void wxBrushList::RemoveBrush (wxBrush * brush)
{
DeleteObject (brush);
DeleteObject (brush);
}
wxFontList::~wxFontList ()
@@ -812,12 +812,12 @@ wxFontList::~wxFontList ()
void wxFontList::AddFont (wxFont * font)
{
Append (font);
Append (font);
}
void wxFontList::RemoveFont (wxFont * font)
{
DeleteObject (font);
DeleteObject (font);
}
wxFont *wxFontList::FindOrCreateFont(int pointSize,
@@ -858,7 +858,7 @@ wxFont *wxFontList::FindOrCreateFont(int pointSize,
// a different font if we create it with empty facename, but it is
// still better than never matching anything in the cache at all
// in this case
if ( same && !!facename )
if ( same && !facename.IsEmpty() )
{
const wxString& fontFace = font->GetFaceName();
@@ -888,7 +888,7 @@ wxFont *wxFontList::FindOrCreateFont(int pointSize,
AddFont(font);
// and mark it as being cacheable
font->SetVisible(TRUE);
font->SetVisible(true);
}
return font;

8
src/common/geometry.cpp
View File

@@ -57,9 +57,9 @@ bool wxRect2DDouble::Intersects( const wxRect2DDouble &rect ) const
if ( left < right && top < bottom )
{
return TRUE;
return true;
}
return FALSE;
return false;
}
void wxRect2DDouble::Intersect( const wxRect2DDouble &src1 , const wxRect2DDouble &src2 , wxRect2DDouble *dest )
@@ -252,9 +252,9 @@ bool wxRect2DInt::Intersects( const wxRect2DInt &rect ) const
if ( left < right && top < bottom )
{
return TRUE;
return true;
}
return FALSE;
return false;
}
void wxRect2DInt::Intersect( const wxRect2DInt &src1 , const wxRect2DInt &src2 , wxRect2DInt *dest )

46
src/common/gifdecod.cpp
View File

@@ -116,7 +116,7 @@ bool wxGIFDecoder::ConvertToImage(wxImage *image) const
image->Create(GetWidth(), GetHeight());
if (!image->Ok())
return FALSE;
return false;
pal = GetPalette();
src = GetData();
@@ -143,7 +143,7 @@ bool wxGIFDecoder::ConvertToImage(wxImage *image) const
image->SetMaskColour(255, 0, 255);
}
else
image->SetMask(FALSE);
image->SetMask(false);
#if wxUSE_PALETTE
if (pal)
@@ -171,7 +171,7 @@ bool wxGIFDecoder::ConvertToImage(wxImage *image) const
*(dst++) = pal[3 * (*src) + 2];
}
return TRUE;
return true;
}
@@ -208,27 +208,27 @@ bool wxGIFDecoder::IsAnimation() const { return (m_nimages > 1); }
bool wxGIFDecoder::GoFirstFrame()
{
if (!IsAnimation())
return FALSE;
return false;
m_image = 1;
m_pimage = m_pfirst;
return TRUE;
return true;
}
bool wxGIFDecoder::GoLastFrame()
{
if (!IsAnimation())
return FALSE;
return false;
m_image = m_nimages;
m_pimage = m_plast;
return TRUE;
return true;
}
bool wxGIFDecoder::GoNextFrame(bool cyclic)
{
if (!IsAnimation())
return FALSE;
return false;
if ((m_image < m_nimages) || (cyclic))
{
@@ -241,16 +241,16 @@ bool wxGIFDecoder::GoNextFrame(bool cyclic)
m_pimage = m_pfirst;
}
return TRUE;
return true;
}
else
return FALSE;
return false;
}
bool wxGIFDecoder::GoPrevFrame(bool cyclic)
{
if (!IsAnimation())
return FALSE;
return false;
if ((m_image > 1) || (cyclic))
{
@@ -263,10 +263,10 @@ bool wxGIFDecoder::GoPrevFrame(bool cyclic)
m_pimage = m_plast;
}
return TRUE;
return true;
}
else
return FALSE;
return false;
}
bool wxGIFDecoder::GoFrame(int which)
@@ -274,7 +274,7 @@ bool wxGIFDecoder::GoFrame(int which)
int i;
if (!IsAnimation())
return FALSE;
return false;
if ((which >= 1) && (which <= m_nimages))
{
@@ -283,10 +283,10 @@ bool wxGIFDecoder::GoFrame(int which)
for (i = 0; i < which; i++)
m_pimage = m_pimage->next;
return TRUE;
return true;
}
else
return FALSE;
return false;
}
@@ -612,14 +612,14 @@ as an End of Information itself)
// CanRead:
// Returns TRUE if the file looks like a valid GIF, FALSE otherwise.
// Returns true if the file looks like a valid GIF, false otherwise.
//
bool wxGIFDecoder::CanRead()
{
unsigned char buf[3];
if ( !m_f->Read(buf, WXSIZEOF(buf)) )
return FALSE;
return false;
m_f->SeekI(-(off_t)WXSIZEOF(buf), wxFromCurrent);
@@ -663,7 +663,7 @@ int wxGIFDecoder::ReadGIF()
if (memcmp(buf + 3, "89a", 3) < 0)
{
m_anim = FALSE;
m_anim = false;
}
/* read logical screen descriptor block (LSDB) */
@@ -701,7 +701,7 @@ int wxGIFDecoder::ReadGIF()
pprev = NULL;
pimg = NULL;
bool done = FALSE;
bool done = false;
while(!done)
{
@@ -727,7 +727,7 @@ int wxGIFDecoder::ReadGIF()
/* end of data? */
if (type == 0x3B)
{
done = TRUE;
done = true;
}
else
/* extension block? */
@@ -762,7 +762,7 @@ int wxGIFDecoder::ReadGIF()
m_f->SeekI(i, wxFromCurrent);
if (m_f->Eof())
{
done = TRUE;
done = true;
break;
}
}
@@ -857,7 +857,7 @@ int wxGIFDecoder::ReadGIF()
/* if this is not an animated GIF, exit after first image */
if (!m_anim)
done = TRUE;
done = true;
}
}

2
src/common/helpbase.cpp
View File

@@ -6,7 +6,7 @@
// Created: 04/01/98
// RCS-ID: $Id$
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

38
src/common/http.cpp
View File

@@ -33,7 +33,7 @@
#include "wx/sckstrm.h"
IMPLEMENT_DYNAMIC_CLASS(wxHTTP, wxProtocol)
IMPLEMENT_PROTOCOL(wxHTTP, wxT("http"), wxT("80"), TRUE)
IMPLEMENT_PROTOCOL(wxHTTP, wxT("http"), wxT("80"), true)
#define HTTP_BSIZE 2048
@@ -41,8 +41,8 @@ wxHTTP::wxHTTP()
: wxProtocol()
{
m_addr = NULL;
m_read = FALSE;
m_proxy_mode = FALSE;
m_read = false;
m_proxy_mode = false;
m_post_buf = wxEmptyString;
m_http_response = 0;
@@ -99,7 +99,7 @@ void wxHTTP::SetHeader(const wxString& header, const wxString& h_data)
{
if (m_read) {
ClearHeaders();
m_read = FALSE;
m_read = false;
}
wxHeaderIterator it = FindHeader(header);
@@ -141,11 +141,11 @@ bool wxHTTP::ParseHeaders()
wxStringTokenizer tokenzr;
ClearHeaders();
m_read = TRUE;
m_read = true;
#if defined(__VISAGECPP__)
// VA just can't stand while(1)
bool bOs2var = TRUE;
bool bOs2var = true;
while(bOs2var)
#else
while (1)
@@ -153,7 +153,7 @@ bool wxHTTP::ParseHeaders()
{
m_perr = GetLine(this, line);
if (m_perr != wxPROTO_NOERR)
return FALSE;
return false;
if (line.Length() == 0)
break;
@@ -161,7 +161,7 @@ bool wxHTTP::ParseHeaders()
wxString left_str = line.BeforeFirst(':');
m_headers[left_str] = line.AfterFirst(':').Strip(wxString::both);
}
return TRUE;
return true;
}
bool wxHTTP::Connect(const wxString& host, unsigned short port)
@@ -180,7 +180,7 @@ bool wxHTTP::Connect(const wxString& host, unsigned short port)
delete m_addr;
m_addr = NULL;
m_perr = wxPROTO_NETERR;
return FALSE;
return false;
}
if ( port ) addr->Service(port);
@@ -189,7 +189,7 @@ bool wxHTTP::Connect(const wxString& host, unsigned short port)
SetHeader(wxT("Host"), host);
return TRUE;
return true;
}
bool wxHTTP::Connect(wxSockAddress& addr, bool WXUNUSED(wait))
@@ -205,7 +205,7 @@ bool wxHTTP::Connect(wxSockAddress& addr, bool WXUNUSED(wait))
if (ipv4addr)
SetHeader(wxT("Host"), ipv4addr->OrigHostname());
return TRUE;
return true;
}
bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req)
@@ -222,7 +222,7 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req)
SetHeader( wxT("Content-Length"), wxString::Format( wxT("%lu"), (unsigned long)m_post_buf.Len() ) );
break;
default:
return FALSE;
return false;
}
m_http_response = 0;
@@ -237,7 +237,7 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req)
#else
SetFlags( wxSOCKET_NONE );
#endif
Notify(FALSE);
Notify(false);
wxString buf;
buf.Printf(wxT("%s %s HTTP/1.0\r\n"), request, path.c_str());
@@ -255,7 +255,7 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req)
m_perr = GetLine(this, tmp_str);
if (m_perr != wxPROTO_NOERR) {
RestoreState();
return FALSE;
return false;
}
if (!tmp_str.Contains(wxT("HTTP/"))) {
@@ -264,7 +264,7 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req)
SetHeader(wxT("Content-Length"), wxT("-1"));
SetHeader(wxT("Content-Type"), wxT("none/none"));
RestoreState();
return TRUE;
return true;
}
wxStringTokenizer token(tmp_str,wxT(' '));
@@ -289,7 +289,7 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req)
default:
m_perr = wxPROTO_NOFILE;
RestoreState();
return FALSE;
return false;
}
ret_value = ParseHeaders();
@@ -343,9 +343,9 @@ wxInputStream *wxHTTP::GetInputStream(const wxString& path)
if (!m_addr)
return NULL;
// We set m_connected back to FALSE so wxSocketBase will know what to do.
// We set m_connected back to false so wxSocketBase will know what to do.
#ifdef __WXMAC__
wxSocketClient::Connect(*m_addr , FALSE );
wxSocketClient::Connect(*m_addr , false );
wxSocketClient::WaitOnConnect(10);
if (!wxSocketClient::IsConnected())
@@ -367,7 +367,7 @@ wxInputStream *wxHTTP::GetInputStream(const wxString& path)
inp_stream->m_read_bytes = 0;
Notify(FALSE);
Notify(false);
SetFlags(wxSOCKET_BLOCK | wxSOCKET_WAITALL);
return inp_stream;