compilation fixes after string changes

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

diff --git a/demos/forty/scorefil.cpp b/demos/forty/scorefil.cpp
index 83c2e6e45b6ebb9fb24d3058b55f954921f6e6a6..e49fb6afcef23c2e21dab72cb05777776e55d7bf 100644 (file)
--- a/demos/forty/scorefil.cpp
+++ b/demos/forty/scorefil.cpp
@@ -128,7 +128,7 @@ void ScoreFile::ReadPlayersScore(
 
 void ScoreFile::WritePlayersScore(const wxString& player, int wins, int games, int score)
 {
-    if (player)
+    if (!player.empty())
     {
         m_config->SetPath(_T("/General"));
         m_config->Write(_T("LastPlayer"), wxString(player)); // Without wxString tmp, thinks it's bool in VC++

diff --git a/demos/poem/wxpoem.cpp b/demos/poem/wxpoem.cpp
index 2234c07cc0ceb42958b3fe498a42e897796e808f..13da0411e9c92d428e75c6aba8da84d8daa77de4 100644 (file)
--- a/demos/poem/wxpoem.cpp
+++ b/demos/poem/wxpoem.cpp
@@ -888,7 +888,7 @@ long MainWindow::DoSearch(void)
 
         // Only match if we're looking at a different poem
         // (no point in displaying the same poem again)
-        if ((ch == m_searchString[i]) && (last_poem_start != previous_poem_start))
+        if ((m_searchString[i] == ch) && (last_poem_start != previous_poem_start))
         {
             if (i == 0)
                 last_find = ftell(file);

diff --git a/samples/combo/combo.cpp b/samples/combo/combo.cpp
index 2d705f1523cc651897f416e6b90696c242e00953..cb2f5238c26a876e630dbb778042f39a758dd30e 100644 (file)
--- a/samples/combo/combo.cpp
+++ b/samples/combo/combo.cpp
@@ -747,7 +747,7 @@ MyFrame::MyFrame(const wxString& title)
     m_logWin->SetEditable(false);
     wxLogTextCtrl* logger = new wxLogTextCtrl( m_logWin );
     m_logOld = logger->SetActiveTarget( logger );
-    logger->SetTimestamp( NULL );
+    logger->DisableTimestamp();
 
 
     topSizer = new wxBoxSizer( wxVERTICAL );

diff --git a/samples/debugrpt/debugrpt.cpp b/samples/debugrpt/debugrpt.cpp
index 9b379a1f518ce508fe7f78f2b97558399e58e728..1125ff6cfa797cd6c7b8591ea43417199e4d95ca 100644 (file)
--- a/samples/debugrpt/debugrpt.cpp
+++ b/samples/debugrpt/debugrpt.cpp
@@ -125,7 +125,7 @@ static void bar(const wxChar *p)
 
 void baz(const wxString& s)
 {
-    printf("baz: %s\n", s.c_str());
+    printf("baz: %s\n", (const char*)s.c_str());
 }
 
 void foo(int n)

diff --git a/samples/exec/exec.cpp b/samples/exec/exec.cpp
index 75279b9ce92c40bd8a38ec014752dd2670fff22d..932674772d37bbfddc14a95b3c7e093ecb618c79 100644 (file)
--- a/samples/exec/exec.cpp
+++ b/samples/exec/exec.cpp
@@ -833,7 +833,7 @@ void MyFrame::OnFileExec(wxCommandEvent& WXUNUSED(event))
     wxString filename;
 
 #if wxUSE_FILEDLG
-    filename = wxLoadFileSelector(_T("any file"), NULL, s_filename, this);
+    filename = wxLoadFileSelector(_T("any file"), wxEmptyString, s_filename, this);
 #else // !wxUSE_FILEDLG
     filename = wxGetTextFromUser(_T("Enter the file name"), _T("exec sample"),
                                  s_filename, this);

diff --git a/samples/ipc/client.cpp b/samples/ipc/client.cpp
index 9141746c4afd46aa2349d350da8585d225d704b2..7bca7c5e77ad582bdd8be1955dcf399242e17a4c 100644 (file)
--- a/samples/ipc/client.cpp
+++ b/samples/ipc/client.cpp
@@ -337,8 +337,8 @@ void MyFrame::OnExecute(wxCommandEvent& WXUNUSED(event))
     {
         wxString s = _T("Date");
 
-        m_client->GetConnection()->Execute((wxChar *)s.c_str());
-        m_client->GetConnection()->Execute((wxChar *)s.c_str(), (s.Length() + 1) * sizeof(wxChar));
+        m_client->GetConnection()->Execute((const wxChar *)s.c_str());
+        m_client->GetConnection()->Execute((const wxChar *)s.c_str(), (s.Length() + 1) * sizeof(wxChar));
 #if wxUSE_DDE_FOR_IPC
         wxLogMessage(_T("DDE Execute can only be used to send text strings, not arbitrary data.\nThe type argument will be ignored, text truncated, converted to Unicode and null terminated."));
 #endif
@@ -353,9 +353,9 @@ void MyFrame::OnPoke(wxCommandEvent& WXUNUSED(event))
     if (m_client->IsConnected())
     {
         wxString s = wxDateTime::Now().Format();
-        m_client->GetConnection()->Poke(_T("Date"), (wxChar *)s.c_str());
+        m_client->GetConnection()->Poke(_T("Date"), (const wxChar *)s.c_str());
         s = wxDateTime::Now().FormatTime() + _T(" ") + wxDateTime::Now().FormatDate();
-        m_client->GetConnection()->Poke(_T("Date"), (wxChar *)s.c_str(), (s.Length() + 1) * sizeof(wxChar));
+        m_client->GetConnection()->Poke(_T("Date"), (const wxChar *)s.c_str(), (s.Length() + 1) * sizeof(wxChar));
         char bytes[3];
         bytes[0] = '1'; bytes[1] = '2'; bytes[2] = '3';
         m_client->GetConnection()->Poke(_T("bytes[3]"), (wxChar *)bytes, 3, wxIPC_PRIVATE);

diff --git a/samples/popup/popup.cpp b/samples/popup/popup.cpp
index 14075eaae7af5bdfed1a47112b4af5a0ea82ebc4..6ea7c912db9c41061eb51e8d30c1cb057e2aaa03 100644 (file)
--- a/samples/popup/popup.cpp
+++ b/samples/popup/popup.cpp
@@ -358,7 +358,7 @@ MyFrame::MyFrame(const wxString& title)
     m_logWin->SetEditable(false);
     wxLogTextCtrl* logger = new wxLogTextCtrl( m_logWin );
     m_logOld = logger->SetActiveTarget( logger );
-    logger->SetTimestamp( NULL );
+    logger->DisableTimestamp();
 
     wxBoxSizer *topSizer = new wxBoxSizer( wxVERTICAL );
     topSizer->Add( button1, 0, wxALL, 5 );

diff --git a/utils/tex2rtf/src/tex2any.cpp b/utils/tex2rtf/src/tex2any.cpp
index 488a200c858f8de1ca6df3d108e6a00d239e303f..4984789f8b8c8d018df522663c09d1699c905f8d 100644 (file)
--- a/utils/tex2rtf/src/tex2any.cpp
+++ b/utils/tex2rtf/src/tex2any.cpp
@@ -246,17 +246,15 @@ CustomMacro::~CustomMacro()
         delete [] macroBody;
 }
 
-void TexOutput(const wxChar *s, bool ordinaryText)
+void TexOutput(const wxString& s, bool ordinaryText)
 {
-  int len = wxStrlen(s);
-
   // Update current column, but only if we're guaranteed to
   // be ordinary text (not mark-up stuff)
   int i;
   if (ordinaryText)
-    for (i = 0; i < len; i++)
+    for (wxString::const_iterator i = s.begin(); i != s.end(); ++i)
     {
-      if (s[i] == 13 || s[i] == 10)
+      if (*i == 13 || *i == 10)
         currentColumn = 0;
       else
         currentColumn ++;

diff --git a/utils/tex2rtf/src/tex2any.h b/utils/tex2rtf/src/tex2any.h
index d05a643333292ad1d4b8f23bfa1403d1393906cc..5bff6a936932c39e16ff95197a5194255d8387f8 100644 (file)
--- a/utils/tex2rtf/src/tex2any.h
+++ b/utils/tex2rtf/src/tex2any.h
@@ -162,7 +162,7 @@ extern FILE *CurrentOutput2;
 void AddMacroDef(int the_id, const wxChar *name, int n, bool ignore = false, bool forbidden = false);
 void TexInitialize(int bufSize);
 void TexCleanUp(void);
-void TexOutput(const wxChar *s, bool ordinaryText = false);
+void TexOutput(const wxString& s, bool ordinaryText = false);
 wxChar *GetArgData(TexChunk *chunk);
 wxChar *GetArgData(void);             // Get the string for the current argument
 int GetNoArgs(void);                // Get the number of arguments for the current macro