Commit e3952297 authored by jean-pierre charras's avatar jean-pierre charras

Pcbnew: dialog copper zone: fix bug 726999. Remove unwanted resizing of dialog...

Pcbnew: dialog copper zone: fix bug 726999. Remove unwanted resizing of dialog frame when selecting options.
parent 201408a1
...@@ -224,6 +224,7 @@ void dialog_copper_zone::OnSize( wxSizeEvent& event ) ...@@ -224,6 +224,7 @@ void dialog_copper_zone::OnSize( wxSizeEvent& event )
// Set layer list column width to widget width minus a few pixels // Set layer list column width to widget width minus a few pixels
m_LayerSelectionCtrl->SetColumnWidth( 0, m_LayerSelectionCtrl->GetSize().x - 5 ); m_LayerSelectionCtrl->SetColumnWidth( 0, m_LayerSelectionCtrl->GetSize().x - 5 );
event.Skip();
} }
...@@ -250,9 +251,6 @@ void dialog_copper_zone::OnCornerSmoothingModeChoice( wxCommandEvent& event ) ...@@ -250,9 +251,6 @@ void dialog_copper_zone::OnCornerSmoothingModeChoice( wxCommandEvent& event )
AddUnitSymbol( *m_cornerSmoothingTitle, g_UserUnit ); AddUnitSymbol( *m_cornerSmoothingTitle, g_UserUnit );
break; break;
} }
Layout();
m_MainBoxSizer->SetSizeHints( this );
} }
......
This diff is collapsed.
This diff is collapsed.
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Nov 18 2010) // C++ code generated with wxFormBuilder (version Nov 17 2010)
// http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/
// //
// PLEASE DO "NOT" EDIT THIS FILE! // PLEASE DO "NOT" EDIT THIS FILE!
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
#ifndef __dialog_copper_zones_base__ #ifndef __dialog_copper_zones_base__
#define __dialog_copper_zones_base__ #define __dialog_copper_zones_base__
#include <wx/intl.h> #include <wx/intl.h>
#include <wx/string.h> #include <wx/string.h>
#include <wx/stattext.h> #include <wx/stattext.h>
#include <wx/gdicmn.h> #include <wx/gdicmn.h>
#include <wx/font.h> #include <wx/font.h>
#include <wx/colour.h> #include <wx/colour.h>
#include <wx/settings.h> #include <wx/settings.h>
#include <wx/sizer.h> #include <wx/sizer.h>
#include <wx/listbox.h> #include <wx/listbox.h>
#include <wx/choice.h> #include <wx/choice.h>
#include <wx/textctrl.h> #include <wx/textctrl.h>
#include <wx/button.h> #include <wx/button.h>
#include <wx/statbox.h> #include <wx/statbox.h>
#include <wx/dialog.h> #include <wx/dialog.h>
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
/// Class dialog_copper_zone_base /// Class dialog_copper_zone_base
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
class dialog_copper_zone_base : public wxDialog class dialog_copper_zone_base : public wxDialog
{ {
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
private: private:
// Private event handlers // Private event handlers
void _wxFB_OnClose( wxCloseEvent& event ){ OnClose( event ); } void _wxFB_OnClose( wxCloseEvent& event ){ OnClose( event ); }
void _wxFB_OnSize( wxSizeEvent& event ){ OnSize( event ); } void _wxFB_OnSize( wxSizeEvent& event ){ OnSize( event ); }
void _wxFB_OnNetSortingOptionSelected( wxCommandEvent& event ){ OnNetSortingOptionSelected( event ); } void _wxFB_OnNetSortingOptionSelected( wxCommandEvent& event ){ OnNetSortingOptionSelected( event ); }
void _wxFB_OnRunFiltersButtonClick( wxCommandEvent& event ){ OnRunFiltersButtonClick( event ); } void _wxFB_OnRunFiltersButtonClick( wxCommandEvent& event ){ OnRunFiltersButtonClick( event ); }
void _wxFB_OnCornerSmoothingModeChoice( wxCommandEvent& event ){ OnCornerSmoothingModeChoice( event ); } void _wxFB_OnCornerSmoothingModeChoice( wxCommandEvent& event ){ OnCornerSmoothingModeChoice( event ); }
void _wxFB_OnPadsInZoneClick( wxCommandEvent& event ){ OnPadsInZoneClick( event ); } void _wxFB_OnPadsInZoneClick( wxCommandEvent& event ){ OnPadsInZoneClick( event ); }
void _wxFB_ExportSetupToOtherCopperZones( wxCommandEvent& event ){ ExportSetupToOtherCopperZones( event ); } void _wxFB_ExportSetupToOtherCopperZones( wxCommandEvent& event ){ ExportSetupToOtherCopperZones( event ); }
void _wxFB_OnButtonOkClick( wxCommandEvent& event ){ OnButtonOkClick( event ); } void _wxFB_OnButtonOkClick( wxCommandEvent& event ){ OnButtonOkClick( event ); }
void _wxFB_OnButtonCancelClick( wxCommandEvent& event ){ OnButtonCancelClick( event ); } void _wxFB_OnButtonCancelClick( wxCommandEvent& event ){ OnButtonCancelClick( event ); }
protected: protected:
enum enum
{ {
ID_NETNAME_SELECTION = 1000, ID_NETNAME_SELECTION = 1000,
ID_M_NETDISPLAYOPTION, ID_M_NETDISPLAYOPTION,
ID_TEXTCTRL_NETNAMES_FILTER, ID_TEXTCTRL_NETNAMES_FILTER,
wxID_APPLY_FILTERS, wxID_APPLY_FILTERS,
ID_M_CORNERSMOOTHINGCTRL, ID_CORNER_SMOOTHING,
ID_M_PADINZONEOPT, ID_M_CORNERSMOOTHINGCTRL,
wxID_ANTIPAD_SIZE, ID_M_PADINZONEOPT,
wxID_COPPER_BRIDGE_VALUE, wxID_ANTIPAD_SIZE,
ID_M_FILLMODECTRL, wxID_COPPER_BRIDGE_VALUE,
ID_M_ARCAPPROXIMATIONOPT, ID_M_FILLMODECTRL,
ID_M_ORIENTEDGESOPT, ID_M_ARCAPPROXIMATIONOPT,
ID_M_OUTLINEAPPEARANCECTRL, ID_M_ORIENTEDGESOPT,
wxID_BUTTON_EXPORT, ID_M_OUTLINEAPPEARANCECTRL,
}; wxID_BUTTON_EXPORT,
};
wxBoxSizer* m_MainBoxSizer;
wxBoxSizer* m_layerSizer; wxBoxSizer* m_MainBoxSizer;
wxStaticText* m_staticText17; wxBoxSizer* m_layerSizer;
wxStaticText* m_staticText2; wxStaticText* m_staticText17;
wxListBox* m_ListNetNameSelection; wxStaticText* m_staticText2;
wxStaticText* m_staticText16; wxListBox* m_ListNetNameSelection;
wxChoice* m_NetDisplayOption; wxStaticText* m_staticText16;
wxStaticText* m_staticText5; wxChoice* m_NetDisplayOption;
wxTextCtrl* m_DoNotShowNetNameFilter; wxStaticText* m_staticText5;
wxStaticText* m_staticText51; wxTextCtrl* m_DoNotShowNetNameFilter;
wxTextCtrl* m_ShowNetNameFilter; wxStaticText* m_staticText51;
wxButton* m_buttonRunFilter; wxTextCtrl* m_ShowNetNameFilter;
wxStaticText* m_ClearanceValueTitle; wxButton* m_buttonRunFilter;
wxTextCtrl* m_ZoneClearanceCtrl; wxStaticText* m_ClearanceValueTitle;
wxStaticText* m_MinThicknessValueTitle; wxTextCtrl* m_ZoneClearanceCtrl;
wxTextCtrl* m_ZoneMinThicknessCtrl; wxStaticText* m_MinThicknessValueTitle;
wxStaticText* m_staticText151; wxTextCtrl* m_ZoneMinThicknessCtrl;
wxChoice* m_cornerSmoothingChoice; wxStaticText* m_staticText151;
wxStaticText* m_cornerSmoothingTitle; wxChoice* m_cornerSmoothingChoice;
wxTextCtrl* m_cornerSmoothingCtrl; wxStaticText* m_cornerSmoothingTitle;
wxStaticText* m_staticText13; wxTextCtrl* m_cornerSmoothingCtrl;
wxChoice* m_PadInZoneOpt; wxStaticText* m_staticText13;
wxStaticText* m_AntipadSizeText; wxChoice* m_PadInZoneOpt;
wxTextCtrl* m_AntipadSizeValue; wxStaticText* m_AntipadSizeText;
wxStaticText* m_CopperBridgeWidthText; wxTextCtrl* m_AntipadSizeValue;
wxTextCtrl* m_CopperWidthValue; wxStaticText* m_CopperBridgeWidthText;
wxStaticText* m_staticText11; wxTextCtrl* m_CopperWidthValue;
wxChoice* m_FillModeCtrl; wxStaticText* m_staticText11;
wxStaticText* m_staticText12; wxChoice* m_FillModeCtrl;
wxChoice* m_ArcApproximationOpt; wxStaticText* m_staticText12;
wxStaticText* m_staticText14; wxChoice* m_ArcApproximationOpt;
wxChoice* m_OrientEdgesOpt; wxStaticText* m_staticText14;
wxStaticText* m_staticText15; wxChoice* m_OrientEdgesOpt;
wxChoice* m_OutlineAppearanceCtrl; wxStaticText* m_staticText15;
wxButton* m_ExportSetupButton; wxChoice* m_OutlineAppearanceCtrl;
wxButton* m_OkButton; wxButton* m_ExportSetupButton;
wxButton* m_ButtonCancel; wxButton* m_OkButton;
wxButton* m_ButtonCancel;
// Virtual event handlers, overide them in your derived class
virtual void OnClose( wxCloseEvent& event ) { event.Skip(); } // Virtual event handlers, overide them in your derived class
virtual void OnSize( wxSizeEvent& event ) { event.Skip(); } virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
virtual void OnNetSortingOptionSelected( wxCommandEvent& event ) { event.Skip(); } virtual void OnSize( wxSizeEvent& event ) { event.Skip(); }
virtual void OnRunFiltersButtonClick( wxCommandEvent& event ) { event.Skip(); } virtual void OnNetSortingOptionSelected( wxCommandEvent& event ) { event.Skip(); }
virtual void OnCornerSmoothingModeChoice( wxCommandEvent& event ) { event.Skip(); } virtual void OnRunFiltersButtonClick( wxCommandEvent& event ) { event.Skip(); }
virtual void OnPadsInZoneClick( wxCommandEvent& event ) { event.Skip(); } virtual void OnCornerSmoothingModeChoice( wxCommandEvent& event ) { event.Skip(); }
virtual void ExportSetupToOtherCopperZones( wxCommandEvent& event ) { event.Skip(); } virtual void OnPadsInZoneClick( wxCommandEvent& event ) { event.Skip(); }
virtual void OnButtonOkClick( wxCommandEvent& event ) { event.Skip(); } virtual void ExportSetupToOtherCopperZones( wxCommandEvent& event ) { event.Skip(); }
virtual void OnButtonCancelClick( wxCommandEvent& event ) { event.Skip(); } virtual void OnButtonOkClick( wxCommandEvent& event ) { event.Skip(); }
virtual void OnButtonCancelClick( wxCommandEvent& event ) { event.Skip(); }
public:
public:
dialog_copper_zone_base( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Zone Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 550,500 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
~dialog_copper_zone_base(); dialog_copper_zone_base( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Zone Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 550,500 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
~dialog_copper_zone_base();
};
};
#endif //__dialog_copper_zones_base__
#endif //__dialog_copper_zones_base__
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment