Attempting to check in this wretched cursor again. Also added SetAcceleratorTable

[wxWidgets.git] / samples / grid / test.cpp

diff --git a/samples/grid/test.cpp b/samples/grid/test.cpp
index 6cfcf2b9b6b7eaa671ad1f6a7f73aca683faba9f..1f48aeec8772f9d6ec2704d92440d032d79f2df8 100644 (file)
--- a/samples/grid/test.cpp
+++ b/samples/grid/test.cpp
@@ -88,7 +88,7 @@ IMPLEMENT_APP(MyApp)
 // `Main program' equivalent, creating windows and returning main app frame
 bool MyApp::OnInit(void)
 {
 // `Main program' equivalent, creating windows and returning main app frame
 bool MyApp::OnInit(void)
 {

-#ifdef __WINDOWS__
+#ifdef __WXMSW__

   cellBitmap1 = new wxBitmap("bitmap1");
   cellBitmap2 = new wxBitmap("bitmap2");
 #endif
   cellBitmap1 = new wxBitmap("bitmap1");
   cellBitmap2 = new wxBitmap("bitmap2");
 #endif


@@ -97,7 +97,7 @@ bool MyApp::OnInit(void)
   MyFrame *frame = new MyFrame(NULL, "wxGrid Sample", wxPoint(50, 50), wxSize(450, 300));
   
   // Give it an icon
   MyFrame *frame = new MyFrame(NULL, "wxGrid Sample", wxPoint(50, 50), wxSize(450, 300));
   
   // Give it an icon

-#ifdef __WINDOWS__
+#ifdef __WXMSW__

   frame->SetIcon(wxIcon("mondrian"));
 #endif
 #ifdef __X__
   frame->SetIcon(wxIcon("mondrian"));
 #endif
 #ifdef __X__


@@ -184,13 +184,13 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
   EVT_MENU(GRID_QUIT, MyFrame::Quit)
 END_EVENT_TABLE()
 
   EVT_MENU(GRID_QUIT, MyFrame::Quit)
 END_EVENT_TABLE()
 

-void MyFrame::ToggleEditable(wxCommandEvent& event)
+void MyFrame::ToggleEditable(wxCommandEvent& WXUNUSED(event))

 {
       grid->SetEditable(!grid->GetEditable());
       grid->Refresh();
 }
 
 {
       grid->SetEditable(!grid->GetEditable());
       grid->Refresh();
 }
 

-void MyFrame::ToggleRowLabel(wxCommandEvent& event)
+void MyFrame::ToggleRowLabel(wxCommandEvent& WXUNUSED(event))

 {
       if (grid->GetLabelSize(wxVERTICAL) > 0)
         grid->SetLabelSize(wxVERTICAL, 0);
 {
       if (grid->GetLabelSize(wxVERTICAL) > 0)
         grid->SetLabelSize(wxVERTICAL, 0);


@@ -199,7 +199,7 @@ void MyFrame::ToggleRowLabel(wxCommandEvent& event)
       grid->Refresh();
 }
 
       grid->Refresh();
 }
 

-void MyFrame::ToggleColLabel(wxCommandEvent& event)
+void MyFrame::ToggleColLabel(wxCommandEvent& WXUNUSED(event))

 {
       if (grid->GetLabelSize(wxHORIZONTAL) > 0)
         grid->SetLabelSize(wxHORIZONTAL, 0);
 {
       if (grid->GetLabelSize(wxHORIZONTAL) > 0)
         grid->SetLabelSize(wxHORIZONTAL, 0);


@@ -208,7 +208,7 @@ void MyFrame::ToggleColLabel(wxCommandEvent& event)
       grid->Refresh();
 }
 
       grid->Refresh();
 }
 

-void MyFrame::ToggleDividers(wxCommandEvent& event)
+void MyFrame::ToggleDividers(wxCommandEvent& WXUNUSED(event))

 {
       if (!grid->GetDividerPen())
         grid->SetDividerPen(wxThePenList->FindOrCreatePen("LIGHT GREY", 1, wxSOLID));
 {
       if (!grid->GetDividerPen())
         grid->SetDividerPen(wxThePenList->FindOrCreatePen("LIGHT GREY", 1, wxSOLID));


@@ -217,25 +217,25 @@ void MyFrame::ToggleDividers(wxCommandEvent& event)
       grid->Refresh();
 }
 
       grid->Refresh();
 }
 

-void MyFrame::LeftCell(wxCommandEvent& event)
+void MyFrame::LeftCell(wxCommandEvent& WXUNUSED(event))

 {
       grid->SetCellAlignment(wxLEFT);
       grid->Refresh();
 }
 
 {
       grid->SetCellAlignment(wxLEFT);
       grid->Refresh();
 }
 

-void MyFrame::CentreCell(wxCommandEvent& event)
+void MyFrame::CentreCell(wxCommandEvent& WXUNUSED(event))

 {
       grid->SetCellAlignment(wxCENTRE);
       grid->Refresh();
 }
 
 {
       grid->SetCellAlignment(wxCENTRE);
       grid->Refresh();
 }
 

-void MyFrame::RightCell(wxCommandEvent& event)
+void MyFrame::RightCell(wxCommandEvent& WXUNUSED(event))

 {
       grid->SetCellAlignment(wxRIGHT);
       grid->Refresh();
 }
 
 {
       grid->SetCellAlignment(wxRIGHT);
       grid->Refresh();
 }
 

-void MyFrame::ColourLabelBackground(wxCommandEvent& event)
+void MyFrame::ColourLabelBackground(wxCommandEvent& WXUNUSED(event))

 {
       wxColourData data;
       data.SetChooseFull(TRUE);
 {
       wxColourData data;
       data.SetChooseFull(TRUE);


@@ -249,7 +249,7 @@ void MyFrame::ColourLabelBackground(wxCommandEvent& event)
       }
 }
 
       }
 }
 

-void MyFrame::ColourLabelText(wxCommandEvent& event)
+void MyFrame::ColourLabelText(wxCommandEvent& WXUNUSED(event))

 {
       wxColourData data;
       data.SetChooseFull(TRUE);
 {
       wxColourData data;
       data.SetChooseFull(TRUE);


@@ -263,14 +263,14 @@ void MyFrame::ColourLabelText(wxCommandEvent& event)
       }
 }
 
       }
 }
 

-void MyFrame::NormalLabelColouring(wxCommandEvent& event)
+void MyFrame::NormalLabelColouring(wxCommandEvent& WXUNUSED(event))

 {
       grid->SetLabelBackgroundColour(*wxLIGHT_GREY);
       grid->SetLabelTextColour(*wxBLACK);
       grid->Refresh();
 }
 
 {
       grid->SetLabelBackgroundColour(*wxLIGHT_GREY);
       grid->SetLabelTextColour(*wxBLACK);
       grid->Refresh();
 }
 

-void MyFrame::ColourCellBackground(wxCommandEvent& event)
+void MyFrame::ColourCellBackground(wxCommandEvent& WXUNUSED(event))

 {
       wxColourData data;
       data.SetChooseFull(TRUE);
 {
       wxColourData data;
       data.SetChooseFull(TRUE);


@@ -284,7 +284,7 @@ void MyFrame::ColourCellBackground(wxCommandEvent& event)
       }
 }
 
       }
 }
 

-void MyFrame::ColourCellText(wxCommandEvent& event)
+void MyFrame::ColourCellText(wxCommandEvent& WXUNUSED(event))

 {
       wxColourData data;
       data.SetChooseFull(TRUE);
 {
       wxColourData data;
       data.SetChooseFull(TRUE);


@@ -298,14 +298,14 @@ void MyFrame::ColourCellText(wxCommandEvent& event)
       }
 }
 
       }
 }
 

-void MyFrame::NormalCellColouring(wxCommandEvent& event)
+void MyFrame::NormalCellColouring(wxCommandEvent& WXUNUSED(event))

 {
       grid->SetCellBackgroundColour(*wxWHITE);
       grid->SetCellTextColour(*wxBLACK);
       grid->Refresh();
 }
 
 {
       grid->SetCellBackgroundColour(*wxWHITE);
       grid->SetCellTextColour(*wxBLACK);
       grid->Refresh();
 }
 

-void MyFrame::Quit(wxCommandEvent& event)
+void MyFrame::Quit(wxCommandEvent& WXUNUSED(event))

 {
       this->Close(TRUE);
 }
 {
       this->Close(TRUE);
 }