From f3174f3857653b36bb87194b5bd9f1ca0db727f5 Mon Sep 17 00:00:00 2001
From: Chris Frey <cdfrey@foursquare.net>
Date: Mon, 19 Mar 2012 19:29:34 -0400
Subject: [PATCH] desktop: added IDs to controls that generate events in
 CalendarEditDlg

---
 desktop/src/CalendarEditDlg.cc  | 52 +++++++++++++++++------------------------
 desktop/src/CalendarEditDlg.wxg | 13 ++++++++++-
 desktop/src/windowids.h         | 11 +++++++++
 3 files changed, 45 insertions(+), 31 deletions(-)

diff --git a/desktop/src/CalendarEditDlg.cc b/desktop/src/CalendarEditDlg.cc
index 42900f6a..91ac6779 100644
--- a/desktop/src/CalendarEditDlg.cc
+++ b/desktop/src/CalendarEditDlg.cc
@@ -66,21 +66,21 @@ CalendarEditDlg::CalendarEditDlg(wxWindow* parent,
 	m_Location = new wxTextCtrl(this, wxID_ANY, wxEmptyString);
 	static_line_1 = new wxStaticLine(this, wxID_ANY);
 	label_4 = new wxStaticText(this, wxID_ANY, wxT("All Day Event:"));
-	m_AllDayCheck = new wxCheckBox(this, wxID_ANY, wxEmptyString);
+	m_AllDayCheck = new wxCheckBox(this, Dialog_CalendarEdit_AllDayCheck, wxEmptyString);
 	label_5 = new wxStaticText(this, wxID_ANY, wxT("Start:"));
-	m_StartDateCtrl = new wxDatePickerCtrl(this, wxID_ANY, wxDefaultDateTime, wxDefaultPosition, wxDefaultSize, wxDP_DROPDOWN|wxDP_SHOWCENTURY);
-	m_StartHoursSpinner = new wxSpinCtrl(this, wxID_ANY, wxT(""), wxDefaultPosition, wxDefaultSize, wxSP_WRAP|wxTE_NOHIDESEL, 0, 23);
+	m_StartDateCtrl = new wxDatePickerCtrl(this, Dialog_CalendarEdit_StartDateCtrl, wxDefaultDateTime, wxDefaultPosition, wxDefaultSize, wxDP_DROPDOWN|wxDP_SHOWCENTURY);
+	m_StartHoursSpinner = new wxSpinCtrl(this, Dialog_CalendarEdit_StartHoursSpinner, wxT(""), wxDefaultPosition, wxDefaultSize, wxSP_WRAP|wxTE_NOHIDESEL, 0, 23);
 	label_11 = new wxStaticText(this, wxID_ANY, wxT(":"));
-	m_StartMinutesSpinner = new wxSpinCtrl(this, wxID_ANY, wxT(""), wxDefaultPosition, wxDefaultSize, wxSP_WRAP|wxTE_NOHIDESEL, 0, 59);
+	m_StartMinutesSpinner = new wxSpinCtrl(this, Dialog_CalendarEdit_StartMinutesSpinner, wxT(""), wxDefaultPosition, wxDefaultSize, wxSP_WRAP|wxTE_NOHIDESEL, 0, 59);
 	label_6 = new wxStaticText(this, wxID_ANY, wxT("End:"));
-	m_EndDateCtrl = new wxDatePickerCtrl(this, wxID_ANY, wxDefaultDateTime, wxDefaultPosition, wxDefaultSize, wxDP_DROPDOWN|wxDP_SHOWCENTURY);
-	m_EndHoursSpinner = new wxSpinCtrl(this, wxID_ANY, wxT(""), wxDefaultPosition, wxDefaultSize, wxSP_WRAP|wxTE_NOHIDESEL, 0, 23);
+	m_EndDateCtrl = new wxDatePickerCtrl(this, Dialog_CalendarEdit_EndDateCtrl, wxDefaultDateTime, wxDefaultPosition, wxDefaultSize, wxDP_DROPDOWN|wxDP_SHOWCENTURY);
+	m_EndHoursSpinner = new wxSpinCtrl(this, Dialog_CalendarEdit_EndHoursSpinner, wxT(""), wxDefaultPosition, wxDefaultSize, wxSP_WRAP|wxTE_NOHIDESEL, 0, 23);
 	label_12 = new wxStaticText(this, wxID_ANY, wxT(":"));
-	m_EndMinutesSpinner = new wxSpinCtrl(this, wxID_ANY, wxT(""), wxDefaultPosition, wxDefaultSize, wxSP_WRAP|wxTE_NOHIDESEL, 0, 59);
+	m_EndMinutesSpinner = new wxSpinCtrl(this, Dialog_CalendarEdit_EndMinutesSpinner, wxT(""), wxDefaultPosition, wxDefaultSize, wxSP_WRAP|wxTE_NOHIDESEL, 0, 59);
 	label_7 = new wxStaticText(this, wxID_ANY, wxT("Duration:"));
-	m_DurationHoursSpinner = new wxSpinCtrl(this, wxID_ANY, wxT(""), wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 999);
+	m_DurationHoursSpinner = new wxSpinCtrl(this, Dialog_CalendarEdit_DurationHoursSpinner, wxT(""), wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 999);
 	label_13 = new wxStaticText(this, wxID_ANY, wxT("hours and"));
-	m_DurationMinutesSpinner = new wxSpinCtrl(this, wxID_ANY, wxT(""), wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 59);
+	m_DurationMinutesSpinner = new wxSpinCtrl(this, Dialog_CalendarEdit_DurationMinutesSpinner, wxT(""), wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 59);
 	label_17 = new wxStaticText(this, wxID_ANY, wxT("minutes."));
 	label_8 = new wxStaticText(this, wxID_ANY, wxT("Time Zone:"));
 	const wxString m_TimezoneChoice_choices[] = {
@@ -109,7 +109,7 @@ CalendarEditDlg::CalendarEditDlg(wxWindow* parent,
         wxT("Monthly"),
         wxT("Yearly")
     };
-	m_RecurrenceChoice = new wxChoice(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 5, m_RecurrenceChoice_choices, 0);
+	m_RecurrenceChoice = new wxChoice(this, Dialog_CalendarEdit_RecurrenceChoice, wxDefaultPosition, wxDefaultSize, 5, m_RecurrenceChoice_choices, 0);
 	label_19 = new wxStaticText(this, wxID_ANY, wxT("Interval:"));
 	label_23 = new wxStaticText(this, wxID_ANY, wxT("Every"));
 	m_IntervalSpinner = new wxSpinCtrl(this, wxID_ANY, wxT("1"), wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 1, 999);
@@ -125,7 +125,7 @@ CalendarEditDlg::CalendarEditDlg(wxWindow* parent,
 	label_21 = new wxStaticText(this, wxID_ANY, wxT("Relative Date:"));
 	m_RelativeDateCheck = new wxCheckBox(this, wxID_ANY, wxEmptyString);
 	label_22 = new wxStaticText(this, wxID_ANY, wxT("End Date:"));
-	m_NeverEndsCheck = new wxCheckBox(this, wxID_ANY, wxT("Never ends"));
+	m_NeverEndsCheck = new wxCheckBox(this, Dialog_CalendarEdit_NeverEndsCheck, wxT("Never ends"));
 	m_RecurEndDateCtrl = new wxDatePickerCtrl(this, wxID_ANY, wxDefaultDateTime, wxDefaultPosition, wxDefaultSize, wxDP_DROPDOWN|wxDP_SHOWCENTURY);
 	static_line_3 = new wxStaticLine(this, wxID_ANY);
 	label_14 = new wxStaticText(this, wxID_ANY, wxT("Organizer:"));
@@ -174,17 +174,17 @@ void CalendarEditDlg::RedoLayout()
 
 BEGIN_EVENT_TABLE(CalendarEditDlg, wxDialog)
 	// begin wxGlade: CalendarEditDlg::event_table
-	EVT_CHECKBOX(wxID_ANY, CalendarEditDlg::OnAllDayEvent)
-	EVT_DATE_CHANGED(wxID_ANY, CalendarEditDlg::OnStartDateChanged)
-	EVT_SPINCTRL(wxID_ANY, CalendarEditDlg::OnStartHoursSpin)
-	EVT_SPINCTRL(wxID_ANY, CalendarEditDlg::OnStartMinutesSpin)
-	EVT_DATE_CHANGED(wxID_ANY, CalendarEditDlg::OnEndDateChanged)
-	EVT_SPINCTRL(wxID_ANY, CalendarEditDlg::OnEndHoursSpin)
-	EVT_SPINCTRL(wxID_ANY, CalendarEditDlg::OnEndMinutesSpin)
-	EVT_SPINCTRL(wxID_ANY, CalendarEditDlg::OnDurationHoursSpin)
-	EVT_SPINCTRL(wxID_ANY, CalendarEditDlg::OnDurationMinutesSpin)
-	EVT_CHOICE(wxID_ANY, CalendarEditDlg::OnRecurrenceChoice)
-	EVT_CHECKBOX(wxID_ANY, CalendarEditDlg::OnEndDateCheckbox)
+	EVT_CHECKBOX(Dialog_CalendarEdit_AllDayCheck, CalendarEditDlg::OnAllDayEvent)
+	EVT_DATE_CHANGED(Dialog_CalendarEdit_StartDateCtrl, CalendarEditDlg::OnStartDateChanged)
+	EVT_SPINCTRL(Dialog_CalendarEdit_StartHoursSpinner, CalendarEditDlg::OnStartHoursSpin)
+	EVT_SPINCTRL(Dialog_CalendarEdit_StartMinutesSpinner, CalendarEditDlg::OnStartMinutesSpin)
+	EVT_DATE_CHANGED(Dialog_CalendarEdit_EndDateCtrl, CalendarEditDlg::OnEndDateChanged)
+	EVT_SPINCTRL(Dialog_CalendarEdit_EndHoursSpinner, CalendarEditDlg::OnEndHoursSpin)
+	EVT_SPINCTRL(Dialog_CalendarEdit_EndMinutesSpinner, CalendarEditDlg::OnEndMinutesSpin)
+	EVT_SPINCTRL(Dialog_CalendarEdit_DurationHoursSpinner, CalendarEditDlg::OnDurationHoursSpin)
+	EVT_SPINCTRL(Dialog_CalendarEdit_DurationMinutesSpinner, CalendarEditDlg::OnDurationMinutesSpin)
+	EVT_CHOICE(Dialog_CalendarEdit_RecurrenceChoice, CalendarEditDlg::OnRecurrenceChoice)
+	EVT_CHECKBOX(Dialog_CalendarEdit_NeverEndsCheck, CalendarEditDlg::OnEndDateCheckbox)
 	// end wxGlade
 END_EVENT_TABLE();
 
@@ -202,56 +202,48 @@ void CalendarEditDlg::OnStartDateChanged(wxDateEvent &event)
 	wxLogDebug(wxT("Event handler (CalendarEditDlg::OnStartDateChanged) not implemented yet")); //notify the user that he hasn't implemented the event handler yet
 }
 
-
 void CalendarEditDlg::OnStartHoursSpin(wxSpinEvent &event)
 {
 	event.Skip();
 	wxLogDebug(wxT("Event handler (CalendarEditDlg::OnStartHoursSpin) not implemented yet")); //notify the user that he hasn't implemented the event handler yet
 }
 
-
 void CalendarEditDlg::OnStartMinutesSpin(wxSpinEvent &event)
 {
 	event.Skip();
 	wxLogDebug(wxT("Event handler (CalendarEditDlg::OnStartMinutesSpin) not implemented yet")); //notify the user that he hasn't implemented the event handler yet
 }
 
-
 void CalendarEditDlg::OnEndDateChanged(wxDateEvent &event)
 {
 	event.Skip();
 	wxLogDebug(wxT("Event handler (CalendarEditDlg::OnEndDateChanged) not implemented yet")); //notify the user that he hasn't implemented the event handler yet
 }
 
-
 void CalendarEditDlg::OnEndHoursSpin(wxSpinEvent &event)
 {
 	event.Skip();
 	wxLogDebug(wxT("Event handler (CalendarEditDlg::OnEndHoursSpin) not implemented yet")); //notify the user that he hasn't implemented the event handler yet
 }
 
-
 void CalendarEditDlg::OnEndMinutesSpin(wxSpinEvent &event)
 {
 	event.Skip();
 	wxLogDebug(wxT("Event handler (CalendarEditDlg::OnEndMinutesSpin) not implemented yet")); //notify the user that he hasn't implemented the event handler yet
 }
 
-
 void CalendarEditDlg::OnDurationHoursSpin(wxSpinEvent &event)
 {
 	event.Skip();
 	wxLogDebug(wxT("Event handler (CalendarEditDlg::OnDurationHoursSpin) not implemented yet")); //notify the user that he hasn't implemented the event handler yet
 }
 
-
 void CalendarEditDlg::OnDurationMinutesSpin(wxSpinEvent &event)
 {
 	event.Skip();
 	wxLogDebug(wxT("Event handler (CalendarEditDlg::OnDurationMinutesSpin) not implemented yet")); //notify the user that he hasn't implemented the event handler yet
 }
 
-
 void CalendarEditDlg::OnRecurrenceChoice(wxCommandEvent &event)
 {
 	event.Skip();
diff --git a/desktop/src/CalendarEditDlg.wxg b/desktop/src/CalendarEditDlg.wxg
index b9830fec..00117d96 100644
--- a/desktop/src/CalendarEditDlg.wxg
+++ b/desktop/src/CalendarEditDlg.wxg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!-- generated by wxGlade 783a09e9ee04 on Tue Feb 21 20:32:12 2012 -->
+<!-- generated by wxGlade 783a09e9ee04 on Mon Mar 19 18:30:50 2012 -->
 
 <application path="CalendarEditDlg.cc" name="" class="" option="0" language="C++" top_window="dialog_1" encoding="ISO-8859-1" use_gettext="0" overwrite="0" use_new_namespace="1" for_version="2.8" is_template="0" indent_amount="1" indent_symbol="tab" source_extension=".cc" header_extension=".h">
     <object class="CalendarEditDlg" name="dialog_1" base="EditDialog">
@@ -93,6 +93,7 @@
                                 <border>0</border>
                                 <option>0</option>
                                 <object class="wxCheckBox" name="m_AllDayCheck" base="EditCheckBox">
+                                    <id>Dialog_CalendarEdit_AllDayCheck</id>
                                     <events>
                                         <handler event="EVT_CHECKBOX">OnAllDayEvent</handler>
                                     </events>
@@ -121,6 +122,7 @@
                                         <option>0</option>
                                         <object class="wxDatePickerCtrl" name="m_StartDateCtrl" base="EditDatePickerCtrl">
                                             <style>wxDP_DROPDOWN|wxDP_SHOWCENTURY</style>
+                                            <id>Dialog_CalendarEdit_StartDateCtrl</id>
                                             <events>
                                                 <handler event="EVT_DATE_CHANGED">OnStartDateChanged</handler>
                                             </events>
@@ -143,6 +145,7 @@
                                         <option>0</option>
                                         <object class="wxSpinCtrl" name="m_StartHoursSpinner" base="EditSpinCtrl">
                                             <style>wxSP_WRAP|wxTE_NOHIDESEL</style>
+                                            <id>Dialog_CalendarEdit_StartHoursSpinner</id>
                                             <range>0, 23</range>
                                             <events>
                                                 <handler event="EVT_SPINCTRL">OnStartHoursSpin</handler>
@@ -167,6 +170,7 @@
                                         <option>0</option>
                                         <object class="wxSpinCtrl" name="m_StartMinutesSpinner" base="EditSpinCtrl">
                                             <style>wxSP_WRAP|wxTE_NOHIDESEL</style>
+                                            <id>Dialog_CalendarEdit_StartMinutesSpinner</id>
                                             <range>0, 59</range>
                                             <events>
                                                 <handler event="EVT_SPINCTRL">OnStartMinutesSpin</handler>
@@ -199,6 +203,7 @@
                                         <option>0</option>
                                         <object class="wxDatePickerCtrl" name="m_EndDateCtrl" base="EditDatePickerCtrl">
                                             <style>wxDP_DROPDOWN|wxDP_SHOWCENTURY</style>
+                                            <id>Dialog_CalendarEdit_EndDateCtrl</id>
                                             <events>
                                                 <handler event="EVT_DATE_CHANGED">OnEndDateChanged</handler>
                                             </events>
@@ -221,6 +226,7 @@
                                         <option>0</option>
                                         <object class="wxSpinCtrl" name="m_EndHoursSpinner" base="EditSpinCtrl">
                                             <style>wxSP_WRAP|wxTE_NOHIDESEL</style>
+                                            <id>Dialog_CalendarEdit_EndHoursSpinner</id>
                                             <range>0, 23</range>
                                             <events>
                                                 <handler event="EVT_SPINCTRL">OnEndHoursSpin</handler>
@@ -245,6 +251,7 @@
                                         <option>0</option>
                                         <object class="wxSpinCtrl" name="m_EndMinutesSpinner" base="EditSpinCtrl">
                                             <style>wxSP_WRAP|wxTE_NOHIDESEL</style>
+                                            <id>Dialog_CalendarEdit_EndMinutesSpinner</id>
                                             <range>0, 59</range>
                                             <events>
                                                 <handler event="EVT_SPINCTRL">OnEndMinutesSpin</handler>
@@ -277,6 +284,7 @@
                                         <border>5</border>
                                         <option>0</option>
                                         <object class="wxSpinCtrl" name="m_DurationHoursSpinner" base="EditSpinCtrl">
+                                            <id>Dialog_CalendarEdit_DurationHoursSpinner</id>
                                             <range>0, 999</range>
                                             <events>
                                                 <handler event="EVT_SPINCTRL">OnDurationHoursSpin</handler>
@@ -301,6 +309,7 @@
                                         <border>5</border>
                                         <option>0</option>
                                         <object class="wxSpinCtrl" name="m_DurationMinutesSpinner" base="EditSpinCtrl">
+                                            <id>Dialog_CalendarEdit_DurationMinutesSpinner</id>
                                             <range>0, 59</range>
                                             <events>
                                                 <handler event="EVT_SPINCTRL">OnDurationMinutesSpin</handler>
@@ -459,6 +468,7 @@
                                 <option>0</option>
                                 <object class="wxChoice" name="m_RecurrenceChoice" base="EditChoice">
                                     <selection>0</selection>
+                                    <id>Dialog_CalendarEdit_RecurrenceChoice</id>
                                     <choices>
                                         <choice>None</choice>
                                         <choice>Daily</choice>
@@ -659,6 +669,7 @@
                                         <object class="wxCheckBox" name="m_NeverEndsCheck" base="EditCheckBox">
                                             <checked>1</checked>
                                             <label>Never ends</label>
+                                            <id>Dialog_CalendarEdit_NeverEndsCheck</id>
                                             <events>
                                                 <handler event="EVT_CHECKBOX">OnEndDateCheckbox</handler>
                                             </events>
diff --git a/desktop/src/windowids.h b/desktop/src/windowids.h
index 0950ab33..0511488a 100644
--- a/desktop/src/windowids.h
+++ b/desktop/src/windowids.h
@@ -124,6 +124,17 @@ enum {
 	Dialog_ContactEdit,
 	Dialog_ContactEdit_PhotoButton,
 	Dialog_CalendarEdit,
+	Dialog_CalendarEdit_AllDayCheck,
+	Dialog_CalendarEdit_StartDateCtrl,
+	Dialog_CalendarEdit_StartHoursSpinner,
+	Dialog_CalendarEdit_StartMinutesSpinner,
+	Dialog_CalendarEdit_EndDateCtrl,
+	Dialog_CalendarEdit_EndHoursSpinner,
+	Dialog_CalendarEdit_EndMinutesSpinner,
+	Dialog_CalendarEdit_DurationHoursSpinner,
+	Dialog_CalendarEdit_DurationMinutesSpinner,
+	Dialog_CalendarEdit_RecurrenceChoice,
+	Dialog_CalendarEdit_NeverEndsCheck,
 	Dialog_MemoEdit,
 	Dialog_Migrate_MigrateNowButton,
 	Dialog_Migrate_CancelButton,
-- 
2.11.4.GIT