AllSpiceMirrors/kicad
7
Fork 0
mirror of https://gitlab.com/kicad/code/kicad.git synced 2025-04-19 14:11:41 +00:00
Files Issues Releases Activity

Require wxWidgets 3.2

Browse Source 
Removes old defines and work arounds for earlier wx versions and adds a
CMake requirement to use at least 3.2 (or the minimum matching wxPython
version)
This commit is contained in:
Seth Hillbrand 2023-08-22 11:32:25 -07:00
parent f4f1ca352a
commit db8e15ce88
50 changed files with 11 additions and 707 deletions

7
3d-viewer/3d_canvas/eda_3d_canvas.cpp
View File

@ -71,10 +71,7 @@ BEGIN_EVENT_TABLE( EDA_3D_CANVAS, HIDPI_GL_3D_CANVAS )
EVT_MIDDLE_DOWN( EDA_3D_CANVAS::OnMiddleDown)
EVT_MOUSEWHEEL( EDA_3D_CANVAS::OnMouseWheel )
EVT_MOTION( EDA_3D_CANVAS::OnMouseMove )
#if wxCHECK_VERSION( 3, 1, 0 ) || defined( USE_OSX_MAGNIFY_EVENT )
EVT_MAGNIFY( EDA_3D_CANVAS::OnMagnify )
#endif
// other events
EVT_ERASE_BACKGROUND( EDA_3D_CANVAS::OnEraseBackground )
@ -156,9 +153,7 @@ EDA_3D_CANVAS::EDA_3D_CANVAS( wxWindow* aParent, const int* aAttribList,
wxEVT_RIGHT_UP, wxEVT_RIGHT_DOWN, wxEVT_RIGHT_DCLICK,
wxEVT_MIDDLE_UP, wxEVT_MIDDLE_DOWN, wxEVT_MIDDLE_DCLICK,
wxEVT_MOTION, wxEVT_MOUSEWHEEL, wxEVT_CHAR, wxEVT_CHAR_HOOK,
#if wxCHECK_VERSION( 3, 1, 0 ) || defined( USE_OSX_MAGNIFY_EVENT )
wxEVT_MAGNIFY,
#endif
wxEVT_MENU_OPEN, wxEVT_MENU_CLOSE, wxEVT_MENU_HIGHLIGHT
};
@ -613,7 +608,6 @@ void EDA_3D_CANVAS::OnMouseWheel( wxMouseEvent& event )
}
#if wxCHECK_VERSION( 3, 1, 0 ) || defined( USE_OSX_MAGNIFY_EVENT )
void EDA_3D_CANVAS::OnMagnify( wxMouseEvent& event )
{
SetFocus();
@ -631,7 +625,6 @@ void EDA_3D_CANVAS::OnMagnify( wxMouseEvent& event )
DisplayStatus();
Request_refresh();
}
#endif
void EDA_3D_CANVAS::OnMouseMove( wxMouseEvent& event )

3
3d-viewer/3d_canvas/eda_3d_canvas.h
View File

@ -228,10 +228,7 @@ private:
void OnMouseWheel( wxMouseEvent& event );
#if wxCHECK_VERSION( 3, 1, 0 ) || defined( USE_OSX_MAGNIFY_EVENT )
void OnMagnify( wxMouseEvent& event );
#endif
void OnMouseMove( wxMouseEvent& event );
void OnLeftDown( wxMouseEvent& event );
void OnLeftUp( wxMouseEvent& event );

3
CMakeLists.txt
View File

