smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-22 21:27:22 +01:00
Code Issues Projects Releases Wiki Activity

remove critical use of Glib::ustring

Browse source 
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@10005 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2011-08-18 17:33:48 +00:00
parent 52537effeb
commit 115934e6ab
2 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
libs/gtkmm2ext/gtkapplication_quartz.mm
View file

@ -1373,7 +1373,7 @@ gtk_application_add_app_menu_item (GtkApplicationMenuGroup *group,
namespace Gtk {
namespace Application {
sigc::signal<void,bool> ActivationChanged;
sigc::signal<void,const Glib::ustring&> ShouldLoad;
sigc::signal<void,const std::string&> ShouldLoad;
sigc::signal<void> ShouldQuit;
}
}
@ -1420,7 +1420,7 @@ namespace Gtk {
@implementation GtkApplicationDelegate
-(BOOL) application:(NSApplication*) theApplication openFile:(NSString*) file
{
Glib::ustring utf8_path ([file UTF8String]);
std::string utf8_path ([file UTF8String]);
Gtkmm2ext::Application::instance()->ShouldLoad (utf8_path);
return 1;
}

7
libs/gtkmm2ext/gtkmm2ext/application.h
View file

@ -22,6 +22,7 @@
#ifndef __GTK_APPLICATION_MM_H__
#define __GTK_APPLICATION_MM_H__
#include <string>
#include <gtkmm2ext/gtkapplication.h> // for GtkApplicationGroup typedef
#include <sigc++/signal.h>
@ -30,10 +31,6 @@ namespace Gtk {
class MenuShell;
}
namespace Glib {
class ustring;
}
namespace Gtkmm2ext {
class Application
@ -49,7 +46,7 @@ public:
void add_app_menu_item (GtkApplicationMenuGroup*, Gtk::MenuItem*);
sigc::signal<void,bool> ActivationChanged;
sigc::signal<void,const Glib::ustring&> ShouldLoad;
sigc::signal<void,const std::string&> ShouldLoad;
sigc::signal<void> ShouldQuit;
private: