From: Julian Smart <julian@anthemion.co.uk>
Date: Wed, 9 Dec 1998 18:12:31 +0000 (+0000)
Subject: Various fixes incl. checking in .po/.mo files
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/94f52d90c97b067b4626cc4cd6ac46a71fa54484?ds=sidebyside

Various fixes incl. checking in .po/.mo files


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1144 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/samples/dynamic/dynamic.cpp b/samples/dynamic/dynamic.cpp
index e8be267bda..3bf016f19f 100644
--- a/samples/dynamic/dynamic.cpp
+++ b/samples/dynamic/dynamic.cpp
@@ -60,8 +60,8 @@ bool MyApp::OnInit(void)
   // Create the main frame window
   MyFrame *frame = new MyFrame(NULL, "Dynamic wxWindows App", 50, 50, 450, 340);
 
-  frame->Connect( DYNAMIC_QUIT,  -1, wxEVT_COMMAND_MENU_SELECTED, (wxObjectEventFunction)MyFrame::OnQuit );
-  frame->Connect( DYNAMIC_ABOUT, -1, wxEVT_COMMAND_MENU_SELECTED, (wxObjectEventFunction)MyFrame::OnAbout );
+  frame->Connect( DYNAMIC_QUIT,  -1, wxEVT_COMMAND_MENU_SELECTED, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) MyFrame::OnQuit );
+  frame->Connect( DYNAMIC_ABOUT, -1, wxEVT_COMMAND_MENU_SELECTED, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) MyFrame::OnAbout );
 
   // Give it an icon
 #ifdef __WXMSW__
diff --git a/samples/ownerdrw/ownerdrw.cpp b/samples/ownerdrw/ownerdrw.cpp
index 87f8c89da5..27815e5424 100644
--- a/samples/ownerdrw/ownerdrw.cpp
+++ b/samples/ownerdrw/ownerdrw.cpp
@@ -241,6 +241,8 @@ OwnerDrawnFrame::OwnerDrawnFrame(wxFrame *frame, char *title, int x, int y, int
     
   }
 
+  delete[] astrChoices;
+
   // create the status line
   const int widths[] = { -1, 60 };
   CreateStatusBar(2);
diff --git a/samples/treectrl/treetest.h b/samples/treectrl/treetest.h
index 9adacc8acf..fd921e2f64 100644
--- a/samples/treectrl/treetest.h
+++ b/samples/treectrl/treetest.h
@@ -54,7 +54,7 @@ public:
   void OnItemCollapsing(wxTreeEvent& event);
   void OnSelChanged(wxTreeEvent& event);
   void OnSelChanging(wxTreeEvent& event);
-  void OnTreeKeyDown(wxTreeEvent& event);
+  void OnTreeKeyDown(wxKeyEvent& event);
 
   void GetItemsRecursively(const wxTreeItemId& idParent, long cookie);