X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ad81651f00edc6f489d9b6a0839d316a964fd521..1d6560d796aefb5dbdf217109767b1054c68c291:/src/msw/statbox.cpp diff --git a/src/msw/statbox.cpp b/src/msw/statbox.cpp index f08e16db70..aff9a05e68 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,7 +43,57 @@ // wxWin macros // ---------------------------------------------------------------------------- - IMPLEMENT_DYNAMIC_CLASS(wxStaticBox, wxControl) +#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 , EMPTY_MACROVALUE, 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) +#endif // ============================================================================ // implementation @@ -59,19 +111,39 @@ bool wxStaticBox::Create(wxWindow *parent, long style, const wxString& name) { - if ( !CreateControl(parent, id, pos, size, style, name) ) - return FALSE; + if ( !CreateControl(parent, id, pos, size, style, wxDefaultValidator, name) ) + 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 + // wxWidgets 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; - if ( !MSWCreateControl(wxT("BUTTON"), BS_GROUPBOX, pos, size, label, 0) ) - return FALSE; + // to be transparent we should have the same colour as the parent as well + SetBackgroundColour(GetParent()->GetBackgroundColour()); - 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); @@ -82,10 +154,11 @@ wxSize wxStaticBox::DoGetBestSize() const return wxSize(wBox, hBox); } -long wxStaticBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) +WXLRESULT wxStaticBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) { switch ( nMsg ) { +#ifndef __WXWINCE__ case WM_NCHITTEST: // FIXME: this hack is specific to dialog ed, shouldn't it be // somehow disabled during normal operation? @@ -101,9 +174,7 @@ long wxStaticBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) return (long)HTCLIENT; } break; - - // VZ: I will remove (or change) this soon... (15.11.99) -#if 0 +#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 @@ -112,9 +183,9 @@ long wxStaticBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) // 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