X-Git-Url: http://Server1/repobrowser/?p=xestiacalendar%2F.git;a=blobdiff_plain;f=source%2Fwidgets%2FXCCalendarMenu.cpp;h=1ca0550a1e892569d2ce3be287e40c2691d95336;hp=c3d07a97ea14a1e5ac5392e9138e273f6ed946cc;hb=1fe6e43892e5c572949a293a9e19704b5debadad;hpb=2e304ff435c80c07daaf0d3fbe8a9ab7d1ae70b1 diff --git a/source/widgets/XCCalendarMenu.cpp b/source/widgets/XCCalendarMenu.cpp index c3d07a9..1ca0550 100644 --- a/source/widgets/XCCalendarMenu.cpp +++ b/source/widgets/XCCalendarMenu.cpp @@ -62,7 +62,7 @@ void XCCalendarMenu::AppendMenuItem(wxString objectName, // Append a menu item to the XCCalendarMenu control. - wxMenuItem *menuitem = this->Append(ItemID, menuName, menuDescription); + wxMenuItem *menuitem = this->Append(itemID, menuName, menuDescription); this->Connect(menuitem->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(XCCalendarMenu::ProcessMenuItemClick)); menuItems.insert(std::make_pair(objectName.ToStdString(), menuitem)); @@ -81,7 +81,7 @@ void XCCalendarMenu::ProcessMenuItemClick( wxCommandEvent& event){ int itemID = event.GetId(); - PopupPtr->Dismiss(); + popupPtr->Dismiss(); switch (itemID){ @@ -90,7 +90,7 @@ void XCCalendarMenu::ProcessMenuItemClick( wxCommandEvent& event){ wxCommandEvent editCalendar(XCMAIN_EDITCALENDAR); editCalendar.SetId(ID_EDITCALENDAR); editCalendar.SetInt(calendarID); - wxPostEvent(WindowPtr->GetParent()->GetParent()->GetParent()->GetParent(), editCalendar); + wxPostEvent(windowPtr->GetParent()->GetParent()->GetParent()->GetParent(), editCalendar); } break; case ID_CALENDARMENU_DELETE: @@ -103,7 +103,7 @@ void XCCalendarMenu::ProcessMenuItemClick( wxCommandEvent& event){ wxCommandEvent deleteCalendar(XCMAIN_DELETECALENDAR); deleteCalendar.SetId(ID_DELETECALENDAR); deleteCalendar.SetClientData(calendarInfo); - wxPostEvent(WindowPtr->GetParent()->GetParent()->GetParent()->GetParent(), deleteCalendar); + wxPostEvent(windowPtr->GetParent()->GetParent()->GetParent()->GetParent(), deleteCalendar); } break; @@ -125,12 +125,12 @@ void XCCalendarMenu::SetAccountPreferencesID(int accountPreferencesID){ void XCCalendarMenu::SetWindowPointer(wxWindow *windowPointer){ - WindowPtr = windowPointer; + windowPtr = windowPointer; } void XCCalendarMenu::SetPopupPointer(wxPopupTransientWindow *popupPointer){ - PopupPtr = popupPointer; + popupPtr = popupPointer; } \ No newline at end of file