kicad-developers team mailing list archive
-
kicad-developers team
-
Mailing list archive
-
Message #19539
Re: [bpanak@xxxxxxxxx: kicad possible bug]
Hi,
On 29.07.2015 21:00, jp charras wrote:
> I removed a few conditional compilations in rev 6014.
> This bug already known, but not fixed, should be fixed in this rev.
There is an older patch from Blair Bonnett removing all support for
wxWidgets < 3.0. I have that in my repository, and it got rebased over
time, attached is what's left of it (a few of the changes are already
applied, and only the updated copyright year is still in the patch).
Simon
commit d987e6c511d17ebcb9ff4b36c65980b587bd0ba9
Author: Blair Bonnett <blair.bonnett@xxxxxxxxx>
Date: Sat May 2 21:14:39 2015 +1200
Remove conditionally compiled wxWidgets 2.x code
diff --git a/3d-viewer/3d_frame.cpp b/3d-viewer/3d_frame.cpp
index f28ec4f..64440d6 100644
--- a/3d-viewer/3d_frame.cpp
+++ b/3d-viewer/3d_frame.cpp
@@ -140,8 +140,7 @@ EDA_3D_FRAME::EDA_3D_FRAME( KIWAY* aKiway, PCB_BASE_FRAME* aParent,
ReCreateMainToolbar();
// Make a EDA_3D_CANVAS
- // Note: We try to use anti aliasing if the graphic card allows that,
- // but only on wxWidgets >= 3.0.0 (this option does not exist on wxWidgets 2.8)
+ // Note: We try to use anti aliasing if the graphic card allows that.
int attrs[] = { // This array should be 2*n+1
// Sadly wxwidgets / glx < 13 allowed
// a thing named "boolean attributes" that don't take a value.
diff --git a/common/class_layer_box_selector.cpp b/common/class_layer_box_selector.cpp
index ad2df99..94263e4 100644
--- a/common/class_layer_box_selector.cpp
+++ b/common/class_layer_box_selector.cpp
@@ -2,7 +2,7 @@
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 2014 Jean-Pierre Charras, jp.charras at wanadoo.fr
- * Copyright (C) 2014 KiCad Developers, see CHANGELOG.TXT for contributors.
+ * Copyright (C) 2014-2015 KiCad Developers, see CHANGELOG.TXT for contributors.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
diff --git a/common/dialog_shim.cpp b/common/dialog_shim.cpp
index fad1865..0936243 100644
--- a/common/dialog_shim.cpp
+++ b/common/dialog_shim.cpp
@@ -3,7 +3,7 @@
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 2012 SoftPLC Corporation, Dick Hollenbeck <dick@xxxxxxxxxxx>
- * Copyright (C) 2012 KiCad Developers, see CHANGELOG.TXT for contributors.
+ * Copyright (C) 2012-2015 KiCad Developers, see CHANGELOG.TXT for contributors.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -68,10 +68,6 @@ DIALOG_SHIM::DIALOG_SHIM( wxWindow* aParent, wxWindowID id, const wxString& titl
if( h )
SetKiway( this, &h->Kiway() );
-
-#if DLGSHIM_USE_SETFOCUS
- Connect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( DIALOG_SHIM::onInit ) );
-#endif
}
@@ -145,58 +141,6 @@ bool DIALOG_SHIM::Enable( bool enable )
}
-#if DLGSHIM_USE_SETFOCUS
-
-static bool findWindowRecursively( const wxWindowList& children, const wxWindow* wanted )
-{
- for( wxWindowList::const_iterator it = children.begin(); it != children.end(); ++it )
- {
- const wxWindow* child = *it;
-
- if( wanted == child )
- return true;
- else
- {
- if( findWindowRecursively( child->GetChildren(), wanted ) )
- return true;
- }
- }
-
- return false;
-}
-
-
-static bool findWindowRecursively( const wxWindow* topmost, const wxWindow* wanted )
-{
- // wanted may be NULL and that is ok.
-
- if( wanted == topmost )
- return true;
-
- return findWindowRecursively( topmost->GetChildren(), wanted );
-}
-
-
-/// Set the focus if it is not already set in a derived constructor to a specific control.
-void DIALOG_SHIM::onInit( wxInitDialogEvent& aEvent )
-{
- wxWindow* focusWnd = wxWindow::FindFocus();
-
- // If focusWnd is not already this window or a child of it, then SetFocus().
- // Otherwise the derived class's constructor SetFocus() already to a specific
- // child control.
-
- if( !findWindowRecursively( this, focusWnd ) )
- {
- // Linux wxGTK needs this to allow the ESCAPE key to close a wxDialog window.
- SetFocus();
- }
-
- aEvent.Skip(); // derived class's handler should be called too
-}
-#endif
-
-
/*
Quasi-Modal Mode Explained:
@@ -221,73 +165,6 @@ void DIALOG_SHIM::onInit( wxInitDialogEvent& aEvent )
*/
-#if !wxCHECK_VERSION( 2, 9, 4 )
-wxWindow* DIALOG_SHIM::CheckIfCanBeUsedAsParent( wxWindow* parent ) const
-{
- if ( !parent )
- return NULL;
-
- extern WXDLLIMPEXP_DATA_BASE(wxList) wxPendingDelete;
-
- if ( wxPendingDelete.Member(parent) || parent->IsBeingDeleted() )
- {
- // this window is being deleted and we shouldn't create any children
- // under it
- return NULL;
- }
-
- if ( parent->GetExtraStyle() & wxWS_EX_TRANSIENT )
- {
- // this window is not being deleted yet but it's going to disappear
- // soon so still don't parent this window under it
- return NULL;
- }
-
- if ( !parent->IsShownOnScreen() )
- {
- // using hidden parent won't work correctly neither
- return NULL;
- }
-
- // FIXME-VC6: this compiler requires an explicit const cast or it fails
- // with error C2446
- if ( const_cast<const wxWindow *>(parent) == this )
- {
- // not sure if this can really happen but it doesn't hurt to guard
- // against this clearly invalid situation
- return NULL;
- }
-
- return parent;
-}
-
-
-wxWindow* DIALOG_SHIM::GetParentForModalDialog(wxWindow *parent, long style) const
-{
- // creating a parent-less modal dialog will result (under e.g. wxGTK2)
- // in an unfocused dialog, so try to find a valid parent for it unless we
- // were explicitly asked not to
- if ( style & wxDIALOG_NO_PARENT )
- return NULL;
-
- // first try the given parent
- if ( parent )
- parent = CheckIfCanBeUsedAsParent(wxGetTopLevelParent(parent));
-
- // then the currently active window
- if ( !parent )
- parent = CheckIfCanBeUsedAsParent(
- wxGetTopLevelParent(wxGetActiveWindow()));
-
- // and finally the application main window
- if ( !parent )
- parent = CheckIfCanBeUsedAsParent(wxTheApp->GetTopWindow());
-
- return parent;
-}
-#endif
-
-
/*
/// wxEventLoopActivator but with a friend so it
/// has access to m_evtLoopOld, and it does not SetActive() as that is
@@ -570,14 +447,11 @@ void DIALOG_SHIM::EndQuasiModal( int retCode )
if( m_qmodal_loop )
{
-#if wxCHECK_VERSION( 2, 9, 4 ) // 2.9.4 is only approximate, might be 3, 0, 0.
if( m_qmodal_loop->IsRunning() )
m_qmodal_loop->Exit( 0 );
else
m_qmodal_loop->ScheduleExit( 0 );
-#else
- m_qmodal_loop->Exit( 0 );
-#endif
+
m_qmodal_loop = NULL;
}
diff --git a/common/draw_panel.cpp b/common/draw_panel.cpp
index 5a87479..45be997 100644
--- a/common/draw_panel.cpp
+++ b/common/draw_panel.cpp
@@ -425,14 +425,12 @@ void EDA_DRAW_PANEL::OnScroll( wxScrollWinEvent& event )
int dir = event.GetOrientation(); // wxHORIZONTAL or wxVERTICAL
- // On windows and on wxWidgets >= 2.9.5 and < 3.1,
- // there is a bug in mousewheel event which always generates 2 scroll events
- // (should be the case only for the default mousewheel event)
- // with id = wxEVT_SCROLLWIN_LINEUP or wxEVT_SCROLLWIN_LINEDOWN
- // so we skip these events.
- // Note they are here just in case, because they are not actually used
- // in Kicad
-#if wxCHECK_VERSION( 3, 1, 0 ) || !wxCHECK_VERSION( 2, 9, 5 ) || !defined (__WINDOWS__)
+ // On Windows with wxWidgets < 3.1, there is a bug in the mousewheel events
+ // which always generates 2 scroll events (should be the case only for the
+ // default mousewheel event) with id = wxEVT_SCROLLWIN_LINEUP or
+ // wxEVT_SCROLLWIN_LINEDOWN so we skip these events.
+ // Note they are here just in case as they are not actually used in Kicad.
+#if wxCHECK_VERSION( 3, 1, 0 ) || !defined (__WINDOWS__)
int maxX = unitsX - csizeX;
int maxY = unitsY - csizeY;
diff --git a/common/draw_panel_gal.cpp b/common/draw_panel_gal.cpp
index 84903cf..29d33e9 100644
--- a/common/draw_panel_gal.cpp
+++ b/common/draw_panel_gal.cpp
@@ -190,29 +190,17 @@ void EDA_DRAW_PANEL_GAL::SetEventDispatcher( TOOL_DISPATCHER* aEventDispatcher )
{
m_eventDispatcher = aEventDispatcher;
-#if wxCHECK_VERSION( 3, 0, 0 )
- const wxEventType eventTypes[] = { wxEVT_TOOL };
-#else
- const wxEventType eventTypes[] = { wxEVT_COMMAND_MENU_SELECTED, wxEVT_COMMAND_TOOL_CLICKED };
-#endif
-
if( m_eventDispatcher )
{
- BOOST_FOREACH( wxEventType type, eventTypes )
- {
- m_parent->Connect( type, wxCommandEventHandler( TOOL_DISPATCHER::DispatchWxCommand ),
- NULL, m_eventDispatcher );
- }
+ m_parent->Connect( wxEVT_TOOL, wxCommandEventHandler( TOOL_DISPATCHER::DispatchWxCommand ),
+ NULL, m_eventDispatcher );
}
else
{
- BOOST_FOREACH( wxEventType type, eventTypes )
- {
- // While loop is used to be sure that all event handlers are removed.
- while( m_parent->Disconnect( type,
- wxCommandEventHandler( TOOL_DISPATCHER::DispatchWxCommand ),
- NULL, m_eventDispatcher ) );
- }
+ // While loop is used to be sure that all event handlers are removed.
+ while( m_parent->Disconnect( wxEVT_TOOL,
+ wxCommandEventHandler( TOOL_DISPATCHER::DispatchWxCommand ),
+ NULL, m_eventDispatcher ) );
}
}
diff --git a/common/gr_basic.cpp b/common/gr_basic.cpp
index 002b242..5150a5f 100644
--- a/common/gr_basic.cpp
+++ b/common/gr_basic.cpp
@@ -294,41 +294,32 @@ bool GetGRForceBlackPenState( void )
void GRSetDrawMode( wxDC* DC, GR_DRAWMODE draw_mode )
{
if( draw_mode & GR_OR )
-#if defined(__WXMAC__) && (wxMAC_USE_CORE_GRAPHICS || wxCHECK_VERSION( 2, 9, 0 ) )
-
- DC->SetLogicalFunction( wxCOPY );
-#elif defined( USE_WX_GRAPHICS_CONTEXT )
-
+#if defined(__WXMAC__) || defined( USE_WX_GRAPHICS_CONTEXT )
DC->SetLogicalFunction( wxCOPY );
#else
-
DC->SetLogicalFunction( wxOR );
#endif
+
else if( draw_mode & GR_XOR )
#if defined( USE_WX_GRAPHICS_CONTEXT )
-
DC->SetLogicalFunction( wxCOPY );
#else
-
DC->SetLogicalFunction( wxXOR );
#endif
- else if( draw_mode & GR_NXOR )
-#if defined(__WXMAC__) && (wxMAC_USE_CORE_GRAPHICS || wxCHECK_VERSION( 2, 9, 0 ) )
+ else if( draw_mode & GR_NXOR )
+#if defined(__WXMAC__)
DC->SetLogicalFunction( wxXOR );
#elif defined( USE_WX_GRAPHICS_CONTEXT )
-
DC->SetLogicalFunction( wxCOPY );
#else
-
DC->SetLogicalFunction( wxEQUIV );
#endif
+
else if( draw_mode & GR_INVERT )
#if defined( USE_WX_GRAPHICS_CONTEXT )
-
DC->SetLogicalFunction( wxCOPY );
#else
-
DC->SetLogicalFunction( wxINVERT );
#endif
else if( draw_mode & GR_COPY )
diff --git a/common/msgpanel.cpp b/common/msgpanel.cpp
index 5652db8..1a16791 100644
--- a/common/msgpanel.cpp
+++ b/common/msgpanel.cpp
@@ -3,7 +3,7 @@
*
* Copyright (C) 2004 Jean-Pierre Charras, jaen-pierre.charras@xxxxxxxxxxxxxxxxxx
* Copyright (C) 2011 Wayne Stambaugh <stambaughw@xxxxxxxxxxx>
- * Copyright (C) 1992-2011 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 1992-2015 KiCad Developers, see AUTHORS.txt for contributors.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -235,12 +235,7 @@ void EDA_MSG_PANEL::erase( wxDC* aDC )
pen.SetColour( color );
brush.SetColour( color );
-
-#if wxCHECK_VERSION( 3, 0, 0 )
brush.SetStyle( wxBRUSHSTYLE_SOLID );
-#else
- brush.SetStyle( wxSOLID );
-#endif
aDC->SetPen( pen );
aDC->SetBrush( brush );
diff --git a/common/pgm_base.cpp b/common/pgm_base.cpp
index 54c2ec6..36708cc 100644
--- a/common/pgm_base.cpp
+++ b/common/pgm_base.cpp
@@ -599,11 +599,7 @@ bool PGM_BASE::SetLanguage( bool first_time )
delete m_locale;
m_locale = new wxLocale;
-#if wxCHECK_VERSION( 2, 9, 0 )
if( !m_locale->Init( m_language_id ) )
-#else
- if( !m_locale->Init( m_language_id, wxLOCALE_CONV_ENCODING ) )
-#endif
{
wxLogDebug( wxT( "This language is not supported by the system." ) );
diff --git a/common/prependpath.cpp b/common/prependpath.cpp
index 258c74d..4e6224a 100644
--- a/common/prependpath.cpp
+++ b/common/prependpath.cpp
@@ -2,7 +2,7 @@
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 2014 CERN
- * Copyright (C) 2014 KiCad Developers, see CHANGELOG.TXT for contributors.
+ * Copyright (C) 2014-2015 KiCad Developers, see CHANGELOG.TXT for contributors.
* @author Maciej Suminski <maciej.suminski@xxxxxxx>
*
* This program is free software; you can redistribute it and/or
@@ -29,59 +29,6 @@
-#if !wxCHECK_VERSION( 2, 9, 0 )
-
-// implement missing wx2.8 function until >= wx3.0 pervades.
-static wxString wxJoin(const wxArrayString& arr, const wxChar sep,
- const wxChar escape = '\\')
-{
- size_t count = arr.size();
- if ( count == 0 )
- return wxEmptyString;
-
- wxString str;
-
- // pre-allocate memory using the estimation of the average length of the
- // strings in the given array: this is very imprecise, of course, but
- // better than nothing
- str.reserve(count*(arr[0].length() + arr[count-1].length()) / 2);
-
- if ( escape == wxT('\0') )
- {
- // escaping is disabled:
- for ( size_t i = 0; i < count; i++ )
- {
- if ( i )
- str += sep;
- str += arr[i];
- }
- }
- else // use escape character
- {
- for ( size_t n = 0; n < count; n++ )
- {
- if ( n )
- str += sep;
-
- for ( wxString::const_iterator i = arr[n].begin(),
- end = arr[n].end();
- i != end;
- ++i )
- {
- const wxChar ch = *i;
- if ( ch == sep )
- str += escape; // escape this separator
- str += ch;
- }
- }
- }
-
- str.Shrink(); // release extra memory if we allocated too much
- return str;
-}
-#endif
-
-
/// Put aPriorityPath in front of all paths in the value of aEnvVar.
const wxString PrePendPath( const wxString& aEnvVar, const wxString& aPriorityPath )
{
diff --git a/common/selcolor.cpp b/common/selcolor.cpp
index f24ad1b..95964be 100644
--- a/common/selcolor.cpp
+++ b/common/selcolor.cpp
@@ -2,7 +2,7 @@
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 2014 Jean-Pierre Charras, jp.charras at wanadoo.fr
- * Copyright (C) 2014 KiCad Developers, see CHANGELOG.TXT for contributors.
+ * Copyright (C) 2014-2015 KiCad Developers, see CHANGELOG.TXT for contributors.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
diff --git a/common/tool/tool_dispatcher.cpp b/common/tool/tool_dispatcher.cpp
index 97127ce..643e9b4 100644
--- a/common/tool/tool_dispatcher.cpp
+++ b/common/tool/tool_dispatcher.cpp
@@ -3,6 +3,7 @@
*
* Copyright (C) 2013 CERN
* @author Tomasz Wlostowski <tomasz.wlostowski@xxxxxxx>
+ * Copyright (C) 2013-2015 KiCad Developers, see CHANGELOG.TXT for contributors.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -299,12 +300,6 @@ void TOOL_DISPATCHER::DispatchWxEvent( wxEvent& aEvent )
if( mods & MD_CTRL )
{
-#if !wxCHECK_VERSION( 2, 9, 0 )
- // I really look forward to the day when we will use only one version of wxWidgets..
- const int WXK_CONTROL_A = 1;
- const int WXK_CONTROL_Z = 26;
-#endif
-
// wxWidgets have a quirk related to Ctrl+letter hot keys handled by CHAR_EVT
// http://docs.wxwidgets.org/trunk/classwx_key_event.html:
// "char events for ASCII letters in this case carry codes corresponding to the ASCII
diff --git a/common/view/wx_view_controls.cpp b/common/view/wx_view_controls.cpp
index 3484a15..175d481 100644
--- a/common/view/wx_view_controls.cpp
+++ b/common/view/wx_view_controls.cpp
@@ -257,10 +257,8 @@ void WX_VIEW_CONTROLS::onTimer( wxTimerEvent& aEvent )
{
case AUTO_PANNING:
{
-#if wxCHECK_VERSION( 3, 0, 0 )
if( !m_parentPanel->HasFocus() )
break;
-#endif
double borderSize = std::min( m_autoPanMargin * m_view->GetScreenPixelSize().x,
m_autoPanMargin * m_view->GetScreenPixelSize().y );
@@ -277,16 +275,9 @@ void WX_VIEW_CONTROLS::onTimer( wxTimerEvent& aEvent )
wxMouseEvent moveEvent( EVT_REFRESH_MOUSE );
// Set the modifiers state
-#if wxCHECK_VERSION( 3, 0, 0 )
moveEvent.SetControlDown( wxGetKeyState( WXK_CONTROL ) );
moveEvent.SetShiftDown( wxGetKeyState( WXK_SHIFT ) );
moveEvent.SetAltDown( wxGetKeyState( WXK_ALT ) );
-#else
- // wx <3.0 do not have accessors, but the fields are exposed
- moveEvent.m_controlDown = wxGetKeyState( WXK_CONTROL );
- moveEvent.m_shiftDown = wxGetKeyState( WXK_SHIFT );
- moveEvent.m_altDown = wxGetKeyState( WXK_ALT );
-#endif
wxPostEvent( m_parentPanel, moveEvent );
}
diff --git a/common/wx_unit_binder.cpp b/common/wx_unit_binder.cpp
index 25ef4cb..6a9236b 100644
--- a/common/wx_unit_binder.cpp
+++ b/common/wx_unit_binder.cpp
@@ -27,9 +27,7 @@
#include <wx/textctrl.h>
#include <limits>
#include <base_units.h>
-#if wxCHECK_VERSION( 2, 9, 0 )
#include <wx/valnum.h>
-#endif
#include <boost/optional.hpp>
diff --git a/common/wxunittext.cpp b/common/wxunittext.cpp
index 743f973..16f649a 100644
--- a/common/wxunittext.cpp
+++ b/common/wxunittext.cpp
@@ -28,9 +28,7 @@
#include <wx/textctrl.h>
#include <limits>
#include <base_units.h>
-#if wxCHECK_VERSION( 2, 9, 0 )
#include <wx/valnum.h>
-#endif
#include <boost/optional.hpp>
WX_UNIT_TEXT::WX_UNIT_TEXT( wxWindow* aParent, const wxString& aLabel, double aValue, double aStep ) :
@@ -58,7 +56,6 @@ WX_UNIT_TEXT::WX_UNIT_TEXT( wxWindow* aParent, const wxString& aLabel, double aV
SetValue( aValue );
sizer->Add( m_inputValue, 0, wxALIGN_CENTER_VERTICAL | wxALL );
-#if wxCHECK_VERSION( 2, 9, 0 ) // Sorry guys, I am tired of dealing with 2.8 compatibility
wxFloatingPointValidator<double> validator( 4, NULL, wxNUM_VAL_NO_TRAILING_ZEROES );
validator.SetRange( 0.0, std::numeric_limits<double>::max() );
m_inputValue->SetValidator( validator );
@@ -72,7 +69,6 @@ WX_UNIT_TEXT::WX_UNIT_TEXT( wxWindow* aParent, const wxString& aLabel, double aV
Connect( wxEVT_SPIN_UP, wxSpinEventHandler( WX_UNIT_TEXT::onSpinUpEvent ), NULL, this );
Connect( wxEVT_SPIN_DOWN, wxSpinEventHandler( WX_UNIT_TEXT::onSpinDownEvent ), NULL, this );
-#endif
sizer->AddSpacer( 5 );
diff --git a/eeschema/dialogs/dialog_choose_component.cpp b/eeschema/dialogs/dialog_choose_component.cpp
index 83d2d14..16a4863 100644
--- a/eeschema/dialogs/dialog_choose_component.cpp
+++ b/eeschema/dialogs/dialog_choose_component.cpp
@@ -2,7 +2,7 @@
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 2014 Henner Zeller <h.zeller@xxxxxxx>
- * Copyright (C) 2014 KiCad Developers, see change_log.txt for contributors.
+ * Copyright (C) 2014-2015 KiCad Developers, see change_log.txt for contributors.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -47,9 +47,7 @@ DIALOG_CHOOSE_COMPONENT::DIALOG_CHOOSE_COMPONENT( SCH_BASE_FRAME* aParent, const
m_searchBox->SetFocus();
m_componentDetails->SetEditable( false );
-#if wxCHECK_VERSION( 3, 0, 0 )
m_libraryComponentTree->ScrollTo( m_libraryComponentTree->GetFocusedItem() );
-#endif
// The tree showing libs and component uses a fixed font,
// because we want controle the position of some info when drawing the
diff --git a/eeschema/dialogs/dialog_color_config.cpp b/eeschema/dialogs/dialog_color_config.cpp
index 833747d..81ba660 100644
--- a/eeschema/dialogs/dialog_color_config.cpp
+++ b/eeschema/dialogs/dialog_color_config.cpp
@@ -236,7 +236,6 @@ void DIALOG_COLOR_CONFIG::SetColor( wxCommandEvent& event )
wxBrush brush;
ColorSetBrush( &brush, color);
-
brush.SetStyle( wxBRUSHSTYLE_SOLID );
iconDC.SetBrush( brush );
diff --git a/gerbview/dialogs/dialog_print_using_printer.cpp b/gerbview/dialogs/dialog_print_using_printer.cpp
index b2a17b7..d9a645b 100644
--- a/gerbview/dialogs/dialog_print_using_printer.cpp
+++ b/gerbview/dialogs/dialog_print_using_printer.cpp
@@ -2,7 +2,7 @@
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 2010-2014 Jean-Pierre Charras jp.charras at wanadoo.fr
- * Copyright (C) 1992-2014 KiCad Developers, see change_log.txt for contributors.
+ * Copyright (C) 1992-2015 KiCad Developers, see change_log.txt for contributors.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -390,11 +390,6 @@ void DIALOG_PRINT_USING_PRINTER::OnPrintButtonClick( wxCommandEvent& event )
wxString title = _( "Print" );
BOARD_PRINTOUT_CONTROLLER printout( s_Parameters, m_Parent, title );
-#if !defined(__WINDOWS__) && !wxCHECK_VERSION(2,9,0)
- wxDC* dc = printout.GetDC();
- ( (wxPostScriptDC*) dc )->SetResolution( 600 ); // Postscript DC resolution is 600 ppi
-#endif
-
if( !printer.Print( this, &printout, true ) )
{
if( wxPrinter::GetLastError() == wxPRINTER_ERROR )
diff --git a/gerbview/gerbview_frame.cpp b/gerbview/gerbview_frame.cpp
index 2ec237c..5cc5800 100644
--- a/gerbview/gerbview_frame.cpp
+++ b/gerbview/gerbview_frame.cpp
@@ -2,7 +2,7 @@
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 2013 Jean-Pierre Charras, jp.charras at wanadoo.fr
- * Copyright (C) 1992-2013 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 1992-2015 KiCad Developers, see AUTHORS.txt for contributors.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
diff --git a/include/class_page_info.h b/include/class_page_info.h
index a9896f6..a10f7eb 100644
--- a/include/class_page_info.h
+++ b/include/class_page_info.h
@@ -3,7 +3,7 @@
*
* Copyright (C) 2007-2013 SoftPLC Corporation, Dick Hollenbeck <dick@xxxxxxxxxxx>
* Copyright (C) 2008-2013 Wayne Stambaugh <stambaughw@xxxxxxxxxxx>
- * Copyright (C) 1992-2013 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 1992-2015 KiCad Developers, see AUTHORS.txt for contributors.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -117,7 +117,7 @@ public:
/**
* Function GetWxOrientation.
- * @return ws' style printing orientation (wxPORTRAIT or wxLANDSCAPE).
+ * @return wx style printing orientation (wxPORTRAIT or wxLANDSCAPE).
*/
wxPrintOrientation GetWxOrientation() const { return IsPortrait() ? wxPORTRAIT : wxLANDSCAPE; }
diff --git a/include/colors.h b/include/colors.h
index 733932a..3a940b0 100644
--- a/include/colors.h
+++ b/include/colors.h
@@ -2,7 +2,7 @@
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 2007-2014 Jean-Pierre Charras, jp.charras at wanadoo.fr
- * Copyright (C) 1992-2014 KiCad Developers, see CHANGELOG.TXT for contributors.
+ * Copyright (C) 1992-2015 KiCad Developers, see CHANGELOG.TXT for contributors.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -205,8 +205,8 @@ inline wxColour MakeColour( EDA_COLOR_T aColor )
return wxColour( g_ColorRefs[ndx].m_Red,
g_ColorRefs[ndx].m_Green,
- g_ColorRefs[ndx].m_Blue
- ,(unsigned char) alpha
+ g_ColorRefs[ndx].m_Blue,
+ (unsigned char) alpha
);
}
diff --git a/include/dialog_shim.h b/include/dialog_shim.h
index 4369e7c..193edca 100644
--- a/include/dialog_shim.h
+++ b/include/dialog_shim.h
@@ -5,7 +5,7 @@
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 2012 SoftPLC Corporation, Dick Hollenbeck <dick@xxxxxxxxxxx>
- * Copyright (C) 2012 KiCad Developers, see CHANGELOG.TXT for contributors.
+ * Copyright (C) 2012-2015 KiCad Developers, see CHANGELOG.TXT for contributors.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -29,25 +29,14 @@
#include <hashtables.h>
#include <kiway_player.h>
-#if wxMINOR_VERSION == 8 && defined(__WXGTK__)
- #define DLGSHIM_USE_SETFOCUS 1
-#else
- #define DLGSHIM_USE_SETFOCUS 0
-#endif
-
class WDO_ENABLE_DISABLE;
class EVENT_LOOP;
// These macros are for DIALOG_SHIM only, NOT for KIWAY_PLAYER. KIWAY_PLAYER
// has its own support for quasi modal and its platform specific issues are different
// than for a wxDialog.
-#if wxCHECK_VERSION( 3, 0, 0 )
- #define SHOWQUASIMODAL ShowQuasiModal
- #define ENDQUASIMODAL EndQuasiModal
-#else
- #define SHOWQUASIMODAL ShowModal
- #define ENDQUASIMODAL EndModal
-#endif
+#define SHOWQUASIMODAL ShowQuasiModal
+#define ENDQUASIMODAL EndQuasiModal
/**
@@ -84,22 +73,12 @@ public:
protected:
-#if !wxCHECK_VERSION( 2, 9, 4 )
- wxWindow* CheckIfCanBeUsedAsParent( wxWindow* parent ) const;
- wxWindow* GetParentForModalDialog( wxWindow *parent, long style ) const;
-#endif
-
std::string m_hash_key; // alternate for class_map when classname re-used.
// variables for quasi-modal behavior support, only used by a few derivatives.
EVENT_LOOP* m_qmodal_loop; // points to nested event_loop, NULL means not qmodal and dismissed
bool m_qmodal_showing;
WDO_ENABLE_DISABLE* m_qmodal_parent_disabler;
-
-#if DLGSHIM_USE_SETFOCUS
-private:
- void onInit( wxInitDialogEvent& aEvent );
-#endif
};
#endif // DIALOG_SHIM_
diff --git a/include/fctsys.h b/include/fctsys.h
index 0769e42..49f0b1f 100644
--- a/include/fctsys.h
+++ b/include/fctsys.h
@@ -2,7 +2,7 @@
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 2007-2014 Jean-Pierre Charras, jp.charras at wanadoo.fr
- * Copyright (C) 1992-2014 KiCad Developers, see CHANGELOG.TXT for contributors.
+ * Copyright (C) 1992-2015 KiCad Developers, see CHANGELOG.TXT for contributors.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -41,7 +41,6 @@
#define DBG(x) // nothing
#endif
-
#include <config.h>
#endif // FCTSYS_H__
diff --git a/include/gal/cairo/cairo_gal.h b/include/gal/cairo/cairo_gal.h
index dca18ac..065931e 100644
--- a/include/gal/cairo/cairo_gal.h
+++ b/include/gal/cairo/cairo_gal.h
@@ -2,7 +2,7 @@
* This program source code file is part of KICAD, a free EDA CAD application.
*
* Copyright (C) 2012 Torsten Hueter, torstenhtr <at> gmx.de
- * Copyright (C) 2012 Kicad Developers, see change_log.txt for contributors.
+ * Copyright (C) 2012-2015 Kicad Developers, see change_log.txt for contributors.
*
* CairoGal - Graphics Abstraction Layer for Cairo
*
@@ -39,11 +39,7 @@
#if defined(__WXMSW__)
#define SCREEN_DEPTH 24
#else
-#if wxCHECK_VERSION( 2, 9, 0 )
#define SCREEN_DEPTH wxBITMAP_SCREEN_DEPTH
-#else
-#define SCREEN_DEPTH 32
-#endif
#endif
/**
diff --git a/include/gr_basic.h b/include/gr_basic.h
index 2db80a7..2814c7b 100644
--- a/include/gr_basic.h
+++ b/include/gr_basic.h
@@ -78,7 +78,6 @@ inline GR_DRAWMODE operator &(const GR_DRAWMODE& a, const GR_DRAWMODE& b)
#define GR_M_MIDDLE_DOWN 0x40000000
#define GR_M_DCLICK 0x80000000
-
extern GR_DRAWMODE g_XorMode;
typedef enum {
diff --git a/include/kiway_player.h b/include/kiway_player.h
index 94be92d..de4e868 100644
--- a/include/kiway_player.h
+++ b/include/kiway_player.h
@@ -5,7 +5,7 @@
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 2014 SoftPLC Corporation, Dick Hollenbeck <dick@xxxxxxxxxxx>
- * Copyright (C) 2014 KiCad Developers, see change_log.txt for contributors.
+ * Copyright (C) 2014-2015 KiCad Developers, see change_log.txt for contributors.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -88,11 +88,7 @@ private:
class KIWAY_EXPRESS;
-#if wxCHECK_VERSION( 2, 9, 4 )
- #define WX_EVENT_LOOP wxGUIEventLoop
-#else
- #define WX_EVENT_LOOP wxEventLoop
-#endif
+#define WX_EVENT_LOOP wxGUIEventLoop
class WX_EVENT_LOOP;
diff --git a/include/macros.h b/include/macros.h
index 9d3de5f..95bcb04 100644
--- a/include/macros.h
+++ b/include/macros.h
@@ -77,11 +77,7 @@ static inline wxString FROM_UTF8( const char* cstring )
*/
static inline const wxChar* GetChars( const wxString& s )
{
-#if wxCHECK_VERSION( 2, 9, 0 )
return (const wxChar*) s.c_str();
-#else
- return s.GetData();
-#endif
}
/// # of elements in an array
diff --git a/include/xnode.h b/include/xnode.h
index 54c132b..971d034 100644
--- a/include/xnode.h
+++ b/include/xnode.h
@@ -5,7 +5,7 @@
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 2010 SoftPLC Corporation, Dick Hollenbeck <dick@xxxxxxxxxxx>
- * Copyright (C) 1992-2010 KiCAd Developers, see change_log.txt for contributors.
+ * Copyright (C) 1992-2015 KiCAd Developers, see change_log.txt for contributors.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -34,9 +34,6 @@
#include <wx/xml/xml.h>
-#if !wxCHECK_VERSION( 2, 9, 0 )
-#define wxXmlAttribute wxXmlProperty
-#endif
/**
* Class XNODE
@@ -97,36 +94,6 @@ public:
* @throw IO_ERROR if a system error writing the output, such as a full disk.
*/
virtual void FormatContents( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR );
-
-#if !wxCHECK_VERSION( 2, 9, 0 )
- // The following functions did not appear in the base class until recently.
- // Overload them even if they are present in base class, just to make sure
- // they are present in any older base class implementation.
- //-----<overloads>---------------------------------------------------------
-
- wxString GetAttribute( const wxString& attrName, const wxString& defaultVal ) const
- {
- return GetPropVal( attrName, defaultVal );
- }
- bool GetAttribute( const wxString& attrName, wxString *value ) const
- {
- return GetPropVal( attrName, value );
- }
- void AddAttribute( const wxString& attrName, const wxString& value )
- {
- AddProperty( attrName, value );
- }
- bool DeleteAttribute( const wxString& attrName )
- {
- return DeleteProperty( attrName );
- }
- wxXmlAttribute* GetAttributes() const
- {
- return GetProperties();
- }
-
- //-----</overloads>--------------------------------------------------------
-#endif
};
#endif // XATTR_H_
diff --git a/kicad/kicad.h b/kicad/kicad.h
index 94e16f9..5ddee6d 100644
--- a/kicad/kicad.h
+++ b/kicad/kicad.h
@@ -7,7 +7,7 @@
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 2013 CERN (www.cern.ch)
- * Copyright (C) 2015 KiCad Developers, see CHANGELOG.txt for contributors.
+ * Copyright (C) 2013-2015 KiCad Developers, see CHANGELOG.txt for contributors.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
diff --git a/new/sweet_edit.cpp b/new/sweet_edit.cpp
index 86c2039..0a6d538 100644
--- a/new/sweet_edit.cpp
+++ b/new/sweet_edit.cpp
@@ -2,7 +2,7 @@
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 2011 SoftPLC Corporation, Dick Hollenbeck <dick@xxxxxxxxxxx>
- * Copyright (C) 2011 KiCad Developers, see change_log.txt for contributors.
+ * Copyright (C) 2011-2015 KiCad Developers, see change_log.txt for contributors.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
diff --git a/pcbnew/dialogs/dialog_copper_zones.cpp b/pcbnew/dialogs/dialog_copper_zones.cpp
index f0215ff..d09faa7 100644
--- a/pcbnew/dialogs/dialog_copper_zones.cpp
+++ b/pcbnew/dialogs/dialog_copper_zones.cpp
@@ -7,7 +7,7 @@
*
* Copyright (C) 2012 Jean-Pierre Charras, jean-pierre.charras@xxxxxxxxxxxxxxx
* Copyright (C) 2012 SoftPLC Corporation, Dick Hollenbeck <dick@xxxxxxxxxxx>
- * Copyright (C) 1992-2012 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 1992-2015 KiCad Developers, see AUTHORS.txt for contributors.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -702,12 +702,7 @@ wxBitmap DIALOG_COPPER_ZONE::makeLayerBitmap( EDA_COLOR_T aColor )
iconDC.SelectObject( bitmap );
brush.SetColour( MakeColour( aColor ) );
-
-#if wxCHECK_VERSION( 3, 0, 0 )
brush.SetStyle( wxBRUSHSTYLE_SOLID );
-#else
- brush.SetStyle( wxSOLID );
-#endif
iconDC.SetBrush( brush );
iconDC.DrawRectangle( 0, 0, LAYER_BITMAP_SIZE_X, LAYER_BITMAP_SIZE_Y );
diff --git a/pcbnew/dialogs/dialog_design_rules.cpp b/pcbnew/dialogs/dialog_design_rules.cpp
index 8d1d5db..e111f7d 100644
--- a/pcbnew/dialogs/dialog_design_rules.cpp
+++ b/pcbnew/dialogs/dialog_design_rules.cpp
@@ -7,7 +7,7 @@
*
* Copyright (C) 2004-2009 Jean-Pierre Charras, jean-pierre.charras@xxxxxxxxxxxxxxxxx
* Copyright (C) 2009 Dick Hollenbeck, dick@xxxxxxxxxxx
- * Copyright (C) 2009 KiCad Developers, see change_log.txt for contributors.
+ * Copyright (C) 2009-2015 KiCad Developers, see change_log.txt for contributors.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -178,12 +178,10 @@ DIALOG_DESIGN_RULES::DIALOG_DESIGN_RULES( PCB_EDIT_FRAME* parent ) :
GetSizer()->Fit( this );
GetSizer()->SetSizeHints( this );
- // Allow tabbing out of grid controls. Only available on wxWidgets 2.9.5 or later.
-#if wxCHECK_VERSION( 2, 9, 5 )
+ // Allow tabbing out of grid controls.
m_grid->SetTabBehaviour( wxGrid::Tab_Leave );
m_gridViaSizeList->SetTabBehaviour( wxGrid::Tab_Leave );
m_gridTrackWidthList->SetTabBehaviour( wxGrid::Tab_Leave );
-#endif
Center();
}
diff --git a/pcbnew/dialogs/dialog_drc.cpp b/pcbnew/dialogs/dialog_drc.cpp
index fd9b656..00f34bd 100644
--- a/pcbnew/dialogs/dialog_drc.cpp
+++ b/pcbnew/dialogs/dialog_drc.cpp
@@ -133,7 +133,6 @@ void DIALOG_DRC_CONTROL::OnStartdrcClick( wxCommandEvent& event )
wxSafeYield(); // Allows time slice to refresh the m_Messages window
m_tester->m_pcb->m_Status_Pcb = 0; // Force full connectivity and ratsnest recalculations
m_tester->RunTests(m_Messages);
-
m_Notebook->ChangeSelection( 0 ); // display the 1at tab "...Markers ..."
@@ -197,7 +196,6 @@ void DIALOG_DRC_CONTROL::OnListUnconnectedClick( wxCommandEvent& event )
m_Messages->Clear();
m_tester->ListUnconnectedPads();
-
m_Notebook->ChangeSelection( 1 ); // display the 2nd tab "Unconnected..."
// Generate the report
diff --git a/pcbnew/dialogs/dialog_keepout_area_properties.cpp b/pcbnew/dialogs/dialog_keepout_area_properties.cpp
index 76da0e5..73c2c56 100644
--- a/pcbnew/dialogs/dialog_keepout_area_properties.cpp
+++ b/pcbnew/dialogs/dialog_keepout_area_properties.cpp
@@ -7,7 +7,7 @@
*
* Copyright (C) 2014 Jean-Pierre Charras, jp.charras at wanadoo.fr
* Copyright (C) 2014 SoftPLC Corporation, Dick Hollenbeck <dick@xxxxxxxxxxx>
- * Copyright (C) 1992-2014 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 1992-2015 KiCad Developers, see AUTHORS.txt for contributors.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -264,12 +264,7 @@ wxBitmap DIALOG_KEEPOUT_AREA_PROPERTIES::makeLayerBitmap( EDA_COLOR_T aColor )
iconDC.SelectObject( bitmap );
brush.SetColour( MakeColour( aColor ) );
-
-#if wxCHECK_VERSION( 3, 0, 0 )
brush.SetStyle( wxBRUSHSTYLE_SOLID );
-#else
- brush.SetStyle( wxSOLID );
-#endif
iconDC.SetBrush( brush );
iconDC.DrawRectangle( 0, 0, LAYER_BITMAP_SIZE_X, LAYER_BITMAP_SIZE_Y );
diff --git a/pcbnew/dialogs/dialog_non_copper_zones_properties.cpp b/pcbnew/dialogs/dialog_non_copper_zones_properties.cpp
index 35516e1..adf7e72 100644
--- a/pcbnew/dialogs/dialog_non_copper_zones_properties.cpp
+++ b/pcbnew/dialogs/dialog_non_copper_zones_properties.cpp
@@ -6,7 +6,7 @@
*
* Copyright (C) 2014 Jean-Pierre Charras, jp.charras at wanadoo.fr
* Copyright (C) 2014 SoftPLC Corporation, Dick Hollenbeck <dick@xxxxxxxxxxx>
- * Copyright (C) 1992-2014 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 1992-2015 KiCad Developers, see AUTHORS.txt for contributors.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -259,12 +259,7 @@ wxBitmap DIALOG_NON_COPPER_ZONES_EDITOR::makeLayerBitmap( EDA_COLOR_T aColor )
iconDC.SelectObject( bitmap );
brush.SetColour( MakeColour( aColor ) );
-
-#if wxCHECK_VERSION( 3, 0, 0 )
brush.SetStyle( wxBRUSHSTYLE_SOLID );
-#else
- brush.SetStyle( wxSOLID );
-#endif
iconDC.SetBrush( brush );
iconDC.DrawRectangle( 0, 0, LAYER_BITMAP_SIZE_X, LAYER_BITMAP_SIZE_Y );
diff --git a/pcbnew/dialogs/dialog_pad_properties.cpp b/pcbnew/dialogs/dialog_pad_properties.cpp
index a30c352..f55f549 100644
--- a/pcbnew/dialogs/dialog_pad_properties.cpp
+++ b/pcbnew/dialogs/dialog_pad_properties.cpp
@@ -9,7 +9,7 @@
* Copyright (C) 2013 Jean-Pierre Charras, jp.charras at wanadoo.fr
* Copyright (C) 2013 Dick Hollenbeck, dick@xxxxxxxxxxx
* Copyright (C) 2008-2013 Wayne Stambaugh <stambaughw@xxxxxxxxxxx>
- * Copyright (C) 1992-2013 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 1992-2015 KiCad Developers, see AUTHORS.txt for contributors.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -182,9 +182,6 @@ DIALOG_PAD_PROPERTIES::DIALOG_PAD_PROPERTIES( PCB_BASE_FRAME* aParent, D_PAD* aP
{
m_panelShowPadGal->UseColorScheme( m_board->GetColorsSettings() );
m_panelShowPadGal->SwitchBackend( m_parent->GetGalCanvas()->GetBackend() );
-#if !wxCHECK_VERSION( 3, 0, 0 )
- m_panelShowPadGal->SetSize( m_panelShowPad->GetSize() );
-#endif
m_panelShowPadGal->Show();
m_panelShowPad->Hide();
m_panelShowPadGal->GetView()->Add( m_dummyPad );
diff --git a/pcbnew/dialogs/dialog_print_for_modedit.cpp b/pcbnew/dialogs/dialog_print_for_modedit.cpp
index 40bef2b..8181c0a 100644
--- a/pcbnew/dialogs/dialog_print_for_modedit.cpp
+++ b/pcbnew/dialogs/dialog_print_for_modedit.cpp
@@ -2,7 +2,7 @@
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 2010-2014 Jean-Pierre Charras, jean-pierre.charras at wanadoo.fr
- * Copyright (C) 1992-2014 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 1992-2015 KiCad Developers, see AUTHORS.txt for contributors.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
diff --git a/pcbnew/dialogs/dialog_print_using_printer.cpp b/pcbnew/dialogs/dialog_print_using_printer.cpp
index d01771b..59992a6 100644
--- a/pcbnew/dialogs/dialog_print_using_printer.cpp
+++ b/pcbnew/dialogs/dialog_print_using_printer.cpp
@@ -2,7 +2,7 @@
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 2010-2014 Jean-Pierre Charras, jean-pierre.charras at wanadoo.fr
- * Copyright (C) 1992-2014 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 1992-2015 KiCad Developers, see AUTHORS.txt for contributors.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
diff --git a/pcbnew/dialogs/dialog_track_via_size.cpp b/pcbnew/dialogs/dialog_track_via_size.cpp
index 60ef3e7..d51c46f 100644
--- a/pcbnew/dialogs/dialog_track_via_size.cpp
+++ b/pcbnew/dialogs/dialog_track_via_size.cpp
@@ -3,6 +3,7 @@
*
* Copyright (C) 2014 CERN
* Author: Maciej Suminski <maciej.suminski@xxxxxxx>
+ * Copyright (C) 2014-2015 KiCad Developers, see change_log.txt for contributors.
*
* This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -49,11 +50,7 @@ DIALOG_TRACK_VIA_SIZE::DIALOG_TRACK_VIA_SIZE( wxWindow* aParent, BOARD_DESIGN_SE
Centre();
// Pressing ENTER when any of the text input fields is active applies changes
- #if wxCHECK_VERSION( 3, 0, 0 )
- Connect( wxEVT_TEXT_ENTER, wxCommandEventHandler( DIALOG_TRACK_VIA_SIZE::onOkClick ), NULL, this );
- #else
- Connect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( DIALOG_TRACK_VIA_SIZE::onOkClick ), NULL, this );
- #endif
+ Connect( wxEVT_TEXT_ENTER, wxCommandEventHandler( DIALOG_TRACK_VIA_SIZE::onOkClick ), NULL, this );
}
diff --git a/pcbnew/footprint_wizard_frame.cpp b/pcbnew/footprint_wizard_frame.cpp
index 7bd6410..06d8560 100644
--- a/pcbnew/footprint_wizard_frame.cpp
+++ b/pcbnew/footprint_wizard_frame.cpp
@@ -77,13 +77,8 @@ BEGIN_EVENT_TABLE( FOOTPRINT_WIZARD_FRAME, EDA_DRAW_FRAME )
EVT_LISTBOX( ID_FOOTPRINT_WIZARD_PAGE_LIST, FOOTPRINT_WIZARD_FRAME::ClickOnPageList )
-#if wxCHECK_VERSION( 3, 0, 0 )
EVT_GRID_CMD_CELL_CHANGED( ID_FOOTPRINT_WIZARD_PARAMETER_LIST,
FOOTPRINT_WIZARD_FRAME::ParametersUpdated )
-#else
- EVT_GRID_CMD_CELL_CHANGE( ID_FOOTPRINT_WIZARD_PARAMETER_LIST,
- FOOTPRINT_WIZARD_FRAME::ParametersUpdated )
-#endif
EVT_GRID_CMD_EDITOR_HIDDEN( ID_FOOTPRINT_WIZARD_PARAMETER_LIST,
FOOTPRINT_WIZARD_FRAME::ParametersUpdated )
diff --git a/pcbnew/highlight.cpp b/pcbnew/highlight.cpp
index 48452a3..e55331c 100644
--- a/pcbnew/highlight.cpp
+++ b/pcbnew/highlight.cpp
@@ -3,7 +3,7 @@
*
* Copyright (C) 2012 Jean-Pierre Charras, jean-pierre.charras@xxxxxxxxxxxxxxx
* Copyright (C) 2012 SoftPLC Corporation, Dick Hollenbeck <dick@xxxxxxxxxxx>
- * Copyright (C) 1992-2012 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 1992-2015 KiCad Developers, see AUTHORS.txt for contributors.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -76,7 +76,7 @@ void PCB_EDIT_FRAME::ListNetsAndSelect( wxCommandEvent& event )
list.Add( Line );
}
- wxSingleChoiceDialog choiceDlg( this, wxEmptyString, _( "Select Net" ), list );
+ wxSingleChoiceDialog choiceDlg( this, wxEmptyString, _( "Select Net" ), list, (void**) NULL );
if( (choiceDlg.ShowModal() == wxID_CANCEL) || (choiceDlg.GetSelection() == wxNOT_FOUND) )
return;
diff --git a/pcbnew/layer_widget.cpp b/pcbnew/layer_widget.cpp
index 84cad5d..b6b8236 100644
--- a/pcbnew/layer_widget.cpp
+++ b/pcbnew/layer_widget.cpp
@@ -3,7 +3,7 @@
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 2010 SoftPLC Corporation, Dick Hollenbeck <dick@xxxxxxxxxxx>
- * Copyright (C) 2010 KiCad Developers, see change_log.txt for contributors.
+ * Copyright (C) 2010-2015 KiCad Developers, see change_log.txt for contributors.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -194,12 +194,7 @@ wxBitmap LAYER_WIDGET::makeBitmap( EDA_COLOR_T aColor )
iconDC.SelectObject( bitmap );
brush.SetColour( MakeColour( aColor ) );
-
-#if wxCHECK_VERSION( 3, 0, 0 )
brush.SetStyle( wxBRUSHSTYLE_SOLID );
-#else
- brush.SetStyle( wxSOLID );
-#endif
iconDC.SetBrush( brush );
Attachment:
signature.asc
Description: OpenPGP digital signature
References
