Penguin Unicode compilation fix.

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

diff --git a/samples/opengl/penguin/penguin.cpp b/samples/opengl/penguin/penguin.cpp
index 12a70d4de1de8bd1ddd688e1a7c60e514b55cef3..0c686418359a00e5294aec9e690c30c57f833824 100644 (file)
--- a/samples/opengl/penguin/penguin.cpp
+++ b/samples/opengl/penguin/penguin.cpp
@@ -43,24 +43,24 @@
 #define VIEW_ASPECT 1.3
 
 /* `Main program' equivalent, creating windows and returning main app frame */
-bool MyApp::OnInit(void)
+bool MyApp::OnInit()
 {
 
   /* Create the main frame window */
-  MyFrame *frame = new MyFrame(NULL, "wxWindows OpenGL Demo", wxPoint(50, 50), wxSize(400, 300));
+  MyFrame *frame = new MyFrame(NULL, wxT("wxWindows OpenGL Demo"), wxPoint(50, 50), wxSize(400, 300));
 
   /* Make a menubar */
   wxMenu *fileMenu = new wxMenu;
 
-  fileMenu->Append(wxID_EXIT, "E&xit");
+  fileMenu->Append(wxID_EXIT, wxT("E&xit"));
   wxMenuBar *menuBar = new wxMenuBar;
-  menuBar->Append(fileMenu, "&File");
+  menuBar->Append(fileMenu, wxT("&File"));
   frame->SetMenuBar(menuBar);
 
-  frame->m_canvas = new TestGLCanvas(frame, -1, wxPoint(0, 0), wxSize(200, 200), wxSUNKEN_BORDER);
+  frame->SetCanvas( new TestGLCanvas(frame, -1, wxPoint(0, 0), wxSize(200, 200), wxSUNKEN_BORDER) );
 
   /* Load file wiht mesh data */
-  frame->m_canvas->LoadLWO( "penguin.lwo" );
+  frame->GetCanvas()->LoadLWO( wxT("penguin.lwo") );
 
   /* Show the frame */
   frame->Show(TRUE);
@@ -178,10 +178,10 @@ void TestGLCanvas::OnEraseBackground(wxEraseEvent& event)
 void TestGLCanvas::LoadLWO(const wxString &filename)
 {
     /* test if lightwave object */
-    if (!lw_is_lwobject(filename)) return;
+    if (!lw_is_lwobject(filename.mb_str())) return;
   
     /* read lightwave object */
-    lwObject *lwobject = lw_object_read(filename);
+    lwObject *lwobject = lw_object_read(filename.mb_str());
     
     /* scale */
     lw_object_scale(lwobject, 10.0 / lw_object_radius(lwobject));

diff --git a/samples/opengl/penguin/penguin.h b/samples/opengl/penguin/penguin.h
index a8e8550e65c06d233516f98c802f0006996009ea..d04c39988f220a7841f8421e5be070c40a35057d 100644 (file)
--- a/samples/opengl/penguin/penguin.h
+++ b/samples/opengl/penguin/penguin.h
@@ -29,11 +29,11 @@ extern "C" {
 typedef struct 
 {
 //  gint do_init;         /* true if initgl not yet called */
-  int do_init;
-  lwObject *lwobject;   /* lightwave object mesh */
-  float beginx,beginy;  /* position of mouse */
-  float quat[4];        /* orientation of object */
-  float zoom;           /* field of view in degrees */
+    int do_init;
+    lwObject *lwobject;   /* lightwave object mesh */
+    float beginx,beginy;  /* position of mouse */
+    float quat[4];        /* orientation of object */
+    float zoom;           /* field of view in degrees */
 } mesh_info;
 
 
@@ -46,6 +46,7 @@ public:
 
 /* Define a new frame type */
 class TestGLCanvas;
+
 class MyFrame: public wxFrame
 {
 public:
@@ -53,30 +54,35 @@ public:
         long style = wxDEFAULT_FRAME_STYLE);
 
     void OnExit(wxCommandEvent& event);
-public:
+    
+    void SetCanvas( TestGLCanvas *canvas )    { m_canvas = canvas; }
+    TestGLCanvas *GetCanvas()                 { return m_canvas; }
+    
+private:
     TestGLCanvas*    m_canvas;
 
-DECLARE_EVENT_TABLE()
+    DECLARE_EVENT_TABLE()
 };
 
 class TestGLCanvas: public wxGLCanvas
 {
- public:
-   TestGLCanvas(wxWindow *parent, const wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition,
-      const wxSize& size = wxDefaultSize, long style = 0, const wxString& name = "TestGLCanvas");
-   ~TestGLCanvas(void);
-
-   void OnPaint(wxPaintEvent& event);
-   void OnSize(wxSizeEvent& event);
-   void OnEraseBackground(wxEraseEvent& event);
-   void LoadLWO( const wxString &filename);
-   void OnMouse( wxMouseEvent& event );
-   void InitGL(void);
+public:
+    TestGLCanvas(wxWindow *parent, const wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition,
+        const wxSize& size = wxDefaultSize, long style = 0, const wxString& name = wxT("TestGLCanvas"));
+    ~TestGLCanvas(void);
+
+    void OnPaint(wxPaintEvent& event);
+    void OnSize(wxSizeEvent& event);
+    void OnEraseBackground(wxEraseEvent& event);
+    void LoadLWO( const wxString &filename);
+    void OnMouse( wxMouseEvent& event );
+    void InitGL(void);
    
-   mesh_info  info;
-   bool       block;
+    mesh_info  info;
+    bool       block;
 
-DECLARE_EVENT_TABLE()
+private:
+    DECLARE_EVENT_TABLE()
 };
 
 #endif