Make SetText pure virtual instead of Paint().
This commit is contained in:
@@ -12,8 +12,8 @@ public:
|
||||
virtual RString Init() { return RString(); }
|
||||
virtual ~LoadingWindow() { }
|
||||
|
||||
virtual void Paint() = 0;
|
||||
virtual void SetText(RString str) { }
|
||||
virtual void Paint() { };
|
||||
virtual void SetText( RString str ) = 0;
|
||||
virtual void SetIcon( const RageSurface *pIcon ) { }
|
||||
};
|
||||
|
||||
|
||||
@@ -30,7 +30,6 @@ public:
|
||||
}
|
||||
~LoadingWindow_Cocoa() { DisposeOfCocoaWindow(); }
|
||||
|
||||
void Paint() { } /* Not needed but pure virtual*/
|
||||
void SetText( RString str ) { SetCocoaWindowText( str ); }
|
||||
};
|
||||
#define USE_LOADING_WINDOW_COCOA
|
||||
|
||||
@@ -12,8 +12,7 @@ public:
|
||||
RString Init();
|
||||
~LoadingWindow_Gtk();
|
||||
|
||||
void SetText(RString str);
|
||||
void Paint() { }
|
||||
void SetText( RString str );
|
||||
};
|
||||
#define USE_LOADING_WINDOW_GTK
|
||||
|
||||
|
||||
@@ -3,13 +3,10 @@
|
||||
|
||||
#include "LoadingWindow.h"
|
||||
|
||||
class LoadingWindow_Null: public LoadingWindow {
|
||||
class LoadingWindow_Null: public LoadingWindow
|
||||
{
|
||||
public:
|
||||
LoadingWindow_Null() { }
|
||||
~LoadingWindow_Null() { }
|
||||
|
||||
void SetText(RString str) { }
|
||||
void Paint() { }
|
||||
void SetText( RString str ) { }
|
||||
};
|
||||
#define USE_LOADING_WINDOW_NULL
|
||||
|
||||
|
||||
Reference in New Issue
Block a user