Extensive documentation typo patch (closes #13063).

[wxWidgets.git] / samples / opengl / isosurf / isosurf.cpp

diff --git a/samples/opengl/isosurf/isosurf.cpp b/samples/opengl/isosurf/isosurf.cpp
index fb8039efa78b22c5e83278f97b20404a29358061..a2ea654f916d98f1d7f5fcec5c4d304480a224d1 100644 (file)
--- a/samples/opengl/isosurf/isosurf.cpp
+++ b/samples/opengl/isosurf/isosurf.cpp
@@ -51,14 +51,13 @@ GLboolean g_lighting = GL_TRUE;
 
 IMPLEMENT_APP(MyApp)
 
 
 IMPLEMENT_APP(MyApp)
 

-// `Main program' equivalent, creating windows and returning main app frame

 bool MyApp::OnInit()
 {
     if ( !wxApp::OnInit() )
         return false;
 
     // Create the main frame window
 bool MyApp::OnInit()
 {
     if ( !wxApp::OnInit() )
         return false;
 
     // Create the main frame window

-    SetTopWindow(new MyFrame(NULL, wxT("wxWidgets OpenGL Isosurf Sample")));
+    MyFrame *frame = new MyFrame(NULL, wxT("wxWidgets OpenGL Isosurf Sample"));

 
     return true;
 }
 
     return true;
 }


@@ -93,9 +92,8 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(wxID_EXIT, MyFrame::OnExit)
 END_EVENT_TABLE()
 
     EVT_MENU(wxID_EXIT, MyFrame::OnExit)
 END_EVENT_TABLE()
 

-// My frame constructor

 MyFrame::MyFrame(wxFrame *frame, const wxString& title, const wxPoint& pos,
 MyFrame::MyFrame(wxFrame *frame, const wxString& title, const wxPoint& pos,

-    const wxSize& size, long style)
+                 const wxSize& size, long style)

     : wxFrame(frame, wxID_ANY, title, pos, size, style),
       m_canvas(NULL)
 {
     : wxFrame(frame, wxID_ANY, title, pos, size, style),
       m_canvas(NULL)
 {


@@ -105,9 +103,9 @@ MyFrame::MyFrame(wxFrame *frame, const wxString& title, const wxPoint& pos,
     // Make a menubar
     wxMenu *fileMenu = new wxMenu;
 
     // Make a menubar
     wxMenu *fileMenu = new wxMenu;
 

-    fileMenu->Append(wxID_EXIT, _T("E&xit"));
+    fileMenu->Append(wxID_EXIT, wxT("E&xit"));

     wxMenuBar *menuBar = new wxMenuBar;
     wxMenuBar *menuBar = new wxMenuBar;

-    menuBar->Append(fileMenu, _T("&File"));
+    menuBar->Append(fileMenu, wxT("&File"));

     SetMenuBar(menuBar);
 
 
     SetMenuBar(menuBar);
 
 


@@ -232,8 +230,12 @@ void TestGLCanvas::LoadSurface(const wxString& filename)
 
     delete stream;
 
 
     delete stream;
 

-    wxLogMessage(_T("Loaded %d vertices, %d triangles from '%s'"),
+    wxLogMessage(wxT("Loaded %d vertices, %d triangles from '%s'"),

                  m_numverts, m_numverts-2, filename.c_str());
                  m_numverts, m_numverts-2, filename.c_str());

+
+    // NOTE: for some reason under wxGTK the following is required to avoid that
+    //       the surface gets rendered in a small rectangle in the top-left corner of the frame
+    PostSizeEventToParent();

 }
 
 void TestGLCanvas::OnPaint( wxPaintEvent& WXUNUSED(event) )
 }
 
 void TestGLCanvas::OnPaint( wxPaintEvent& WXUNUSED(event) )


@@ -345,9 +347,9 @@ void TestGLCanvas::OnMouseEvent(wxMouseEvent& event)
     // (for key events).
     event.Skip();
 
     // (for key events).
     event.Skip();
 

-    if(event.LeftIsDown())
+    if (event.LeftIsDown())

     {
     {

-        if(!dragging)
+        if (!dragging)

         {
             dragging = 1;
         }
         {
             dragging = 1;
         }