frmContactEditor(*): Call Layout on szrGeneral after adding priorty control

[xestiaab/.git] / source / contacteditor / frmContactEditorGeoposition.cpp

diff --git a/source/contacteditor/frmContactEditorGeoposition.cpp b/source/contacteditor/frmContactEditorGeoposition.cpp
index cfd61bf..bcc3e87 100644 (file)
--- a/source/contacteditor/frmContactEditorGeoposition.cpp
+++ b/source/contacteditor/frmContactEditorGeoposition.cpp
@@ -24,24 +24,21 @@ frmContactEditorGeoposition::frmContactEditorGeoposition( wxWindow* parent )
 :
 frmContactEditorGeopositionADT( parent )
 {
+       
+       // Setup the window.
+       
        EditorMode = FALSE;
-       sliPriority->Disable();
-}
-
-void frmContactEditorGeoposition::EnablePriority( wxCommandEvent& event )
-{
-
-       if (chkUsePref->IsChecked()){
-               sliPriority->Enable();
-       } else {
-               sliPriority->Disable();
-       }
+       priorityCtrl = new XABPriorityCtrl(tabGeneral);
+       szrGeneral->Add(priorityCtrl, 1, wxEXPAND, 5);
+       szrGeneral->Layout();
        
 }
 
 void frmContactEditorGeoposition::SetEditorMode(bool EditMode, SectionType SectType)
 {
 
+       // Setup the editor mode.
+       
        // Set the editor mode for adding or editing a timezone.
 
        if (EditMode == FALSE){
@@ -76,11 +73,11 @@ void frmContactEditorGeoposition::SetEditorMode(bool EditMode, SectionType SectT
                
                intiter = GeopositionListPrefPtr->find(GeopositionListIndex);
                
-               if (intiter->first == GeopositionListIndex && intiter->second > 0){
+               if (intiter->first == GeopositionListIndex && intiter->second > 0 &&
+                       intiter != GeopositionListPrefPtr->end()){
                
-                       sliPriority->SetValue(intiter->second);
-                       sliPriority->Enable();
-                       chkUsePref->SetValue(TRUE);
+                       priorityCtrl->SetValue(intiter->second);
+                       priorityCtrl->EnablePriority(true);
                
                }       
                
@@ -93,6 +90,8 @@ void frmContactEditorGeoposition::SetEditorMode(bool EditMode, SectionType SectT
 void frmContactEditorGeoposition::ProcessAction( wxCommandEvent& event )
 {
 
+       // Process action.
+       
        long ListCtrlIndex;
 
        if (EditorMode == FALSE){
@@ -125,9 +124,9 @@ void frmContactEditorGeoposition::ProcessAction( wxCommandEvent& event )
                
                // Add Language priority.
                
-               if (chkUsePref->IsChecked()){
+               if (priorityCtrl->IsPriorityChecked()){
                
-                       GeopositionListPrefPtr->insert(std::make_pair(GeopositionListIndex, sliPriority->GetValue()));
+                       GeopositionListPrefPtr->insert(std::make_pair(GeopositionListIndex, priorityCtrl->GetValue()));
                
                } else {
                
@@ -144,9 +143,9 @@ void frmContactEditorGeoposition::ProcessAction( wxCommandEvent& event )
                coldata.SetText(txtGeoposition->GetValue());
                ListCtrlIndex = GeopositionListCtrlPtr->InsertItem(coldata);
                
-               if (chkUsePref->IsChecked()){
+               if (priorityCtrl->IsPriorityChecked()){
                
-                       GeopositionListCtrlPtr->SetItem(ListCtrlIndex, 1, wxString::Format(wxT("%i"), sliPriority->GetValue()));
+                       GeopositionListCtrlPtr->SetItem(ListCtrlIndex, 1, wxString::Format(wxT("%i"), priorityCtrl->GetValue()));
                
                }
                
@@ -165,9 +164,9 @@ void frmContactEditorGeoposition::ProcessAction( wxCommandEvent& event )
                
                GeopositionListPrefPtr->erase(GeopositionListIndex);
                
-               if (chkUsePref->IsChecked()){
+               if (priorityCtrl->IsPriorityChecked()){
                
-                       GeopositionListPrefPtr->insert(std::make_pair(GeopositionListIndex, sliPriority->GetValue()));
+                       GeopositionListPrefPtr->insert(std::make_pair(GeopositionListIndex, priorityCtrl->GetValue()));
                
                } else {
                
@@ -185,9 +184,9 @@ void frmContactEditorGeoposition::ProcessAction( wxCommandEvent& event )
                
                GeopositionListCtrlPtr->SetItem(longSelected, 0, txtGeoposition->GetValue());
                
-               if (chkUsePref->IsChecked()){
+               if (priorityCtrl->IsPriorityChecked()){
                
-                       GeopositionListCtrlPtr->SetItem(longSelected, 1, wxString::Format(wxT("%i"), sliPriority->GetValue()));
+                       GeopositionListCtrlPtr->SetItem(longSelected, 1, wxString::Format(wxT("%i"), priorityCtrl->GetValue()));
                
                } else {
                
@@ -203,7 +202,11 @@ void frmContactEditorGeoposition::ProcessAction( wxCommandEvent& event )
 
 void frmContactEditorGeoposition::CloseWindow( wxCommandEvent& event )
 {
+       
+       // Close this window.
+       
        this->Close();
+       
 }
 
 void frmContactEditorGeoposition::SetupPointers(std::map<int, wxString> *GeopositionList,