#endif
#include <ctype.h>
+
#include "wx/sizer.h"
#include "wx/statline.h"
+#include "wx/notebook.h"
#include "layout.h"
{
}
-bool MyApp::OnInit(void)
+bool MyApp::OnInit()
{
// Create the main frame window
frame = new MyFrame((MyFrame *) NULL, (char *) "wxWindows Layout Demo", 0, 0, 550, 500);
wxMenu *file_menu = new wxMenu;
file_menu->Append(LAYOUT_LOAD_FILE, "&Load file", "Load a text file");
- file_menu->Append(LAYOUT_TEST, "&Test sizers", "Test sizer code");
- file_menu->Append(LAYOUT_TEST_NEW, "&Test new sizers", "Test new sizer code");
+ file_menu->Append(LAYOUT_TEST_SIZER, "&Test sizers", "Test sizer");
+ file_menu->Append(LAYOUT_TEST_NB, "&Test notebook sizers", "Test notebook sizer");
file_menu->AppendSeparator();
file_menu->Append(LAYOUT_QUIT, "E&xit", "Quit program");
// Make a panel
frame->panel = new wxPanel(frame, 0, 0, 1000, 500, wxTAB_TRAVERSAL);
- frame->panel->SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
+ frame->panel->SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
// frame->panel->SetAutoLayout(TRUE);
// Create some panel items
BEGIN_EVENT_TABLE(MyFrame, wxFrame)
EVT_MENU(LAYOUT_LOAD_FILE, MyFrame::LoadFile)
EVT_MENU(LAYOUT_QUIT, MyFrame::Quit)
- EVT_MENU(LAYOUT_TEST, MyFrame::TestSizers)
- EVT_MENU(LAYOUT_TEST_NEW, MyFrame::TestNewSizers)
+ EVT_MENU(LAYOUT_TEST_SIZER, MyFrame::TestSizers)
+ EVT_MENU(LAYOUT_TEST_NB, MyFrame::TestNotebookSizers)
EVT_MENU(LAYOUT_ABOUT, MyFrame::About)
EVT_SIZE(MyFrame::OnSize)
END_EVENT_TABLE()
void MyFrame::LoadFile(wxCommandEvent& WXUNUSED(event) )
{
- wxString s = wxFileSelector( _T("Load text file"), (const wxChar *) NULL,
+ wxString s = wxFileSelector( _T("Load text file"), (const wxChar *) NULL,
(const wxChar *) NULL, (const wxChar *) NULL, _T("*.txt") );
if (s != "")
{
void MyFrame::Quit(wxCommandEvent& WXUNUSED(event) )
{
- this->Close(TRUE);
+ this->Close(TRUE);
}
void MyFrame::TestSizers(wxCommandEvent& WXUNUSED(event) )
{
- SizerFrame *newFrame = new SizerFrame((MyFrame *) NULL, "Sizer Test Frame", 50, 50, 500, 500);
- newFrame->Show(TRUE);
+ MySizerFrame *newFrame = new MySizerFrame((MyFrame *) NULL, "Sizer Test Frame", 50, 50 );
+ newFrame->Show(TRUE);
}
-void MyFrame::TestNewSizers(wxCommandEvent& WXUNUSED(event) )
+void MyFrame::TestNotebookSizers(wxCommandEvent& WXUNUSED(event) )
{
- NewSizerFrame *newFrame = new NewSizerFrame((MyFrame *) NULL, "Sizer Test Frame", 50, 50 );
- newFrame->Show(TRUE);
+ wxDialog dialog( this, -1, wxString("Notebook Sizer Test Dialog") );
+
+ // Begin with first hierarchy: a notebook at the top and
+ // and OK button at the bottom.
+
+ wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
+
+ wxNotebook *notebook = new wxNotebook( &dialog, -1 );
+ wxNotebookSizer *nbs = new wxNotebookSizer( notebook );
+ topsizer->Add( nbs, 1, wxGROW );
+
+ wxButton *button = new wxButton( &dialog, wxID_OK, "OK" );
+ topsizer->Add( button, 0, wxALIGN_RIGHT | wxALL, 10 );
+
+ // First page: one big text ctrl
+ wxTextCtrl *multi = new wxTextCtrl( notebook, -1, "TextCtrl.", wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE );
+ notebook->AddPage( multi, "Page One" );
+
+ // Second page: a text ctrl and a button
+ wxPanel *panel = new wxPanel( notebook, -1 );
+ notebook->AddPage( panel, "Page Two" );
+
+ wxSizer *panelsizer = new wxBoxSizer( wxVERTICAL );
+
+ wxTextCtrl *text = new wxTextCtrl( panel, -1, "TextLine 1.", wxDefaultPosition, wxSize(250,-1) );
+ panelsizer->Add( text, 0, wxGROW|wxALL, 30 );
+ text = new wxTextCtrl( panel, -1, "TextLine 2.", wxDefaultPosition, wxSize(250,-1) );
+ panelsizer->Add( text, 0, wxGROW|wxALL, 30 );
+ wxButton *button2 = new wxButton( panel, -1, "Hallo" );
+ panelsizer->Add( button2, 0, wxALIGN_RIGHT | wxLEFT|wxRIGHT|wxBOTTOM, 30 );
+
+ panel->SetAutoLayout( TRUE );
+ panel->SetSizer( panelsizer );
+
+ // Tell dialog to use sizer
+
+ dialog.SetAutoLayout( TRUE );
+ dialog.SetSizer( topsizer );
+ topsizer->Fit( &dialog );
+ topsizer->SetSizeHints( &dialog );
+
+ dialog.ShowModal();
}
+
void MyFrame::About(wxCommandEvent& WXUNUSED(event) )
{
- (void)wxMessageBox("wxWindows GUI library layout demo\n",
+ (void)wxMessageBox("wxWindows GUI library layout demo\n",
"About Layout Demo", wxOK|wxCENTRE);
}
dc.DrawRoundedRectangle(150, 150, 100, 50, 20);
dc.DrawEllipse(250, 250, 100, 50);
+#if wxUSE_SPLINES
dc.DrawSpline(50, 200, 50, 100, 200, 10);
+#endif // wxUSE_SPLINES
dc.DrawLine(50, 230, 200, 230);
dc.SetPen(* wxBLACK_PEN);
{
}
-MyWindow::~MyWindow(void)
+MyWindow::~MyWindow()
{
}
}
//-----------------------------------------------------------------
-// SizerFrame
+// MySizerFrame
//-----------------------------------------------------------------
-SizerFrame::SizerFrame(wxFrame *frame, char *title, int x, int y, int w, int h):
- wxFrame(frame, -1, title, wxPoint(x, y), wxSize(w, h))
-{
- panel = new wxPanel(this, -1, wxPoint(0, 0), wxSize(-1, -1), wxTAB_TRAVERSAL);
- panel->SetBackgroundColour(wxColour(192, 192, 192));
-
- // A sizer to fit the whole panel, plus two sizers, one
- // above the other. A button is centred on the lower
- // sizer; a rowcol containing 3 buttons is centred on the upper
- // sizer.
- wxSizer *expandSizer = new wxSizer(panel, wxSizerExpand);
- expandSizer->SetName("expandSizer");
-
- wxLayoutConstraints *c;
-
- /////// TOP OF PANEL
- ///////
- wxSizer *topSizer = new wxSizer(expandSizer);
- topSizer->SetName("topSizer");
-
- // Specify constraints for the top sizer
- c = new wxLayoutConstraints;
- c->left.SameAs (expandSizer, wxLeft);
- c->top.SameAs (expandSizer, wxTop);
- c->right.SameAs (expandSizer, wxRight);
- c->height.PercentOf (expandSizer, wxHeight, 50);
-
- topSizer->SetConstraints(c);
-
- /*
- * Add a row-col sizer and some buttons
- */
-
- // Default is layout by rows, 20 columns per row, shrink to fit.
- wxRowColSizer *rowCol = new wxRowColSizer(topSizer);
- rowCol->SetName("rowCol");
-
- wxButton *button = new wxButton(panel, -1, "Button 1");
- rowCol->AddSizerChild(button);
-
- button = new wxButton(panel, -1, "Button 2");
- rowCol->AddSizerChild(button);
-
- button = new wxButton(panel, -1, "Button 3");
- rowCol->AddSizerChild(button);
-
- // Centre the rowcol in the middle of the upper sizer
- c = new wxLayoutConstraints;
- c->centreX.SameAs (topSizer, wxCentreX);
- c->centreY.SameAs (topSizer, wxCentreY);
- c->width.AsIs();
- c->height.AsIs();
- rowCol->SetConstraints(c);
-
- /////// BOTTOM OF PANEL
- ///////
- wxSizer *bottomSizer = new wxSizer(expandSizer);
-
- // Specify constraints for the bottom sizer
- c = new wxLayoutConstraints;
- c->left.SameAs (expandSizer, wxLeft);
- c->top.PercentOf (expandSizer, wxHeight, 50);
- c->right.SameAs (expandSizer, wxRight);
- c->height.PercentOf (expandSizer, wxHeight, 50);
-
- bottomSizer->SetConstraints(c);
-
- wxButton *button2 = new wxButton(panel, -1, "Test button");
-
- // The button should be a child of the bottom sizer
- bottomSizer->AddSizerChild(button2);
-
- // Centre the button on the sizer
- c = new wxLayoutConstraints;
- c->centreX.SameAs (bottomSizer, wxCentreX);
- c->centreY.SameAs (bottomSizer, wxCentreY);
- c->width.PercentOf (bottomSizer, wxWidth, 20);
- c->height.PercentOf (bottomSizer, wxHeight, 20);
- button2->SetConstraints(c);
-}
-
-BEGIN_EVENT_TABLE(SizerFrame, wxFrame)
- EVT_SIZE(SizerFrame::OnSize)
-END_EVENT_TABLE()
-
-
-// Size the subwindows when the frame is resized
-void SizerFrame::OnSize(wxSizeEvent& event)
-{
- wxFrame::OnSize(event);
- panel->Layout();
-}
-
-//-----------------------------------------------------------------
-// NewSizerFrame
-//-----------------------------------------------------------------
-
-NewSizerFrame::NewSizerFrame(wxFrame *frame, char *title, int x, int y ):
+MySizerFrame::MySizerFrame(wxFrame *frame, char *title, int x, int y ):
wxFrame(frame, -1, title, wxPoint(x, y) )
{
// we want to get a dialog that is stretchable because it
// has a text ctrl in the middle. at the bottom, we have
// two buttons which.
- topsizer = new wxBox( wxVERTICAL );
-
+ wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
+
// 1) top: create wxStaticText with minimum size equal to its default size
- topsizer->Add(
+ topsizer->Add(
new wxStaticText( this, -1, "An explanation (wxALIGN_RIGHT)." ),
0, // make vertically unstretchable
wxALIGN_RIGHT | // right align text
5 ); // set border width to 5
// 2) top: create wxTextCtrl with minimum size (100x60)
- topsizer->Add(
+ topsizer->Add(
new wxTextCtrl( this, -1, "My text (wxEXPAND).", wxDefaultPosition, wxSize(100,60), wxTE_MULTILINE),
1, // make vertically stretchable
wxEXPAND | // make horizontally stretchable
wxALL, // and make border all around
5 ); // set border width to 5
+ // 2.5) Gratuitous test of wxStaticBoxSizers
+ wxBoxSizer *statsizer = new wxStaticBoxSizer(
+ new wxStaticBox(this, -1, "A wxStaticBoxSizer"),
+ wxVERTICAL );
+ statsizer->Add(
+ new wxStaticText(this, -1, "And some TEXT inside it"),
+ 0,
+ wxCENTER |
+ wxALL,
+ 30);
+ topsizer->Add(statsizer, 1, wxEXPAND | wxALL, 10);
+
+ // 2.7) And a test of wxGridSizer
+ wxGridSizer *gridsizer = new wxGridSizer(2, 5, 5);
+ gridsizer->Add(new wxStaticText(this, -1, "Label"), 0,
+ wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL);
+ gridsizer->Add(new wxTextCtrl(this, -1, "Grid sizer demo"), 1,
+ wxGROW | wxALIGN_CENTER_VERTICAL);
+ gridsizer->Add(new wxStaticText(this, -1, "Another label"), 0,
+ wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL);
+ gridsizer->Add(new wxTextCtrl(this, -1, "More text"), 1,
+ wxGROW | wxALIGN_CENTER_VERTICAL);
+ gridsizer->Add(new wxStaticText(this, -1, "Final label"), 0,
+ wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL);
+ gridsizer->Add(new wxTextCtrl(this, -1, "And yet more text"), 1,
+ wxGROW | wxALIGN_CENTER_VERTICAL);
+ topsizer->Add(gridsizer, 1, wxGROW | wxALL, 10);
+
// 3) middle: create wxStaticLine with minimum size (3x3)
- topsizer->Add(
- new wxStaticLine( this, -1, wxDefaultPosition, wxSize(3,3), wxHORIZONTAL),
+ topsizer->Add(
+ new wxStaticLine( this, -1, wxDefaultPosition, wxSize(3,3), wxHORIZONTAL),
0, // make vertically unstretchable
wxEXPAND | // make horizontally stretchable
wxALL, // and make border all around
5 ); // set border width to 5
-
- // 4) bottom: create two centred wxButtons
- wxBox *button_box = new wxBox( wxHORIZONTAL );
+
+ // 4) bottom: create two centred wxButtons
+ wxBoxSizer *button_box = new wxBoxSizer( wxHORIZONTAL );
button_box->Add(
- new wxButton( this, -1, "Two buttons in a box" ),
+ new wxButton( this, -1, "Two buttons in a box" ),
0, // make horizontally unstretchable
wxALL, // make border all around
7 ); // set border width to 7
button_box->Add(
- new wxButton( this, -1, "(wxCENTER)" ),
+ new wxButton( this, -1, "(wxCENTER)" ),
0, // make horizontally unstretchable
wxALL, // make border all around
7 ); // set border width to 7
-
- topsizer->Add(
+
+ topsizer->Add(
button_box,
0, // make vertically unstretchable
wxCENTER ); // no border and centre horizontally
-
- // set frame to minimum size
- topsizer->Fit( this );
-
- // don't allow frame to get smaller than what the sizers tell ye
- topsizer->SetSizeHints( this );
-
- // layout widgets
- topsizer->Layout();
-}
-
-// This can later be removed if we integrate wxNewSizers
-// into wxWindows
+ SetAutoLayout( TRUE );
-BEGIN_EVENT_TABLE(NewSizerFrame, wxFrame)
- EVT_SIZE(NewSizerFrame::OnSize)
-END_EVENT_TABLE()
+ // set frame to minimum size
+ topsizer->Fit( this );
-void NewSizerFrame::OnSize(wxSizeEvent& event)
-{
- wxFrame::OnSize(event);
+ // don't allow frame to get smaller than what the sizers tell ye
+ topsizer->SetSizeHints( this );
- wxSize client_size( GetClientSize() );
-
- topsizer->SetDimension( 0, 0, client_size.x, client_size.y );
+ SetSizer( topsizer );
}
+
projects / wxWidgets.git / blobdiff