trying to resolve GSocketManager API mess: the meaning of Install/Uninstall_Callback...

[wxWidgets.git] / include / wx / msw / private.h

diff --git a/include/wx/msw/private.h b/include/wx/msw/private.h
index 0c5c99ed2c409110020fcb198dad75f626c8b191..146d2d3a372cc67fd389931bc4818b850c511465 100644 (file)
--- a/include/wx/msw/private.h
+++ b/include/wx/msw/private.h
@@ -904,17 +904,17 @@ inline bool wxStyleHasBorder(long style)
                      wxSUNKEN_BORDER | wxDOUBLE_BORDER)) != 0;
 }
 
-inline long wxGetWindowExStyle(const wxWindow *win)
+inline long wxGetWindowExStyle(const wxWindowMSW *win)
 {
     return ::GetWindowLong(GetHwndOf(win), GWL_EXSTYLE);
 }
 
-inline bool wxHasWindowExStyle(const wxWindow *win, long style)
+inline bool wxHasWindowExStyle(const wxWindowMSW *win, long style)
 {
     return (wxGetWindowExStyle(win) & style) != 0;
 }
 
-inline long wxSetWindowExStyle(const wxWindow *win, long style)
+inline long wxSetWindowExStyle(const wxWindowMSW *win, long style)
 {
     return ::SetWindowLong(GetHwndOf(win), GWL_EXSTYLE, style);
 }
@@ -930,7 +930,7 @@ extern WXDLLIMPEXP_CORE wxWindow* wxFindWinFromHandle(HWND hwnd);
 // without STRICT WXHWND is the same as HWND anyhow
 inline wxWindow* wxFindWinFromHandle(WXHWND hWnd)
 {
-    return wxFindWinFromHandle(wx_static_cast(HWND, hWnd));
+    return wxFindWinFromHandle(static_cast<HWND>(hWnd));
 }
 
 // find the window for HWND which is part of some wxWindow, i.e. unlike