X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f7556ff05f5cf0a5be1e494a477fd463db4a9236..ca37cfde6a65e2895f7494dcdbce96cdb8b56eea:/samples/grid/griddemo.h

diff --git a/samples/grid/griddemo.h b/samples/grid/griddemo.h
index 3fa91e0ce5..ec95d19e1d 100644
--- 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$
@@ -12,10 +12,6 @@
 #ifndef griddemo_h
 #define griddemo_h
 
-#if !defined(wxUSE_NEW_GRID) || !(wxUSE_NEW_GRID)
-    #error "This sample requires the new wxGrid class."
-#endif
-
 class wxGrid;
 
 class GridApp : public wxApp
@@ -28,8 +24,10 @@ public:
 class GridFrame : public wxFrame
 {
     wxGrid         *grid;
+#if wxUSE_LOG
     wxTextCtrl     *logWin;
     wxLogTextCtrl  *logger;
+#endif // wxUSE_LOG
     wxString       logBuf;
 
     void SetDefaults();
@@ -40,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& );
@@ -82,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&);
@@ -107,6 +107,7 @@ public:
         ID_TOGGLEROWSIZING,
         ID_TOGGLECOLSIZING,
         ID_TOGGLEGRIDSIZING,
+        ID_TOGGLEGRIDDRAGCELL,
         ID_TOGGLEGRIDLINES,
         ID_AUTOSIZECOLS,
         ID_CELLOVERFLOW,
@@ -152,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;
@@ -189,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;
@@ -229,7 +232,7 @@ private:
 class BugsGridTable : public wxGridTableBase
 {
 public:
-    BugsGridTable();
+    BugsGridTable(){};
 
     virtual int GetNumberRows();
     virtual int GetNumberCols();