--- gigedit/trunk/src/gigedit/mainwindow.cpp	2011/08/19 10:55:41	2246
+++ gigedit/trunk/src/gigedit/mainwindow.cpp	2013/01/07 20:41:16	2392
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2011 Andreas Persson
+ * Copyright (C) 2006-2013 Andreas Persson
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -20,6 +20,10 @@
 #include <iostream>
 #include <cstring>
 
+#include <glibmm/convert.h>
+#include <glibmm/dispatcher.h>
+#include <glibmm/miscutils.h>
+#include <glibmm/stringutils.h>
 #include <gtkmm/aboutdialog.h>
 #include <gtkmm/filechooserdialog.h>
 #include <gtkmm/messagedialog.h>
@@ -28,7 +32,9 @@
 #include <gtkmm/main.h>
 #include <gtkmm/radiomenuitem.h>
 #include <gtkmm/toggleaction.h>
+#if GTKMM_MAJOR_VERSION < 3
 #include "wrapLabel.hh"
+#endif
 
 #include "global.h"
 #include "compat.h"
@@ -461,7 +467,7 @@
 void Loader::progress_callback(float fraction)
 {
     {
-        Glib::Mutex::Lock lock(progressMutex);
+        Glib::Threads::Mutex::Lock lock(progressMutex);
         progress = fraction;
     }
     progress_dispatcher();
@@ -469,7 +475,7 @@
 
 void Loader::thread_function()
 {
-    printf("thread_function self=%x\n", Glib::Thread::self());
+    printf("thread_function self=%x\n", Glib::Threads::Thread::self());
     printf("Start %s\n", filename);
     RIFF::File* riff = new RIFF::File(filename);
     gig = new gig::File(riff);
@@ -489,7 +495,11 @@
 
 void Loader::launch()
 {
+#ifdef OLD_THREADS
     thread = Glib::Thread::create(sigc::mem_fun(*this, &Loader::thread_function), true);
+#else
+    thread = Glib::Threads::Thread::create(sigc::mem_fun(*this, &Loader::thread_function));
+#endif
     printf("launch thread=%x\n", thread);
 }
 
@@ -497,7 +507,7 @@
 {
     float res;
     {
-        Glib::Mutex::Lock lock(progressMutex);
+        Glib::Threads::Mutex::Lock lock(progressMutex);
         res = progress;
     }
     return res;
@@ -617,7 +627,7 @@
     if (dialog.run() == Gtk::RESPONSE_OK) {
         std::string filename = dialog.get_filename();
         printf("filename=%s\n", filename.c_str());
-        printf("on_action_file_open self=%x\n", Glib::Thread::self());
+        printf("on_action_file_open self=%x\n", Glib::Threads::Thread::self());
         load_file(filename.c_str());
         current_gig_dir = Glib::path_get_dirname(filename);
     }
@@ -659,7 +669,7 @@
 void MainWindow::on_loader_finished()
 {
     printf("Loader finished!\n");
-    printf("on_loader_finished self=%x\n", Glib::Thread::self());
+    printf("on_loader_finished self=%x\n", Glib::Threads::Thread::self());
     load_gig(loader->gig, loader->filename);
     load_dialog->hide();
 }
@@ -762,7 +772,12 @@
     descriptionArea.set_spacing(15);
     Gtk::Image warningIcon(Gtk::Stock::DIALOG_WARNING, Gtk::IconSize(Gtk::ICON_SIZE_DIALOG));
     descriptionArea.pack_start(warningIcon, Gtk::PACK_SHRINK);
+#if GTKMM_MAJOR_VERSION < 3
     view::WrapLabel description;
+#else
+    Gtk::Label description;
+    description.set_line_wrap();
+#endif
     description.set_markup(
         _("\n<b>CAUTION:</b> You <b>MUST</b> use the "
           "<span style=\"italic\">\"Save\"</span> dialog instead of "
@@ -911,7 +926,7 @@
     dialog.set_name("Gigedit");
 #endif
     dialog.set_version(VERSION);
-    dialog.set_copyright("Copyright (C) 2006-2011 Andreas Persson");
+    dialog.set_copyright("Copyright (C) 2006-2013 Andreas Persson");
     dialog.set_comments(_(
         "Released under the GNU General Public License.\n"
         "\n"
@@ -1549,7 +1564,7 @@
     if (!file) return;
     Gtk::FileChooserDialog dialog(*this, _("Select Folder"),
                                   Gtk::FILE_CHOOSER_ACTION_SELECT_FOLDER);
-    view::WrapLabel description(
+    const char* str = 
         _("This is a very specific function. It tries to replace all samples "
           "in the current gig file by samples located in the chosen "
           "directory.\n\n"
@@ -1563,8 +1578,13 @@
           "the sample in the gig file accordingly. If you don't need an "
           "extension, blank the field below. Any gig sample where no "
           "appropriate sample file could be found will be reported and left "
-          "untouched.\n")
-    );
+          "untouched.\n");
+#if GTKMM_MAJOR_VERSION < 3
+    view::WrapLabel description(str);
+#else
+    Gtk::Label description(str);
+    description.set_line_wrap();
+#endif
     Gtk::HBox entryArea;
     Gtk::Label entryLabel( _("Add filename extension: "), Gtk::ALIGN_START);
     Gtk::Entry postfixEntryBox;