ardour/livetrax
13
0
Fork 0
Code

Merge branch 'windows+cc' into cairocanvas

Browse Source
This commit is contained in:
John Emmas 2014-01-20 18:18:21 +00:00
commit 25a6296f86
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libs/gtkmm2ext/gtkmm2ext/dndtreeview.h
View File

@ -31,7 +31,7 @@
namespace Gtkmm2ext {
template<class DataType>
struct LIBGTKMM2EXT_API SerializedObjectPointers {
struct /*LIBGTKMM2EXT_API*/ SerializedObjectPointers {
uint32_t size;
uint32_t cnt;
char type[32];
@ -89,7 +89,7 @@ class LIBGTKMM2EXT_API DnDTreeViewBase : public Gtk::TreeView
};
template<class DataType>
class LIBGTKMM2EXT_API DnDTreeView : public DnDTreeViewBase
class /*LIBGTKMM2EXT_API*/ DnDTreeView : public DnDTreeViewBase
{
public:
DnDTreeView() {}

4
libs/gtkmm2ext/gtkmm2ext/dndvbox.h
View File

@ -25,7 +25,7 @@
namespace Gtkmm2ext {
/** Parent class for children of a DnDVBox */
class LIBGTKMM2EXT_API DnDVBoxChild
class /*LIBGTKMM2EXT_API*/ DnDVBoxChild
{
public:
virtual ~DnDVBoxChild () {}
@ -45,7 +45,7 @@ public:
/** A VBox whose contents can be dragged and dropped */
template <class T>
class LIBGTKMM2EXT_API DnDVBox : public Gtk::EventBox
class /*LIBGTKMM2EXT_API*/ DnDVBox : public Gtk::EventBox
{
public:
DnDVBox () : _active (0), _drag_icon (0), _expecting_unwanted_button_event (false), _placeholder (0)

6
libs/gtkmm2ext/gtkmm2ext/doi.h
View File

@ -30,11 +30,11 @@
/* XXX g++ 2.95 can't compile this as pair of member function templates */
template<typename T> LIBGTKMM2EXT_API gint idle_delete (T *obj) { delete obj; return FALSE; }
template<typename T> LIBGTKMM2EXT_API void delete_when_idle (T *obj) {
template<typename T> /*LIBGTKMM2EXT_API*/ gint idle_delete (T *obj) { delete obj; return FALSE; }
template<typename T> /*LIBGTKMM2EXT_API*/ void delete_when_idle (T *obj) {
Glib::signal_idle().connect (sigc::bind (sigc::ptr_fun (idle_delete<T>), obj));
}
template<typename T> LIBGTKMM2EXT_API gint delete_on_unmap (GdkEventAny *ignored, T *obj) {
template<typename T> /*LIBGTKMM2EXT_API*/ gint delete_on_unmap (GdkEventAny *ignored, T *obj) {
Glib::signal_idle().connect (sigc::bind (sigc::ptr_fun (idle_delete<T>), obj));
return FALSE;
}

2
libs/gtkmm2ext/gtkmm2ext/utils.h
View File

@ -79,7 +79,7 @@ namespace Gtkmm2ext {
LIBGTKMM2EXT_API void set_popdown_strings (Gtk::ComboBoxText&,
const std::vector<std::string>&);
template<class T> LIBGTKMM2EXT_API void deferred_delete (void *ptr) {
template<class T> /*LIBGTKMM2EXT_API*/ void deferred_delete (void *ptr) {
delete static_cast<T *> (ptr);
}