From 1f602af6153fb5ad74159ef50a8228bca622a55d Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 10 Apr 2007 16:51:52 +0000
Subject: [PATCH] rename the menu to avoid conflict with a standard Mac menu

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45387 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 samples/opengl/cube/cube.cpp | 25 +++++++++++++------------
 samples/opengl/cube/cube.h   |  2 +-
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/samples/opengl/cube/cube.cpp b/samples/opengl/cube/cube.cpp
index 783ed604e7..4b549dc05c 100644
--- a/samples/opengl/cube/cube.cpp
+++ b/samples/opengl/cube/cube.cpp
@@ -87,10 +87,10 @@ BEGIN_EVENT_TABLE(TestGLCanvas, wxGLCanvas)
     EVT_KEY_DOWN(TestGLCanvas::OnKeyDown)
 END_EVENT_TABLE()
 
-static /* const */ int attribs[] = { WX_GL_RGBA, WX_GL_DOUBLEBUFFER, 0 };
+static const int attribs[] = { WX_GL_RGBA, WX_GL_DOUBLEBUFFER, 0 };
 
 TestGLCanvas::TestGLCanvas(wxWindow *parent)
-            : wxGLCanvas(parent, wxID_ANY, attribs)
+            : wxGLCanvas(parent, wxID_ANY, NULL /* attribs */)
 {
     m_gllist = 0;
 
@@ -101,8 +101,6 @@ TestGLCanvas::TestGLCanvas(wxWindow *parent)
 // this function is called on each repaint so it should be fast
 void TestGLCanvas::Render()
 {
-    wxGetApp().SetCurrent(this);
-
     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
     glCallList(m_gllist);
 
@@ -112,6 +110,8 @@ void TestGLCanvas::Render()
 
 void TestGLCanvas::OnPaint(wxPaintEvent& WXUNUSED(event))
 {
+    wxGetApp().SetCurrent(this);
+
     // initialize if not done yet
     InitGL();
 
@@ -141,8 +141,6 @@ void TestGLCanvas::InitGL()
     if ( IsInitialized() )
         return;
 
-    wxGetApp().SetCurrent(this);
-
     /* set viewing projection */
     glMatrixMode(GL_PROJECTION);
     glLoadIdentity();
@@ -253,8 +251,8 @@ void TestGLCanvas::OnKeyDown( wxKeyEvent& event )
 // ----------------------------------------------------------------------------
 
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
-    EVT_MENU(wxID_EXIT, MyFrame::OnExit)
     EVT_MENU(wxID_NEW, MyFrame::OnNewWindow)
+    EVT_MENU(wxID_CLOSE, MyFrame::OnClose)
 END_EVENT_TABLE()
 
 MyFrame::MyFrame()
@@ -266,18 +264,21 @@ MyFrame::MyFrame()
     SetIcon(wxICON(sample));
 
     // Make a menubar
-    wxMenu *winMenu = new wxMenu;
-    winMenu->Append(wxID_EXIT, _T("&Close"));
-    winMenu->Append(wxID_NEW, _T("&New") );
+    wxMenu *menu = new wxMenu;
+    menu->Append(wxID_NEW);
+    menu->AppendSeparator();
+    menu->Append(wxID_CLOSE);
     wxMenuBar *menuBar = new wxMenuBar;
-    menuBar->Append(winMenu, _T("&Window"));
+    menuBar->Append(menu, _T("&Cube"));
 
     SetMenuBar(menuBar);
 
+    CreateStatusBar();
+
     Show();
 }
 
-void MyFrame::OnExit( wxCommandEvent& WXUNUSED(event) )
+void MyFrame::OnClose(wxCommandEvent& WXUNUSED(event))
 {
     // true is to force the frame to close
     Close(true);
diff --git a/samples/opengl/cube/cube.h b/samples/opengl/cube/cube.h
index 1fa19dc7c9..a67e7b0a34 100644
--- a/samples/opengl/cube/cube.h
+++ b/samples/opengl/cube/cube.h
@@ -45,7 +45,7 @@ public:
     void RefreshCanvas();
 
 private:
-    void OnExit(wxCommandEvent& event);
+    void OnClose(wxCommandEvent& event);
     void OnNewWindow(wxCommandEvent& event);
     void OnDefRotateLeftKey(wxCommandEvent& event);
     void OnDefRotateRightKey(wxCommandEvent& event);
-- 
2.47.2