Made GtkBubble/SelectionWindow private at the moment

diff --git a/docs/reference/gtk/gtk-docs.sgml b/docs/reference/gtk/gtk-docs.sgml
index 40b5b112f247a3387e948b4f793d3f4eca07e217..6260fb8cfc8cdfd67722dcadbccfa4013e8e4ca0 100644 (file)
--- a/docs/reference/gtk/gtk-docs.sgml
+++ b/docs/reference/gtk/gtk-docs.sgml
@@ -89,8 +89,6 @@
       <xi:include href="xml/gtkaboutdialog.xml" />
       <xi:include href="xml/gtkassistant.xml" />
       <xi:include href="xml/gtkoffscreenwindow.xml" />
-      <xi:include href="xml/gtkbubblewindow.xml" />
-      <xi:include href="xml/gtkselectionwindow.xml" />
     </chapter>
 
     <chapter id="DisplayWidgets">

diff --git a/docs/reference/gtk/gtk3-sections.txt b/docs/reference/gtk/gtk3-sections.txt
index 228bda49c4768cf7171b712c951540630e339b7d..5db1c72c3bcde5d243b3cf2601fc7e96b68ee249 100644 (file)
--- a/docs/reference/gtk/gtk3-sections.txt
+++ b/docs/reference/gtk/gtk3-sections.txt
@@ -7494,54 +7494,3 @@ GTK_COLOR_CHOOSER_DIALOG_GET_CLASS
 GtkColorChooserDialogPrivate
 gtk_color_chooser_dialog_get_type
 </SECTION>
-
-<SECTION>
-<FILE>gtkbubblewindow</FILE>
-<TITLE>GtkBubbleWindow</TITLE>
-GtkBubbleWindow
-gtk_bubble_window_new
-gtk_bubble_window_set_relative_to
-gtk_bubble_window_get_relative_to
-gtk_bubble_window_set_pointing_to
-gtk_bubble_window_get_pointing_to
-gtk_bubble_window_set_position
-gtk_bubble_window_get_position
-gtk_bubble_window_popup
-gtk_bubble_window_popdown
-gtk_bubble_window_grab
-gtk_bubble_window_ungrab
-
-<SUBSECTION Standard>
-GTK_TYPE_BUBBLE_WINDOW
-GTK_BUBBLE_WINDOW
-GTK_BUBBLE_WINDOW_CLASS
-GTK_IS_BUBBLE_WINDOW
-GTK_IS_BUBBLE_WINDOW_CLASS
-GTK_BUBBLE_WINDOW_GET_CLASS
-
-<SUBSECTION Private>
-gtk_bubble_window_get_type
-</SECTION>
-
-<SECTION>
-<FILE>gtkselectionwindow</FILE>
-<TITLE>GtkSelectionWindow</TITLE>
-GtkSelectionWindow
-gtk_selection_window_new
-gtk_selection_window_set_editable
-gtk_selection_window_get_editable
-gtk_selection_window_set_has_selection
-gtk_selection_window_get_has_selection
-gtk_selection_window_get_toolbar
-
-<SUBSECTION Standard>
-GTK_TYPE_SELECTION_WINDOW
-GTK_SELECTION_WINDOW
-GTK_SELECTION_WINDOW_CLASS
-GTK_IS_SELECTION_WINDOW
-GTK_IS_SELECTION_WINDOW_CLASS
-GTK_SELECTION_WINDOW_GET_CLASS
-
-<SUBSECTION Private>
-gtk_selection_window_get_type
-</SECTION>

diff --git a/docs/reference/gtk/gtk3.types.in b/docs/reference/gtk/gtk3.types.in
index 7abc07d4ddace4e645803081806b5b8e08b149f8..3f378b3b226de2e6807097ede58a360bc4201319 100644 (file)
--- a/docs/reference/gtk/gtk3.types.in
+++ b/docs/reference/gtk/gtk3.types.in
@@ -23,7 +23,6 @@ gtk_aspect_frame_get_type
 gtk_assistant_get_type
 gtk_bin_get_type
 gtk_box_get_type
-gtk_bubble_window_get_type
 gtk_builder_get_type
 gtk_buildable_get_type
 gtk_button_box_get_type
@@ -147,7 +146,6 @@ gtk_scrollable_get_type
 gtk_scrollbar_get_type
 gtk_scrolled_window_get_type
 gtk_search_entry_get_type
-gtk_selection_window_get_type
 gtk_separator_get_type
 gtk_separator_menu_item_get_type
 gtk_separator_tool_item_get_type

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index f9797c5d4f53ef9c4175c9d03a7ddf69f6ad830b..14feeacdd32fdc8568a8a9e51c75c2f28268e905 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -202,7 +202,6 @@ gtk_public_h_sources =              \
        gtkbindings.h           \
        gtkborder.h             \
        gtkbox.h                \
-       gtkbubblewindow.h       \
        gtkbuilder.h            \
        gtkbuildable.h          \
        gtkbutton.h             \
@@ -320,7 +319,6 @@ gtk_public_h_sources =              \
        gtkscrolledwindow.h     \
        gtksearchentry.h        \
        gtkselection.h          \
-       gtkselectionwindow.h    \
        gtkseparator.h          \
        gtkseparatormenuitem.h  \
        gtkseparatortoolitem.h  \
@@ -424,6 +422,7 @@ gtk_private_h_sources =             \
        gtkbitmaskprivateimpl.h \
        gtkborderimageprivate.h \
        gtkboxprivate.h         \
