compilation fixes

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

diff --git a/samples/wxpoem/wxpoem.cpp b/samples/wxpoem/wxpoem.cpp
index 4890c8f92aa5a213f61189e0ff6aaadb03723fe4..2a2d89c03166c89552208c26e779dd7e2b505147 100644 (file)
--- a/samples/wxpoem/wxpoem.cpp
+++ b/samples/wxpoem/wxpoem.cpp
@@ -131,7 +131,6 @@ void            CopyToClipboard(HWND, char *);
 #endif
 
 wxMenu    *popupMenu = NULL;
 #endif
 
 wxMenu    *popupMenu = NULL;

-void PopupFunction(wxMenu& menu, wxCommandEvent& event);

 
 #if wxUSE_HELP
     wxHelpController *HelpController = NULL;
 
 #if wxUSE_HELP
     wxHelpController *HelpController = NULL;


@@ -152,6 +151,7 @@ void CreateFonts()
 BEGIN_EVENT_TABLE(MainWindow, wxFrame)
     EVT_CLOSE(MainWindow::OnCloseWindow)
     EVT_CHAR(MainWindow::OnChar)
 BEGIN_EVENT_TABLE(MainWindow, wxFrame)
     EVT_CLOSE(MainWindow::OnCloseWindow)
     EVT_CHAR(MainWindow::OnChar)

+    EVT_MENU(-1, MainWindow::OnPopup)

 END_EVENT_TABLE()
 
 MainWindow::MainWindow(wxFrame *frame, wxWindowID id, const wxString& title,
 END_EVENT_TABLE()
 
 MainWindow::MainWindow(wxFrame *frame, wxWindowID id, const wxString& title,


@@ -616,7 +616,7 @@ bool MyApp::OnInit()
 
   TheMainWindow->canvas = new MyCanvas(TheMainWindow, 501, wxDefaultPosition, wxDefaultSize);
 
 
   TheMainWindow->canvas = new MyCanvas(TheMainWindow, 501, wxDefaultPosition, wxDefaultSize);
 

-  popupMenu = new wxMenu("", (wxFunction)PopupFunction);
+  popupMenu = new wxMenu;

   popupMenu->Append(POEM_NEXT, "Next poem/page");
   popupMenu->Append(POEM_PREVIOUS, "Previous page");
   popupMenu->AppendSeparator();
   popupMenu->Append(POEM_NEXT, "Next poem/page");
   popupMenu->Append(POEM_PREVIOUS, "Previous page");
   popupMenu->AppendSeparator();


@@ -729,11 +729,10 @@ void MyCanvas::OnPaint(wxPaintEvent& WXUNUSED(event))
 
 void MyCanvas::OnMouseEvent(wxMouseEvent& event)
 {
 
 void MyCanvas::OnMouseEvent(wxMouseEvent& event)
 {

-  long x, y;
-  event.Position(&x, &y);

   static int startPosX, startPosY, startFrameX, startFrameY;
 
   static int startPosX, startPosY, startFrameX, startFrameY;
 

-  event.Position(&x, &y);
+  long x, y;
+  event.GetPosition(&x, &y);

 
   if (event.RightDown())
   {
 
   if (event.RightDown())
   {


@@ -1074,7 +1073,7 @@ bool Compile(void)
     return TRUE;
 }
 
     return TRUE;
 }
 

-void PopupFunction(wxMenu& /*menu*/, wxCommandEvent& event)
+void MainWindow::OnPopup(wxCommandEvent& event)

 {
   switch (event.GetId())
   {
 {
   switch (event.GetId())
   {

diff --git a/samples/wxpoem/wxpoem.h b/samples/wxpoem/wxpoem.h
index ea2e00e40f34ae7696f2fbabc4e3430872d5bf60..2f65c220edffa514d7fcacd370247a4457fdad8c 100644 (file)
--- a/samples/wxpoem/wxpoem.h
+++ b/samples/wxpoem/wxpoem.h
@@ -51,6 +51,7 @@ class MainWindow: public wxFrame
 
     void OnCloseWindow(wxCloseEvent& event);
     void OnChar(wxKeyEvent& event);
 
     void OnCloseWindow(wxCloseEvent& event);
     void OnChar(wxKeyEvent& event);

+    void OnPopup(wxCommandEvent& event);

 
     // Display next page or poem
     void NextPage(void);
 
     // Display next page or poem
     void NextPage(void);