Fix 3D frame issue when iconized (Windows only).

cvpcb/class_DisplayFootprintsFrame.cpp

@@ -106,7 +106,7 @@ DISPLAY_FOOTPRINTS_FRAME::DISPLAY_FOOTPRINTS_FRAME( CVPCB_MAINFRAME* father,
                           wxAuiPaneInfo( vert ).Name( wxT( "m_VToolBar" ) ).Right() );
 
     m_auimgr.AddPane( DrawPanel,
-                      wxAuiPaneInfo().Name( wxT( "DrawFrame" ) ).CentrePane() );
+                      wxAuiPaneInfo().Name( wxT( "DisplayFrame" ) ).CentrePane() );
 
     m_auimgr.AddPane( MsgPanel,
                       wxAuiPaneInfo( horiz ).Name( wxT( "MsgPanel" ) ).Bottom() );
@@ -126,7 +126,7 @@ DISPLAY_FOOTPRINTS_FRAME::~DISPLAY_FOOTPRINTS_FRAME()
     delete GetScreen();
     SetScreen( NULL );
 
-    ( (CVPCB_MAINFRAME*) wxGetApp().GetTopWindow() )->DrawFrame = NULL;
+    ( (CVPCB_MAINFRAME*) wxGetApp().GetTopWindow() )->m_DisplayFootprintFrame = NULL;
 }
 
 /* Called when the frame is closed
@@ -134,12 +134,8 @@ DISPLAY_FOOTPRINTS_FRAME::~DISPLAY_FOOTPRINTS_FRAME()
  */
 void DISPLAY_FOOTPRINTS_FRAME::OnCloseWindow( wxCloseEvent& event )
 {
-    wxPoint pos;
-    wxSize  size;
-
-    size = GetSize();
-    pos  = GetPosition();
-
+    if( m_Draw3DFrame )
+        m_Draw3DFrame->Close(true);
     SaveSettings();
     Destroy();
 }
