Re-add support for multiple text validator styles but

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

diff --git a/interface/wx/grid.h b/interface/wx/grid.h
index 3aef6025823d992c2ddd0784e398f6b3b0ddab85..3c63d221c318f41fe37cd3bdc19b246680364a4a 100644 (file)
--- a/interface/wx/grid.h
+++ b/interface/wx/grid.h
@@ -321,7 +321,7 @@ public:
         an empty string otherwise.
     */
     static void UseStringValues(const wxString& valueTrue = "1",
         an empty string otherwise.
     */
     static void UseStringValues(const wxString& valueTrue = "1",

-                                const wxString& valueFalse = wxEmptyString) const;
+                                const wxString& valueFalse = wxEmptyString);

 };
 
 /**
 };
 
 /**


@@ -1397,13 +1397,13 @@ public:
 
     /**
         Call this in order to make the column labels use a native look by using
 
     /**
         Call this in order to make the column labels use a native look by using

-        wxRenderer::DrawHeaderButton() internally.
+        wxRendererNative::DrawHeaderButton() internally.

 
         There is no equivalent method for drawing row columns as there is not
         native look for that. This option is useful when using wxGrid for
         displaying tables and not as a spread-sheet.
 
 
         There is no equivalent method for drawing row columns as there is not
         native look for that. This option is useful when using wxGrid for
         displaying tables and not as a spread-sheet.
 

-        @see UseNativeHeader()
+        @see UseNativeColHeader()

     */
     void SetUseNativeColLabels(bool native = true);
 
     */
     void SetUseNativeColLabels(bool native = true);
 


@@ -1425,8 +1425,8 @@ public:
         are using the grid to display tabular data and don't have thousands of
         columns in it.
 
         are using the grid to display tabular data and don't have thousands of
         columns in it.
 

-        Also note that currently @c wxEVT_GRID_LABEL_LEFT_DCLICK and @c
-        wxEVT_GRID_LABEL_RIGHT_DCLICK events are not generated for the column
+        Also note that currently @c wxEVT_GRID_LABEL_LEFT_DCLICK and
+        @c wxEVT_GRID_LABEL_RIGHT_DCLICK events are not generated for the column

         labels if the native columns header is used (but this limitation could
         possibly be lifted in the future).
      */
         labels if the native columns header is used (but this limitation could
         possibly be lifted in the future).
      */


@@ -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;
+    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.


@@ -2770,7 +2770,7 @@ public:
 
         @see BlockToDeviceRect()
     */
 
         @see BlockToDeviceRect()
     */

-    const wxRect CellToRect(const wxGridCellCoords& coords) const;
+    wxRect CellToRect(const wxGridCellCoords& coords) const;

 
     /**
         Returns the column at the given pixel position.
 
     /**
         Returns the column at the given pixel position.


@@ -3098,44 +3098,6 @@ public:
 
     //@}
 
 
     //@}
 

-protected:
-    /**
-        Returns @true if this grid has support for cell attributes.
-
-        The grid supports attributes if it has the associated table which, in
-        turn, has attributes support, i.e. wxGridTableBase::CanHaveAttributes()
-        returns @true.
-    */
-    bool CanHaveAttributes() const;
-
-    /**
-        Get the minimal width of the given column/row.
-
-        The value returned by this function may be different than that returned
-        by GetColMinimalAcceptableWidth() if SetColMinimalWidth() had been
-        called for this column.
-    */
-    int GetColMinimalWidth(int col) const;
-
-    /**
-        Returns the coordinate of the right border specified column.
-    */
-    int GetColRight(int col) const;
-
-    /**
-        Returns the coordinate of the left border specified column.
-    */
-    int GetColLeft(int col) const;
-
-    /**
-        Returns the minimal size for the given column.
-
-        The value returned by this function may be different than that returned
-        by GetRowMinimalAcceptableHeight() if SetRowMinimalHeight() had been
-        called for this row.
-    */
-    int GetRowMinimalHeight(int col) const;
-

 
     /**
         @name Sorting support.
 
     /**
         @name Sorting support.


@@ -3207,6 +3169,7 @@ protected:
     void UnsetSortingColumn();
     //@}
 
     void UnsetSortingColumn();
     //@}
 

+

     /**
         @name Accessors for component windows.
 
     /**
         @name Accessors for component windows.
 


@@ -3251,7 +3214,7 @@ protected:
         GetGridColHeader() to access it if you need wxHeaderCtrl-specific
         functionality.
      */
         GetGridColHeader() to access it if you need wxHeaderCtrl-specific
         functionality.
      */

-    wxWindow *GetGridWindow() const;
+    wxWindow *GetGridColLabelWindow() const;

 
     /**
         Return the window in the top left grid corner.
 
     /**
         Return the window in the top left grid corner.


@@ -3271,6 +3234,44 @@ protected:
     wxHeaderCtrl *GetGridColHeader() const;
 
     //@}
     wxHeaderCtrl *GetGridColHeader() const;
 
     //@}

+
+protected:
+    /**
+        Returns @true if this grid has support for cell attributes.
+
+        The grid supports attributes if it has the associated table which, in
+        turn, has attributes support, i.e. wxGridTableBase::CanHaveAttributes()
+        returns @true.
+    */
+    bool CanHaveAttributes() const;
+
+    /**
+        Get the minimal width of the given column/row.
+
+        The value returned by this function may be different than that returned
+        by GetColMinimalAcceptableWidth() if SetColMinimalWidth() had been
+        called for this column.
+    */
+    int GetColMinimalWidth(int col) const;
+
+    /**
+        Returns the coordinate of the right border specified column.
+    */
+    int GetColRight(int col) const;
+
+    /**
+        Returns the coordinate of the left border specified column.
+    */
+    int GetColLeft(int col) const;
+
+    /**
+        Returns the minimal size for the given column.
+
+        The value returned by this function may be different than that returned
+        by GetRowMinimalAcceptableHeight() if SetRowMinimalHeight() had been
+        called for this row.
+    */
+    int GetRowMinimalHeight(int col) const;

 };
 
 
 };