projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
allow overriding automatic alpha detection during icon->bitmap conversions (slightly...
[wxWidgets.git]
/
include
/
wx
/
dbgrid.h
diff --git
a/include/wx/dbgrid.h
b/include/wx/dbgrid.h
index 954655b1c9e37e100b7a6088bb906f4c3749ee43..b08f2c6bcb4babdbb6d2000bc13d995bc8b68042 100644
(file)
--- a/
include/wx/dbgrid.h
+++ b/
include/wx/dbgrid.h
@@
-14,10
+14,6
@@
#ifndef _WX_GENERIC_DBGRID_H_
#define _WX_GENERIC_DBGRID_H_
#ifndef _WX_GENERIC_DBGRID_H_
#define _WX_GENERIC_DBGRID_H_
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
- #pragma interface "dbgrid.h"
-#endif
-
#if wxUSE_ODBC
#if wxUSE_GRID
#if wxUSE_ODBC
#if wxUSE_GRID
@@
-29,7
+25,7
@@
#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;
@@
-118,8
+114,8
@@
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()
{
@@
-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();
}