More _T()... trying to get to that clipboard sample

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3148 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/samples/dnd/dnd.cpp b/samples/dnd/dnd.cpp
index 92b29d29e749dff6570ac2d9eac4b973d94ff860..3fc5583e92c4c76839697c66fa419ff4bb96887d 100644 (file)
--- a/samples/dnd/dnd.cpp
+++ b/samples/dnd/dnd.cpp
@@ -372,18 +372,18 @@ void DnDFrame::OnCopy(wxCommandEvent& WXUNUSED(event))
 {
     if ( !wxTheClipboard->Open() )
     {
 {
     if ( !wxTheClipboard->Open() )
     {

-        wxLogError("Can't open clipboard.");
+        wxLogError(_T("Can't open clipboard."));

 
         return;
     }
 
     if ( !wxTheClipboard->AddData(new wxTextDataObject(m_strText)) )
     {
 
         return;
     }
 
     if ( !wxTheClipboard->AddData(new wxTextDataObject(m_strText)) )
     {

-        wxLogError("Can't copy data to the clipboard");
+        wxLogError(_T("Can't copy data to the clipboard"));

     }
     else
     {
     }
     else
     {

-        wxLogMessage("Text '%s' put on the clipboard", m_strText.c_str());
+        wxLogMessage(_T("Text '%s' put on the clipboard"), m_strText.c_str());

     }
 
     wxTheClipboard->Close();
     }
 
     wxTheClipboard->Close();


@@ -393,14 +393,14 @@ void DnDFrame::OnPaste(wxCommandEvent& WXUNUSED(event))
 {
     if ( !wxTheClipboard->Open() )
     {
 {
     if ( !wxTheClipboard->Open() )
     {

-        wxLogError("Can't open clipboard.");
+        wxLogError(_T("Can't open clipboard."));

 
         return;
     }
 
     if ( !wxTheClipboard->IsSupported(wxDF_TEXT) )
     {
 
         return;
     }
 
     if ( !wxTheClipboard->IsSupported(wxDF_TEXT) )
     {

-        wxLogWarning("No text data on clipboard");
+        wxLogWarning(_T("No text data on clipboard"));

 
         return;
     }
 
         return;
     }


@@ -408,11 +408,11 @@ void DnDFrame::OnPaste(wxCommandEvent& WXUNUSED(event))
     wxTextDataObject text;
     if ( !wxTheClipboard->GetData(&text) )
     {
     wxTextDataObject text;
     if ( !wxTheClipboard->GetData(&text) )
     {

-        wxLogError("Can't paste data from the clipboard");
+        wxLogError(_T("Can't paste data from the clipboard"));

     }
     else
     {
     }
     else
     {

-        wxLogMessage("Text '%s' pasted from the clipboard",
+        wxLogMessage(_T("Text '%s' pasted from the clipboard"),

                      text.GetText().c_str());
     }
 
                      text.GetText().c_str());
     }
 

diff --git a/samples/docview/docview.cpp b/samples/docview/docview.cpp
index 6204548013608e99c4616fec31be457552fbe874..b142b5f84338d8f0c8bbf36ccc1ae7fd31795ca1 100644 (file)
--- a/samples/docview/docview.cpp
+++ b/samples/docview/docview.cpp
@@ -62,7 +62,7 @@ bool MyApp::OnInit(void)
   ///   single window : (one document at a time, only one frame, as in Windows Write)
   if (argc > 1)
   {
   ///   single window : (one document at a time, only one frame, as in Windows Write)
   if (argc > 1)
   {

-    if (strcmp(argv[1], "-single") == 0)
+    if (wxStrcmp(argv[1], _T("-single")) == 0)

     {
       singleWindowMode = TRUE;
     }
     {
       singleWindowMode = TRUE;
     }