@@ -408,6 +404,10 @@ void DISPLAY_FOOTPRINTS_FRAME::Show3D_Frame( wxCommandEvent& event )
 {
     if( m_Draw3DFrame )
     {
+        // Raising the window does not show the window on Windows if iconized.
+        // This should work on any platform.
+        if( m_Draw3DFrame->IsIconized() )
+             m_Draw3DFrame->Iconize( false );
         m_Draw3DFrame->Raise();
 
         // Raising the window does not set the focus on Linux.  This should work on any platform.

cvpcb/class_footprints_listbox.cpp

@@ -244,7 +244,7 @@ void FOOTPRINTS_LISTBOX::OnLeftClick( wxListEvent& event )
 
     Module = GetParent()->m_footprints.GetModuleInfo( FootprintName );
     wxASSERT(Module);
-    if( GetParent()->DrawFrame )
+    if( GetParent()->m_DisplayFootprintFrame )
     {
         GetParent()->CreateScreenCmp(); /* refresh general */
     }

cvpcb/cvpcb_mainframe.h

@@ -17,7 +17,6 @@ class COMPONENTS_LISTBOX;
 class DISPLAY_FOOTPRINTS_FRAME;
 
 
-
 /**
  * The CVPcb application main window.
  */
@@ -26,18 +25,18 @@ class CVPCB_MAINFRAME : public EDA_BASE_FRAME
 public:
 
     bool m_KeepCvpcbOpen;
-    FOOTPRINTS_LISTBOX*  m_FootprintList;
-    COMPONENTS_LISTBOX*  m_ListCmp;
-    DISPLAY_FOOTPRINTS_FRAME* DrawFrame;
-    EDA_TOOLBAR*         m_HToolBar;
-    wxFileName           m_NetlistFileName;
-    wxArrayString        m_ModuleLibNames;
-    wxArrayString        m_AliasLibNames;
-    wxString             m_UserLibraryPath;
-    wxString             m_NetlistFileExtension;
-    wxString             m_DocModulesFileName;
-    FOOTPRINT_LIST       m_footprints;
-    COMPONENT_LIST       m_components;
+    FOOTPRINTS_LISTBOX*       m_FootprintList;
+    COMPONENTS_LISTBOX*       m_ListCmp;
+    DISPLAY_FOOTPRINTS_FRAME* m_DisplayFootprintFrame;
+    EDA_TOOLBAR* m_HToolBar;
+    wxFileName m_NetlistFileName;
+    wxArrayString             m_ModuleLibNames;
+    wxArrayString             m_AliasLibNames;
+    wxString        m_UserLibraryPath;
+    wxString        m_NetlistFileExtension;
+    wxString        m_DocModulesFileName;
+    FOOTPRINT_LIST  m_footprints;
+    COMPONENT_LIST  m_components;
 
 protected:
     int             m_undefinedComponentCnt;
@@ -45,9 +44,8 @@ protected:
     bool            m_isEESchemaNetlist;
     PARAM_CFG_ARRAY m_projectFileParams;
 
-public:
-    CVPCB_MAINFRAME( const wxString& title,
-                       long            style = KICAD_DEFAULT_DRAWFRAME_STYLE );
+public: CVPCB_MAINFRAME( const wxString& title,
+                         long            style = KICAD_DEFAULT_DRAWFRAME_STYLE );
     ~CVPCB_MAINFRAME();
 
     void             OnLeftClick( wxListEvent& event );
@@ -108,21 +106,21 @@ public:
      * fills m_footprints
      * @return true if libraries are found, false otherwise.
      */
-    bool LoadFootprintFiles( );
+    bool             LoadFootprintFiles();
 
     /**
      * function GenNetlistPcbnew
      * writes the output netlist file
      *
      */
-    int GenNetlistPcbnew( FILE* f, bool isEESchemaNetlist = true );
+    int              GenNetlistPcbnew( FILE* f, bool isEESchemaNetlist = true );
 
     /**
      * Function LoadComponentFile
      * Loads the .cmp file that stores the component/footprint association.
      * @param aCmpFileName = the full filename of .cmp file to load
      */
-    bool LoadComponentFile( const wxString& aCmpFileName );
+    bool             LoadComponentFile( const wxString& aCmpFileName );
 
     PARAM_CFG_ARRAY& GetProjectFileParameters( void );
 

cvpcb/setvisu.cpp

@@ -31,28 +31,32 @@ void CVPCB_MAINFRAME::CreateScreenCmp()
 
     FootprintName = m_FootprintList->GetSelectedFootprint();
 
-    if( DrawFrame == NULL )
+    if( m_DisplayFootprintFrame == NULL )
     {
-        DrawFrame = new DISPLAY_FOOTPRINTS_FRAME( this, _( "Module" ),
+        m_DisplayFootprintFrame = new DISPLAY_FOOTPRINTS_FRAME( this, _( "Module" ),
                                                   wxPoint( 0, 0 ),
                                                   wxSize( 600, 400 ),
                                                   KICAD_DEFAULT_DRAWFRAME_STYLE );
         IsNew = true;
-        DrawFrame->Show( true );
+        m_DisplayFootprintFrame->Show( true );
     }
     else
     {
-        DrawFrame->Raise();
+        // Raising the window does not show the window on Windows if iconized.
+        // This should work on any platform.
+        if( m_DisplayFootprintFrame->IsIconized() )
+             m_DisplayFootprintFrame->Iconize( false );
+        m_DisplayFootprintFrame->Raise();
 
         // Raising the window does not set the focus on Linux.  This should work on any platform.
-        if( wxWindow::FindFocus() != DrawFrame )
-            DrawFrame->SetFocus();
+        if( wxWindow::FindFocus() != m_DisplayFootprintFrame )
+            m_DisplayFootprintFrame->SetFocus();
     }
 
     if( !FootprintName.IsEmpty() )
     {
         msg = _( "Footprint: " ) + FootprintName;
-        DrawFrame->SetTitle( msg );
+        m_DisplayFootprintFrame->SetTitle( msg );
         FOOTPRINT_INFO* Module = m_footprints.GetModuleInfo( FootprintName );
         msg = _( "Lib: " );
 
@@ -61,32 +65,32 @@ void CVPCB_MAINFRAME::CreateScreenCmp()
         else
             msg += wxT( "???" );
 
-        DrawFrame->SetStatusText( msg, 0 );
+        m_DisplayFootprintFrame->SetStatusText( msg, 0 );
 
-        if( DrawFrame->GetBoard()->m_Modules.GetCount() )
+        if( m_DisplayFootprintFrame->GetBoard()->m_Modules.GetCount() )
         {
             // there is only one module in the list
-            DrawFrame->GetBoard()->m_Modules.DeleteAll();
+            m_DisplayFootprintFrame->GetBoard()->m_Modules.DeleteAll();
         }
 
-        MODULE* mod = DrawFrame->Get_Module( FootprintName );
+        MODULE* mod = m_DisplayFootprintFrame->Get_Module( FootprintName );
 
         if( mod )
-            DrawFrame->GetBoard()->m_Modules.PushBack( mod );
+            m_DisplayFootprintFrame->GetBoard()->m_Modules.PushBack( mod );
 
-        DrawFrame->Zoom_Automatique( false );
-        DrawFrame->DrawPanel->Refresh();
-        DrawFrame->UpdateStatusBar();    /* Display new cursor coordinates and zoom value */
+        m_DisplayFootprintFrame->Zoom_Automatique( false );
+        m_DisplayFootprintFrame->DrawPanel->Refresh();
+        m_DisplayFootprintFrame->UpdateStatusBar();    /* Display new cursor coordinates and zoom value */
 
-        if( DrawFrame->m_Draw3DFrame )
-            DrawFrame->m_Draw3DFrame->NewDisplay();
+        if( m_DisplayFootprintFrame->m_Draw3DFrame )
+            m_DisplayFootprintFrame->m_Draw3DFrame->NewDisplay();
     }
     else if( !IsNew )
     {
-        DrawFrame->Refresh();
+        m_DisplayFootprintFrame->Refresh();
 
-        if( DrawFrame->m_Draw3DFrame )
-            DrawFrame->m_Draw3DFrame->NewDisplay();
+        if( m_DisplayFootprintFrame->m_Draw3DFrame )
+            m_DisplayFootprintFrame->m_Draw3DFrame->NewDisplay();
     }
 }
 

pcbnew/edit.cpp

@@ -168,6 +168,8 @@ void PCB_EDIT_FRAME::Process_Special_Functions( wxCommandEvent& event )
         }
         else
         {
+            if( m_ModuleEditFrame->IsIconized() )
+                 m_ModuleEditFrame->Iconize( false );
             m_ModuleEditFrame->Raise();
 
             // Raising the window does not set the focus on Linux.  This should work on

pcbnew/moduleframe.cpp

@@ -325,6 +325,10 @@ void WinEDA_ModuleEditFrame::Show3D_Frame( wxCommandEvent& event )
 {
     if( m_Draw3DFrame )
     {
+        // Raising the window does not show the window on Windows if iconized.
+        // This should work on any platform.
+        if( m_Draw3DFrame->IsIconized() )
+             m_Draw3DFrame->Iconize( false );
         m_Draw3DFrame->Raise();
 
         // Raising the window does not set the focus on Linux.  This should work on any platform.

pcbnew/pcbframe.cpp

@@ -483,6 +483,10 @@ void PCB_EDIT_FRAME::Show3D_Frame( wxCommandEvent& event )
 {
     if( m_Draw3DFrame )
     {
+        // Raising the window does not show the window on Windows if iconized.
+        // This should work on any platform.
+        if( m_Draw3DFrame->IsIconized() )
+             m_Draw3DFrame->Iconize( false );
         m_Draw3DFrame->Raise();
 
         // Raising the window does not set the focus on Linux.  This should work on any platform.