X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3f2711d5c119962a9fcb7198ebf351930d646e23..f0f4301209cc58eb5562be289f49bf0fb9e7d6b8:/src/msw/statbox.cpp diff --git a/src/msw/statbox.cpp b/src/msw/statbox.cpp index 2c150f4866..2a622955cb 100644 --- a/src/msw/statbox.cpp +++ b/src/msw/statbox.cpp @@ -5,8 +5,8 @@ // 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 ///////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -17,7 +17,7 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "statbox.h" #endif @@ -28,6 +28,8 @@ #pragma hdrstop #endif +#if wxUSE_STATBOX + #ifndef WX_PRECOMP #include "wx/app.h" #include "wx/dcclient.h" @@ -41,13 +43,56 @@ // wxWin macros // ---------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARY +#if wxUSE_EXTENDED_RTTI +WX_DEFINE_FLAGS( wxStaticBoxStyle ) + +wxBEGIN_FLAGS( wxStaticBoxStyle ) + // new style border flags, we put them first to + // use them for streaming out + wxFLAGS_MEMBER(wxBORDER_SIMPLE) + wxFLAGS_MEMBER(wxBORDER_SUNKEN) + wxFLAGS_MEMBER(wxBORDER_DOUBLE) + wxFLAGS_MEMBER(wxBORDER_RAISED) + wxFLAGS_MEMBER(wxBORDER_STATIC) + wxFLAGS_MEMBER(wxBORDER_NONE) + + // old style border flags + wxFLAGS_MEMBER(wxSIMPLE_BORDER) + wxFLAGS_MEMBER(wxSUNKEN_BORDER) + wxFLAGS_MEMBER(wxDOUBLE_BORDER) + wxFLAGS_MEMBER(wxRAISED_BORDER) + wxFLAGS_MEMBER(wxSTATIC_BORDER) + wxFLAGS_MEMBER(wxBORDER) + + // standard window styles + wxFLAGS_MEMBER(wxTAB_TRAVERSAL) + wxFLAGS_MEMBER(wxCLIP_CHILDREN) + wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW) + wxFLAGS_MEMBER(wxWANTS_CHARS) + wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE) + wxFLAGS_MEMBER(wxALWAYS_SHOW_SB ) + wxFLAGS_MEMBER(wxVSCROLL) + wxFLAGS_MEMBER(wxHSCROLL) + +wxEND_FLAGS( wxStaticBoxStyle ) + +IMPLEMENT_DYNAMIC_CLASS_XTI(wxStaticBox, wxControl,"wx/statbox.h") + +wxBEGIN_PROPERTIES_TABLE(wxStaticBox) + wxPROPERTY( Label,wxString, SetLabel, GetLabel, wxString() , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) + wxPROPERTY_FLAGS( WindowStyle , wxStaticBoxStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style +/* + TODO PROPERTIES : + label +*/ +wxEND_PROPERTIES_TABLE() + +wxBEGIN_HANDLERS_TABLE(wxStaticBox) +wxEND_HANDLERS_TABLE() + +wxCONSTRUCTOR_6( wxStaticBox , wxWindow* , Parent , wxWindowID , Id , wxString , Label , wxPoint , Position , wxSize , Size , long , WindowStyle ) +#else IMPLEMENT_DYNAMIC_CLASS(wxStaticBox, wxControl) - -BEGIN_EVENT_TABLE(wxStaticBox, wxControl) - EVT_ERASE_BACKGROUND(wxStaticBox::OnEraseBackground) -END_EVENT_TABLE() - #endif // ============================================================================ @@ -69,15 +114,33 @@ bool wxStaticBox::Create(wxWindow *parent, if ( !CreateControl(parent, id, pos, size, style, wxDefaultValidator, name) ) return FALSE; - if ( !MSWCreateControl(wxT("BUTTON"), BS_GROUPBOX) ) + // 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, +#ifdef __WXWINCE__ + 0 +#else + WS_EX_TRANSPARENT +#endif + ) ) return FALSE; - SetSize(pos.x, pos.y, size.x, size.y); + // to be transparent we should have the same colour as the parent as well + SetBackgroundColour(GetParent()->GetBackgroundColour()); return TRUE; } -wxSize wxStaticBox::DoGetBestSize() +wxSize wxStaticBox::DoGetBestSize() const { int cx, cy; wxGetCharSize(GetHWND(), &cx, &cy, &GetFont()); @@ -91,87 +154,38 @@ wxSize wxStaticBox::DoGetBestSize() 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(); -} - -// VZ: this is probably the most commented function in wxWindows, but I still -// don't understand what it does and why. Wouldn't it be better to _never_ -// erase the background here? What would we lose if we didn't do it? -// (FIXME) - -// Shouldn't erase the whole window, since the static box must only paint its -// 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(GetHwndOf(parent), GWL_STYLE) & WS_CLIPCHILDREN) ) - { - // TODO: May in fact need to generate a paint event for inside this - // control's rectangle, otherwise all controls are going to be clipped - - // ugh. - - // let wxControl::OnEraseBackground() do the job - event.Skip(); - } - //else: do *not* call event.Skip() or wxControl will erase the background -} - long wxStaticBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) { - if ( nMsg == WM_NCHITTEST) + switch ( nMsg ) { - 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; +#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