Add draft wxPlotWindow

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

diff --git a/include/wx/generic/grid.h b/include/wx/generic/grid.h
index b169892b98f10487def07c9216f79f05a3660f7e..23bef5c25a003bae6974b591ee9d959737505cdc 100644 (file)
--- a/include/wx/generic/grid.h
+++ b/include/wx/generic/grid.h
@@ -52,7 +52,7 @@
 #define WXGRID_DEFAULT_TOPEDIT_HEIGHT         60
 
 
 #define WXGRID_DEFAULT_TOPEDIT_HEIGHT         60
 
 

-class wxGrid;
+class WXDLLEXPORT wxGrid;

 
 
 //////////////////////////////////////////////////////////////////////
 
 
 //////////////////////////////////////////////////////////////////////


@@ -283,11 +283,11 @@ class wxGridTextCtrl : public wxTextCtrl
 };
 
 
 };
 
 

-class wxGrid : public wxPanel
+class WXDLLEXPORT wxGrid : public wxPanel

 {
     DECLARE_DYNAMIC_CLASS( wxGrid )
 
 {
     DECLARE_DYNAMIC_CLASS( wxGrid )
 

-  private:
+  protected:

     bool m_created;
 
     wxGridTableBase *m_table;
     bool m_created;
 
     wxGridTableBase *m_table;


@@ -309,10 +309,12 @@ class wxGrid : public wxPanel
     int        m_defaultRowHeight;
     wxArrayInt m_rowHeights;
     wxArrayInt m_rowBottoms;
     int        m_defaultRowHeight;
     wxArrayInt m_rowHeights;
     wxArrayInt m_rowBottoms;

+    int        m_sumRowHeights;

 
     int        m_defaultColWidth;
     wxArrayInt m_colWidths;
     wxArrayInt m_colRights;
 
     int        m_defaultColWidth;
     wxArrayInt m_colWidths;
     wxArrayInt m_colRights;

+    int        m_sumColWidths;

 
     int m_rowLabelWidth;
     int m_colLabelHeight;
 
     int m_rowLabelWidth;
     int m_colLabelHeight;


@@ -393,7 +395,7 @@ class wxGrid : public wxPanel
     void OnSize( wxSizeEvent& );
     void OnMouse( wxMouseEvent& );
     void OnKeyDown( wxKeyEvent& );
     void OnSize( wxSizeEvent& );
     void OnMouse( wxMouseEvent& );
     void OnKeyDown( wxKeyEvent& );

-    void OnText( wxKeyEvent& );
+    void OnText( wxCommandEvent& );

     void OnGridScroll( wxScrollEvent& );
 
     void SelectCell( const wxGridCellCoords& coords );
     void OnGridScroll( wxScrollEvent& );
 
     void SelectCell( const wxGridCellCoords& coords );


@@ -459,14 +461,21 @@ class wxGrid : public wxPanel
     void DrawGridLines( wxDC& dc );
     void DrawCells( wxDC& dc );
     void DrawCellBackground( wxDC& dc, const wxRect&, int row, int col );
     void DrawGridLines( wxDC& dc );
     void DrawCells( wxDC& dc );
     void DrawCellBackground( wxDC& dc, const wxRect&, int row, int col );

-    void DrawCellValue( wxDC& dc, const wxRect&, int row, int col );
-
-    // this one is useful when you just need to draw one or a few
+    void DrawCellValue( wxDC& dc, const wxRect&, int row, int col,
+                        const wxString& value = wxEmptyString, bool useValueArg = FALSE );
+    
+    // this updates the displayed cell text value but not the underlying 
+    // table cell value (it is used to echo text being entered into
+    // the top edit control when in-place editing is turned off)
+    //
+    void DrawCellValue( const wxGridCellCoords& coords, const wxString& value );
+    
+    // these are useful when you just need to draw one or a few

     // cells
     void DrawCell( int row, int col );
     void DrawCell( const wxGridCellCoords& coords )
         { DrawCell( coords.GetRow(), coords.GetCol() ); }
     // cells
     void DrawCell( int row, int col );
     void DrawCell( const wxGridCellCoords& coords )
         { DrawCell( coords.GetRow(), coords.GetCol() ); }

-    
+        

     void DrawCellHighlight( wxDC& dc, int row, int col );
     void DrawCellHighlight( wxDC& dc, wxGridCellCoords& coords )
         { DrawCellHighlight( dc, coords.GetRow(), coords.GetCol() ); }
     void DrawCellHighlight( wxDC& dc, int row, int col );
     void DrawCellHighlight( wxDC& dc, wxGridCellCoords& coords )
         { DrawCellHighlight( dc, coords.GetRow(), coords.GetCol() ); }


@@ -896,7 +905,7 @@ class WXDLLEXPORT wxGridEvent : public wxNotifyEvent
 {
     DECLARE_DYNAMIC_CLASS(wxGridEvent)
 
 {
     DECLARE_DYNAMIC_CLASS(wxGridEvent)
 

-  private:
+  protected:

     int         m_row;
     int         m_col;
     int         m_x;
     int         m_row;
     int         m_col;
     int         m_x;


@@ -931,7 +940,7 @@ class WXDLLEXPORT wxGridSizeEvent : public wxNotifyEvent
 {
     DECLARE_DYNAMIC_CLASS(wxGridSizeEvent)
 
 {
     DECLARE_DYNAMIC_CLASS(wxGridSizeEvent)
 

-  private:
+  protected:

     int         m_rowOrCol;
     int         m_x;
     int         m_y;
     int         m_rowOrCol;
     int         m_x;
     int         m_y;


@@ -964,7 +973,7 @@ class WXDLLEXPORT wxGridRangeSelectEvent : public wxNotifyEvent
 {
     DECLARE_DYNAMIC_CLASS(wxGridRangeSelectEvent)
 
 {
     DECLARE_DYNAMIC_CLASS(wxGridRangeSelectEvent)
 

-  private:
+  protected:

     wxGridCellCoords  m_topLeft;
     wxGridCellCoords  m_bottomRight;
     bool              m_control;
     wxGridCellCoords  m_topLeft;
     wxGridCellCoords  m_bottomRight;
     bool              m_control;