Source cleaning: whitespaces, tabs, -1/wxNOT_FOUND, TRUE/true, FALSE/false.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28931 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/msw/helpbest.h b/include/wx/msw/helpbest.h
index 5c735c65d91dd26fba24b2076a17412d498da6a9..452a074c2c593b459004261727cabb692324a2e7 100644 (file)
--- a/include/wx/msw/helpbest.h
+++ b/include/wx/msw/helpbest.h
@@ -87,7 +87,7 @@ public:
     virtual void SetFrameParameters(const wxString& title,
                                     const wxSize& size,
                                     const wxPoint& pos = wxDefaultPosition,
     virtual void SetFrameParameters(const wxString& title,
                                     const wxSize& size,
                                     const wxPoint& pos = wxDefaultPosition,

-                                    bool newFrameEachTime = FALSE)
+                                    bool newFrameEachTime = false)

     {
         m_helpController->SetFrameParameters( title, size, pos,
                                               newFrameEachTime );
     {
         m_helpController->SetFrameParameters( title, size, pos,
                                               newFrameEachTime );

diff --git a/include/wx/msw/helpchm.h b/include/wx/msw/helpchm.h
index 09c621b5f33e4235cae9a7b66a82d5e31706da47..aa76e84a64a28e3a8141e7de44fb87bf5f7728a6 100644 (file)
--- a/include/wx/msw/helpchm.h
+++ b/include/wx/msw/helpchm.h
@@ -6,7 +6,7 @@
 // Created:     16/04/2000
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     16/04/2000
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_HELPCHM_H_
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_HELPCHM_H_

diff --git a/include/wx/msw/helpwin.h b/include/wx/msw/helpwin.h
index da2c7c2fd4cef3136101319735a615b2e0551de7..3d2e609b7dc2de11d4101496ff2250a7c6f275c7 100644 (file)
--- a/include/wx/msw/helpwin.h
+++ b/include/wx/msw/helpwin.h
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_HELPWIN_H_
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_HELPWIN_H_


@@ -25,7 +25,7 @@
 class WXDLLEXPORT wxWinHelpController: public wxHelpControllerBase
 {
     DECLARE_CLASS(wxWinHelpController)
 class WXDLLEXPORT wxWinHelpController: public wxHelpControllerBase
 {
     DECLARE_CLASS(wxWinHelpController)

-        
+

 public:
     wxWinHelpController() {};
     ~wxWinHelpController() {};
 public:
     wxWinHelpController() {};
     ~wxWinHelpController() {};


@@ -50,7 +50,7 @@ public:
 protected:
     // Append extension if necessary.
     wxString GetValidFilename(const wxString& file) const;
 protected:
     // Append extension if necessary.
     wxString GetValidFilename(const wxString& file) const;

-    
+

 private:
     wxString m_helpFile;
 };
 private:
     wxString m_helpFile;
 };

diff --git a/include/wx/msw/imaglist.h b/include/wx/msw/imaglist.h
index 075127ae197bad68f6a33a7560cd2b8569adaed9..dce0618369ca127e5d458bd63f401d32e033a5ed 100644 (file)
--- a/include/wx/msw/imaglist.h
+++ b/include/wx/msw/imaglist.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_IMAGLIST_H_
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_IMAGLIST_H_


@@ -62,7 +62,7 @@ public:
   // Specify the width and height of the images in the list,
   // whether there are masks associated with them (e.g. if creating images
   // from icons), and the initial size of the list.
   // Specify the width and height of the images in the list,
   // whether there are masks associated with them (e.g. if creating images
   // from icons), and the initial size of the list.

-  wxImageList(int width, int height, bool mask = TRUE, int initialCount = 1)
+  wxImageList(int width, int height, bool mask = true, int initialCount = 1)

   {
     Create(width, height, mask, initialCount);
   }
   {
     Create(width, height, mask, initialCount);
   }


@@ -85,7 +85,7 @@ public:
   // width, height specify the size of the images in the list (all the same).
   // mask specifies whether the images have masks or not.
   // initialNumber is the initial number of images to reserve.
   // width, height specify the size of the images in the list (all the same).
   // mask specifies whether the images have masks or not.
   // initialNumber is the initial number of images to reserve.

-  bool Create(int width, int height, bool mask = TRUE, int initialNumber = 1);
+  bool Create(int width, int height, bool mask = true, int initialNumber = 1);

 
   // Adds a bitmap, and optionally a mask bitmap.
   // Note that wxImageList creates *new* bitmaps, so you may delete
 
   // Adds a bitmap, and optionally a mask bitmap.
   // Note that wxImageList creates *new* bitmaps, so you may delete


@@ -123,12 +123,12 @@ public:
   bool RemoveAll();
 
   // Draws the given image on a dc at the specified position.
   bool RemoveAll();
 
   // Draws the given image on a dc at the specified position.

-  // If 'solidBackground' is TRUE, Draw sets the image list background
+  // If 'solidBackground' is true, Draw sets the image list background

   // colour to the background colour of the wxDC, to speed up
   // drawing by eliminating masked drawing where possible.
   bool Draw(int index, wxDC& dc, int x, int y,
             int flags = wxIMAGELIST_DRAW_NORMAL,
   // colour to the background colour of the wxDC, to speed up
   // drawing by eliminating masked drawing where possible.
   bool Draw(int index, wxDC& dc, int x, int y,
             int flags = wxIMAGELIST_DRAW_NORMAL,

-            bool solidBackground = FALSE);
+            bool solidBackground = false);

 
   // TODO: miscellaneous functionality
 /*
 
   // TODO: miscellaneous functionality
 /*


@@ -191,10 +191,10 @@ public:
 
   1) Starting to drag:
 
 
   1) Starting to drag:
 

-  wxImageList *dragImageList = new wxImageList(16, 16, TRUE);
+  wxImageList *dragImageList = new wxImageList(16, 16, true);

   dragImageList->Add(myDragImage); // Provide an image to combine with the current cursor
   dragImageList->BeginDrag(0, wxPoint(0, 0));
   dragImageList->Add(myDragImage); // Provide an image to combine with the current cursor
   dragImageList->BeginDrag(0, wxPoint(0, 0));

-  wxShowCursor(FALSE);        // wxShowCursor not yet implemented in wxWin
+  wxShowCursor(false);        // wxShowCursor not yet implemented in wxWin

   myWindow->CaptureMouse();
 
   2) Dragging:
   myWindow->CaptureMouse();
 
   2) Dragging:


@@ -210,7 +210,7 @@ public:
 
   dragImageList->EndDrag();
   myWindow->ReleaseMouse();
 
   dragImageList->EndDrag();
   myWindow->ReleaseMouse();

-  wxShowCursor(TRUE);
+  wxShowCursor(true);

 */
 
 #endif
 */
 
 #endif

diff --git a/include/wx/msw/iniconf.h b/include/wx/msw/iniconf.h
index 22e141149e1950e19c107d9c05111cf9fb5bb472..81872a9290591aa4db99b942a5fb52274d41ac47 100644 (file)
--- a/include/wx/msw/iniconf.h
+++ b/include/wx/msw/iniconf.h
@@ -2,7 +2,7 @@
 // Name:        include/wx/msw/iniconf.h
 // Purpose:     INI-file based wxConfigBase implementation
 // Author:      Vadim Zeitlin
 // Name:        include/wx/msw/iniconf.h
 // Purpose:     INI-file based wxConfigBase implementation
 // Author:      Vadim Zeitlin

-// Modified by: 
+// Modified by:

 // Created:     27.07.98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Created:     27.07.98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>


@@ -56,21 +56,21 @@ public:
   virtual bool GetFirstEntry(wxString& str, long& lIndex) const;
   virtual bool GetNextEntry (wxString& str, long& lIndex) const;
 
   virtual bool GetFirstEntry(wxString& str, long& lIndex) const;
   virtual bool GetNextEntry (wxString& str, long& lIndex) const;
 

-  virtual size_t GetNumberOfEntries(bool bRecursive = FALSE) const;
-  virtual size_t GetNumberOfGroups(bool bRecursive = FALSE) const;
+  virtual size_t GetNumberOfEntries(bool bRecursive = false) const;
+  virtual size_t GetNumberOfGroups(bool bRecursive = false) const;

 
   virtual bool HasGroup(const wxString& strName) const;
   virtual bool HasEntry(const wxString& strName) const;
 
 
   virtual bool HasGroup(const wxString& strName) const;
   virtual bool HasEntry(const wxString& strName) const;
 

-  // return TRUE if the current group is empty
+  // return true if the current group is empty

   bool IsEmpty() const;
 
   bool IsEmpty() const;
 

-  virtual bool Flush(bool bCurrentOnly = FALSE);
+  virtual bool Flush(bool bCurrentOnly = false);

 
   virtual bool RenameEntry(const wxString& oldName, const wxString& newName);
   virtual bool RenameGroup(const wxString& oldName, const wxString& newName);
 
 
   virtual bool RenameEntry(const wxString& oldName, const wxString& newName);
   virtual bool RenameGroup(const wxString& oldName, const wxString& newName);
 

-  virtual bool DeleteEntry(const wxString& Key, bool bGroupIfEmptyAlso = TRUE);
+  virtual bool DeleteEntry(const wxString& Key, bool bGroupIfEmptyAlso = true);

   virtual bool DeleteGroup(const wxString& szKey);
   virtual bool DeleteAll();
 
   virtual bool DeleteGroup(const wxString& szKey);
   virtual bool DeleteAll();
 

diff --git a/src/msw/helpbest.cpp b/src/msw/helpbest.cpp
index bb1aad5059984d58826f1bdea7f77140dd5a2c8d..2b7e2cf2b8ab46892bedae68e8f6fcc2d4a32cb5 100644 (file)
--- a/src/msw/helpbest.cpp
+++ b/src/msw/helpbest.cpp
@@ -6,7 +6,7 @@
 // Created:     02/04/2001
 // RCS-ID:      $Id$
 // Copyright:   (c) Mattia Barbon
 // Created:     02/04/2001
 // RCS-ID:      $Id$
 // Copyright:   (c) Mattia Barbon

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)


@@ -48,7 +48,7 @@ bool wxBestHelpController::Initialize( const wxString& filename )
     if( chm->Initialize( GetValidFilename( filename ) ) )
     {
         m_helpController = chm;
     if( chm->Initialize( GetValidFilename( filename ) ) )
     {
         m_helpController = chm;

-        return TRUE;
+        return true;

     }
 
     // failed
     }
 
     // failed


@@ -61,13 +61,13 @@ bool wxBestHelpController::Initialize( const wxString& filename )
     if( html->Initialize( GetValidFilename( filename ) ) )
     {
         m_helpController = html;
     if( html->Initialize( GetValidFilename( filename ) ) )
     {
         m_helpController = html;

-        return TRUE;
+        return true;

     }
 
     // failed
     delete html;
 
     }
 
     // failed
     delete html;
 

-    return FALSE;
+    return false;

 }
 
 wxString wxBestHelpController::GetValidFilename( const wxString& filename ) const
 }
 
 wxString wxBestHelpController::GetValidFilename( const wxString& filename ) const

