eeschema: library order when loading libs fixed (i hope)

eeschema/eelibs_read_libraryfiles.cpp

@@ -164,8 +164,7 @@ void LoadLibraries (WinEDA_DrawFrame* frame)
         else
             msg += _( " error!" );
 
-        frame->PrintMsg( msg );
-    }
+        frame->PrintMsg( msg );    }
 
     // reorder the linked list to match the order filename list:
     int            NumOfLibs;
@@ -186,7 +185,8 @@ void LoadLibraries (WinEDA_DrawFrame* frame)
     {
         if( jj >= NumOfLibs )
             break;
-        lib = FindLibrary( g_LibName_List[ii] );
+        fn = g_LibName_List[ii];
+        lib = FindLibrary( fn.GetName() );
         if( lib )
         {
             lib->m_Flags = 1;
@@ -212,7 +212,9 @@ void LoadLibraries (WinEDA_DrawFrame* frame)
     MyFree( libs );
 
     for( lib = g_LibraryList; lib != NULL; lib = lib->m_Pnext )
+    {
         lib->m_Flags = 0;
+    }
 }
 
 

include/wxEeschemaStruct.h

@@ -106,6 +106,7 @@ public:
         m_CurrentField = aCurrentField;
     }
 
+
     DrawSheetPath*   GetSheet();
 
     SCH_SCREEN*      GetScreen() const;
@@ -152,7 +153,7 @@ public:
                                     bool            mouseWarp );
 
     /* Cross probing with pcbnew */
-    void                    SendMessageToPCBNEW( EDA_BaseStruct * objectToSync,
+    void                           SendMessageToPCBNEW( EDA_BaseStruct* objectToSync,
                                                         SCH_COMPONENT*  LibItem );
 
     /* netlist generation */
@@ -169,6 +170,7 @@ public:
     // Functions used for hierarchy handling
     void                           InstallPreviousSheet();
     void                           InstallNextScreen( DrawSheetStruct* Sheet );
+
     /** Function GetUniqueFilenameForCurrentSheet
      * @return a filename that can be used in plot and print functions
      * for the current screen anad sheet path.
@@ -179,7 +181,7 @@ public:
      * and has no extension.
      * However if filename is too long name is <sheet filename>-<sheet number>
      */
-    wxString                GetUniqueFilenameForCurrentSheet( );
+    wxString                       GetUniqueFilenameForCurrentSheet();
 
     /**
      * Function SetSheetNumberAndCount
@@ -208,7 +210,8 @@ public:
      * @param aSetFielsAttributeToVisible = true to set the footprint field flag to visible
      * @return bool - true if success, else true.
      */
-    bool  		            ProcessStuffFile( FILE* aFilename, bool aSetFielsAttributeToVisible );
+    bool                           ProcessStuffFile( FILE* aFilename,
+                                                     bool  aSetFielsAttributeToVisible );
 
     bool                           SaveEEFile( SCH_SCREEN* screen, int FileSave );
     SCH_SCREEN*                    CreateNewScreen( SCH_SCREEN* OldScreen, int TimeStamp );
@@ -301,13 +304,19 @@ public:
 private:
     void                           StartMoveSheet( DrawSheetStruct* sheet, wxDC* DC );
     Hierarchical_PIN_Sheet_Struct* Create_PinSheet( DrawSheetStruct* Sheet, wxDC* DC );
-    void                    Edit_PinSheet( Hierarchical_PIN_Sheet_Struct* SheetLabel, wxDC* DC );
-    void                    StartMove_PinSheet( Hierarchical_PIN_Sheet_Struct* SheetLabel, wxDC* DC );
-    void                    Place_PinSheet( Hierarchical_PIN_Sheet_Struct* SheetLabel, wxDC* DC );
+    void                           Edit_PinSheet( Hierarchical_PIN_Sheet_Struct* SheetLabel,
+                                                  wxDC*                          DC );
+    void                           StartMove_PinSheet( Hierarchical_PIN_Sheet_Struct* SheetLabel,
+                                                       wxDC*                          DC );
+    void                           Place_PinSheet( Hierarchical_PIN_Sheet_Struct* SheetLabel,
+                                                   wxDC*                          DC );
     Hierarchical_PIN_Sheet_Struct* Import_PinSheet( DrawSheetStruct* Sheet, wxDC* DC );
 
 public:
-    void                    DeleteSheetLabel( bool aRedraw, Hierarchical_PIN_Sheet_Struct* aSheetLabelToDel );
+    void                           DeleteSheetLabel(
+        bool aRedraw,
+        Hierarchical_PIN_Sheet_Struct*
+             aSheetLabelToDel );
 
 private:
 
@@ -430,7 +439,7 @@ private:
                                               int                     noMsg = 0 );
 
     void               DisplayCmpDoc( const wxString& Name );
-    void                InstallLibeditFrame( );
+    void               InstallLibeditFrame();
 
     // General editing
 public:
@@ -459,7 +468,7 @@ private:
     void               GraphicItemBeginDraw( wxDC* DC );
     void               StartMoveDrawSymbol( wxDC* DC );
     void               EndDrawGraphicItem( wxDC* DC );
-    void                LoadOneSymbol( );
+    void               LoadOneSymbol();
     void               SaveOneSymbol();
     void               EditGraphicSymbol( wxDC* DC, LibEDA_BaseStruct* DrawItem );
     void               EditSymbolText( wxDC* DC, LibEDA_BaseStruct* DrawItem );