Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove MSWGetFocusHwnd() helper

Browse Source 
It doesn't seem worth having it when it's only used in a couple of
places in a single file, unlike GetHwnd() which is used in dozens of
places across entire wxMSW.
This commit is contained in:
Vadim Zeitlin
2019-10-31 23:56:55 +01:00
parent bfde3d3e08
commit 96da0060ca
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/wx/msw/private.h
View File

@@ -838,7 +838,6 @@ private:
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
#define GetHwnd() ((HWND)GetHWND()) #define GetHwnd() ((HWND)GetHWND())
#define MSWGetFocusHwnd() ((HWND)MSWGetFocusHWND())
#define GetHwndOf(win) ((HWND)((win)->GetHWND())) #define GetHwndOf(win) ((HWND)((win)->GetHWND()))
// old name // old name
#define GetWinHwnd GetHwndOf #define GetWinHwnd GetHwndOf

4
src/msw/window.cpp
View File

@@ -577,7 +577,7 @@ void wxWindowMSW::SetId(wxWindowID winid)
void wxWindowMSW::SetFocus() void wxWindowMSW::SetFocus()
{ {
HWND hWnd = MSWGetFocusHwnd(); HWND hWnd = (HWND)MSWGetFocusHWND();
wxCHECK_RET( hWnd, wxT("can't set focus to invalid window") ); wxCHECK_RET( hWnd, wxT("can't set focus to invalid window") );
::SetLastError(0); ::SetLastError(0);
@@ -599,7 +599,7 @@ void wxWindowMSW::SetFocus()
void wxWindowMSW::SetFocusFromKbd() void wxWindowMSW::SetFocusFromKbd()
{ {
HWND hWnd = MSWGetFocusHwnd(); HWND hWnd = (HWND)MSWGetFocusHWND();
// when the focus is given to the control with DLGC_HASSETSEL style from // when the focus is given to the control with DLGC_HASSETSEL style from
// keyboard its contents should be entirely selected: this is what // keyboard its contents should be entirely selected: this is what