X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c67daf87774c71ae9f73af9969008af220e52a11..0dfef5a8124ac0f1bb2aed6ef5ddfa833e8e2c6e:/samples/grid/test.cpp

diff --git a/samples/grid/test.cpp b/samples/grid/test.cpp
index 874ebeeb35..743ba4f79f 100644
--- a/samples/grid/test.cpp
+++ b/samples/grid/test.cpp
@@ -34,15 +34,15 @@ class MyApp: public wxApp
     bool OnInit(void);
 };
 
+
 // Define a new frame type
 class MyFrame: public wxFrame
 { public:
     wxGrid *grid;
     MyFrame(wxFrame *frame, const wxString& title, const wxPoint& pos, const wxSize& size);
 
-    bool OnClose(void) { return TRUE; }
-
     void ToggleEditable(wxCommandEvent& event);
+    void ToggleEditInPlace(wxCommandEvent& event);
     void ToggleRowLabel(wxCommandEvent& event);
     void ToggleColLabel(wxCommandEvent& event);
     void ToggleDividers(wxCommandEvent& event);
@@ -68,6 +68,7 @@ wxBitmap *cellBitmap2 = (wxBitmap *) NULL;
 // ID for the menu quit command
 #define GRID_QUIT 1
 #define GRID_TOGGLE_EDITABLE 2
+#define GRID_TOGGLE_EDITINPLACE 22
 #define GRID_LEFT_CELL       3
 #define GRID_CENTRE_CELL     4
 #define GRID_RIGHT_CELL      5
@@ -107,6 +108,7 @@ bool MyApp::OnInit(void)
 
   wxMenu *settings_menu = new wxMenu;
   settings_menu->Append(GRID_TOGGLE_EDITABLE, "&Toggle editable");
+  settings_menu->Append(GRID_TOGGLE_EDITINPLACE, "&Toggle edit in place");
   settings_menu->Append(GRID_TOGGLE_ROW_LABEL, "Toggle ro&w label");
   settings_menu->Append(GRID_TOGGLE_COL_LABEL, "Toggle co&l label");
   settings_menu->Append(GRID_TOGGLE_DIVIDERS, "Toggle &dividers");
@@ -137,7 +139,7 @@ bool MyApp::OnInit(void)
   frame->grid->SetCellValue("First cell", 0, 0);
   frame->grid->SetCellValue("Another cell", 1, 1);
   frame->grid->SetCellValue("Yet another cell", 2, 2);
-  frame->grid->SetCellTextFont(wxTheFontList->FindOrCreateFont(10, wxROMAN, wxITALIC, wxNORMAL), 0, 0);
+  frame->grid->SetCellTextFont(* wxTheFontList->FindOrCreateFont(10, wxROMAN, wxITALIC, wxNORMAL), 0, 0);
   frame->grid->SetCellTextColour(*wxRED, 1, 1);
   frame->grid->SetCellBackgroundColour(*wxCYAN, 2, 2);
   if (cellBitmap1 && cellBitmap2)
@@ -161,11 +163,12 @@ bool MyApp::OnInit(void)
 MyFrame::MyFrame(wxFrame *frame, const wxString& title, const wxPoint& pos, const wxSize& size):
   wxFrame(frame, -1, title, pos, size)
 {
-  grid = (wxGenericGrid *) NULL;
+  grid = (wxGrid*) NULL;
 }
 
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
   EVT_MENU(GRID_TOGGLE_EDITABLE, MyFrame::ToggleEditable)
+  EVT_MENU(GRID_TOGGLE_EDITINPLACE, MyFrame::ToggleEditInPlace)
   EVT_MENU(GRID_TOGGLE_ROW_LABEL, MyFrame::ToggleRowLabel)
   EVT_MENU(GRID_TOGGLE_COL_LABEL, MyFrame::ToggleColLabel)
   EVT_MENU(GRID_TOGGLE_DIVIDERS, MyFrame::ToggleDividers)
@@ -187,6 +190,12 @@ void MyFrame::ToggleEditable(wxCommandEvent& WXUNUSED(event))
       grid->Refresh();
 }
 
+void MyFrame::ToggleEditInPlace(wxCommandEvent& WXUNUSED(event))
+{
+      grid->SetEditInPlace(!grid->GetEditInPlace());
+      grid->Refresh();
+}
+
 void MyFrame::ToggleRowLabel(wxCommandEvent& WXUNUSED(event))
 {
       if (grid->GetLabelSize(wxVERTICAL) > 0)
@@ -207,10 +216,10 @@ void MyFrame::ToggleColLabel(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::ToggleDividers(wxCommandEvent& WXUNUSED(event))
 {
-      if (!grid->GetDividerPen())
-        grid->SetDividerPen(wxThePenList->FindOrCreatePen("LIGHT GREY", 1, wxSOLID));
+      if (!grid->GetDividerPen().Ok())
+        grid->SetDividerPen(* wxThePenList->FindOrCreatePen("LIGHT GREY", 1, wxSOLID));
       else
-        grid->SetDividerPen((wxPen *) NULL);
+        grid->SetDividerPen(wxNullPen);
       grid->Refresh();
 }