diff --git a/src/msw/helpchm.cpp b/src/msw/helpchm.cpp
index 7ad636774742bba39206a70e10912ec4e8d11584..9e8c8846fa3349eeb27e24667291e189e028e233 100644 (file)
--- a/src/msw/helpchm.cpp
+++ b/src/msw/helpchm.cpp
@@ -58,7 +58,7 @@ static bool LoadHtmlHelpLibrary()
     if( !lib )
     {
         wxLogError(_("MS HTML Help functions are unavailable because the MS HTML Help library is not installed on this machine. Please install it."));
     if( !lib )
     {
         wxLogError(_("MS HTML Help functions are unavailable because the MS HTML Help library is not installed on this machine. Please install it."));

-        return FALSE;
+        return false;

     }
     else
     {
     }
     else
     {


@@ -69,11 +69,11 @@ static bool LoadHtmlHelpLibrary()
             wxLogError(_("Failed to initialize MS HTML Help."));
 
             lib->UnrefLib();
             wxLogError(_("Failed to initialize MS HTML Help."));
 
             lib->UnrefLib();

-            return FALSE ;
+            return false ;

         }
     }
 
         }
     }
 

-    return TRUE;
+    return true;

 }
 
 static void UnloadHtmlHelpLibrary()
 }
 
 static void UnloadHtmlHelpLibrary()


