1. PositionToXY() off-by-2 (!) bug corrected

[wxWidgets.git] / samples / wxpoem / wxpoem.cpp

diff --git a/samples/wxpoem/wxpoem.cpp b/samples/wxpoem/wxpoem.cpp
index cc3f25bad6da580ac591dbe0ef7e6a51623bc866..dea7b5ac0f73e2c83e6f696c1e3d51eff2853862 100644 (file)
--- a/samples/wxpoem/wxpoem.cpp
+++ b/samples/wxpoem/wxpoem.cpp
@@ -35,7 +35,7 @@
 
 #include "wxpoem.h"
 
-#ifdef __WXGTK__
+#if defined(__WXGTK__) || defined(__WXMOTIF__)
 #include "corner1.xpm"
 #include "corner2.xpm"
 #include "corner3.xpm"
@@ -159,6 +159,14 @@ MainWindow::MainWindow(wxFrame *frame, wxWindowID id, const wxString& title,
 {
 }
 
+MainWindow::~MainWindow()
+{
+  // Note: this must be done before the main window/canvas are destroyed
+  // or we get an error (no parent window for menu item button)
+  delete popupMenu;
+  popupMenu = NULL;
+}
+
 // Read the poetry buffer, either for finding the size
 // or for writing to a bitmap (not to the window directly,
 // since that displays messily)
@@ -639,7 +647,7 @@ bool MyApp::OnInit()
   Corner3 = new wxIcon("icon_3");
   Corner4 = new wxIcon("icon_4");
 #endif
-#ifdef __WXGTK__
+#if defined(__WXGTK__) || defined(__WXMOTIF__)
   Corner1 = new wxIcon( corner1_xpm );
   Corner2 = new wxIcon( corner2_xpm );
   Corner3 = new wxIcon( corner3_xpm );
@@ -658,17 +666,14 @@ int MyApp::OnExit()
   if (backingBitmap)
     delete backingBitmap;
   delete HelpController;
-  delete popupMenu;
   delete GreyPen;
   delete DarkGreyPen;
   delete WhitePen;
 
-//#ifdef __WXMSW__
   delete Corner1;
   delete Corner2;
   delete Corner3;
   delete Corner4;
-//#endif
 
   delete NormalFont;
   delete BoldFont;
@@ -1070,7 +1075,7 @@ bool Compile(void)
 
 void PopupFunction(wxMenu& /*menu*/, wxCommandEvent& event)
 {
-  switch (event.m_commandInt)
+  switch (event.GetId())
   {
      case POEM_NEXT:
        // Another poem/page