X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fwidgets%2FXCCalendarManipulator.cpp;h=95d20457516fd3c9db9cfd0147993a7d2263ea96;hb=1e27ad4d0a3825dc9d270848469bfc82a5d33607;hp=f8971cad9f09ad9656ab191244438bf09b7ccec3;hpb=1fe6e43892e5c572949a293a9e19704b5debadad;p=xestiacalendar%2F.git

diff --git a/source/widgets/XCCalendarManipulator.cpp b/source/widgets/XCCalendarManipulator.cpp
index f8971ca..95d2045 100644
--- a/source/widgets/XCCalendarManipulator.cpp
+++ b/source/widgets/XCCalendarManipulator.cpp
@@ -18,15 +18,13 @@
 
 #include "XCCalendarManipulator.h"
 
-BEGIN_EVENT_TABLE(XCCalendarManipulator, wxPanel)
-END_EVENT_TABLE()
+wxDEFINE_EVENT(XCCALENDARMANIPULATOR_CHANGEGRID, wxCommandEvent);
 
 using namespace std;
 
 XCCalendarManipulator::XCCalendarManipulator(wxWindow* parent, const wxString& title, 
 	const wxPoint& pos, const wxSize& size, CalendarDataStorage *dataStorage)
         : wxPanel(parent, wxID_ANY, pos, size, wxTAB_TRAVERSAL, title){
-	
 	szrMain = new wxBoxSizer( wxVERTICAL );
 	pnlMain = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxSize(500, 50), wxTAB_TRAVERSAL);
 	pnlMain->SetBackgroundColour(wxColour(40,40,40));
@@ -60,6 +58,9 @@ XCCalendarManipulator::XCCalendarManipulator(wxWindow* parent, const wxString& t
 	previousButton->SetBitmap(previousIconBitmap);
 	nextButton->SetBitmap(nextIconBitmap);
 	calendarsButton->SetBitmap(calendarsIconBitmap);
+	previousButton->SetBackgroundColour(pnlMain->GetBackgroundColour());
+	nextButton->SetBackgroundColour(pnlMain->GetBackgroundColour());
+	calendarsButton->SetBackgroundColour(pnlMain->GetBackgroundColour());
 		
 	// Setup the static text.
 		
@@ -72,15 +73,7 @@ XCCalendarManipulator::XCCalendarManipulator(wxWindow* parent, const wxString& t
 		
 	dateButton->SetFont(test);
 	dateButton->SetForegroundColour(wxColour(255,255,255));
-	
-	// Setup the event controls.
-
-	dateButton->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(XCCalendarManipulator::DateTextClick), NULL, this);
-	nextButton->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(XCCalendarManipulator::NextMonth), NULL, this);
-	calendarsButton->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(XCCalendarManipulator::ShowCalendarsList), NULL, this);
-	previousButton->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(XCCalendarManipulator::PreviousMonth), NULL, this);
-	
-	Connect(ID_CHANGEGRID, XCCALENDARMANIPULATOR_CHANGEGRID, wxCommandEventHandler(XCCalendarManipulator::ChangeGrid));
+	dateButton->SetBackgroundColour(pnlMain->GetBackgroundColour());
 	
 	// Setup the manipulator control.
 
@@ -110,6 +103,14 @@ XCCalendarManipulator::XCCalendarManipulator(wxWindow* parent, const wxString& t
 	
 	this->dataStorage = dataStorage;
 		
+	// Setup the event controls.
+
+	dateButton->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(XCCalendarManipulator::DateTextClick), NULL, this);
+	nextButton->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(XCCalendarManipulator::NextMonth), NULL, this);
+	calendarsButton->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(XCCalendarManipulator::ShowCalendarsList), NULL, this);
+	previousButton->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(XCCalendarManipulator::PreviousMonth), NULL, this);
+	
+	Bind(XCCALENDARMANIPULATOR_CHANGEGRID, &XCCalendarManipulator::ChangeGrid, this, ID_CHANGEGRID);
 }
 
 XCCalendarManipulator::~XCCalendarManipulator(){