Changeset 164

Timestamp:

10/06/10 11:58:53 (20 months ago)

Author:

Carsten

Message:

CaWE: Fixed arrow keys handling in 3D views under wxGTK.

Location:

cafu/trunk/CaWE

Files:

• ChildFrameViewWin2D.cpp (modified) (3 diffs)
• ChildFrameViewWin2D.hpp (modified) (1 diff)
• ChildFrameViewWin3D.cpp (modified) (1 diff)

cafu/trunk/CaWE/ChildFrameViewWin2D.cpp

@@ -88 +88 @@
     EVT_SCROLLWIN         (ViewWindow2DT::OnScroll          )     // Scroll event.
     EVT_PAINT             (ViewWindow2DT::OnPaint           )     // Paint event.
-    EVT_ERASE_BACKGROUND  (ViewWindow2DT::OnEraseBackground )     // Erase background event.
     EVT_SIZE              (ViewWindow2DT::OnSize            )     // Size event.
     EVT_MOUSE_CAPTURE_LOST(ViewWindow2DT::OnMouseCaptureLost)
@@ -109 +108 @@
 {
     SetMinSize(wxSize(120, 90));
+    SetBackgroundStyle(wxBG_STYLE_PAINT);   // Our paint event handler handles erasing the background.
 
     SetZoom(0.25);                  // Calls UpdateScrollbars(), which calls SetScrollbar(hor/ver) and Refresh(), then calls SetScrollPos(hor/ver).
@@ -1313 +1313 @@
 
 
-void ViewWindow2DT::OnEraseBackground(wxEraseEvent& EE)
-{
-    // Do nothing (i.e. do *not* erase the background).
-}
-
-
 void ViewWindow2DT::OnSize(wxSizeEvent& SE)
 {

cafu/trunk/CaWE/ChildFrameViewWin2D.hpp

@@ -146 +146 @@
     void OnContextMenu     (wxContextMenuEvent&      CE);
     void OnPaint           (wxPaintEvent&            PE);
-    void OnEraseBackground (wxEraseEvent&            EE);
     void OnSize            (wxSizeEvent&             SE);
     void OnMouseCaptureLost(wxMouseCaptureLostEvent& ME);

cafu/trunk/CaWE/ChildFrameViewWin3D.cpp

@@ -479 +479 @@
             break;
 
+        case WXK_UP:
+        case WXK_DOWN:
+        case WXK_LEFT:
+        case WXK_RIGHT:
+            // Handle the arrow keys here (so that KE.Skip() is not called for them), in order to
+            // prevent (under wxGTK) that the default processing moves the focus to another window.
+            break;
+
         default:
             KE.Skip();