diff options
-rw-r--r-- | ui/base/dragdrop/os_exchange_data_provider_gtk.h | 2 | ||||
-rw-r--r-- | ui/base/gtk/event_synthesis_gtk.h | 8 | ||||
-rw-r--r-- | ui/base/gtk/g_object_destructor_filo.h | 3 | ||||
-rw-r--r-- | ui/base/keycodes/keyboard_code_conversion_gtk.h | 2 | ||||
-rw-r--r-- | ui/base/keycodes/keyboard_code_conversion_x.h | 5 | ||||
-rw-r--r-- | ui/base/x/x11_util.h | 7 | ||||
-rw-r--r-- | ui/gfx/platform_font_gtk.h | 2 |
7 files changed, 16 insertions, 13 deletions
diff --git a/ui/base/dragdrop/os_exchange_data_provider_gtk.h b/ui/base/dragdrop/os_exchange_data_provider_gtk.h index 443e69b..840b956 100644 --- a/ui/base/dragdrop/os_exchange_data_provider_gtk.h +++ b/ui/base/dragdrop/os_exchange_data_provider_gtk.h @@ -25,7 +25,7 @@ namespace ui { // types can be set on OSExchangeDataProviderGtk by way of the various setters. // The various has methods return true if the format was supplied to the // constructor, or explicitly set. -class OSExchangeDataProviderGtk : public OSExchangeData::Provider { +class UI_API OSExchangeDataProviderGtk : public OSExchangeData::Provider { public: OSExchangeDataProviderGtk(int known_formats, const std::set<GdkAtom>& known_custom_formats_); diff --git a/ui/base/gtk/event_synthesis_gtk.h b/ui/base/gtk/event_synthesis_gtk.h index da1257c..93ba86ca 100644 --- a/ui/base/gtk/event_synthesis_gtk.h +++ b/ui/base/gtk/event_synthesis_gtk.h @@ -20,10 +20,10 @@ namespace ui { // Creates and returns a key event. Passes ownership to the caller. -GdkEvent* SynthesizeKeyEvent(GdkWindow* event_window, - bool press, - guint gdk_key, - guint state); +UI_API GdkEvent* SynthesizeKeyEvent(GdkWindow* event_window, + bool press, + guint gdk_key, + guint state); // Creates the proper sequence of key events for a key press + release. // Ownership of the events in the vector is passed to the caller. diff --git a/ui/base/gtk/g_object_destructor_filo.h b/ui/base/gtk/g_object_destructor_filo.h index 90e7597..0297a8c 100644 --- a/ui/base/gtk/g_object_destructor_filo.h +++ b/ui/base/gtk/g_object_destructor_filo.h @@ -11,6 +11,7 @@ #include <list> #include "base/memory/singleton.h" +#include "ui/ui_api.h" typedef struct _GObject GObject; @@ -46,7 +47,7 @@ namespace ui { // TODO(glotov): Probably worth adding ScopedGObjectDtor<T>. // // This class is a singleton. Not thread safe. Must be called within UI thread. -class GObjectDestructorFILO { +class UI_API GObjectDestructorFILO { public: typedef void (*DestructorHook)(void* context, GObject* where_the_object_was); diff --git a/ui/base/keycodes/keyboard_code_conversion_gtk.h b/ui/base/keycodes/keyboard_code_conversion_gtk.h index d0fcfb6..de17841 100644 --- a/ui/base/keycodes/keyboard_code_conversion_gtk.h +++ b/ui/base/keycodes/keyboard_code_conversion_gtk.h @@ -48,7 +48,7 @@ UI_API KeyboardCode WindowsKeyCodeForGdkKeyCode(int keycode); UI_API int GdkKeyCodeForWindowsKeyCode(KeyboardCode keycode, bool shift); -KeyboardCode KeyboardCodeFromGdkEventKey(GdkEventKey* event); +UI_API KeyboardCode KeyboardCodeFromGdkEventKey(GdkEventKey* event); } // namespace ui diff --git a/ui/base/keycodes/keyboard_code_conversion_x.h b/ui/base/keycodes/keyboard_code_conversion_x.h index 5611c53..c3d0f83 100644 --- a/ui/base/keycodes/keyboard_code_conversion_x.h +++ b/ui/base/keycodes/keyboard_code_conversion_x.h @@ -6,14 +6,15 @@ #define UI_BASE_KEYCODES_KEYBOARD_CODE_CONVERSION_X_H_ #include "ui/base/keycodes/keyboard_codes_posix.h" +#include "ui/ui_api.h" typedef union _XEvent XEvent; namespace ui { -KeyboardCode KeyboardCodeFromXKeyEvent(XEvent* xev); +UI_API KeyboardCode KeyboardCodeFromXKeyEvent(XEvent* xev); -KeyboardCode KeyboardCodeFromXKeysym(unsigned int keysym); +UI_API KeyboardCode KeyboardCodeFromXKeysym(unsigned int keysym); // Converts a hardware keycode into a key symbol on a standard US PC keyboard. unsigned int DefaultXKeysymFromHardwareKeycode(unsigned int keycode); diff --git a/ui/base/x/x11_util.h b/ui/base/x/x11_util.h index 1e287dd..ab455a0 100644 --- a/ui/base/x/x11_util.h +++ b/ui/base/x/x11_util.h @@ -81,9 +81,10 @@ UI_API bool GetWindowRect(XID window, gfx::Rect* rect); UI_API bool PropertyExists(XID window, const std::string& property_name); // Get the value of an int, int array, atom array or string property. On // success, true is returned and the value is stored in |value|. -bool GetIntProperty(XID window, const std::string& property_name, int* value); -bool GetIntArrayProperty(XID window, const std::string& property_name, - std::vector<int>* value); +UI_API bool GetIntProperty(XID window, const std::string& property_name, + int* value); +UI_API bool GetIntArrayProperty(XID window, const std::string& property_name, + std::vector<int>* value); UI_API bool GetAtomArrayProperty(XID window, const std::string& property_name, std::vector<Atom>* value); UI_API bool GetStringProperty( diff --git a/ui/gfx/platform_font_gtk.h b/ui/gfx/platform_font_gtk.h index 2159752..da47828 100644 --- a/ui/gfx/platform_font_gtk.h +++ b/ui/gfx/platform_font_gtk.h @@ -15,7 +15,7 @@ class SkPaint; namespace gfx { -class PlatformFontGtk : public PlatformFont { +class UI_API PlatformFontGtk : public PlatformFont { public: PlatformFontGtk(); explicit PlatformFontGtk(const Font& other); |