move m_Flags
This commit is contained in:
@@ -27,6 +27,7 @@ WheelItemData::WheelItemData( WheelItemType wit, Song* pSong, RString sSectionNa
|
|||||||
{
|
{
|
||||||
m_pSong = pSong;
|
m_pSong = pSong;
|
||||||
m_pCourse = pCourse;
|
m_pCourse = pCourse;
|
||||||
|
m_Flags = WheelNotifyIcon::Flags();
|
||||||
}
|
}
|
||||||
|
|
||||||
MusicWheelItem::MusicWheelItem( RString sType ):
|
MusicWheelItem::MusicWheelItem( RString sType ):
|
||||||
|
|||||||
@@ -54,6 +54,7 @@ struct WheelItemData : public WheelItemBaseData
|
|||||||
|
|
||||||
Course* m_pCourse;
|
Course* m_pCourse;
|
||||||
Song* m_pSong;
|
Song* m_pSong;
|
||||||
|
WheelNotifyIcon::Flags m_Flags;
|
||||||
|
|
||||||
// for TYPE_SORT
|
// for TYPE_SORT
|
||||||
RString m_sLabel;
|
RString m_sLabel;
|
||||||
|
|||||||
@@ -6,7 +6,6 @@ WheelItemBaseData::WheelItemBaseData( WheelItemType wit, RString sText, RageColo
|
|||||||
m_Type = wit;
|
m_Type = wit;
|
||||||
m_sText = sText;
|
m_sText = sText;
|
||||||
m_color = color;
|
m_color = color;
|
||||||
m_Flags = WheelNotifyIcon::Flags();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
WheelItemBase::WheelItemBase( const WheelItemBase &cpy ):
|
WheelItemBase::WheelItemBase( const WheelItemBase &cpy ):
|
||||||
|
|||||||
@@ -5,7 +5,6 @@
|
|||||||
|
|
||||||
#include "ActorFrame.h"
|
#include "ActorFrame.h"
|
||||||
#include "BitmapText.h"
|
#include "BitmapText.h"
|
||||||
#include "WheelNotifyIcon.h"
|
|
||||||
#include "ThemeMetric.h"
|
#include "ThemeMetric.h"
|
||||||
#include "GameConstantsAndTypes.h"
|
#include "GameConstantsAndTypes.h"
|
||||||
#include "AutoActor.h"
|
#include "AutoActor.h"
|
||||||
@@ -66,7 +65,6 @@ struct WheelItemBaseData
|
|||||||
WheelItemType m_Type;
|
WheelItemType m_Type;
|
||||||
RString m_sText;
|
RString m_sText;
|
||||||
RageColor m_color; // either text color or section background color
|
RageColor m_color; // either text color or section background color
|
||||||
WheelNotifyIcon::Flags m_Flags;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
Reference in New Issue
Block a user