Fix broken and missing DataView interface items for Phoenix

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

diff --git a/samples/grid/griddemo.h b/samples/grid/griddemo.h
index 5779b175c57c86a87479d09557328881393a27aa..88056141949637a69a0f97c8c95d911adc18441b 100644 (file)
--- a/samples/grid/griddemo.h
+++ b/samples/grid/griddemo.h
@@ -42,6 +42,8 @@ class GridFrame : public wxFrame
     void SetNativeColHeader ( wxCommandEvent& );
     void SetCustomColHeader( wxCommandEvent& );
     void SetDefaultColHeader( wxCommandEvent& );
     void SetNativeColHeader ( wxCommandEvent& );
     void SetCustomColHeader( wxCommandEvent& );
     void SetDefaultColHeader( wxCommandEvent& );

+    void SetTabBehaviour( wxCommandEvent& );
+    void SetTabCustomHandler( wxCommandEvent& );

     void ToggleGridLines( wxCommandEvent& );
     void AutoSizeCols( wxCommandEvent& );
     void CellOverflow( wxCommandEvent& );
     void ToggleGridLines( wxCommandEvent& );
     void AutoSizeCols( wxCommandEvent& );
     void CellOverflow( wxCommandEvent& );


@@ -77,7 +79,6 @@ class GridFrame : public wxFrame
     void SelectRow(wxCommandEvent& event);
     void SelectAll(wxCommandEvent& event);
     void OnAddToSelectToggle(wxCommandEvent& event);
     void SelectRow(wxCommandEvent& event);
     void SelectAll(wxCommandEvent& event);
     void OnAddToSelectToggle(wxCommandEvent& event);

-    void OnShowSelection(wxCommandEvent& event);

 
     void AutoSizeRow(wxCommandEvent& event);
     void AutoSizeCol(wxCommandEvent& event);
 
     void AutoSizeRow(wxCommandEvent& event);
     void AutoSizeCol(wxCommandEvent& event);


@@ -103,6 +104,8 @@ class GridFrame : public wxFrame
     void OnSetHighlightWidth(wxCommandEvent&);
     void OnSetROHighlightWidth(wxCommandEvent&);
 
     void OnSetHighlightWidth(wxCommandEvent&);
     void OnSetROHighlightWidth(wxCommandEvent&);
 

+    void OnGridCustomTab(wxGridEvent& event);
+

 public:
     GridFrame();
     ~GridFrame();
 public:
     GridFrame();
     ~GridFrame();


@@ -112,6 +115,8 @@ public:
     void OnVTable( wxCommandEvent& );
     void OnBugsTable( wxCommandEvent& );
     void OnTabularTable( wxCommandEvent& );
     void OnVTable( wxCommandEvent& );
     void OnBugsTable( wxCommandEvent& );
     void OnTabularTable( wxCommandEvent& );

+    void OnGridRender( wxCommandEvent& event );
+    void OnRenderPaint( wxPaintEvent& event );

 
     enum
     {
 
     enum
     {


@@ -139,6 +144,10 @@ public:
         ID_COLDEFAULTHEADER,
         ID_COLNATIVEHEADER,
         ID_COLCUSTOMHEADER,
         ID_COLDEFAULTHEADER,
         ID_COLNATIVEHEADER,
         ID_COLCUSTOMHEADER,

+        ID_TAB_STOP,
+        ID_TAB_WRAP,
+        ID_TAB_LEAVE,
+        ID_TAB_CUSTOM,

         ID_GRIDLINECOLOUR,
         ID_INSERTROW,
         ID_INSERTCOL,
         ID_GRIDLINECOLOUR,
         ID_INSERTROW,
         ID_INSERTCOL,


@@ -156,7 +165,6 @@ public:
         ID_BUGS_TABLE,
         ID_TABULAR_TABLE,
         ID_SELECT_UNSELECT,
         ID_BUGS_TABLE,
         ID_TABULAR_TABLE,
         ID_SELECT_UNSELECT,

-        ID_SHOW_SELECTION,

         ID_SELECT_ALL,
         ID_SELECT_ROW,
         ID_SELECT_COL,
         ID_SELECT_ALL,
         ID_SELECT_ROW,
         ID_SELECT_COL,


@@ -176,7 +184,18 @@ public:
         ID_SET_HIGHLIGHT_WIDTH,
         ID_SET_RO_HIGHLIGHT_WIDTH,
 
         ID_SET_HIGHLIGHT_WIDTH,
         ID_SET_RO_HIGHLIGHT_WIDTH,
 

-        ID_TESTFUNC
+        ID_TESTFUNC,
+
+        ID_RENDER_ROW_LABEL,
+        ID_RENDER_COL_LABEL,
+        ID_RENDER_GRID_LINES,
+        ID_RENDER_GRID_BORDER,
+        ID_RENDER_SELECT_HLIGHT,
+        ID_RENDER_LOMETRIC,
+        ID_RENDER_COORDS,
+        ID_RENDER_ZOOM,
+        ID_RENDER_MARGIN,
+        ID_RENDER_DEFAULT_SIZE,

     };
 
 #if wxUSE_LOG
     };
 
 #if wxUSE_LOG


@@ -186,6 +205,8 @@ public:
     // 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;
 

+    wxBitmap m_gridBitmap;
+

     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };