Unicode compilation fixes (patch from Dimitri)

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

samples/dialup/nettest.cpp

@@ -256,10 +256,10 @@ void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {
     wxString msg;
-    msg.Printf(_T("This is the network functions test sample.\n"
+    msg.Printf( wxT("This is the network functions test sample.\n")
-                  "<EFBFBD> 1999 Vadim Zeitlin"));
+                wxT("<EFBFBD> 1999 Vadim Zeitlin") );
 
-    wxMessageBox(msg, _T("About NetTest"), wxOK | wxICON_INFORMATION, this);
+    wxMessageBox(msg, wxT("About NetTest"), wxOK | wxICON_INFORMATION, this);
 }
 
 void MyFrame::OnHangUp(wxCommandEvent& WXUNUSED(event))

samples/event/event.cpp

@@ -293,9 +293,9 @@ void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {
-    wxMessageBox(_T("Event sample shows different ways of using events\n"
+    wxMessageBox( wxT("Event sample shows different ways of using events\n")
-                    "<EFBFBD> 2001 Vadim Zeitlin"),
+                  wxT("<EFBFBD> 2001 Vadim Zeitlin"),
-                 _T("About Event Sample"), wxOK | wxICON_INFORMATION, this);
+                  wxT("About Event Sample"), wxOK | wxICON_INFORMATION, this );
 }
 
 // ----------------------------------------------------------------------------
@@ -304,9 +304,12 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnDynamic(wxCommandEvent& WXUNUSED(event))
 {
-    wxMessageBox(_T("This is a dynamic event handler which can be connected "
+    wxMessageBox
-                    "and disconnected during run-time."),
+    (
-                 _T("Dynamic Event Handler"), wxOK | wxICON_INFORMATION, this);
+        wxT("This is a dynamic event handler which can be connected ")
+        wxT("and disconnected at run-time."),
+        wxT("Dynamic Event Handler"), wxOK | wxICON_INFORMATION, this
+    );
 }
 
 void MyFrame::OnConnect(wxCommandEvent& event)

samples/resource/resource.cpp

@@ -24,6 +24,10 @@
 #include "wx/wx.h"
 #endif
 
+#if wxUSE_UNICODE
+    #error "This sample can't be compiled in Unicode mode."
+#endif // wxUSE_UNICODE
+
 #include "wx/resource.h"
 
 #include <ctype.h>
@@ -52,8 +56,8 @@
 // Under Windows, some compilers can't include
 // a whole .wxr file. So we use a .rc user-defined resource
 // instead. dialog1 will point to the whole .wxr 'file'.
-static char *dialog1 = NULL;
+static wxChar *dialog1 = NULL;
-static char *menu1 = NULL;
+static wxChar *menu1 = NULL;
 #else
 // Other platforms should have sensible compilers that
 // cope with long strings.
