Fixes for wxUSE_SPIN... == 0.

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

diff --git a/samples/grid/griddemo.h b/samples/grid/griddemo.h
index a06464e232074c7f0c0c404f810f93b0c32efeea..ec95d19e1dde1effe7f41eff0fba9a80a857ca49 100644 (file)
--- a/samples/grid/griddemo.h
+++ b/samples/grid/griddemo.h
@@ -24,8 +24,10 @@ public:
 class GridFrame : public wxFrame
 {
     wxGrid         *grid;
 class GridFrame : public wxFrame
 {
     wxGrid         *grid;

+#if wxUSE_LOG

     wxTextCtrl     *logWin;
     wxLogTextCtrl  *logger;
     wxTextCtrl     *logWin;
     wxLogTextCtrl  *logger;

+#endif // wxUSE_LOG

     wxString       logBuf;
 
     void SetDefaults();
     wxString       logBuf;
 
     void SetDefaults();


@@ -36,6 +38,7 @@ class GridFrame : public wxFrame
     void ToggleRowSizing( wxCommandEvent& );
     void ToggleColSizing( wxCommandEvent& );
     void ToggleGridSizing( wxCommandEvent& );
     void ToggleRowSizing( wxCommandEvent& );
     void ToggleColSizing( wxCommandEvent& );
     void ToggleGridSizing( wxCommandEvent& );

+    void ToggleGridDragCell ( wxCommandEvent& );

     void ToggleGridLines( wxCommandEvent& );
     void AutoSizeCols( wxCommandEvent& );
     void CellOverflow( 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 OnSelectCell( wxGridEvent& );
     void OnRangeSelected( wxGridRangeSelectEvent& );
     void OnCellValueChanged( wxGridEvent& );

+    void OnCellBeginDrag( wxGridEvent& );

 
     void OnEditorShown(wxGridEvent&);
     void OnEditorHidden(wxGridEvent&);
 
     void OnEditorShown(wxGridEvent&);
     void OnEditorHidden(wxGridEvent&);


@@ -103,6 +107,7 @@ public:
         ID_TOGGLEROWSIZING,
         ID_TOGGLECOLSIZING,
         ID_TOGGLEGRIDSIZING,
         ID_TOGGLEROWSIZING,
         ID_TOGGLECOLSIZING,
         ID_TOGGLEGRIDSIZING,

+        ID_TOGGLEGRIDDRAGCELL,

         ID_TOGGLEGRIDLINES,
         ID_AUTOSIZECOLS,
         ID_CELLOVERFLOW,
         ID_TOGGLEGRIDLINES,
         ID_AUTOSIZECOLS,
         ID_CELLOVERFLOW,


@@ -148,7 +153,9 @@ public:
         ID_TESTFUNC
     };
 
         ID_TESTFUNC
     };
 

+#if wxUSE_LOG

     wxLog *m_logOld;
     wxLog *m_logOld;

+#endif // wxUSE_LOG

 
     // add the cells to selection when using commands from select menu?
     bool m_addToSel;
 
     // 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 */ }
     }
 
     void SetValue( int , int , const wxString&  ) { /* ignore */ }

-    bool IsEmptyCell( int , int  ) { return FALSE; }
+    bool IsEmptyCell( int , int  ) { return false; }

 
 private:
     long m_sizeGrid;
 
 private:
     long m_sizeGrid;


@@ -225,7 +232,7 @@ private:
 class BugsGridTable : public wxGridTableBase
 {
 public:
 class BugsGridTable : public wxGridTableBase
 {
 public:

-    BugsGridTable();
+    BugsGridTable(){};

 
     virtual int GetNumberRows();
     virtual int GetNumberCols();
 
     virtual int GetNumberRows();
     virtual int GetNumberCols();