From 213ceb3f0e7b88a09d756dd181f14ecb5bd44d57 Mon Sep 17 00:00:00 2001
From: =?utf8?q?W=C5=82odzimierz=20Skiba?= <abx@abx.art.pl>
Date: Thu, 26 Aug 2004 08:46:18 +0000
Subject: [PATCH] Source cleaning: whitespaces & tabs, ::, TRUE/true,
FALSE/false.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28925 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
include/wx/msw/gccpriv.h | 4 ++--
include/wx/msw/gdiimage.h | 2 +-
include/wx/msw/gdiobj.h | 10 +++++-----
src/msw/gauge95.cpp | 4 ++--
src/msw/gdiimage.cpp | 6 +++---
src/msw/gdiobj.cpp | 12 ++++++------
src/msw/glcanvas.cpp | 30 +++++++++++++++---------------
src/msw/gsocket.cpp | 2 +-
8 files changed, 35 insertions(+), 35 deletions(-)
diff --git a/include/wx/msw/gccpriv.h b/include/wx/msw/gccpriv.h
index c08747990d..20dc5c11d1 100644
--- a/include/wx/msw/gccpriv.h
+++ b/include/wx/msw/gccpriv.h
@@ -16,12 +16,12 @@
#endif
#endif
#elif defined( __CYGWIN__ ) && !defined( HAVE_W32API_H )
- #if ( __GNUC__ > 2 )
+ #if ( __GNUC__ > 2 )
#define HAVE_W32API_H
#endif
#endif
-#if (defined(__WATCOMC__) && __WATCOMC__ >= 1200)
+#if (defined(__WATCOMC__) && __WATCOMC__ >= 1200)
#define HAVE_W32API_H
#endif
diff --git a/include/wx/msw/gdiimage.h b/include/wx/msw/gdiimage.h
index ac89747bd5..534c9fc99e 100644
--- a/include/wx/msw/gdiimage.h
+++ b/include/wx/msw/gdiimage.h
@@ -176,7 +176,7 @@ public:
void SetSize(const wxSize& size) { SetSize(size.x, size.y); }
// forward some of base class virtuals to wxGDIImageRefData
- bool FreeResource(bool force = FALSE);
+ bool FreeResource(bool force = false);
virtual WXHANDLE GetResourceHandle() const;
protected:
diff --git a/include/wx/msw/gdiobj.h b/include/wx/msw/gdiobj.h
index 4b085fce52..3d3d1b9209 100644
--- a/include/wx/msw/gdiobj.h
+++ b/include/wx/msw/gdiobj.h
@@ -36,15 +36,15 @@ class WXDLLEXPORT wxGDIRefData : public wxObjectRefData
class WXDLLEXPORT wxGDIObject : public wxObject
{
public:
- wxGDIObject() { m_visible = FALSE; };
+ wxGDIObject() { m_visible = false; };
// Creates the resource
- virtual bool RealizeResource() { return FALSE; };
+ virtual bool RealizeResource() { return false; };
// Frees the resource
- virtual bool FreeResource(bool WXUNUSED(force) = FALSE) { return FALSE; }
+ virtual bool FreeResource(bool WXUNUSED(force) = false) { return false; }
- virtual bool IsFree() const { return FALSE; }
+ virtual bool IsFree() const { return false; }
bool IsNull() const { return (m_refData == 0); }
@@ -55,7 +55,7 @@ public:
virtual void SetVisible(bool v) { m_visible = v; }
protected:
- bool m_visible; // TRUE only if we should delete this object ourselves
+ bool m_visible; // true only if we should delete this object ourselves
private:
DECLARE_DYNAMIC_CLASS(wxGDIObject)
diff --git a/src/msw/gauge95.cpp b/src/msw/gauge95.cpp
index 6b176c92ec..e06f66301c 100644
--- a/src/msw/gauge95.cpp
+++ b/src/msw/gauge95.cpp
@@ -78,7 +78,7 @@ wxBEGIN_FLAGS( wxGaugeStyle )
wxFLAGS_MEMBER(wxBORDER_RAISED)
wxFLAGS_MEMBER(wxBORDER_STATIC)
wxFLAGS_MEMBER(wxBORDER_NONE)
-
+
// old style border flags
wxFLAGS_MEMBER(wxSIMPLE_BORDER)
wxFLAGS_MEMBER(wxSUNKEN_BORDER)
@@ -117,7 +117,7 @@ wxEND_PROPERTIES_TABLE()
wxBEGIN_HANDLERS_TABLE(wxGauge95)
wxEND_HANDLERS_TABLE()
-wxCONSTRUCTOR_6( wxGauge95 , wxWindow* , Parent , wxWindowID , Id , int , Range , wxPoint , Position , wxSize , Size , long , WindowStyle )
+wxCONSTRUCTOR_6( wxGauge95 , wxWindow* , Parent , wxWindowID , Id , int , Range , wxPoint , Position , wxSize , Size , long , WindowStyle )
#else
IMPLEMENT_DYNAMIC_CLASS(wxGauge95, wxControl)
#endif
diff --git a/src/msw/gdiimage.cpp b/src/msw/gdiimage.cpp
index 36c3623a9f..cba8189116 100644
--- a/src/msw/gdiimage.cpp
+++ b/src/msw/gdiimage.cpp
@@ -378,9 +378,9 @@ bool wxBMPFileHandler::LoadFile(wxBitmap *bitmap,
WXHBITMAP hBitmap = (WXHBITMAP)wxLoadBMP(name);
if(hBitmap) {
bitmap->SetHBITMAP(hBitmap);
- return TRUE;
+ return true;
}
- return FALSE;
+ return false;
#endif
}
@@ -396,7 +396,7 @@ bool wxBMPFileHandler::SaveFile(wxBitmap *bitmap,
return dib.Save(name);
#else
- return FALSE;
+ return false;
#endif
}
diff --git a/src/msw/gdiobj.cpp b/src/msw/gdiobj.cpp
index de94cd9d54..77c3045ad8 100644
--- a/src/msw/gdiobj.cpp
+++ b/src/msw/gdiobj.cpp
@@ -6,7 +6,7 @@
// Created: 01/02/97
// RCS-ID: $Id$
// Copyright: (c) Julian Smart
-// Licence: wxWindows licence
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
@@ -36,8 +36,8 @@ IMPLEMENT_DYNAMIC_CLASS(wxGDIObject, wxObject)
/*
void wxGDIObject::IncrementResourceUsage(void)
{
- if ( !M_GDIDATA )
- return;
+ if ( !M_GDIDATA )
+ return;
// wxDebugMsg("Object %ld about to be incremented: %d\n", (long)this, m_usageCount);
M_GDIDATA->m_usageCount ++;
@@ -45,12 +45,12 @@ void wxGDIObject::IncrementResourceUsage(void)
void wxGDIObject::DecrementResourceUsage(void)
{
- if ( !M_GDIDATA )
- return;
+ if ( !M_GDIDATA )
+ return;
M_GDIDATA->m_usageCount --;
if (wxTheApp)
- wxTheApp->SetPendingCleanup(TRUE);
+ wxTheApp->SetPendingCleanup(true);
// wxDebugMsg("Object %ld decremented: %d\n", (long)this, M_GDIDATA->m_usageCount);
if (M_GDIDATA->m_usageCount < 0)
{
diff --git a/src/msw/glcanvas.cpp b/src/msw/glcanvas.cpp
index 312b94dbd0..eacc888687 100644
--- a/src/msw/glcanvas.cpp
+++ b/src/msw/glcanvas.cpp
@@ -175,7 +175,7 @@ wxGLCanvas::wxGLCanvas(wxWindow *parent, wxWindowID id,
SetupPixelFormat(attribList);
SetupPalette(palette);
- m_glContext = new wxGLContext(TRUE, this, palette);
+ m_glContext = new wxGLContext(true, this, palette);
}
wxGLCanvas::wxGLCanvas( wxWindow *parent,
@@ -198,7 +198,7 @@ wxGLCanvas::wxGLCanvas( wxWindow *parent,
SetupPixelFormat(attribList);
SetupPalette(palette);
- m_glContext = new wxGLContext(TRUE, this, palette, shared );
+ m_glContext = new wxGLContext(true, this, palette, shared );
}
// Not very useful for wxMSW, but this is to be wxGTK compliant
@@ -224,7 +224,7 @@ wxGLCanvas::wxGLCanvas( wxWindow *parent, const wxGLCanvas *shared, wxWindowID i
wxGLContext *sharedContext=0;
if (shared) sharedContext=shared->GetContext();
- m_glContext = new wxGLContext(TRUE, this, palette, sharedContext );
+ m_glContext = new wxGLContext(true, this, palette, sharedContext );
}
wxGLCanvas::~wxGLCanvas()
@@ -244,7 +244,7 @@ bool wxGLCanvas::Create(wxWindow *parent,
long style,
const wxString& name)
{
- static bool s_registeredGLCanvasClass = FALSE;
+ static bool s_registeredGLCanvasClass = false;
// We have to register a special window class because we need
// the CS_OWNDC style for GLCanvas.
@@ -287,7 +287,7 @@ bool wxGLCanvas::Create(wxWindow *parent,
if ( !::RegisterClass(&wndclass) )
{
wxLogLastError(wxT("RegisterClass(wxGLCanvasClass)"));
- return FALSE;
+ return false;
}
// Register the GLCanvas class name for windows which don't do full repaint
@@ -301,16 +301,16 @@ bool wxGLCanvas::Create(wxWindow *parent,
::UnregisterClass(wxGLCanvasClassName, wxhInstance);
- return FALSE;
+ return false;
}
- s_registeredGLCanvasClass = TRUE;
+ s_registeredGLCanvasClass = true;
}
- wxCHECK_MSG( parent, FALSE, wxT("can't create wxWindow without parent") );
+ wxCHECK_MSG( parent, false, wxT("can't create wxWindow without parent") );
if ( !CreateBase(parent, id, pos, size, style, wxDefaultValidator, name) )
- return FALSE;
+ return false;
parent->AddChild(this);
@@ -466,8 +466,8 @@ void wxGLCanvas::SetupPalette(const wxPalette& palette)
if (m_palette.Ok())
{
- SelectPalette((HDC) m_hDC, (HPALETTE) m_palette.GetHPALETTE(), FALSE);
- RealizePalette((HDC) m_hDC);
+ ::SelectPalette((HDC) m_hDC, (HPALETTE) m_palette.GetHPALETTE(), FALSE);
+ ::RealizePalette((HDC) m_hDC);
}
}
@@ -547,10 +547,10 @@ void wxGLCanvas::OnQueryNewPalette(wxQueryNewPaletteEvent& event)
::SelectPalette((HDC) GetHDC(), (HPALETTE) GetPalette()->GetHPALETTE(), FALSE);
::RealizePalette((HDC) GetHDC());
Refresh();
- event.SetPaletteRealized(TRUE);
+ event.SetPaletteRealized(true);
}
else
- event.SetPaletteRealized(FALSE);
+ event.SetPaletteRealized(false);
}
// I think this doesn't have to be propagated to child windows.
@@ -736,10 +736,10 @@ bool wxGLApp::InitGLVisual(int *attribList)
if (pixelFormat == 0) {
wxLogError(_("Failed to initialize OpenGL"));
- return FALSE;
+ return false;
}
- return TRUE;
+ return true;
}
wxGLApp::~wxGLApp()
diff --git a/src/msw/gsocket.cpp b/src/msw/gsocket.cpp
index 9b7bb39ed5..620ad39cbf 100644
--- a/src/msw/gsocket.cpp
+++ b/src/msw/gsocket.cpp
@@ -508,7 +508,7 @@ GSocket *GSocket::WaitConnection()
* make the appropriate setsockopt() call.
* Implemented as a GSocket function because clients (ie, wxSocketServer)
* don't have access to the GSocket struct information.
-* Returns TRUE if the flag was set correctly, FALSE if an error occured
+* Returns true if the flag was set correctly, false if an error occured
* (ie, if the parameter was NULL)
*/
bool GSocket::SetReusable()
--
2.47.2