X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2fa7c206f68655f226e37ce1f1cc7e646e6c0bf2..d73ae65656793cc988fd95a56beb02a82fd1736b:/demos/life/dialogs.cpp diff --git a/demos/life/dialogs.cpp b/demos/life/dialogs.cpp index bc041cb3ea..7712e995a5 100644 --- a/demos/life/dialogs.cpp +++ b/demos/life/dialogs.cpp @@ -29,17 +29,18 @@ #endif #include "wx/statline.h" -#include "wx/spinctrl.h" +#include "wx/minifram.h" #include "dialogs.h" #include "life.h" #include "game.h" + // -------------------------------------------------------------------------- // resources // -------------------------------------------------------------------------- -#if defined(__WXGTK__) || defined(__WXMOTIF__) +#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXX11__) // logo for the about dialog #include "bitmaps/life.xpm" #endif @@ -54,21 +55,17 @@ // IDs for the controls and the menu commands enum { - // bmp window in about dialog - ID_BMPWIN = 2001, - // listbox in samples dialog ID_LISTBOX }; // -------------------------------------------------------------------------- -// event tables and other macros for wxWindows +// event tables and other macros for wxWidgets // -------------------------------------------------------------------------- // Event tables BEGIN_EVENT_TABLE(LifeSamplesDialog, wxDialog) EVT_LISTBOX (ID_LISTBOX, LifeSamplesDialog::OnListBox) - END_EVENT_TABLE() @@ -81,14 +78,11 @@ END_EVENT_TABLE() // -------------------------------------------------------------------------- LifeSamplesDialog::LifeSamplesDialog(wxWindow *parent) - : wxDialog(parent, -1, - _("Sample games"), - wxDefaultPosition, - wxDefaultSize, - wxDEFAULT_DIALOG_STYLE | wxDIALOG_MODAL) + : wxDialog(parent, wxID_ANY, _("Sample games"), + wxDefaultPosition, wxDefaultSize) { m_value = 0; - + // create and populate the list of available samples m_list = new wxListBox( this, ID_LISTBOX, wxDefaultPosition, @@ -96,39 +90,42 @@ LifeSamplesDialog::LifeSamplesDialog(wxWindow *parent) 0, NULL, wxLB_SINGLE | wxLB_NEEDED_SB | wxLB_HSCROLL ); - for (unsigned i = 0; i < (sizeof(g_shapes) / sizeof(LifeShape)); i++) - m_list->Append(g_shapes[i].m_name); + for (unsigned i = 0; i < (sizeof(g_patterns) / sizeof(LifePattern)); i++) + m_list->Append(g_patterns[i].m_name); // descriptions - wxStaticBox *statbox = new wxStaticBox( this, -1, _("Description")); + wxStaticBox *statbox = new wxStaticBox( this, wxID_ANY, _("Description")); m_life = new Life(); - m_life->SetShape(g_shapes[0]); - m_canvas = new LifeCanvas( this, m_life, FALSE ); - m_text = new wxTextCtrl( this, -1, - g_shapes[0].m_desc, + m_life->SetPattern(g_patterns[0]); + m_canvas = new LifeCanvas( this, m_life, false ); + m_text = new wxTextCtrl( this, wxID_ANY, + g_patterns[0].m_description, wxDefaultPosition, wxSize(300, 60), wxTE_MULTILINE | wxTE_READONLY); // layout components wxStaticBoxSizer *sizer1 = new wxStaticBoxSizer( statbox, wxVERTICAL ); - sizer1->Add( m_canvas, 2, wxGROW | wxCENTRE | wxALL, 5); - sizer1->Add( m_text, 1, wxGROW | wxCENTRE | wxALL, 5 ); + sizer1->Add( m_canvas, 2, wxGROW | wxALL, 5); + sizer1->Add( m_text, 1, wxGROW | wxALL, 5 ); wxBoxSizer *sizer2 = new wxBoxSizer( wxHORIZONTAL ); - sizer2->Add( m_list, 0, wxGROW | wxCENTRE | wxALL, 5 ); - sizer2->Add( sizer1, 1, wxGROW | wxCENTRE | wxALL, 5 ); + sizer2->Add( m_list, 0, wxGROW | wxALL, 5 ); + sizer2->Add( sizer1, 1, wxGROW | wxALL, 5 ); wxBoxSizer *sizer3 = new wxBoxSizer( wxVERTICAL ); sizer3->Add( CreateTextSizer(_("Select one configuration")), 0, wxALL, 10 ); - sizer3->Add( new wxStaticLine(this, -1), 0, wxGROW | wxLEFT | wxRIGHT, 10 ); - sizer3->Add( sizer2, 1, wxGROW | wxCENTRE | wxALL, 5 ); - sizer3->Add( new wxStaticLine(this, -1), 0, wxGROW | wxLEFT | wxRIGHT, 10 ); +#if wxUSE_STATLINE + sizer3->Add( new wxStaticLine(this, wxID_ANY), 0, wxGROW | wxLEFT | wxRIGHT, 10 ); +#endif // wxUSE_STATLINE + sizer3->Add( sizer2, 1, wxGROW | wxALL, 5 ); +#if wxUSE_STATLINE + sizer3->Add( new wxStaticLine(this, wxID_ANY), 0, wxGROW | wxLEFT | wxRIGHT, 10 ); +#endif // wxUSE_STATLINE sizer3->Add( CreateButtonSizer(wxOK | wxCANCEL), 0, wxCENTRE | wxALL, 10 ); // activate SetSizer(sizer3); - SetAutoLayout(TRUE); sizer3->SetSizeHints(this); sizer3->Fit(this); Centre(wxBOTH | wxCENTRE_ON_SCREEN); @@ -139,9 +136,9 @@ LifeSamplesDialog::~LifeSamplesDialog() m_canvas->Destroy(); } -const LifeShape& LifeSamplesDialog::GetShape() +const LifePattern& LifeSamplesDialog::GetPattern() { - return g_shapes[m_value]; + return g_patterns[m_value]; } void LifeSamplesDialog::OnListBox(wxCommandEvent& event) @@ -151,15 +148,14 @@ void LifeSamplesDialog::OnListBox(wxCommandEvent& event) if (sel != -1) { m_value = m_list->GetSelection(); - m_text->SetValue(g_shapes[ sel ].m_desc); - m_life->SetShape(g_shapes[ sel ]); + m_text->SetValue(g_patterns[ sel ].m_description); + m_life->SetPattern(g_patterns[ sel ]); - // quick and dirty :-) - if ((g_shapes[ sel ].m_width > 36) || - (g_shapes[ sel ].m_height > 22)) - m_canvas->SetCellSize(2); - else + // these values shouldn't be hardcoded... + if ((size_t)sel < (sizeof(g_patterns) / sizeof(LifePattern)) - 3) m_canvas->SetCellSize(8); + else + m_canvas->SetCellSize(2); } } @@ -168,36 +164,39 @@ void LifeSamplesDialog::OnListBox(wxCommandEvent& event) // -------------------------------------------------------------------------- LifeAboutDialog::LifeAboutDialog(wxWindow *parent) - : wxDialog(parent, -1, - _("About Life!"), - wxDefaultPosition, - wxDefaultSize, - wxDEFAULT_DIALOG_STYLE | wxDIALOG_MODAL) + : wxDialog(parent, wxID_ANY, _("About Life!"), + wxDefaultPosition, wxDefaultSize) { // logo wxBitmap bmp = wxBITMAP(life); -#if !defined(__WXGTK__) && !defined(__WXMOTIF__) +#if !defined(__WXGTK__) && !defined(__WXMOTIF__) && !defined(__WXMAC__) bmp.SetMask(new wxMask(bmp, *wxBLUE)); #endif - wxStaticBitmap *sbmp = new wxStaticBitmap(this, -1, bmp); + wxStaticBitmap *sbmp = new wxStaticBitmap(this, wxID_ANY, bmp); // layout components wxBoxSizer *sizer = new wxBoxSizer( wxVERTICAL ); sizer->Add( sbmp, 0, wxCENTRE | wxALL, 10 ); - sizer->Add( new wxStaticLine(this, -1), 0, wxGROW | wxLEFT | wxRIGHT, 5 ); - sizer->Add( CreateTextSizer(_("Life! for wxWindows, version 2.0\n\n" - "(c) 2000 Guillermo Rodriguez Garcia\n\n" - "\n\n" - "Portions of the code are based in XLife\n" - "XLife is (c) 1989 by Jon Bennett et al.")), +#if wxUSE_STATLINE + sizer->Add( new wxStaticLine(this, wxID_ANY), 0, wxGROW | wxLEFT | wxRIGHT, 5 ); +#endif // wxUSE_STATLINE + sizer->Add( CreateTextSizer(_("Life! version 2.2 for wxWidgets\n\n\ +(c) 2000 Guillermo Rodriguez Garcia\n\n\ +\n\n\ +Portions of the code are based in XLife;\n\ +XLife is (c) 1989 by Jon Bennett et al.")), 0, wxCENTRE | wxALL, 20 ); - sizer->Add( new wxStaticLine(this, -1), 0, wxGROW | wxLEFT | wxRIGHT, 5 ); +#if wxUSE_STATLINE + sizer->Add( new wxStaticLine(this, wxID_ANY), 0, wxGROW | wxLEFT | wxRIGHT, 5 ); +#endif // wxUSE_STATLINE sizer->Add( CreateButtonSizer(wxOK), 0, wxCENTRE | wxALL, 10 ); // activate SetSizer(sizer); - SetAutoLayout(TRUE); sizer->SetSizeHints(this); sizer->Fit(this); Centre(wxBOTH | wxCENTRE_ON_SCREEN); } + + +