Commit 36ae78ff authored by jean-pierre charras's avatar jean-pierre charras
Browse files

pcbnew: fix wxWidgets 2.8 compatibility issue (temporary fix, still have a... 

pcbnew: fix wxWidgets 2.8 compatibility issue (temporary fix, still have a minor cosmetic issue), and add missing file.
parent ede208f3

pcbnew/class_pcb_layer_box_selector.cpp

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ void PCB_LAYER_BOX_SELECTOR::Resync() 
    }



    minwidth += BM_SIZE + 35;    // Take in account the bitmap size and margins

    SetMinClientSize( wxSize( minwidth, -1 ) );

    SetMinSize( wxSize( minwidth, -1 ) );

}

pcbnew/dialogs/dialog_graphic_item_properties_base.cpp

+7 −13
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ DIALOG_GRAPHIC_ITEM_PROPERTIES_BASE::DIALOG_GRAPHIC_ITEM_PROPERTIES_BASE( wxWind 
	bUpperRightSizer = new wxBoxSizer( wxVERTICAL );

	

	wxFlexGridSizer* fgUpperRightGridSizer;

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

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

	fgUpperRightGridSizer->AddGrowableCol( 1 );

	fgUpperRightGridSizer->SetFlexibleDirection( wxBOTH );

	fgUpperRightGridSizer->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
@@ -126,24 +126,18 @@ DIALOG_GRAPHIC_ITEM_PROPERTIES_BASE::DIALOG_GRAPHIC_ITEM_PROPERTIES_BASE( wxWind 
	m_DefaulThicknessTextUnit->Wrap( -1 );

	fgUpperRightGridSizer->Add( m_DefaulThicknessTextUnit, 0, wxTOP|wxBOTTOM|wxRIGHT, 5 );

	

	

	bUpperRightSizer->Add( fgUpperRightGridSizer, 0, wxEXPAND, 5 );

	

	wxFlexGridSizer* fgLowerRightSizer;

	fgLowerRightSizer = new wxFlexGridSizer( 1, 2, 0, 0 );

	fgLowerRightSizer->AddGrowableCol( 1 );

	fgLowerRightSizer->SetFlexibleDirection( wxBOTH );

	fgLowerRightSizer->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );

	

	m_LayerLabel = new wxStaticText( this, wxID_ANY, _("Layer:"), wxDefaultPosition, wxDefaultSize, 0 );

	m_LayerLabel->Wrap( -1 );

	fgLowerRightSizer->Add( m_LayerLabel, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxTOP|wxBOTTOM|wxLEFT, 5 );

	fgUpperRightGridSizer->Add( m_LayerLabel, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxTOP|wxBOTTOM|wxLEFT, 5 );

	

	m_LayerSelectionCtrl = new PCB_LAYER_BOX_SELECTOR( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); 

	fgLowerRightSizer->Add( m_LayerSelectionCtrl, 0, wxALL, 5 );

	fgUpperRightGridSizer->Add( m_LayerSelectionCtrl, 0, wxALL, 5 );

	

	

	bUpperRightSizer->Add( fgLowerRightSizer, 1, wxEXPAND, 5 );

	fgUpperRightGridSizer->Add( 0, 0, 1, wxEXPAND, 5 );

	

	

	bUpperRightSizer->Add( fgUpperRightGridSizer, 0, wxEXPAND, 5 );

	

	

	bUpperSizer->Add( bUpperRightSizer, 1, wxEXPAND, 5 );

pcbnew/dialogs/dialog_graphic_item_properties_base.fbp

+12 −20
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ 
            <property name="minimum_size">-1,-1</property>

            <property name="name">DIALOG_GRAPHIC_ITEM_PROPERTIES_BASE</property>

            <property name="pos"></property>

            <property name="size">537,215</property>

            <property name="size">576,215</property>

            <property name="style">wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER|wxSYSTEM_MENU</property>

            <property name="subclass">DIALOG_SHIM; dialog_shim.h</property>

            <property name="title">Graphic Item Properties</property>
@@ -1250,7 +1250,7 @@ 
                                        <property name="name">fgUpperRightGridSizer</property>

                                        <property name="non_flexible_grow_mode">wxFLEX_GROWMODE_SPECIFIED</property>

                                        <property name="permission">none</property>

                                        <property name="rows">3</property>

                                        <property name="rows">0</property>

                                        <property name="vgap">0</property>

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

                                            <property name="border">5</property>
@@ -2023,24 +2023,6 @@ 
                                                <event name="OnUpdateUI"></event>

                                            </object>

                                        </object>

                                    </object>

                                </object>

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

                                    <property name="border">5</property>

                                    <property name="flag">wxEXPAND</property>

                                    <property name="proportion">1</property>

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

                                        <property name="cols">2</property>

                                        <property name="flexible_direction">wxBOTH</property>

                                        <property name="growablecols">1</property>

                                        <property name="growablerows"></property>

                                        <property name="hgap">0</property>

                                        <property name="minimum_size"></property>

                                        <property name="name">fgLowerRightSizer</property>

                                        <property name="non_flexible_grow_mode">wxFLEX_GROWMODE_SPECIFIED</property>

                                        <property name="permission">none</property>

                                        <property name="rows">1</property>

                                        <property name="vgap">0</property>

                                        <object class="sizeritem" expanded="0">

                                            <property name="border">5</property>

                                            <property name="flag">wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxTOP|wxBOTTOM|wxLEFT</property>
@@ -2215,6 +2197,16 @@ 
                                                <event name="OnUpdateUI"></event>

                                            </object>

                                        </object>

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

                                            <property name="border">5</property>

                                            <property name="flag">wxEXPAND</property>

                                            <property name="proportion">1</property>

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

                                                <property name="height">0</property>

                                                <property name="permission">protected</property>

                                                <property name="width">0</property>

                                            </object>

                                        </object>

                                    </object>

                                </object>

                            </object>

pcbnew/dialogs/dialog_graphic_item_properties_base.h

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ class DIALOG_GRAPHIC_ITEM_PROPERTIES_BASE : public DIALOG_SHIM 
	

	public:

		

		DIALOG_GRAPHIC_ITEM_PROPERTIES_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Graphic Item Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 537,215 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER|wxSYSTEM_MENU ); 

		DIALOG_GRAPHIC_ITEM_PROPERTIES_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Graphic Item Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 576,215 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER|wxSYSTEM_MENU ); 

		~DIALOG_GRAPHIC_ITEM_PROPERTIES_BASE();

	

};

