Changeset 7283 for OpenSceneGraph/trunk/examples/osgviewerWX/osgviewerWX.cpp

Timestamp:

08/24/07 11:42:11 (6 years ago)

Author:

robert

Message:

From Mario Valle,

osgviewerWX: "To make the example compile using a wx build non UNICODE based.
Tested on Linux with wxGTK 2.8.4"

osgviewerFOX: "Added removeChore() call in the FOX_OSG_MDIView destructor to get rid of a Trace/BPT trap
error on exit on Linux. BTW this is suggested also in the FOX documentation."

Files:

• OpenSceneGraph/trunk/examples/osgviewerWX/osgviewerWX.cpp (modified) (11 diffs)

OpenSceneGraph/trunk/examples/osgviewerWX/osgviewerWX.cpp

@@ -28 +28 @@
     // create osg canvas
     //    - initialize
-    
+
 
     int width = 800;
@@ -35 +35 @@
     GraphicsWindowWX* gw = new GraphicsWindowWX(frame, wxID_ANY, wxDefaultPosition,
                                                 wxSize(width, height), wxSUNKEN_BORDER);
-    
-    
+
+
     osgViewer::Viewer *viewer = new osgViewer::Viewer;
     viewer->getCamera()->setGraphicsContext(gw);
@@ -42 +42 @@
     viewer->addEventHandler(new osgViewer::StatsHandler);
     viewer->setThreadingModel(osgViewer::Viewer::SingleThreaded);
-        
+
     // load the scene.
     osg::ref_ptr<osg::Node> loadedModel = osgDB::readNodeFile("cow.osg");
@@ -49 +49 @@
         return false;
     }
-    
+
     viewer->setSceneData(loadedModel.get());
     viewer->setCameraManipulator(new osgGA::TrackballManipulator);
@@ -82 +82 @@
 {
     _viewer->frame();
-    
+
     event.RequestMore();
 }
@@ -101 +101 @@
     // default cursor to standard
     _oldCursor = *wxSTANDARD_CURSOR;
-    
+
     _traits = new GraphicsContext::Traits;
     _traits->x = pos.x;
@@ -109 +109 @@
 
     init();
-    
+
 }
 
@@ -122 +122 @@
         {
             getState()->setContextID( _traits->sharedContext->getState()->getContextID() );
-            incrementContextIDUsageCount( getState()->getContextID() );   
+            incrementContextIDUsageCount( getState()->getContextID() );
         }
         else
@@ -149 +149 @@
     int width, height;
     GetClientSize(&width, &height);
-    
+
     // update the window dimensions, in case the window has been resized.
     getEventQueue()->windowResize(0, 0, width, height);
@@ -162 +162 @@
 void GraphicsWindowWX::OnKeyDown(wxKeyEvent &event)
 {
-#if 1
+#if wxUSE_UNICODE
     int key = event.GetUnicodeKey();
 #else
     int key = event.GetKeyCode();
 #endif
-    getEventQueue()->keyPress(key);    
+    getEventQueue()->keyPress(key);
 
     // propagate event
@@ -175 +175 @@
 void GraphicsWindowWX::OnKeyUp(wxKeyEvent &event)
 {
-#if 1
+#if wxUSE_UNICODE
     int key = event.GetUnicodeKey();
 #else
     int key = event.GetKeyCode();
 #endif
-    getEventQueue()->keyRelease(key);    
+    getEventQueue()->keyRelease(key);
 
     // propagate event