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

Layout improvements for CalendarCtrl

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53255 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling 2008-04-18 08:01:13 +00:00
parent 427ad6e188
commit a4f03d8798
5 changed files with 58 additions and 202 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
samples/erase/erase.cpp
View File

@ -353,6 +353,8 @@ void MyCanvas::OnEraseBackground( wxEraseEvent& event )
{
dc.DrawLine(0, y, size.x, y);
}
wxPrintf( "hello\n" );
dc.SetTextForeground(*wxRED);
dc.DrawText(_T("This text is drawn from OnEraseBackground"), 60, 160);

1
samples/mediaplayer/mediaplayer.cpp
View File

@ -1643,6 +1643,7 @@ wxMediaPlayerNotebookPage::wxMediaPlayerNotebookPage(wxMediaPlayerFrame* parentF
m_gauge->Create(this, wxID_GAUGE, 0, wxDefaultPosition, wxDefaultSize,
wxGA_HORIZONTAL | wxGA_SMOOTH);
sizer->Add(m_gauge, 0, wxALIGN_CENTER_HORIZONTAL|wxALL|wxEXPAND , 5);
//
// Create the speed/volume sliders

217
samples/minimal/minimal.cpp
View File

@ -1,199 +1,30 @@
/////////////////////////////////////////////////////////////////////////////
// Name: minimal.cpp
// Purpose: Minimal wxWidgets sample
// Author: Julian Smart
// Modified by:
// Created: 04/01/98
// RCS-ID: $Id$
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#include "wx/wx.h"
// ============================================================================
// declarations
// ============================================================================
// ----------------------------------------------------------------------------
// headers
// ----------------------------------------------------------------------------
// For compilers that support precompilation, includes "wx/wx.h".
#include "wx/wxprec.h"
#ifdef __BORLANDC__
#pragma hdrstop
#endif
// for all others, include the necessary headers (this file is usually all you
// need because it includes almost all "standard" wxWidgets headers)
#ifndef WX_PRECOMP
#include "wx/wx.h"
#endif
// ----------------------------------------------------------------------------
// resources
// ----------------------------------------------------------------------------
// the application icon (under Windows and OS/2 it is in resources and even
// though we could still include the XPM here it would be unused)
#if !defined(__WXMSW__) && !defined(__WXPM__)
#include "../sample.xpm"
#endif
// ----------------------------------------------------------------------------
// private classes
// ----------------------------------------------------------------------------
// Define a new application type, each program should derive a class from wxApp
class MyApp : public wxApp
class TestApp : public wxApp
{
public:
// override base class virtuals
// ----------------------------
// this one is called on application startup and is a good place for the app
// initialization (doing it here and not in the ctor allows to have an error
// return: if OnInit() returns false, the application terminates)
virtual bool OnInit();
virtual bool OnInit() {
wxFrame *frame = new wxFrame(NULL, -1, _T("Test"));
wxFlexGridSizer *sizer = new wxFlexGridSizer(3, 1, 0, 0);
sizer->Add(new wxListBox(frame, -1, wxDefaultPosition, wxSize(200,100)));
sizer->Add(new wxButton(frame, -1, _T("Hello")), 0, wxGROW | wxALIGN_RIGHT);
sizer->Add(new wxTextCtrl(frame, -1, _T("dummy"), wxDefaultPosition, wxSize(200, 100)) );
sizer->AddGrowableRow(0, 1);
sizer->AddGrowableRow(1, 1);
sizer->AddGrowableRow(2, 1);
sizer->AddGrowableCol(0, 1);
frame->SetSizer(sizer);
sizer->SetSizeHints(frame);
frame->Show();
SetTopWindow(frame);
return true;
}
};
// Define a new frame type: this is going to be our main frame
class MyFrame : public wxFrame
{
public:
// ctor(s)
MyFrame(const wxString& title);
// event handlers (these functions should _not_ be virtual)
void OnQuit(wxCommandEvent& event);
void OnAbout(wxCommandEvent& event);
private:
// any class wishing to process wxWidgets events must use this macro
DECLARE_EVENT_TABLE()
};
// ----------------------------------------------------------------------------
// constants
// ----------------------------------------------------------------------------
// IDs for the controls and the menu commands
enum
{
// menu items
Minimal_Quit = wxID_EXIT,
// it is important for the id corresponding to the "About" command to have
// this standard value as otherwise it won't be handled properly under Mac
// (where it is special and put into the "Apple" menu)
Minimal_About = wxID_ABOUT
};
// ----------------------------------------------------------------------------
// event tables and other macros for wxWidgets
// ----------------------------------------------------------------------------
// the event tables connect the wxWidgets events with the functions (event
// handlers) which process them. It can be also done at run-time, but for the
// simple menu events like this the static method is much simpler.
BEGIN_EVENT_TABLE(MyFrame, wxFrame)
EVT_MENU(Minimal_Quit, MyFrame::OnQuit)
EVT_MENU(Minimal_About, MyFrame::OnAbout)
END_EVENT_TABLE()
// Create a new application object: this macro will allow wxWidgets to create
// the application object during program execution (it's better than using a
// static object for many reasons) and also implements the accessor function
// wxGetApp() which will return the reference of the right type (i.e. MyApp and
// not wxApp)
IMPLEMENT_APP(MyApp)
// ============================================================================
// implementation
// ============================================================================
// ----------------------------------------------------------------------------
// the application class
// ----------------------------------------------------------------------------
// 'Main program' equivalent: the program execution "starts" here
bool MyApp::OnInit()
{
// call the base class initialization method, currently it only parses a
// few common command-line options but it could be do more in the future
if ( !wxApp::OnInit() )
return false;
// create the main application window
MyFrame *frame = new MyFrame(_T("Minimal wxWidgets App"));
// and show it (the frames, unlike simple controls, are not shown when
// created initially)
frame->Show(true);
// success: wxApp::OnRun() will be called which will enter the main message
// loop and the application will run. If we returned false here, the
// application would exit immediately.
return true;
}
// ----------------------------------------------------------------------------
// main frame
// ----------------------------------------------------------------------------
// frame constructor
MyFrame::MyFrame(const wxString& title)
: wxFrame(NULL, wxID_ANY, title)
{
// set the frame icon
SetIcon(wxICON(sample));
#if wxUSE_MENUS
// create a menu bar
wxMenu *fileMenu = new wxMenu;
// the "About" item should be in the help menu
wxMenu *helpMenu = new wxMenu;
helpMenu->Append(Minimal_About, _T("&About...\tF1"), _T("Show about dialog"));
fileMenu->Append(Minimal_Quit, _T("E&xit\tAlt-X"), _T("Quit this program"));
// now append the freshly created menu to the menu bar...
wxMenuBar *menuBar = new wxMenuBar();
menuBar->Append(fileMenu, _T("&File"));
menuBar->Append(helpMenu, _T("&Help"));
// ... and attach this menu bar to the frame
SetMenuBar(menuBar);
#endif // wxUSE_MENUS
#if wxUSE_STATUSBAR
// create a status bar just for fun (by default with 1 pane only)
CreateStatusBar(2);
SetStatusText(_T("Welcome to wxWidgets!"));
#endif // wxUSE_STATUSBAR
}
// event handlers
void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
{
// true is to force the frame to close
Close(true);
}
void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
{
wxMessageBox(wxString::Format(
_T("Welcome to %s!\n")
_T("\n")
_T("This is the minimal wxWidgets sample\n")
_T("running under %s."),
wxVERSION_STRING,
wxGetOsDescription().c_str()
),
_T("About wxWidgets minimal sample"),
wxOK | wxICON_INFORMATION,
this);
}
IMPLEMENT_APP(TestApp)

16
samples/toolbar/toolbar.cpp
View File

@ -401,7 +401,7 @@ void MyFrame::PopulateToolbar(wxToolBarBase* toolBar)
INIT_TOOL_BMP(paste);
INIT_TOOL_BMP(print);
INIT_TOOL_BMP(help);
int w = toolBarBitmaps[Tool_new].GetWidth(),
h = toolBarBitmaps[Tool_new].GetHeight();
@ -412,8 +412,22 @@ void MyFrame::PopulateToolbar(wxToolBarBase* toolBar)
for ( size_t n = Tool_new; n < WXSIZEOF(toolBarBitmaps); n++ )
{
#if 0
wxBitmap source = toolBarBitmaps[n];
wxBitmap target( w, h );
wxMemoryDC dc( target );
dc.SetPen( wxPen( wxColour(100,100,100), 1, wxSOLID ) );
dc.SetBrush( *wxTRANSPARENT_BRUSH );
dc.DrawRectangle( 0, 0, w, h );
wxRect inner(1,1,w-2,h-2);
dc.GradientFillLinear( inner, wxColour(240,240,240), wxColour(150,150,150), wxSOUTH );
dc.DrawBitmap( source, w/4, h/4, true );
toolBarBitmaps[n] = target;
#else
toolBarBitmaps[n] =
wxBitmap(toolBarBitmaps[n].ConvertToImage().Scale(w, h));
#endif
}
}

