diff --git a/3d-viewer/3d_canvas.cpp b/3d-viewer/3d_canvas.cpp
index 024b2da5fe..682e7dd483 100644
--- a/3d-viewer/3d_canvas.cpp
+++ b/3d-viewer/3d_canvas.cpp
@@ -493,11 +493,11 @@ void Pcb3D_GLCanvas::OnPaint( wxPaintEvent& event )
 void Pcb3D_GLCanvas::OnSize( wxSizeEvent& event )
 /**********************************************/
 {
+    int w, h;
+    // set GL viewport (not called by wxGLCanvas::OnSize on all platforms...)
     // this is also necessary to update the context on some platforms
     wxGLCanvas::OnSize( event );
 
-    // set GL viewport (not called by wxGLCanvas::OnSize on all platforms...)
-    int w, h;
     GetClientSize( &w, &h );
 #ifndef __WXMOTIF__
     if( GetContext() )
@@ -506,6 +506,8 @@ void Pcb3D_GLCanvas::OnSize( wxSizeEvent& event )
         SetCurrent();
         glViewport( 0, 0, (GLint) w, (GLint) h );
     }
+
+    event.Skip();
 }
 
 
diff --git a/3d-viewer/3d_draw.cpp b/3d-viewer/3d_draw.cpp
index c54ae69660..4502227239 100644
--- a/3d-viewer/3d_draw.cpp
+++ b/3d-viewer/3d_draw.cpp
@@ -75,9 +75,7 @@ void Pcb3D_GLCanvas::Redraw( bool finish )
         glCallList( m_gllist );
     else
     {
-        m_gllist = CreateDrawGL_List();
-
-//		m_gllist = DisplayCubeforTest();	// Only for test
+        CreateDrawGL_List();
     }
 
     glFlush();
@@ -93,7 +91,6 @@ GLuint Pcb3D_GLCanvas::CreateDrawGL_List()
 /* Create the draw list items
  */
 {
-    GLuint               gllist   = glGenLists( 1 );
     WinEDA_BasePcbFrame* pcbframe = m_Parent->m_Parent;
     BOARD*               pcb = pcbframe->m_Pcb;
     TRACK*               pt_piste;
@@ -101,6 +98,8 @@ GLuint Pcb3D_GLCanvas::CreateDrawGL_List()
 
     wxBusyCursor         dummy;
 
+    m_gllist = glGenLists( 1 );
+
     pcb->ComputeBoundaryBox();
     g_Parm_3D_Visu.m_BoardSettings = pcb->m_BoardSettings;
     g_Parm_3D_Visu.m_BoardSize  = pcb->m_BoundaryBox.GetSize();
@@ -134,7 +133,7 @@ GLuint Pcb3D_GLCanvas::CreateDrawGL_List()
     g_Parm_3D_Visu.m_LayerZcoord[ECO1_N]    = zpos_cmp + zpos_cu;
     g_Parm_3D_Visu.m_LayerZcoord[ECO2_N]    = zpos_cmp + zpos_cu;
 
-    glNewList( gllist, GL_COMPILE_AND_EXECUTE );
+    glNewList( m_gllist, GL_COMPILE_AND_EXECUTE );
 
     glColorMaterial( GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE );
 
@@ -223,7 +222,7 @@ GLuint Pcb3D_GLCanvas::CreateDrawGL_List()
     GLenum err = glGetError();
     if( err != GL_NO_ERROR )
         DisplayError( this, wxT( "Error in GL commands" ) );
-    return gllist;
+    return m_gllist;
 }
 
 
