reversed change of rev 1.127: this resulted in bug 1175461 while the original bug...

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

diff --git a/samples/grid/griddemo.h b/samples/grid/griddemo.h
index 94d923e417d76971548c06ecc2f1599268e8b29f..ec95d19e1dde1effe7f41eff0fba9a80a857ca49 100644 (file)
--- a/samples/grid/griddemo.h
+++ b/samples/grid/griddemo.h
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        griddemo.h
-// Purpose:     Grid control wxWindows sample
+// Purpose:     Grid control wxWidgets sample
 // Author:      Michael Bedward
 // Modified by:
 // RCS-ID:      $Id$
@@ -24,8 +24,10 @@ public:
 class GridFrame : public wxFrame
 {
     wxGrid         *grid;
+#if wxUSE_LOG
     wxTextCtrl     *logWin;
     wxLogTextCtrl  *logger;
+#endif // wxUSE_LOG
     wxString       logBuf;
 
     void SetDefaults();
@@ -36,6 +38,7 @@ class GridFrame : public wxFrame
     void ToggleRowSizing( wxCommandEvent& );
     void ToggleColSizing( wxCommandEvent& );
     void ToggleGridSizing( wxCommandEvent& );
+    void ToggleGridDragCell ( wxCommandEvent& );
     void ToggleGridLines( wxCommandEvent& );
     void AutoSizeCols( wxCommandEvent& );
     void CellOverflow( wxCommandEvent& );
@@ -78,6 +81,7 @@ class GridFrame : public wxFrame
     void OnSelectCell( wxGridEvent& );
     void OnRangeSelected( wxGridRangeSelectEvent& );
     void OnCellValueChanged( wxGridEvent& );
+    void OnCellBeginDrag( wxGridEvent& );
 
     void OnEditorShown(wxGridEvent&);
     void OnEditorHidden(wxGridEvent&);
@@ -103,6 +107,7 @@ public:
         ID_TOGGLEROWSIZING,
         ID_TOGGLECOLSIZING,
         ID_TOGGLEGRIDSIZING,
+        ID_TOGGLEGRIDDRAGCELL,
         ID_TOGGLEGRIDLINES,
         ID_AUTOSIZECOLS,
         ID_CELLOVERFLOW,
@@ -148,7 +153,9 @@ public:
         ID_TESTFUNC
     };
 
+#if wxUSE_LOG
     wxLog *m_logOld;
+#endif // wxUSE_LOG
 
     // add the cells to selection when using commands from select menu?
     bool m_addToSel;
@@ -185,7 +192,7 @@ public:
     }
 
     void SetValue( int , int , const wxString&  ) { /* ignore */ }
-    bool IsEmptyCell( int , int  ) { return FALSE; }
+    bool IsEmptyCell( int , int  ) { return false; }
 
 private:
     long m_sizeGrid;
@@ -225,7 +232,7 @@ private:
 class BugsGridTable : public wxGridTableBase
 {
 public:
-    BugsGridTable();
+    BugsGridTable(){};
 
     virtual int GetNumberRows();
     virtual int GetNumberCols();