24
src/generic/calctrlg.cpp
View File

@ -249,7 +249,6 @@ bool wxGenericCalendarCtrl::Create(wxWindow *parent,
m_staticYear = new wxStaticText(GetParent(), wxID_ANY, m_date.Format(_T("%Y")),
wxDefaultPosition, wxDefaultSize,
wxALIGN_CENTRE);
CreateMonthComboBox();
m_staticMonth = new wxStaticText(GetParent(), wxID_ANY, m_date.Format(_T("%B")),
wxDefaultPosition, wxDefaultSize,
@ -339,6 +338,9 @@ void wxGenericCalendarCtrl::CreateYearSpinCtrl()
wxDefaultSize,
wxSP_ARROW_KEYS | wxCLIP_SIBLINGS,
-4300, 10000, GetDate().GetYear());
#ifdef __WXMAC__
m_spinYear->SetSize( 90, -1 );
#endif
m_spinYear->Connect(m_spinYear->GetId(), wxEVT_COMMAND_TEXT_UPDATED,
wxCommandEventHandler(wxGenericCalendarCtrl::OnYearTextChange),
@ -777,12 +779,9 @@ size_t wxGenericCalendarCtrl::GetWeek(const wxDateTime& date) const
// the same space
// the constants used for the layout
#define VERT_MARGIN 5 // distance between combo and calendar
#ifdef __WXMAC__
#define VERT_MARGIN 5 // distance between combo and calendar
#define HORZ_MARGIN 5 // spin
#else
#define HORZ_MARGIN 15 // spin
#endif
wxSize wxGenericCalendarCtrl::DoGetBestSize() const
{
// calc the size of the calendar
@ -797,6 +796,10 @@ wxSize wxGenericCalendarCtrl::DoGetBestSize() const
height += wxMax(bestSizeCombo.y, m_spinYear->GetBestSize().y)
+ VERT_MARGIN;
#ifdef __WXMAC__
// the spin control get clipped otherwise
width += 10;
#endif
wxCoord w2 = bestSizeCombo.x + HORZ_MARGIN + GetCharWidth()*6;
if ( width < w2 )
@ -810,6 +813,7 @@ wxSize wxGenericCalendarCtrl::DoGetBestSize() const
}
CacheBestSize(best);
return best;
}
@ -825,12 +829,16 @@ void wxGenericCalendarCtrl::DoMoveWindow(int x, int y, int width, int height)
int maxHeight = wxMax(sizeSpin.y, sizeCombo.y);
int dy = (maxHeight - sizeStatic.y) / 2;
m_comboMonth->Move(x, y);
#ifdef __WXMAC__
m_comboMonth->Move(x, y + (maxHeight - sizeCombo.y)/2 + 2); // FIXME, something is reporting the wrong size..
#else
m_comboMonth->Move(x, y + (maxHeight - sizeCombo.y)/2);
#endif
m_staticMonth->SetSize(x, y + dy, sizeCombo.x, -1, sizeStatic.y);
int xDiff = sizeCombo.x + HORZ_MARGIN;
m_spinYear->SetSize(x + xDiff, y, width - xDiff, maxHeight);
m_spinYear->SetSize(x + xDiff, y + (maxHeight - sizeSpin.y)/2, width - xDiff, maxHeight);
m_staticYear->SetSize(x + xDiff, y + dy, width - xDiff, sizeStatic.y);
yDiff = maxHeight + VERT_MARGIN;