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 eb39abc46993b529e1032badf500d5a056188327..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,7 +283,7 @@ class wxGridTextCtrl : public wxTextCtrl
 };
 
 
 };
 
 

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

 {
     DECLARE_DYNAMIC_CLASS( wxGrid )
 
 {
     DECLARE_DYNAMIC_CLASS( wxGrid )
 


@@ -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 );