Merge branch 'reorganisation' of github.com:FacialTurd/The-Powder-Toy

1 files changed, 0 insertions, 43 deletions

diff --git a/src/colourpicker/ColourPickerActivity.h b/src/colourpicker/ColourPickerActivity.h
deleted file mode 100644
index 5cc3f04..0000000
--- a/src/colourpicker/ColourPickerActivity.h
+++ /dev/null
@@ -1,43 +0,0 @@
-#pragma once
-
-#include <vector>
-#include <string>
-#include "Activity.h"
-#include "interface/Window.h"
-#include "interface/Textbox.h"
-
-class ColourPickedCallback
-{
-public:
-	ColourPickedCallback() {}
-	virtual  ~ColourPickedCallback() {}
-	virtual void ColourPicked(ui::Colour colour) {}
-};
-
-class ColourPickerActivity: public WindowActivity {
-	int currentHue;
-	int currentSaturation;
-	int currentValue;
-	int currentAlpha;
-
-	bool mouseDown;
-	bool valueMouseDown;
-
-	ui::Textbox * rValue;
-	ui::Textbox * gValue;
-	ui::Textbox * bValue;
-	ui::Textbox * aValue;
-	ui::Label * hexValue;
-
-	ColourPickedCallback * callback;
-
-	void UpdateTextboxes(int r, int g, int b, int a);
-public:
-	virtual void OnMouseMove(int x, int y, int dx, int dy);
-	virtual void OnMouseDown(int x, int y, unsigned button);
-	virtual void OnMouseUp(int x, int y, unsigned button);
-	virtual void OnTryExit(ExitMethod method);
-	ColourPickerActivity(ui::Colour initialColour, ColourPickedCallback * callback = NULL);
-	virtual ~ColourPickerActivity();
-	virtual void OnDraw();
-};