diff --git a/3d-viewer/3d_frame.cpp b/3d-viewer/3d_frame.cpp
index ed906faf3a..fe1ad3b819 100644
--- a/3d-viewer/3d_frame.cpp
+++ b/3d-viewer/3d_frame.cpp
@@ -309,6 +309,7 @@ void WinEDA3D_DrawFrame::NewDisplay()
 /*****************************************/
 {
     m_Canvas->ClearLists();
+    m_Canvas->CreateDrawGL_List();
     m_Canvas->InitGL();
     m_Canvas->DisplayStatus();
     m_Canvas->Refresh( true );
diff --git a/cvpcb/dialog_display_options.cpp b/cvpcb/dialog_display_options.cpp
index c89441b8d6..3cbf141ceb 100644
--- a/cvpcb/dialog_display_options.cpp
+++ b/cvpcb/dialog_display_options.cpp
@@ -108,6 +108,7 @@ bool WinEDA_FootprintDisplayOptionsFrame::Create( wxWindow* parent, wxWindowID i
     m_IsShowPadFill = NULL;
     m_IsShowPadNum = NULL;
     BottomBoxSizer = NULL;
+    m_CancelButton = NULL;
 ////@end WinEDA_FootprintDisplayOptionsFrame member initialisation
 
 ////@begin WinEDA_FootprintDisplayOptionsFrame creation
@@ -133,7 +134,7 @@ void WinEDA_FootprintDisplayOptionsFrame::CreateControls()
 	SetFont(*g_DialogFont);
 
 ////@begin WinEDA_FootprintDisplayOptionsFrame content construction
-    // Generated by DialogBlocks, 27/10/2007 09:57:04 (unregistered)
+    // Generated by DialogBlocks, 21/07/2008 15:12:47 (unregistered)
 
     WinEDA_FootprintDisplayOptionsFrame* itemDialog1 = this;
 
@@ -168,7 +169,7 @@ void WinEDA_FootprintDisplayOptionsFrame::CreateControls()
 
     m_IsShowPadNum = new wxCheckBox( itemDialog1, PADNUM_OPT, _("Display Pad &Num"), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE );
     m_IsShowPadNum->SetValue(false);
-    if (ShowToolTips())
+    if (WinEDA_FootprintDisplayOptionsFrame::ShowToolTips())
         m_IsShowPadNum->SetToolTip(_("Display pad number"));
     ColumnBoxSizer->Add(m_IsShowPadNum, 1, wxGROW|wxALL, 5);
 
@@ -188,9 +189,9 @@ void WinEDA_FootprintDisplayOptionsFrame::CreateControls()
     itemButton13->SetForegroundColour(wxColour(255, 0, 0));
     BottomBoxSizer->Add(itemButton13, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
 
-    wxButton* itemButton14 = new wxButton( itemDialog1, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxDefaultSize, 0 );
-    itemButton14->SetForegroundColour(wxColour(0, 0, 255));
-    BottomBoxSizer->Add(itemButton14, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+    m_CancelButton = new wxButton( itemDialog1, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_CancelButton->SetForegroundColour(wxColour(0, 0, 255));
+    BottomBoxSizer->Add(m_CancelButton, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
 
     wxButton* itemButton15 = new wxButton( itemDialog1, wxID_APPLY, _("&Apply"), wxDefaultPosition, wxDefaultSize, 0 );
     BottomBoxSizer->Add(itemButton15, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
@@ -201,6 +202,8 @@ void WinEDA_FootprintDisplayOptionsFrame::CreateControls()
     m_IsShowPadFill->SetValidator( wxGenericValidator(& DisplayOpt.DisplayPadFill) );
     m_IsShowPadNum->SetValidator( wxGenericValidator(& DisplayOpt.DisplayPadNum) );
 ////@end WinEDA_FootprintDisplayOptionsFrame content construction
+
+    m_CancelButton->SetFocus();     /* Necessary to use escape key as cancel under wxGRk */
 }
 
 /*!
diff --git a/cvpcb/dialog_display_options.h b/cvpcb/dialog_display_options.h
index 4d278014b0..0544d56078 100644
--- a/cvpcb/dialog_display_options.h
+++ b/cvpcb/dialog_display_options.h
@@ -121,6 +121,7 @@ public:
     wxCheckBox* m_IsShowPadFill;
     wxCheckBox* m_IsShowPadNum;
     wxBoxSizer* BottomBoxSizer;
+    wxButton* m_CancelButton;
 ////@end WinEDA_FootprintDisplayOptionsFrame member variables
 
 	WinEDA_BasePcbFrame * m_Parent;
diff --git a/cvpcb/dialog_display_options.pjd b/cvpcb/dialog_display_options.pjd
index 976f8614e9..c4db3764a6 100644
--- a/cvpcb/dialog_display_options.pjd
+++ b/cvpcb/dialog_display_options.pjd
@@ -10,8 +10,10 @@
     <bool name="convert_images_to_xpm">0</bool>
     <bool name="inline_images">0</bool>
     <bool name="generate_cpp_for_xrc">0</bool>
+    <long name="working_mode">1</long>
     <bool name="use_help_text_for_tooltips">1</bool>
     <bool name="translate_strings">1</bool>
+    <bool name="make_unicode_strings">1</bool>
     <bool name="extract_strings">0</bool>
     <string name="user_name">"jean-pierre Charras"</string>
     <string name="copyright_string">"License GNU"</string>
@@ -106,10 +108,12 @@
     <bool name="use_resource_archive">0</bool>
     <bool name="use_generated_xrc_cpp">0</bool>
     <bool name="always_generate_xrc">1</bool>
+    <bool name="use_id_name_for_name">0</bool>
     <bool name="archive_xrc_files">1</bool>
     <bool name="archive_image_files">1</bool>
     <bool name="archive_all_image_files">0</bool>
     <bool name="xrc_retain_relative_paths">1</bool>
+    <bool name="xrc_generate_id_tags">0</bool>
   </header>
   <data>
     <document>
@@ -132,6 +136,7 @@
         <long name="locked">0</long>
         <string name="template-name">""</string>
         <bool name="dirty">1</bool>
+        <long name="makefile-last-written">0</long>
         <string name="Compiler name">""</string>
         <string name="Build mode">"Debug"</string>
         <string name="Unicode mode">"ANSI"</string>
@@ -173,6 +178,8 @@
         <string name="wxWidgets build command">"%AUTO%"</string>
         <string name="wxWidgets clean command">"%AUTO%"</string>
         <string name="PATH variable">"%AUTO%"</string>
+        <bool name="Suppress source rules">0</bool>
+        <bool name="Enable makefile generation">1</bool>
       </document>
     </document>
   </data>
@@ -213,6 +220,7 @@
           <bool name="use-id-suffix">0</bool>
           <string name="id-suffix">""</string>
           <long name="use-xrc">0</long>
+          <long name="working-mode">0</long>
           <string name="proxy-Id name">"ID_DIALOG"</string>
           <long name="proxy-Id value">10000</long>
           <string name="proxy-Class">"WinEDA_FootprintDisplayOptionsFrame"</string>
@@ -233,10 +241,16 @@
           <bool name="proxy-Hidden">0</bool>
           <bool name="proxy-Enabled">1</bool>
           <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
+          <string name="proxy-Data source">""</string>
+          <string name="proxy-Data class name">""</string>
+          <string name="proxy-Data class implementation filename">""</string>
+          <string name="proxy-Data class header filename">""</string>
+          <string name="proxy-Data class manager window">""</string>
+          <string name="proxy-Texture">""</string>
+          <string name="proxy-Texture style">"Tiled"</string>
           <bool name="proxy-wxDEFAULT_DIALOG_STYLE">1</bool>
           <bool name="proxy-wxCAPTION">0</bool>
           <bool name="proxy-wxRESIZE_BORDER">0</bool>
-          <bool name="proxy-wxTHICK_FRAME">0</bool>
           <bool name="proxy-wxSYSTEM_MENU">0</bool>
           <bool name="proxy-wxSTAY_ON_TOP">0</bool>
           <bool name="proxy-wxDIALOG_NO_PARENT">0</bool>
@@ -322,6 +336,7 @@
                 <string name="proxy-type">"wbRadioBoxProxy"</string>
                 <string name="proxy-Id name">"EDGE_SELECT"</string>
                 <long name="proxy-Id value">10001</long>
+                <string name="proxy-Name">""</string>
                 <string name="proxy-Class">"wxRadioBox"</string>
                 <string name="proxy-Base class">"wxRadioBox"</string>
                 <bool name="proxy-External implementation">1</bool>
@@ -343,6 +358,11 @@
                 <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
                 <string name="proxy-Data variable">"DisplayOpt.DisplayModEdge"</string>
                 <string name="proxy-Data validator">"wxGenericValidator(&amp; %VARIABLE%)"</string>
+                <string name="proxy-Data source">""</string>
+                <string name="proxy-Data class name">""</string>
+                <string name="proxy-Data class implementation filename">""</string>
+                <string name="proxy-Data class header filename">""</string>
+                <string name="proxy-Data class manager window">""</string>
                 <bool name="proxy-wxRA_SPECIFY_ROWS">0</bool>
                 <bool name="proxy-wxRA_SPECIFY_COLS">1</bool>
                 <bool name="proxy-wxWANTS_CHARS">0</bool>
@@ -380,6 +400,7 @@
                 <string name="proxy-type">"wbRadioBoxProxy"</string>
                 <string name="proxy-Id name">"TEXT_SELECT"</string>
                 <long name="proxy-Id value">10002</long>
+                <string name="proxy-Name">""</string>
                 <string name="proxy-Class">"wxRadioBox"</string>
                 <string name="proxy-Base class">"wxRadioBox"</string>
                 <bool name="proxy-External implementation">1</bool>
@@ -401,6 +422,11 @@
                 <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
                 <string name="proxy-Data variable">"DisplayOpt.DisplayModText"</string>
                 <string name="proxy-Data validator">"wxGenericValidator(&amp; %VARIABLE%)"</string>
+                <string name="proxy-Data source">""</string>
+                <string name="proxy-Data class name">""</string>
+                <string name="proxy-Data class implementation filename">""</string>
+                <string name="proxy-Data class header filename">""</string>
+                <string name="proxy-Data class manager window">""</string>
                 <bool name="proxy-wxRA_SPECIFY_ROWS">0</bool>
                 <bool name="proxy-wxRA_SPECIFY_COLS">1</bool>
                 <bool name="proxy-wxWANTS_CHARS">0</bool>
@@ -463,6 +489,7 @@
                   <string name="proxy-type">"wbCheckBoxProxy"</string>
                   <string name="proxy-Id name">"PADFILL_OPT"</string>
                   <long name="proxy-Id value">10003</long>
+                  <string name="proxy-Name">""</string>
                   <string name="proxy-Class">"wxCheckBox"</string>
                   <string name="proxy-Base class">"wxCheckBox"</string>
                   <bool name="proxy-External implementation">1</bool>
@@ -476,6 +503,11 @@
                   <string name="proxy-Tooltip text">""</string>
                   <string name="proxy-Data variable">"DisplayOpt.DisplayPadFill"</string>
                   <string name="proxy-Data validator">"wxGenericValidator(&amp; %VARIABLE%)"</string>
+                  <string name="proxy-Data source">""</string>
+                  <string name="proxy-Data class name">""</string>
+                  <string name="proxy-Data class implementation filename">""</string>
+                  <string name="proxy-Data class header filename">""</string>
+                  <string name="proxy-Data class manager window">""</string>
                   <string name="proxy-Background colour">""</string>
                   <string name="proxy-Foreground colour">""</string>
                   <string name="proxy-Font">""</string>
@@ -521,6 +553,7 @@
                   <string name="proxy-type">"wbCheckBoxProxy"</string>
                   <string name="proxy-Id name">"PADNUM_OPT"</string>
                   <long name="proxy-Id value">10004</long>
+                  <string name="proxy-Name">""</string>
                   <string name="proxy-Class">"wxCheckBox"</string>
                   <string name="proxy-Base class">"wxCheckBox"</string>
                   <bool name="proxy-External implementation">1</bool>
@@ -534,6 +567,11 @@
                   <string name="proxy-Tooltip text">"Display pad number"</string>
                   <string name="proxy-Data variable">"DisplayOpt.DisplayPadNum"</string>
                   <string name="proxy-Data validator">"wxGenericValidator(&amp; %VARIABLE%)"</string>
+                  <string name="proxy-Data source">""</string>
+                  <string name="proxy-Data class name">""</string>
+                  <string name="proxy-Data class implementation filename">""</string>
+                  <string name="proxy-Data class header filename">""</string>
+                  <string name="proxy-Data class manager window">""</string>
                   <string name="proxy-Background colour">""</string>
                   <string name="proxy-Foreground colour">""</string>
                   <string name="proxy-Font">""</string>
@@ -606,6 +644,7 @@
                   <string name="event-handler-0">"wxEVT_COMMAND_BUTTON_CLICKED|OnSaveConfigClick|||"</string>
                   <string name="proxy-Id name">"ID_SAVE_CONFIG"</string>
                   <long name="proxy-Id value">10005</long>
+                  <string name="proxy-Name">""</string>
                   <string name="proxy-Class">"wxButton"</string>
                   <string name="proxy-Base class">"wxButton"</string>
                   <bool name="proxy-External implementation">1</bool>
@@ -617,6 +656,13 @@
                   <bool name="proxy-Default">0</bool>
                   <string name="proxy-Help text">""</string>
                   <string name="proxy-Tooltip text">""</string>
+                  <string name="proxy-Data variable">""</string>
+                  <string name="proxy-Data validator">""</string>
+                  <string name="proxy-Data source">""</string>
+                  <string name="proxy-Data class name">""</string>
+                  <string name="proxy-Data class implementation filename">""</string>
+                  <string name="proxy-Data class header filename">""</string>
+                  <string name="proxy-Data class manager window">""</string>
                   <string name="proxy-Background colour">""</string>
                   <string name="proxy-Foreground colour">""</string>
                   <string name="proxy-Font">""</string>
@@ -666,6 +712,7 @@
               <string name="proxy-type">"wbStaticLineProxy"</string>
               <string name="proxy-Id name">"ID_STATICLINE1"</string>
               <long name="proxy-Id value">10006</long>
+              <string name="proxy-Name">""</string>
               <string name="proxy-Class">"wxStaticLine"</string>
               <string name="proxy-Base class">"wxStaticLine"</string>
               <bool name="proxy-External implementation">1</bool>
@@ -746,6 +793,7 @@
                 <string name="event-handler-0">"wxEVT_COMMAND_BUTTON_CLICKED|OnOkClick|NONE||"</string>
                 <string name="proxy-Id name">"wxID_OK"</string>
                 <long name="proxy-Id value">5100</long>
+                <string name="proxy-Name">""</string>
                 <string name="proxy-Class">"wxButton"</string>
                 <string name="proxy-Base class">"wxButton"</string>
                 <bool name="proxy-External implementation">1</bool>
@@ -757,6 +805,13 @@
                 <bool name="proxy-Default">1</bool>
                 <string name="proxy-Help text">""</string>
                 <string name="proxy-Tooltip text">""</string>
+                <string name="proxy-Data variable">""</string>
+                <string name="proxy-Data validator">""</string>
+                <string name="proxy-Data source">""</string>
+                <string name="proxy-Data class name">""</string>
+                <string name="proxy-Data class implementation filename">""</string>
+                <string name="proxy-Data class header filename">""</string>
+                <string name="proxy-Data class manager window">""</string>
                 <string name="proxy-Background colour">""</string>
                 <string name="proxy-Foreground colour">"FF0000"</string>
                 <string name="proxy-Font">""</string>
@@ -802,20 +857,28 @@
                 <long name="locked">0</long>
                 <string name="created">"24/10/2007"</string>
                 <string name="proxy-type">"wbButtonProxy"</string>
-                <string name="event-handler-0">"wxEVT_COMMAND_BUTTON_CLICKED|OnCancelClick|NONE||"</string>
+                <string name="event-handler-0">"wxEVT_COMMAND_BUTTON_CLICKED|OnCancelClick|NONE||WinEDA_FootprintDisplayOptionsFrame"</string>
                 <string name="proxy-Id name">"wxID_CANCEL"</string>
                 <long name="proxy-Id value">5101</long>
+                <string name="proxy-Name">""</string>
                 <string name="proxy-Class">"wxButton"</string>
                 <string name="proxy-Base class">"wxButton"</string>
                 <bool name="proxy-External implementation">1</bool>
                 <bool name="proxy-Separate files">0</bool>
                 <string name="proxy-Implementation filename">""</string>
                 <string name="proxy-Header filename">""</string>
-                <string name="proxy-Member variable name">""</string>
+                <string name="proxy-Member variable name">"m_CancelButton"</string>
                 <string name="proxy-Label">"&amp;Cancel"</string>
                 <bool name="proxy-Default">0</bool>
                 <string name="proxy-Help text">""</string>
                 <string name="proxy-Tooltip text">""</string>
+                <string name="proxy-Data variable">""</string>
+                <string name="proxy-Data validator">""</string>
+                <string name="proxy-Data source">""</string>
+                <string name="proxy-Data class name">""</string>
+                <string name="proxy-Data class implementation filename">""</string>
+                <string name="proxy-Data class header filename">""</string>
+                <string name="proxy-Data class manager window">""</string>
                 <string name="proxy-Background colour">""</string>
                 <string name="proxy-Foreground colour">"0000FF"</string>
                 <string name="proxy-Font">""</string>
@@ -864,6 +927,7 @@
                 <string name="event-handler-0">"wxEVT_COMMAND_BUTTON_CLICKED|OnApplyClick|NONE||"</string>
                 <string name="proxy-Id name">"wxID_APPLY"</string>
                 <long name="proxy-Id value">5102</long>
+                <string name="proxy-Name">""</string>
                 <string name="proxy-Class">"wxButton"</string>
                 <string name="proxy-Base class">"wxButton"</string>
                 <bool name="proxy-External implementation">1</bool>
@@ -875,6 +939,13 @@
                 <bool name="proxy-Default">0</bool>
                 <string name="proxy-Help text">""</string>
                 <string name="proxy-Tooltip text">""</string>
+                <string name="proxy-Data variable">""</string>
+                <string name="proxy-Data validator">""</string>
+                <string name="proxy-Data source">""</string>
+                <string name="proxy-Data class name">""</string>
+                <string name="proxy-Data class implementation filename">""</string>
+                <string name="proxy-Data class header filename">""</string>
+                <string name="proxy-Data class manager window">""</string>
                 <string name="proxy-Background colour">""</string>
                 <string name="proxy-Foreground colour">""</string>
                 <string name="proxy-Font">""</string>
diff --git a/kicad/mainframe.cpp b/kicad/mainframe.cpp
index c16bcb78db..ef87e78a2d 100644
--- a/kicad/mainframe.cpp
+++ b/kicad/mainframe.cpp
@@ -185,6 +185,7 @@ void WinEDA_MainFrame::OnSashDrag( wxSashEvent& event )
 
     wxLayoutAlgorithm layout;
     layout.LayoutFrame( this );
+    event.Skip();
 }
 
 
@@ -214,6 +215,8 @@ void WinEDA_MainFrame::OnSize( wxSizeEvent& event )
     layout.LayoutFrame( this );
     if( m_CommandWin )
         m_CommandWin->Refresh( TRUE );
+    
+    event.Skip();
 }
 
 
diff --git a/pcbnew/tool_pcb.cpp b/pcbnew/tool_pcb.cpp
index 3ae8c3eda1..b383f68107 100644
--- a/pcbnew/tool_pcb.cpp
+++ b/pcbnew/tool_pcb.cpp
@@ -163,7 +163,7 @@ void WinEDA_PcbFrame::PrepareLayerIndicator()
 
     if( m_HToolBar )
     {
-#if wxCHECK_VERSION( 2, 8, 3 )
+#if wxCHECK_VERSION( 2, 8, 3 ) & !defined(__WXX11__)
         m_HToolBar->SetToolNormalBitmap( ID_AUX_TOOLBAR_PCB_SELECT_LAYER_PAIR, *LayerPairBitmap );
 #else
         int pos = m_HToolBar->GetToolPos( ID_AUX_TOOLBAR_PCB_SELECT_LAYER_PAIR );