X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a047aff270905b377a81657a90f92eb3297157d0..9d5507f7a2701395e1d5c121bd877bb9066ee6ea:/src/msw/control.cpp diff --git a/src/msw/control.cpp b/src/msw/control.cpp index 2f1ae919e7..fa9989fb1c 100644 --- a/src/msw/control.cpp +++ b/src/msw/control.cpp @@ -226,11 +226,6 @@ bool wxControl::MSWCreateControl(const wxChar *classname, // various accessors // ---------------------------------------------------------------------------- -wxBorder wxControl::GetDefaultBorder() const -{ - return GetDefaultBorderForControl(); -} - WXDWORD wxControl::MSWGetStyle(long style, WXDWORD *exstyle) const { long msStyle = wxWindow::MSWGetStyle(style, exstyle); @@ -248,6 +243,11 @@ wxSize wxControl::DoGetBestSize() const return wxSize(DEFAULT_ITEM_WIDTH, DEFAULT_ITEM_HEIGHT); } +wxBorder wxControl::GetDefaultBorder() const +{ + return wxControlBase::GetDefaultBorder(); +} + // This is a helper for all wxControls made with UPDOWN native control. // In wxMSW it was only wxSpinCtrl derived from wxSpinButton but in // WinCE of Smartphones this happens also for native wxTextCtrl, @@ -315,7 +315,7 @@ wxControl::GetCompositeControlsDefaultAttributes(wxWindowVariant WXUNUSED(varian bool wxControl::ProcessCommand(wxCommandEvent& event) { - return GetEventHandler()->ProcessEvent(event); + return HandleWindowEvent(event); } bool wxControl::MSWOnNotify(int idCtrl, @@ -363,7 +363,7 @@ bool wxControl::MSWOnNotify(int idCtrl, event.SetEventType(eventType); event.SetEventObject(this); - return GetEventHandler()->ProcessEvent(event); + return HandleWindowEvent(event); } WXHBRUSH wxControl::DoMSWControlColor(WXHDC pDC, wxColour colBg, WXHWND hWnd)