@@ -99,60 +99,60 @@ bool wxCHMHelpController::Initialize(const wxString& filename)
 {
     // warn on failure
     if( !LoadHtmlHelpLibrary() )
 {
     // warn on failure
     if( !LoadHtmlHelpLibrary() )

-        return FALSE;
+        return false;

 
     m_helpFile = filename;
 
     m_helpFile = filename;

-    return TRUE;
+    return true;

 }
 
 bool wxCHMHelpController::LoadFile(const wxString& file)
 {
     if (!file.IsEmpty())
         m_helpFile = file;
 }
 
 bool wxCHMHelpController::LoadFile(const wxString& file)
 {
     if (!file.IsEmpty())
         m_helpFile = file;

-    return TRUE;
+    return true;

 }
 
 bool wxCHMHelpController::DisplayContents()
 {
 }
 
 bool wxCHMHelpController::DisplayContents()
 {

-    if (m_helpFile.IsEmpty()) return FALSE;
+    if (m_helpFile.IsEmpty()) return false;

 
     wxString str = GetValidFilename(m_helpFile);
 
     gs_htmlHelp(GetSuitableHWND(), (const wxChar*) str, HH_DISPLAY_TOPIC, 0L);
 
     wxString str = GetValidFilename(m_helpFile);
 
     gs_htmlHelp(GetSuitableHWND(), (const wxChar*) str, HH_DISPLAY_TOPIC, 0L);

-    return TRUE;
+    return true;

 }
 
 // Use topic or HTML filename
 bool wxCHMHelpController::DisplaySection(const wxString& section)
 {
 }
 
 // Use topic or HTML filename
 bool wxCHMHelpController::DisplaySection(const wxString& section)
 {

-    if (m_helpFile.IsEmpty()) return FALSE;
+    if (m_helpFile.IsEmpty()) return false;

 
     wxString str = GetValidFilename(m_helpFile);
 
     // Is this an HTML file or a keyword?
 
     wxString str = GetValidFilename(m_helpFile);
 
     // Is this an HTML file or a keyword?

-    bool isFilename = (section.Find(wxT(".htm")) != -1);
+    bool isFilename = (section.Find(wxT(".htm")) != wxNOT_FOUND);

 
     if (isFilename)
         gs_htmlHelp(GetSuitableHWND(), (const wxChar*) str, HH_DISPLAY_TOPIC, (DWORD) (const wxChar*) section);
     else
         KeywordSearch(section);
 
     if (isFilename)
         gs_htmlHelp(GetSuitableHWND(), (const wxChar*) str, HH_DISPLAY_TOPIC, (DWORD) (const wxChar*) section);
     else
         KeywordSearch(section);

-    return TRUE;
+    return true;

 }
 
 // Use context number
 bool wxCHMHelpController::DisplaySection(int section)
 {
 }
 
 // Use context number
 bool wxCHMHelpController::DisplaySection(int section)
 {

-    if (m_helpFile.IsEmpty()) return FALSE;
+    if (m_helpFile.IsEmpty()) return false;

 
     wxString str = GetValidFilename(m_helpFile);
 
     gs_htmlHelp(GetSuitableHWND(), (const wxChar*) str, HH_HELP_CONTEXT, (DWORD)section);
 
     wxString str = GetValidFilename(m_helpFile);
 
     gs_htmlHelp(GetSuitableHWND(), (const wxChar*) str, HH_HELP_CONTEXT, (DWORD)section);

-    return TRUE;
+    return true;

 }
 
 bool wxCHMHelpController::DisplayContextPopup(int contextId)
 {
 }
 
 bool wxCHMHelpController::DisplayContextPopup(int contextId)
 {

-    if (m_helpFile.IsEmpty()) return FALSE;
+    if (m_helpFile.IsEmpty()) return false;

 
     wxString str = GetValidFilename(m_helpFile);
 
 
     wxString str = GetValidFilename(m_helpFile);
 


@@ -172,7 +172,7 @@ bool wxCHMHelpController::DisplayContextPopup(int contextId)
     popup.pszText = NULL;
 
     gs_htmlHelp(GetSuitableHWND(), (const wxChar*) str, HH_DISPLAY_TEXT_POPUP, (DWORD) & popup);
     popup.pszText = NULL;
 
     gs_htmlHelp(GetSuitableHWND(), (const wxChar*) str, HH_DISPLAY_TEXT_POPUP, (DWORD) & popup);

-    return TRUE;
+    return true;

 }
 
 bool wxCHMHelpController::DisplayTextPopup(const wxString& text, const wxPoint& pos)
 }
 
 bool wxCHMHelpController::DisplayTextPopup(const wxString& text, const wxPoint& pos)


