Merge from default. Hope I did it right...

This commit is contained in:
Emil Martinec
2012-03-08 20:27:30 -06:00
parent 380728e1f0
commit f47b4b5bb0
262 changed files with 41736 additions and 37104 deletions

View File

@@ -19,6 +19,7 @@
#define _PREVIEWMODEPANEL_
#include <gtkmm.h>
#include "adjuster.h"//dev
class ImageArea;
class PreviewModePanel : public Gtk::HBox {
@@ -31,8 +32,15 @@ class PreviewModePanel : public Gtk::HBox {
Gtk::ToggleButton* previewFocusMask;
ImageArea* imageArea;
Gtk::Image* iR, *igR;
Gtk::Image* iG, *igG;
Gtk::Image* iB, *igB;
Gtk::Image* iL, *igL;
Gtk::Image* iF, *igF;
public:
PreviewModePanel (ImageArea* ia);
~PreviewModePanel();
void toggleR ();
void toggleG ();