X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6a89f9ee4212a2268df1a7ed97145944e937fa0f..adb799d6ef8e1ba754ab08b26e64fa40219f95f8:/src/msw/statbox.cpp diff --git a/src/msw/statbox.cpp b/src/msw/statbox.cpp index 84eb048bd0..646fd62567 100644 --- a/src/msw/statbox.cpp +++ b/src/msw/statbox.cpp @@ -44,20 +44,53 @@ // ---------------------------------------------------------------------------- #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") -WX_BEGIN_PROPERTIES_TABLE(wxStaticBox) - WX_PROPERTY( Label,wxString, SetLabel, GetLabel, wxT("") ) +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 */ -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 @@ -88,7 +121,7 @@ bool wxStaticBox::Create(wxWindow *parent, // 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 + // 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 @@ -121,7 +154,7 @@ 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 ) {