Code cleanup and minor fix in viewlib.

eeschema/tool_viewlib.cpp

@@ -105,10 +105,10 @@ void LIB_VIEW_FRAME::ReCreateHToolbar()
 
         m_mainToolBar->AddSeparator();
 
-        SelpartBox = new wxComboBox( m_mainToolBar, ID_LIBVIEW_SELECT_PART_NUMBER,
-                                     wxEmptyString, wxDefaultPosition,
-                                     wxSize( 150, -1 ), 0, NULL, wxCB_READONLY );
-        m_mainToolBar->AddControl( SelpartBox );
+        m_selpartBox = new wxComboBox( m_mainToolBar, ID_LIBVIEW_SELECT_PART_NUMBER,
+                                       wxEmptyString, wxDefaultPosition,
+                                       wxSize( 150, -1 ), 0, NULL, wxCB_READONLY );
+        m_mainToolBar->AddControl( m_selpartBox );
 
         m_mainToolBar->AddSeparator();
         m_mainToolBar->AddTool( ID_LIBVIEW_VIEWDOC, wxEmptyString,
@@ -116,7 +116,7 @@ void LIB_VIEW_FRAME::ReCreateHToolbar()
                                 _( "View component documents" ) );
         m_mainToolBar->EnableTool( ID_LIBVIEW_VIEWDOC, false );
 
-        if( m_Semaphore )
+        if( m_semaphore )
         {
             // The library browser is called from a "load component" command
             m_mainToolBar->AddSeparator();
@@ -167,17 +167,17 @@ void LIB_VIEW_FRAME::ReCreateHToolbar()
     if( component )
         parts_count = std::max( component->GetPartCount(), 1 );
 
-    SelpartBox->Clear();
+    m_selpartBox->Clear();
 
     for( ii = 0; ii < parts_count; ii++ )
     {
         wxString msg;
         msg.Printf( _( "Unit %c" ), 'A' + ii );
-        SelpartBox->Append( msg );
+        m_selpartBox->Append( msg );
     }
 
-    SelpartBox->SetSelection( (m_unit > 0 ) ? m_unit - 1 : 0 );
-    SelpartBox->Enable( parts_count > 1 );
+    m_selpartBox->SetSelection( (m_unit > 0 ) ? m_unit - 1 : 0 );
+    m_selpartBox->Enable( parts_count > 1 );
 
     m_mainToolBar->EnableTool( ID_LIBVIEW_VIEWDOC,
                                entry && ( entry->GetDocFileName() != wxEmptyString ) );

eeschema/viewlib_frame.h

 /*
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
- * Copyright (C) 2004 Jean-Pierre Charras, jaen-pierre.charras@gipsa-lab.inpg.com
- * Copyright (C) 2008-2011 Wayne Stambaugh <stambaughw@verizon.net>
- * Copyright (C) 2004-2011 KiCad Developers, see change_log.txt for contributors.
+ * Copyright (C) 2014 Jean-Pierre Charras, jp.charras at wanadoo.fr
+ * Copyright (C) 2008-2014 Wayne Stambaugh <stambaughw@verizon.net>
+ * Copyright (C) 2004-2014 KiCad Developers, see change_log.txt for contributors.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -48,20 +48,18 @@ class CMP_LIBRARY;
 class LIB_VIEW_FRAME : public SCH_BASE_FRAME
 {
 private:
-    wxComboBox*         SelpartBox;
+    wxComboBox*         m_selpartBox;
 
     // List of libraries (for selection )
-    wxSashLayoutWindow* m_LibListWindow;
-    wxListBox*          m_LibList;          // The list of libs
-    wxSize              m_LibListSize;      // size of the window
+    wxListBox*          m_libList;          // The list of libs
+    int                 m_libListWidth;     // Last width of the window
 
     // List of components in the selected library
-    wxSashLayoutWindow* m_CmpListWindow;
-    wxListBox*          m_CmpList;          // The list of components
-    wxSize              m_CmpListSize;      // size of the window
+    wxListBox*          m_cmpList;          // The list of components
+    int                 m_cmpListWidth;     // Last width of the window
 
     // Flags
-    wxSemaphore*        m_Semaphore;        // != NULL if the frame must emulate a modal dialog
+    wxSemaphore*        m_semaphore;        // != NULL if the frame must emulate a modal dialog
     wxString            m_configPath;       // subpath for configuration
 
 protected:
@@ -95,12 +93,6 @@ public:
 
     void OnSize( wxSizeEvent& event );
 
-    /**
-     * Function OnSashDrag
-     * resizes the child windows when dragging a sash window border.
-     */
-    void OnSashDrag( wxSashEvent& event );
-
     /**
      * Function ReCreateListLib
      *

eeschema/viewlibs.cpp

@@ -70,7 +70,7 @@ void LIB_VIEW_FRAME::Process_Special_Functions( wxCommandEvent& event )
         break;
 
     case ID_LIBVIEW_SELECT_PART_NUMBER:
-        ii = SelpartBox->GetCurrentSelection();
+        ii = m_selpartBox->GetCurrentSelection();
         if( ii < 0 )
             return;
         m_unit = ii + 1;
@@ -132,16 +132,16 @@ void LIB_VIEW_FRAME::SelectCurrentLibrary()
         m_libraryName = Lib->GetName();
         DisplayLibInfos();
 
-        if( m_LibList )
+        if( m_libList )
         {
             ReCreateListCmp();
             m_canvas->Refresh();
             DisplayLibInfos();
             ReCreateHToolbar();
-            int id = m_LibList->FindString( m_libraryName.GetData() );
+            int id = m_libList->FindString( m_libraryName.GetData() );
 
             if( id >= 0 )
-                m_LibList->SetSelection( id );
+                m_libList->SetSelection( id );
         }
     }
 }
@@ -234,11 +234,11 @@ void LIB_VIEW_FRAME::ViewOneLibraryContent( CMP_LIBRARY* Lib, int Flag )
     Zoom_Automatique( false );
     m_canvas->Refresh( );
 
-    if( m_CmpList )
+    if( m_cmpList )
     {
-        int id = m_CmpList->FindString( m_entryName.GetData() );
+        int id = m_cmpList->FindString( m_entryName.GetData() );
         if( id >= 0 )
-            m_CmpList->SetSelection( id );
+            m_cmpList->SetSelection( id );
     }
     ReCreateHToolbar();
 }