#include "wx/msw/private.h"
-#if wxUSE_EXTENDED_RTTI
-WX_DEFINE_FLAGS( wxStaticTextStyle )
-
-wxBEGIN_FLAGS( wxStaticTextStyle )
- // 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)
-
- wxFLAGS_MEMBER(wxST_NO_AUTORESIZE)
- wxFLAGS_MEMBER(wxALIGN_LEFT)
- wxFLAGS_MEMBER(wxALIGN_RIGHT)
- wxFLAGS_MEMBER(wxALIGN_CENTRE)
-
-wxEND_FLAGS( wxStaticTextStyle )
-
-IMPLEMENT_DYNAMIC_CLASS_XTI(wxStaticText, wxControl,"wx/stattext.h")
-
-wxBEGIN_PROPERTIES_TABLE(wxStaticText)
- wxPROPERTY( Label,wxString, SetLabel, GetLabel, wxString() , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
- wxPROPERTY_FLAGS( WindowStyle , wxStaticTextStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE, 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
-wxEND_PROPERTIES_TABLE()
-
-wxBEGIN_HANDLERS_TABLE(wxStaticText)
-wxEND_HANDLERS_TABLE()
-
-wxCONSTRUCTOR_6( wxStaticText , wxWindow* , Parent , wxWindowID , Id , wxString , Label , wxPoint , Position , wxSize , Size , long , WindowStyle )
-#else
-IMPLEMENT_DYNAMIC_CLASS(wxStaticText, wxControl)
-#endif
-
bool wxStaticText::Create(wxWindow *parent,
wxWindowID id,
const wxString& label,
if ( !CreateControl(parent, id, pos, size, style, wxDefaultValidator, name) )
return false;
- if ( !MSWCreateControl(wxT("STATIC"), label, pos, size) )
+ if ( !MSWCreateControl(wxT("STATIC"), wxEmptyString, pos, size) )
return false;
+ // we set the label here and not through MSWCreateControl() because we
+ // need to do many operation on it for ellipsization&markup support
+ SetLabel(label);
+
+ // as we didn't pass the correct label to MSWCreateControl(), it didn't set
+ // the initial size correctly -- do it now
+ InvalidateBestSize();
+ SetInitialSize(size);
+
+ // NOTE: if the label contains ampersand characters which are interpreted as
+ // accelerators, they will be rendered (at least on WinXP) only if the
+ // static text is placed inside a window class which correctly handles
+ // focusing by TAB traversal (e.g. wxPanel).
+
return true;
}
return msStyle;
}
-wxSize wxStaticText::DoGetBestSize() const
+wxSize wxStaticText::DoGetBestClientSize() const
{
wxClientDC dc(const_cast<wxStaticText *>(this));
wxFont font(GetFont());
- if (!font.Ok())
+ if (!font.IsOk())
font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
dc.SetFont(font);
widthTextMax += 2;
#endif // __WXWINCE__
- // border takes extra space
+ // It looks like the static control needs "slightly" more vertical space
+ // than the character height and while the text isn't actually truncated if
+ // we use just the minimal height, it is positioned differently than when
+ // the control has enough space and this result in the text in edit and
+ // static controls not being aligned when the controls themselves are. As
+ // this is something you really should be able to count on, increase the
+ // space allocated for the control so that the base lines do align
+ // correctly. Notice that while the above is true at least for the single
+ // line controls, there doesn't seem to do any harm to allocate two extra
+ // pixels in multi-line case neither so do it always for consistency.
//
- // TODO: this is probably not wxStaticText-specific and should be moved
- wxCoord border;
- switch ( GetBorder() )
- {
- case wxBORDER_STATIC:
- case wxBORDER_SIMPLE:
- border = 1;
- break;
-
- case wxBORDER_SUNKEN:
- border = 2;
- break;
-
- case wxBORDER_RAISED:
- case wxBORDER_DOUBLE:
- border = 3;
- break;
-
- default:
- wxFAIL_MSG( _T("unknown border style") );
- // fall through
-
- case wxBORDER_NONE:
- border = 0;
- }
-
- widthTextMax += 2*border;
- heightTextTotal += 2*border;
-
- wxSize best(widthTextMax, heightTextTotal);
- CacheBestSize(best);
- return best;
+ // I still have no idea why exactly is this needed nor why should we use 2
+ // and not something else. This seems to work in all the configurations
+ // though (small/large fonts, different OS versions, ...) so just hard code
+ // it for now. If we need something better later it might be worth looking
+ // at the height of the text control returned by ::GetComboBoxInfo() as it
+ // seems to be the "minimal acceptable" height.
+ heightTextTotal += 2;
+
+ return wxSize(widthTextMax, heightTextTotal);
}
void wxStaticText::DoSetSize(int x, int y, int w, int h, int sizeFlags)
}
#endif // SS_ENDELLIPSIS
- // this call will save the label in m_labelOrig and set it into this window
- // (through wxWindow::SetLabel)
+ // save the label in m_labelOrig with both the markup (if any) and
+ // the mnemonics characters (if any)
m_labelOrig = label;
#ifdef SS_ENDELLIPSIS
if ( styleReal & SS_ENDELLIPSIS )
- DoSetLabel(RemoveMarkup(label));
+ DoSetLabel(GetLabel());
else
#endif // SS_ENDELLIPSIS
- DoSetLabel(GetEllipsizedLabelWithoutMarkup());
+ DoSetLabel(GetEllipsizedLabel());
// adjust the size of the window to fit to the label unless autoresizing is
// disabled
projects / wxWidgets.git / blobdiff