// Modified by:
// Created: 04/01/98
// RCS-ID: $Id$
-// Copyright: (c) Julian Smart and Markus Holzem
-// Licence: wxWindows license
+// Copyright: (c) Julian Smart
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// ============================================================================
#pragma hdrstop
#endif
+#if wxUSE_STATBOX
+
#ifndef WX_PRECOMP
#include "wx/app.h"
#include "wx/dcclient.h"
// wxWin macros
// ----------------------------------------------------------------------------
-#if !USE_SHARED_LIBRARY
- IMPLEMENT_DYNAMIC_CLASS(wxStaticBox, wxControl)
-#endif
+IMPLEMENT_DYNAMIC_CLASS(wxStaticBox, wxControl)
// ============================================================================
// implementation
if ( !CreateControl(parent, id, pos, size, style, wxDefaultValidator, name) )
return FALSE;
- if ( !MSWCreateControl(wxT("BUTTON"), BS_GROUPBOX, pos, size, label, 0) )
+ // as wxStaticBox doesn't draw its own background, we make it transparent
+ // to force redrawing its background which could have been overwritten by
+ // the other controls inside it
+ //
+ // FIXME: I still think that it isn't the right solution because the static
+ // boxes shouldn't have to be transparent if the redrawing was done
+ // right elsewhere - who ever had to make them transparent in non
+ // wxWindows programs, after all? But for now it does fix a serious
+ // problem (try resizing the sizers test screen in the layout sample
+ // after removing WS_EX_TRANSPARENT bit) and so let's use it until
+ // we fix the real underlying problem
+ if ( !MSWCreateControl(wxT("BUTTON"), BS_GROUPBOX, pos, size, label,
+ WS_EX_TRANSPARENT) )
return FALSE;
+ // to be transparent we should have the same colour as the parent as well
+ SetBackgroundColour(GetParent()->GetBackgroundColour());
+
return TRUE;
}
return wxSize(wBox, hBox);
}
-WXHBRUSH wxStaticBox::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
- WXUINT message,
- WXWPARAM wParam,
- WXLPARAM lParam)
-{
-#if wxUSE_CTL3D
- if ( m_useCtl3D )
- {
- HBRUSH hbrush = Ctl3dCtlColorEx(message, wParam, lParam);
- return (WXHBRUSH) hbrush;
- }
-#endif // wxUSE_CTL3D
-
- HDC hdc = (HDC)pDC;
- if (GetParent()->GetTransparentBackground())
- SetBkMode(hdc, TRANSPARENT);
- else
- SetBkMode(hdc, OPAQUE);
-
- const wxColour& colBack = GetBackgroundColour();
- ::SetBkColor(hdc, wxColourToRGB(colBack));
- ::SetTextColor(hdc, wxColourToRGB(GetForegroundColour()));
-
- wxBrush *brush = wxTheBrushList->FindOrCreateBrush(colBack, wxSOLID);
-
- return (WXHBRUSH)brush->GetResourceHandle();
-}
-
long wxStaticBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
{
switch ( nMsg )
}
break;
- // VZ: I will remove (or change) this soon... (15.11.99)
-#if 0
case WM_ERASEBKGND:
// prevent wxControl from processing this message because it will
// erase the background incorrectly and there is no way for us to
// without painting over other controls - and if we don't,
// wxControl still gets it)
return MSWDefWindowProc(nMsg, wParam, lParam);
-#endif
}
return wxControl::MSWWindowProc(nMsg, wParam, lParam);
}
+#endif // wxUSE_STATBOX