/[svn]/gigedit/trunk/src/gigedit/gigedit.cpp
ViewVC logotype

Diff of /gigedit/trunk/src/gigedit/gigedit.cpp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 3068 by schoenebeck, Mon Jan 2 22:13:01 2017 UTC revision 3364 by schoenebeck, Tue Nov 14 18:07:25 2017 UTC
# Line 17  Line 17 
17   * 02110-1301 USA.   * 02110-1301 USA.
18   */   */
19    
20  #include <glibmmconfig.h>  #include "compat.h"
21  // threads.h must be included first to be able to build with  // threads.h must be included first to be able to build with
22  // G_DISABLE_DEPRECATED  // G_DISABLE_DEPRECATED
23  #if (GLIBMM_MAJOR_VERSION == 2 && GLIBMM_MINOR_VERSION == 31 && GLIBMM_MICRO_VERSION >= 2) || \  #if (GLIBMM_MAJOR_VERSION == 2 && GLIBMM_MINOR_VERSION == 31 && GLIBMM_MICRO_VERSION >= 2) || \
# Line 27  Line 27 
27    
28  #include "gigedit.h"  #include "gigedit.h"
29    
 #include <gtkmmconfig.h>  
30  #if GTKMM_MAJOR_VERSION < 3  #if GTKMM_MAJOR_VERSION < 3
31  #include <gdkmm/region.h>  #include <gdkmm/region.h>
32  #endif  #endif
# Line 317  GigEdit::GigEdit() { Line 316  GigEdit::GigEdit() {
316  int GigEdit::run(int argc, char* argv[]) {  int GigEdit::run(int argc, char* argv[]) {
317      init_app();      init_app();
318    
319    #if GTKMM_MAJOR_VERSION < 3 || (GTKMM_MAJOR_VERSION == 3 && (GTKMM_MINOR_VERSION < 89 || (GTKMM_MINOR_VERSION == 89 && GTKMM_MICRO_VERSION < 4))) // GTKMM < 3.89.4
320      Gtk::Main kit(argc, argv);      Gtk::Main kit(argc, argv);
321    #else
322        Glib::RefPtr<Gtk::Application> app =
323            Gtk::Application::create("org.linuxsampler.gigedit");
324    #endif
325      init_app_after_gtk_init();      init_app_after_gtk_init();
326    
327      MainWindow window;      MainWindow window;
328      connect_signals(this, &window);      connect_signals(this, &window);
329      if (argc >= 2) window.load_file(argv[1]);      if (argc >= 2) window.load_file(argv[1]);
330    #if GTKMM_MAJOR_VERSION < 3 || (GTKMM_MAJOR_VERSION == 3 && (GTKMM_MINOR_VERSION < 89 || (GTKMM_MINOR_VERSION == 89 && GTKMM_MICRO_VERSION < 4))) // GTKMM < 3.89.4
331      kit.run(window);      kit.run(window);
332    #else
333        app->run(window, argc, argv);
334    #endif
335        
336      return 0;      return 0;
337  }  }
338    
# Line 439  void GigEditState::main_loop_run(Cond* i Line 448  void GigEditState::main_loop_run(Cond* i
448      int argc = 1;      int argc = 1;
449      const char* argv_c[] = { "gigedit" };      const char* argv_c[] = { "gigedit" };
450      char** argv = const_cast<char**>(argv_c);      char** argv = const_cast<char**>(argv_c);
451    #if GTKMM_MAJOR_VERSION < 3 || (GTKMM_MAJOR_VERSION == 3 && (GTKMM_MINOR_VERSION < 89 || (GTKMM_MINOR_VERSION == 89 && GTKMM_MICRO_VERSION < 4))) // GTKMM < 3.89.4
452      Gtk::Main main_loop(argc, argv);      Gtk::Main main_loop(argc, argv);
453    #endif
454      init_app_after_gtk_init();      init_app_after_gtk_init();
455    
456      dispatcher = new Glib::Dispatcher();      dispatcher = new Glib::Dispatcher();
457      dispatcher->connect(sigc::ptr_fun(&GigEditState::open_window_static));      dispatcher->connect(sigc::ptr_fun(&GigEditState::open_window_static));
458      initialized->signal();      initialized->signal();
459    
460    #if GTKMM_MAJOR_VERSION < 3 || (GTKMM_MAJOR_VERSION == 3 && (GTKMM_MINOR_VERSION < 89 || (GTKMM_MINOR_VERSION == 89 && GTKMM_MICRO_VERSION < 4))) // GTKMM < 3.89.4
461      main_loop.run();      main_loop.run();
462    #else
463        Gtk::Main::run();
464    #endif
465  }  }
466    
467  #if defined(__APPLE__)  #if defined(__APPLE__)
Legend:
Removed from v.3068  
changed lines
  Added in v.3364
  ViewVC Help
Powered by ViewVC