compilation fix for DLL build

[wxWidgets.git] / samples / scroll / scroll.cpp

diff --git a/samples/scroll/scroll.cpp b/samples/scroll/scroll.cpp
index 3567376359a8b2ff1f2c9270ea8c1c031f8d91a2..8f5cba310cd299ca1d48e3d1e1455d5f697d1f44 100644 (file)
--- a/samples/scroll/scroll.cpp
+++ b/samples/scroll/scroll.cpp
@@ -96,7 +96,7 @@ IMPLEMENT_DYNAMIC_CLASS(MyCanvas, wxScrolledWindow)
 
 BEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow)
   EVT_PAINT(                  MyCanvas::OnPaint)
-  EVT_LEFT_DOWN(              MyCanvas::OnMouseDown)
+  EVT_MOUSE_EVENTS(                  MyCanvas::OnMouseDown)
   EVT_BUTTON( ID_QUERYPOS,    MyCanvas::OnQueryPosition)
   EVT_BUTTON( ID_ADDBUTTON,   MyCanvas::OnAddButton)
   EVT_BUTTON( ID_DELBUTTON,   MyCanvas::OnDeleteButton)
@@ -151,17 +151,17 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
 
     (void) new wxListBox( this, -1, wxPoint(260,280), wxSize(120,120), 5, choices, wxLB_ALWAYS_SB );
 
-    wxWindow *test = new wxWindow( this, -1, wxPoint(10, 530), wxSize(130,120), wxSIMPLE_BORDER | wxTAB_TRAVERSAL );
+    wxPanel *test = new wxPanel( this, -1, wxPoint(10, 530), wxSize(130,120), wxSIMPLE_BORDER | wxTAB_TRAVERSAL );
     test->SetBackgroundColour( "WHEAT" );
     wxButton *test2 = new wxButton( test, -1, "Hallo", wxPoint(10,10) );
   
-    test = new wxWindow( this, -1, wxPoint(160, 530), wxSize(130,120), wxSUNKEN_BORDER | wxTAB_TRAVERSAL );
+    test = new wxPanel( this, -1, wxPoint(160, 530), wxSize(130,120), wxSUNKEN_BORDER | wxTAB_TRAVERSAL );
     test->SetBackgroundColour( "WHEAT" );
     test->SetCursor( wxCursor( wxCURSOR_NO_ENTRY ) );
     test2 = new wxButton( test, -1, "Hallo", wxPoint(10,10) );
     test2->SetCursor( wxCursor( wxCURSOR_PENCIL ) );
   
-    test = new wxWindow( this, -1, wxPoint(310, 530), wxSize(130,120), wxRAISED_BORDER | wxTAB_TRAVERSAL );
+    test = new wxPanel( this, -1, wxPoint(310, 530), wxSize(130,120), wxRAISED_BORDER | wxTAB_TRAVERSAL );
     test->SetBackgroundColour( "WHEAT" );
     test->SetCursor( wxCursor( wxCURSOR_PENCIL ) );
     test2 = new wxButton( test, -1, "Hallo", wxPoint(10,10) );
@@ -178,10 +178,19 @@ MyCanvas::~MyCanvas()
 
 void MyCanvas::OnMouseDown( wxMouseEvent &event )
 {
-    wxPoint pt( event.GetPosition() );
-    int x,y;
-    CalcUnscrolledPosition( pt.x, pt.y, &x, &y );
-    wxLogMessage( "Mouse down event at: %d %d, scrolled: %d %d", pt.x, pt.y, x, y );
+    if (event.LeftDown())
+    {
+        wxPoint pt( event.GetPosition() );
+        int x,y;
+        CalcUnscrolledPosition( pt.x, pt.y, &x, &y );
+        wxLogMessage( "Mouse down event at: %d %d, scrolled: %d %d", pt.x, pt.y, x, y );
+    }
+    
+    if (event.LeftIsDown() &&
+        event.LeftDown())
+    {
+        wxLogMessage( "Error: both LeftDown() and LeftIsDown() are TRUE!" );
+    }
 }
 
 void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )