haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor tweaks to support wx3.3

This commit is contained in:
Marek Roszko 2023-06-07 21:11:27 -04:00
parent 42933c1c12
commit a87fada9e5
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/FindwxWidgets.cmake
View File

@ -293,6 +293,7 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
# Find wxWidgets multilib base libraries. # Find wxWidgets multilib base libraries.
find_library(WX_base${_DBG} find_library(WX_base${_DBG}
NAMES NAMES
wxbase33${_UCD}${_DBG}
wxbase32${_UCD}${_DBG} wxbase32${_UCD}${_DBG}
wxbase31${_UCD}${_DBG} wxbase31${_UCD}${_DBG}
wxbase30${_UCD}${_DBG} wxbase30${_UCD}${_DBG}
@ -308,6 +309,7 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
foreach(LIB net odbc xml) foreach(LIB net odbc xml)
find_library(WX_${LIB}${_DBG} find_library(WX_${LIB}${_DBG}
NAMES NAMES
wxbase33${_UCD}${_DBG}_${LIB}
wxbase32${_UCD}${_DBG}_${LIB} wxbase32${_UCD}${_DBG}_${LIB}
wxbase31${_UCD}${_DBG}_${LIB} wxbase31${_UCD}${_DBG}_${LIB}
wxbase30${_UCD}${_DBG}_${LIB} wxbase30${_UCD}${_DBG}_${LIB}
@ -325,6 +327,7 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
# Find wxWidgets monolithic library. # Find wxWidgets monolithic library.
find_library(WX_mono${_DBG} find_library(WX_mono${_DBG}
NAMES NAMES
wx${_PF}${_UNV}33${_UCD}${_DBG}
wx${_PF}${_UNV}32${_UCD}${_DBG} wx${_PF}${_UNV}32${_UCD}${_DBG}
wx${_PF}${_UNV}31${_UCD}${_DBG} wx${_PF}${_UNV}31${_UCD}${_DBG}
wx${_PF}${_UNV}30${_UCD}${_DBG} wx${_PF}${_UNV}30${_UCD}${_DBG}
@ -343,6 +346,7 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
stc ribbon propgrid webview) stc ribbon propgrid webview)
find_library(WX_${LIB}${_DBG} find_library(WX_${LIB}${_DBG}
NAMES NAMES
wx${_PF}${_UNV}33${_UCD}${_DBG}_${LIB}
wx${_PF}${_UNV}32${_UCD}${_DBG}_${LIB} wx${_PF}${_UNV}32${_UCD}${_DBG}_${LIB}
wx${_PF}${_UNV}31${_UCD}${_DBG}_${LIB} wx${_PF}${_UNV}31${_UCD}${_DBG}_${LIB}
wx${_PF}${_UNV}30${_UCD}${_DBG}_${LIB} wx${_PF}${_UNV}30${_UCD}${_DBG}_${LIB}

4
eeschema/symbol_viewer_frame.cpp
View File

@ -884,8 +884,8 @@ void SYMBOL_VIEWER_FRAME::ClickOnLibList( wxCommandEvent& event )
void SYMBOL_VIEWER_FRAME::SetSelectedLibrary( const wxString& aLibraryName, void SYMBOL_VIEWER_FRAME::SetSelectedLibrary( const wxString& aLibraryName,
const wxString& aSubLibName ) const wxString& aSubLibName )
{ {
if( m_currentSymbol.GetUniStringLibNickname() == aLibraryName && if( m_currentSymbol.GetUniStringLibNickname() == aLibraryName
wxString( m_currentSymbol.GetSubLibraryName() ) == aSubLibName ) && wxString( m_currentSymbol.GetSubLibraryName().wx_str() ) == aSubLibName )
return; return;
m_currentSymbol.SetLibNickname( aLibraryName ); m_currentSymbol.SetLibNickname( aLibraryName );

2
pcbnew/plugins/cadstar/cadstar_pcb_archive_plugin.cpp
View File

@ -243,7 +243,7 @@ void CADSTAR_PCB_ARCHIVE_PLUGIN::ensureLoadedLibrary( const wxString& aLibraryPa
for( std::unique_ptr<FOOTPRINT>& fp : footprints ) for( std::unique_ptr<FOOTPRINT>& fp : footprints )
{ {
footprintMap.insert( { fp->GetFPID().GetLibItemName(), std::move( fp ) } ); footprintMap.insert( { fp->GetFPID().GetLibItemName().wx_str(), std::move( fp ) } );
} }
m_cache.insert( { aLibraryPath, std::move( footprintMap ) } ); m_cache.insert( { aLibraryPath, std::move( footprintMap ) } );