#include "wx/log.h"
#endif
+#include "wx/os2/dc.h"
#include "wx/os2/private.h"
IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow)
return bRval;
} // end of wxControl::Create
-wxControl::~wxControl()
-{
- m_isBeingDeleted = true;
-}
-
bool wxControl::OS2CreateControl( const wxChar* zClassname,
const wxString& rsLabel,
const wxPoint& rPos,
dwStyle &= ~WS_CLIPSIBLINGS;
m_hWnd = (WXHWND)::WinCreateWindow( (HWND)GetHwndOf(pParent) // Parent window handle
- ,(PSZ)zClass // Window class
- ,(PSZ)label.c_str() // Initial Text
+ ,zClass // Window class
+ ,label.c_str() // Initial Text
,(ULONG)dwStyle // Style flags
,(LONG)0 // X pos of origin
,(LONG)0 // Y pos of origin
bool wxControl::ProcessCommand(wxCommandEvent& event)
{
- return GetEventHandler()->ProcessEvent(event);
+ return HandleWindowEvent(event);
}
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);
{
long dwStyle = wxWindow::OS2GetStyle( lStyle, pdwExstyle );
- if (AcceptsFocus())
+ if (AcceptsFocusFromKeyboard())
{
dwStyle |= WS_TABSTOP;
}
label = ::wxPMTextToLabel(m_label);
else
label = m_label;
- ::WinSetWindowText(GetHwnd(), (PSZ)label.c_str());
+ ::WinSetWindowText(GetHwnd(), label.c_str());
}
} // end of wxControl::SetLabel