list also wxSystemOptions next to wxSystemSettings

[wxWidgets.git] / interface / wx / grid.h

diff --git a/interface/wx/grid.h b/interface/wx/grid.h
index 83aa1b25a1c7401ee16abd7aa8ec33238f92c50b..763c62ecde01610a3c382553277b41a97a5629cd 100644 (file)
--- a/interface/wx/grid.h
+++ b/interface/wx/grid.h
@@ -1068,7 +1068,7 @@ public:
     - wxGridCellFloatEditor
     - wxGridCellNumberEditor
     - wxGridCellTextEditor
     - wxGridCellFloatEditor
     - wxGridCellNumberEditor
     - wxGridCellTextEditor

-    
+

     Please see wxGridEvent, wxGridSizeEvent, wxGridRangeSelectEvent, and
     wxGridEditorCreatedEvent for the documentation of all event types you can
     use with wxGrid.
     Please see wxGridEvent, wxGridSizeEvent, wxGridRangeSelectEvent, and
     wxGridEditorCreatedEvent for the documentation of all event types you can
     use with wxGrid.


@@ -1665,7 +1665,7 @@ public:
         See wxGridTableBase::CanGetValueAs() and the @ref overview_grid for
         more information.
     */
         See wxGridTableBase::CanGetValueAs() and the @ref overview_grid for
         more information.
     */

-    const wxString GetCellValue(const wxGridCellCoords& coords) const;
+    const wxString& GetCellValue(const wxGridCellCoords& coords) const;

 
     /**
         Returns a pointer to the current default grid cell editor.
 
     /**
         Returns a pointer to the current default grid cell editor.


@@ -2332,12 +2332,12 @@ public:
         This method takes an array containing the indices of the columns in
         their display order, i.e. uses the same convention as
         wxHeaderCtrl::SetColumnsOrder().
         This method takes an array containing the indices of the columns in
         their display order, i.e. uses the same convention as
         wxHeaderCtrl::SetColumnsOrder().

-     */
+    */

     void SetColumnsOrder(const wxArrayInt& order);
 
     /**
         Resets the position of the columns to the default.
     void SetColumnsOrder(const wxArrayInt& order);
 
     /**
         Resets the position of the columns to the default.

-     */
+    */

     void ResetColPos();
 
     //@}
     void ResetColPos();
 
     //@}


@@ -2345,7 +2345,7 @@ public:
 
     /**
         @name Cursor Movement
 
     /**
         @name Cursor Movement

-     */
+    */

     //@{
 
     /**
     //@{
 
     /**


@@ -3354,8 +3354,8 @@ public:
     @event{EVT_GRID_CELL_CHANGING(func)}
         The user is about to change the data in a cell. The new cell value as
         string is available from GetString() event object method. This event
     @event{EVT_GRID_CELL_CHANGING(func)}
         The user is about to change the data in a cell. The new cell value as
         string is available from GetString() event object method. This event

-        can be vetoed if the change is not allowed. Processes a @c
-        wxEVT_GRID_CELL_CHANGING event type.
+        can be vetoed if the change is not allowed.
+        Processes a @c wxEVT_GRID_CELL_CHANGING event type.

     @event{EVT_GRID_CELL_CHANGED(func)}
         The user changed the data in a cell. The old cell value as string is
         available from GetString() event object method. Notice that vetoing
     @event{EVT_GRID_CELL_CHANGED(func)}
         The user changed the data in a cell. The old cell value as string is
         available from GetString() event object method. Notice that vetoing


@@ -3406,7 +3406,6 @@ public:
         proceed in which case wxGrid::SetColPos() is used to reorder the
         columns display order without affecting the use of the column indices
         otherwise.
         proceed in which case wxGrid::SetColPos() is used to reorder the
         columns display order without affecting the use of the column indices
         otherwise.

-

         This event macro corresponds to @c wxEVT_GRID_COL_MOVE event type.
     @event{EVT_GRID_COL_SORT(func)}
         This event is generated when a column is clicked by the user and its
         This event macro corresponds to @c wxEVT_GRID_COL_MOVE event type.
     @event{EVT_GRID_COL_SORT(func)}
         This event is generated when a column is clicked by the user and its


@@ -3417,12 +3416,11 @@ public:
         (and not vetoed) the grid supposes that the table was indeed resorted
         and updates the column to indicate the new sort order and refreshes
         itself.
         (and not vetoed) the grid supposes that the table was indeed resorted
         and updates the column to indicate the new sort order and refreshes
         itself.

-

         This event macro corresponds to @c wxEVT_GRID_COL_SORT event type.
     @endEventTable
 
     @library{wxadv}
         This event macro corresponds to @c wxEVT_GRID_COL_SORT event type.
     @endEventTable
 
     @library{wxadv}

-    @category{grid}
+    @category{grid,events}

 */
 class wxGridEvent : public wxNotifyEvent
 {
 */
 class wxGridEvent : public wxNotifyEvent
 {


@@ -3504,7 +3502,7 @@ public:
     @endEventTable
 
     @library{wxadv}
     @endEventTable
 
     @library{wxadv}

-    @category{grid}
+    @category{grid,events}

 */
 class wxGridSizeEvent : public wxNotifyEvent
 {
 */
 class wxGridSizeEvent : public wxNotifyEvent
 {


@@ -3567,7 +3565,7 @@ public:
     @endEventTable
 
     @library{wxadv}
     @endEventTable
 
     @library{wxadv}

-    @category{grid}
+    @category{grid,events}

 */
 class wxGridRangeSelectEvent : public wxNotifyEvent
 {
 */
 class wxGridRangeSelectEvent : public wxNotifyEvent
 {


@@ -3658,7 +3656,7 @@ public:
     @endEventTable
 
     @library{wxadv}
     @endEventTable
 
     @library{wxadv}

-    @category{grid}
+    @category{grid,events}

 */
 class wxGridEditorCreatedEvent : public wxCommandEvent
 {
 */
 class wxGridEditorCreatedEvent : public wxCommandEvent
 {