pcbnew/dialogs/dialog_layer_selection_base.cpp

+6 −6
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ DIALOG_LAYER_SELECTION_BASE::DIALOG_LAYER_SELECTION_BASE( wxWindow* parent, wxWi 
	m_leftGridLayers = new wxGrid( this, ID_LEFT_LIST, wxDefaultPosition, wxDefaultSize, 0 );

	

	// Grid

	m_leftGridLayers->CreateGrid( 1, 4 );

	m_leftGridLayers->CreateGrid( 1, 3 );

	m_leftGridLayers->EnableEditing( false );

	m_leftGridLayers->EnableGridLines( true );

	m_leftGridLayers->EnableDragGridSize( false );
@@ -45,12 +45,12 @@ DIALOG_LAYER_SELECTION_BASE::DIALOG_LAYER_SELECTION_BASE( wxWindow* parent, wxWi 
	// Cell Defaults

	m_leftGridLayers->SetDefaultCellBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_MENU ) );

	m_leftGridLayers->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP );

	bSizerUpper->Add( m_leftGridLayers, 0, wxALL|wxEXPAND, 5 );

	bSizerUpper->Add( m_leftGridLayers, 1, wxALL|wxEXPAND, 5 );

	

	m_rightGridLayers = new wxGrid( this, ID_RIGHT_LIST, wxDefaultPosition, wxDefaultSize, 0 );

	

	// Grid

	m_rightGridLayers->CreateGrid( 1, 4 );

	m_rightGridLayers->CreateGrid( 1, 3 );

	m_rightGridLayers->EnableEditing( false );

	m_rightGridLayers->EnableGridLines( true );

	m_rightGridLayers->EnableDragGridSize( false );
@@ -72,7 +72,7 @@ DIALOG_LAYER_SELECTION_BASE::DIALOG_LAYER_SELECTION_BASE( wxWindow* parent, wxWi 
	// Cell Defaults

	m_rightGridLayers->SetDefaultCellBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_MENU ) );

	m_rightGridLayers->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP );

	bSizerUpper->Add( m_rightGridLayers, 0, wxALL|wxEXPAND, 5 );

	bSizerUpper->Add( m_rightGridLayers, 1, wxALL|wxEXPAND, 5 );

	

	

	bSizerMain->Add( bSizerUpper, 1, wxEXPAND, 5 );
@@ -121,7 +121,7 @@ DIALOG_COPPER_LAYER_PAIR_SELECTION_BASE::DIALOG_COPPER_LAYER_PAIR_SELECTION_BASE 
	m_leftGridLayers = new wxGrid( this, ID_LEFT_LIST, wxDefaultPosition, wxDefaultSize, 0 );

	

	// Grid

	m_leftGridLayers->CreateGrid( 1, 4 );

	m_leftGridLayers->CreateGrid( 1, 3 );

	m_leftGridLayers->EnableEditing( false );

	m_leftGridLayers->EnableGridLines( true );

	m_leftGridLayers->EnableDragGridSize( false );
@@ -159,7 +159,7 @@ DIALOG_COPPER_LAYER_PAIR_SELECTION_BASE::DIALOG_COPPER_LAYER_PAIR_SELECTION_BASE 
	m_rightGridLayers = new wxGrid( this, ID_RIGHT_LIST, wxDefaultPosition, wxDefaultSize, 0 );

	

	// Grid

	m_rightGridLayers->CreateGrid( 1, 4 );

	m_rightGridLayers->CreateGrid( 1, 3 );

	m_rightGridLayers->EnableEditing( false );

	m_rightGridLayers->EnableGridLines( true );

	m_rightGridLayers->EnableDragGridSize( false );