X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..c7426f4ca3ca80554c6360f7385741e971a96af3:/src/os2/control.cpp diff --git a/src/os2/control.cpp b/src/os2/control.cpp index 6b858be71e..d3db1d4e50 100644 --- a/src/os2/control.cpp +++ b/src/os2/control.cpp @@ -6,7 +6,7 @@ // Created: 09/17/99 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: wxWidgets licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ @@ -115,20 +115,20 @@ bool wxControl::OS2CreateControl( dwStyle |= WS_VISIBLE; wxWindow* pParent = GetParent(); - PSZ zClass; + PSZ zClass = ""; if (!pParent) return FALSE; - if ((strcmp(zClassname, "COMBOBOX")) == 0) + if ((wxStrcmp(zClassname, _T("COMBOBOX"))) == 0) zClass = WC_COMBOBOX; - else if ((strcmp(zClassname, "STATIC")) == 0) + else if ((wxStrcmp(zClassname, _T("STATIC"))) == 0) zClass = WC_STATIC; - else if ((strcmp(zClassname, "BUTTON")) == 0) + else if ((wxStrcmp(zClassname, _T("BUTTON"))) == 0) zClass = WC_BUTTON; - else if ((strcmp(zClassname, "NOTEBOOK")) == 0) + else if ((wxStrcmp(zClassname, _T("NOTEBOOK"))) == 0) zClass = WC_NOTEBOOK; - else if ((strcmp(zClassname, "CONTAINER")) == 0) + else if ((wxStrcmp(zClassname, _T("CONTAINER"))) == 0) zClass = WC_CONTAINER; dwStyle |= WS_VISIBLE; @@ -251,7 +251,7 @@ void wxControl::SetLabel( { wxString sLabel = ::wxPMTextToLabel(rsLabel); - ::WinSetWindowText(GetHwnd(), sLabel.c_str()); + ::WinSetWindowText(GetHwnd(), (PSZ)sLabel.c_str()); } // end of wxControl::SetLabel // ---------------------------------------------------------------------------