diff options
| author | FWoltermann@gmail.com <FWoltermann@gmail.com@076cb2c4-205e-83fd-5cf3-1be9aa105544> | 2012-05-28 16:44:39 +0000 |
|---|---|---|
| committer | FWoltermann@gmail.com <FWoltermann@gmail.com@076cb2c4-205e-83fd-5cf3-1be9aa105544> | 2012-05-28 16:44:39 +0000 |
| commit | 56a3380b46f406ffaf093405ac2db4515b0a4f80 (patch) | |
| tree | e9e4c5553343f27e41d862c49b21fd69bf5161b9 /nGenEx/ActiveWindow.h | |
| parent | 41b40af36198fb013a2034a1954bbc4df50fea8b (diff) | |
| download | starshatter-56a3380b46f406ffaf093405ac2db4515b0a4f80.zip starshatter-56a3380b46f406ffaf093405ac2db4515b0a4f80.tar.gz starshatter-56a3380b46f406ffaf093405ac2db4515b0a4f80.tar.bz2 | |
Removes the ArrayList classes, and replaces all instances with std::vector implementations.
Diffstat (limited to 'nGenEx/ActiveWindow.h')
| -rw-r--r-- | nGenEx/ActiveWindow.h | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/nGenEx/ActiveWindow.h b/nGenEx/ActiveWindow.h index 6be3bfb..b08cd26 100644 --- a/nGenEx/ActiveWindow.h +++ b/nGenEx/ActiveWindow.h @@ -15,13 +15,13 @@ #ifndef ActiveWindow_h
#define ActiveWindow_h
+#include <vector>
#include "Types.h"
#include "Color.h"
#include "Geometry.h"
#include "Bitmap.h"
#include "Window.h"
#include "EventTarget.h"
-#include "ArrayList.h"
#include "List.h"
#include "Text.h"
@@ -132,20 +132,20 @@ public: virtual void Show();
virtual void Hide();
virtual void MoveTo(const Rect& r);
- virtual void UseLayout(const ArrayList& min_x,
- const ArrayList& min_y,
- const FloatList& weight_x,
- const FloatList& weight_y);
- virtual void UseLayout(const FloatList& min_x,
- const FloatList& min_y,
- const FloatList& weight_x,
- const FloatList& weight_y);
+ virtual void UseLayout(const std::vector<DWORD>& min_x,
+ const std::vector<DWORD>& min_y,
+ const std::vector<float>& weight_x,
+ const std::vector<float>& weight_y);
+ virtual void UseLayout(const std::vector<float>& min_x,
+ const std::vector<float>& min_y,
+ const std::vector<float>& weight_x,
+ const std::vector<float>& weight_y);
virtual void UseLayout(int ncols,
- int nrows,
- int* min_x,
- int* min_y,
- float* weight_x,
- float* weight_y);
+ int nrows,
+ int* min_x,
+ int* min_y,
+ float* weight_x,
+ float* weight_y);
virtual void DoLayout();
// Event Target Interface:
|