@@ -77,8 +81,8 @@ bool MyApp::OnInit(void)
 {
 #if defined(__WXMSW__)
     // Load the .wxr 'file' from a .rc resource, under Windows.
-  dialog1 = wxLoadUserResource("dialog1", "WXRDATA");
+    dialog1 = wxLoadUserResource(wxT("dialog1"), wxT("WXRDATA"));
-  menu1 = wxLoadUserResource("menu1", "WXRDATA");
+    menu1 = wxLoadUserResource(wxT("menu1"), wxT("WXRDATA"));
     // All resources in the file (only one in this case) get parsed
     // by this call.
     wxResourceParseString(dialog1);
@@ -92,7 +96,9 @@ bool MyApp::OnInit(void)
 #endif
 
     // Create the main frame window
-  frame = new MyFrame((wxFrame *) NULL, -1, (char *) "wxWindows Resource Sample", wxPoint(-1, -1), wxSize(300, 250));
+    frame = new MyFrame( (wxFrame *) NULL, -1,
+                         (char *) "wxWindows Resource Sample",
+                         wxPoint(-1, -1), wxSize(300, 250) );
 
     // Give it a status line
     frame->CreateStatusBar(2);
@@ -103,7 +109,8 @@ bool MyApp::OnInit(void)
     frame->SetMenuBar(menu_bar);
 
     // Make a panel
-  frame->panel = new MyPanel(frame, -1, wxPoint(0, 0), wxSize(400, 400), 0, "MyMainFrame");
+    frame->panel = new MyPanel( frame, -1, wxPoint(0, 0), wxSize(400, 400),
+                                0, "MyMainFrame" );
     frame->Show(TRUE);
 
     SetTopWindow(frame);
@@ -123,9 +130,12 @@ BEGIN_EVENT_TABLE(MyPanel, wxPanel)
     EVT_LEFT_DOWN( MyPanel::OnClick)
 END_EVENT_TABLE()
 
-MyPanel::MyPanel( wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, 
+MyPanel::MyPanel
-  int style, const wxString &name ) : 
+(
-  wxPanel( parent, id, pos, size, style, name )
+    wxWindow *parent, wxWindowID id, const wxPoint& pos,
+    const wxSize& size,
+    int style, const wxString &name
+) : wxPanel( parent, id, pos, size, style, name )
 {
 }
 
@@ -144,8 +154,11 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
 END_EVENT_TABLE()
 
 // Define my frame constructor
-MyFrame::MyFrame(wxWindow *parent, const wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size):
+MyFrame::MyFrame
-  wxFrame(parent, id, title, pos, size)
+(
+    wxWindow *parent, const wxWindowID id,
+    const wxString& title, const wxPoint& pos, const wxSize& size
+) : wxFrame(parent, id, title, pos, size)
 {
     panel = (wxWindow *) NULL;
 }
@@ -165,13 +178,18 @@ void MyFrame::OnQuit( wxCommandEvent& WXUNUSED(event) )
 void MyFrame::OnTestDialog(wxCommandEvent& WXUNUSED(event) )
 {
     MyDialog *dialog = new MyDialog;
+
     if (dialog->LoadFromResource(this, "dialog1"))
     {
         wxTextCtrl *text = (wxTextCtrl *)wxFindWindowByName("multitext3", dialog);
         if (text)
+        {
             text->SetValue("wxWindows resource demo");
+        }
+
         dialog->ShowModal();
     }
+
     dialog->Close(TRUE);
 }
 

samples/richedit/wxLayout.cpp

@@ -273,12 +273,20 @@ void MyFrame::OnCommand( wxCommandEvent &event )
         wxPrinter printer;
         wxLayoutPrintout printout(m_lwin->GetLayoutList(),_("M: Printout"));
         if (! printer.Print(this, &printout, TRUE))
-         wxMessageBox(
+        {
-            _("There was a problem with printing the message:\n"
+            // Had to remove the split up strings that used to be below, and
-              "perhaps your current printer is not set up correctly?"),
+            // put them into one long strong. Otherwise MSVC would give an
-            _("Printing"), wxOK);
+            // error "C2308: concatenating mismatched wide strings" when
+            // building a Unicode version.
+            wxMessageBox
+            (
+                _("There was a problem with printing the message:\nperhaps your current printer is not set up correctly?"),
+                _("Printing"), wxOK
+            );
         }
         break;
+    }
+
     case ID_NOWRAP:
     case ID_WRAP:
         m_lwin->SetWrapMargin(event.GetId() == ID_NOWRAP ? 0 : 40);
@@ -335,10 +343,12 @@ void MyFrame::OnCommand( wxCommandEvent &event )
                 cout << *(export0->content.text);
             else
                 ; // ignore itcout << "<!--UNKNOWN OBJECT>";
+
             delete export0;
         }
-   }
         break;
+    }
+
     case ID_TEXT:
     {
         wxLayoutExportObject *export0;
@@ -350,20 +360,25 @@ void MyFrame::OnCommand( wxCommandEvent &event )
                 cout << *(export0->content.text);
             else
                 cout << "<!--UNKNOWN OBJECT>";
+
             delete export0;
         }
-   }
+
         break;
