add API to query Gtk::ComboBoxText entries

[ardour.git] / libs / gtkmm2ext / gtkmm2ext / visibility.h

diff --git a/libs/gtkmm2ext/gtkmm2ext/visibility.h b/libs/gtkmm2ext/gtkmm2ext/visibility.h
index ce2d3e6e422520f5a063a6cba35674196d624986..902e94d779fe0c42b2fd844659879db2a9c2d063 100644 (file)
--- a/libs/gtkmm2ext/gtkmm2ext/visibility.h
+++ b/libs/gtkmm2ext/gtkmm2ext/visibility.h
@@ -20,37 +20,26 @@
 #ifndef __libgtkmm2ext_visibility_h__
 #define __libgtkmm2ext_visibility_h__
 
-/* _WIN32 is defined by most compilers targetting Windows, but within the
- * gtkmm2ext source tree, we also define COMPILER_MSVC or COMPILER_MINGW depending
- * on how a Windows build is built.
- */
-
-#if defined _WIN32 || defined __CYGWIN__ || defined(COMPILER_MSVC) || defined(COMPILER_MINGW)
+#if defined(COMPILER_MSVC)
   #define LIBGTKMM2EXT_DLL_IMPORT __declspec(dllimport)
   #define LIBGTKMM2EXT_DLL_EXPORT __declspec(dllexport)
   #define LIBGTKMM2EXT_DLL_LOCAL
 #else
-  #if __GNUC__ >= 4
-    #define LIBGTKMM2EXT_DLL_IMPORT __attribute__ ((visibility ("default")))
-    #define LIBGTKMM2EXT_DLL_EXPORT __attribute__ ((visibility ("default")))
-    #define LIBGTKMM2EXT_DLL_LOCAL  __attribute__ ((visibility ("hidden")))
-  #else
-    #define LIBGTKMM2EXT_DLL_IMPORT
-    #define LIBGTKMM2EXT_DLL_EXPORT
-    #define LIBGTKMM2EXT_DLL_LOCAL
-  #endif
+  #define LIBGTKMM2EXT_DLL_IMPORT __attribute__ ((visibility ("default")))
+  #define LIBGTKMM2EXT_DLL_EXPORT __attribute__ ((visibility ("default")))
+  #define LIBGTKMM2EXT_DLL_LOCAL  __attribute__ ((visibility ("hidden")))
 #endif
 
-#ifdef LIBGTKMM2EXT_DLL // libgtkmm2ext is a DLL
-#ifdef LIBGTKMM2EXT_DLL_EXPORTS // defined if we are building the libgtkmm2ext DLL (instead of using it)
-    #define LIBGTKMM2EXT_API LIBGTKMM2EXT_DLL_EXPORT
+#ifdef LIBGTKMM2EXT_STATIC // libgtkmm2ext is a DLL
+  #define LIBGTKMM2EXT_API
+  #define LIBGTKMM2EXT_LOCAL
 #else
-    #define LIBGTKMM2EXT_API LIBGTKMM2EXT_DLL_IMPORT
-#endif 
-#define     LIBGTKMM2EXT_LOCAL LIBGTKMM2EXT_DLL_LOCAL
-#else /* static lib, not DLL */
-#define LIBGTKMM2EXT_API
-#define LIBGTKMM2EXT_LOCAL
+  #ifdef LIBGTKMM2EXT_DLL_EXPORTS // defined if we are building the libgtkmm2ext DLL (instead of using it)
+     #define LIBGTKMM2EXT_API LIBGTKMM2EXT_DLL_EXPORT
+  #else
+     #define LIBGTKMM2EXT_API LIBGTKMM2EXT_DLL_IMPORT
+  #endif 
+  #define     LIBGTKMM2EXT_LOCAL LIBGTKMM2EXT_DLL_LOCAL
 #endif
 
 #endif /* __libgtkmm2ext_visibility_h__ */