removed libxpm

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

diff --git a/samples/scroll/scroll.cpp b/samples/scroll/scroll.cpp
index e1eb70cf08571941a5183eee87b6c0770307b6e8..6f27a04edeb6dde9bb7a61cf1b474f794e7fc1d5 100644 (file)
--- a/samples/scroll/scroll.cpp
+++ b/samples/scroll/scroll.cpp
@@ -205,27 +205,27 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
 #endif
 
     wxPanel *test = new wxPanel( this, -1, wxPoint(10, 110), wxSize(130,50), wxSIMPLE_BORDER | wxTAB_TRAVERSAL );
 #endif
 
     wxPanel *test = new wxPanel( this, -1, wxPoint(10, 110), wxSize(130,50), wxSIMPLE_BORDER | wxTAB_TRAVERSAL );

-    test->SetBackgroundColour( "WHEAT" );
+    test->SetBackgroundColour( wxT("WHEAT") );

 
 #if 0
 
     wxButton *test2 = new wxButton( test, -1, "Hallo", wxPoint(10,10) );
 
     test = new wxPanel( this, -1, wxPoint(160, 530), wxSize(130,120), wxSUNKEN_BORDER | wxTAB_TRAVERSAL );
 
 #if 0
 
     wxButton *test2 = new wxButton( test, -1, "Hallo", wxPoint(10,10) );
 
     test = new wxPanel( this, -1, wxPoint(160, 530), wxSize(130,120), wxSUNKEN_BORDER | wxTAB_TRAVERSAL );

-    test->SetBackgroundColour( "WHEAT" );
+    test->SetBackgroundColour( wxT("WHEAT") );

     test->SetCursor( wxCursor( wxCURSOR_NO_ENTRY ) );
     test2 = new wxButton( test, -1, "Hallo", wxPoint(10,10) );
     test2->SetCursor( wxCursor( wxCURSOR_PENCIL ) );
 
     test = new wxPanel( this, -1, wxPoint(310, 530), wxSize(130,120), wxRAISED_BORDER | wxTAB_TRAVERSAL );
     test->SetCursor( wxCursor( wxCURSOR_NO_ENTRY ) );
     test2 = new wxButton( test, -1, "Hallo", wxPoint(10,10) );
     test2->SetCursor( wxCursor( wxCURSOR_PENCIL ) );
 
     test = new wxPanel( this, -1, wxPoint(310, 530), wxSize(130,120), wxRAISED_BORDER | wxTAB_TRAVERSAL );

-    test->SetBackgroundColour( "WHEAT" );
+    test->SetBackgroundColour( wxT("WHEAT") );

     test->SetCursor( wxCursor( wxCURSOR_PENCIL ) );
     test2 = new wxButton( test, -1, "Hallo", wxPoint(10,10) );
     test2->SetCursor( wxCursor( wxCURSOR_NO_ENTRY ) );
 
 #endif
 
     test->SetCursor( wxCursor( wxCURSOR_PENCIL ) );
     test2 = new wxButton( test, -1, "Hallo", wxPoint(10,10) );
     test2->SetCursor( wxCursor( wxCURSOR_NO_ENTRY ) );
 
 #endif
 

-    SetBackgroundColour( "BLUE" );
+    SetBackgroundColour( wxT("BLUE") );

 
     SetCursor( wxCursor( wxCURSOR_IBEAM ) );
 }
 
     SetCursor( wxCursor( wxCURSOR_IBEAM ) );
 }


@@ -241,10 +241,10 @@ void MyCanvas::OnMouseDown( wxMouseEvent &event )
         wxPoint pt( event.GetPosition() );
         int x,y;
         CalcUnscrolledPosition( pt.x, pt.y, &x, &y );
         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 );
+        wxLogMessage( wxT("Mouse down event at: %d %d, scrolled: %d %d"), pt.x, pt.y, x, y );

 
         if ( !event.LeftIsDown() )
 
         if ( !event.LeftIsDown() )

-            wxLogMessage( "Error: LeftIsDown() should be TRUE if for LeftDown()" );
+            wxLogMessage( wxT("Error: LeftIsDown() should be TRUE if for LeftDown()") );

     }
 }
 
     }
 }
 


