Update configuration for OpenVMS

[wxWidgets.git] / include / wx / generic / grid.h

diff --git a/include/wx/generic/grid.h b/include/wx/generic/grid.h
index 546bf7ea26b2603cce1883ff69854f1f86634a13..075bd336fdde1edf88f750e809ae06351664616b 100644 (file)
--- a/include/wx/generic/grid.h
+++ b/include/wx/generic/grid.h
@@ -22,7 +22,7 @@
 // constants
 // ----------------------------------------------------------------------------
 
 // constants
 // ----------------------------------------------------------------------------
 

-extern WXDLLIMPEXP_DATA_ADV(const wxChar) wxGridNameStr[];
+extern WXDLLIMPEXP_DATA_ADV(const char) wxGridNameStr[];

 
 // Default parameters for wxGrid
 //
 
 // Default parameters for wxGrid
 //


@@ -913,9 +913,9 @@ public:
     // would break the existing code overriding them, so instead we provide
     // these const synonyms which can be used from const-correct code
     int GetRowsCount() const
     // would break the existing code overriding them, so instead we provide
     // these const synonyms which can be used from const-correct code
     int GetRowsCount() const

-        { return wx_const_cast(wxGridTableBase *, this)->GetNumberRows(); }
+        { return const_cast<wxGridTableBase *>(this)->GetNumberRows(); }

     int GetColsCount() const
     int GetColsCount() const

-        { return wx_const_cast(wxGridTableBase *, this)->GetNumberCols(); }
+        { return const_cast<wxGridTableBase *>(this)->GetNumberCols(); }

 
 
     virtual bool IsEmptyCell( int row, int col ) = 0;
 
 
     virtual bool IsEmptyCell( int row, int col ) = 0;


@@ -2326,7 +2326,9 @@ public:
         SetEventObject(obj);
     }
 
         SetEventObject(obj);
     }
 

-    wxDEPRECATED(
+    // explicitly specifying inline allows gcc < 3.4 to
+    // handle the deprecation attribute even in the constructor.
+    wxDEPRECATED( inline

     wxGridEvent(int id,
                 wxEventType type,
                 wxObject* obj,
     wxGridEvent(int id,
                 wxEventType type,
                 wxObject* obj,


@@ -2387,7 +2389,7 @@ public:
         SetEventObject(obj);
     }
 
         SetEventObject(obj);
     }
 

-    wxDEPRECATED(
+    wxDEPRECATED( inline

     wxGridSizeEvent(int id,
                     wxEventType type,
                     wxObject* obj,
     wxGridSizeEvent(int id,
                     wxEventType type,
                     wxObject* obj,


@@ -2445,7 +2447,7 @@ public:
         SetEventObject(obj);
     }
 
         SetEventObject(obj);
     }
 

-    wxDEPRECATED(
+    wxDEPRECATED( inline

     wxGridRangeSelectEvent(int id,
                            wxEventType type,
                            wxObject* obj,
     wxGridRangeSelectEvent(int id,
                            wxEventType type,
                            wxObject* obj,