X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fa9a4f7f81724bb57b916968005dbca7913da841..0912690b65b3c58c0e12870fb971675ca5572ae6:/include/wx/msw/window.h

diff --git a/include/wx/msw/window.h b/include/wx/msw/window.h
index d266161df1..fe646444e4 100644
--- a/include/wx/msw/window.h
+++ b/include/wx/msw/window.h
@@ -21,9 +21,6 @@
     #pragma interface "window.h"
 #endif
 
-// for HANDLE
-#include "wx/msw/wrapwin.h"
-
 // [at least] some version of Windows send extra mouse move messages after
 // a mouse click or a key press - to temporarily fix this problem, set the
 // define below to 1
@@ -177,10 +174,6 @@ public:
 #endif
 
 public:
-    // For implementation purposes - sometimes decorations make the client area
-    // smaller
-    virtual wxPoint GetClientAreaOrigin() const;
-
     // Windows subclassing
     void SubclassWin(WXHWND hWnd);
     void UnsubclassWin();
@@ -414,6 +407,9 @@ public:
     // check if mouse is in the window
     bool IsMouseInWindow() const;
 
+    // synthesize a wxEVT_LEAVE_WINDOW event and set m_mouseInWindow to false
+    void GenerateMouseLeave();
+
     // virtual function for implementing internal idle
     // behaviour
     virtual void OnInternalIdle() ;
@@ -477,6 +473,11 @@ protected:
     wxKeyEvent CreateKeyEvent(wxEventType evType, int id,
                               WXLPARAM lParam = 0, WXWPARAM wParam = 0) const;
 
+
+    // default OnEraseBackground() implementation, return true if we did erase
+    // the background, false otherwise
+    bool DoEraseBackground(wxDC& dc);
+
 private:
     // common part of all ctors
     void Init();
@@ -497,7 +498,7 @@ private:
     unsigned int m_frozenness;
 
     // current defer window position operation handle (may be NULL)
-    HANDLE m_hDWP;
+    WXHANDLE m_hDWP;
 
 
     DECLARE_DYNAMIC_CLASS(wxWindowMSW)