X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1863484b0889b14191e43b4de9b31fed847cc29d..f6ac9c62401b35980d693cc7fef5ccd5bcb6015a:/samples/uiaction/uiaction.cpp

diff --git a/samples/uiaction/uiaction.cpp b/samples/uiaction/uiaction.cpp
index 6cf4d99f6d..56e477c153 100644
--- a/samples/uiaction/uiaction.cpp
+++ b/samples/uiaction/uiaction.cpp
@@ -4,7 +4,6 @@
 // Author:      Kevin Ollivier
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id$
 // Copyright:   (c) Kevin Ollivier, Steven Lamerton
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -40,7 +39,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)
-#if !defined(__WXMSW__) && !defined(__WXPM__)
+#ifndef wxHAS_IMAGES_IN_RESOURCES
     #include "../sample.xpm"
 #endif
 
@@ -213,7 +212,7 @@ void MyFrame::OnSimulateText(wxCommandEvent& WXUNUSED(event))
 
     wxUIActionSimulator sim;
     m_text->SetFocus();
-    sim.Text(s_text);
+    sim.Text(s_text.c_str());
 }
 
 void MyFrame::OnButtonPressed(wxCommandEvent& WXUNUSED(event))