X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/65f3f920ba3601249efdd84efc1a9299d80d1b4f..26f7724c4b03d6d75f8aa80d6cd2b5099ac32ea1:/src/os2/control.cpp diff --git a/src/os2/control.cpp b/src/os2/control.cpp index 63650453c8..4bbf875564 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, @@ -184,7 +180,7 @@ wxSize wxControl::DoGetBestSize() const bool wxControl::ProcessCommand(wxCommandEvent& event) { - return GetEventHandler()->ProcessEvent(event); + return HandleWindowEvent(event); } WXHBRUSH wxControl::OnCtlColor(WXHDC hWxDC, @@ -215,7 +211,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);