+       gtkbubblewindowprivate.h        \
        gtkbuilderprivate.h     \
        gtkbuttonprivate.h      \
        gtkcairoblurprivate.h   \
@@ -524,6 +523,7 @@ gtk_private_h_sources =             \
        gtksearchengine.h       \
        gtksearchenginesimple.h \
        gtkselectionprivate.h   \
+       gtkselectionwindowprivate.h     \
        gtksettingsprivate.h    \
        gtksizegroup-private.h  \
        gtksizerequestcacheprivate.h    \

diff --git a/gtk/gtk.h b/gtk/gtk.h
index 9c98b4137849d10947af97cd82e175789d8623c4..e95494f0feb9190abc03a58bd199fbe914fdc94c 100644 (file)
--- a/gtk/gtk.h
+++ b/gtk/gtk.h
@@ -53,7 +53,6 @@
 #include <gtk/gtkbindings.h>
 #include <gtk/gtkborder.h>
 #include <gtk/gtkbox.h>
-#include <gtk/gtkbubblewindow.h>
 #include <gtk/gtkbuildable.h>
 #include <gtk/gtkbuilder.h>
 #include <gtk/gtkbutton.h>
@@ -169,7 +168,6 @@
 #include <gtk/gtkscrolledwindow.h>
 #include <gtk/gtksearchentry.h>
 #include <gtk/gtkselection.h>
-#include <gtk/gtkselectionwindow.h>
 #include <gtk/gtkseparator.h>
 #include <gtk/gtkseparatormenuitem.h>
 #include <gtk/gtkseparatortoolitem.h>

diff --git a/gtk/gtkbubblewindow.c b/gtk/gtkbubblewindow.c
index 2200d8f9c6e255e01eec87dc21c170624eddea66..aee3dc77055e89ef84c24686d4d389add25a980a 100644 (file)
--- a/gtk/gtkbubblewindow.c
+++ b/gtk/gtkbubblewindow.c
@@ -39,7 +39,7 @@
 #include "config.h"
 #include <gdk/gdk.h>
 #include <cairo-gobject.h>
-#include "gtkbubblewindow.h"
+#include "gtkbubblewindowprivate.h"
 #include "gtktypebuiltins.h"
 #include "gtkmain.h"
 #include "gtkprivate.h"

diff --git a/gtk/gtkbubblewindow.h b/gtk/gtkbubblewindowprivate.h
similarity index 96%
rename from gtk/gtkbubblewindow.h
rename to gtk/gtkbubblewindowprivate.h
index 3d2eceb8d2bb259264647b74a2664ffa0352427d..47fd038df4a64ca09e9dffb5cc24ca4299a5ef7b 100644 (file)
--- a/gtk/gtkbubblewindow.h
+++ b/gtk/gtkbubblewindowprivate.h
@@ -18,10 +18,6 @@
 #ifndef __GTK_BUBBLE_WINDOW_H__
 #define __GTK_BUBBLE_WINDOW_H__
 
-#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
 #include <gtk/gtkwindow.h>
 
 G_BEGIN_DECLS

diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index a1a5387d5f12756f4419be0ded0732d596316dbf..a5c13e2c7a24248b1d17e7e220a9924d7a4fcc89 100644 (file)
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -66,7 +66,7 @@
 #include "gtkwidgetprivate.h"
 #include "gtkstylecontextprivate.h"
 #include "gtktexthandleprivate.h"
-#include "gtkselectionwindow.h"
+#include "gtkselectionwindowprivate.h"
 
 #include "a11y/gtkentryaccessible.h"
 

diff --git a/gtk/gtkselectionwindow.c b/gtk/gtkselectionwindow.c
index 1e18f4336663cbb30a31b994025c1080f307b272..d1591b57f7b75f4d1d0929c51d8cd133059dd0b4 100644 (file)
--- a/gtk/gtkselectionwindow.c
+++ b/gtk/gtkselectionwindow.c
@@ -27,7 +27,7 @@
  */
 
 #include "config.h"
-#include "gtkselectionwindow.h"
+#include "gtkselectionwindowprivate.h"
 #include "gtkactiongroup.h"
 #include "gtkuimanager.h"
 #include "gtkclipboard.h"

diff --git a/gtk/gtkselectionwindow.h b/gtk/gtkselectionwindowprivate.h
similarity index 98%
rename from gtk/gtkselectionwindow.h
rename to gtk/gtkselectionwindowprivate.h
index bce80e1f9fcce082b1724793e840054c78708435..bde774ddcf4ff2f5d3b6b156d90f9545c974aa32 100644 (file)
--- a/gtk/gtkselectionwindow.h
+++ b/gtk/gtkselectionwindowprivate.h
@@ -22,7 +22,7 @@
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#include <gtk/gtkbubblewindow.h>
+#include "gtkbubblewindowprivate.h"
 
 G_BEGIN_DECLS
 

diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
index 6986d0b981e41269e9221558a0385c9fdcde7d9a..1e3b71dde9febd38532113800e5065a00e988d95 100644 (file)
--- a/gtk/gtktextview.c
+++ b/gtk/gtktextview.c
@@ -53,7 +53,7 @@
 #include "gtktexthandleprivate.h"
 #include "gtkstylecontextprivate.h"
 #include "gtkcssstylepropertyprivate.h"
-#include "gtkselectionwindow.h"
+#include "gtkselectionwindowprivate.h"
 
 #include "a11y/gtktextviewaccessibleprivate.h"