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

Pcbnew: make all dialogs derived from DIALOG_SHIM.

parent c169de80

pcbnew/dialogs/dialog_SVG_print_base.cpp

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 


///////////////////////////////////////////////////////////////////////////



DIALOG_SVG_PRINT_base::DIALOG_SVG_PRINT_base( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )

DIALOG_SVG_PRINT_base::DIALOG_SVG_PRINT_base( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : DIALOG_SHIM( parent, id, title, pos, size, style )

{

	this->SetSizeHints( wxSize( -1,350 ), wxDefaultSize );

pcbnew/dialogs/dialog_SVG_print_base.fbp

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ 
            <property name="pos"></property>

            <property name="size">507,420</property>

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

            <property name="subclass"></property>

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

            <property name="title">Export SVG file</property>

            <property name="tooltip"></property>

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

pcbnew/dialogs/dialog_SVG_print_base.h

+2 −1
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include <wx/artprov.h>

#include <wx/xrc/xmlres.h>

#include <wx/intl.h>

#include "dialog_shim.h"

#include <wx/string.h>

#include <wx/sizer.h>

#include <wx/statbox.h>
@@ -30,7 +31,7 @@ 
///////////////////////////////////////////////////////////////////////////////

/// Class DIALOG_SVG_PRINT_base

///////////////////////////////////////////////////////////////////////////////

class DIALOG_SVG_PRINT_base : public wxDialog 

class DIALOG_SVG_PRINT_base : public DIALOG_SHIM

{

	private:

pcbnew/dialogs/dialog_block_options_base.cpp

+7 −3
Original line number Diff line number Diff line 
///////////////////////////////////////////////////////////////////////////

// C++ code generated with wxFormBuilder (version Nov 17 2010)

// C++ code generated with wxFormBuilder (version Apr 10 2012)

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

//

// PLEASE DO "NOT" EDIT THIS FILE!
@@ -9,7 +9,7 @@ 


///////////////////////////////////////////////////////////////////////////



DIALOG_BLOCK_OPTIONS_BASE::DIALOG_BLOCK_OPTIONS_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )

DIALOG_BLOCK_OPTIONS_BASE::DIALOG_BLOCK_OPTIONS_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : DIALOG_SHIM( parent, id, title, pos, size, style )

{

	this->SetSizeHints( wxDefaultSize, wxDefaultSize );
@@ -47,7 +47,8 @@ DIALOG_BLOCK_OPTIONS_BASE::DIALOG_BLOCK_OPTIONS_BASE( wxWindow* parent, wxWindow 
	m_DrawBlockItems = new wxCheckBox( this, wxID_ANY, _("Draw selected items while moving"), wxDefaultPosition, wxDefaultSize, 0 );

	gSizer1->Add( m_DrawBlockItems, 0, wxALL, 5 );

	

	sbSizer1->Add( gSizer1, 0, wxEXPAND, 5 );

	

	sbSizer1->Add( gSizer1, 1, wxEXPAND, 5 );

	

	m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );

	sbSizer1->Add( m_staticline1, 0, wxEXPAND | wxALL, 5 );
@@ -55,6 +56,7 @@ DIALOG_BLOCK_OPTIONS_BASE::DIALOG_BLOCK_OPTIONS_BASE( wxWindow* parent, wxWindow 
	m_checkBoxIncludeInvisible = new wxCheckBox( this, wxID_ANY, _("Include items on invisible layers"), wxDefaultPosition, wxDefaultSize, 0 );

	sbSizer1->Add( m_checkBoxIncludeInvisible, 0, wxALL, 5 );

	

	

	bSizerMain->Add( sbSizer1, 1, wxALL|wxEXPAND, 5 );

	

	m_sdbSizer1 = new wxStdDialogButtonSizer();
@@ -63,8 +65,10 @@ DIALOG_BLOCK_OPTIONS_BASE::DIALOG_BLOCK_OPTIONS_BASE( wxWindow* parent, wxWindow 
	m_sdbSizer1Cancel = new wxButton( this, wxID_CANCEL );

	m_sdbSizer1->AddButton( m_sdbSizer1Cancel );

	m_sdbSizer1->Realize();

	

	bSizerMain->Add( m_sdbSizer1, 0, wxALIGN_RIGHT|wxALL, 5 );

	

	

	this->SetSizer( bSizerMain );

	this->Layout();

pcbnew/dialogs/dialog_block_options_base.fbp

+557 −553

File changed.

Preview size limit exceeded, changes collapsed.