Make it possible to use svn-find-native-eols script without svn checkout.

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

diff --git a/samples/uiaction/uiaction.cpp b/samples/uiaction/uiaction.cpp
index 6cf4d99f6d83b1ac622f257d80ba7d977dca3c0f..6fd518e2999ff2506145b1fe00122327d166d8df 100644 (file)
--- a/samples/uiaction/uiaction.cpp
+++ b/samples/uiaction/uiaction.cpp
@@ -40,7 +40,7 @@
 
 // the application icon (under Windows and OS/2 it is in resources and even
 // though we could still include the XPM here it would be unused)
 
 // the application icon (under Windows and OS/2 it is in resources and even
 // though we could still include the XPM here it would be unused)

-#if !defined(__WXMSW__) && !defined(__WXPM__)
+#ifndef wxHAS_IMAGES_IN_RESOURCES

     #include "../sample.xpm"
 #endif
 
     #include "../sample.xpm"
 #endif
 


@@ -213,7 +213,7 @@ void MyFrame::OnSimulateText(wxCommandEvent& WXUNUSED(event))
 
     wxUIActionSimulator sim;
     m_text->SetFocus();
 
     wxUIActionSimulator sim;
     m_text->SetFocus();

-    sim.Text(s_text);
+    sim.Text(s_text.c_str());

 }
 
 void MyFrame::OnButtonPressed(wxCommandEvent& WXUNUSED(event))
 }
 
 void MyFrame::OnButtonPressed(wxCommandEvent& WXUNUSED(event))