From 86a40a93c34241ede6d3879dde4511a18ee59f52 Mon Sep 17 00:00:00 2001 From: stambaughw Date: Wed, 6 May 2009 17:13:09 +0000 Subject: [PATCH] Fix over zealous clean up of user grid dialog in PCBNew. --- pcbnew/set_grid.cpp | 24 +----------------------- pcbnew/set_grid.h | 6 ------ pcbnew/set_grid.pjd | 4 +--- 3 files changed, 2 insertions(+), 32 deletions(-) diff --git a/pcbnew/set_grid.cpp b/pcbnew/set_grid.cpp index ef0140826b..11b12cf613 100644 --- a/pcbnew/set_grid.cpp +++ b/pcbnew/set_grid.cpp @@ -52,10 +52,6 @@ IMPLEMENT_DYNAMIC_CLASS( WinEDA_PcbGridFrame, wxDialog ) BEGIN_EVENT_TABLE( WinEDA_PcbGridFrame, wxDialog ) ////@begin WinEDA_PcbGridFrame event table entries - EVT_BUTTON( wxID_OK, WinEDA_PcbGridFrame::OnOkClick ) - - EVT_BUTTON( wxID_CANCEL, WinEDA_PcbGridFrame::OnCancelClick ) - ////@end WinEDA_PcbGridFrame event table entries END_EVENT_TABLE() @@ -109,7 +105,7 @@ bool WinEDA_PcbGridFrame::Create( wxWindow* parent, wxWindowID id, const wxStrin void WinEDA_PcbGridFrame::CreateControls() { ////@begin WinEDA_PcbGridFrame content construction - // Generated by DialogBlocks, 29/04/2009 15:16:09 (unregistered) + // Generated by DialogBlocks, 06/05/2009 13:48:21 (unregistered) WinEDA_PcbGridFrame* itemDialog1 = this; @@ -187,25 +183,7 @@ wxIcon WinEDA_PcbGridFrame::GetIconResource( const wxString& name ) return wxNullIcon; ////@end WinEDA_PcbGridFrame icon retrieval } -/*! - * wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_OK - */ -void WinEDA_PcbGridFrame::OnOkClick( wxCommandEvent& event ) -{ -} - -/*! - * wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_CANCEL - */ - -void WinEDA_PcbGridFrame::OnCancelClick( wxCommandEvent& event ) -{ -////@begin wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_CANCEL in WinEDA_PcbGridFrame. - // Before editing this code, remove the block markers. - event.Skip(); -////@end wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_CANCEL in WinEDA_PcbGridFrame. -} void WinEDA_PcbGridFrame::SetGridSize( const wxRealPoint& grid ) { diff --git a/pcbnew/set_grid.h b/pcbnew/set_grid.h index 427c4d2ce7..2abbea88f2 100644 --- a/pcbnew/set_grid.h +++ b/pcbnew/set_grid.h @@ -77,12 +77,6 @@ public: ////@begin WinEDA_PcbGridFrame event handler declarations - /// wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_OK - void OnOkClick( wxCommandEvent& event ); - - /// wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_CANCEL - void OnCancelClick( wxCommandEvent& event ); - ////@end WinEDA_PcbGridFrame event handler declarations ////@begin WinEDA_PcbGridFrame member function declarations diff --git a/pcbnew/set_grid.pjd b/pcbnew/set_grid.pjd index 3c90792154..673b7ca018 100644 --- a/pcbnew/set_grid.pjd +++ b/pcbnew/set_grid.pjd @@ -138,7 +138,7 @@ 0 "" 1 - 0 + -8519680 "" "Debug" "ANSI" @@ -760,7 +760,6 @@ 0 "26/3/2006" "wbButtonProxy" - "wxEVT_COMMAND_BUTTON_CLICKED|OnOkClick" "wxID_OK" 5100 "" @@ -827,7 +826,6 @@ 0 "26/3/2006" "wbButtonProxy" - "wxEVT_COMMAND_BUTTON_CLICKED|OnCancelClick" "wxID_CANCEL" 5101 ""