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

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

diff --git a/samples/splitter/test.cpp b/samples/splitter/test.cpp
index 8a81d60befce70fef3720613fc4286e2db4bce8e..4d749c959b6a259d83b983d59560ca4aa9fe4540 100644 (file)
--- a/samples/splitter/test.cpp
+++ b/samples/splitter/test.cpp
@@ -113,13 +113,15 @@ MyFrame::MyFrame(wxFrame* frame, const wxString& title, const wxPoint& pos, cons
        wxFrame(frame, -1, title, pos, size)
 {
        // set the icon
        wxFrame(frame, -1, title, pos, size)
 {
        // set the icon

-#ifdef __WINDOWS__
+#ifdef __WXMSW__

        SetIcon(wxIcon("mondrian"));
 #endif
 #ifdef __X__
        SetIcon(wxIcon("aiai.xbm"));
 #endif
 
        SetIcon(wxIcon("mondrian"));
 #endif
 #ifdef __X__
        SetIcon(wxIcon("aiai.xbm"));
 #endif
 

+       CreateStatusBar(1);
+

        // Make a menubar
        fileMenu = new wxMenu;
        fileMenu->Append(SPLIT_VERTICAL, "Split &Vertically", "Split vertically");
        // Make a menubar
        fileMenu = new wxMenu;
        fileMenu->Append(SPLIT_VERTICAL, "Split &Vertically", "Split vertically");


@@ -150,7 +152,6 @@ MyFrame::MyFrame(wxFrame* frame, const wxString& title, const wxPoint& pos, cons
 
     // Set this to prevent unsplitting
 //    splitter->SetMinimumPaneSize(20);
 
     // Set this to prevent unsplitting
 //    splitter->SetMinimumPaneSize(20);

-    CreateStatusBar();

 }
 
 MyFrame::~MyFrame()
 }
 
 MyFrame::~MyFrame()


@@ -162,12 +163,12 @@ bool MyFrame::OnClose()
        return TRUE;
 }
 
        return TRUE;
 }
 

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

 {
        Close(TRUE);
 }
 
 {
        Close(TRUE);
 }
 

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

 {
     if ( splitter->IsSplit() )
         splitter->Unsplit();
 {
     if ( splitter->IsSplit() )
         splitter->Unsplit();


@@ -176,7 +177,7 @@ void MyFrame::SplitHorizontal(wxCommandEvent& event)
     splitter->SplitHorizontally( leftCanvas, rightCanvas );
 }
 
     splitter->SplitHorizontally( leftCanvas, rightCanvas );
 }
 

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

 {
     if ( splitter->IsSplit() )
         splitter->Unsplit();
 {
     if ( splitter->IsSplit() )
         splitter->Unsplit();


@@ -185,7 +186,7 @@ void MyFrame::SplitVertical(wxCommandEvent& event)
     splitter->SplitVertically( leftCanvas, rightCanvas );
 }
 
     splitter->SplitVertically( leftCanvas, rightCanvas );
 }
 

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

 {
     if ( splitter->IsSplit() )
         splitter->Unsplit();
 {
     if ( splitter->IsSplit() )
         splitter->Unsplit();


@@ -210,6 +211,8 @@ void MyFrame::OnIdle(wxIdleEvent& event)
 {
     if ( GetStatusBar()->GetStatusText(0) != "Ready" )
         SetStatusText("Ready");
 {
     if ( GetStatusBar()->GetStatusText(0) != "Ready" )
         SetStatusText("Ready");

+       
+       wxFrame::OnIdle(event);

 }
 
 MyCanvas::MyCanvas(wxWindow* parent, int x, int y, int w, int h) :
 }
 
 MyCanvas::MyCanvas(wxWindow* parent, int x, int y, int w, int h) :


@@ -223,8 +226,13 @@ MyCanvas::~MyCanvas()
 
 void MyCanvas::OnDraw(wxDC& dc)
 {
 
 void MyCanvas::OnDraw(wxDC& dc)
 {

+       dc.SetPen(*wxBLACK_PEN);

        dc.DrawLine(0, 0, 100, 100);
 
     dc.SetBackgroundMode(wxTRANSPARENT);
        dc.DrawText("Testing", 50, 50);
        dc.DrawLine(0, 0, 100, 100);
 
     dc.SetBackgroundMode(wxTRANSPARENT);
        dc.DrawText("Testing", 50, 50);

+
+    dc.SetPen(*wxRED_PEN);
+    dc.SetBrush(*wxGREEN_BRUSH);
+    dc.DrawRectangle(120, 120, 100, 80);

 }
 }