liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'gtk3' of https://github.com/Beep6581/RawTherapee.git into

Browse Source 
gtk3

Conflicts:
	rtgui/history.cc
This commit is contained in:
Hombre
2015-09-17 01:14:13 +02:00
parent d2fcabea64 b869c052a4
commit e68a650511
22 changed files with 128 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
rtgui/history.cc
View File

@@ -38,8 +38,13 @@ History::History (bool bookmarkSupport) : blistener(NULL), tpc (NULL), bmnum (1)
// History List
// ~~~~~~~~~~~~
<<<<<<< HEAD
Gtk::ScrolledWindow* hscrollw = Gtk::manage (new Gtk::ScrolledWindow ());
hscrollw->set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC);
=======
hscrollw = Gtk::manage (new Gtk::ScrolledWindow ());
hscrollw->set_policy (Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
>>>>>>> branch 'gtk3' of https://github.com/Beep6581/RawTherapee.git
Gtk::Frame* histFrame = Gtk::manage (new Gtk::Frame (M("HISTORY_LABEL")));
histFrame->add (*hscrollw);