From a87fada9e58ea5fac6435f4d437b8dffe68239e1 Mon Sep 17 00:00:00 2001
From: Marek Roszko <mark.roszko@gmail.com>
Date: Wed, 7 Jun 2023 21:11:27 -0400
Subject: [PATCH] Minor tweaks to support wx3.3
---
cmake/FindwxWidgets.cmake | 4 ++++
eeschema/symbol_viewer_frame.cpp | 4 ++--
pcbnew/plugins/cadstar/cadstar_pcb_archive_plugin.cpp | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/cmake/FindwxWidgets.cmake b/cmake/FindwxWidgets.cmake
index 02d6238163..686a0f111a 100644
--- a/cmake/FindwxWidgets.cmake
+++ b/cmake/FindwxWidgets.cmake
@@ -293,6 +293,7 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
# Find wxWidgets multilib base libraries.
find_library(WX_base${_DBG}
NAMES
+ wxbase33${_UCD}${_DBG}
wxbase32${_UCD}${_DBG}
wxbase31${_UCD}${_DBG}
wxbase30${_UCD}${_DBG}
@@ -308,6 +309,7 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
foreach(LIB net odbc xml)
find_library(WX_${LIB}${_DBG}
NAMES
+ wxbase33${_UCD}${_DBG}_${LIB}
wxbase32${_UCD}${_DBG}_${LIB}
wxbase31${_UCD}${_DBG}_${LIB}
wxbase30${_UCD}${_DBG}_${LIB}
@@ -325,6 +327,7 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
# Find wxWidgets monolithic library.
find_library(WX_mono${_DBG}
NAMES
+ wx${_PF}${_UNV}33${_UCD}${_DBG}
wx${_PF}${_UNV}32${_UCD}${_DBG}
wx${_PF}${_UNV}31${_UCD}${_DBG}
wx${_PF}${_UNV}30${_UCD}${_DBG}
@@ -343,6 +346,7 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
stc ribbon propgrid webview)
find_library(WX_${LIB}${_DBG}
NAMES
+ wx${_PF}${_UNV}33${_UCD}${_DBG}_${LIB}
wx${_PF}${_UNV}32${_UCD}${_DBG}_${LIB}
wx${_PF}${_UNV}31${_UCD}${_DBG}_${LIB}
wx${_PF}${_UNV}30${_UCD}${_DBG}_${LIB}
diff --git a/eeschema/symbol_viewer_frame.cpp b/eeschema/symbol_viewer_frame.cpp
index 92f6334590..37cafe8387 100644
--- a/eeschema/symbol_viewer_frame.cpp
+++ b/eeschema/symbol_viewer_frame.cpp
@@ -884,8 +884,8 @@ void SYMBOL_VIEWER_FRAME::ClickOnLibList( wxCommandEvent& event )
void SYMBOL_VIEWER_FRAME::SetSelectedLibrary( const wxString& aLibraryName,
const wxString& aSubLibName )
{
- if( m_currentSymbol.GetUniStringLibNickname() == aLibraryName &&
- wxString( m_currentSymbol.GetSubLibraryName() ) == aSubLibName )
+ if( m_currentSymbol.GetUniStringLibNickname() == aLibraryName
+ && wxString( m_currentSymbol.GetSubLibraryName().wx_str() ) == aSubLibName )
return;
m_currentSymbol.SetLibNickname( aLibraryName );
diff --git a/pcbnew/plugins/cadstar/cadstar_pcb_archive_plugin.cpp b/pcbnew/plugins/cadstar/cadstar_pcb_archive_plugin.cpp
index 0ec828ae8c..4fc50c152b 100644
--- a/pcbnew/plugins/cadstar/cadstar_pcb_archive_plugin.cpp
+++ b/pcbnew/plugins/cadstar/cadstar_pcb_archive_plugin.cpp
@@ -243,7 +243,7 @@ void CADSTAR_PCB_ARCHIVE_PLUGIN::ensureLoadedLibrary( const wxString& aLibraryPa
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 ) } );