X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..e47ce385a75d78babaaac68d47d6f4dd5230a31c:/src/os2/control.cpp diff --git a/src/os2/control.cpp b/src/os2/control.cpp index df264fae88..d3db1d4e50 100644 --- a/src/os2/control.cpp +++ b/src/os2/control.cpp @@ -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 // ---------------------------------------------------------------------------