+    }
+
+
     case ID_LONG_TEST:
     {
         wxString line;
         wxLayoutList *llist = m_lwin->GetLayoutList();
         for(int i = 1; i < 300; i++)
         {
-         line.Printf("This is line number %d.", i);
+            line.Printf(wxT("This is line number %d."), i);
             llist->Insert(line);
             llist->LineBreak();
         }
+
         llist->MoveCursorTo(wxPoint(0,0));
         m_lwin->SetDirty();
         m_lwin->Refresh();
@@ -371,10 +386,12 @@ void MyFrame::OnCommand( wxCommandEvent &event )
     }
 
     case ID_LINEBREAKS_TEST:
-      wxLayoutImportText(m_lwin->GetLayoutList(),
+        wxLayoutImportText
-                         "This is a text\n"
+        (
-                         "with embedded line\n"
+            m_lwin->GetLayoutList(),
-                         "breaks.\n");
+            wxT("This is a text\nwith embedded line\nbreaks.\n")
+        );
+
         m_lwin->SetDirty();
         m_lwin->Refresh();
         break;

samples/richedit/wxllist.cpp

@@ -81,7 +81,7 @@
    wxLayoutObject::DebugDump(void) const
    {
       wxString str;
-      str.Printf("%s",g_aTypeStrings[GetType()]);
+      str.Printf(wxT("%s"), g_aTypeStrings[GetType()]);
       return str;
    }
 #else
@@ -176,11 +176,16 @@ bool Contains(const wxRect &r, const wxPoint &p)
 static
 void ReadString(wxString &to, wxString &from)
 {
-   to = "";
+    to = wxT("");
-   const char *cptr = from.c_str();
+    const wxChar *cptr = from.c_str();
-   while(*cptr && *cptr != '\n')
+    while(*cptr && *cptr != wxT('\n'))
-      to += *cptr++;
+    {
+        to += cptr;
+        cptr++;
+    }
+
     if(*cptr) cptr++;
+
     from = cptr;
 }
 