@@ -189,7 +189,7 @@ bool wxCHMHelpController::DisplayTextPopup(const wxString& text, const wxPoint&
     popup.pszText = (const wxChar*) text;
 
     gs_htmlHelp(GetSuitableHWND(), NULL, HH_DISPLAY_TEXT_POPUP, (DWORD) & popup);
     popup.pszText = (const wxChar*) text;
 
     gs_htmlHelp(GetSuitableHWND(), NULL, HH_DISPLAY_TEXT_POPUP, (DWORD) & popup);

-    return TRUE;
+    return true;

 }
 
 bool wxCHMHelpController::DisplayBlock(long block)
 }
 
 bool wxCHMHelpController::DisplayBlock(long block)


@@ -200,7 +200,7 @@ bool wxCHMHelpController::DisplayBlock(long block)
 bool wxCHMHelpController::KeywordSearch(const wxString& k,
                                         wxHelpSearchMode WXUNUSED(mode))
 {
 bool wxCHMHelpController::KeywordSearch(const wxString& k,
                                         wxHelpSearchMode WXUNUSED(mode))
 {

-    if (m_helpFile.IsEmpty()) return FALSE;
+    if (m_helpFile.IsEmpty()) return false;

 
     wxString str = GetValidFilename(m_helpFile);
 
 
     wxString str = GetValidFilename(m_helpFile);
 


@@ -215,14 +215,14 @@ bool wxCHMHelpController::KeywordSearch(const wxString& k,
     link.fIndexOnFail = TRUE ;
 
     gs_htmlHelp(GetSuitableHWND(), (const wxChar*) str, HH_KEYWORD_LOOKUP, (DWORD)& link);
     link.fIndexOnFail = TRUE ;
 
     gs_htmlHelp(GetSuitableHWND(), (const wxChar*) str, HH_KEYWORD_LOOKUP, (DWORD)& link);

-    return TRUE;
+    return true;

 }
 
 bool wxCHMHelpController::Quit()
 {
     gs_htmlHelp(GetSuitableHWND(), 0, HH_CLOSE_ALL, 0L);
 
 }
 
 bool wxCHMHelpController::Quit()
 {
     gs_htmlHelp(GetSuitableHWND(), 0, HH_CLOSE_ALL, 0L);
 

-    return TRUE;
+    return true;

 }
 
 // Append extension if necessary.
 }
 
 // Append extension if necessary.

diff --git a/src/msw/helpwin.cpp b/src/msw/helpwin.cpp
index abaa425609b7dbfe36620e2a780214ca006ac20c..464ea1025a502d15319d2f51974dc1c962c37556 100644 (file)
--- a/src/msw/helpwin.cpp
+++ b/src/msw/helpwin.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)


