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

Merge branch 'gtk3' into gtk3-bugfix

Browse Source
This commit is contained in:
Hombre
2016-10-28 23:48:22 +02:00
parent 4d19b97109 b16ef8d1f5
commit e4e474ca8a
259 changed files with 5062 additions and 3653 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
rtgui/splash.cc
View File

@@ -78,7 +78,7 @@ bool SplashImage::on_draw(const ::Cairo::RefPtr< Cairo::Context> &cr)
Splash::Splash (Gtk::Window& parent) : Gtk::Dialog(M("GENERAL_ABOUT"), parent, true)
{
releaseNotesSW = NULL;
releaseNotesSW = nullptr;
nb = Gtk::manage (new Gtk::Notebook ());
get_content_area()->pack_start (*nb);
@@ -104,7 +104,7 @@ Splash::Splash (Gtk::Window& parent) : Gtk::Dialog(M("GENERAL_ABOUT"), parent, t
if ( Glib::file_test(buildFileName, (Glib::FILE_TEST_EXISTS)) ) {
FILE *f = g_fopen (buildFileName.c_str (), "rt");
if (f != NULL) {
if (f != nullptr) {
char* buffer = new char[1024];
std::ostringstream ostr;
@@ -135,7 +135,7 @@ Splash::Splash (Gtk::Window& parent) : Gtk::Dialog(M("GENERAL_ABOUT"), parent, t
if ( Glib::file_test(creditsFileName, (Glib::FILE_TEST_EXISTS)) ) {
FILE *f = g_fopen (creditsFileName.c_str (), "rt");
if (f != NULL) {
if (f != nullptr) {
char* buffer = new char[1024];
std::ostringstream ostr;
@@ -167,7 +167,7 @@ Splash::Splash (Gtk::Window& parent) : Gtk::Dialog(M("GENERAL_ABOUT"), parent, t
if ( Glib::file_test(licenseFileName, (Glib::FILE_TEST_EXISTS)) ) {
FILE *f = g_fopen (licenseFileName.c_str (), "rt");
if (f != NULL) {
if (f != nullptr) {
char* buffer = new char[1024];
std::ostringstream ostr;
@@ -200,7 +200,7 @@ Splash::Splash (Gtk::Window& parent) : Gtk::Dialog(M("GENERAL_ABOUT"), parent, t
if ( Glib::file_test(releaseNotesFileName, (Glib::FILE_TEST_EXISTS)) ) {
FILE *f = g_fopen (releaseNotesFileName.c_str (), "rt");
if (f != NULL) {
if (f != nullptr) {
char* buffer = new char[1024];
std::ostringstream ostr;