do use context menu event under wxGTK, it is supported there now

[wxWidgets.git] / demos / life / dialogs.cpp

diff --git a/demos/life/dialogs.cpp b/demos/life/dialogs.cpp
index 0d8989793e44f13340f59e66c2635d6a1dca893a..f995c62e2464ed5229423d98f2bcf4b441212baa 100644 (file)
--- a/demos/life/dialogs.cpp
+++ b/demos/life/dialogs.cpp
@@ -40,7 +40,7 @@
 // resources
 // --------------------------------------------------------------------------
 
 // 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
     // logo for the about dialog
     #include "bitmaps/life.xpm"
 #endif


@@ -93,16 +93,16 @@ LifeSamplesDialog::LifeSamplesDialog(wxWindow *parent)
         0, NULL,
         wxLB_SINGLE | wxLB_NEEDED_SB | wxLB_HSCROLL );
 
         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"));
     m_life   = new Life();
 
     // descriptions
     wxStaticBox *statbox = new wxStaticBox( this, -1, _("Description"));
     m_life   = new Life();

-    m_life->SetShape(g_shapes[0]);
+    m_life->SetPattern(g_patterns[0]);

     m_canvas = new LifeCanvas( this, m_life, FALSE );
     m_text   = new wxTextCtrl( this, -1,
     m_canvas = new LifeCanvas( this, m_life, FALSE );
     m_text   = new wxTextCtrl( this, -1,

-        g_shapes[0].m_desc,
+        g_patterns[0].m_description,

         wxDefaultPosition,
         wxSize(300, 60),
         wxTE_MULTILINE | wxTE_READONLY);
         wxDefaultPosition,
         wxSize(300, 60),
         wxTE_MULTILINE | wxTE_READONLY);


@@ -136,9 +136,9 @@ LifeSamplesDialog::~LifeSamplesDialog()
     m_canvas->Destroy();
 }
 
     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)
 }
 
 void LifeSamplesDialog::OnListBox(wxCommandEvent& event)


@@ -148,15 +148,14 @@ void LifeSamplesDialog::OnListBox(wxCommandEvent& event)
     if (sel != -1)
     {
         m_value = m_list->GetSelection();
     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);
             m_canvas->SetCellSize(8);

+        else
+            m_canvas->SetCellSize(2);

     }
 }
 
     }
 }
 


@@ -173,7 +172,7 @@ LifeAboutDialog::LifeAboutDialog(wxWindow *parent)
 {
     // logo
     wxBitmap bmp = wxBITMAP(life);
 {
     // 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);
     bmp.SetMask(new wxMask(bmp, *wxBLUE));
 #endif
     wxStaticBitmap *sbmp = new wxStaticBitmap(this, -1, bmp);


@@ -182,11 +181,11 @@ LifeAboutDialog::LifeAboutDialog(wxWindow *parent)
     wxBoxSizer *sizer = new wxBoxSizer( wxVERTICAL );
     sizer->Add( sbmp, 0, wxCENTRE | wxALL, 10 );
     sizer->Add( new wxStaticLine(this, -1), 0, wxGROW | wxLEFT | wxRIGHT, 5 );
     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! version 2.1 for wxWindows\n\n"
-                                  "(c) 2000 Guillermo Rodriguez Garcia\n\n"
-                                  "<guille@iies.es>\n\n"
-                                  "Portions of the code are based in XLife;\n"
-                                  "XLife is (c) 1989 by Jon Bennett et al.")),
+    sizer->Add( CreateTextSizer(_("Life! version 2.2 for wxWindows\n\n\
+(c) 2000 Guillermo Rodriguez Garcia\n\n\
+<guille@iies.es>\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 );
     sizer->Add( CreateButtonSizer(wxOK), 0, wxCENTRE | wxALL, 10 );
                                   0, wxCENTRE | wxALL, 20 );
     sizer->Add( new wxStaticLine(this, -1), 0, wxGROW | wxLEFT | wxRIGHT, 5 );
     sizer->Add( CreateButtonSizer(wxOK), 0, wxCENTRE | wxALL, 10 );