X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgraphics%2Fdisplay.h;h=5f84848d16781cb7a2ec76fa42e5f8d833674c6b;hb=d7686e3867e3c68cec0d3767a21f9d2408383085;hp=da3eafa65ca8c462c754ccfe168e26abb699076c;hpb=294c354ae3b1f26887c37f866f082e52c08d80f1;p=libs%2Fgui.git

diff --git a/source/graphics/display.h b/source/graphics/display.h
index da3eafa..5f84848 100644
--- a/source/graphics/display.h
+++ b/source/graphics/display.h
@@ -1,12 +1,13 @@
 #ifndef MSP_GRAPHICS_DISPLAY_H_
 #define MSP_GRAPHICS_DISPLAY_H_
 
-#include <list>
 #include <stdexcept>
 #include <string>
+#include <vector>
 #include <sigc++/signal.h>
 #include "errordialog.h"
 #include "monitor.h"
+#include "mspgui_api.h"
 #include "videomode.h"
 
 namespace Msp {
@@ -14,7 +15,7 @@ namespace Graphics {
 
 class Window;
 
-class Display
+class MSPGUI_API Display
 {
 public:
 	struct Private;
@@ -23,12 +24,12 @@ public:
 	sigc::signal<void> signal_lost_focus;
 
 private:
-	std::list<Monitor> monitors;
-	Monitor *primary_monitor = 0;
-	std::list<VideoMode> modes;
-	Private *priv = 0;
-	ErrorDialog *err_dialog = 0;
-	Window *focus_window = 0;
+	std::vector<Monitor> monitors;
+	Monitor *primary_monitor = nullptr;
+	std::vector<VideoMode> modes;
+	Private *priv = nullptr;
+	ErrorDialog *err_dialog = nullptr;
+	Window *focus_window = nullptr;
 
 public:
 	Display(const std::string &disp_name = std::string());
@@ -39,8 +40,8 @@ public:
 	void add_window(Window &);
 	void remove_window(Window &);
 
-	const std::list<Monitor> &get_monitors() const { return monitors; }
-	const std::list<VideoMode> &get_modes() const { return modes; }
+	const std::vector<Monitor> &get_monitors() const { return monitors; }
+	const std::vector<VideoMode> &get_modes() const { return modes; }
 	const VideoMode &get_desktop_mode() const;
 	void set_mode(const VideoMode &, bool = false);
 	void restore_mode();