AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Layout fixes due to measuring with the wrong font. Also added

Browse Source 
GetDefaultAttributes and switched everything to use GetXXX instead of
m_XXX.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28111 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn 2004-06-30 21:49:17 +00:00
parent 6d450e1a20
commit ab473127c6
2 changed files with 29 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/generic/calctrl.h
View File

@ -162,6 +162,12 @@ public:
virtual bool Enable(bool enable = true);
virtual bool Show(bool show = true);
virtual wxVisualAttributes GetDefaultAttributes() const
{ return GetClassDefaultAttributes(GetWindowVariant()); }
static wxVisualAttributes
GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
private:
// common part of all ctors
void Init();

53
src/generic/calctrl.cpp
View File

@ -33,6 +33,7 @@
#include "wx/settings.h"
#include "wx/brush.h"
#include "wx/combobox.h"
#include "wx/listbox"
#include "wx/stattext.h"
#include "wx/textctrl.h"
#endif //WX_PRECOMP
@ -306,29 +307,12 @@ bool wxCalendarCtrl::Create(wxWindow *parent,
ShowCurrentControls();
wxSize sizeReal;
if ( size.x == wxDefaultSize.x || size.y == wxDefaultSize.y )
{
sizeReal = DoGetBestSize();
if ( size.x != wxDefaultSize.x )
sizeReal.x = size.x;
if ( size.y != wxDefaultSize.y )
sizeReal.y = size.y;
}
else
{
sizeReal = size;
}
// we need to set the position as well because the main control position
// is not the same as the one specified in pos if we have the controls
// above it
SetSize(pos.x, pos.y, sizeReal.x, sizeReal.y);
SetForegroundColour(*wxBLACK);
SetBackgroundColour(*wxWHITE);
SetFont(*wxSWISS_FONT);
SetBestSize(size);
SetPosition(pos);
SetHolidayAttrs();
return true;
@ -805,7 +789,9 @@ wxSize wxCalendarCtrl::DoGetBestSize() const
width += 4;
}
return wxSize(width, height);
wxSize best(width, height);
CacheBestSize(best);
return best;
}
void wxCalendarCtrl::DoSetSize(int x, int y,
@ -904,12 +890,9 @@ void wxCalendarCtrl::DoGetSize(int *width, int *height) const
void wxCalendarCtrl::RecalcGeometry()
{
if ( m_widthCol != 0 )
return;
wxClientDC dc(this);
dc.SetFont(m_font);
dc.SetFont(GetFont());
// determine the column width (we assume that the weekday names are always
// wider (in any language) than the numbers)
@ -940,7 +923,7 @@ void wxCalendarCtrl::OnPaint(wxPaintEvent& WXUNUSED(event))
{
wxPaintDC dc(this);
dc.SetFont(m_font);
dc.SetFont(GetFont());
RecalcGeometry();
@ -1158,7 +1141,7 @@ void wxCalendarCtrl::OnPaint(wxPaintEvent& WXUNUSED(event))
}
else
{
colBorder = m_foregroundColour;
colBorder = GetForegroundColour();
}
wxPen pen(colBorder, 1, wxSOLID);
@ -1184,13 +1167,13 @@ void wxCalendarCtrl::OnPaint(wxPaintEvent& WXUNUSED(event))
if ( changedColours )
{
dc.SetTextForeground(m_foregroundColour);
dc.SetTextBackground(m_backgroundColour);
dc.SetTextForeground(GetForegroundColour());
dc.SetTextBackground(GetBackgroundColour());
}
if ( changedFont )
{
dc.SetFont(m_font);
dc.SetFont(GetFont());
}
}
//else: just don't draw it
@ -1824,6 +1807,16 @@ void wxCalendarCtrl::ResetHolidayAttrs()
}
}
//static
wxVisualAttributes
wxCalendarCtrl::GetClassDefaultAttributes(wxWindowVariant variant)
{
// Use the same color scheme as wxListBox
return wxListBox::GetClassDefaultAttributes(variant);
}
// ----------------------------------------------------------------------------
// wxCalendarEvent
// ----------------------------------------------------------------------------