@@ -196,8 +201,9 @@ wxLayoutObject::Read(wxString &istr)
 {
     wxString tmp;
     ReadString(tmp, istr);
-   int type = WXLO_TYPE_INVALID;
+    long l = WXLO_TYPE_INVALID;
-   sscanf(tmp.c_str(),"%d", &type);
+    tmp.ToLong(&l);
+    int type = (int) l;
 
     switch(type)
     {
@@ -385,7 +391,7 @@ wxLayoutObjectText::DebugDump(void) const
    wxString str;
    str = wxLayoutObject::DebugDump();
    wxString str2;
-   str2.Printf(" `%s`", m_Text.c_str());
+   str2.Printf(wxT(" `%s`"), m_Text.c_str());
    return str+str2;
 }
 #endif
@@ -400,7 +406,7 @@ wxLayoutObjectIcon::wxLayoutObjectIcon(wxBitmap const &icon)
 {
    if ( !icon.Ok() )
    {
-      wxFAIL_MSG("invalid icon");
+      wxFAIL_MSG(wxT("invalid icon"));
 
       m_Icon = NULL;
 
@@ -592,43 +598,73 @@ wxLayoutObjectCmd::Read(wxString &istr)
 {
     wxLayoutObjectCmd *obj = new wxLayoutObjectCmd;
 
+    long l = 0;
     wxString tmp;
     ReadString(tmp, istr);
-   sscanf(tmp.c_str(),"%d", &obj->m_StyleInfo->family);
+    tmp.ToLong(&l);
+    obj->m_StyleInfo->family = (int) l;
+
+
     ReadString(tmp, istr);
-   sscanf(tmp.c_str(),"%d", &obj->m_StyleInfo->size);
+    tmp.ToLong(&l);
+    obj->m_StyleInfo->size = (int) l;
+
     ReadString(tmp, istr);
-   sscanf(tmp.c_str(),"%d", &obj->m_StyleInfo->style);
+    tmp.ToLong(&l);
+    obj->m_StyleInfo->style = (int) l;
+
     ReadString(tmp, istr);
-   sscanf(tmp.c_str(),"%d", &obj->m_StyleInfo->weight);
+    tmp.ToLong(&l);
+    obj->m_StyleInfo->weight = (int) l;
+
     ReadString(tmp, istr);
-   sscanf(tmp.c_str(),"%d", &obj->m_StyleInfo->underline);
+    tmp.ToLong(&l);
+    obj->m_StyleInfo->underline = (int) l;
+
     ReadString(tmp, istr);
-   sscanf(tmp.c_str(),"%d", &obj->m_StyleInfo->m_fg_valid);
+    tmp.ToLong(&l);
+    obj->m_StyleInfo->m_fg_valid = (int) l;
+
     ReadString(tmp, istr);
-   sscanf(tmp.c_str(),"%d", &obj->m_StyleInfo->m_bg_valid);
+    tmp.ToLong(&l);
+    obj->m_StyleInfo->m_bg_valid = (int) l;
+
     if(obj->m_StyleInfo->m_fg_valid)
     {
         int red, green, blue;
         ReadString(tmp, istr);
-      sscanf(tmp.c_str(),"%d", &red);
+        tmp.ToLong(&l);
+        red = (int) l;
+
         ReadString(tmp, istr);
-      sscanf(tmp.c_str(),"%d", &green);
+        tmp.ToLong(&l);
+        green = (int) l;
+
         ReadString(tmp, istr);
-      sscanf(tmp.c_str(),"%d", &blue);
+        tmp.ToLong(&l);
+        blue = (int) l;
+
         obj->m_StyleInfo->m_fg = wxColour(red, green, blue);
     }
+
     if(obj->m_StyleInfo->m_bg_valid)
     {
         int red, green, blue;
         ReadString(tmp, istr);
-      sscanf(tmp.c_str(),"%d", &red);
+        tmp.ToLong(&l);
+        red = (int) l;
+
         ReadString(tmp, istr);
-      sscanf(tmp.c_str(),"%d", &green);
+        tmp.ToLong(&l);
+        green = (int) l;
+
         ReadString(tmp, istr);
-      sscanf(tmp.c_str(),"%d", &blue);
+        tmp.ToLong(&l);
+        blue = (int) l;
+
         obj->m_StyleInfo->m_bg = wxColour(red, green, blue);
     }
+
     return obj;
 }
 
@@ -1006,6 +1042,7 @@ wxLayoutLine::DeleteWord(CoordType xpos)
                 i++; offset = 0;
                 continue;
             }
+
             wxLayoutObjectText *tobj = (wxLayoutObjectText *)*i;
             size_t count = 0;
             wxString str = tobj->GetText();
@@ -1019,11 +1056,12 @@ wxLayoutLine::DeleteWord(CoordType xpos)
             wxASSERT(count+offset <= (size_t) (**i).GetLength());
             ((wxLayoutObjectText *)*i)->GetText().erase(offset,count);
             m_Length -= count;
+
             return true;
         }
     }
 
-   wxFAIL_MSG("unreachable");
+    wxFAIL_MSG(wxT("unreachable"));
 }
 
 wxLayoutLine *
@@ -1322,7 +1360,8 @@ wxLayoutLine::Wrap(CoordType wrapmargin, wxLayoutList *llist)
    // find the object which covers the wrapmargin:
    CoordType offset;
    wxLOiterator i = FindObject(wrapmargin, &offset);
-   wxCHECK_MSG( i != NULLIT, FALSE, "Cannot find object covering wrapmargin.");
+   wxCHECK_MSG( i != NULLIT, FALSE,
+                wxT("Cannot find object covering wrapmargin."));
    
    // from this object on, the rest of the line must be copied to the
    // next one:
@@ -1451,7 +1490,8 @@ wxLayoutLine::ReNumber(void)
 void
 wxLayoutLine::MergeNextLine(wxLayoutList *llist)
 {
-   wxCHECK_RET(GetNextLine(),"wxLayout internal error: no next line to merge");
+   wxCHECK_RET( GetNextLine(),
+                wxT("wxLayout internal error: no next line to merge"));
    wxLayoutObjectList &list = GetNextLine()->m_ObjectList;
    wxLOiterator i;
 
@@ -1569,7 +1609,7 @@ void
 wxLayoutLine::Debug(void) const
 {
    wxPoint pos = GetPosition();
-   WXLO_DEBUG(("Line %ld, Pos (%ld,%ld), Height %ld, BL %ld, Font: %d",
+   WXLO_DEBUG((wxT("Line %ld, Pos (%ld,%ld), Height %ld, BL %ld, Font: %d"),
                (long int) GetLineNumber(),
                (long int) pos.x, (long int) pos.y,
                (long int) GetHeight(),
@@ -1675,7 +1715,7 @@ wxLayoutList::~wxLayoutList()
    Empty();
    m_FirstLine->DeleteLine(false, this);
 
-   wxASSERT_MSG( m_numLines == 0, "line count calculation broken" );
+   wxASSERT_MSG( m_numLines == 0, wxT("line count calculation broken"));
 }
 
 void
@@ -1728,8 +1768,10 @@ wxLayoutList::Read(wxString &istr)
       // check for a linebreak:
       wxString tmp;
       tmp = istr.BeforeFirst('\n');
-      int type = WXLO_TYPE_INVALID;
+      long l = WXLO_TYPE_INVALID;
-      sscanf(tmp.c_str(),"%d", &type);
+      tmp.ToLong(&l);
+      int type = (int) l;
+
       if(type == WXLO_TYPE_LINEBREAK)
       {
          LineBreak();
@@ -1962,8 +2004,8 @@ wxLayoutList::MoveCursorHorizontally(int n)
 bool
 wxLayoutList::MoveCursorWord(int n, bool untilNext)
 {
-   wxCHECK_MSG( m_CursorLine, false, "no current line" );
+   wxCHECK_MSG( m_CursorLine, false, wxT("no current line") );
-   wxCHECK_MSG( n == -1 || n == +1, false, "not implemented yet" );
+   wxCHECK_MSG( n == -1 || n == +1, false, wxT("not implemented yet") );
 
    CoordType moveDistance = 0;
    CoordType offset;
@@ -2052,9 +2094,9 @@ wxLayoutList::MoveCursorWord(int n, bool untilNext)
          if ( canAdvance )
          {
             const wxString& text = tobj->GetText();
-            const char *start = text.c_str();
+            const wxChar *start = text.c_str();
-            const char *end = start + text.length();
+            const wxChar *end = start + text.length();
-            const char *p = start + offset;
+            const wxChar *p = start + offset;
 
             if ( n < 0 )
             {
@@ -2123,7 +2165,8 @@ bool
 wxLayoutList::Insert(wxString const &text)
 {
    wxASSERT(m_CursorLine);
-   wxASSERT_MSG( text.Find('\n') == wxNOT_FOUND, "use wxLayoutImportText!" );
+   wxASSERT_MSG( text.Find(wxT('\n')) == wxNOT_FOUND,
+                 wxT("use wxLayoutImportText!") );
 
    if ( !text )
        return true;
@@ -2245,7 +2288,7 @@ wxLayoutList::WrapAll(CoordType column)
 bool
 wxLayoutList::Delete(CoordType npos)
 {
-   wxCHECK_MSG(m_CursorLine, false, "can't delete in non existing line");
+   wxCHECK_MSG(m_CursorLine, false, wxT("can't delete in non existing line"));
 
    if ( npos == 0 )
        return true;
@@ -2300,7 +2343,7 @@ wxLayoutList::Delete(CoordType npos)
                }
                else
                {
-                  wxFAIL_MSG("can't delete all this");
+                  wxFAIL_MSG(wxT("can't delete all this"));
 
                   return false;
                }
@@ -2537,8 +2580,8 @@ wxLayoutList::Draw(wxDC &dc,
    }
    InvalidateUpdateRect();
 
-   WXLO_DEBUG(("Selection is %s : %ld,%ld/%ld,%ld",
+   WXLO_DEBUG((wxT("Selection is %s : %ld,%ld/%ld,%ld"),
-               m_Selection.m_valid ? "valid" : "invalid",
+               m_Selection.m_valid ? wxT("valid") : wxT("invalid"),
                m_Selection.m_CursorA.x, m_Selection.m_CursorA.y,
                m_Selection.m_CursorB.x, m_Selection.m_CursorB.y));
 }
@@ -2650,14 +2693,14 @@ wxLayoutList::DrawCursor(wxDC &dc, bool active, wxPoint const &translate)
    coords += translate;
 
 #ifdef WXLAYOUT_DEBUG
-   WXLO_DEBUG(("Drawing cursor (%ld,%ld) at %ld,%ld, size %ld,%ld, line: %ld, len %ld",
+   WXLO_DEBUG((wxT("Drawing cursor (%ld,%ld) at %ld,%ld, size %ld,%ld, line: %ld, len %ld"),
                (long)m_CursorPos.x, (long)m_CursorPos.y,
                (long)coords.x, (long)coords.y, 
                (long)m_CursorSize.x, (long)m_CursorSize.y,
                (long)m_CursorLine->GetLineNumber(),
                (long)m_CursorLine->GetLength()));
 
-   wxLogStatus("Cursor is at (%d, %d)", m_CursorPos.x, m_CursorPos.y);
+   wxLogStatus(wxT("Cursor is at (%d, %d)"), m_CursorPos.x, m_CursorPos.y);
 #endif
 
 #ifdef WXLAYOUT_USE_CARET
@@ -2711,7 +2754,7 @@ wxLayoutList::StartSelection(const wxPoint& cposOrig, const wxPoint& spos)
    wxPoint cpos(cposOrig);
    if ( cpos.x == -1 )
       cpos = m_CursorPos;
-   WXLO_DEBUG(("Starting selection at %ld/%ld", cpos.x, cpos.y));
+   WXLO_DEBUG((wxT("Starting selection at %ld/%ld"), cpos.x, cpos.y));
    m_Selection.m_CursorA = cpos;
    m_Selection.m_CursorB = cpos;
    m_Selection.m_ScreenA = spos;
@@ -2729,7 +2772,7 @@ wxLayoutList::ContinueSelection(const wxPoint& cposOrig, const wxPoint& spos)
 
    wxASSERT(m_Selection.m_selecting == true);
    wxASSERT(m_Selection.m_valid == false);
-   WXLO_DEBUG(("Continuing selection at %ld/%ld", cpos.x, cpos.y));
+   WXLO_DEBUG((wxT("Continuing selection at %ld/%ld"), cpos.x, cpos.y));
 
    m_Selection.m_ScreenB = spos;
    m_Selection.m_CursorB = cpos;
@@ -2741,7 +2784,7 @@ wxLayoutList::EndSelection(const wxPoint& cposOrig, const wxPoint& spos)
    wxPoint cpos(cposOrig);
    if(cpos.x == -1) cpos = m_CursorPos;
    ContinueSelection(cpos, spos);
-   WXLO_DEBUG(("Ending selection at %ld/%ld", cpos.x, cpos.y));
+   WXLO_DEBUG((wxT("Ending selection at %ld/%ld"), cpos.x, cpos.y));
    // we always want m_CursorA <= m_CursorB!
    if( m_Selection.m_CursorA > m_Selection.m_CursorB )
    {
@@ -2930,7 +2973,7 @@ wxLayoutLine *
 wxLayoutList::GetLine(CoordType index) const
 {
    wxASSERT_MSG( (0 <= index) && (index < (CoordType)m_numLines),
-                 "invalid index" );
+                 wxT("invalid index") );
 
    wxLayoutLine *line;
    CoordType n = index;
@@ -3082,7 +3125,7 @@ wxLayoutList::ApplyStyle(wxLayoutStyleInfo const &si, wxDC &dc)
 void
 wxLayoutList::Debug(void)
 {
-   WXLO_DEBUG(("Cursor is in line %d, screen pos = (%d, %d)",
+   WXLO_DEBUG((wxT("Cursor is in line %d, screen pos = (%d, %d)"),
                m_CursorLine->GetLineNumber(),
                m_CursorScreenPos.x, m_CursorScreenPos.y));
 
@@ -3182,7 +3225,7 @@ bool wxLayoutPrintout::OnPrintPage(int page)
       top = (page - 1)*m_PrintoutHeight;
       bottom = top + m_PrintoutHeight; 
 
-      WXLO_DEBUG(("OnPrintPage(%d) printing from %d to %d", page, top, 
+      WXLO_DEBUG((wxT("OnPrintPage(%d) printing from %d to %d"), page, top, 
                   bottom));
       // SetDeviceOrigin() doesn't work here, so we need to manually
       // translate all coordinates.

samples/richedit/wxllist.h

@@ -292,7 +292,7 @@ public:
    virtual wxString DebugDump(void) const;
 #endif
 
-   virtual CoordType GetLength(void) const { return strlen(m_Text.c_str()); }
+   virtual CoordType GetLength(void) const { return wxStrlen(m_Text.c_str()); }
 
    // for editing:
    wxString & GetText(void) { return m_Text; }
@@ -1273,7 +1273,7 @@ class wxLayoutDataObject : public wxCustomDataObject
 public:
    wxLayoutDataObject()
       {
-         SetFormat("application/wxlayoutlist");
+         SetFormat(wxT("application/wxlayoutlist"));
       }
 
    // type safe wrappers

samples/richedit/wxlwindow.cpp

@@ -741,8 +741,11 @@ wxLayoutWindow::OnChar(wxKeyEvent& event)
                      && m_WrapMargin > 0
                      && m_llist->GetCursorPos().x > m_WrapMargin
                      && isspace(keyCode))
+                  {
                      m_llist->WrapLine(m_WrapMargin);
-                  m_llist->Insert((char)keyCode);
+                  }
+                  
+                  m_llist->Insert((wxChar)keyCode);
                   SetDirty();
                }
                else

samples/splitter/splitter.cpp

@@ -254,14 +254,14 @@ void MyFrame::ToggleLive(wxCommandEvent& event )
 void MyFrame::SetMinSize(wxCommandEvent& WXUNUSED(event) )
 {
     wxString str;
-    str.Printf( _T(_T("%d")), m_splitter->GetMinimumPaneSize());
+    str.Printf( wxT("%d"), m_splitter->GetMinimumPaneSize());
     str = wxGetTextFromUser(_T("Enter minimal size for panes:"), _T(""), str, this);
     if ( str.IsEmpty() )
         return;
 
     int minsize = wxStrtol( str, (wxChar**)NULL, 10 );
     m_splitter->SetMinimumPaneSize(minsize);
-    str.Printf( _T(_T("Min pane size = %d")), minsize);
+    str.Printf( wxT("Min pane size = %d"), minsize);
     SetStatusText(str, 1);
 }
 

src/common/sckipc.cpp

@@ -471,7 +471,7 @@ void wxTCPEventHandler::Client_OnRequest(wxSocketEvent &event)
     data = new char[size];
     sockstrm->Read(data, size);
 
-    connection->OnExecute (topic_name, data, size, format);
+    connection->OnExecute (topic_name, (wxChar *) data, size, format);
 
     delete [] data;
     break;
@@ -488,7 +488,7 @@ void wxTCPEventHandler::Client_OnRequest(wxSocketEvent &event)
     data = new char[size];
     sockstrm->Read(data, size);
     
-    connection->OnAdvise (topic_name, item, data, size, format);
+    connection->OnAdvise (topic_name, item, (wxChar *) data, size, format);
 
     delete [] data;
     break;

src/msw/dde.cpp

@@ -734,7 +734,7 @@ _DDECallback(WORD wType,
                                            0);
                     DdeFreeDataHandle(hData);
                     if ( connection->OnExecute(connection->m_topicName,
-                                               connection->m_bufPtr,
+                                               (wxChar *) connection->m_bufPtr,
                                                (int)len,
                                                (wxIPCFormat) wFmt) )
                     {
@@ -874,7 +874,7 @@ _DDECallback(WORD wType,
                     DdeFreeDataHandle(hData);
                     if ( connection->OnAdvise(connection->m_topicName,
                                               item_name,
-                                              connection->m_bufPtr,
+                                              (wxChar *) connection->m_bufPtr,
                                               (int)len,
                                               (wxIPCFormat) wFmt) )
                     {