@@ -50,22 +50,22 @@ IMPLEMENT_DYNAMIC_CLASS(wxWinHelpController, wxHelpControllerBase)
 bool wxWinHelpController::Initialize(const wxString& filename)
 {
     m_helpFile = filename;
 bool wxWinHelpController::Initialize(const wxString& filename)
 {
     m_helpFile = filename;

-    return TRUE;
+    return true;

 }
 
 bool wxWinHelpController::LoadFile(const wxString& file)
 {
     if (!file.IsEmpty())
         m_helpFile = file;
 }
 
 bool wxWinHelpController::LoadFile(const wxString& file)
 {
     if (!file.IsEmpty())
         m_helpFile = file;

-    return TRUE;
+    return true;

 }
 
 bool wxWinHelpController::DisplayContents(void)
 {
 }
 
 bool wxWinHelpController::DisplayContents(void)
 {

-    if (m_helpFile.IsEmpty()) return FALSE;
-    
+    if (m_helpFile.IsEmpty()) return false;
+

     wxString str = GetValidFilename(m_helpFile);
     wxString str = GetValidFilename(m_helpFile);

-    
+

 #if defined(__WIN95__)
     return (WinHelp(GetSuitableHWND(), (const wxChar*) str, HELP_FINDER, 0L) != 0);
 #else
 #if defined(__WIN95__)
     return (WinHelp(GetSuitableHWND(), (const wxChar*) str, HELP_FINDER, 0L) != 0);
 #else


@@ -76,8 +76,8 @@ bool wxWinHelpController::DisplayContents(void)
 bool wxWinHelpController::DisplaySection(int section)
 {
     // Use context number
 bool wxWinHelpController::DisplaySection(int section)
 {
     // Use context number

-    if (m_helpFile.IsEmpty()) return FALSE;
-    
+    if (m_helpFile.IsEmpty()) return false;
+

     wxString str = GetValidFilename(m_helpFile);
 
     return (WinHelp((HWND) wxTheApp->GetTopWindow()->GetHWND(), (const wxChar*) str, HELP_CONTEXT, (DWORD)section) != 0);
     wxString str = GetValidFilename(m_helpFile);
 
     return (WinHelp((HWND) wxTheApp->GetTopWindow()->GetHWND(), (const wxChar*) str, HELP_CONTEXT, (DWORD)section) != 0);


@@ -85,8 +85,8 @@ bool wxWinHelpController::DisplaySection(int section)
 
 bool wxWinHelpController::DisplayContextPopup(int contextId)
 {
 
 bool wxWinHelpController::DisplayContextPopup(int contextId)
 {

-    if (m_helpFile.IsEmpty()) return FALSE;
-    
+    if (m_helpFile.IsEmpty()) return false;
+

     wxString str = GetValidFilename(m_helpFile);
 
     return (WinHelp((HWND) wxTheApp->GetTopWindow()->GetHWND(), (const wxChar*) str, HELP_CONTEXTPOPUP, (DWORD) contextId) != 0);
     wxString str = GetValidFilename(m_helpFile);
 
     return (WinHelp((HWND) wxTheApp->GetTopWindow()->GetHWND(), (const wxChar*) str, HELP_CONTEXTPOPUP, (DWORD) contextId) != 0);


@@ -95,16 +95,16 @@ bool wxWinHelpController::DisplayContextPopup(int contextId)
 bool wxWinHelpController::DisplayBlock(long block)
 {
     DisplaySection(block);
 bool wxWinHelpController::DisplayBlock(long block)
 {
     DisplaySection(block);

-    return TRUE;
+    return true;

 }
 
 bool wxWinHelpController::KeywordSearch(const wxString& k,
                                         wxHelpSearchMode WXUNUSED(mode))
 {
 }
 
 bool wxWinHelpController::KeywordSearch(const wxString& k,
                                         wxHelpSearchMode WXUNUSED(mode))
 {

-    if (m_helpFile.IsEmpty()) return FALSE;
-    
+    if (m_helpFile.IsEmpty()) return false;
+

     wxString str = GetValidFilename(m_helpFile);
     wxString str = GetValidFilename(m_helpFile);

-    
+

     return (WinHelp(GetSuitableHWND(), (const wxChar*) str, HELP_PARTIALKEY, (DWORD)(const wxChar*) k) != 0);
 }
 
     return (WinHelp(GetSuitableHWND(), (const wxChar*) str, HELP_PARTIALKEY, (DWORD)(const wxChar*) k) != 0);
 }
 

diff --git a/src/msw/icon.cpp b/src/msw/icon.cpp
index 9064101a533de02749fcbe0c99db24f9b51630f9..658c537e8867091d394176c2f622f7ed5fc62980 100644 (file)
--- a/src/msw/icon.cpp
+++ b/src/msw/icon.cpp
@@ -135,7 +135,7 @@ bool wxIcon::LoadFile(const wxString& filename,
     if ( !handler )
     {
         // say something?
     if ( !handler )
     {
         // say something?

-        return FALSE;
+        return false;

     }
 
     return handler->Load(this, filename, type, desiredWidth, desiredHeight);
     }
 
     return handler->Load(this, filename, type, desiredWidth, desiredHeight);

diff --git a/src/msw/imaglist.cpp b/src/msw/imaglist.cpp
index af74e0328f5f17e981d5f731e5b138f39f047284..ca1952008269fdf309aded771c08b0e5a9afbd3f 100644 (file)
--- a/src/msw/imaglist.cpp
+++ b/src/msw/imaglist.cpp
@@ -90,11 +90,11 @@ bool wxImageList::Create(int width, int height, bool mask, int initial)
 #else
     int dd = wxDisplayDepth();
 
 #else
     int dd = wxDisplayDepth();
 

-    if (dd <= 4)       flags |= ILC_COLOR;     // 16 color
-    else if (dd <= 8)  flags |= ILC_COLOR8;    // 256 color
-    else if (dd <= 16) flags |= ILC_COLOR16;   // 64k hi-color
-    else if (dd <= 24) flags |= ILC_COLOR24;   // 16m truecolor
-    else if (dd <= 32) flags |= ILC_COLOR32;   // 16m truecolor
+    if (dd <= 4)       flags |= ILC_COLOR;   // 16 color
+    else if (dd <= 8)  flags |= ILC_COLOR8;  // 256 color
+    else if (dd <= 16) flags |= ILC_COLOR16; // 64k hi-color
+    else if (dd <= 24) flags |= ILC_COLOR24; // 16m truecolor
+    else if (dd <= 32) flags |= ILC_COLOR32; // 16m truecolor

 #endif
 
     if ( mask )
 #endif
 
     if ( mask )


@@ -246,11 +246,11 @@ bool wxImageList::RemoveAll()
         (void)Remove(0);
     }
 
         (void)Remove(0);
     }
 

-    return TRUE;
+    return true;

 }
 
 // Draws the given image on a dc at the specified position.
 }
 
 // Draws the given image on a dc at the specified position.

-// If 'solidBackground' is TRUE, Draw sets the image list background
+// If 'solidBackground' is true, Draw sets the image list background

 // colour to the background colour of the wxDC, to speed up
 // drawing by eliminating masked drawing where possible.
 bool wxImageList::Draw(int index,
 // colour to the background colour of the wxDC, to speed up
 // drawing by eliminating masked drawing where possible.
 bool wxImageList::Draw(int index,


@@ -260,7 +260,7 @@ bool wxImageList::Draw(int index,
                        bool solidBackground)
 {
     HDC hDC = GetHdcOf(dc);
                        bool solidBackground)
 {
     HDC hDC = GetHdcOf(dc);

-    wxCHECK_MSG( hDC, FALSE, _T("invalid wxDC in wxImageList::Draw") );
+    wxCHECK_MSG( hDC, false, _T("invalid wxDC in wxImageList::Draw") );

 
     COLORREF clr = CLR_NONE;    // transparent by default
     if ( solidBackground )
 
     COLORREF clr = CLR_NONE;    // transparent by default
     if ( solidBackground )


@@ -301,7 +301,7 @@ static HBITMAP GetMaskForImage(const wxBitmap& bitmap, const wxBitmap& mask)
 {
     HBITMAP hbmpMask;
     wxMask *pMask;
 {
     HBITMAP hbmpMask;
     wxMask *pMask;

-    bool deleteMask = FALSE;
+    bool deleteMask = false;

 
     if ( mask.Ok() )
     {
 
     if ( mask.Ok() )
     {


@@ -322,7 +322,7 @@ static HBITMAP GetMaskForImage(const wxBitmap& bitmap, const wxBitmap& mask)
 
             pMask = new wxMask(bitmap, col);
 
 
             pMask = new wxMask(bitmap, col);
 

-            deleteMask = TRUE;
+            deleteMask = true;

         }
 
         hbmpMask = (HBITMAP)pMask->GetMaskBitmap();
         }
 
         hbmpMask = (HBITMAP)pMask->GetMaskBitmap();

diff --git a/src/msw/iniconf.cpp b/src/msw/iniconf.cpp
index 0184d5ab1f835dfb925985d8903c2bfc1fa4b0c7..c072f913048dee7fa96463f0b6d8a3371fd4f68d 100644 (file)
--- a/src/msw/iniconf.cpp
+++ b/src/msw/iniconf.cpp
@@ -205,28 +205,28 @@ bool wxIniConfig::GetFirstGroup(wxString& WXUNUSED(str), long& WXUNUSED(lIndex))
 {
   wxFAIL_MSG("not implemented");
 
 {
   wxFAIL_MSG("not implemented");
 

-  return FALSE;
+  return false;

 }
 
 bool wxIniConfig::GetNextGroup (wxString& WXUNUSED(str), long& WXUNUSED(lIndex)) const
 {
   wxFAIL_MSG("not implemented");
 
 }
 
 bool wxIniConfig::GetNextGroup (wxString& WXUNUSED(str), long& WXUNUSED(lIndex)) const
 {
   wxFAIL_MSG("not implemented");
 

-  return FALSE;
+  return false;

 }
 
 bool wxIniConfig::GetFirstEntry(wxString& WXUNUSED(str), long& WXUNUSED(lIndex)) const
 {
   wxFAIL_MSG("not implemented");
 
 }
 
 bool wxIniConfig::GetFirstEntry(wxString& WXUNUSED(str), long& WXUNUSED(lIndex)) const
 {
   wxFAIL_MSG("not implemented");
 

-  return FALSE;
+  return false;

 }
 
 bool wxIniConfig::GetNextEntry (wxString& WXUNUSED(str), long& WXUNUSED(lIndex)) const
 {
   wxFAIL_MSG("not implemented");
 
 }
 
 bool wxIniConfig::GetNextEntry (wxString& WXUNUSED(str), long& WXUNUSED(lIndex)) const
 {
   wxFAIL_MSG("not implemented");
 

-  return FALSE;
+  return false;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -252,14 +252,14 @@ bool wxIniConfig::HasGroup(const wxString& WXUNUSED(strName)) const
 {
   wxFAIL_MSG("not implemented");
 
 {
   wxFAIL_MSG("not implemented");
 

-  return FALSE;
+  return false;

 }
 
 bool wxIniConfig::HasEntry(const wxString& WXUNUSED(strName)) const
 {
   wxFAIL_MSG("not implemented");
 
 }
 
 bool wxIniConfig::HasEntry(const wxString& WXUNUSED(strName)) const
 {
   wxFAIL_MSG("not implemented");
 

-  return FALSE;
+  return false;

 }
 
 // is current group empty?
 }
 
 // is current group empty?


@@ -270,13 +270,13 @@ bool wxIniConfig::IsEmpty() const
   GetPrivateProfileString(m_strGroup, NULL, "",
                           szBuf, WXSIZEOF(szBuf), m_strLocalFilename);
   if ( !::IsEmpty(szBuf) )
   GetPrivateProfileString(m_strGroup, NULL, "",
                           szBuf, WXSIZEOF(szBuf), m_strLocalFilename);
   if ( !::IsEmpty(szBuf) )

-    return FALSE;
+    return false;

 
   GetProfileString(m_strGroup, NULL, "", szBuf, WXSIZEOF(szBuf));
   if ( !::IsEmpty(szBuf) )
 
   GetProfileString(m_strGroup, NULL, "", szBuf, WXSIZEOF(szBuf));
   if ( !::IsEmpty(szBuf) )

-    return FALSE;
+    return false;

 
 

-  return TRUE;
+  return true;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -302,10 +302,10 @@ bool wxIniConfig::DoReadString(const wxString& szKey, wxString *pstr) const
   }
 
   if ( ::IsEmpty(szBuf) )
   }
 
   if ( ::IsEmpty(szBuf) )

-    return FALSE;
+    return false;

 
   *pstr = szBuf;
 
   *pstr = szBuf;

-  return TRUE;
+  return true;

 }
 
 bool wxIniConfig::DoReadLong(const wxString& szKey, long *pl) const
 }
 
 bool wxIniConfig::DoReadLong(const wxString& szKey, long *pl) const


@@ -322,7 +322,7 @@ bool wxIniConfig::DoReadLong(const wxString& szKey, long *pl) const
   if ( lVal != nMagic ) {
     // the value was read from the file
     *pl = lVal;
   if ( lVal != nMagic ) {
     // the value was read from the file
     *pl = lVal;

-    return TRUE;
+    return true;

   }
 
   // is it really nMagic?
   }
 
   // is it really nMagic?


@@ -330,7 +330,7 @@ bool wxIniConfig::DoReadLong(const wxString& szKey, long *pl) const
   if ( lVal != nMagic2 ) {
     // the nMagic it returned was indeed read from the file
     *pl = lVal;
   if ( lVal != nMagic2 ) {
     // the nMagic it returned was indeed read from the file
     *pl = lVal;

-    return TRUE;
+    return true;

   }
 
   // CS : I have no idea why they should look up in win.ini
   }
 
   // CS : I have no idea why they should look up in win.ini


@@ -340,9 +340,9 @@ bool wxIniConfig::DoReadLong(const wxString& szKey, long *pl) const
   // no, it was just returning the default value, so now look in win.ini
  *pl = GetProfileInt(GetVendorName(), GetKeyName(szKey), *pl);
 
   // no, it was just returning the default value, so now look in win.ini
  *pl = GetProfileInt(GetVendorName(), GetKeyName(szKey), *pl);
 

-  return TRUE;
+  return true;

 #endif
 #endif

-  return FALSE ;
+  return false ;

 }
 
 bool wxIniConfig::DoWriteString(const wxString& szKey, const wxString& szValue)
 }
 
 bool wxIniConfig::DoWriteString(const wxString& szKey, const wxString& szValue)


@@ -386,10 +386,10 @@ bool wxIniConfig::DeleteEntry(const wxString& szKey, bool bGroupIfEmptyAlso)
 
   if (WritePrivateProfileString(m_strGroup, strKey,
                                          (const char*) NULL, m_strLocalFilename) == 0)
 
   if (WritePrivateProfileString(m_strGroup, strKey,
                                          (const char*) NULL, m_strLocalFilename) == 0)

-    return FALSE;
+    return false;

 
   if ( !bGroupIfEmptyAlso || !IsEmpty() )
 
   if ( !bGroupIfEmptyAlso || !IsEmpty() )

-    return TRUE;
+    return true;

 
   // delete the current group too
   bool bOk = WritePrivateProfileString(m_strGroup, NULL,
 
   // delete the current group too
   bool bOk = WritePrivateProfileString(m_strGroup, NULL,


@@ -442,24 +442,24 @@ bool wxIniConfig::DeleteAll()
 
   if ( wxFile::Exists(strFile) && !wxRemoveFile(strFile) ) {
     wxLogSysError(_("Can't delete the INI file '%s'"), strFile.c_str());
 
   if ( wxFile::Exists(strFile) && !wxRemoveFile(strFile) ) {
     wxLogSysError(_("Can't delete the INI file '%s'"), strFile.c_str());

-    return FALSE;
+    return false;

   }
 
   }
 

-  return TRUE;
+  return true;

 }
 
 bool wxIniConfig::RenameEntry(const wxString& WXUNUSED(oldName),
                               const wxString& WXUNUSED(newName))
 {
     // Not implemented
 }
 
 bool wxIniConfig::RenameEntry(const wxString& WXUNUSED(oldName),
                               const wxString& WXUNUSED(newName))
 {
     // Not implemented

-    return FALSE;
+    return false;

 }
 
 bool wxIniConfig::RenameGroup(const wxString& WXUNUSED(oldName),
                               const wxString& WXUNUSED(newName))
 {
     // Not implemented
 }
 
 bool wxIniConfig::RenameGroup(const wxString& WXUNUSED(oldName),
                               const wxString& WXUNUSED(newName))
 {
     // Not implemented

-    return FALSE;
+    return false;

 }
 
 #endif
 }
 
 #endif