X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7c71eb6a2607235a29ffb29e3c39bb4f1a74fff7..afab8b85c4bdeb11a248c57d13e9bcfa14149ef8:/src/os2/control.cpp?ds=sidebyside diff --git a/src/os2/control.cpp b/src/os2/control.cpp index 0c53e236b9..50020c88b5 100644 --- a/src/os2/control.cpp +++ b/src/os2/control.cpp @@ -4,7 +4,6 @@ // Author: David Webster // Modified by: // Created: 09/17/99 -// RCS-ID: $Id$ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -60,11 +59,6 @@ bool wxControl::Create( wxWindow* pParent, return bRval; } // end of wxControl::Create -wxControl::~wxControl() -{ - m_isBeingDeleted = true; -} - bool wxControl::OS2CreateControl( const wxChar* zClassname, const wxString& rsLabel, const wxPoint& rPos, @@ -111,15 +105,15 @@ bool wxControl::OS2CreateControl( const wxChar* zClassname, if (!pParent) return false; - if ((wxStrcmp(zClassname, _T("COMBOBOX"))) == 0) + if ((wxStrcmp(zClassname, wxT("COMBOBOX"))) == 0) zClass = WC_COMBOBOX; - else if ((wxStrcmp(zClassname, _T("STATIC"))) == 0) + else if ((wxStrcmp(zClassname, wxT("STATIC"))) == 0) zClass = WC_STATIC; - else if ((wxStrcmp(zClassname, _T("BUTTON"))) == 0) + else if ((wxStrcmp(zClassname, wxT("BUTTON"))) == 0) zClass = WC_BUTTON; - else if ((wxStrcmp(zClassname, _T("NOTEBOOK"))) == 0) + else if ((wxStrcmp(zClassname, wxT("NOTEBOOK"))) == 0) zClass = WC_NOTEBOOK; - else if ((wxStrcmp(zClassname, _T("CONTAINER"))) == 0) + else if ((wxStrcmp(zClassname, wxT("CONTAINER"))) == 0) zClass = WC_CONTAINER; if ((zClass == WC_STATIC) || (zClass == WC_BUTTON)) dwStyle |= DT_MNEMONIC; @@ -152,9 +146,7 @@ bool wxControl::OS2CreateControl( const wxChar* zClassname, if ( !m_hWnd ) { -#ifdef __WXDEBUG__ wxLogError(wxT("Failed to create a control of class '%s'"), zClassname); -#endif // DEBUG return false; }