#if wxUSE_STATTEXT
#ifndef WX_PRECOMP
-#include "wx/event.h"
-#include "wx/app.h"
-#include "wx/brush.h"
+ #include "wx/event.h"
+ #include "wx/app.h"
+ #include "wx/brush.h"
+ #include "wx/dcclient.h"
+ #include "wx/settings.h"
#endif
#include "wx/stattext.h"
#include "wx/msw/private.h"
-#include <stdio.h>
#if wxUSE_EXTENDED_RTTI
WX_DEFINE_FLAGS( wxStaticTextStyle )
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(wxNO_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(wxNO_FULL_REPAINT_ON_RESIZE)
+ wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
wxFLAGS_MEMBER(wxVSCROLL)
wxFLAGS_MEMBER(wxHSCROLL)
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 , , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
+ 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 )
+wxCONSTRUCTOR_6( wxStaticText , wxWindow* , Parent , wxWindowID , Id , wxString , Label , wxPoint , Position , wxSize , Size , long , WindowStyle )
#else
IMPLEMENT_DYNAMIC_CLASS(wxStaticText, wxControl)
#endif
const wxString& name)
{
if ( !CreateControl(parent, id, pos, size, style, wxDefaultValidator, name) )
- return FALSE;
+ return false;
if ( !MSWCreateControl(wxT("STATIC"), label, pos, size) )
- return FALSE;
+ return false;
- return TRUE;
+ return true;
}
wxBorder wxStaticText::GetDefaultBorder() const
return msStyle;
}
-wxSize wxStaticText::DoGetBestSize() const
+WXHBRUSH wxStaticText::DoMSWControlColor(WXHDC pDC, wxColour colBg)
{
- wxString text(wxGetWindowText(GetHWND()));
-
- int widthTextMax = 0, widthLine,
- heightTextTotal = 0, heightLineDefault = 0, heightLine = 0;
-
- bool lastWasAmpersand = FALSE;
-
- wxString curLine;
- for ( const wxChar *pc = text; ; pc++ )
+ // If this control has a non-standard fg colour but still has the standard
+ // bg then we need to also give it a non-standard bg otherwise the fg
+ // setting has no effect.
+ WXHBRUSH hbr = wxControl::DoMSWControlColor(pDC, colBg);
+ if (!hbr && m_hasFgCol)
{
- if ( *pc == wxT('\n') || *pc == wxT('\0') )
- {
- if ( !curLine )
- {
- // we can't use GetTextExtent - it will return 0 for both width
- // and height and an empty line should count in height
- // calculation
- if ( !heightLineDefault )
- heightLineDefault = heightLine;
- if ( !heightLineDefault )
- GetTextExtent(_T("W"), NULL, &heightLineDefault);
-
- heightTextTotal += heightLineDefault;
- }
- else
- {
- GetTextExtent(curLine, &widthLine, &heightLine);
- if ( widthLine > widthTextMax )
- widthTextMax = widthLine;
- heightTextTotal += heightLine;
- }
-
- if ( *pc == wxT('\n') )
- {
- curLine.Empty();
- }
- else
- {
- // the end of string
- break;
- }
- }
- else
+ hbr = MSWGetBgBrushForChild(pDC, this);
+ if (!hbr)
{
- // we shouldn't take into account the '&' which just introduces the
- // mnemonic characters and so are not shown on the screen -- except
- // when it is preceded by another '&' in which case it stands for a
- // literal ampersand
- if ( *pc == _T('&') )
- {
- if ( !lastWasAmpersand )
- {
- lastWasAmpersand = TRUE;
-
- // skip the statement adding pc to curLine below
- continue;
- }
-
- // it is a literal ampersand
- lastWasAmpersand = FALSE;
- }
-
- curLine += *pc;
+ HDC hdc = (HDC)pDC;
+ wxColour bg = GetBackgroundColour();
+ ::SetBkColor(hdc, wxColourToRGB(bg));
+ wxBrush *brush = wxTheBrushList->FindOrCreateBrush(bg, wxSOLID);
+ hbr = (WXHBRUSH)brush->GetResourceHandle();
}
}
+ return hbr;
+}
+
+wxSize wxStaticText::DoGetBestSize() const
+{
+ wxClientDC dc(wx_const_cast(wxStaticText *, this));
+ wxFont font(GetFont());
+ if (!font.Ok())
+ font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
+
+ dc.SetFont(font);
+
+ wxCoord widthTextMax, heightTextTotal;
+ dc.GetMultiLineTextExtent(GetLabel(), &widthTextMax, &heightTextTotal);
+
+#ifdef __WXWINCE__
+ if ( widthTextMax )
+ widthTextMax += 2;
+#endif // __WXWINCE__
return wxSize(widthTextMax, heightTextTotal);
}
// disabled
if ( !(GetWindowStyle() & wxST_NO_AUTORESIZE) )
{
- DoSetSize(-1, -1, -1, -1, wxSIZE_AUTO_WIDTH | wxSIZE_AUTO_HEIGHT);
+ InvalidateBestSize();
+ DoSetSize(wxDefaultCoord, wxDefaultCoord, wxDefaultCoord, wxDefaultCoord,
+ wxSIZE_AUTO_WIDTH | wxSIZE_AUTO_HEIGHT);
}
}
// disabled
if ( !(GetWindowStyle() & wxST_NO_AUTORESIZE) )
{
- DoSetSize(-1, -1, -1, -1, wxSIZE_AUTO_WIDTH | wxSIZE_AUTO_HEIGHT);
+ InvalidateBestSize();
+ DoSetSize(wxDefaultCoord, wxDefaultCoord, wxDefaultCoord, wxDefaultCoord,
+ wxSIZE_AUTO_WIDTH | wxSIZE_AUTO_HEIGHT);
}
return ret;
projects / wxWidgets.git / blobdiff