X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/65f3f920ba3601249efdd84efc1a9299d80d1b4f..04fa04d8067d235ab45b5bc05b65f0679634b541:/src/os2/control.cpp?ds=sidebyside

diff --git a/src/os2/control.cpp b/src/os2/control.cpp
index 63650453c8..4b4ecbb55c 100644
--- a/src/os2/control.cpp
+++ b/src/os2/control.cpp
@@ -22,6 +22,7 @@
     #include "wx/log.h"
 #endif
 
+#include "wx/os2/dc.h"
 #include "wx/os2/private.h"
 
 IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow)
@@ -59,11 +60,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,
@@ -110,15 +106,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;
@@ -151,9 +147,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;
     }
@@ -184,7 +178,7 @@ wxSize wxControl::DoGetBestSize() const
 
 bool wxControl::ProcessCommand(wxCommandEvent& event)
 {
-    return GetEventHandler()->ProcessEvent(event);
+    return HandleWindowEvent(event);
 }
 
 WXHBRUSH wxControl::OnCtlColor(WXHDC    hWxDC,
@@ -215,7 +209,8 @@ WXHBRUSH wxControl::OnCtlColor(WXHDC    hWxDC,
 void wxControl::OnEraseBackground( wxEraseEvent& rEvent )
 {
     RECTL                           vRect;
-    HPS                             hPS = rEvent.GetDC()->GetHPS();
+    wxPMDCImpl                     *impl = (wxPMDCImpl*) rEvent.GetDC()->GetImpl();
+    HPS                             hPS = impl->GetHPS();
     SIZEL                           vSize = {0,0};
 
     ::GpiSetPS(hPS, &vSize, PU_PELS | GPIF_DEFAULT);