don't set background colour explicitely; no need to handle WM_ERASEBKGND ourselves...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30642 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/msw/statbox.h b/include/wx/msw/statbox.h
index 169f95e25d6e8d28726cd6ad7fa8dacee7c2b93a..06956d91b545af86f62d64440a6f89afe68b2f25 100644 (file)
--- a/include/wx/msw/statbox.h
+++ b/include/wx/msw/statbox.h
@@ -39,14 +39,6 @@ public:
                 long style = 0,
                 const wxString& name = wxStaticBoxNameStr);
 
-    // implementation from now on
-    // --------------------------
-
-    virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
-
-    // overriden base class virtuals
-    virtual bool AcceptsFocus() const { return false; }
-
 protected:
     virtual wxSize DoGetBestSize() const;
 

diff --git a/src/msw/statbox.cpp b/src/msw/statbox.cpp
index aff9a05e6856c18a4842c0915f4fae9bc188bcff..969ce69949d0c9a0dc050a5e7950761a34e3e966 100644 (file)
--- a/src/msw/statbox.cpp
+++ b/src/msw/statbox.cpp
@@ -134,9 +134,6 @@ bool wxStaticBox::Create(wxWindow *parent,
                            ) )
         return false;
 
-    // to be transparent we should have the same colour as the parent as well
-    SetBackgroundColour(GetParent()->GetBackgroundColour());
-
     return true;
 }
 
@@ -154,38 +151,4 @@ wxSize wxStaticBox::DoGetBestSize() const
     return wxSize(wBox, hBox);
 }
 
-WXLRESULT wxStaticBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
-{
-    switch ( nMsg )
-    {
-#ifndef __WXWINCE__
-        case WM_NCHITTEST:
-            // FIXME: this hack is specific to dialog ed, shouldn't it be
-            //        somehow disabled during normal operation?
-            {
-                int xPos = LOWORD(lParam);  // horizontal position of cursor
-                int yPos = HIWORD(lParam);  // vertical position of cursor
-
-                ScreenToClient(&xPos, &yPos);
-
-                // Make sure you can drag by the top of the groupbox, but let
-                // other (enclosed) controls get mouse events also
-                if ( yPos < 10 )
-                    return (long)HTCLIENT;
-            }
-            break;
-#endif
-        case WM_ERASEBKGND:
-            // prevent wxControl from processing this message because it will
-            // erase the background incorrectly and there is no way for us to
-            // override this at wxWin event level (if we do process the event,
-            // we don't know how to do it properly - paint the background
-            // without painting over other controls - and if we don't,
-            // wxControl still gets it)
-            return MSWDefWindowProc(nMsg, wParam, lParam);
-    }
-
-    return wxControl::MSWWindowProc(nMsg, wParam, lParam);
-}
-
 #endif // wxUSE_STATBOX