Implement left indentation and tab stops support in wxTextCtrl, patch #1518114 -...

[wxWidgets.git] / src / common / dbgrid.cpp

diff --git a/src/common/dbgrid.cpp b/src/common/dbgrid.cpp
index 127a31ba24f737f1b7b8f9c1973ee5cae07c8cfd..418d445b16005590ac8477e544f75e4c75493114 100644 (file)
--- a/src/common/dbgrid.cpp
+++ b/src/common/dbgrid.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        dbgrid.cpp
+// Name:        src/common/dbgrid.cpp

 // 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:


@@ -17,20 +17,18 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-
-#if wxUSE_ODBC
-#if wxUSE_GRID
+#if wxUSE_ODBC && wxUSE_GRID

 
 #ifndef WX_PRECOMP
     #include "wx/textctrl.h"
     #include "wx/dc.h"
 
 #ifndef WX_PRECOMP
     #include "wx/textctrl.h"
     #include "wx/dc.h"

+    #include "wx/app.h"

 #endif // WX_PRECOMP
 
 #include "wx/generic/gridctrl.h"
 #include "wx/dbgrid.h"
 
 // DLL options compatibility check:
 #endif // WX_PRECOMP
 
 #include "wx/generic/gridctrl.h"
 #include "wx/dbgrid.h"
 
 // DLL options compatibility check:

-#include "wx/app.h"

 WX_CHECK_BUILD_OPTIONS("wxDbGrid")
 
 
 WX_CHECK_BUILD_OPTIONS("wxDbGrid")
 
 


@@ -274,7 +272,7 @@ wxString wxDbGridTableBase::GetTypeName(int WXUNUSED(row), int col)
                 case SQL_C_CHAR:
 #ifdef SQL_C_WCHAR
                 case SQL_C_WCHAR:
                 case SQL_C_CHAR:
 #ifdef SQL_C_WCHAR
                 case SQL_C_WCHAR:

-#endif                 
+#endif

                     return wxGRID_VALUE_STRING;
                 case SQL_C_SHORT:
                 case SQL_C_SSHORT:
                     return wxGRID_VALUE_STRING;
                 case SQL_C_SHORT:
                 case SQL_C_SSHORT:


@@ -723,8 +721,6 @@ bool wxDbGridTableBase::Writeback() const
 
 #include "wx/arrimpl.cpp"
 
 
 #include "wx/arrimpl.cpp"
 

-WX_DEFINE_EXPORTED_OBJARRAY(keyarray);
-
-#endif  // #if wxUSE_GRID
-#endif  // #if wxUSE_ODBC
+WX_DEFINE_EXPORTED_OBJARRAY(keyarray)

 
 

+#endif  // wxUSE_GRID && wxUSE_ODBC