removed code inside USE_SIZABLE_CALENDAR, we should allow making the main calendar control resizeable instead of adding another one just for this
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43524 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
6bc807b35d
commit
908f8fc481
@ -52,8 +52,6 @@
|
||||
|
||||
#include "../sample.xpm"
|
||||
|
||||
#define USE_SIZABLE_CALENDAR 0
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// private classes
|
||||
// ----------------------------------------------------------------------------
|
||||
@ -516,10 +514,6 @@ MyPanel::MyPanel(wxFrame *frame)
|
||||
wxCAL_SHOW_HOLIDAYS |
|
||||
wxRAISED_BORDER);
|
||||
|
||||
#if USE_SIZABLE_CALENDAR
|
||||
wxCalendarCtrl *sizableCalendar = new wxCalendarCtrl(this, wxID_ANY);
|
||||
#endif
|
||||
|
||||
// adjust to vertical/horizontal display, check mostly dedicated to WinCE
|
||||
bool horizontal = ( wxSystemSettings::GetMetric(wxSYS_SCREEN_X) > wxSystemSettings::GetMetric(wxSYS_SCREEN_Y) );
|
||||
wxBoxSizer *m_sizer = new wxBoxSizer( horizontal ? wxHORIZONTAL : wxVERTICAL );
|
||||
@ -527,10 +521,6 @@ MyPanel::MyPanel(wxFrame *frame)
|
||||
m_sizer->Add(m_date, 0, wxALIGN_CENTER | wxALL, 10 );
|
||||
m_sizer->Add(m_calendar, 0, wxALIGN_CENTER | wxALIGN_LEFT);
|
||||
|
||||
#if USE_SIZABLE_CALENDAR
|
||||
m_sizer->Add(sizableCalendar, 1, wxEXPAND);
|
||||
#endif
|
||||
|
||||
SetSizer( m_sizer );
|
||||
m_sizer->SetSizeHints( this );
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user