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

Replace __WXGTK20__ with __WXGTK__ 

We no longer care about a GTK2 vs 3 difference, we only support GTK 3.
This commit is contained in:
Ian McInerney 2023-04-12 17:18:47 +01:00
parent f0684510f0
commit 8f3bbf36f8
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/widgets/grid_combobox.cpp
View File

@ -103,7 +103,7 @@ void GRID_CELL_COMBOBOX::BeginEdit( int aRow, int aCol, wxGrid* aGrid )
// When dropping down the menu, a kill focus event
// happens after this point, so we can't reset the flag yet.
#if !defined(__WXGTK20__)
#if !defined(__WXGTK__)
evtHandler->SetInSetFocus( false );
#endif
}

4
common/widgets/grid_icon_text_helpers.cpp
View File

@ -225,7 +225,7 @@ void GRID_CELL_ICON_TEXT_POPUP::SetSize( const wxRect& aRect )
wxRect rect( aRect );
rect.Inflate( -1 );
#if !defined( __WXMSW__ ) && !defined( __WXGTK20__ )
#if !defined( __WXMSW__ ) && !defined( __WXGTK__ )
// Only implemented in generic wxBitmapComboBox; MSW and GTK use native controls
Combo()->SetButtonPosition( 0, 0, wxRIGHT, 2 );
#endif
@ -260,7 +260,7 @@ void GRID_CELL_ICON_TEXT_POPUP::BeginEdit( int aRow, int aCol, wxGrid* aGrid )
// When dropping down the menu, a kill focus event
// happens after this point, so we can't reset the flag yet.
#if !defined(__WXGTK20__)
#if !defined(__WXGTK__)
evtHandler->SetInSetFocus( false );
#endif
}

6
pcbnew/grid_layer_box_helpers.cpp
View File

@ -148,7 +148,7 @@ void GRID_CELL_LAYER_SELECTOR::SetSize( const wxRect& aRect )
wxRect rect( aRect );
rect.Inflate( -1 );
#if !defined( __WXMSW__ ) && !defined( __WXGTK20__ )
#if !defined( __WXMSW__ ) && !defined( __WXGTK__ )
// Only implemented in generic wxBitmapComboBox; MSW and GTK use native controls
LayerBox()->SetButtonPosition( 0, 0, wxRIGHT, 0 );
#endif
@ -194,7 +194,7 @@ void GRID_CELL_LAYER_SELECTOR::BeginEdit( int aRow, int aCol, wxGrid* aGrid )
// When dropping down the menu, a kill focus event
// happens after this point, so we can't reset the flag yet.
#if !defined(__WXGTK20__)
#if !defined(__WXGTK__)
evtHandler->SetInSetFocus( false );
#endif
}
@ -232,7 +232,7 @@ void GRID_CELL_LAYER_SELECTOR::Reset()
void GRID_CELL_LAYER_SELECTOR::onComboDropDown( wxCommandEvent& aEvent )
{
// On other platforms this is done in BeginEdit()
#if defined(__WXGTK20__)
#if defined(__WXGTK__)
auto evtHandler = static_cast<wxGridCellEditorEvtHandler*>( m_control->GetEventHandler() );
// Once the combobox is dropped, reset the flag to allow the focus-loss handler