summaryrefslogtreecommitdiffstats
path: root/ui/base/gtk
diff options
context:
space:
mode:
Diffstat (limited to 'ui/base/gtk')
-rw-r--r--ui/base/gtk/event_synthesis_gtk.h21
-rw-r--r--ui/base/gtk/focus_store_gtk.h4
-rw-r--r--ui/base/gtk/g_object_destructor_filo.h4
-rw-r--r--ui/base/gtk/gtk_expanded_container.h22
-rw-r--r--ui/base/gtk/gtk_floating_container.h8
-rw-r--r--ui/base/gtk/gtk_screen_util.h12
-rw-r--r--ui/base/gtk/gtk_signal_registrar.h4
-rw-r--r--ui/base/gtk/gtk_windowing.h4
-rw-r--r--ui/base/gtk/owned_widget_gtk.h4
-rw-r--r--ui/base/gtk/scoped_region.h4
10 files changed, 46 insertions, 41 deletions
diff --git a/ui/base/gtk/event_synthesis_gtk.h b/ui/base/gtk/event_synthesis_gtk.h
index 1839e29..0994f9f 100644
--- a/ui/base/gtk/event_synthesis_gtk.h
+++ b/ui/base/gtk/event_synthesis_gtk.h
@@ -13,24 +13,25 @@
#include <gdk/gdkkeysyms.h>
#include <vector>
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
#include "ui/events/keycodes/keyboard_codes.h"
namespace ui {
// Creates and returns a key event. Passes ownership to the caller.
-UI_EXPORT GdkEvent* SynthesizeKeyEvent(GdkWindow* event_window,
- bool press,
- guint gdk_key,
- guint state);
+UI_BASE_EXPORT 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.
-UI_EXPORT void SynthesizeKeyPressEvents(
- GdkWindow* window,
- KeyboardCode key,
- bool control, bool shift, bool alt,
- std::vector<GdkEvent*>* events);
+UI_BASE_EXPORT void SynthesizeKeyPressEvents(GdkWindow* window,
+ KeyboardCode key,
+ bool control,
+ bool shift,
+ bool alt,
+ std::vector<GdkEvent*>* events);
} // namespace ui
diff --git a/ui/base/gtk/focus_store_gtk.h b/ui/base/gtk/focus_store_gtk.h
index b0f420d..3274c01 100644
--- a/ui/base/gtk/focus_store_gtk.h
+++ b/ui/base/gtk/focus_store_gtk.h
@@ -6,13 +6,13 @@
#define UI_BASE_GTK_FOCUS_STORE_GTK_H_
#include "base/basictypes.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
typedef struct _GtkWidget GtkWidget;
namespace ui {
-class UI_EXPORT FocusStoreGtk {
+class UI_BASE_EXPORT FocusStoreGtk {
public:
FocusStoreGtk();
~FocusStoreGtk();
diff --git a/ui/base/gtk/g_object_destructor_filo.h b/ui/base/gtk/g_object_destructor_filo.h
index 76e41f7..14c9e5f 100644
--- a/ui/base/gtk/g_object_destructor_filo.h
+++ b/ui/base/gtk/g_object_destructor_filo.h
@@ -10,7 +10,7 @@
#include <map>
#include "base/basictypes.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
template <typename T> struct DefaultSingletonTraits;
@@ -48,7 +48,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 UI_EXPORT GObjectDestructorFILO {
+class UI_BASE_EXPORT GObjectDestructorFILO {
public:
typedef void (*DestructorHook)(void* context, GObject* where_the_object_was);
diff --git a/ui/base/gtk/gtk_expanded_container.h b/ui/base/gtk/gtk_expanded_container.h
index 63e3dbd..c136151 100644
--- a/ui/base/gtk/gtk_expanded_container.h
+++ b/ui/base/gtk/gtk_expanded_container.h
@@ -8,7 +8,7 @@
#include <gdk/gdk.h>
#include <gtk/gtk.h>
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
// A specialized container derived from GtkFixed, which expands the size of its
// children to fill the container, in one or both directions. The usage of this
@@ -57,16 +57,20 @@ struct _GtkExpandedContainerClass {
GtkFixedClass parent_class;
};
-UI_EXPORT GType gtk_expanded_container_get_type() G_GNUC_CONST;
-UI_EXPORT GtkWidget* gtk_expanded_container_new();
-UI_EXPORT void gtk_expanded_container_put(GtkExpandedContainer* container,
- GtkWidget* widget, gint x, gint y);
-UI_EXPORT void gtk_expanded_container_move(GtkExpandedContainer* container,
- GtkWidget* widget, gint x, gint y);
-UI_EXPORT void gtk_expanded_container_set_has_window(
+UI_BASE_EXPORT GType gtk_expanded_container_get_type() G_GNUC_CONST;
+UI_BASE_EXPORT GtkWidget* gtk_expanded_container_new();
+UI_BASE_EXPORT void gtk_expanded_container_put(GtkExpandedContainer* container,
+ GtkWidget* widget,
+ gint x,
+ gint y);
+UI_BASE_EXPORT void gtk_expanded_container_move(GtkExpandedContainer* container,
+ GtkWidget* widget,
+ gint x,
+ gint y);
+UI_BASE_EXPORT void gtk_expanded_container_set_has_window(
GtkExpandedContainer* container,
gboolean has_window);
-UI_EXPORT gboolean gtk_expanded_container_get_has_window(
+UI_BASE_EXPORT gboolean gtk_expanded_container_get_has_window(
GtkExpandedContainer* container);
G_END_DECLS
diff --git a/ui/base/gtk/gtk_floating_container.h b/ui/base/gtk/gtk_floating_container.h
index 2d68edd..0d91a83 100644
--- a/ui/base/gtk/gtk_floating_container.h
+++ b/ui/base/gtk/gtk_floating_container.h
@@ -8,7 +8,7 @@
#include <gdk/gdk.h>
#include <gtk/gtk.h>
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
// A specialized container, which is a cross between a GtkBin and a
// GtkFixed. This container dervies from GtkBin and the implementation of
@@ -76,9 +76,9 @@ struct _GtkFloatingContainerChild {
gint y;
};
-UI_EXPORT GType gtk_floating_container_get_type() G_GNUC_CONST;
-UI_EXPORT GtkWidget* gtk_floating_container_new();
-UI_EXPORT void gtk_floating_container_add_floating(
+UI_BASE_EXPORT GType gtk_floating_container_get_type() G_GNUC_CONST;
+UI_BASE_EXPORT GtkWidget* gtk_floating_container_new();
+UI_BASE_EXPORT void gtk_floating_container_add_floating(
GtkFloatingContainer* container,
GtkWidget* widget);
// Use gtk_container_remove to remove all widgets; both widgets added with
diff --git a/ui/base/gtk/gtk_screen_util.h b/ui/base/gtk/gtk_screen_util.h
index b916cf2..c3a7f2c 100644
--- a/ui/base/gtk/gtk_screen_util.h
+++ b/ui/base/gtk/gtk_screen_util.h
@@ -7,7 +7,7 @@
#include <gtk/gtk.h>
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
#include "ui/gfx/point.h"
#include "ui/gfx/rect.h"
#include "ui/gfx/vector2d.h"
@@ -15,19 +15,19 @@
namespace ui {
// Returns true if the screen is composited, false otherwise.
-UI_EXPORT bool IsScreenComposited();
+UI_BASE_EXPORT bool IsScreenComposited();
// Get the current location of the mouse cursor relative to the screen.
-UI_EXPORT gfx::Point ScreenPoint(GtkWidget* widget);
+UI_BASE_EXPORT gfx::Point ScreenPoint(GtkWidget* widget);
// Get the current location of the mouse cursor relative to the widget.
-UI_EXPORT gfx::Point ClientPoint(GtkWidget* widget);
+UI_BASE_EXPORT gfx::Point ClientPoint(GtkWidget* widget);
// Gets the offset of a gtk widget from the origin in screen coordinates.
-UI_EXPORT gfx::Vector2d GetWidgetScreenOffset(GtkWidget* widget);
+UI_BASE_EXPORT gfx::Vector2d GetWidgetScreenOffset(GtkWidget* widget);
// Returns the bounds of the specified widget in screen coordinates.
-UI_EXPORT gfx::Rect GetWidgetScreenBounds(GtkWidget* widget);
+UI_BASE_EXPORT gfx::Rect GetWidgetScreenBounds(GtkWidget* widget);
} // namespace ui
diff --git a/ui/base/gtk/gtk_signal_registrar.h b/ui/base/gtk/gtk_signal_registrar.h
index 2fa839c..37b8710 100644
--- a/ui/base/gtk/gtk_signal_registrar.h
+++ b/ui/base/gtk/gtk_signal_registrar.h
@@ -10,7 +10,7 @@
#include <vector>
#include "base/basictypes.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
typedef void (*GCallback) (void);
typedef struct _GObject GObject;
@@ -37,7 +37,7 @@ namespace ui {
//
// When |signals_| goes down, it will disconnect the handlers connected via
// Connect.
-class UI_EXPORT GtkSignalRegistrar {
+class UI_BASE_EXPORT GtkSignalRegistrar {
public:
GtkSignalRegistrar();
~GtkSignalRegistrar();
diff --git a/ui/base/gtk/gtk_windowing.h b/ui/base/gtk/gtk_windowing.h
index 93a9335..8510779 100644
--- a/ui/base/gtk/gtk_windowing.h
+++ b/ui/base/gtk/gtk_windowing.h
@@ -7,12 +7,12 @@
#include <gtk/gtk.h>
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
namespace ui {
// Stacks a |popup| window directly on top of a |toplevel| window.
-UI_EXPORT void StackPopupWindow(GtkWidget* popup, GtkWidget* toplevel);
+UI_BASE_EXPORT void StackPopupWindow(GtkWidget* popup, GtkWidget* toplevel);
} // namespace ui
diff --git a/ui/base/gtk/owned_widget_gtk.h b/ui/base/gtk/owned_widget_gtk.h
index ba3068c..9a1166b 100644
--- a/ui/base/gtk/owned_widget_gtk.h
+++ b/ui/base/gtk/owned_widget_gtk.h
@@ -50,13 +50,13 @@
#define UI_BASE_GTK_OWNED_WIDGET_GTK_H_
#include "base/basictypes.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
typedef struct _GtkWidget GtkWidget;
namespace ui {
-class UI_EXPORT OwnedWidgetGtk {
+class UI_BASE_EXPORT OwnedWidgetGtk {
public:
// Create an instance that isn't managing any ownership.
OwnedWidgetGtk() : widget_(NULL) { }
diff --git a/ui/base/gtk/scoped_region.h b/ui/base/gtk/scoped_region.h
index faa7e81..e7a690f 100644
--- a/ui/base/gtk/scoped_region.h
+++ b/ui/base/gtk/scoped_region.h
@@ -6,7 +6,7 @@
#define UI_BASE_GTK_SCOPED_REGION_H_
#include "base/basictypes.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
typedef struct _GdkRegion GdkRegion;
@@ -14,7 +14,7 @@ namespace ui {
// Wraps a GdkRegion. This class provides the same methods as ScopedGDIObject in
// base/win/scoped_gdi_object.h.
-class UI_EXPORT ScopedRegion {
+class UI_BASE_EXPORT ScopedRegion {
public:
ScopedRegion();
explicit ScopedRegion(GdkRegion* region);
generated by cgit v1.1 at 2025-05-18 05:55:03 +0000