diff --git a/include/wx/db.h b/include/wx/db.h
index cfccb02d19..ad1b1ce5c9 100644
--- a/include/wx/db.h
+++ b/include/wx/db.h
@@ -53,7 +53,7 @@
 
 #if wxMAJOR_VERSION == 2
     #ifdef __GNUG__
-    #pragma interface "db.h"
+        #pragma interface "db.h"
     #endif
 #endif
 
@@ -305,6 +305,7 @@ public:
     int          FkCol;       // Foreign key column       0=No; 1= First Key, 2 = Second Key etc.
     char         FkTableName[DB_MAX_TABLE_NAME_LEN+1]; // Foreign key table name
     wxDbColFor  *pColFor;                              // How should this columns be formatted
+
     wxDbColInf();
     ~wxDbColInf();
 };
@@ -332,6 +333,7 @@ public:
     char          schema[128+1];
     int           numTables;           // How many tables does this database have
     wxDbTableInf *pTableInf;           // pTableInf = new wxDbTableInf[numTables];
+
     wxDbInf();
     ~wxDbInf();
 };
@@ -401,7 +403,7 @@ private:
     unsigned int nTables;
 
     // Information about logical data types VARCHAR, INTEGER, FLOAT and DATE.
-	 //
+     //
     // This information is obtained from the ODBC driver by use of the
     // SQLGetTypeInfo() function.  The key piece of information is the
     // type name the data source uses for each logical data type.
@@ -475,7 +477,7 @@ public:
 
 #if wxODBC_BACKWARD_COMPATABILITY
     // Information about logical data types VARCHAR, INTEGER, FLOAT and DATE.
-	 //
+     //
     // This information is obtained from the ODBC driver by use of the
     // SQLGetTypeInfo() function.  The key piece of information is the
     // type name the data source uses for each logical data type.
diff --git a/include/wx/dbtable.h b/include/wx/dbtable.h
index 15869b2b22..203f453ad4 100644
--- a/include/wx/dbtable.h
+++ b/include/wx/dbtable.h
@@ -35,7 +35,7 @@
 
 #if wxMAJOR_VERSION == 2
     #ifdef __GNUG__
-    #pragma interface "dbtable.h"
+        #pragma interface "dbtable.h"
     #endif
 #endif
 
@@ -96,20 +96,20 @@ public:
 class WXDLLEXPORT wxDbTable
 {
 private:
-    ULONG    tableID;  // Used for debugging.  This can help to match up mismatched constructors/destructors
+    ULONG       tableID;  // Used for debugging.  This can help to match up mismatched constructors/destructors
 
     // Private member variables
-    UDWORD cursorType;
-    bool   insertable;
+    UDWORD      cursorType;
+    bool        insertable;
 
     // Private member functions
-    bool bindInsertParams(void);
-    bool bindUpdateParams(void);
-    bool bindCols(HSTMT cursor);
-    bool getRec(UWORD fetchType);
-    bool execDelete(const char *pSqlStmt);
-    bool execUpdate(const char *pSqlStmt);
-    bool query(int queryType, bool forUpdate, bool distinct, const char *pSqlStmt = 0);
+    bool        bindInsertParams(void);
+    bool        bindUpdateParams(void);
+    bool        bindCols(HSTMT cursor);
+    bool        getRec(UWORD fetchType);
+    bool        execDelete(const char *pSqlStmt);
+    bool        execUpdate(const char *pSqlStmt);
+    bool        query(int queryType, bool forUpdate, bool distinct, const char *pSqlStmt = 0);
 
 #if !wxODBC_BACKWARD_COMPATABILITY
 // these were public
@@ -190,32 +190,32 @@ public:
     bool            CreateIndex(const char * idxName, bool unique, int noIdxCols, wxDbIdxDef *pIdxDefs, bool attemptDrop=TRUE);
     bool            DropIndex(const char * idxName);
 
-// Accessors
+    // Accessors
 
     // The member variables returned by these accessors are all
     // set when the wxDbTable instance is createand cannot be 
     // changed, hence there is no corresponding SetXxxx function
-	 wxDb           *GetDb()              { return pDb; }
-	 const char     *GetTableName()       { return tableName; }
-	 const char     *GetQueryTableName()  { return queryTableName; }
-	 const char     *GetTablePath()       { return tablePath; }
+    wxDb           *GetDb()              { return pDb; }
+    const char     *GetTableName()       { return tableName; }
+    const char     *GetQueryTableName()  { return queryTableName; }
+    const char     *GetTablePath()       { return tablePath; }
 
-         int GetNumberOfColumns() { return noCols; }  // number of "defined" columns for this wxDbTable instance
+    int             GetNumberOfColumns() { return noCols; }  // number of "defined" columns for this wxDbTable instance
        
 
-	 const char     *GetFromClause()      { return from; }
-	 const char     *GetOrderByClause()   { return orderBy; }
-	 const char     *GetWhereClause()     { return where; }
+    const char     *GetFromClause()      { return from; }
+    const char     *GetOrderByClause()   { return orderBy; }
+    const char     *GetWhereClause()     { return where; }
 
-	 bool            IsQueryOnly()        { return queryOnly; }
+    bool            IsQueryOnly()        { return queryOnly; }
 #if wxODBC_BACKWARD_COMPATABILITY
     void            SetFromClause(const char *From) { from = (char *)From; }
-	 void            SetOrderByClause(const char *OrderBy) { orderBy = (char *)OrderBy; }
-	 void            SetWhereClause(const char *Where) { where = (char *)Where; }
+    void            SetOrderByClause(const char *OrderBy) { orderBy = (char *)OrderBy; }
+    void            SetWhereClause(const char *Where) { where = (char *)Where; }
 #else
-	 void            SetFromClause(const wxString& From) { from = From; }
-	 void            SetOrderByClause(const wxString& OrderBy) { orderBy = OrderBy; }
-	 void            SetWhereClause(const wxString& Where) { where = Where; }
+    void            SetFromClause(const wxString& From) { from = From; }
+    void            SetOrderByClause(const wxString& OrderBy) { orderBy = OrderBy; }
+    void            SetWhereClause(const wxString& Where) { where = Where; }
 #endif
     int             Insert(void);
     bool            Update(void);