don't attempt to convert 8bit values to Unicode in ANSI build

[wxWidgets.git] / include / wx / dbgrid.h

diff --git a/include/wx/dbgrid.h b/include/wx/dbgrid.h
index e5c9fa6b08a55b6386f33fe2f56fcd473afad94e..b08f2c6bcb4babdbb6d2000bc13d995bc8b68042 100644 (file)
--- a/include/wx/dbgrid.h
+++ b/include/wx/dbgrid.h
@@ -14,12 +14,8 @@
 #ifndef _WX_GENERIC_DBGRID_H_
 #define _WX_GENERIC_DBGRID_H_
 
 #ifndef _WX_GENERIC_DBGRID_H_
 #define _WX_GENERIC_DBGRID_H_
 

-#if defined(__GNUG__) && !defined(__APPLE__)
-    #pragma interface "dbgrid.h"
-#endif
-

 #if wxUSE_ODBC
 #if wxUSE_ODBC

-#if wxUSE_NEW_GRID
+#if wxUSE_GRID

 
 #include "wx/log.h"
 #include "wx/dbtable.h"
 
 #include "wx/log.h"
 #include "wx/dbtable.h"


@@ -29,11 +25,11 @@
 
 #define wxGRID_VALUE_DBAUTO     _T("dbauto")
 
 
 #define wxGRID_VALUE_DBAUTO     _T("dbauto")
 

-WX_DECLARE_EXPORTED_OBJARRAY(GenericKey,keyarray);
+WX_DECLARE_USER_EXPORTED_OBJARRAY(GenericKey,keyarray,WXDLLIMPEXP_DBGRID);

 
 static const int wxUSE_QUERY = -1;
 
 
 static const int wxUSE_QUERY = -1;
 

-class WXDLLEXPORT wxDbGridColInfoBase
+class WXDLLIMPEXP_DBGRID wxDbGridColInfoBase

 {
 public:
     //Default ctor
 {
 public:
     //Default ctor


@@ -60,7 +56,7 @@ public:
 };
 
 
 };
 
 

-class WXDLLEXPORT wxDbGridColInfo
+class WXDLLIMPEXP_DBGRID wxDbGridColInfo

 {
 public:
     wxDbGridColInfo(int colNo,
 {
 public:
     wxDbGridColInfo(int colNo,


@@ -98,7 +94,7 @@ public:
 };
 
 
 };
 
 

-class WXDLLEXPORT wxDbGridCellAttrProvider : public wxGridCellAttrProvider
+class WXDLLIMPEXP_DBGRID wxDbGridCellAttrProvider : public wxGridCellAttrProvider

 {
 public:
     wxDbGridCellAttrProvider();
 {
 public:
     wxDbGridCellAttrProvider();


@@ -114,21 +110,21 @@ private:
 };
 
 
 };
 
 

-class WXDLLEXPORT wxDbGridTableBase : public wxGridTableBase
+class WXDLLIMPEXP_DBGRID wxDbGridTableBase : public wxGridTableBase

 {
 public:
     wxDbGridTableBase(wxDbTable *tab, wxDbGridColInfo *ColInfo,
 {
 public:
     wxDbGridTableBase(wxDbTable *tab, wxDbGridColInfo *ColInfo,

-              int count = wxUSE_QUERY, bool takeOwnership = TRUE);
-    ~wxDbGridTableBase();
+              int count = wxUSE_QUERY, bool takeOwnership = true);
+    virtual ~wxDbGridTableBase();

 
     virtual int GetNumberRows()
     {
 
     virtual int GetNumberRows()
     {

-        wxLogDebug(" GetNumberRows() = %i",m_rowtotal);
+        wxLogDebug(_T(" GetNumberRows() = %i"),m_rowtotal);

         return m_rowtotal;
     }
     virtual int GetNumberCols()
     {
         return m_rowtotal;
     }
     virtual int GetNumberCols()
     {

-        wxLogDebug(" GetNumberCols() = %i",m_nocols);
+        wxLogDebug(_T(" GetNumberCols() = %i"),m_nocols);

         return m_nocols;
     }
     virtual bool     IsEmptyCell(int row, int col) ;
         return m_nocols;
     }
     virtual bool     IsEmptyCell(int row, int col) ;


@@ -150,12 +146,12 @@ public:
 
     virtual wxString GetColLabelValue(int col);
 
 
     virtual wxString GetColLabelValue(int col);
 

-    virtual bool     AssignDbTable(wxDbTable *tab, int count = wxUSE_QUERY, bool takeOwnership=TRUE);
+    virtual bool     AssignDbTable(wxDbTable *tab, int count = wxUSE_QUERY, bool takeOwnership=true);

     virtual void     ValidateRow(int row);
     virtual bool     UpdateRow(int row) const
     {
         if (m_row != row)
     virtual void     ValidateRow(int row);
     virtual bool     UpdateRow(int row) const
     {
         if (m_row != row)

-            return TRUE;
+            return true;

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


@@ -175,7 +171,7 @@ private:
     bool         m_rowmodified;
 };
 
     bool         m_rowmodified;
 };
 

-#endif  // #if wxUSE_NEW_GRID
+#endif  // #if wxUSE_GRID

 #endif  // #if wxUSE_ODBC
 
 #endif  // _WX_GENERIC_DBGRID_H_
 #endif  // #if wxUSE_ODBC
 
 #endif  // _WX_GENERIC_DBGRID_H_