Merge branch 'maint'

* maint:
  reltool: Remove export_all warning in tests
  et: Remove export_all warnings in test
  mnesia: Remove export_all in tests
  wx: Remove export_all in example code
  wx: test remove export_all
  wx: Update doc, OpenGL external links
  wx: Reduce Opengl docs

1 files changed, 0 insertions, 31 deletions

diff --git a/lib/wx/examples/simple/menu.erl b/lib/wx/examples/simple/menu.erl
index 479df1ef98..93573fb97d 100644
--- a/lib/wx/examples/simple/menu.erl
+++ b/lib/wx/examples/simple/menu.erl
@@ -29,7 +29,6 @@
 -include_lib("wx/include/wx.hrl").
 
 -export([start/0]).
--compile(export_all).
 
 %%%Lots of IDs to declare!
 -define(menuID_FILE_QUIT,           ?wxID_EXIT).
@@ -228,36 +227,6 @@ create_menubar_menu() ->
 %%    
 %%    
 %%    
-create_submenu_menu() ->
-    SubMenuMenu   = wxMenu:new(),
-    wxMenu:append(SubMenuMenu, wxMenuItem:new([
-            {id,    ?menuID_SUBMENU_NORMAL},
-            {text,  "&Normal submenu item"},
-            {help,  "Disabled submenu item"}
-            ])),
-    %% note different way of adding check menu item
-    wxMenu:appendCheckItem(SubMenuMenu, 
-            ?menuID_SUBMENU_CHECK,
-            "&Check submenu item",
-            [{help,  "Check submenu item"}]),
-    wxMenu:appendRadioItem(SubMenuMenu, 
-            ?menuID_SUBMENU_RADIO_1,
-            "Radio item &1",
-            [{help,  "Radio item"}]),
-    wxMenu:appendRadioItem(SubMenuMenu, 
-            ?menuID_SUBMENU_RADIO_2,
-            "Radio item &2",
-            [{help,  "Radio item"}]),
-    wxMenu:appendRadioItem(SubMenuMenu, 
-            ?menuID_SUBMENU_RADIO_3,
-            "Radio item &3",
-            [{help,  "Radio item"}]),
-    SubMenuMenu.
-
-
-%%    
-%%    
-%%    
 create_menu_menu() ->
     MenuMenu   = wxMenu:new(),
     wxMenu:append(MenuMenu, wxMenuItem:new([