X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/debe6624c1e9d4bf3243381153d1e173c849bcd8..e5403d7c573d45fcfef73959c41fda93aea1d07f:/src/msw/statbox.cpp

diff --git a/src/msw/statbox.cpp b/src/msw/statbox.cpp
index ae58e8f769..63ddabb570 100644
--- a/src/msw/statbox.cpp
+++ b/src/msw/statbox.cpp
@@ -52,8 +52,8 @@ bool wxStaticBox::Create(wxWindow *parent, wxWindowID id,
 
   if (parent) parent->AddChild(this);
 
-  SetBackgroundColour(parent->GetDefaultBackgroundColour()) ;
-  SetForegroundColour(parent->GetDefaultForegroundColour()) ;
+  SetBackgroundColour(parent->GetBackgroundColour()) ;
+  SetForegroundColour(parent->GetForegroundColour()) ;
 
   if ( id == -1 )
   	m_windowId = (int)NewControlId();
@@ -117,30 +117,30 @@ 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))
   {
     GetSize(&w1, &h1);
   }
 
-  char buf[300];
-
   int current_width;
 
   int cx;
   int cy;
   int cyf;
 
-  HWND button = (HWND)m_hWnd;
   wxGetCharSize(GetHWND(), &cx, &cy,GetFont());
 
-  GetWindowText(button, buf, 300);
-  GetTextExtent(buf, &current_width, &cyf,NULL,NULL,GetFont());
-  if (w1 < 0)
-   w1 = (int)(current_width + 3*cx) ;
-  if (h1<0)
-    h1 = (int)(cyf*EDIT_CONTROL_FACTOR) ;
-  MoveWindow(button, x1, y1, w1, h1, TRUE);
+  GetTextExtent(wxGetWindowText(m_hWnd), &current_width, &cyf,
+                NULL,NULL,GetFont());
+  if ( w1 < 0 )
+   w1 = current_width + 3*cx;
+  if ( h1 < 0 )
+    h1 = EDIT_HEIGHT_FROM_CHAR_HEIGHT(cyf);
+
+  MoveWindow((HWND)m_hWnd, x1, y1, w1, h1, TRUE);
 }
 
 WXHBRUSH wxStaticBox::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
@@ -211,20 +211,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