Merge branch 'master' into gtk3

This commit is contained in:
Morgan Hardwood
2016-10-11 22:08:49 +02:00
3 changed files with 11 additions and 37 deletions

View File

@@ -2562,8 +2562,10 @@ void CropWindow::setCropGUIListener (CropGUIListener* cgl)
void CropWindow::setPointerMotionListener (PointerMotionListener* pml)
{
pmlistener = pml;
pml->signal_cycle_rgb().connect( sigc::mem_fun(*this, &CropWindow::cycleRGB) );
pml->signal_cycle_hsv().connect( sigc::mem_fun(*this, &CropWindow::cycleHSV) );
if (pml) {
pml->signal_cycle_rgb().connect( sigc::mem_fun(*this, &CropWindow::cycleRGB) );
pml->signal_cycle_hsv().connect( sigc::mem_fun(*this, &CropWindow::cycleHSV) );
}
}
PointerMotionListener* CropWindow::getPointerMotionListener ()