@@ -263,45 +263,45 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
 void MyCanvas::OnQueryPosition( wxCommandEvent &WXUNUSED(event) )
 {
     wxPoint pt( m_button->GetPosition() );
 void MyCanvas::OnQueryPosition( wxCommandEvent &WXUNUSED(event) )
 {
     wxPoint pt( m_button->GetPosition() );

-    wxLogMessage( "Position of ""Query position"" is %d %d", pt.x, pt.y );
+    wxLogMessage( wxT("Position of \"Query position\" is %d %d"), pt.x, pt.y );

     pt = ClientToScreen( pt );
     pt = ClientToScreen( pt );

-    wxLogMessage( "Position of ""Query position"" on screen is %d %d", pt.x, pt.y );
+    wxLogMessage( wxT("Position of \"Query position\" on screen is %d %d"), pt.x, pt.y );

 }
 
 void MyCanvas::OnAddButton( wxCommandEvent &WXUNUSED(event) )
 {
 }
 
 void MyCanvas::OnAddButton( wxCommandEvent &WXUNUSED(event) )
 {

-    wxLogMessage( "Inserting button at position 10,70..." );
+    wxLogMessage( wxT("Inserting button at position 10,70...") );

     wxButton *button = new wxButton( this, ID_NEWBUTTON, "new button", wxPoint(10,70), wxSize(80,25) );
     wxPoint pt( button->GetPosition() );
     wxButton *button = new wxButton( this, ID_NEWBUTTON, "new button", wxPoint(10,70), wxSize(80,25) );
     wxPoint pt( button->GetPosition() );

-    wxLogMessage( "-> Position after inserting %d %d", pt.x, pt.y );
+    wxLogMessage( wxT("-> Position after inserting %d %d"), pt.x, pt.y );

 }
 
 void MyCanvas::OnDeleteButton( wxCommandEvent &event )
 {
 }
 
 void MyCanvas::OnDeleteButton( wxCommandEvent &event )
 {

-    wxLogMessage( "Deleting button inserted with ""Add button""..." );
+    wxLogMessage( wxT("Deleting button inserted with \"Add button\"...") );

     wxWindow *win = FindWindow( ID_NEWBUTTON );
     if (win)
        win->Destroy();
     else
     wxWindow *win = FindWindow( ID_NEWBUTTON );
     if (win)
        win->Destroy();
     else

-       wxLogMessage( "-> No window with id = ID_NEWBUTTON found." );
+       wxLogMessage( wxT("-> No window with id = ID_NEWBUTTON found.") );

 }
 
 void MyCanvas::OnMoveButton( wxCommandEvent &event )
 {
 }
 
 void MyCanvas::OnMoveButton( wxCommandEvent &event )
 {

-    wxLogMessage( "Moving button 10 pixels downward.." );
+    wxLogMessage( wxT("Moving button 10 pixels downward..") );

     wxWindow *win = FindWindow( event.GetId() );
     wxPoint pt( win->GetPosition() );
     wxWindow *win = FindWindow( event.GetId() );
     wxPoint pt( win->GetPosition() );

-    wxLogMessage( "-> Position before move is %d %d", pt.x, pt.y );
+    wxLogMessage( wxT("-> Position before move is %d %d"), pt.x, pt.y );

     win->Move( -1, pt.y + 10 );
     pt = win->GetPosition();
     win->Move( -1, pt.y + 10 );
     pt = win->GetPosition();

-    wxLogMessage( "-> Position after move is %d %d", pt.x, pt.y );
+    wxLogMessage( wxT("-> Position after move is %d %d"), pt.x, pt.y );

 }
 
 void MyCanvas::OnScrollWin( wxCommandEvent &WXUNUSED(event) )
 {
 }
 
 void MyCanvas::OnScrollWin( wxCommandEvent &WXUNUSED(event) )
 {

-    wxLogMessage( "Scrolling 2 units up.\nThe white square and the controls should move equally!" );
+    wxLogMessage( wxT("Scrolling 2 units up.\nThe white square and the controls should move equally!") );

     int x,y;
     int x,y;

-    ViewStart( &x, &y );
+    GetViewStart( &x, &y );

     Scroll( -1, y+2 );
 }
 
     Scroll( -1, y+2 );
 }