Commit 21013246 authored by Blair Bonnett's avatar Blair Bonnett Committed by Wayne Stambaugh
Browse files

Fix wxGTK scrollbar assertion in Pcbnew layer setup dialog.

parent 4000820b

common/draw_panel.cpp

+1 −7
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
 *

 * Copyright (C) 2009 Jean-Pierre Charras, jean-pierre.charras@gipsa-lab.inpg.fr

 * Copyright (C) 2007-2011 Wayne Stambaugh <stambaughw@verizon.net>

 * 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
@@ -87,18 +87,12 @@ END_EVENT_TABLE() 


EDA_DRAW_PANEL::EDA_DRAW_PANEL( EDA_DRAW_FRAME* parent, int id,

                                const wxPoint& pos, const wxSize& size ) :

#if wxCHECK_VERSION( 2, 9, 5 )

    wxScrolledWindow( parent, id, pos, size, wxBORDER | wxHSCROLL | wxVSCROLL )

#else

    wxScrolledWindow( parent, id, pos, size, wxBORDER | wxHSCROLL | wxVSCROLL | wxALWAYS_SHOW_SB )

#endif

{

    wxASSERT( parent );



#if wxCHECK_VERSION( 2, 9, 5 )

    ShowScrollbars( wxSHOW_SB_ALWAYS, wxSHOW_SB_ALWAYS );

    DisableKeyboardScrolling();

#endif



    m_scrollIncrementX = std::min( size.x / 8, 10 );

    m_scrollIncrementY = std::min( size.y / 8, 10 );

pcbnew/dialogs/dialog_layers_setup.cpp

+3 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
 *

 * Copyright (C) 2009 Isaac Marino Bavaresco, isaacbavaresco@yahoo.com.br

 * Copyright (C) 2009 SoftPLC Corporation, Dick Hollenbeck <dick@softplc.com>

 * 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
@@ -357,6 +357,8 @@ DIALOG_LAYERS_SETUP::DIALOG_LAYERS_SETUP( wxTopLevelWindow* aParent, BOARD* aBoa 
    // plus 10 so we can have a border of 5 on both top and bottom.

    m_TitlePanel->SetMinSize( wxSize( -1, m_AdhesFrontName->GetSize().y+10 ) );



    m_LayersListPanel->ShowScrollbars( wxSHOW_SB_ALWAYS, wxSHOW_SB_ALWAYS );



    Layout();

    Fit();

pcbnew/dialogs/dialog_layers_setup_base.cpp

+2 −2
Original line number Diff line number Diff line 
///////////////////////////////////////////////////////////////////////////

// C++ code generated with wxFormBuilder (version Nov  6 2013)

// C++ code generated with wxFormBuilder (version Nov  5 2014)

// http://www.wxformbuilder.org/

//

// PLEASE DO "NOT" EDIT THIS FILE!
@@ -73,7 +73,7 @@ DIALOG_LAYERS_SETUP_BASE::DIALOG_LAYERS_SETUP_BASE( wxWindow* parent, wxWindowID 
	

	b_layersListSizer->Add( bCaptionsSizer, 0, wxALIGN_CENTER|wxEXPAND|wxRIGHT|wxLEFT, 5 );

	

	m_LayersListPanel = new wxScrolledWindow( this, wxID_ANY, wxDefaultPosition, wxSize( -1,-1 ), wxALWAYS_SHOW_SB|wxRAISED_BORDER|wxTAB_TRAVERSAL|wxVSCROLL );

	m_LayersListPanel = new wxScrolledWindow( this, wxID_ANY, wxDefaultPosition, wxSize( -1,-1 ), wxRAISED_BORDER|wxTAB_TRAVERSAL|wxVSCROLL );

	m_LayersListPanel->SetScrollRate( 0, 5 );

	m_LayerListFlexGridSizer = new wxFlexGridSizer( 0, 3, 0, 0 );

	m_LayerListFlexGridSizer->AddGrowableCol( 0 );

pcbnew/dialogs/dialog_layers_setup_base.fbp

+2 −2
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>

<wxFormBuilder_Project>

    <FileVersion major="1" minor="11" />

    <FileVersion major="1" minor="13" />

    <object class="Project" expanded="1">

        <property name="class_decoration"></property>

        <property name="code_generation">C++</property>
@@ -707,7 +707,7 @@ 
                                <property name="tooltip"></property>

                                <property name="window_extra_style"></property>

                                <property name="window_name"></property>

                                <property name="window_style">wxALWAYS_SHOW_SB|wxRAISED_BORDER|wxTAB_TRAVERSAL|wxVSCROLL</property>

                                <property name="window_style">wxRAISED_BORDER|wxTAB_TRAVERSAL|wxVSCROLL</property>

                                <event name="OnChar"></event>

                                <event name="OnEnterWindow"></event>

                                <event name="OnEraseBackground"></event>

pcbnew/dialogs/dialog_layers_setup_base.h

+1 −1
Original line number Diff line number Diff line 
///////////////////////////////////////////////////////////////////////////

// C++ code generated with wxFormBuilder (version Nov  6 2013)

// C++ code generated with wxFormBuilder (version Nov  5 2014)

// http://www.wxformbuilder.org/

//

// PLEASE DO "NOT" EDIT THIS FILE!