X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e70b4f10951f806a7b6cf7e65317a21421e2f3a6..5f3565a2fb3d678b03cf8547f37e56b1efe786f5:/src/msw/statbox.cpp diff --git a/src/msw/statbox.cpp b/src/msw/statbox.cpp index d17de195f8..6cd10ee393 100644 --- a/src/msw/statbox.cpp +++ b/src/msw/statbox.cpp @@ -36,9 +36,15 @@ #endif #include "wx/statbox.h" +#include "wx/notebook.h" #include "wx/msw/private.h" +// this is for Win CE +#ifndef WS_EX_TRANSPARENT + #define WS_EX_TRANSPARENT 0 +#endif + // ---------------------------------------------------------------------------- // wxWin macros // ---------------------------------------------------------------------------- @@ -46,51 +52,51 @@ #if wxUSE_EXTENDED_RTTI WX_DEFINE_FLAGS( wxStaticBoxStyle ) -WX_BEGIN_FLAGS( wxStaticBoxStyle ) +wxBEGIN_FLAGS( wxStaticBoxStyle ) // new style border flags, we put them first to // use them for streaming out - WX_FLAGS_MEMBER(wxBORDER_SIMPLE) - WX_FLAGS_MEMBER(wxBORDER_SUNKEN) - WX_FLAGS_MEMBER(wxBORDER_DOUBLE) - WX_FLAGS_MEMBER(wxBORDER_RAISED) - WX_FLAGS_MEMBER(wxBORDER_STATIC) - WX_FLAGS_MEMBER(wxBORDER_NONE) - + 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 - WX_FLAGS_MEMBER(wxSIMPLE_BORDER) - WX_FLAGS_MEMBER(wxSUNKEN_BORDER) - WX_FLAGS_MEMBER(wxDOUBLE_BORDER) - WX_FLAGS_MEMBER(wxRAISED_BORDER) - WX_FLAGS_MEMBER(wxSTATIC_BORDER) - WX_FLAGS_MEMBER(wxNO_BORDER) + 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 - WX_FLAGS_MEMBER(wxTAB_TRAVERSAL) - WX_FLAGS_MEMBER(wxCLIP_CHILDREN) - WX_FLAGS_MEMBER(wxTRANSPARENT_WINDOW) - WX_FLAGS_MEMBER(wxWANTS_CHARS) - WX_FLAGS_MEMBER(wxNO_FULL_REPAINT_ON_RESIZE) - WX_FLAGS_MEMBER(wxALWAYS_SHOW_SB ) - WX_FLAGS_MEMBER(wxVSCROLL) - WX_FLAGS_MEMBER(wxHSCROLL) + 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) -WX_END_FLAGS( wxStaticBoxStyle ) +wxEND_FLAGS( wxStaticBoxStyle ) IMPLEMENT_DYNAMIC_CLASS_XTI(wxStaticBox, wxControl,"wx/statbox.h") -WX_BEGIN_PROPERTIES_TABLE(wxStaticBox) - WX_PROPERTY( Label,wxString, SetLabel, GetLabel, wxString() , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) - WX_PROPERTY_FLAGS( WindowStyle , wxStaticBoxStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style +wxBEGIN_PROPERTIES_TABLE(wxStaticBox) + wxPROPERTY( Label,wxString, SetLabel, GetLabel, wxString() , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) + wxPROPERTY_FLAGS( WindowStyle , wxStaticBoxStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE, 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style /* - TODO PROPERTIES : - label + TODO PROPERTIES : + label */ -WX_END_PROPERTIES_TABLE() +wxEND_PROPERTIES_TABLE() -WX_BEGIN_HANDLERS_TABLE(wxStaticBox) -WX_END_HANDLERS_TABLE() +wxBEGIN_HANDLERS_TABLE(wxStaticBox) +wxEND_HANDLERS_TABLE() -WX_CONSTRUCTOR_6( wxStaticBox , wxWindow* , Parent , wxWindowID , Id , wxString , Label , wxPoint , Position , wxSize , Size , long , WindowStyle ) +wxCONSTRUCTOR_6( wxStaticBox , wxWindow* , Parent , wxWindowID , Id , wxString , Label , wxPoint , Position , wxSize , Size , long , WindowStyle ) #else IMPLEMENT_DYNAMIC_CLASS(wxStaticBox, wxControl) #endif @@ -112,38 +118,19 @@ bool wxStaticBox::Create(wxWindow *parent, const wxString& name) { if ( !CreateControl(parent, id, pos, size, style, wxDefaultValidator, name) ) - return FALSE; + return false; - // 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; - - // to be transparent we should have the same colour as the parent as well - SetBackgroundColour(GetParent()->GetBackgroundColour()); + WS_EX_TRANSPARENT) ) + return false; - return TRUE; + return true; } wxSize wxStaticBox::DoGetBestSize() const { int cx, cy; - wxGetCharSize(GetHWND(), &cx, &cy, &GetFont()); + wxGetCharSize(GetHWND(), &cx, &cy, GetFont()); int wBox; GetTextExtent(wxGetWindowText(m_hWnd), &wBox, &cy); @@ -154,38 +141,18 @@ wxSize wxStaticBox::DoGetBestSize() const return wxSize(wBox, hBox); } -long wxStaticBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) +WXHBRUSH +wxStaticBox::MSWGetBgBrushForSelf(wxWindow *parent, WXHDC WXUNUSED(pDC)) { - 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); + // we can't use pattern brushes because, apparently, the window proc of our + // class does something which invalidates the brush origin before drawing + // with it and so any patetrn brush is used incorrectly as can be seen by + // putting a static box inside a (themed) notebook + // + // so always use solid brush for painting the background (note that this + // only applies to the background of the box label, not the insides of the + // box itself) + return parent->MSWGetSolidBgBrushForChild(this); } #endif // wxUSE_STATBOX