X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ee4f8c2af9c6c5458e488db10aef7d00a89ace25..9406d962ccf50d63f163896a2dd94123a2a8664a:/src/msw/tabctrl.cpp?ds=sidebyside diff --git a/src/msw/tabctrl.cpp b/src/msw/tabctrl.cpp index df6dc39552..cec9af4086 100644 --- a/src/msw/tabctrl.cpp +++ b/src/msw/tabctrl.cpp @@ -145,15 +145,15 @@ void wxTabCtrl::Command(wxCommandEvent& event) { } -bool wxTabCtrl::MSWCommand(const WXUINT cmd, const WXWORD id) +bool wxTabCtrl::MSWCommand(WXUINT cmd, WXWORD id) { return FALSE; } -bool wxTabCtrl::MSWNotify(const WXWPARAM wParam, const WXLPARAM lParam) +bool wxTabCtrl::MSWNotify(WXWPARAM wParam, WXLPARAM lParam) { - wxTabEvent event(0, m_windowId); - int eventType = 0; + wxTabEvent event(wxEVT_NULL, m_windowId); + wxEventType eventType = wxEVT_NULL; NMHDR* hdr1 = (NMHDR*) lParam; switch ( hdr1->code ) { @@ -228,6 +228,12 @@ int wxTabCtrl::GetSelection() const return (int) TabCtrl_GetCurSel( (HWND) GetHWND() ); } +// Get the tab with the current keyboard focus +int wxTabCtrl::GetCurFocus() const +{ + return (int) TabCtrl_GetCurFocus( (HWND) GetHWND() ); +} + // Get the associated image list wxImageList* wxTabCtrl::GetImageList() const { @@ -471,7 +477,7 @@ void wxMapBitmap(HBITMAP hBitmap, int width, int height) // Tab event IMPLEMENT_DYNAMIC_CLASS(wxTabEvent, wxCommandEvent) -wxTabEvent::wxTabEvent(WXTYPE commandType, int id): +wxTabEvent::wxTabEvent(wxEventType commandType, int id): wxCommandEvent(commandType, id) { }