update to 2.9.0

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

diff --git a/include/wx/msw/window.h b/include/wx/msw/window.h
index 4e758ba9cdcbd0bab7c12577b0437f606ab43b5d..cd55625acd56b42b2d4fb2cff8550b605f6e5824 100644 (file)
--- a/include/wx/msw/window.h
+++ b/include/wx/msw/window.h
@@ -160,7 +160,7 @@ public:
     // that the window object is passed instead of window handle) and should
     // return true if it handled the message or false if it should be passed to
     // DefWindowProc()
     // that the window object is passed instead of window handle) and should
     // return true if it handled the message or false if it should be passed to
     // DefWindowProc()

-    typedef bool (*MSWMessageHandler)(wxWindow *win,
+    typedef bool (*MSWMessageHandler)(wxWindowMSW *win,

                                       WXUINT nMsg,
                                       WXWPARAM wParam,
                                       WXLPARAM lParam);
                                       WXUINT nMsg,
                                       WXWPARAM wParam,
                                       WXLPARAM lParam);


@@ -201,7 +201,7 @@ public:
     wxWindow *FindItemByHWND(WXHWND hWnd, bool controlOnly = false) const;
 
     // MSW only: true if this control is part of the main control
     wxWindow *FindItemByHWND(WXHWND hWnd, bool controlOnly = false) const;
 
     // MSW only: true if this control is part of the main control

-    virtual bool ContainsHWND(WXHWND WXUNUSED(hWnd)) const { return false; };
+    virtual bool ContainsHWND(WXHWND WXUNUSED(hWnd)) const { return false; }

 
 #if wxUSE_TOOLTIPS
     // MSW only: true if this window or any of its children have a tooltip
 
 #if wxUSE_TOOLTIPS
     // MSW only: true if this window or any of its children have a tooltip


@@ -317,6 +317,8 @@ public:
     bool HandleSize(int x, int y, WXUINT flag);
     bool HandleSizing(wxRect& rect);
     bool HandleGetMinMaxInfo(void *mmInfo);
     bool HandleSize(int x, int y, WXUINT flag);
     bool HandleSizing(wxRect& rect);
     bool HandleGetMinMaxInfo(void *mmInfo);

+    bool HandleEnterSizeMove();
+    bool HandleExitSizeMove();

 
     bool HandleShow(bool show, int status);
     bool HandleActivate(int flag, bool minimized, WXHWND activate);
 
     bool HandleShow(bool show, int status);
     bool HandleActivate(int flag, bool minimized, WXHWND activate);


@@ -431,6 +433,14 @@ public:
     // check if a native double-buffering applies for this window
     virtual bool IsDoubleBuffered() const;
 
     // check if a native double-buffering applies for this window
     virtual bool IsDoubleBuffered() const;
 

+    // this allows you to implement standard control borders without
+    // repeating the code in different classes that are not derived from
+    // wxControl
+    virtual wxBorder GetDefaultBorderForControl() const;
+
+    // choose the default border for this window
+    virtual wxBorder GetDefaultBorder() const;
+

     // synthesize a wxEVT_LEAVE_WINDOW event and set m_mouseInWindow to false
     void GenerateMouseLeave();
 
     // synthesize a wxEVT_LEAVE_WINDOW event and set m_mouseInWindow to false
     void GenerateMouseLeave();