Applied patch [ 667149 ] wxFileHistory: Only adds a menu separator when necessary
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@18902 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1948,8 +1948,10 @@ void wxFileHistory::AddFileToHistory(const wxString& file)
|
|||||||
while (node)
|
while (node)
|
||||||
{
|
{
|
||||||
wxMenu* menu = (wxMenu*) node->Data();
|
wxMenu* menu = (wxMenu*) node->Data();
|
||||||
if (m_fileHistoryN == 0)
|
if ( m_fileHistoryN == 0 && menu->GetMenuItemCount() )
|
||||||
|
{
|
||||||
menu->AppendSeparator();
|
menu->AppendSeparator();
|
||||||
|
}
|
||||||
menu->Append(wxID_FILE1+m_fileHistoryN, _("[EMPTY]"));
|
menu->Append(wxID_FILE1+m_fileHistoryN, _("[EMPTY]"));
|
||||||
node = node->Next();
|
node = node->Next();
|
||||||
}
|
}
|
||||||
@@ -2115,7 +2117,10 @@ void wxFileHistory::AddFilesToMenu()
|
|||||||
while (node)
|
while (node)
|
||||||
{
|
{
|
||||||
wxMenu* menu = (wxMenu*) node->Data();
|
wxMenu* menu = (wxMenu*) node->Data();
|
||||||
|
if (menu->GetMenuItemCount())
|
||||||
|
{
|
||||||
menu->AppendSeparator();
|
menu->AppendSeparator();
|
||||||
|
}
|
||||||
int i;
|
int i;
|
||||||
for (i = 0; i < m_fileHistoryN; i++)
|
for (i = 0; i < m_fileHistoryN; i++)
|
||||||
{
|
{
|
||||||
@@ -2134,8 +2139,11 @@ void wxFileHistory::AddFilesToMenu()
|
|||||||
void wxFileHistory::AddFilesToMenu(wxMenu* menu)
|
void wxFileHistory::AddFilesToMenu(wxMenu* menu)
|
||||||
{
|
{
|
||||||
if (m_fileHistoryN > 0)
|
if (m_fileHistoryN > 0)
|
||||||
|
{
|
||||||
|
if (menu->GetMenuItemCount())
|
||||||
{
|
{
|
||||||
menu->AppendSeparator();
|
menu->AppendSeparator();
|
||||||
|
}
|
||||||
int i;
|
int i;
|
||||||
for (i = 0; i < m_fileHistoryN; i++)
|
for (i = 0; i < m_fileHistoryN; i++)
|
||||||
{
|
{
|
||||||
|
Reference in New Issue
Block a user