widgets: Updated and added widgets

[xestiacalendar/.git] / source / widgets / XCCalendarDay.cpp

diff --git a/source/widgets/XCCalendarDay.cpp b/source/widgets/XCCalendarDay.cpp
index 15c8c65..bc8dc46 100644 (file)
--- a/source/widgets/XCCalendarDay.cpp
+++ b/source/widgets/XCCalendarDay.cpp
@@ -33,11 +33,19 @@ XCCalendarDay::XCCalendarDay(wxWindow *parent, const wxString& title, const wxPo
 
        this->SetMinSize( wxSize( 100,100 ) );
        
-       AlertIconBitmap.LoadFile("AlertIcon-32.png", wxBITMAP_DEFAULT_TYPE);
-       PriorityIconBitmap.LoadFile("PriorityIcon-32.png", wxBITMAP_DEFAULT_TYPE);
+       // Setip the icons.
+               
+       wxMemoryInputStream alerticon(icons_alert32_png, sizeof(icons_alert32_png));
+       wxMemoryInputStream priorityicon(icons_priority32_png, sizeof(icons_priority32_png));
+       
+       wxImage icons_alert_png(alerticon, wxBITMAP_TYPE_PNG);
+       wxBitmap imgAlertIcon(icons_alert_png, -1);
+
+       wxImage icons_priority_png(priorityicon, wxBITMAP_TYPE_PNG);
+       wxBitmap imgPriorityIcon(icons_priority_png, -1);
        
-       AlertIcon->SetBitmap(AlertIconBitmap);
-       HighPriorityIcon->SetBitmap(PriorityIconBitmap);        
+       AlertIcon->SetBitmap(imgAlertIcon);
+       HighPriorityIcon->SetBitmap(imgPriorityIcon);
        
        WindowSizer->AddGrowableCol(0);
        WindowSizer->AddGrowableRow(1);
@@ -58,7 +66,7 @@ XCCalendarDay::XCCalendarDay(wxWindow *parent, const wxString& title, const wxPo
        EventColour.red = 40; EventColour.green = 80; EventColour.blue = 80;
        
        EventListFrame->SetSizer(EventListFrameSizer);
-       CalendarEntry1->SetColour(&EventColour);
+       /*CalendarEntry1->SetColour(&EventColour);
        CalendarEntry1->SetDisplayAlarm(false);
        CalendarEntry1->SetDisplayHighPriority(false);
        EventListFrameSizer->Add(CalendarEntry1, 0, wxEXPAND, 5);
@@ -95,7 +103,7 @@ XCCalendarDay::XCCalendarDay(wxWindow *parent, const wxString& title, const wxPo
        EventListFrameSizer->Add(0, 5, 0, 0, 5);
        EventListFrameSizer->Add(CalendarEntry9, 0, wxEXPAND, 5);
        EventListFrameSizer->Add(0, 5, 0, 0, 5);
-       EventListFrameSizer->Add(CalendarEntry10, 0, wxEXPAND, 5);
+       EventListFrameSizer->Add(CalendarEntry10, 0, wxEXPAND, 5);*/
 
        EventListFrame->SetScrollRate(0,1);
        //EventListFrameSizer->FitInside(EventListFrame);
@@ -115,7 +123,7 @@ XCCalendarDay::XCCalendarDay(wxWindow *parent, const wxString& title, const wxPo
        this->SetBackgroundStyle(wxBG_STYLE_PAINT);
        this->Centre(wxBOTH);
        
-       CalendarEntryList.push_back(CalendarEntry1);
+       /*CalendarEntryList.push_back(CalendarEntry1);
        CalendarEntryList.push_back(CalendarEntry2);
        CalendarEntryList.push_back(CalendarEntry3);
        CalendarEntryList.push_back(CalendarEntry4);
@@ -124,7 +132,7 @@ XCCalendarDay::XCCalendarDay(wxWindow *parent, const wxString& title, const wxPo
        CalendarEntryList.push_back(CalendarEntry7);
        CalendarEntryList.push_back(CalendarEntry8);
        CalendarEntryList.push_back(CalendarEntry9);
-       CalendarEntryList.push_back(CalendarEntry10);
+       CalendarEntryList.push_back(CalendarEntry10);*/
        
        UpdateTopIcons();