Commit 5d23ce5f authored by Davis King's avatar Davis King

Renamed stuff so that this still compiles

--HG--
extra : convert_revision : svn%3Afdd8eb12-d10e-0410-9acb-85c331704f74/trunk%402604
parent 9585b55e
...@@ -28,7 +28,7 @@ typedef dlib::array2d<hsi_pixel>::kernel_1a_c image; ...@@ -28,7 +28,7 @@ typedef dlib::array2d<hsi_pixel>::kernel_1a_c image;
class color_box : public dragable class color_box : public draggable
{ {
unsigned char red, green,blue; unsigned char red, green,blue;
...@@ -40,7 +40,7 @@ public: ...@@ -40,7 +40,7 @@ public:
unsigned char green_, unsigned char green_,
unsigned char blue_ unsigned char blue_
) : ) :
dragable(w, MOUSE_WHEEL), draggable(w, MOUSE_WHEEL),
red(red_), red(red_),
green(green_), green(green_),
blue(blue_), blue(blue_),
...@@ -51,7 +51,7 @@ public: ...@@ -51,7 +51,7 @@ public:
t.set_delay_time(4); t.set_delay_time(4);
// t.start(); // t.start();
set_dragable_area(rectangle(10,10,500,500)); set_draggable_area(rectangle(10,10,500,500));
enable_events(); enable_events();
} }
...@@ -122,7 +122,7 @@ private: ...@@ -122,7 +122,7 @@ private:
void on_window_resized () void on_window_resized ()
{ {
dragable::on_window_resized(); draggable::on_window_resized();
} }
timer<color_box>::kernel_1a t; timer<color_box>::kernel_1a t;
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment