Needed a comment after last #endif and defined true TRUE and false FALSE for Visual...

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

diff --git a/include/wx/dbgrid.h b/include/wx/dbgrid.h
index 60f9ca0816710dc7abb3352c555c85f4d215ff8a..8b6bf5d49aca18f654728fbf7e0793098725600a 100644 (file)
--- a/include/wx/dbgrid.h
+++ b/include/wx/dbgrid.h
@@ -3,7 +3,7 @@
 // Purpose:     Displays a wxDbTable in a wxGrid.
 // Author:      Roger Gammans, Paul Gammans
 // Modified by:
 // Purpose:     Displays a wxDbTable in a wxGrid.
 // Author:      Roger Gammans, Paul Gammans
 // Modified by:

-// Created:     
+// Created:

 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 The Computer Surgery (roger@computer-surgery.co.uk)
 // Licence:     wxWindows licence
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 The Computer Surgery (roger@computer-surgery.co.uk)
 // Licence:     wxWindows licence


@@ -49,11 +49,11 @@ public:
     {
         DbCol       = ref.DbCol;
         wxtypename  = ref.wxtypename;
     {
         DbCol       = ref.DbCol;
         wxtypename  = ref.wxtypename;

-        Title       = ref.Title;    
+        Title       = ref.Title;

     }
     //Empty destructor for member obj's
     ~wxDbGridColInfoBase() {}
     }
     //Empty destructor for member obj's
     ~wxDbGridColInfoBase() {}

-    
+

     int        DbCol;
     wxString   wxtypename;
     wxString   Title;
     int        DbCol;
     wxString   wxtypename;
     wxString   Title;


@@ -112,12 +112,12 @@ public:
     virtual int GetNumberRows()
     {
         wxLogDebug(" GetNumberRows() = %i",m_rowtotal);
     virtual int GetNumberRows()
     {
         wxLogDebug(" GetNumberRows() = %i",m_rowtotal);

-        return m_rowtotal; 
+        return m_rowtotal;

     }
     virtual int GetNumberCols()
     }
     virtual int GetNumberCols()

-    { 
+    {

         wxLogDebug(" GetNumberCols() = %i",m_nocols);
         wxLogDebug(" GetNumberCols() = %i",m_nocols);

-        return m_nocols; 
+        return m_nocols;

     }
     virtual bool     IsEmptyCell(int row, int col) ;
     virtual wxString GetValue(int row, int col) ;
     }
     virtual bool     IsEmptyCell(int row, int col) ;
     virtual wxString GetValue(int row, int col) ;


@@ -144,10 +144,10 @@ public:
     {
         if (m_row != row)
             return true;
     {
         if (m_row != row)
             return true;

-        else 
+        else

             return Writeback();
     }
             return Writeback();
     }

-    
+

 private:
     //Operates on the current row
     bool Writeback() const;
 private:
     //Operates on the current row
     bool Writeback() const;


@@ -166,4 +166,4 @@ private:
 #endif  // #if wxUSE_NEW_GRID
 #endif  // #if wxUSE_ODBC
 
 #endif  // #if wxUSE_NEW_GRID
 #endif  // #if wxUSE_ODBC
 

-#endif _WX_GENERIC_DBGRID_H_
+#endif  // _WX_GENERIC_DBGRID_H_

diff --git a/include/wx/defs.h b/include/wx/defs.h
index aaa969318831103b908d0e62d65577e7ddc51fed..cf965721b380619db2fc1ac2e31228c77e42d340 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -315,6 +315,11 @@
     #define FALSE 0
 #endif
 
     #define FALSE 0
 #endif
 

+#ifdef __VISAGECPP__
+    #define true TRUE
+    #define false FALSE
+#endif
+

 // Add more tests here for Windows compilers that already define bool
 // (under Unix, configure tests for this)
 #ifndef HAVE_BOOL
 // Add more tests here for Windows compilers that already define bool
 // (under Unix, configure tests for this)
 #ifndef HAVE_BOOL