Corrected memory.cpp compilation error; Cygwin makefile uses generic wxDirDlg

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

diff --git a/src/msw/statbox.cpp b/src/msw/statbox.cpp
index b943131324d6234294f085982b9810415cc3b4e0..eb82270972f24a35402388ca42ec610053aa0823 100644 (file)
--- a/src/msw/statbox.cpp
+++ b/src/msw/statbox.cpp
@@ -41,19 +41,19 @@ END_EVENT_TABLE()
  * Group box
  */
  
-bool wxStaticBox::Create(wxWindow *parent, const wxWindowID id,
+bool wxStaticBox::Create(wxWindow *parent, wxWindowID id,
            const wxString& label,
            const wxPoint& pos,
            const wxSize& size,
-           const long style,
+           long style,
            const wxString& name)
 {
   SetName(name);
 
   if (parent) parent->AddChild(this);
 
-  SetBackgroundColour(parent->GetDefaultBackgroundColour()) ;
-  SetForegroundColour(parent->GetDefaultForegroundColour()) ;
+  SetBackgroundColour(parent->GetBackgroundColour()) ;
+  SetForegroundColour(parent->GetForegroundColour()) ;
 
   if ( id == -1 )
        m_windowId = (int)NewControlId();
@@ -89,7 +89,7 @@ bool wxStaticBox::Create(wxWindow *parent, const wxWindowID id,
   // Subclass again for purposes of dialog editing mode
   SubclassWin(GetHWND());
 
-  SetFont(* parent->GetFont());
+  SetFont(parent->GetFont());
 
   SetSize(x, y, width, height);
   ShowWindow(wx_button, SW_SHOW);
@@ -102,7 +102,7 @@ void wxStaticBox::SetLabel(const wxString& label)
   SetWindowText((HWND)m_hWnd, (const char *)label);
 }
 
-void wxStaticBox::SetSize(const int x, const int y, const int width, const int height, const int sizeFlags)
+void wxStaticBox::SetSize(int x, int y, int width, int height, int sizeFlags)
 {
   int currentX, currentY;
   GetPosition(&currentX, &currentY);
@@ -117,41 +117,33 @@ void wxStaticBox::SetSize(const int x, const int y, const int width, const int h
   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];
-
-  float current_width;
+  int current_width;
 
   int cx;
   int cy;
-  float 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);
-
-#if WXWIN_COMPATIBILITY
-  GetEventHandler()->OldOnSize(width, height);
-#else
-  wxSizeEvent event(wxSize(width, height), m_windowId);
-  event.eventObject = this;
-  GetEventHandler()->ProcessEvent(event);
-#endif
+  int cyf;
+
+  wxGetCharSize(GetHWND(), &cx, &cy, & GetFont());
+
+  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(const WXHDC pDC, const WXHWND pWnd, const WXUINT nCtlColor,
+WXHBRUSH wxStaticBox::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
                        WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
 {
 #if CTL3D
@@ -182,6 +174,21 @@ WXHBRUSH wxStaticBox::OnCtlColor(const WXHDC pDC, const WXHWND pWnd, const WXUIN
 // outline.
 void wxStaticBox::OnEraseBackground(wxEraseEvent& event)
 {
+    // If we don't have this (call Default()), we don't paint the background properly.
+    // If we do have this, we seem to overwrite enclosed controls.
+    // Is it the WS_CLIPCHILDREN style that's causing the problems?
+    // Probably - without this style, the background of the window will show through,
+    // so the control doesn't have to paint it. The window background will always be
+    // painted before all other controls, therefore there are no problems with
+    // controls being hidden by the static box.
+    // So, if we could specify wxCLIP_CHILDREN in window, or not, we could optimise painting better.
+    // We would assume wxCLIP_CHILDREN in a frame and a scrolled window, but not in a panel.
+    // Is this too platform-specific?? What else can we do? Not a lot, since we have to pass
+    // this information from arbitrary wxWindow derivatives, and it depends on what you wish to
+    // do with the windows.
+    // Alternatively, just make sure that wxStaticBox is always at the back! There are probably
+    // few other circumstances where it matters about child clipping. But what about painting onto
+    // to panel, inside a groupbox? Doesn't appear, because the box wipes it out.
   wxWindow *parent = GetParent();
   if ( parent && parent->GetHWND() && (::GetWindowLong((HWND) parent->GetHWND(), GWL_STYLE) & WS_CLIPCHILDREN) )
   {
@@ -204,19 +211,18 @@ 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();
+    {
+        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;
+    }
 
        return wxControl::MSWWindowProc(nMsg, wParam, lParam);
 }