@ -960,6 +960,9 @@ find_package( wxWidgets ${wxWidgets_REQ_VERSION} COMPONENTS gl aui adv html core
# Include wxWidgets macros.
include( ${wxWidgets_USE_FILE} )
if( ${wxWidgets_VERSION_STRING} VERSION_LESS 3.2 )
message( FATAL_ERROR "wxWidgets 3.2.0 or greater is required" )
if( MINGW )
# This needs to be on a separate line to protect against a broken FindWxWidgets.cmake in vcpkg
if( ${wxWidgets_VERSION_STRING} VERSION_LESS 3.1 )

2
common/bitmap.cpp
View File

@ -122,7 +122,7 @@ wxBitmap KiBitmap( const BITMAP_OPAQUE* aBitmap )
int KiIconScale( wxWindow* aWindow )
{
#if defined( __WXMSW__) && wxCHECK_VERSION( 3, 1, 6 )
#if defined( __WXMSW__)
// Basically don't try and scale within kicad and let wx do its thing
// with wx introducing bitmap bundles, it will auto scale automatically with dpi
// the issue is, none of the scaling factors have any tie to system scaling

4
common/bitmap_base.cpp
View File

@ -310,10 +310,6 @@ void BITMAP_BASE::DrawBitmap( wxDC* aDC, const VECTOR2I& aPos,
// Be carefull before changing the code.
bool useTransform = aDC->CanUseTransformMatrix();
#if wxCHECK_VERSION( 3, 1, 6 ) && !wxCHECK_VERSION( 3, 1, 7 )
useTransform = false;
#endif
wxAffineMatrix2D init_matrix = aDC->GetTransformMatrix();
// Note: clipping bitmap area was made to fix a minor issue in old versions of

19
common/build_version.cpp
View File

@ -53,16 +53,7 @@ extern std::string GetCurlLibVersion();
wxString GetPlatformGetBitnessName()
{
wxPlatformInfo platform;
// TODO (ISM): Read conditional once our wx fork and flatpaks are running released 3.1.5
// On Windows, use GetBitnessName if exists
// I (J-PC) hope 3.1.6 has no problem
#if defined( __WINDOWS__ ) && wxCHECK_VERSION( 3, 1, 5 )
return platform.GetBitnessName();
#elif wxCHECK_VERSION( 3, 1, 6 )
return platform.GetBitnessName();
#else
return platform.GetArchName();
#endif
}
@ -146,17 +137,7 @@ wxString GetVersionInfoData( const wxString& aTitle, bool aHtml, bool aBrief )
wxPlatformInfo platform;
aMsg << "Application: " << aTitle;
#if wxCHECK_VERSION( 3, 1, 6 )
aMsg << " " << wxGetCpuArchitectureName() << " on " << wxGetNativeCpuArchitectureName();
#elif defined( KICAD_BUILD_ARCH_X64 )
aMsg << " (64-bit)";
#elif defined( KICAD_BUILD_ARCH_X86 )
aMsg << " (32-bit)";
#elif defined( KICAD_BUILD_ARCH_ARM )
aMsg << " (ARM 32-bit)";
#elif defined( KICAD_BUILD_ARCH_ARM64 )
aMsg << " (ARM 64-bit)";
#endif
aMsg << eol << eol;

4
common/dialogs/dialog_color_picker.cpp
View File

@ -396,7 +396,7 @@ void DIALOG_COLOR_PICKER::drawRGBPalette()
// Use Y axis from bottom to top and origin to center
bitmapDC.SetAxisOrientation( true, true );
#if wxCHECK_VERSION( 3, 1, 7 ) && defined( __WXMSW__)
#if defined( __WXMSW__)
// For some reason, SetDeviceOrigin has changed in wxWidgets 3.1.6 or 3.1.7
bitmapDC.SetDeviceOrigin( half_size, -half_size );
#else
@ -466,7 +466,7 @@ void DIALOG_COLOR_PICKER::drawHSVPalette()
// Use Y axis from bottom to top and origin to center
bitmapDC.SetAxisOrientation( true, true );
#if wxCHECK_VERSION( 3, 1, 7 ) && defined( __WXMSW__)
#if defined( __WXMSW__)
// For some reason, SetDeviceOrigin has changed in wxWidgets 3.1.6 or 3.1.7
bitmapDC.SetDeviceOrigin( half_size, -half_size );
#else

7
common/dialogs/panel_common_settings.cpp
View File

@ -138,15 +138,8 @@ PANEL_COMMON_SETTINGS::PANEL_COMMON_SETTINGS( wxWindow* aParent )
// Hide the option of icons in menus for platforms that do not support them
m_checkBoxIconsInMenus->Show( KIPLATFORM::UI::AllowIconsInMenus() );
/*
* Font scaling hacks are only needed on GTK under wxWidgets 3.0.
*/
#if defined( __WXGTK__ ) && !wxCHECK_VERSION( 3, 1, 0 )
m_fontScalingHelp->SetFont( KIUI::GetInfoFont( this ).Italic() );
#else
m_scaleFonts->Show( false );
m_fontScalingHelp->Show( false );
#endif
if( m_iconScaleSlider )
{

2
common/draw_panel_gal.cpp
View File

@ -142,9 +142,7 @@ EDA_DRAW_PANEL_GAL::EDA_DRAW_PANEL_GAL( wxWindow* aParentWindow, wxWindowID aWin
wxEVT_MOUSEWHEEL,
wxEVT_CHAR,
wxEVT_CHAR_HOOK,
#if wxCHECK_VERSION( 3, 1, 0 ) || defined( USE_OSX_MAGNIFY_EVENT )
wxEVT_MAGNIFY,
#endif
KIGFX::WX_VIEW_CONTROLS::EVT_REFRESH_MOUSE
};

14
common/eda_base_frame.cpp
View File

@ -445,22 +445,8 @@ void EDA_BASE_FRAME::HandleUpdateUIEvent( wxUpdateUIEvent& aEvent, EDA_BASE_FRAM
aEvent.Enable( enableRes );
aEvent.Show( showRes );
// wxWidgets 3.1.5+ includes a field in the event that says if the event supports being
// checked, since wxMenuItems don't want to be checked unless they actually are checkable
#if wxCHECK_VERSION( 3, 1, 5 )
if( aEvent.IsCheckable() )
aEvent.Check( checkRes );
#else
bool canCheck = true;
// wxMenuItems don't want to be checked unless they actually are checkable, so we have to
// check to see if they can be and can't just universally apply a check in this event.
if( wxMenu* menu = dynamic_cast<wxMenu*>( aEvent.GetEventObject() ) )
canCheck = menu->FindItem( aEvent.GetId() )->IsCheckable();
if( canCheck )
aEvent.Check( checkRes );
#endif
}

2
common/eda_draw_frame.cpp
View File

@ -172,7 +172,6 @@ EDA_DRAW_FRAME::EDA_DRAW_FRAME( KIWAY* aKiway, wxWindow* aParent, FRAME_T aFrame
m_messagePanel->SetBackgroundColour( COLOR4D( LIGHTGRAY ).ToColour() );
#if wxCHECK_VERSION( 3, 1, 3 )
Bind( wxEVT_DPI_CHANGED,
[&]( wxDPIChangedEvent& )
{
@ -189,7 +188,6 @@ EDA_DRAW_FRAME::EDA_DRAW_FRAME( KIWAY* aKiway, wxWindow* aParent, FRAME_T aFrame
m_messagePanel->SetPosition( wxPoint( 0, m_frameSize.y ) );
m_messagePanel->SetSize( m_frameSize.x, m_msgFrameHeight );
} );
#endif
}

11
common/gal/opengl/opengl_gal.cpp
View File

@ -314,9 +314,7 @@ OPENGL_GAL::OPENGL_GAL( GAL_DISPLAY_OPTIONS& aDisplayOptions, wxWindow* aParent,
Connect( wxEVT_AUX2_UP, wxMouseEventHandler( OPENGL_GAL::skipMouseEvent ) );
Connect( wxEVT_AUX2_DCLICK, wxMouseEventHandler( OPENGL_GAL::skipMouseEvent ) );
Connect( wxEVT_MOUSEWHEEL, wxMouseEventHandler( OPENGL_GAL::skipMouseEvent ) );
#if wxCHECK_VERSION( 3, 1, 0 ) || defined( USE_OSX_MAGNIFY_EVENT )
Connect( wxEVT_MAGNIFY, wxMouseEventHandler( OPENGL_GAL::skipMouseEvent ) );
#endif
#if defined _WIN32 || defined _WIN64
Connect( wxEVT_ENTER_WINDOW, wxMouseEventHandler( OPENGL_GAL::skipMouseEvent ) );
#endif
@ -2556,15 +2554,6 @@ void OPENGL_GAL::init()
wxASSERT_MSG( m_isContextLocked, "This should only be called from within a locked context." );
// IsDisplayAttr() handles WX_GL_{MAJOR,MINOR}_VERSION correctly only in 3.0.4
// starting with 3.1.0 one should use wxGLContext::IsOk() (done by GL_CONTEXT_MANAGER)
#if wxCHECK_VERSION( 3, 0, 3 ) and !wxCHECK_VERSION( 3, 1, 0 )
const int attr[] = { WX_GL_MAJOR_VERSION, 2, WX_GL_MINOR_VERSION, 1, 0 };
if( !IsDisplaySupported( attr ) )
throw std::runtime_error( "OpenGL 2.1 or higher is required!" );
#endif /* wxCHECK_VERSION( 3, 0, 3 ) */
// Check correct initialization from the constructor
if( m_tesselator == nullptr )
throw std::runtime_error( "Could not create the tesselator" );

2
common/gl_context_mgr.cpp
View File

@ -40,13 +40,11 @@ wxGLContext* GL_CONTEXT_MANAGER::CreateCtx( wxGLCanvas* aCanvas, const wxGLConte
wxGLContext* context = new wxGLContext( aCanvas, aOther );
wxCHECK( context, nullptr );
#if wxCHECK_VERSION( 3, 1, 0 )
if( !context->IsOK() )
{
delete context;
return nullptr;
}
#endif /* wxCHECK_VERSION( 3, 1, 0 ) */
m_glContexts.insert( std::make_pair( context, aCanvas ) );

21
common/launch_ext.cpp
View File

@ -29,27 +29,6 @@ bool LaunchExternal( const wxString& aPath )
const wchar_t* args[] = { L"open", aPath.wc_str(), nullptr };
return wxExecute( const_cast<wchar_t**>( args ) ) != -1;
#elif defined( __WXGTK__ ) && !wxCHECK_VERSION( 3, 1, 1 )
// On Unix systems `wxLaunchDefaultApplication()` before wxWidgets 3.1.1 mistakenly uses
// `wxExecute(xdg_open + " " + document)`, thereby failing for filenames with spaces. Below is
// a backport of the fixed `wxLaunchDefaultApplication()`, to be used until we switch to a
// newer version of wxWidgets.
wxString PATH, xdg_open;
if( wxGetEnv( "PATH", &PATH ) && wxFindFileInPath( &xdg_open, PATH, "xdg-open" ) )
{
const char* argv[3];
argv[0] = xdg_open.fn_str();
argv[1] = aPath.fn_str();
argv[2] = nullptr;
if( wxExecute( const_cast<char**>( argv ) ) )
return true;
}
return false;
#else
wxString path( aPath );

13
common/pgm_base.cpp
View File

@ -830,11 +830,7 @@ wxString PGM_BASE::GetLanguageTag()
return "";
else
{
#if wxCHECK_VERSION( 3, 1, 6 )
wxString str = langInfo->GetCanonicalWithRegion();
#else
wxString str = langInfo->CanonicalName;
#endif
str.Replace( "_", "-" );
return str;
@ -911,16 +907,7 @@ bool PGM_BASE::IsGUI()
if( !wxTheApp )
return false;
#if wxCHECK_VERSION( 3, 1, 6 )
return wxTheApp->IsGUI();
#else
// wxWidgets older than version 3.1.6 do not have a way to know if the app
// has a GUI or is a console application.
// So the trick is to set the App class name when starting kicad-cli, and when
// the app class name is the kicad-cli class name the app is a console app
bool run_gui = wxTheApp->GetClassName() != KICAD_CLI_APP_NAME;
return run_gui;
#endif
}

4
common/properties/pg_cell_renderer.cpp
View File

@ -64,11 +64,7 @@ bool PG_CELL_RENDERER::Render( wxDC &aDC, const wxRect &aRect, const wxPropertyG
text = wxControl::Ellipsize( text, aDC, wxELLIPSIZE_MIDDLE, aRect.GetWidth() );
#if wxCHECK_VERSION( 3, 1, 6 )
int imageWidth = PreDrawCell( aDC, aRect, aGrid, cell, preDrawFlags );
#else
int imageWidth = PreDrawCell( aDC, aRect, cell, preDrawFlags );
#endif
int imageOffset = aProperty->GetImageOffset( imageWidth );

5
common/settings/common_settings.cpp
View File

@ -102,12 +102,7 @@ COMMON_SETTINGS::COMMON_SETTINGS() :
/*
* Font scaling hacks are only needed on GTK under wxWidgets 3.0.
*/
#if defined( __WXGTK__ ) && !wxCHECK_VERSION( 3, 1, 0 )
m_params.emplace_back( new PARAM<bool>( "appearance.apply_icon_scale_to_fonts",
&m_Appearance.apply_icon_scale_to_fonts, false ) );
#else
m_Appearance.apply_icon_scale_to_fonts = false;
#endif
m_params.emplace_back( new PARAM<bool>( "appearance.show_scrollbars",
&m_Appearance.show_scrollbars, false ) );

9
common/tool/action_menu.cpp
View File

@ -492,16 +492,7 @@ void ACTION_MENU::OnMenuEvent( wxMenuEvent& aEvent )
FindItem( m_selected, &menu );
// This conditional compilation is probably not needed.
// It will be removed later, for the Kicad V 6.x version.
// But in "old" 3.0 version, the "&& menu != this" contition was added to avoid
// hang. This hang is no longer encountered in wxWidgets 3.0.4 version, and this
// condition is no longer needed. And in 3.1.2, we have to remove it, as
// "menu != this" never happens ("menu != this" always happens in 3.1.1 and older!).
#if wxCHECK_VERSION( 3, 1, 2 )
if( menu )
#else
if( menu && menu != this )
#endif
{
ACTION_MENU* cxmenu = static_cast<ACTION_MENU*>( menu );
evt = cxmenu->eventHandler( aEvent );

10
common/tool/action_toolbar.cpp
View File

@ -191,12 +191,6 @@ ACTION_TOOLBAR::ACTION_TOOLBAR( EDA_BASE_FRAME* parent, wxWindowID id, const wxP
{
m_paletteTimer = new wxTimer( this );
#if !wxCHECK_VERSION( 3, 1, 0 )
// Custom art provider makes dark mode work on wx < 3.1
WX_AUI_TOOLBAR_ART* newArt = new WX_AUI_TOOLBAR_ART();
SetArtProvider( newArt );
#endif
Connect( wxEVT_COMMAND_TOOL_CLICKED, wxAuiToolBarEventHandler( ACTION_TOOLBAR::onToolEvent ),
nullptr, this );
Connect( wxEVT_AUITOOLBAR_RIGHT_CLICK,
@ -335,12 +329,8 @@ void ACTION_TOOLBAR::doSelectAction( ACTION_GROUP* aGroup, const TOOL_ACTION& aA
// Update the item information
item->SetShortHelp( aAction.GetTooltip() );
item->SetBitmap( KiScaledBitmap( aAction.GetIcon(), GetParent() ) );
#if wxCHECK_VERSION( 3, 1, 6 )
item->SetDisabledBitmap(
MakeDisabledBitmap( item->GetBitmapBundle().GetBitmapFor( GetParent() ) ) );
#else
item->SetDisabledBitmap( MakeDisabledBitmap( item->GetBitmap() ) );
#endif
// Register a new handler with the new UI conditions
if( m_toolManager )

2
common/tool/tool_dispatcher.cpp
View File

@ -463,9 +463,7 @@ void TOOL_DISPATCHER::DispatchWxEvent( wxEvent& aEvent )
// Mouse handling
// Note: wxEVT_LEFT_DOWN event must always be skipped.
if( type == wxEVT_MOTION || type == wxEVT_MOUSEWHEEL ||
#if wxCHECK_VERSION( 3, 1, 0 ) || defined( USE_OSX_MAGNIFY_EVENT )
type == wxEVT_MAGNIFY ||
#endif
isMouseClick( type ) ||
// Event issued when mouse retains position in screen coordinates,
// but changes in world coordinates (e.g. autopanning)

19
common/validators.cpp
View File

@ -393,7 +393,6 @@ bool FIELD_VALIDATOR::Validate( wxWindow* aParent )
{
wxArrayString badCharsFound;
#if wxCHECK_VERSION( 3, 1, 3 )
for( const wxUniCharRef& excludeChar : GetCharExcludes() )
{
if( val.Find( excludeChar ) != wxNOT_FOUND )
@ -410,24 +409,6 @@ bool FIELD_VALIDATOR::Validate( wxWindow* aParent )
badCharsFound.Add( wxString::Format( wxT( "'%c'" ), excludeChar ) );
}
}
#else
for( const wxString& excludeChar : GetExcludes() )
{
if( val.Find( excludeChar ) != wxNOT_FOUND )
{
if( excludeChar == wxT( "\r" ) )
badCharsFound.Add( _( "carriage return" ) );
else if( excludeChar == wxT( "\n" ) )
badCharsFound.Add( _( "line feed" ) );
else if( excludeChar == wxT( "\t" ) )
badCharsFound.Add( _( "tab" ) );
else if( excludeChar == wxT( " " ) )
badCharsFound.Add( _( "space" ) );
else
badCharsFound.Add( wxString::Format( wxT( "'%s'" ), excludeChar ) );
}
}
#endif
wxString badChars;

4
common/view/wx_view_controls.cpp
View File

@ -89,10 +89,8 @@ WX_VIEW_CONTROLS::WX_VIEW_CONTROLS( VIEW* aView, EDA_DRAW_PANEL_GAL* aParentPane
m_parentPanel->Connect( wxEVT_MOTION,
wxMouseEventHandler( WX_VIEW_CONTROLS::onMotion ), nullptr, this );
#if wxCHECK_VERSION( 3, 1, 0 ) || defined( USE_OSX_MAGNIFY_EVENT )
m_parentPanel->Connect( wxEVT_MAGNIFY,
wxMouseEventHandler( WX_VIEW_CONTROLS::onMagnify ), nullptr, this );
#endif
m_parentPanel->Connect( wxEVT_MOUSEWHEEL,
wxMouseEventHandler( WX_VIEW_CONTROLS::onWheel ), nullptr, this );
m_parentPanel->Connect( wxEVT_MIDDLE_UP,
@ -423,7 +421,6 @@ void WX_VIEW_CONTROLS::onWheel( wxMouseEvent& aEvent )
}
#if wxCHECK_VERSION( 3, 1, 0 ) || defined( USE_OSX_MAGNIFY_EVENT )
void WX_VIEW_CONTROLS::onMagnify( wxMouseEvent& aEvent )
{
// Scale based on the magnification from our underlying magnification event.
@ -432,7 +429,6 @@ void WX_VIEW_CONTROLS::onMagnify( wxMouseEvent& aEvent )
aEvent.Skip();
}
#endif
void WX_VIEW_CONTROLS::setState( STATE aNewState )

9
common/widgets/app_progress_dialog.cpp
View File

@ -30,31 +30,24 @@ APP_PROGRESS_DIALOG::APP_PROGRESS_DIALOG( const wxString& aTitle, const wxString
bool aIndeterminateTaskBarStatus, int aStyle )
: wxProgressDialog( aTitle,
aMessage == wxEmptyString ? wxString( wxT( " " ) ) : aMessage,
aMaximum, aParent, aStyle )
#if wxCHECK_VERSION( 3, 1, 0 )
,
aMaximum, aParent, aStyle ),
m_appProgressIndicator( aParent, aMaximum ),
m_indeterminateTaskBarStatus( aIndeterminateTaskBarStatus )
#endif
{
#if wxCHECK_VERSION( 3, 1, 0 )
if( m_indeterminateTaskBarStatus )
{
m_appProgressIndicator.Pulse();
}
#endif
}
bool APP_PROGRESS_DIALOG::Update( int aValue, const wxString& aNewMsg, bool* aSkip )
{
#if wxCHECK_VERSION( 3, 1, 0 )
if( !m_indeterminateTaskBarStatus )
{
m_appProgressIndicator.SetValue( aValue );
}
#endif
return wxProgressDialog::Update( aValue, aNewMsg, aSkip );
}

9
common/widgets/lib_tree.cpp
View File

@ -115,11 +115,7 @@ LIB_TREE::LIB_TREE( wxWindow* aParent, const wxString& aRecentSearchesKey, LIB_T
m_query_ctrl->Bind( wxEVT_TEXT, &LIB_TREE::onQueryText, this );
#if wxCHECK_VERSION( 3, 1, 1 )
m_query_ctrl->Bind( wxEVT_SEARCH_CANCEL, &LIB_TREE::onQueryText, this );
#else
m_query_ctrl->Bind( wxEVT_SEARCHCTRL_CANCEL_BTN, &LIB_TREE::onQueryText, this );
#endif
m_query_ctrl->Bind( wxEVT_CHAR_HOOK, &LIB_TREE::onQueryCharHook, this );
m_query_ctrl->Bind( wxEVT_MOTION, &LIB_TREE::onQueryMouseMoved, this );
m_query_ctrl->Bind( wxEVT_LEAVE_WINDOW,
@ -748,11 +744,6 @@ void LIB_TREE::onHeaderContextMenu( wxDataViewEvent& aEvent )
if( dlg.ShowModal() == wxID_OK )
m_adapter->SetShownColumns( dlg.EnabledList() );
}
#if !wxCHECK_VERSION( 3, 1, 0 )
// wxGTK 3.0 sends item right click events for header right clicks
m_skipNextRightClick = true;
#endif
}

4
common/widgets/mathplot.cpp
View File

@ -1285,9 +1285,7 @@ EVT_SIZE( mpWindow::OnSize )
EVT_MIDDLE_DOWN( mpWindow::OnMouseMiddleDown ) // JLB
EVT_RIGHT_UP( mpWindow::OnShowPopupMenu )
EVT_MOUSEWHEEL( mpWindow::OnMouseWheel ) // JLB
#if wxCHECK_VERSION( 3, 1, 0 ) || defined( USE_OSX_MAGNIFY_EVENT )
EVT_MAGNIFY( mpWindow::OnMagnify )
#endif
EVT_MOTION( mpWindow::OnMouseMove ) // JLB
EVT_LEFT_DOWN( mpWindow::OnMouseLeftDown )
EVT_LEFT_UP( mpWindow::OnMouseLeftRelease )
@ -1412,7 +1410,6 @@ void mpWindow::OnMouseMiddleDown( wxMouseEvent& event )
}
#if wxCHECK_VERSION( 3, 1, 0 ) || defined( USE_OSX_MAGNIFY_EVENT )
void mpWindow::OnMagnify( wxMouseEvent& event )
{
if( !m_enableMouseNavigation )
@ -1429,7 +1426,6 @@ void mpWindow::OnMagnify( wxMouseEvent& event )
else if( zoom < 1.0f )
ZoomOut( pos, 1.0f / zoom );
}
#endif
// Process mouse wheel events

Some files were not shown because too many files have changed in this diff Show More