mwxLog was leaked - fixed

[wxWidgets.git] / samples / newgrid / griddemo.h

diff --git a/samples/newgrid/griddemo.h b/samples/newgrid/griddemo.h
index e54c469f75fe6eeebff29eed0ce1ee0931e6658f..2bc68c20823fe3345221129ac0d0dd99c17e6619 100644 (file)
--- a/samples/newgrid/griddemo.h
+++ b/samples/newgrid/griddemo.h
@@ -37,6 +37,9 @@ class GridFrame : public wxFrame
     void ToggleRowLabels( wxCommandEvent& );
     void ToggleColLabels( wxCommandEvent& );
     void ToggleEditing( wxCommandEvent& );
+    void ToggleRowSizing( wxCommandEvent& );
+    void ToggleColSizing( wxCommandEvent& );
+    void ToggleGridSizing( wxCommandEvent& );
     void SetLabelColour( wxCommandEvent& );
     void SetLabelTextColour( wxCommandEvent& );
     void SetRowLabelHorizAlignment( wxCommandEvent& );
@@ -79,6 +82,9 @@ public:
         ID_TOGGLEROWLABELS = 100,
         ID_TOGGLECOLLABELS,
         ID_TOGGLEEDIT,
+        ID_TOGGLEROWSIZING,
+        ID_TOGGLECOLSIZING,
+        ID_TOGGLEGRIDSIZING,
         ID_SETLABELCOLOUR,
         ID_SETLABELTEXTCOLOUR,
         ID_ROWLABELALIGN,
@@ -102,6 +108,8 @@ public:
         ID_TESTFUNC
     };
 
+    wxLog *m_logOld;
+
     DECLARE_EVENT_TABLE()
 };
 
@@ -121,24 +129,6 @@ public:
 // memory
 // ----------------------------------------------------------------------------
 
-class SimpleTable : public wxGridStringTable {
-public:
-    SimpleTable( int numRows, int numCols )
-        : wxGridStringTable( numRows, numCols ) {}
-
-    // override this to fake a row as all bools
-    wxString GetTypeName( int row, int col )
-        {
-            if (row == 8)
-                return wxT("bool");
-            else if (row == 9 && col == 1)
-                return wxT("unknown type");  // to test fallback
-            else
-                return wxGridStringTable::GetTypeName(row, col);
-        }
-
-};
-
 class BigGridTable : public wxGridTableBase
 {
 public:
@@ -169,9 +159,33 @@ private:
 };
 
 // ----------------------------------------------------------------------------
-// another, more realistic, grid example
+// another, more realistic, grid example: shows typed columns and more
 // ----------------------------------------------------------------------------
 
+class BugsGridTable : public wxGridTableBase
+{
+public:
+    BugsGridTable();
+
+    virtual long GetNumberRows();
+    virtual long GetNumberCols();
+    virtual bool IsEmptyCell( int row, int col );
+    virtual wxString GetValue( int row, int col );
+    virtual void SetValue( int row, int col, const wxString& value );
+
+    virtual wxString GetColLabelValue( int col );
+
+    virtual wxString GetTypeName( int row, int col );
+    virtual bool CanGetValueAs( int row, int col, const wxString& typeName );
+    virtual bool CanSetValueAs( int row, int col, const wxString& typeName );
+
+    virtual long GetValueAsLong( int row, int col );
+    virtual bool GetValueAsBool( int row, int col );
+
+    virtual void SetValueAsLong( int row, int col, long value );
+    virtual void SetValueAsBool( int row, int col, bool value );
+};
+
 class BugsGridFrame : public wxFrame
 {
 public: