X-Git-Url: http://Server1/repobrowser/?p=xestiacalendar%2F.git;a=blobdiff_plain;f=source%2Fwidgets%2FXCCalendarManipulator.cpp;h=81843b5b8939aa45a5cdaff93619a8a96c8cfeec;hp=a055eb841afcb175361df8f8a02f5d5327cd5120;hb=902d948e5e45ad483c8e235690dda8f2bf596ad5;hpb=ca1d24d80ec04ae64a7540cf8bca61c053f2a193

diff --git a/source/widgets/XCCalendarManipulator.cpp b/source/widgets/XCCalendarManipulator.cpp
index a055eb8..81843b5 100644
--- a/source/widgets/XCCalendarManipulator.cpp
+++ b/source/widgets/XCCalendarManipulator.cpp
@@ -27,7 +27,11 @@ XCCalendarManipulator::XCCalendarManipulator(wxWindow* parent, const wxString& t
         : 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);
+#if defined(__APPLE__)
+	pnlMain->SetBackgroundColour(wxColour(120,120,120));
+#else
 	pnlMain->SetBackgroundColour(wxColour(40,40,40));
+#endif
 	this->SetSizer(szrMain);
 	szrMain->Add(pnlMain, 0, wxEXPAND, 0);
 	
@@ -58,6 +62,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.
 		
@@ -70,6 +77,7 @@ XCCalendarManipulator::XCCalendarManipulator(wxWindow* parent, const wxString& t
 		
 	dateButton->SetFont(test);
 	dateButton->SetForegroundColour(wxColour(255,255,255));
+	dateButton->SetBackgroundColour(pnlMain->GetBackgroundColour());
 	
 	// Setup the manipulator control.
 
@@ -84,8 +92,12 @@ XCCalendarManipulator::XCCalendarManipulator(wxWindow* parent, const wxString& t
 	// Setup the month selection control.
 	
 	wxDateTime dtNow = wxDateTime::Now();
-	
+
+#if defined(WIN32) || defined(__APPLE__)
+	moo = new frmCalendarSelectMonth(this);
+#else
 	moo = new XCCalendarMonthSelect(this);
+#endif
 	month = ((int)dtNow.GetMonth() + 1);
 	year = dtNow.GetYear();
 	moo->UpdateDate(month, year);
@@ -106,12 +118,81 @@ XCCalendarManipulator::XCCalendarManipulator(wxWindow* parent, const wxString& t
 	calendarsButton->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(XCCalendarManipulator::ShowCalendarsList), NULL, this);
 	previousButton->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(XCCalendarManipulator::PreviousMonth), NULL, this);
 	
+#if defined(WIN32)
+	dateButton->Connect(wxEVT_ENTER_WINDOW, wxMouseEventHandler(XCCalendarManipulator::ButtonMouseover), NULL, this);
+	dateButton->Connect(wxEVT_LEAVE_WINDOW, wxMouseEventHandler(XCCalendarManipulator::ButtonMouseout), NULL, this);
+	nextButton->Connect(wxEVT_ENTER_WINDOW, wxMouseEventHandler(XCCalendarManipulator::ButtonMouseover), NULL, this);
+	nextButton->Connect(wxEVT_LEAVE_WINDOW, wxMouseEventHandler(XCCalendarManipulator::ButtonMouseout), NULL, this);
+	calendarsButton->Connect(wxEVT_ENTER_WINDOW, wxMouseEventHandler(XCCalendarManipulator::ButtonMouseover), NULL, this);
+	calendarsButton->Connect(wxEVT_LEAVE_WINDOW, wxMouseEventHandler(XCCalendarManipulator::ButtonMouseout), NULL, this);
+	previousButton->Connect(wxEVT_ENTER_WINDOW, wxMouseEventHandler(XCCalendarManipulator::ButtonMouseover), NULL, this);
+	previousButton->Connect(wxEVT_LEAVE_WINDOW, wxMouseEventHandler(XCCalendarManipulator::ButtonMouseout), NULL, this);
+#endif
+
 	Bind(XCCALENDARMANIPULATOR_CHANGEGRID, &XCCalendarManipulator::ChangeGrid, this, ID_CHANGEGRID);
+
+	this->Refresh();
 }
 
 XCCalendarManipulator::~XCCalendarManipulator(){
 	
 	// Destory the controls from the widget.
+
+	dateButton->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(XCCalendarManipulator::DateTextClick), NULL, this);
+	nextButton->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(XCCalendarManipulator::NextMonth), NULL, this);
+	calendarsButton->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(XCCalendarManipulator::ShowCalendarsList), NULL, this);
+	previousButton->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(XCCalendarManipulator::PreviousMonth), NULL, this);
+	
+#if defined(WIN32)
+	dateButton->Disconnect(wxEVT_ENTER_WINDOW, wxMouseEventHandler(XCCalendarManipulator::ButtonMouseover), NULL, this);
+	dateButton->Disconnect(wxEVT_LEAVE_WINDOW, wxMouseEventHandler(XCCalendarManipulator::ButtonMouseout), NULL, this);
+	nextButton->Disconnect(wxEVT_ENTER_WINDOW, wxMouseEventHandler(XCCalendarManipulator::ButtonMouseover), NULL, this);
+	nextButton->Disconnect(wxEVT_LEAVE_WINDOW, wxMouseEventHandler(XCCalendarManipulator::ButtonMouseout), NULL, this);
+	calendarsButton->Disconnect(wxEVT_ENTER_WINDOW, wxMouseEventHandler(XCCalendarManipulator::ButtonMouseover), NULL, this);
+	calendarsButton->Disconnect(wxEVT_LEAVE_WINDOW, wxMouseEventHandler(XCCalendarManipulator::ButtonMouseout), NULL, this);
+	previousButton->Disconnect(wxEVT_ENTER_WINDOW, wxMouseEventHandler(XCCalendarManipulator::ButtonMouseover), NULL, this);
+	previousButton->Disconnect(wxEVT_LEAVE_WINDOW, wxMouseEventHandler(XCCalendarManipulator::ButtonMouseout), NULL, this);
+#endif
+	
+	Unbind(XCCALENDARMANIPULATOR_CHANGEGRID, &XCCalendarManipulator::ChangeGrid, this, ID_CHANGEGRID);
+
+	// Delete the buttons in pnlMain.
+	
+	szrNavigation->Clear();
+	
+	delete previousButton;
+	previousButton = nullptr;
+	
+	delete nextButton;
+	nextButton = nullptr;
+	
+	delete calendarsButton;
+	calendarsButton = nullptr;
+	
+	delete dateButton;
+	dateButton = nullptr;
+	
+	// Delete szrNavigation.
+	
+	szrMain->Clear();
+	pnlMain->SetSizer(nullptr, true);
+	
+	// Delete pnlMain itself;
+	
+	delete pnlMain;
+	pnlMain = nullptr;
+
+	delete moo;
+	moo = nullptr;
+
+	delete calendarList;
+	calendarList = nullptr;
+	
+	// Delete szrMain itself;
+	
+	this->SetSizer(nullptr, true);
+
+	dataStorage = nullptr;
 	
 }
 
