globally renamed uint to size_t. This has _not_ been checked under Windows,

[wxWidgets.git] / src / msw / statbox.cpp

diff --git a/src/msw/statbox.cpp b/src/msw/statbox.cpp
index ae58e8f769095305d5a681f377db6db835e4866d..15bbd1c5f787d36a8a180d3c0a1873c0d85420b6 100644 (file)
--- a/src/msw/statbox.cpp
+++ b/src/msw/statbox.cpp
@@ -117,6 +117,8 @@ void wxStaticBox::SetSize(int x, int y, int width, int height, int sizeFlags)
   if (y == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
     y1 = currentY;
 
+  AdjustForParentClientOrigin(x1, y1, sizeFlags);
+
   // If we're prepared to use the existing size, then...
   if (width == -1 && height == -1 && ((sizeFlags & wxSIZE_AUTO) != wxSIZE_AUTO))
   {
@@ -211,20 +213,6 @@ void wxStaticBox::OnEraseBackground(wxEraseEvent& event)
 
 long wxStaticBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
 {
-       // TODO: somehow, this has to accept mouse clicks in user interface edit mode,
-       // but not otherwise. Only there is no longer a UI edit mode...
-
-       // It worked before because the message could be processed if not in UI
-       // edit mode. We have to find some way of distinguishing this.
-       // Maybe this class can have an AcceptMouseEvents(bool) function; a sort of
-       // kludge... or, we can search for an active event table entry that will
-       // intercept mouse events, and if one exists (that isn't the default),
-       // skip the code below. Too time consuming though.
-       // Perhaps it's ok to do the default thing *anyway* because the title or edge
-       // of the window may still be active!
-//     if (nMsg == WM_NCHITTEST)
-//            return Default();
-
        if (nMsg == WM_NCHITTEST)
     {
         int xPos = LOWORD(lParam);  // horizontal position of cursor