Ticket #712: sg_DlgPreferences.cpp.patch

sg_DlgPreferences.cpp

@@ -61 +61 @@
 
 // Useful arrays used as templates for arrays created at runtime.
 //
-int iTimeOfDayArraySize = 24;
+int iTimeOfDayArraySize = 25;
 wxString astrTimeOfDayStrings[] = {
     wxT("0:00"),
     wxT("1:00"),
@@ -212 +212 @@
     EVT_CHECKBOX( ID_CUSTOMIZEPREFERENCES, CPanelPreferences::OnCustomizePreferencesClick )
     EVT_COMBOBOX( ID_WORKBETWEENBEGIN, CPanelPreferences::OnWorkBetweenBeginSelected )
     EVT_COMBOBOX( ID_CONNECTBETWEENBEGIN, CPanelPreferences::OnConnectBetweenBeginSelected )
-    EVT_BUTTON(ID_SIMPLE_HELP, CPanelPreferences::OnButtonHelp)
+    EVT_BUTTON( ID_SIMPLE_HELP, CPanelPreferences::OnButtonHelp )
 ////@end CPanelPreferences event table entries
 END_EVENT_TABLE()
 
@@ -220 +220 @@
  * CPanelPreferences constructors
  */
 
-CPanelPreferences::CPanelPreferences( )
-{
+CPanelPreferences::CPanelPreferences() {
 }
 
-
-CPanelPreferences::CPanelPreferences( wxWindow* parent ) :  
-    wxPanel(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxNO_BORDER)
+CPanelPreferences::CPanelPreferences( wxWindow* parent )
+    : wxPanel(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxNO_BORDER)
 {
     Create();
 }
@@ -236 +234 @@
  * CPanelPreferences creator
  */
 
-bool CPanelPreferences::Create()
-{
+bool CPanelPreferences::Create() {
 ////@begin CPanelPreferences member initialisation
     m_SkinSelectorCtrl = NULL;
     m_CustomizePreferencesCtrl = NULL;
@@ -267 +264 @@
  * Control creation for CPanelPreferences
  */
 
-void CPanelPreferences::CreateControls()
-{
+void CPanelPreferences::CreateControls() {
     CSkinSimple* pSkinSimple = wxGetApp().GetSkinManager()->GetSimple();
 
     wxASSERT(pSkinSimple);
@@ -637 +633 @@
 
 
 void CPanelPreferences::OnOK() {
-    CMainDocument*    pDoc = wxGetApp().GetDocument();
+    CMainDocument* pDoc = wxGetApp().GetDocument();
 
     wxASSERT(pDoc);
     wxASSERT(wxDynamicCast(pDoc, CMainDocument));
@@ -726 +722 @@
     if (retval == ERR_NOT_FOUND) {
         // Older clients don't support get_global_prefs_working_struct RPC
         global_preferences_working = pDoc->state.global_prefs;
-        retval = pDoc->rpc.get_global_prefs_override_struct(global_preferences_working, global_preferences_mask);
+        retval = pDoc->rpc.get_global_prefs_override_struct(global_preferences_working, global_preferences_mask);
     }
 
     if (!retval && global_preferences_override_mask.are_simple_prefs_set()) {
@@ -997 +993 @@
 
 BEGIN_EVENT_TABLE( CDlgPreferences, wxDialog )
 ////@begin CDlgPreferences event table entries
-    EVT_HELP(wxID_ANY, CDlgPreferences::OnHelp)
+    EVT_HELP( wxID_ANY, CDlgPreferences::OnHelp )
     EVT_BUTTON( wxID_OK, CDlgPreferences::OnOK )
 ////@end CDlgPreferences event table entries
 END_EVENT_TABLE()
@@ -1006 +1002 @@
  * CDlgPreferences constructors
  */
 
-CDlgPreferences::CDlgPreferences( )
-{
+CDlgPreferences::CDlgPreferences() {
 }
 
 
-CDlgPreferences::CDlgPreferences( wxWindow* parent, wxWindowID id, const wxString& caption, const wxPoint& pos, const wxSize& size, long style )
-{
+CDlgPreferences::CDlgPreferences( wxWindow* parent, wxWindowID id, const wxString& caption, const wxPoint& pos, const wxSize& size, long style ) {
     Create(parent, id, caption, pos, size, style);
 }
 
@@ -1021 +1015 @@
  * CDlgPreferences creator
  */
 
-bool CDlgPreferences::Create( wxWindow* parent, wxWindowID id, const wxString& caption, const wxPoint& pos, const wxSize& size, long style )
-{
+bool CDlgPreferences::Create( wxWindow* parent, wxWindowID id, const wxString& caption, const wxPoint& pos, const wxSize& size, long style ) {
     wxString strCaption = caption;
     if (strCaption.IsEmpty()) {
-        CSkinAdvanced*         pSkinAdvanced = wxGetApp().GetSkinManager()->GetAdvanced();
+        CSkinAdvanced* pSkinAdvanced = wxGetApp().GetSkinManager()->GetAdvanced();
         wxASSERT(pSkinAdvanced);
         wxASSERT(wxDynamicCast(pSkinAdvanced, CSkinAdvanced));
 
@@ -1063 +1056 @@
  * wxEVT_HELP event handler for ID_DLGPREFERENCES
  */
 
-void CDlgPreferences::OnHelp(wxHelpEvent& event) {
+void CDlgPreferences::OnHelp( wxHelpEvent& event ) {
     wxLogTrace(wxT("Function Start/End"), wxT("CDlgPreferences::OnHelp - Function Begin"));
 
     if (IsShown()) {
@@ -1097 +1090 @@
     m_pBackgroundPanel->OnOK();
     EndModal(wxID_OK);
 }
-
-
-