@@ -119,10 +200,16 @@ void XCCalendarManipulator::DateTextClick(wxCommandEvent &event){
 	
 	// Bring up a popup control to select the month and year.
 	
+	// Do something different for Win32 and macOS.
+
 	moo->SetPosition(wxPoint(dateButton->GetScreenRect().GetLeft(), dateButton->GetScreenRect().GetBottom()));
 	moo->UpdateDate(month, year);
+#if defined(WIN32) || defined(__APPLE__)
+	moo->ShowModal();
+#else
 	moo->Popup();
-	
+#endif
+
 }
 
 void XCCalendarManipulator::ChangeGrid(wxCommandEvent &event){
@@ -214,8 +301,22 @@ void XCCalendarManipulator::ShowCalendarsList(wxCommandEvent &event){
 	
 	calendarList->SetPosition(wxPoint(calendarsButton->GetScreenRect().GetLeft(), calendarsButton->GetScreenRect().GetBottom()));
 	calendarList->UpdateCalendarList(dataStorage);
+#if defined(__APPLE__)
+
+	if (calendarListShow == false)
+	{
+		calendarList->Show();
+	        calendarListShow = true;
+	}
+	else
+	{
+		calendarList->Hide();
+		calendarListShow = false;
+	}
+#else
 	calendarList->Popup();
-	
+#endif
+    
 }
 
 void XCCalendarManipulator::UpdateDateButtonText(){
@@ -294,4 +395,16 @@ vector<int> XCCalendarManipulator::GetHiddenCalendarsList(){
 	
 	return calendarList->GetHiddenCalendarsList();
 	
+}
+
+void XCCalendarManipulator::ButtonMouseover(wxMouseEvent &event)
+{
+	wxWindow *eventObject = (wxWindow*)event.GetEventObject();
+	eventObject->SetWindowStyle(0 | wxSIMPLE_BORDER);
+}
+
+void XCCalendarManipulator::ButtonMouseout(wxMouseEvent &event)
+{
+	wxWindow *eventObject = (wxWindow*)event.GetEventObject();
+	eventObject->SetWindowStyle(0 | wxNO_BORDER);
 }
\ No newline at end of file