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

diff --git a/samples/grid/griddemo.h b/samples/grid/griddemo.h
index 3fa91e0ce5..bcb3ac25e4 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& );
@@ -74,6 +73,7 @@ class GridFrame : public wxFrame
     void SelectRow(wxCommandEvent& event);
     void SelectAll(wxCommandEvent& event);
     void OnAddToSelectToggle(wxCommandEvent& event);
+    void OnShowSelection(wxCommandEvent& event);
 
     void OnLabelLeftClick( wxGridEvent& );
     void OnCellLeftClick( wxGridEvent& );
@@ -82,6 +82,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 +108,7 @@ public:
         ID_TOGGLEROWSIZING,
         ID_TOGGLECOLSIZING,
         ID_TOGGLEGRIDSIZING,
+        ID_TOGGLEGRIDDRAGCELL,
         ID_TOGGLEGRIDLINES,
         ID_AUTOSIZECOLS,
         ID_CELLOVERFLOW,
@@ -132,11 +134,11 @@ public:
         ID_SELCOLS,
         ID_SET_CELL_FG_COLOUR,
         ID_SET_CELL_BG_COLOUR,
-        ID_ABOUT,
         ID_VTABLE,
         ID_BUGS_TABLE,
         ID_SMALL_GRID,
         ID_SELECT_UNSELECT,
+        ID_SHOW_SELECTION,
         ID_SELECT_ALL,
         ID_SELECT_ROW,
         ID_SELECT_COL,
@@ -152,7 +154,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 +193,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 +233,7 @@ private:
 class BugsGridTable : public wxGridTableBase
 {
 public:
-    BugsGridTable();
+    BugsGridTable(){};
 
     virtual int GetNumberRows();
     virtual int GetNumberCols();