X-Git-Url: http://Server1/repobrowser/?p=xestiaab%2F.git;a=blobdiff_plain;f=source%2FAppXestiaAddrBk.cpp;h=f61a34e0e662cea176461753dde8b78eb0729432;hp=50dffffc074fdf3d06be5c2a2c06b5c41627044f;hb=8089428e86139e335db5f5104382ffc37dce1c42;hpb=cbeea63f67490b46dfe5b2f59c3f54b5304835b6

diff --git a/source/AppXestiaAddrBk.cpp b/source/AppXestiaAddrBk.cpp
index 50dffff..f61a34e 100644
--- a/source/AppXestiaAddrBk.cpp
+++ b/source/AppXestiaAddrBk.cpp
@@ -5025,80 +5025,35 @@ frmContactEditorCalAdrADT::frmContactEditorCalAdrADT( wxWindow* parent, wxWindow
 	
 	nbkWebsite = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
 	tabGeneral = new wxPanel( nbkWebsite, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	wxFlexGridSizer* fgSizer6;
-	fgSizer6 = new wxFlexGridSizer( 0, 2, 0, 0 );
-	fgSizer6->AddGrowableCol( 1 );
-	fgSizer6->SetFlexibleDirection( wxVERTICAL );
-	fgSizer6->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	szrGeneral = new wxFlexGridSizer( 3, 2, 0, 0 );
+	szrGeneral->AddGrowableCol( 1 );
+	szrGeneral->SetFlexibleDirection( wxBOTH );
+	szrGeneral->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 	
 	lblAddress = new wxStaticText( tabGeneral, wxID_ANY, wxT("Address:"), wxDefaultPosition, wxDefaultSize, 0 );
 	lblAddress->Wrap( -1 );
-	fgSizer6->Add( lblAddress, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	szrGeneral->Add( lblAddress, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 	
 	txtAddress = new wxTextCtrl( tabGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	fgSizer6->Add( txtAddress, 0, wxALL|wxEXPAND, 5 );
+	szrGeneral->Add( txtAddress, 0, wxALL|wxEXPAND, 5 );
 	
 	lblType = new wxStaticText( tabGeneral, wxID_ANY, wxT("Type:"), wxDefaultPosition, wxDefaultSize, 0 );
 	lblType->Wrap( -1 );
-	fgSizer6->Add( lblType, 0, wxALL, 5 );
+	szrGeneral->Add( lblType, 0, wxALL, 5 );
 	
 	wxArrayString cmbTypeChoices;
 	cmbType = new wxChoice( tabGeneral, wxID_ANY, wxDefaultPosition, wxDefaultSize, cmbTypeChoices, 0 );
 	cmbType->SetSelection( 0 );
-	fgSizer6->Add( cmbType, 0, wxALL, 5 );
+	szrGeneral->Add( cmbType, 0, wxALL, 5 );
 	
 	lblPriority = new wxStaticText( tabGeneral, wxID_ANY, wxT("Priority:"), wxDefaultPosition, wxDefaultSize, 0 );
 	lblPriority->Wrap( -1 );
-	fgSizer6->Add( lblPriority, 0, wxALL, 5 );
-	
-	wxBoxSizer* bSizer260;
-	bSizer260 = new wxBoxSizer( wxHORIZONTAL );
-	
-	chkUsePref = new wxCheckBox( tabGeneral, wxID_ANY, wxT("Use"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer260->Add( chkUsePref, 0, wxALL, 5 );
-	
-	wxBoxSizer* bSizer254;
-	bSizer254 = new wxBoxSizer( wxVERTICAL );
-	
-	wxBoxSizer* bSizer256;
-	bSizer256 = new wxBoxSizer( wxHORIZONTAL );
-	
-	sliPriority = new wxSlider( tabGeneral, wxID_ANY, 0, 1, 100, wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL|wxSL_LABELS );
-	bSizer256->Add( sliPriority, 1, wxALL|wxEXPAND, 5 );
-	
-	
-	bSizer254->Add( bSizer256, 1, wxEXPAND, 5 );
-	
-	wxBoxSizer* bSizer255;
-	bSizer255 = new wxBoxSizer( wxHORIZONTAL );
-	
-	lblHigh = new wxStaticText( tabGeneral, wxID_ANY, wxT("High"), wxDefaultPosition, wxDefaultSize, 0 );
-	lblHigh->Wrap( -1 );
-	bSizer255->Add( lblHigh, 0, wxALIGN_LEFT|wxALL, 5 );
-	
-	
-	bSizer255->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	lblLow = new wxStaticText( tabGeneral, wxID_ANY, wxT("Low"), wxDefaultPosition, wxDefaultSize, 0 );
-	lblLow->Wrap( -1 );
-	bSizer255->Add( lblLow, 0, wxALIGN_RIGHT|wxALL, 5 );
-	
-	
-	bSizer254->Add( bSizer255, 1, wxEXPAND, 0 );
-	
-	
-	bSizer260->Add( bSizer254, 1, wxEXPAND, 5 );
-	
-	
-	fgSizer6->Add( bSizer260, 1, wxEXPAND, 5 );
-	
-	
-	fgSizer6->Add( 0, 0, 1, wxEXPAND, 5 );
+	szrGeneral->Add( lblPriority, 0, wxALL, 5 );
 	
 	
-	tabGeneral->SetSizer( fgSizer6 );
+	tabGeneral->SetSizer( szrGeneral );
 	tabGeneral->Layout();
-	fgSizer6->Fit( tabGeneral );
+	szrGeneral->Fit( tabGeneral );
 	nbkWebsite->AddPage( tabGeneral, wxT("General"), false );
 	
 	bSizer251->Add( nbkWebsite, 1, wxEXPAND | wxALL, 5 );
@@ -5122,7 +5077,6 @@ frmContactEditorCalAdrADT::frmContactEditorCalAdrADT( wxWindow* parent, wxWindow
 	this->Centre( wxBOTH );
 	
 	// Connect Events
-	chkUsePref->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( frmContactEditorCalAdrADT::EnablePriority ), NULL, this );
 	btnAction->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorCalAdrADT::ProcessAction ), NULL, this );
 	btnClose->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorCalAdrADT::CloseWindow ), NULL, this );
 }
@@ -5130,7 +5084,6 @@ frmContactEditorCalAdrADT::frmContactEditorCalAdrADT( wxWindow* parent, wxWindow
 frmContactEditorCalAdrADT::~frmContactEditorCalAdrADT()
 {
 	// Disconnect Events
-	chkUsePref->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( frmContactEditorCalAdrADT::EnablePriority ), NULL, this );
 	btnAction->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorCalAdrADT::ProcessAction ), NULL, this );
 	btnClose->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorCalAdrADT::CloseWindow ), NULL, this );