X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fwidgets%2FXCCalendarDayEntry.cpp;h=047bc4a0bd303a03e9ee9037daa925424b640028;hb=285af7a588967bcc5c4565125c37f5f296040556;hp=f5f31b4d73819b02bb0da2d1bb0dd8b1756d49b3;hpb=bdc05156983bccd8f7ad725c612280a46b612876;p=xestiacalendar%2F.git

diff --git a/source/widgets/XCCalendarDayEntry.cpp b/source/widgets/XCCalendarDayEntry.cpp
index f5f31b4..047bc4a 100644
--- a/source/widgets/XCCalendarDayEntry.cpp
+++ b/source/widgets/XCCalendarDayEntry.cpp
@@ -27,10 +27,7 @@ END_EVENT_TABLE()
 using namespace std;
 
 XCCalendarDayEntry::XCCalendarDayEntry(wxWindow* parent, const wxString& title, const wxPoint& pos, const wxSize& size, const int id)
-        : wxPanel(parent, wxID_ANY, pos, size, wxTAB_TRAVERSAL, title)
-{
-
-	Connect(wxID_ANY, XCCALENDARDAYENTRY_DESELECT, wxCommandEventHandler(XCCalendarDayEntry::Deselect));
+        : wxPanel(parent, wxID_ANY, pos, size, wxTAB_TRAVERSAL, title){
 	
 	DayPanel = parent->GetParent();
 	EntryID = id;
@@ -39,12 +36,23 @@ XCCalendarDayEntry::XCCalendarDayEntry(wxWindow* parent, const wxString& title,
 	
 	EventTextData = title.mb_str();
 	EventText = new wxStaticText(this, wxID_ANY, title, wxPoint(49, 8), wxDefaultSize, wxST_ELLIPSIZE_END);
-	
-	AlarmIconBitmap.LoadFile("AlertIcon.png", wxBITMAP_DEFAULT_TYPE);
-	PriorityIconBitmap.LoadFile("PriorityIcon.png", wxBITMAP_DEFAULT_TYPE);
 
+	wxMemoryInputStream alerticon(icons_alert_png, sizeof(icons_alert_png));
+	wxMemoryInputStream priorityicon(icons_priority_png, sizeof(icons_priority_png));
+		
+	wxImage icons_alert_png(alerticon, wxBITMAP_TYPE_PNG);
+	AlarmIconBitmap = wxBitmap(icons_alert_png, -1);
+
+	wxImage icons_priority_png(priorityicon, wxBITMAP_TYPE_PNG);
+	PriorityIconBitmap = wxBitmap(icons_priority_png, -1);
+		
 	AlarmIcon->SetBitmap(AlarmIconBitmap);
 	HighPriorityIcon->SetBitmap(PriorityIconBitmap);
+
+	Connect(wxID_ANY, XCCALENDARDAYENTRY_DESELECT, wxCommandEventHandler(XCCalendarDayEntry::Deselect));
+	AlarmIcon->Connect(wxEVT_LEFT_DOWN, wxMouseEventHandler(XCCalendarDayEntry::LeftClick), NULL, this);
+	HighPriorityIcon->Connect(wxEVT_LEFT_DOWN, wxMouseEventHandler(XCCalendarDayEntry::LeftClick), NULL, this);
+	EventText->Connect(wxEVT_LEFT_DOWN, wxMouseEventHandler(XCCalendarDayEntry::LeftClick), NULL, this);
 	
 	UpdateInformation();
 	
@@ -144,15 +152,13 @@ void XCCalendarDayEntry::UpdateInformation(){
 	
 }
 
-void XCCalendarDayEntry::PaintFrameEvent(wxPaintEvent &PaintEvent)
-{
+void XCCalendarDayEntry::PaintFrameEvent(wxPaintEvent &PaintEvent){
 
 	Repaint();
 	
 }
 
-void XCCalendarDayEntry::ResizeFrameEvent(wxSizeEvent &SizeEvent)
-{
+void XCCalendarDayEntry::ResizeFrameEvent(wxSizeEvent &SizeEvent){
 	
 	// Adjust the Event text so it is displayed properly.
 	
@@ -174,8 +180,7 @@ void XCCalendarDayEntry::ResizeFrameEvent(wxSizeEvent &SizeEvent)
 	
 }
 
-void XCCalendarDayEntry::LeftClick(wxMouseEvent &MouseEvent)
-{
+void XCCalendarDayEntry::LeftClick(wxMouseEvent &MouseEvent){
 	
 	// Change the background of the widget to mark 
 	// the entry as selected.