Revert "toolbar: Don't special-case RTL toolbar child positions anymore"

[~andy/gtk] / gtk / gtktreemenu.c

diff --git a/gtk/gtktreemenu.c b/gtk/gtktreemenu.c
index 4bcdbbab2b966e931bfc54db68d888569a60a922..8fef02e6f97af0807ea9c798e7afbf845d2ab28b 100644 (file)
--- a/gtk/gtktreemenu.c
+++ b/gtk/gtktreemenu.c
@@ -18,9 +18,7 @@
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
@@ -46,8 +44,12 @@
 #include "gtkmenushellprivate.h"
 #include "gtkprivate.h"
 
-#undef GTK_DISABLE_DEPRECATED
-#include "gtktearoffmenuitem.h"
+#undef GDK_DEPRECATED
+#undef GDK_DEPRECATED_FOR
+#define GDK_DEPRECATED
+#define GDK_DEPRECATED_FOR(f)
+
+#include "deprecated/gtktearoffmenuitem.h"
 
 /* GObjectClass */
 static GObject  *gtk_tree_menu_constructor                    (GType                  type,